version 1.1.1.1.2.5, 2012/06/11 08:37:41
|
version 1.1.1.1.2.6, 2012/06/19 15:41:15
|
Line 63 int
|
Line 63 int
|
mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, u_short msgID, |
mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, u_short msgID, |
u_char Dup, u_char QOS, u_char Retain, const void *pData, int datlen) |
u_char Dup, u_char QOS, u_char Retain, const void *pData, int datlen) |
{ |
{ |
int siz = 0; | int len, siz; |
struct mqtthdr *hdr; |
struct mqtthdr *hdr; |
mqtthdr_var_t *topic; |
mqtthdr_var_t *topic; |
mqtt_len_t *mid; |
mqtt_len_t *mid; |
Line 71 mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
|
Line 71 mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
|
|
|
if (!buf || !csTopic) |
if (!buf || !csTopic) |
return -1; |
return -1; |
|
else |
|
data = buf->msg_base; |
if (QOS > MQTT_QOS_EXACTLY) { |
if (QOS > MQTT_QOS_EXACTLY) { |
mqtt_SetErr(EINVAL, "Invalid QoS parameter"); |
mqtt_SetErr(EINVAL, "Invalid QoS parameter"); |
return -1; |
return -1; |
Line 80 mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
|
Line 82 mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
|
return -1; |
return -1; |
} |
} |
|
|
if (mqtt_msgRealloc(buf, MQTTMSG_MAX) == -1) | /* calculate message size */ |
| len = sizeof(mqtt_len_t) + strlen(csTopic); /* topic */ |
| len += sizeof(mqtt_len_t); /* msgid */ |
| len += datlen; /* data len */ |
| |
| /* calculate header size */ |
| siz = sizeof(struct mqtthdr); /* mqtt fixed header */ |
| siz += mqtt_sizeLen(mqtt_encodeLen(len)) - 1; /* length size */ |
| |
| if (mqtt_msgRealloc(buf, siz + len) == -1) |
return -1; |
return -1; |
else { | else |
hdr = (struct mqtthdr *) (buf->msg_base + siz); | hdr = (struct mqtthdr *) data; |
siz += sizeof(struct mqtthdr); | |
} | |
|
|
|
/* fixed header */ |
|
MQTTHDR_MSGINIT(hdr); |
|
hdr->mqtt_msg.type = MQTT_TYPE_PUBLISH; |
|
hdr->mqtt_msg.qos = QOS; |
|
hdr->mqtt_msg.dup = Dup ? 1 : 0; |
|
hdr->mqtt_msg.retain = Retain ? 1 : 0; |
|
*hdr->mqtt_len = mqtt_encodeLen(len); |
|
data += siz; |
|
|
/* variable header */ |
/* variable header */ |
topic = (mqtthdr_var_t*) (buf->msg_base + siz); | topic = (mqtthdr_var_t*) data; |
topic->var_sb.val = htons(strlen(csTopic)); |
topic->var_sb.val = htons(strlen(csTopic)); |
memcpy(topic->var_data, csTopic, ntohs(topic->var_sb.val)); |
memcpy(topic->var_data, csTopic, ntohs(topic->var_sb.val)); |
siz += MQTTHDR_VAR_SIZEOF(topic); | data += MQTTHDR_VAR_SIZEOF(topic); |
|
|
mid = (mqtt_len_t*) (buf->msg_base + siz); | mid = (mqtt_len_t*) data; |
mid->val = htons(msgID); |
mid->val = htons(msgID); |
siz += sizeof(mqtt_len_t); | data += sizeof(mqtt_len_t); |
|
|
/* load with data */ |
/* load with data */ |
if (pData && datlen) { | if (pData && datlen) |
data = buf->msg_base + siz; | |
memcpy(data, pData, datlen); |
memcpy(data, pData, datlen); |
siz += datlen; |
|
} |
|
|
|
/* fixed header */ | return siz + len; |
MQTTHDR_MSGINIT(hdr); | |
hdr->mqtt_msg.type = MQTT_TYPE_PUBLISH; | |
hdr->mqtt_msg.qos = QOS; | |
hdr->mqtt_msg.dup = Dup ? 1 : 0; | |
hdr->mqtt_msg.retain = Retain ? 1 : 0; | |
*hdr->mqtt_len = mqtt_encodeLen(siz - sizeof(struct mqtthdr)); | |
| |
return siz; | |
} |
} |
|
|
static int |
static int |