replace the name related device ID with remoteId for some structures

Change-Id: Id358652f3616f9f4eb7065097cf2225c0d803e6b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15735
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h
index 629e660..e3ef022 100755 (executable)
--- a/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@ -290,7 +290,7 @@ typedef struct
     uint16_t                port;       // for IP
     char                    addr[MAX_ADDR_STR_SIZE_CA]; // address for all
     uint32_t                ifindex;    // usually zero for default interface
-    char                    deviceId[CA_MAX_IDENTITY_SIZE]; // device ID of remote device
+    char                    remoteId[CA_MAX_IDENTITY_SIZE]; // device ID of remote device
 #if defined (ROUTING_GATEWAY) || defined (ROUTING_EP)
     char                    routeData[MAX_ADDR_STR_SIZE_CA]; /**< GatewayId:ClientId of
                                                                     destination. **/

diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c
index c10a5aa..070cdcb 100644 (file)
--- a/resource/csdk/connectivity/src/camessagehandler.c
+++ b/resource/csdk/connectivity/src/camessagehandler.c
@@ -991,7 +991,7 @@ CAResult_t CADetachSendMessage(const CAEndpoint_t *endpoint, const void *sendMsg
         return CA_MEMORY_ALLOC_FAILED;
     }
 
-    OIC_LOG_V(DEBUG, TAG, "device ID of endpoint of this message is %s", endpoint->deviceId);
+    OIC_LOG_V(DEBUG, TAG, "device ID of endpoint of this message is %s", endpoint->remoteId);
 
 #ifdef SINGLE_THREAD
     CAResult_t result = CAProcessSendData(data);

diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h
index b99bbdc..5c03601 100755 (executable)
--- a/resource/csdk/stack/include/octypes.h
+++ b/resource/csdk/stack/include/octypes.h
@@ -715,8 +715,8 @@ typedef struct
     /** destination GatewayID:ClientId.*/
     char                    routeData[MAX_ADDR_STR_SIZE];
 
-    /** destination DeviceID.*/
-    char                    deviceId[MAX_IDENTITY_SIZE];
+    /** device ID of remote.*/
+    char                    remoteId[MAX_IDENTITY_SIZE];
 
 } OCDevAddr;
 

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 19f310d..ea76bec 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -485,7 +485,7 @@ void CopyDevAddrToEndpoint(const OCDevAddr *in, CAEndpoint_t *out)
     out->adapter = (CATransportAdapter_t)in->adapter;
     out->flags = OCToCATransportFlags(in->flags);
     OICStrcpy(out->addr, sizeof(out->addr), in->addr);
-    OICStrcpy(out->deviceId, sizeof(out->deviceId), in->deviceId);
+    OICStrcpy(out->remoteId, sizeof(out->remoteId), in->remoteId);
 #if defined (ROUTING_GATEWAY) || defined (ROUTING_EP)
     /* This assert is to prevent accidental mismatch between address size macros defined in
      * RI and CA and cause crash here. */
@@ -1468,7 +1468,7 @@ void OCHandleResponse(const CAEndpoint_t* endPoint, const CAResponseInfo_t* resp
                     OCUpdateResourceInsWithResponse(cbNode->requestUri, &response);
                 }
 #endif
-                // set deviceId into OCClientResponse callback parameter
+                // set remoteID(device ID) into OCClientResponse callback parameter
                 if (OC_REST_DISCOVER == cbNode->method)
                 {
                     OCDiscoveryPayload *payload = (OCDiscoveryPayload*) response.payload;
@@ -1478,10 +1478,10 @@ void OCHandleResponse(const CAEndpoint_t* endPoint, const CAResponseInfo_t* resp
                         return;
                     }
 
-                    OICStrcpy(response.devAddr.deviceId, sizeof(response.devAddr.deviceId),
+                    OICStrcpy(response.devAddr.remoteId, sizeof(response.devAddr.remoteId),
                               payload->sid);
                     OIC_LOG_V(INFO, TAG, "Device ID of response : %s",
-                              response.devAddr.deviceId);
+                              response.devAddr.remoteId);
                 }
 
                 OCStackApplicationResult appFeedback = cbNode->callBack(cbNode->context,
@@ -2767,7 +2767,7 @@ OCStackResult OCDoResource(OCDoHandle *handle,
 
     if (devAddr)
     {
-        OIC_LOG_V(DEBUG, TAG, "DeviceID of devAddr : %s", devAddr->deviceId);
+        OIC_LOG_V(DEBUG, TAG, "remoteId of devAddr : %s", devAddr->remoteId);
     }
 
     resHandle = GenerateInvocationHandle();