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
/
routing
/
src
/
routingmanager.c
diff --git
a/resource/csdk/routing/src/routingmanager.c
b/resource/csdk/routing/src/routingmanager.c
index
23618d5
..
9f87d2f
100644
(file)
--- a/
resource/csdk/routing/src/routingmanager.c
+++ b/
resource/csdk/routing/src/routingmanager.c
@@
-46,7
+46,7
@@
/**
* Unique gateway ID generated before hosting a gateway resource.
*/
/**
* Unique gateway ID generated before hosting a gateway resource.
*/
-uint32_t g_GatewayID = 0;
+
static
uint32_t g_GatewayID = 0;
/**
* Used for assigning unique ID.to endpoint's connected to this gateway
/**
* Used for assigning unique ID.to endpoint's connected to this gateway
@@
-1143,6
+1143,7
@@
rewriteandexit:
}
responseMessage.info.messageId = info->messageId;
}
responseMessage.info.messageId = info->messageId;
+ responseMessage.info.dataType = CA_RESPONSE_DATA;
CAResult_t caRes = CASendResponse(&nextHop, &responseMessage);
if (CA_STATUS_OK != caRes)
CAResult_t caRes = CASendResponse(&nextHop, &responseMessage);
if (CA_STATUS_OK != caRes)
@@
-1170,6
+1171,7
@@
rewriteandexit:
if(isRequest)
{
CARequestInfo_t *msg = message;
if(isRequest)
{
CARequestInfo_t *msg = message;
+ msg->info.dataType = CA_REQUEST_DATA;
CAResult_t caRes = CASendRequest(&nextHop, msg);
if (CA_STATUS_OK != caRes)
{
CAResult_t caRes = CASendRequest(&nextHop, msg);
if (CA_STATUS_OK != caRes)
{
@@
-1189,6
+1191,7
@@
rewriteandexit:
else
{
CAResponseInfo_t *msg = message;
else
{
CAResponseInfo_t *msg = message;
+ msg->info.dataType = CA_RESPONSE_DATA;
CAResult_t caRes = CASendResponse(&nextHop, msg);
if (CA_STATUS_OK != caRes)
{
CAResult_t caRes = CASendResponse(&nextHop, msg);
if (CA_STATUS_OK != caRes)
{
@@
-1241,7
+1244,7
@@
OCStackResult RMHandleRequest(CARequestInfo_t *message, const CAEndpoint_t *send
{
if (!g_isRMInitialized)
{
{
if (!g_isRMInitialized)
{
- OIC_LOG(
ERROR
, TAG, "RM not initialized");
+ OIC_LOG(
INFO
, TAG, "RM not initialized");
*selfDestination = true;
return OC_STACK_OK;
}
*selfDestination = true;
return OC_STACK_OK;
}
@@
-1254,7
+1257,7
@@
OCStackResult RMHandleResponse(CAResponseInfo_t *message, const CAEndpoint_t *se
{
if (!g_isRMInitialized)
{
{
if (!g_isRMInitialized)
{
- OIC_LOG(
ERROR
, TAG, "RM not initialized");
+ OIC_LOG(
INFO
, TAG, "RM not initialized");
*selfDestination = true;
return OC_STACK_OK;
}
*selfDestination = true;
return OC_STACK_OK;
}