From bbf0726c800a7f2d3758cc68fff97054e6b3e692 Mon Sep 17 00:00:00 2001 From: Jihun Ha Date: Thu, 23 Feb 2017 10:17:18 +0900 Subject: [PATCH] Change a maximum size of URI format property to 256 octets As per OCF specification, a normal string-type property without any statement for maximum length can have a 64 octets size at maximum. However, for some cases, e.g. a string for URL, one can use longer string value with a explicit statement of length in its resource model. Fortunately, url format is already defined in OCF spec. as one of property type, which can have 256 octets at maximum. Change-Id: Ia8536ced5f4ab71ccdabd98e9936b00513efaa27 Signed-off-by: Jihun Ha Reviewed-on: https://gerrit.iotivity.org/gerrit/17457 Tested-by: jenkins-iotivity Reviewed-by: Heewon Park Reviewed-by: Uze Choi --- service/easy-setup/enrollee/inc/ESEnrolleeCommon.h | 2 +- service/easy-setup/enrollee/src/resourcehandler.c | 2 +- service/easy-setup/enrollee/src/resourcehandler.h | 2 +- service/easy-setup/inc/escommon.h | 11 +++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h b/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h index 47bb6e9..95b6d2d 100755 --- a/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h +++ b/service/easy-setup/enrollee/inc/ESEnrolleeCommon.h @@ -70,7 +70,7 @@ typedef struct char accessToken[OIC_STRING_MAX_VALUE]; /**< Access token resolved with an auth code **/ OAUTH_TOKENTYPE accessTokenType; /**< Access token type **/ char authProvider[OIC_STRING_MAX_VALUE]; /**< Auth provider ID **/ - char ciServer[OIC_STRING_MAX_VALUE]; /**< Cloud interface server URL which an Enrollee is going to registered **/ + char ciServer[OIC_URI_STRING_MAX_VALUE]; /**< Cloud interface server URL which an Enrollee is going to registered **/ void *userdata; /**< Vender-specific data**/ } ESCoapCloudConfData; diff --git a/service/easy-setup/enrollee/src/resourcehandler.c b/service/easy-setup/enrollee/src/resourcehandler.c index 415b2c6..8fc9ad8 100755 --- a/service/easy-setup/enrollee/src/resourcehandler.c +++ b/service/easy-setup/enrollee/src/resourcehandler.c @@ -438,7 +438,7 @@ void updateCoapCloudConfResource(OCRepPayload* input) memset(cloudData->accessToken, 0, OIC_STRING_MAX_VALUE); g_ESCoapCloudConfResource.accessTokenType = NONE_OAUTH_TOKENTYPE; memset(cloudData->authProvider, 0, OIC_STRING_MAX_VALUE); - memset(cloudData->ciServer, 0, OIC_STRING_MAX_VALUE); + memset(cloudData->ciServer, 0, OIC_URI_STRING_MAX_VALUE); cloudData->userdata = NULL; char *authCode = NULL; diff --git a/service/easy-setup/enrollee/src/resourcehandler.h b/service/easy-setup/enrollee/src/resourcehandler.h index 851f047..f26fb26 100755 --- a/service/easy-setup/enrollee/src/resourcehandler.h +++ b/service/easy-setup/enrollee/src/resourcehandler.h @@ -71,7 +71,7 @@ typedef struct char accessToken[OIC_STRING_MAX_VALUE]; OAUTH_TOKENTYPE accessTokenType; char authProvider[OIC_STRING_MAX_VALUE]; - char ciServer[OIC_STRING_MAX_VALUE]; + char ciServer[OIC_URI_STRING_MAX_VALUE]; } CoapCloudConfResource; typedef struct diff --git a/service/easy-setup/inc/escommon.h b/service/easy-setup/inc/escommon.h index 329ce68..22afb5f 100755 --- a/service/easy-setup/inc/escommon.h +++ b/service/easy-setup/inc/escommon.h @@ -34,12 +34,11 @@ extern "C" #define OC_RSRVD_ES_INTERFACE "if" #define OC_RSRVD_ES_RES_TYPE "rt" - - -#define OIC_STRING_MAX_VALUE 64 -#define MAX_WEBLINKLEN 3 -#define NUM_WIFIMODE 10 -#define NUM_CONNECT_TYPE 3 +#define OIC_STRING_MAX_VALUE 64 +#define OIC_URI_STRING_MAX_VALUE 256 +#define MAX_WEBLINKLEN 3 +#define NUM_WIFIMODE 10 +#define NUM_CONNECT_TYPE 3 /** * Attributes used to form a proper easysetup conforming JSON message. -- 2.7.4