--- libaitmqtt/src/srvside.c 2012/04/07 20:48:39 1.1.2.4 +++ libaitmqtt/src/srvside.c 2012/06/20 15:02:24 1.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srvside.c,v 1.1.2.4 2012/04/07 20:48:39 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,17 +95,18 @@ mqtt_srv_Fini(mqtt_srv_t ** __restrict psrv) * mqtt_srv_Dispatch() MQTT server dispatcher * * @srv = Server handle + * @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) +mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, int rlen, void *arg) { 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 +116,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;