Ian Craggs / MQTTSNPacket

Low level MQTTSN packet library, part of the Eclipse Paho project: http://eclipse.org/paho

Dependents:   MQTTSN sara-n200-hello-mqtt-sn MQTTSN_2

The master source for this project is held at: https://github.com/eclipse/paho.mqtt-sn.embedded-c

Diff: MQTTSNConnectClient.c

Revision:
1:7fa362fa563f
Parent:
0:c524a894b5e8
--- a/MQTTSNConnectClient.c	Thu Feb 26 15:59:36 2015 +0000
+++ b/MQTTSNConnectClient.c	Wed Jan 06 14:19:27 2016 +0000
@@ -57,14 +57,14 @@
 		goto exit;
 	}
 	ptr += MQTTSNPacket_encode(ptr, len); /* write length */
-	writeChar(&ptr, MQTTSN_CONNECT);      /* write message type */
+	MQTTSNPacket_writeChar(&ptr, MQTTSN_CONNECT);      /* write message type */
 
 	flags.all = 0;
 	flags.bits.cleanSession = options->cleansession;
 	flags.bits.will = options->willFlag;
-	writeChar(&ptr, flags.all);
-	writeChar(&ptr, 0x01);                 /* protocol ID */
-	writeInt(&ptr, options->duration);
+	MQTTSNPacket_writeChar(&ptr, flags.all);
+	MQTTSNPacket_writeChar(&ptr, 0x01);                 /* protocol ID */
+	MQTTSNPacket_writeInt(&ptr, options->duration);
 	writeMQTTSNString(&ptr, options->clientID);
 
 	rc = ptr - buf;
@@ -94,10 +94,10 @@
 	if (enddata - buf < 3)
 		goto exit;
 
-	if (readChar(&curdata) != MQTTSN_CONNACK)
+	if (MQTTSNPacket_readChar(&curdata) != MQTTSN_CONNACK)
 		goto exit;
 
-	*connack_rc = readChar(&curdata);
+	*connack_rc = MQTTSNPacket_readChar(&curdata);
 
 	rc = 1;
 exit:
@@ -142,10 +142,10 @@
 		goto exit;
 	}
 	ptr += MQTTSNPacket_encode(ptr, len); /* write length */
-	writeChar(&ptr, MQTTSN_DISCONNECT);      /* write message type */
+	MQTTSNPacket_writeChar(&ptr, MQTTSN_DISCONNECT);      /* write message type */
 
 	if (duration >= 0)
-		writeInt(&ptr, duration);
+		MQTTSNPacket_writeInt(&ptr, duration);
 
 	rc = ptr - buf;
 exit:
@@ -174,7 +174,7 @@
 		goto exit;
 	}
 	ptr += MQTTSNPacket_encode(ptr, len); /* write length */
-	writeChar(&ptr, MQTTSN_PINGREQ);      /* write message type */
+	MQTTSNPacket_writeChar(&ptr, MQTTSN_PINGREQ);      /* write message type */
 
 	writeMQTTSNString(&ptr, clientid);
 
@@ -204,7 +204,7 @@
 	if (enddata - curdata < 2)
 		goto exit;
 
-	if (readChar(&curdata) != MQTTSN_PINGRESP)
+	if (MQTTSNPacket_readChar(&curdata) != MQTTSN_PINGRESP)
 		goto exit;
 
 	rc = 1;
@@ -238,12 +238,12 @@
 		goto exit;
 	}
 	ptr += MQTTSNPacket_encode(ptr, len); /* write length */
-	writeChar(&ptr, packet_type);      /* write message type */
+	MQTTSNPacket_writeChar(&ptr, packet_type);      /* write message type */
 
 	flags.all = 0;
 	flags.bits.QoS = willQoS;
 	flags.bits.retain = willRetain;
-	writeChar(&ptr, flags.all);
+	MQTTSNPacket_writeChar(&ptr, flags.all);
 
 	writeMQTTSNString(&ptr, willTopic);
 
@@ -305,7 +305,7 @@
 		goto exit;
 	}
 	ptr += MQTTSNPacket_encode(ptr, len); /* write length */
-	writeChar(&ptr, packet_type);      /* write message type */
+	MQTTSNPacket_writeChar(&ptr, packet_type);      /* write message type */
 
 	writeMQTTSNString(&ptr, willMsg);
 
@@ -367,7 +367,7 @@
 	if (enddata - curdata < 1)
 		goto exit;
 
-	if (readChar(&curdata) != MQTTSN_WILLTOPICREQ)
+	if (MQTTSNPacket_readChar(&curdata) != MQTTSN_WILLTOPICREQ)
 		goto exit;
 
 	rc = 1;
@@ -402,7 +402,7 @@
 	if (enddata - curdata < 1)
 		goto exit;
 
-	if (readChar(&curdata) != MQTTSN_WILLMSGREQ)
+	if (MQTTSNPacket_readChar(&curdata) != MQTTSN_WILLMSGREQ)
 		goto exit;
 
 	rc = 1;
@@ -432,10 +432,10 @@
 	if (enddata - buf < 3)
 		goto exit;
 
-	if (readChar(&curdata) != MQTTSN_WILLTOPICRESP)
+	if (MQTTSNPacket_readChar(&curdata) != MQTTSN_WILLTOPICRESP)
 		goto exit;
 
-	*resp_rc = readChar(&curdata);
+	*resp_rc = MQTTSNPacket_readChar(&curdata);
 
 	rc = 1;
 exit:
@@ -464,10 +464,10 @@
 	if (enddata - buf < 3)
 		goto exit;
 
-	if (readChar(&curdata) != MQTTSN_WILLMSGRESP)
+	if (MQTTSNPacket_readChar(&curdata) != MQTTSN_WILLMSGRESP)
 		goto exit;
 
-	*resp_rc = readChar(&curdata);
+	*resp_rc = MQTTSNPacket_readChar(&curdata);
 
 	rc = 1;
 exit: