--- libaitmqtt/src/srvside.c	2012/04/07 20:48:39	1.1.2.4
+++ libaitmqtt/src/srvside.c	2012/05/05 13:10:24	1.1.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srvside.c,v 1.1.2.4 2012/04/07 20:48:39 misho Exp $
+* $Id: srvside.c,v 1.1.2.5 2012/05/05 13:10:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -94,16 +94,17 @@ mqtt_srv_Fini(mqtt_srv_t ** __restrict psrv)
  *
  * @srv = Server handle
  * @arg = Argument pass to command callback
+ * @rlen = Ready bytes to parse
  * return: -1 error or 0 ok
  */
 int
-mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, void *arg)
+mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, void *arg, int rlen)
 {
 	struct mqtthdr *hdr;
 
 	if (!srv || !srv->buf->msg_base || !srv->buf->msg_len)
 		return -1;
-	if (srv->buf->msg_len < sizeof(struct mqtthdr)) {
+	if (srv->buf->msg_len < sizeof(struct mqtthdr) || rlen < sizeof(struct mqtthdr)) {
 		mqtt_SetErr(EINVAL, "Message is too short ...");
 		return -1;
 	}
@@ -113,7 +114,7 @@ mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, void *a
 		return -1;
 	}
 	if (srv->cmds[hdr->mqtt_msg.type])
-		return srv->cmds[hdr->mqtt_msg.type]((void*) srv, arg);
+		return srv->cmds[hdr->mqtt_msg.type]((void*) srv, rlen, arg);
 
 	mqtt_SetErr(ENOTSUP, "Unsupported message type %d", hdr->mqtt_msg.type);
 	return -1;