From 34df9a3c8865ea31c1bfc2dd18198733ec05f2aa Mon Sep 17 00:00:00 2001 From: Habib Virji Date: Wed, 23 Mar 2016 21:31:47 +0000 Subject: [PATCH] [IOT-990] Support for URI comparisons to be case-insenstive Support for rt or if in the query to be case-insensitive. JIRA ISSUE: IOT-990 Signed-off-by: Habib Virji Change-Id: Ieff5256e25b2232f25dec52e86b356a0682e3241 Reviewed-on: https://gerrit.iotivity.org/gerrit/6237 Tested-by: jenkins-iotivity --- resource/csdk/stack/src/ocresource.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c index b323481..cd05deb 100755 --- a/resource/csdk/stack/src/ocresource.c +++ b/resource/csdk/stack/src/ocresource.c @@ -25,7 +25,13 @@ // For POSIX.1-2001 base specification, // Refer http://pubs.opengroup.org/onlinepubs/009695399/ #define _POSIX_C_SOURCE 200112L + +#ifdef WITH_ARDUINO #include +#else +#include +#endif + #include "ocresource.h" #include "ocresourcehandler.h" #include "ocobserve.h" @@ -141,11 +147,11 @@ static OCStackResult ExtractFiltersFromQuery(char *query, char **filterOne, char { return OC_STACK_INVALID_QUERY; } - else if (strcmp (key, OC_RSRVD_INTERFACE) == 0) + else if (strncasecmp(key, OC_RSRVD_INTERFACE, sizeof(OC_RSRVD_INTERFACE) - 1) == 0) { *filterOne = value; // if } - else if (strcmp (key, OC_RSRVD_RESOURCE_TYPE) == 0) + else if (strncasecmp(key, OC_RSRVD_RESOURCE_TYPE, sizeof(OC_RSRVD_INTERFACE) - 1) == 0) { *filterTwo = value; // rt } @@ -159,7 +165,7 @@ static OCStackResult ExtractFiltersFromQuery(char *query, char **filterOne, char keyValuePair = strtok_r(NULL, OC_QUERY_SEPARATOR, &restOfQuery); } - OIC_LOG_V(INFO, TAG, "Extracted params %s and %s.", *filterOne, *filterTwo); + OIC_LOG_V(INFO, TAG, "Extracted params if: %s and rt: %s.", *filterOne, *filterTwo); return OC_STACK_OK; } -- 2.7.4