Prevent messages on /update/accepted from incrementing shadowJsonVersionNum

vareddy · vareddy · commit 36e4ee326e11 · 2017-10-24T15:15:42.000-07:00
Fixes #71
diff --git a/src/aws_iot_shadow_records.c b/src/aws_iot_shadow_records.c
@@ -168,9 +168,9 @@ static void topicNameFromThingAndAction(char *pTopic, const char *pThingName, Sh
 	}
 }
 
-static bool isAckForMyThingName(const char *pTopicName) {
+static bool isValidShadowVersionUpdate(const char *pTopicName) {
 	if(strstr(pTopicName, myThingName) != NULL &&
-	   ((strstr(pTopicName, "get/accepted") != NULL) || (strstr(pTopicName, "update/accepted") != NULL) ||
+	   ((strstr(pTopicName, "get/accepted") != NULL) ||
 		(strstr(pTopicName, "delta") != NULL))) {
 		return true;
 	}
@@ -201,7 +201,7 @@ static void AckStatusCallback(AWS_IoT_Client *pClient, char *topicName, uint16_t
 		return;
 	}
 
-	if(isAckForMyThingName(topicName)) {
+	if(isValidShadowVersionUpdate(topicName)) {
 		uint32_t tempVersionNumber = 0;
 		if(extractVersionNumber(shadowRxBuf, pJsonHandler, tokenCount, &tempVersionNumber)) {
 			if(tempVersionNumber > shadowJsonVersionNum) {

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,9 @@ static void topicNameFromThingAndAction(char pTopic, const char pThingName, Sh`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`-static bool isAckForMyThingName(const char *pTopicName) {`
	`171`	`+static bool isValidShadowVersionUpdate(const char *pTopicName) {`
`172`	`172`	`if(strstr(pTopicName, myThingName) != NULL &&`
`173`		`- ((strstr(pTopicName, "get/accepted") != NULL) \|\| (strstr(pTopicName, "update/accepted") != NULL) \|\|`
	`173`	`+ ((strstr(pTopicName, "get/accepted") != NULL) \|\|`
`174`	`174`	`(strstr(pTopicName, "delta") != NULL))) {`
`175`	`175`	`return true;`
`176`	`176`	`}`
`@@ -201,7 +201,7 @@ static void AckStatusCallback(AWS_IoT_Client pClient, char topicName, uint16_t`
`201`	`201`	`return;`
`202`	`202`	`}`
`203`	`203`
`204`		`- if(isAckForMyThingName(topicName)) {`
	`204`	`+ if(isValidShadowVersionUpdate(topicName)) {`
`205`	`205`	`uint32_t tempVersionNumber = 0;`
`206`	`206`	`if(extractVersionNumber(shadowRxBuf, pJsonHandler, tokenCount, &tempVersionNumber)) {`
`207`	`207`	`if(tempVersionNumber > shadowJsonVersionNum) {`