Fixing query delimiters in uri reassembly.

The first delimiter after the uri and before the query is '?'
All eventual delimiters between query params are '&'.
This is missed out on the patch :
https://gerrit.iotivity.org/gerrit/#/c/193.

Change-Id: Iec533d10075e1692a84b36683b0b42b2b702a01e
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/422
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Sashi Penta <sashi.kumar.penta@intel.com>

diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c
index b852ae9..23304a1 100644 (file)
--- a/resource/csdk/connectivity/src/caprotocolmessage.c
+++ b/resource/csdk/connectivity/src/caprotocolmessage.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <time.h>
 
@@ -470,6 +471,7 @@ void CAGetRequestPDUInfo(const coap_pdu_t *pdu, uint32_t *outCode, CAInfo_t *out
     uint32_t count = 0, idx = 0;
     uint32_t optionLength = 0;
     uint32_t isfirstsetflag = 0;
+    bool isQueryBeingProcessed = false;
 
     coap_option_iterator_init((coap_pdu_t *) pdu, &opt_iter, COAP_OPT_ALL);
 
@@ -526,7 +528,17 @@ void CAGetRequestPDUInfo(const coap_pdu_t *pdu, uint32_t *outCode, CAInfo_t *out
                     }
                     else if (COAP_OPTION_URI_QUERY == opt_iter.type)
                     {
-                        memcpy(optionResult + optionLength, "?", 1);
+                        // Delimiter between uri and query is '?'
+                        if (false == isQueryBeingProcessed)
+                        {
+                            memcpy(optionResult + optionLength, "?", 1);
+                            isQueryBeingProcessed = true;
+                        }
+                        else
+                        {
+                            // Delimeter for query params is '&'
+                            memcpy(optionResult + optionLength, "&", 1);
+                        }
                         optionLength++;
                     }
                     memcpy(optionResult + optionLength, buf, strlen((const char *) buf));

diff --git a/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c b/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c
index c011eae..9283efc 100644 (file)
--- a/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c
+++ b/resource/csdk/connectivity/src/caprotocolmessage_singlethread.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 
 
@@ -468,6 +469,7 @@ void CAGetRequestPDUInfo(const coap_pdu_t *pdu, uint32_t *outCode, CAInfo_t *out
     uint32_t count = 0, idx = 0;
     uint32_t optionLength = 0;
     uint32_t isfirstsetflag = 0;
+    bool isQueryBeingProcessed = false;
 
     coap_option_iterator_init((coap_pdu_t *) pdu, &opt_iter, COAP_OPT_ALL);
 
@@ -525,7 +527,17 @@ void CAGetRequestPDUInfo(const coap_pdu_t *pdu, uint32_t *outCode, CAInfo_t *out
                     }
                     else if (COAP_OPTION_URI_QUERY == opt_iter.type)
                     {
-                        memcpy(optionResult + optionLength, "?", 1);
+                        // Delimiter between uri and query is '?'
+                        if (false == isQueryBeingProcessed)
+                        {
+                            memcpy(optionResult + optionLength, "?", 1);
+                            isQueryBeingProcessed = true;
+                        }
+                        else
+                        {
+                            // Delimeter for query params is '&'
+                            memcpy(optionResult + optionLength, "&", 1);
+                        }
                         optionLength++;
                     }
                     memcpy(optionResult + optionLength, buf, strlen((const char *) buf));