--- libaitmqtt/src/srvside.c	2012/05/05 13:10:24	1.1.2.5
+++ libaitmqtt/src/srvside.c	2012/06/20 15:02:24	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srvside.c,v 1.1.2.5 2012/05/05 13:10:24 misho Exp $
+* $Id: srvside.c,v 1.2 2012/06/20 15:02:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -51,10 +51,11 @@ SUCH DAMAGE.
  *
  * @sock = Client socket from accept()
  * @buf = Message buffer
+ * @timeout = timeout
  * return: NULL error or !=NULL allocated server handle
  */
 mqtt_srv_t *
-mqtt_srv_Init(int sock, mqtt_msg_t * __restrict buf)
+mqtt_srv_Init(int sock, mqtt_msg_t * __restrict buf, u_short timeout)
 {
 	mqtt_srv_t *srv = NULL;
 
@@ -70,6 +71,7 @@ mqtt_srv_Init(int sock, mqtt_msg_t * __restrict buf)
 
 	srv->sock = sock;
 	srv->buf = buf;
+	srv->timeout = timeout;
 
 	return srv;
 }
@@ -93,12 +95,12 @@ mqtt_srv_Fini(mqtt_srv_t ** __restrict psrv)
  * mqtt_srv_Dispatch() MQTT server dispatcher
  *
  * @srv = Server handle
- * @arg = Argument pass to command callback
  * @rlen = Ready bytes to parse
+ * @arg = Argument pass to command callback
  * return: -1 error or 0 ok
  */
 int
-mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, void *arg, int rlen)
+mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, int rlen, void *arg)
 {
 	struct mqtthdr *hdr;