Fix for request to secure resource server.

When send to discovered secure resource server,
client should change port to secure channel port.
But, it is not apply at notification consumer service.
In this patch, when discover secure notification resource
consumer service will send request with changed port for secure.

Change-Id: Ib8101753be76996fa4978d7714e8cf474278f771
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12561
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 2cb04ce3be4473203e253258b526ca903cdcfba2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12619

diff --git a/service/notification/src/consumer/NSConsumerDiscovery.c b/service/notification/src/consumer/NSConsumerDiscovery.c
index 44c6a19..a812d34 100644 (file)
--- a/service/notification/src/consumer/NSConsumerDiscovery.c
+++ b/service/notification/src/consumer/NSConsumerDiscovery.c
@@ -125,7 +125,14 @@ OCStackApplicationResult NSProviderDiscoverListener(
                 type = CT_ADAPTER_TCP;
             }
 
-            NSInvokeRequest(NULL, OC_REST_GET, clientResponse->addr,
+            OCDevAddr * addr = clientResponse->addr;
+            if (resource->secure)
+            {
+                addr->port = resource->port;
+                addr->flags |= OC_FLAG_SECURE;
+            }
+
+            NSInvokeRequest(NULL, OC_REST_GET, addr,
                     resource->uri, NULL, NSIntrospectProvider, ctx,
                     type);
         }