Commit c2f30c6e authored by Jihun Ha's avatar Jihun Ha Committed by Uze Choi

Update a resource type of easy setup resources

Easy setup resources should use a "ocf.wk" surfix in their resource types.
For example, ocf.wk.prov and ocf.wk.wifi are right.
Additionally, a state of connecting to enroller is added as a provisioning state

Change-Id: I6e92bf44c4239fb1e17e70d691360fa12734c05f
Signed-off-by: default avatarJihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9389Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
parent 0cb946db
...@@ -128,7 +128,6 @@ OCStackResult initProvResource(bool isSecured) ...@@ -128,7 +128,6 @@ OCStackResult initProvResource(bool isSecured)
{ {
gProvResource.status = ES_STATE_INIT; gProvResource.status = ES_STATE_INIT;
gProvResource.lastErrCode = ES_ERRCODE_NO_ERROR; gProvResource.lastErrCode = ES_ERRCODE_NO_ERROR;
OICStrcpy(gProvResource.errorMessage, MAX_ERRMSGLEN, "");
OICStrcpy(gProvResource.ocfWebLinks, MAX_WEBLINKLEN, ""); OICStrcpy(gProvResource.ocfWebLinks, MAX_WEBLINKLEN, "");
OCStackResult res = OC_STACK_ERROR; OCStackResult res = OC_STACK_ERROR;
......
...@@ -43,7 +43,6 @@ typedef struct PROVRESOURCE ...@@ -43,7 +43,6 @@ typedef struct PROVRESOURCE
OCResourceHandle handle; OCResourceHandle handle;
ProvStatus status; // provisiong status ProvStatus status; // provisiong status
ESErrorCode lastErrCode; ESErrorCode lastErrCode;
char errorMessage[MAX_ERRMSGLEN];
char ocfWebLinks[MAX_WEBLINKLEN]; char ocfWebLinks[MAX_WEBLINKLEN];
} ProvResource; } ProvResource;
......
...@@ -61,13 +61,13 @@ extern "C" ...@@ -61,13 +61,13 @@ extern "C"
/** /**
* Easysetup defined resoruce types and uris. * Easysetup defined resoruce types and uris.
*/ */
#define OC_RSRVD_ES_RES_TYPE_PROV "ocf.r.prov" #define OC_RSRVD_ES_RES_TYPE_PROV "ocf.wk.prov"
#define OC_RSRVD_ES_URI_PROV "/.well-known/ocf/prov" #define OC_RSRVD_ES_URI_PROV "/.well-known/ocf/prov"
#define OC_RSRVD_ES_RES_TYPE_WIFI "ocf.r.wifi" #define OC_RSRVD_ES_RES_TYPE_WIFI "ocf.wk.wifi"
#define OC_RSRVD_ES_URI_WIFI "/.well-known/ocf/prov/wifi" #define OC_RSRVD_ES_URI_WIFI "/.well-known/ocf/prov/wifi"
#define OC_RSRVD_ES_RES_TYPE_CLOUDSERVER "ocf.r.cloudserver" #define OC_RSRVD_ES_RES_TYPE_CLOUDSERVER "ocf.wk.cloudserver"
#define OC_RSRVD_ES_URI_CLOUDSERVER "/.well-known/ocf/prov/cloudserver" #define OC_RSRVD_ES_URI_CLOUDSERVER "/.well-known/ocf/prov/cloudserver"
#define OC_RSRVD_ES_RES_TYPE_DEVCONF "ocf.r.devconf" #define OC_RSRVD_ES_RES_TYPE_DEVCONF "ocf.wk.devconf"
#define OC_RSRVD_ES_URI_DEVCONF "/.well-known/ocf/prov/devconf" #define OC_RSRVD_ES_URI_DEVCONF "/.well-known/ocf/prov/devconf"
#define NUM_WIFIMODE 10 #define NUM_WIFIMODE 10
...@@ -75,7 +75,6 @@ extern "C" ...@@ -75,7 +75,6 @@ extern "C"
#define MAX_CREDLEN 20 #define MAX_CREDLEN 20
#define MAX_DEVICELEN 100 #define MAX_DEVICELEN 100
#define MAX_ERRMSGLEN 100
#define MAX_WEBLINKLEN 100 #define MAX_WEBLINKLEN 100
typedef enum typedef enum
...@@ -177,7 +176,12 @@ typedef enum ...@@ -177,7 +176,12 @@ typedef enum
ES_STATE_INIT = 0, ES_STATE_INIT = 0,
/** /**
* Status indicating successful cnnection to target network * Status indicating being cnnecting to target network
*/
ES_STATE_CONNECTING_TO_ENROLLER,
/**
* Status indicating successful conection to target network
*/ */
ES_STATE_CONNECTED_TO_ENROLLER, ES_STATE_CONNECTED_TO_ENROLLER,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment