--- libaitmqtt/src/srvside.c 2012/04/07 20:48:39 1.1.2.4 +++ libaitmqtt/src/srvside.c 2012/06/29 08:22:50 1.2.4.1 @@ -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.4.1 2012/06/29 08:22:50 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -47,14 +47,15 @@ SUCH DAMAGE. /* - * mqtt_srv_Init() Init MQTT server side support + * mqtt_srv_cliInit() Init MQTT server side support for clients * * @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_cliInit(int sock, mqtt_msg_t * __restrict buf, u_short timeout) { mqtt_srv_t *srv = NULL; @@ -70,18 +71,19 @@ mqtt_srv_Init(int sock, mqtt_msg_t * __restrict buf) srv->sock = sock; srv->buf = buf; + srv->timeout = timeout; return srv; } /* - * mqtt_srv_Fini() Finish MQTT server side support + * mqtt_srv_cliFini() Finish MQTT server side support for clients * * @psrv = Server handle * return: none */ void -mqtt_srv_Fini(mqtt_srv_t ** __restrict psrv) +mqtt_srv_cliFini(mqtt_srv_t ** __restrict psrv) { if (psrv && *psrv) { free(*psrv); @@ -90,20 +92,21 @@ mqtt_srv_Fini(mqtt_srv_t ** __restrict psrv) } /* - * mqtt_srv_Dispatch() MQTT server dispatcher + * mqtt_srv_cliDispatch() MQTT server dispatcher for clients * * @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_cliDispatch(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,8 +116,79 @@ 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; +} + + +/* + * mqtt_srv_Create() - Create server socket + * + * @sa = Server bind address + * @salen = Server struct sockaddr size + * return: -1 error or >-1 server socket + */ +int +mqtt_srv_Create(struct sockaddr * __restrict sa, int salen) +{ + int s = -1, n = 1; + + if (!sa) + return -1; + + s = socket(sa->sa_family, SOCK_STREAM, 0); + if (s == -1) { + LOGERR; + return -1; + } + if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) { + LOGERR; + close(s); + return -1; + } + if (bind(s, sa, salen) == -1) { + LOGERR; + close(s); + return -1; + } + + return s; +} + +/* + * mqtt_srv_Destroy() - Close server socket + * + * @sock = Server socket + * return: -1 error or 0 ok + */ +int +mqtt_srv_Destroy(int sock) +{ + shutdown(sock, SHUT_RDWR); + return close(sock); +} + +/* + * mqtt_srv_Listen() - Listen server socket + * + * @sock = Server socket + * @maxconn = max number of pending connections + * @nb = Non block socket + * return: -1 error or 0 ok + */ +int +mqtt_srv_Listen(int sock, int maxconn, int nb) +{ + if (!maxconn) + maxconn = SOMAXCONN; + + if (listen(sock, maxconn) == -1) { + LOGERR; + return -1; + } else + ioctl(sock, FIONBIO, nb); + + return 0; }