--- libaitmqtt/src/srvside.c 2012/01/27 15:12:27 1.1.2.2 +++ libaitmqtt/src/srvside.c 2012/04/07 20:48:39 1.1.2.4 @@ -1,7 +1,51 @@ -#include "global.h" +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: srvside.c,v 1.1.2.4 2012/04/07 20:48:39 misho Exp $ +* +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ +#include "global.h" + + /* * mqtt_srv_Init() Init MQTT server side support * @@ -25,8 +69,7 @@ mqtt_srv_Init(int sock, mqtt_msg_t * __restrict buf) memset(srv, 0, sizeof(mqtt_srv_t)); srv->sock = sock; - srv->buf->msg_base = buf->msg_base; - srv->buf->msg_len = buf->msg_len; + srv->buf = buf; return srv; } @@ -61,17 +104,17 @@ mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, void *a if (!srv || !srv->buf->msg_base || !srv->buf->msg_len) return -1; if (srv->buf->msg_len < sizeof(struct mqtthdr)) { - mqtt_SetErr(EINVAL, "Error:: message is too small ..."); + mqtt_SetErr(EINVAL, "Message is too short ..."); return -1; } hdr = (struct mqtthdr*) srv->buf->msg_base; if (hdr->mqtt_msg.type > MQTT_TYPE_MAX) { - mqtt_SetErr(ENOSYS, "Error:: message type %d not implemented", hdr->mqtt_msg.type); + mqtt_SetErr(ENOSYS, "Message type %d not implemented", hdr->mqtt_msg.type); return -1; } if (srv->cmds[hdr->mqtt_msg.type]) return srv->cmds[hdr->mqtt_msg.type]((void*) srv, arg); - mqtt_SetErr(ENOTSUP, "Error:: Unsupported message type %d", hdr->mqtt_msg.type); + mqtt_SetErr(ENOTSUP, "Unsupported message type %d", hdr->mqtt_msg.type); return -1; }