[connman] Added Tizen Wi-Fi Mesh

[platform/upstream/connman.git] / src / rtnl.c

diff --git a/src/rtnl.c b/src/rtnl.c
old mode 100755 (executable)
new mode 100644 (file)
index b7d7f37..d733288
--- a/src/rtnl.c
+++ b/src/rtnl.c
@@ -159,6 +159,7 @@ static void read_uevent(struct interface_data *interface)
        if (__connman_rtnl_is_cellular_device(name)) {
                interface->service_type = CONNMAN_SERVICE_TYPE_CELLULAR;
                interface->device_type = CONNMAN_DEVICE_TYPE_CELLULAR;
+               g_free(name);
                return;
        }
 #endif
@@ -212,7 +213,9 @@ static void read_uevent(struct interface_data *interface)
                } else if (strcmp(line + 8, "vlan") == 0) {
                        interface->service_type = CONNMAN_SERVICE_TYPE_ETHERNET;
                        interface->device_type = CONNMAN_DEVICE_TYPE_ETHERNET;
-
+               } else if (strcmp(line + 8, "bond") == 0) {
+                       interface->service_type = CONNMAN_SERVICE_TYPE_ETHERNET;
+                       interface->device_type = CONNMAN_DEVICE_TYPE_ETHERNET;
                } else {
                        interface->service_type = CONNMAN_SERVICE_TYPE_UNKNOWN;
                        interface->device_type = CONNMAN_DEVICE_TYPE_UNKNOWN;
@@ -459,6 +462,20 @@ static void process_newlink(unsigned short type, int index, unsigned flags,
        if (!extract_link(msg, bytes, &address, &ifname, &mtu, &operstate, &stats))
                return;
 
+#if defined TIZEN_EXT_WIFI_MESH
+       /* Do not accept Wi-Fi Mesh interface */
+       if (g_strrstr(ifname, "mesh") != NULL) {
+               DBG("Newlink event for Wi-Fi Mesh interface ignored");
+               return;
+       }
+
+       /* Do not accept Wi-Fi WLAN1 interface "dedicated for softAP */
+       if (!g_strcmp0(ifname, "wlan1")) {
+               DBG("Newlink event for Wi-Fi WLAN1 interface ignored");
+               return;
+       }
+#endif
+
 #if defined TIZEN_EXT
        /* Do not accept Wi-Fi P2P interface */
        if (g_strrstr(ifname, "p2p") != NULL) {
@@ -551,7 +568,9 @@ static void process_newlink(unsigned short type, int index, unsigned flags,
 
                interface = NULL;
 #endif
-       } else
+       } else if (type == ARPHRD_ETHER && interface->device_type == CONNMAN_DEVICE_TYPE_UNKNOWN)
+               read_uevent(interface);
+       else
                interface = NULL;
 
        for (list = rtnl_list; list; list = list->next) {
@@ -1316,30 +1335,33 @@ static void rtnl_newnduseropt(struct nlmsghdr *hdr)
 
 #if defined TIZEN_EXT
        struct connman_service *service;
+       enum connman_service_state state;
        enum connman_dnsconfig_method ipv6_dns_method;
-       char *ifname;
 
        service = __connman_service_lookup_from_index(index);
-       if (!service || !(__connman_service_index_is_default(index))) {
-               DBG("Invalid service, index: %d\n", index);
+       if (!service) {
+               DBG("Invalid service");
                return;
        }
 
        DBG("service: %p index: %d\n", service, index);
 
-       ifname = connman_inet_ifname(index);
-       if (ifname == NULL) {
-               DBG("Interface is NULL, return");
-               return;
+       if (connman_setting_get_bool("SingleConnectedTechnology") == TRUE) {
+               state = __connman_service_ipconfig_get_state(service, CONNMAN_IPCONFIG_TYPE_IPV6);
+               if (state != CONNMAN_SERVICE_STATE_ASSOCIATION &&
+                               state != CONNMAN_SERVICE_STATE_CONFIGURATION &&
+                               state != CONNMAN_SERVICE_STATE_READY &&
+                               state != CONNMAN_SERVICE_STATE_ONLINE) {
+                       DBG("Service state[%d] is not connecting/connected", state);
+                       return;
+               }
        }
 
        ipv6_dns_method = connman_service_get_ipv6_dns_method(service);
        if (ipv6_dns_method != CONNMAN_DNSCONFIG_METHOD_DHCP) {
                DBG("IPv6 DNS method is not Auto ignore RA!!! [DNS method: %d]", ipv6_dns_method);
-               g_free(ifname);
                return;
        }
-       g_free(ifname);
 #endif
 
        for (opt = (void *)&msg[1];
@@ -1352,7 +1374,12 @@ static void rtnl_newnduseropt(struct nlmsghdr *hdr)
 
                if (opt->nd_opt_type == 25) { /* ND_OPT_RDNSS */
                        char buf[40];
+#if defined TIZEN_EXT
+                       struct connman_service *service;
 
+                       service = __connman_service_lookup_from_index(index);
+                       DBG("service: %p\n",service);
+#endif
                        servers = rtnl_nd_opt_rdnss(opt, &lifetime,
                                        &nr_servers);
                        for (i = 0; i < nr_servers; i++) {
@@ -1371,6 +1398,7 @@ static void rtnl_newnduseropt(struct nlmsghdr *hdr)
                                connman_resolver_append_lifetime(index,
                                                NULL, buf, lifetime);
                        }
+
                } else if (opt->nd_opt_type == 31) { /* ND_OPT_DNSSL */
                        g_free(domains);
 
@@ -1496,8 +1524,6 @@ static int process_response(guint32 seq)
 
 static void rtnl_message(void *buf, size_t len)
 {
-       DBG("buf %p len %zd", buf, len);
-
        while (len > 0) {
                struct nlmsghdr *hdr = buf;
                struct nlmsgerr *err;