Merge branch 'develop' into MAX-111

2014-06-26 16:52:57 +01:00
parent 031294f655 10ac2cb6e6
commit ace2550d93
17 changed files with 1273 additions and 484 deletions
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@ -229,7 +229,6 @@ typedef struct dcb {
 	struct service	*service;	/**< The related service */
 	void		*data;		/**< Specific client data */
 	DCBMM		memdata;	/**< The data related to DCB memory management */
-	int		command;	/**< Specific client command type */
 	SPINLOCK	cb_lock;	/**< The lock for the callbacks linked list */
 	DCB_CALLBACK	*callbacks;	/**< The list of callbacks for the DCB */