--- libaitmqtt/src/conn.c 2012/01/26 13:07:33 1.1.1.1 +++ libaitmqtt/src/conn.c 2012/04/26 12:33:14 1.1.1.1.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: conn.c,v 1.1.1.1 2012/01/26 13:07:33 misho Exp $ +* $Id: conn.c,v 1.1.1.1.2.2 2012/04/26 12:33:14 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +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 @@ -46,8 +46,6 @@ SUCH DAMAGE. #include "global.h" -/* ------------------------------------------------------------------- */ - /* * mqtt_msgCONNECT() Create CONNECT message * @@ -79,19 +77,19 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha if (!buf || !csConnID) return -1; if (strlen(csConnID) > 23) { - mqtt_SetErr(EINVAL, "Error:: invalid argument ConnID is too long (max 23 bytes)"); + mqtt_SetErr(EINVAL, "Invalid argument ConnID is too long (max 23 bytes)"); return -1; } if (csUser && strlen(csUser) > 12) { - mqtt_SetErr(EINVAL, "Error:: invalid argument Username is too long (max 12 bytes)"); + mqtt_SetErr(EINVAL, "Invalid argument Username is too long (max 12 bytes)"); return -1; } if (csPass && strlen(csPass) > 12) { - mqtt_SetErr(EINVAL, "Error:: invalid argument Password is too long (max 12 bytes)"); + mqtt_SetErr(EINVAL, "Invalid argument Password is too long (max 12 bytes)"); return -1; } if (WillQOS > MQTT_QOS_EXACTLY) { - mqtt_SetErr(EINVAL, "Error:: invalid argument WillQOS - unknown QOS value"); + mqtt_SetErr(EINVAL, "Invalid argument WillQOS - unknown QOS value"); return -1; } @@ -180,7 +178,6 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha } *hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr)); - mqtt_msgRealloc(buf, siz); return siz; } @@ -201,7 +198,7 @@ mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, u_char re if (!buf) return -1; if (retcode > MQTT_RETCODE_DENIED) { - mqtt_SetErr(EINVAL, "Error:: invalid retcode"); + mqtt_SetErr(EINVAL, "Invalid retcode"); return -1; } @@ -324,7 +321,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short if (!hdr) return cack; if (len < 12) { - mqtt_SetErr(EINVAL, "Error:: short message length %d", len); + mqtt_SetErr(EINVAL, "Short message length %d", len); return cack; } else { pos = buf->msg_base + ret + 1; @@ -332,7 +329,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short } /* check init string & protocol */ if (var->var_sb.sb.l != 6 || strncmp((char*) var->var_data, MQTT_CONN_STR, 6)) { - mqtt_SetErr(EINVAL, "Error:: invalid init string %.6s(%d)", + mqtt_SetErr(EINVAL, "Invalid init string %.6s(%d)", var->var_data, var->var_sb.sb.l); cack.retcode = MQTT_RETCODE_REFUSE_UNAVAIL; return cack; @@ -341,7 +338,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short proto = (mqtthdr_protover_t*) pos; } if (*proto != MQTT_PROTO_VER) { - mqtt_SetErr(EINVAL, "Error:: invalid protocol version %d", *pos); + mqtt_SetErr(EINVAL, "Invalid protocol version %d", *pos); cack.retcode = MQTT_RETCODE_REFUSE_VER; return cack; } else @@ -358,7 +355,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short var = (mqtthdr_var_t*) pos; len -= MQTTHDR_VAR_SIZEOF(var); if (len < 0 || var->var_sb.sb.l > 23) { - mqtt_SetErr(EINVAL, "Error:: unexpected EOM at Connection ID %d", len); + mqtt_SetErr(EINVAL, "Unexpected EOM at Connection ID %d", len); cack.retcode = MQTT_RETCODE_REFUSE_ID; return cack; } else { @@ -372,7 +369,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short var = (mqtthdr_var_t*) pos; len -= MQTTHDR_VAR_SIZEOF(var); if (len < 0) { - mqtt_SetErr(EINVAL, "Error:: unexpected EOM at Will Topic %d", len); + mqtt_SetErr(EINVAL, "Unexpected EOM at Will Topic %d", len); cack.retcode = MQTT_RETCODE_REFUSE_ID; return cack; } else { @@ -392,7 +389,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short var = (mqtthdr_var_t*) pos; len -= MQTTHDR_VAR_SIZEOF(var); if (len < 0) { - mqtt_SetErr(EINVAL, "Error:: unexpected EOM at Will Message %d", len); + mqtt_SetErr(EINVAL, "Unexpected EOM at Will Message %d", len); cack.retcode = MQTT_RETCODE_REFUSE_ID; return cack; } else { @@ -415,7 +412,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short var = (mqtthdr_var_t*) pos; len -= MQTTHDR_VAR_SIZEOF(var); if (len < 0 || var->var_sb.sb.l > 12) { - mqtt_SetErr(EINVAL, "Error:: unexpected EOM at Username %d", len); + mqtt_SetErr(EINVAL, "Unexpected EOM at Username %d", len); cack.retcode = MQTT_RETCODE_REFUSE_USERPASS; return cack; } else { @@ -431,7 +428,7 @@ mqtt_readCONNECT(mqtt_msg_t * __restrict buf, u_short var = (mqtthdr_var_t*) pos; len -= MQTTHDR_VAR_SIZEOF(var); if (len < 0 || var->var_sb.sb.l > 12) { - mqtt_SetErr(EINVAL, "Error:: unexpected EOM at Password %d", len); + mqtt_SetErr(EINVAL, "Unexpected EOM at Password %d", len); cack.retcode = MQTT_RETCODE_REFUSE_USERPASS; return cack; } else { @@ -471,7 +468,7 @@ mqtt_readCONNACK(mqtt_msg_t * __restrict buf) if (!hdr) return (u_char) -1; if (len < sizeof(mqtthdr_connack_t)) { - mqtt_SetErr(EINVAL, "Error:: short message length %d", len); + mqtt_SetErr(EINVAL, "Short message length %d", len); return (u_char) -1; } else { pos = buf->msg_base + ret + 1; @@ -479,7 +476,7 @@ mqtt_readCONNACK(mqtt_msg_t * __restrict buf) } if (ack->retcode > MQTT_RETCODE_DENIED) { - mqtt_SetErr(EINVAL, "Error:: invalid retcode %u", ack->retcode); + mqtt_SetErr(EINVAL, "Invalid retcode %u", ack->retcode); return (u_char) -1; }