From 06fcd3401c2520059852858d96ba946b16482eeb Mon Sep 17 00:00:00 2001 From: "bg.chun" Date: Wed, 14 Dec 2016 17:41:26 +0900 Subject: [PATCH] [Tizen]change flag which used for detect ip changed change netlink interface flags to addr flags which used for detect network IPv4/6 changed Change-Id: I827db082879aafdc3e8bd688917180af09531ab2 Signed-off-by: bg.chun Reviewed-on: https://gerrit.iotivity.org/gerrit/15595 Reviewed-by: Hyuna Jo Tested-by: jenkins-iotivity Reviewed-by: Phil Coval Reviewed-by: Jaehong Jo Reviewed-by: Dan Mihai Reviewed-by: jihwan seo Reviewed-by: Ashok Babu Channa --- packaging/iotivity.spec | 4 ++++ resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec index 7cf4901..5a0e919 100644 --- a/packaging/iotivity.spec +++ b/packaging/iotivity.spec @@ -27,6 +27,10 @@ Source1002: %{name}-test.manifest %define TARGET_TRANSPORT IP %endif +%if "%{TARGET_OS}" == "tizen" +%define TARGET_TRANSPORT IP +%endif + %define JOB "-j4" %if 0%{?speedpython} %define JOB %{?_smp_mflags} diff --git a/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c b/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c index 4b16863..5fbdc3a 100644 --- a/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c +++ b/resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c @@ -164,13 +164,12 @@ u_arraylist_t *CAFindInterfaceChange() for (struct nlmsghdr *nh = (struct nlmsghdr *)buf; NLMSG_OK(nh, len); nh = NLMSG_NEXT(nh, len)) { - if (nh != NULL && nh->nlmsg_type != RTM_NEWLINK) + if (nh != NULL && (nh->nlmsg_type != RTM_DELADDR && nh->nlmsg_type != RTM_NEWADDR)) { continue; } struct ifinfomsg *ifi = (struct ifinfomsg *)NLMSG_DATA(nh); - - if ((!ifi || (ifi->ifi_flags & IFF_LOOPBACK) || !(ifi->ifi_flags & IFF_RUNNING))) + if (!ifi) { continue; } @@ -178,7 +177,6 @@ u_arraylist_t *CAFindInterfaceChange() int ifiIndex = ifi->ifi_index; iflist = CAIPGetInterfaceInformation(ifiIndex); - if (!iflist) { OIC_LOG_V(ERROR, TAG, "get interface info failed: %s", strerror(errno)); -- 2.7.4