projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
stack
/
src
/
ocserverrequest.c
diff --git
a/resource/csdk/stack/src/ocserverrequest.c
b/resource/csdk/stack/src/ocserverrequest.c
index
39290d3
..
46afb69
100644
(file)
--- a/
resource/csdk/stack/src/ocserverrequest.c
+++ b/
resource/csdk/stack/src/ocserverrequest.c
@@
-211,7
+211,7
@@
OCServerRequest * GetServerRequestUsingToken (const CAToken_t token, uint8_t tok
return out;
}
}
return out;
}
}
- OIC_LOG(
ERROR
, TAG, "Server Request not found!!");
+ OIC_LOG(
INFO
, TAG, "Server Request not found!!");
return NULL;
}
return NULL;
}
@@
-254,7
+254,7
@@
OCServerResponse * GetServerResponseUsingHandle (const OCRequestHandle handle)
return out;
}
}
return out;
}
}
- OIC_LOG(
ERROR
, TAG, "Server Response not found!!");
+ OIC_LOG(
INFO
, TAG, "Server Response not found!!");
return NULL;
}
return NULL;
}
@@
-480,9
+480,21
@@
CAResponseResult_t ConvertEHResultToCAResult (OCEntityHandlerResult result, OCMe
case OC_EH_INTERNAL_SERVER_ERROR: // 5.00
caResult = CA_INTERNAL_SERVER_ERROR;
break;
case OC_EH_INTERNAL_SERVER_ERROR: // 5.00
caResult = CA_INTERNAL_SERVER_ERROR;
break;
+ case OC_EH_NOT_IMPLEMENTED: // 5.01
+ caResult = CA_NOT_IMPLEMENTED;
+ break;
+ case OC_EH_BAD_GATEWAY: // 5.02
+ caResult = CA_BAD_GATEWAY;
+ break;
+ case OC_EH_SERVICE_UNAVAILABLE: // 5.03
+ caResult = CA_SERVICE_UNAVAILABLE;
+ break;
case OC_EH_RETRANSMIT_TIMEOUT: // 5.04
caResult = CA_RETRANSMIT_TIMEOUT;
break;
case OC_EH_RETRANSMIT_TIMEOUT: // 5.04
caResult = CA_RETRANSMIT_TIMEOUT;
break;
+ case OC_EH_PROXY_NOT_SUPPORTED: // 5.05
+ caResult = CA_PROXY_NOT_SUPPORTED;
+ break;
default:
caResult = CA_BAD_REQ;
break;
default:
caResult = CA_BAD_REQ;
break;
@@
-627,11
+639,13
@@
OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse)
// Put the JSON prefix and suffix around the payload
if(ehResponse->payload)
{
// Put the JSON prefix and suffix around the payload
if(ehResponse->payload)
{
+#ifdef WITH_PRESENCE
if (ehResponse->payload->type == PAYLOAD_TYPE_PRESENCE)
{
responseInfo.isMulticast = true;
}
else
if (ehResponse->payload->type == PAYLOAD_TYPE_PRESENCE)
{
responseInfo.isMulticast = true;
}
else
+#endif
{
responseInfo.isMulticast = false;
}
{
responseInfo.isMulticast = false;
}