From 5c93577b1ecdfe017ae51a7a3cc239245d300250 Mon Sep 17 00:00:00 2001 From: "hyuna0213.jo" Date: Thu, 6 Apr 2017 19:25:40 +0900 Subject: [PATCH] Support secure network info in CAGetNetworkInformation Secured network interface information should be provided Change-Id: I65fe446d84ed67e00486782901b8b9f07f47c32c Signed-off-by: hyuna0213.jo Reviewed-on: https://gerrit.iotivity.org/gerrit/18565 Tested-by: jenkins-iotivity Reviewed-by: Ziran Sun --- .../connectivity/src/tcp_adapter/catcpserver.c | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c index 22d3b5d..da65231 100644 --- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c +++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c @@ -1314,6 +1314,11 @@ CAResult_t CAGetTCPInterfaceInformation(CAEndpoint_t **info, size_t *size) } size_t len = u_arraylist_length(iflist); + size_t length = len; + +#ifdef __WITH_TLS__ + length = len * 2; +#endif CAEndpoint_t *ep = (CAEndpoint_t *)OICCalloc(len, sizeof (CAEndpoint_t)); if (!ep) @@ -1349,6 +1354,25 @@ CAResult_t CAGetTCPInterfaceInformation(CAEndpoint_t **info, size_t *size) continue; } OICStrcpy(ep[j].addr, sizeof(ep[j].addr), ifitem->addr); + +#ifdef __WITH_TLS__ + j++; + + ep[j].adapter = CA_ADAPTER_TCP; + ep[j].ifindex = ifitem->index; + + if (ifitem->family == AF_INET6) + { + ep[j].flags = CA_IPV6 | CA_SECURE; + ep[j].port = caglobals.tcp.ipv6s.port; + } + else + { + ep[j].flags = CA_IPV4 | CA_SECURE; + ep[j].port = caglobals.tcp.ipv4s.port; + } + OICStrcpy(ep[j].addr, sizeof(ep[j].addr), ifitem->addr); +#endif j++; } -- 2.7.4