From: Joseph Morrow <joseph.l.morrow@intel.com>
Date: Thu, 10 Dec 2015 01:22:12 +0000 (-0800)
Subject: Propagate NodeId change to upper layer.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61ad8d7114f69f3a0af8e49a61098637c491f8f4;p=contrib%2Fiotivity.git

Propagate NodeId change to upper layer.

Change-Id: I741889380b0798cadbbad6014639dfec19926b27
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
---

diff --git a/plugins/zigbee_wrapper/telegesis_wrapper/include/telegesis_wrapper.h b/plugins/zigbee_wrapper/telegesis_wrapper/include/telegesis_wrapper.h
index eea7128..72c894e 100644
--- a/plugins/zigbee_wrapper/telegesis_wrapper/include/telegesis_wrapper.h
+++ b/plugins/zigbee_wrapper/telegesis_wrapper/include/telegesis_wrapper.h
@@ -132,7 +132,7 @@ typedef struct
 typedef void (*TWDeviceFoundCallback)(TWDevice* device);
 typedef void (*TWEnrollmentSucceedCallback)(TWEnrollee* enrollee);
 typedef void (*TWDeviceStatusUpdateCallback)(TWUpdate* update);
-typedef void (*TWInitCompleteCallback)(bool status);
+typedef void (*TWDeviceNodeIdChangedCallback)(const char* eui, const char* nodeId);
 
 /**
  *
@@ -247,6 +247,15 @@ OCStackResult TWColorMoveToColorTemperature(char* nodeId, char* endpointId,
  *
  */
 OCStackResult TWSetDiscoveryCallback(const TWDeviceFoundCallback callback);
+
+/**
+ *
+ * Sets end device's nodeId changed callback.
+ * This callback will be called when there is a NodeId change for a remote ZigBee device.
+ *
+ */
+OCStackResult TWSetEndDeviceNodeIdChangedCallback(TWDeviceNodeIdChangedCallback callback);
+
 /**
  *
  * Sets status update callback.
diff --git a/plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c b/plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c
index d34cfa3..e582047 100644
--- a/plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c
+++ b/plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c
@@ -215,6 +215,7 @@ static TWDevice* g_WIPDevice = NULL;
 static TWDeviceFoundCallback g_DeviceFoundCallback = NULL;
 static TWEnrollmentSucceedCallback g_EnrollmentSucceedCallback = NULL;
 static TWDeviceStatusUpdateCallback g_DeviceStatusUpdateCallback = NULL;
+static TWDeviceNodeIdChangedCallback g_EndDeviceNodeIdChangedCallback = NULL;
 
 /*****************************************************************************/
 /*                                                                           */
@@ -833,6 +834,22 @@ OCStackResult TWSetDiscoveryCallback(const TWDeviceFoundCallback callback)
     return OC_STACK_OK;
 }
 
+OCStackResult TWSetEndDeviceNodeIdChangedCallback(TWDeviceNodeIdChangedCallback callback)
+{
+    OC_LOG(INFO, TAG, "Enter TWSetEndDeviceNodeIdChangedCallback()");
+    if (callback != NULL)
+    {
+        g_EndDeviceNodeIdChangedCallback= callback;
+    }
+    else
+    {
+        g_EndDeviceNodeIdChangedCallback = NULL;
+    }
+
+    OC_LOG(INFO, TAG, "Leave TWSetEndDeviceNodeIdChangedCallback() with ret=OC_STACK_OK");
+    return OC_STACK_OK;
+}
+
 OCStackResult TWSetStatusUpdateCallback(TWDeviceStatusUpdateCallback callback)
 {
     OC_LOG(INFO, TAG, "Enter TWSetStatusUpdateCallback()");
@@ -2383,8 +2400,6 @@ exit:
     return ret;
 }
 
-
-
 TWResultCode TelWriteAttrHandler(int count, char* tokens[])
 {
     //AT+WRITEATR:3A3D,01,0,0003,0000,21,00