Skip to content

GitLab

I
iotivity-classic
Commit f0cf4922 authored by Jihun Ha's avatar Jihun Ha Committed by Madan Lanka
Browse files
Options

Add logic to handle GET/POST request with various interface 

Provisioning resource supports Baseline, link-list, batch interface and
each interface expects a different payload format. This patch is to handle
this.

Change-Id: If6513b4442377a3493d80f68bc04050e58f889c7
Signed-off-by: default avatarJihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10865Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
parent d44955e8
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 33 deletions
service/easy-setup/enrollee/src/resourcehandler.c
View file @ f0cf4922
......@@ -52,9 +52,9 @@ OCEntityHandlerResult ProcessGetRequest(OCEntityHandlerRequest *ehRequest, OCRep
OCEntityHandlerResult ProcessPutRequest(OCEntityHandlerRequest *ehRequest, OCRepPayload** payload);
OCEntityHandlerResult ProcessPostRequest(OCEntityHandlerRequest *ehRequest, OCRepPayload** payload);
void updateProvResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input);
void updateWiFiResource(OCRepPayload* input);
void updateCloudResource(OCRepPayload* input);
void updateDevConfResource(OCRepPayload* input);
void updateWiFiResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input);
void updateCloudResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input);
void updateDevConfResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input);
const char *getResult(OCStackResult result);
ESWiFiCB gWifiRsrcEvtCb = NULL;
......@@ -64,6 +64,30 @@ ESDevConfCB gDevConfRsrcEvtCb = NULL;
ESReadUserdataCb gReadUserdataCb = NULL;
ESWriteUserdataCb gWriteUserdataCb = NULL;
bool CompareResourceInterface(char *from, char *iface)
{
char *str = OICStrdup(from);
char *ptr = strtok(str, ";");
do
{
if(strstr(ptr, ".if."))
{
char *if_ptr = NULL;
if_ptr = strtok(ptr, "=");
if_ptr = strtok(NULL, "=");
if(!strcmp(if_ptr, iface))
{
return true;
}
}
} while (ptr = strtok(NULL, ";"));
return false;
}
ESResult SetCallbackForUserData(ESReadUserdataCb readCb, ESWriteUserdataCb writeCb)
{
if(!readCb && !writeCb)
......@@ -246,18 +270,25 @@ void updateProvResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input)
if(ehRequest->query)
{
if(strstr(ehRequest->query, OC_RSRVD_INTERFACE_BATCH))
if(CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_BATCH))
{
// When Provisioning resource has a POST with BatchInterface
updateCloudResource(input);
updateWiFiResource(input);
updateDevConfResource(input);
// When Provisioning resource has a POST with BatchInterface
updateCloudResource(NULL, input);
updateWiFiResource(NULL, input);
updateDevConfResource(NULL, input);
}
}
}
void updateWiFiResource(OCRepPayload* input)
void updateWiFiResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input)
{
if(ehRequest && !CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT))
{
// In case of link list, batch interface
OIC_LOG(ERROR, ES_RH_TAG, "Not supported Interface");
return ;
}
ESWiFiProvData* wiFiData = (ESWiFiProvData*)OICMalloc(sizeof(ESWiFiProvData));
if(wiFiData == NULL)
......@@ -327,8 +358,15 @@ void updateWiFiResource(OCRepPayload* input)
OICFree(wiFiData);
}
void updateCloudResource(OCRepPayload* input)
void updateCloudResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input)
{
if(ehRequest && !CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT))
{
// In case of link list, batch interface
OIC_LOG(ERROR, ES_RH_TAG, "Not supported Interface");
return ;
}
ESCloudProvData* cloudData = (ESCloudProvData*)OICMalloc(sizeof(ESCloudProvData));
if(cloudData == NULL)
......@@ -389,8 +427,15 @@ void updateCloudResource(OCRepPayload* input)
OICFree(cloudData);
}
void updateDevConfResource(OCRepPayload* input)
void updateDevConfResource(OCEntityHandlerRequest* ehRequest, OCRepPayload* input)
{
if(ehRequest && !CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT))
{
// In case of link list, batch interface
OIC_LOG(ERROR, ES_RH_TAG, "Not supported Interface");
return ;
}
ESDevConfProvData* devConfData = (ESDevConfProvData*)OICMalloc(sizeof(ESDevConfProvData));
if(devConfData == NULL)
......@@ -449,8 +494,15 @@ void updateDevConfResource(OCRepPayload* input)
OICFree(devConfData);
}
OCRepPayload* constructResponseOfWiFi()
OCRepPayload* constructResponseOfWiFi(OCEntityHandlerRequest *ehRequest)
{
if(ehRequest && !CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT))
{
// In case of link list, batch interface
OIC_LOG(ERROR, ES_RH_TAG, "Not supported Interface");
return NULL;
}
OCRepPayload* payload = OCRepPayloadCreate();
if (!payload)
{
......@@ -483,8 +535,15 @@ OCRepPayload* constructResponseOfWiFi()
return payload;
}
OCRepPayload* constructResponseOfCloud()
OCRepPayload* constructResponseOfCloud(OCEntityHandlerRequest *ehRequest)
{
if(ehRequest && !CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT))
{
// In case of link list, batch interface
OIC_LOG(ERROR, ES_RH_TAG, "Not supported Interface");
return NULL;
}
OCRepPayload* payload = OCRepPayloadCreate();
if (!payload)
{
......@@ -506,8 +565,15 @@ OCRepPayload* constructResponseOfCloud()
return payload;
}
OCRepPayload* constructResponseOfDevConf()
OCRepPayload* constructResponseOfDevConf(OCEntityHandlerRequest *ehRequest)
{
if(ehRequest && !CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT))
{
// In case of link list, batch interface
OIC_LOG(ERROR, ES_RH_TAG, "Not supported Interface");
return NULL;
}
OCRepPayload* payload = OCRepPayloadCreate();
if (!payload)
{
......@@ -540,11 +606,129 @@ OCRepPayload* constructResponseOfProv(OCEntityHandlerRequest *ehRequest)
return NULL;
}
OIC_LOG(INFO, ES_RH_TAG, "constructResponse prov res");
OCRepPayloadSetUri(payload, OC_RSRVD_ES_URI_PROV);
OCRepPayloadSetPropInt(payload, OC_RSRVD_ES_PROVSTATUS, gProvResource.status);
OCRepPayloadSetPropInt(payload, OC_RSRVD_ES_LAST_ERRORCODE, gProvResource.lastErrCode);
OCRepPayloadSetPropString(payload, OC_RSRVD_ES_LINKS, gProvResource.ocfWebLinks);
// Requested interface is Link list interface
if(ehRequest->query && CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_LL))
{
const OCRepPayload *arrayPayload[3] = {NULL};
int childResCnt = 0;
if(gWiFiResource.handle != NULL)
{
OCRepPayload *add = OCRepPayloadCreate();
if(!add)
{
OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
return NULL;
}
size_t dimensions[MAX_REP_ARRAY_DEPTH] = {1, 0, 0};
char **resourceType = NULL;
resourceType = (char **)OICMalloc(sizeof(char *) * 1);
char **resourceInterface = NULL;
resourceInterface = (char **)OICMalloc(sizeof(char *) * 1);
if(!resourceType || !resourceInterface)
{
OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
return NULL;
}
resourceType[0] = OICStrdup(OC_RSRVD_ES_RES_TYPE_WIFI);
resourceInterface[0] = OICStrdup(OC_RSRVD_INTERFACE_DEFAULT);
add->base.type = PAYLOAD_TYPE_REPRESENTATION;
OCRepPayloadSetPropString(add, OC_RSRVD_HREF, OC_RSRVD_ES_URI_WIFI);
OCRepPayloadSetStringArray(add, OC_RSRVD_RESOURCE_TYPE,
(const char **)resourceType, dimensions);
OCRepPayloadSetStringArray(add, OC_RSRVD_INTERFACE,
(const char **)resourceInterface, dimensions);
arrayPayload[childResCnt++] = add;
}
if(gDevConfResource.handle != NULL)
{
OCRepPayload *add = OCRepPayloadCreate();
if(!add)
{
OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
return NULL;
}
size_t dimensions[MAX_REP_ARRAY_DEPTH] = {1, 0, 0};
char **resourceType = NULL;
resourceType = (char **)OICMalloc(sizeof(char *) * 1);
char **resourceInterface = NULL;
resourceInterface = (char **)OICMalloc(sizeof(char *) * 1);
if(!resourceType || !resourceInterface)
{
OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
return NULL;
}
resourceType[0] = OICStrdup(OC_RSRVD_ES_RES_TYPE_DEVCONF);
resourceInterface[0] = OICStrdup(OC_RSRVD_INTERFACE_DEFAULT);
add->base.type = PAYLOAD_TYPE_REPRESENTATION;
OCRepPayloadSetPropString(add, OC_RSRVD_HREF, OC_RSRVD_ES_URI_DEVCONF);
OCRepPayloadSetStringArray(add, OC_RSRVD_RESOURCE_TYPE,
(const char **)resourceType, dimensions);
OCRepPayloadSetStringArray(add, OC_RSRVD_INTERFACE,
(const char **)resourceInterface, dimensions);
arrayPayload[childResCnt++] = add;
}
if(gCloudResource.handle != NULL)
{
OCRepPayload *add = OCRepPayloadCreate();
if(!add)
{
OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
return NULL;
}
size_t dimensions[MAX_REP_ARRAY_DEPTH] = {1, 0, 0};
char **resourceType = NULL;
resourceType = (char **)OICMalloc(sizeof(char *) * 1);
char **resourceInterface = NULL;
resourceInterface = (char **)OICMalloc(sizeof(char *) * 1);
if(!resourceType || !resourceInterface)
{
OIC_LOG(ERROR, TAG, "Failed to allocate Payload");
return NULL;
}
resourceType[0] = OICStrdup(OC_RSRVD_ES_RES_TYPE_CLOUDSERVER);
resourceInterface[0] = OICStrdup(OC_RSRVD_INTERFACE_DEFAULT);
add->base.type = PAYLOAD_TYPE_REPRESENTATION;
OCRepPayloadSetPropString(add, OC_RSRVD_HREF, OC_RSRVD_ES_URI_CLOUDSERVER);
OCRepPayloadSetStringArray(add, OC_RSRVD_RESOURCE_TYPE,
(const char **)resourceType, dimensions);
OCRepPayloadSetStringArray(add, OC_RSRVD_INTERFACE,
(const char **)resourceInterface, dimensions);
arrayPayload[childResCnt++] = add;
}
size_t dimensions[MAX_REP_ARRAY_DEPTH] = {childResCnt, 0, 0};
OCRepPayloadSetPropObjectArray(payload, OC_RSRVD_ES_LINKS, arrayPayload, dimensions);
return payload;
} else if (!ehRequest->query ||
(ehRequest->query && CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_BATCH)) ||
(ehRequest->query && CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_DEFAULT)))
{
OIC_LOG(INFO, ES_RH_TAG, "constructResponse prov res");
OCRepPayloadSetUri(payload, OC_RSRVD_ES_URI_PROV);
OCRepPayloadSetPropInt(payload, OC_RSRVD_ES_PROVSTATUS, gProvResource.status);
OCRepPayloadSetPropInt(payload, OC_RSRVD_ES_LAST_ERRORCODE, gProvResource.lastErrCode);
OCRepPayloadSetPropString(payload, OC_RSRVD_ES_LINKS, gProvResource.ocfWebLinks);
}
if(gWriteUserdataCb)
{
......@@ -553,26 +737,26 @@ OCRepPayload* constructResponseOfProv(OCEntityHandlerRequest *ehRequest)
if(ehRequest->query)
{
if(strstr(ehRequest->query, OC_RSRVD_INTERFACE_BATCH))
if(CompareResourceInterface(ehRequest->query, OC_RSRVD_INTERFACE_BATCH))
{// When Provisioning resource has a GET with BatchInterface
OCRepPayload* head = payload;
OCRepPayload* nextPayload = NULL;
nextPayload = constructResponseOfWiFi();
nextPayload = constructResponseOfWiFi(NULL);
if(nextPayload != NULL)
{
payload->next = nextPayload;
payload = payload->next;
}
nextPayload = constructResponseOfCloud();
nextPayload = constructResponseOfCloud(NULL);
if(nextPayload != NULL)
{
payload->next = nextPayload;
payload = payload->next;
}
nextPayload = constructResponseOfDevConf();
nextPayload = constructResponseOfDevConf(NULL);
if(nextPayload != NULL)
{
payload->next = nextPayload;
......@@ -769,15 +953,15 @@ OCEntityHandlerResult ProcessGetRequest(OCEntityHandlerRequest *ehRequest, OCRep
}
else if(ehRequest->resource == gWiFiResource.handle)
{
getResp = constructResponseOfWiFi();
getResp = constructResponseOfWiFi(ehRequest);
}
else if(ehRequest->resource == gCloudResource.handle)
{
getResp = constructResponseOfCloud();
getResp = constructResponseOfCloud(ehRequest);
}
else if(ehRequest->resource == gDevConfResource.handle)
{
getResp = constructResponseOfDevConf();
getResp = constructResponseOfDevConf(ehRequest);
}
if (!getResp)
......@@ -815,15 +999,15 @@ OCEntityHandlerResult ProcessPostRequest(OCEntityHandlerRequest *ehRequest, OCRe
}
else if(ehRequest->resource == gWiFiResource.handle)
{
updateWiFiResource(input);
updateWiFiResource(ehRequest, input);
}
else if(ehRequest->resource == gCloudResource.handle)
{
updateCloudResource(input);
updateCloudResource(ehRequest, input);
}
else if(ehRequest->resource == gDevConfResource.handle)
{
updateDevConfResource(input);
updateDevConfResource(ehRequest, input);
}
OCRepPayload *getResp = NULL;
......@@ -833,15 +1017,15 @@ OCEntityHandlerResult ProcessPostRequest(OCEntityHandlerRequest *ehRequest, OCRe
}
else if(ehRequest->resource == gWiFiResource.handle)
{
getResp = constructResponseOfWiFi();
getResp = constructResponseOfWiFi(NULL);
}
else if(ehRequest->resource == gCloudResource.handle)
{
getResp = constructResponseOfCloud();
getResp = constructResponseOfCloud(NULL);
}
else if(ehRequest->resource == gDevConfResource.handle)
{
getResp = constructResponseOfDevConf();
getResp = constructResponseOfDevConf(NULL);
}
if (!getResp)
......@@ -861,7 +1045,7 @@ OCEntityHandlerResult ProcessPutRequest(OCEntityHandlerRequest * ehRequest,
{
(void) ehRequest;
(void) payload;
OCEntityHandlerResult ehResult = OC_EH_ERROR;
OCEntityHandlerResult ehResult = OC_EH_METHOD_NOT_ALLOWED;
return ehResult;
}
......
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