Disable auto-discovery of NSProvider over TCP.

[platform/upstream/iotivity.git] / service / notification / src / consumer / NSConsumerNetworkEventListener.c

diff --git a/service/notification/src/consumer/NSConsumerNetworkEventListener.c b/service/notification/src/consumer/NSConsumerNetworkEventListener.c
index 82ccd24..078b6a5 100644 (file)
--- a/service/notification/src/consumer/NSConsumerNetworkEventListener.c
+++ b/service/notification/src/consumer/NSConsumerNetworkEventListener.c
@@ -25,11 +25,12 @@
 #include "NSConsumerCommon.h"
 #include "cautilinterface.h"
 #include "oic_malloc.h"
+#include "oic_string.h"
 
 #include "NSConsumerDiscovery.h"
 #include "NSConsumerNetworkEventListener.h"
 
-#define NS_PRESENCE_SUBSCRIBE_QUERY "/oic/ad?rt=oic.r.notification"
+#define NS_PRESENCE_SUBSCRIBE_QUERY "/oic/ad?rt=x.org.iotivity.notification"
 
 void NSConnectionStateListener(const CAEndpoint_t * info, bool isConnected);
 
@@ -52,17 +53,18 @@ NSResult NSConsumerListenerInit()
 //    {
 //        return NS_ERROR;
 //    }
-
+    OCStackResult stackResult;
+#ifdef WITH_PRESENCE
     NS_LOG(DEBUG, "Request to subscribe presence");
-    OCStackResult stackResult = NSInvokeRequest(getPresenceHandle(), OC_REST_PRESENCE, NULL,
+    stackResult = NSInvokeRequest(getPresenceHandle(), OC_REST_PRESENCE, NULL,
                         NS_PRESENCE_SUBSCRIBE_QUERY, NULL, NSConsumerPresenceListener,
-                        NULL, CT_DEFAULT);
+                        NULL, NULL, CT_DEFAULT);
     NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(stackResult), NS_ERROR);
-
+#endif
     NS_LOG(DEBUG, "Request to discover provider");
     stackResult = NSInvokeRequest(NULL, OC_REST_DISCOVER, NULL,
                       NS_DISCOVER_QUERY, NULL, NSProviderDiscoverListener,
-                      NULL, CT_DEFAULT);
+                      NULL, NULL, CT_DEFAULT);
     NS_VERIFY_STACK_SUCCESS(NSOCResultToSuccess(stackResult), NS_ERROR);
 
     return NS_OK;
@@ -70,7 +72,7 @@ NSResult NSConsumerListenerInit()
 
 void NSConsumerListenerTermiate()
 {
-    CARegisterNetworkMonitorHandler(NULL, NULL);
+    CAUnregisterNetworkMonitorHandler(NSAdapterStateListener, NSConnectionStateListener);
     OCCancel(*getPresenceHandle(), NS_QOS, NULL, 0);
 }
 
@@ -79,9 +81,17 @@ void NSConnectionStateListener(const CAEndpoint_t * info, bool connected)
     NS_VERIFY_NOT_NULL_V(info);
 
     NS_LOG_V(DEBUG, "adapter : %d", info->adapter);
-    NS_LOG_V(DEBUG, "remote_address : %s:%d", info->addr, info->port);
+    NS_LOG_V(INFO_PRIVATE, "remote_address : %s:%d", info->addr, info->port);
     NS_LOG_V(DEBUG, "isConnect : %d", connected);
 
+#ifdef DISABLE_AUTO_TCP_NSPROVIDER_DISCOVERY
+    if (info->adapter == CA_ADAPTER_TCP)
+    {
+        NS_LOG(DEBUG, "Ignoring the TCP event.");
+        return;
+    }
+#endif
+
     NSTaskType type = TASK_EVENT_CONNECTED;
     OCDevAddr * addr = NULL;
     if (connected)
@@ -90,16 +100,21 @@ void NSConnectionStateListener(const CAEndpoint_t * info, bool connected)
         {
             type = TASK_EVENT_CONNECTED_TCP;
             NS_LOG(DEBUG, "try to discover notification provider : TCP.");
-            // TODO convet to OCDevAddr;
-            // addr = .....
         }
         else if (info->adapter == CA_ADAPTER_IP)
         {
-            NS_LOG(DEBUG, "try to discover notification provider.");
-            // TODO convet to OCDevAddr;
-            // addr = .....
+            NS_LOG(DEBUG, "try to discover notification provider : IP.");
         }
 
+        addr = (OCDevAddr *)OICMalloc(sizeof(OCDevAddr));
+        NS_VERIFY_NOT_NULL_V(addr);
+
+        addr->adapter = (OCTransportAdapter) info->adapter;
+        OICStrcpy(addr->addr, MAX_ADDR_STR_SIZE, info->addr);
+        addr->flags = info->flags;
+        addr->ifindex = info->ifindex;
+        addr->port = info->port;
+
         NSTask * task = NSMakeTask(type, addr);
         NS_VERIFY_NOT_NULL_WITH_POST_CLEANING_V(task, NSOICFree(addr));