123
Diff: MQTTSNConnectServer.c
- Revision:
- 1:7fa362fa563f
- Parent:
- 0:c524a894b5e8
diff -r c524a894b5e8 -r 7fa362fa563f MQTTSNConnectServer.c --- a/MQTTSNConnectServer.c Thu Feb 26 15:59:36 2015 +0000 +++ b/MQTTSNConnectServer.c Wed Jan 06 14:19:27 2016 +0000 @@ -43,17 +43,17 @@ if (enddata - curdata < 2) goto exit; - if (readChar(&curdata) != MQTTSN_CONNECT) + if (MQTTSNPacket_readChar(&curdata) != MQTTSN_CONNECT) goto exit; - flags.all = readChar(&curdata); + flags.all = MQTTSNPacket_readChar(&curdata); data->cleansession = flags.bits.cleanSession; data->willFlag = flags.bits.will; - if ((version = (int)readChar(&curdata)) != 1) /* Protocol version */ + if ((version = (int)MQTTSNPacket_readChar(&curdata)) != 1) /* Protocol version */ goto exit; - data->duration = readInt(&curdata); + data->duration = MQTTSNPacket_readInt(&curdata); if (!readMQTTSNString(&data->clientID, &curdata, enddata)) goto exit; @@ -85,8 +85,8 @@ } ptr += MQTTSNPacket_encode(ptr, 3); /* write length */ - writeChar(&ptr, MQTTSN_CONNACK); - writeChar(&ptr, connack_rc); + MQTTSNPacket_writeChar(&ptr, MQTTSN_CONNACK); + MQTTSNPacket_writeChar(&ptr, connack_rc); rc = ptr - buf; exit: @@ -115,11 +115,11 @@ if (enddata - curdata < 1) goto exit; - if (readChar(&curdata) != MQTTSN_DISCONNECT) + if (MQTTSNPacket_readChar(&curdata) != MQTTSN_DISCONNECT) goto exit; if (enddata - curdata == 2) - *duration = readInt(&curdata); + *duration = MQTTSNPacket_readInt(&curdata); else if (enddata != curdata) goto exit; @@ -149,7 +149,7 @@ } ptr += MQTTSNPacket_encode(ptr, 2); /* write length */ - writeChar(&ptr, MQTTSN_WILLTOPICREQ); + MQTTSNPacket_writeChar(&ptr, MQTTSN_WILLTOPICREQ); rc = ptr - buf; exit: @@ -177,7 +177,7 @@ } ptr += MQTTSNPacket_encode(ptr, 2); /* write length */ - writeChar(&ptr, MQTTSN_WILLMSGREQ); + MQTTSNPacket_writeChar(&ptr, MQTTSN_WILLMSGREQ); rc = ptr - buf; exit: @@ -207,7 +207,7 @@ if (enddata - curdata < 1) goto exit; - if (readChar(&curdata) != MQTTSN_PINGREQ) + if (MQTTSNPacket_readChar(&curdata) != MQTTSN_PINGREQ) goto exit; if (!readMQTTSNString(clientID, &curdata, enddata)) @@ -239,7 +239,7 @@ } ptr += MQTTSNPacket_encode(ptr, 2); /* write length */ - writeChar(&ptr, MQTTSN_PINGRESP); + MQTTSNPacket_writeChar(&ptr, MQTTSN_PINGRESP); rc = ptr - buf; exit: @@ -270,10 +270,10 @@ if (enddata > buf + len) goto exit; - if (readChar(&curdata) != packet_type) + if (MQTTSNPacket_readChar(&curdata) != packet_type) goto exit; - flags.all = readChar(&curdata); + flags.all = MQTTSNPacket_readChar(&curdata); *willQoS = flags.bits.QoS; *willRetain = flags.bits.retain; @@ -332,7 +332,7 @@ if (enddata > buf + len) goto exit; - if (readChar(&curdata) != packet_type) + if (MQTTSNPacket_readChar(&curdata) != packet_type) goto exit; if (!readMQTTSNString(willMsg, &curdata, enddata)) @@ -390,8 +390,8 @@ } ptr += MQTTSNPacket_encode(ptr, 3); /* write length */ - writeChar(&ptr, MQTTSN_WILLTOPICRESP); - writeChar(&ptr, resp_rc); + MQTTSNPacket_writeChar(&ptr, MQTTSN_WILLTOPICRESP); + MQTTSNPacket_writeChar(&ptr, resp_rc); rc = ptr - buf; exit: @@ -420,8 +420,8 @@ } ptr += MQTTSNPacket_encode(ptr, 3); /* write length */ - writeChar(&ptr, MQTTSN_WILLMSGRESP); - writeChar(&ptr, resp_rc); + MQTTSNPacket_writeChar(&ptr, MQTTSN_WILLMSGRESP); + MQTTSNPacket_writeChar(&ptr, resp_rc); rc = ptr - buf; exit: