Factorize host route setting routine

[framework/connectivity/connman.git] / src / inet.c

diff --git a/src/inet.c b/src/inet.c
index c31c8bb..cfb7f92 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -318,7 +318,7 @@ static char *index2ident(int index, const char *prefix)
        return str;
 }
 
-connman_bool_t connman_inet_is_mac80211(int index)
+connman_bool_t connman_inet_is_cfg80211(int index)
 {
        connman_bool_t result = FALSE;
        char phy80211_path[PATH_MAX];
@@ -375,7 +375,6 @@ enum connman_device_type __connman_inet_get_device_type(int index)
                char wimax_path[PATH_MAX];
                struct stat st;
                struct iwreq iwr;
-               char *devnode;
 
                snprintf(phy80211_path, PATH_MAX,
                                        "/sys/class/net/%s/phy80211", devname);
@@ -389,13 +388,6 @@ enum connman_device_type __connman_inet_get_device_type(int index)
                memset(&iwr, 0, sizeof(iwr));
                strncpy(iwr.ifr_ifrn.ifrn_name, devname, IFNAMSIZ);
 
-               devnode = __connman_udev_get_mbm_devnode(devname);
-               if (devnode != NULL) {
-                       devtype = CONNMAN_DEVICE_TYPE_MBM;
-                       g_free(devnode);
-                       goto done;
-               }
-
                if (g_str_has_prefix(devname, "vmnet") == TRUE)
                        devtype = CONNMAN_DEVICE_TYPE_UNKNOWN;
                else if (g_str_has_prefix(ifr.ifr_name, "vboxnet") == TRUE)
@@ -416,9 +408,6 @@ enum connman_device_type __connman_inet_get_device_type(int index)
                        devtype = CONNMAN_DEVICE_TYPE_WIFI;
                else
                        devtype = CONNMAN_DEVICE_TYPE_ETHERNET;
-       } else if (type == ARPHRD_NONE) {
-               if (g_str_has_prefix(devname, "hso") == TRUE)
-                       devtype = CONNMAN_DEVICE_TYPE_HSO;
        }
 
 done:
@@ -465,15 +454,9 @@ struct connman_device *connman_inet_create_device(int index)
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_GPS:
-       case CONNMAN_DEVICE_TYPE_HSO:
        case CONNMAN_DEVICE_TYPE_VENDOR:
                name = strdup(devname);
                break;
-       case CONNMAN_DEVICE_TYPE_MBM:
-               name = index2ident(index, "");
-               addr = index2addr(index);
-               node = __connman_udev_get_mbm_devnode(devname);
-               break;
        }
 
        device = connman_device_create(name, type);
@@ -499,8 +482,6 @@ struct connman_device *connman_inet_create_device(int index)
                mode = CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE;
                break;
        case CONNMAN_DEVICE_TYPE_CELLULAR:
-       case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
                ident = index2ident(index, NULL);
                break;
@@ -547,6 +528,11 @@ int connman_inet_set_address(int index, struct connman_ipaddress *ipaddress)
 
        DBG("ifname %s", ifr.ifr_name);
 
+       if (ipaddress->local == NULL) {
+               close(sk);
+               return -1;
+       }
+
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_addr.s_addr = inet_addr(ipaddress->local);
@@ -569,7 +555,13 @@ int connman_inet_set_address(int index, struct connman_ipaddress *ipaddress)
 
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
-       addr.sin_addr.s_addr = inet_addr(ipaddress->broadcast);
+
+       if (ipaddress->broadcast != NULL)
+               addr.sin_addr.s_addr = inet_addr(ipaddress->broadcast);
+       else
+               addr.sin_addr.s_addr = inet_addr(ipaddress->local) |
+                               htonl(0xfffffffflu >> ipaddress->prefixlen);
+
        memcpy(&ifr.ifr_broadaddr, &addr, sizeof(ifr.ifr_broadaddr));
 
        err = ioctl(sk, SIOCSIFBRDADDR, &ifr);
@@ -620,7 +612,7 @@ int connman_inet_clear_address(int index)
        return 0;
 }
 
-int connman_inet_add_host_route(int index, const char *host)
+int connman_inet_add_host_route(int index, const char *host, const char *gateway)
 {
        struct ifreq ifr;
        struct rtentry rt;
@@ -643,6 +635,8 @@ int connman_inet_add_host_route(int index, const char *host)
 
        memset(&rt, 0, sizeof(rt));
        rt.rt_flags = RTF_UP | RTF_HOST;
+       if (gateway != NULL)
+               rt.rt_flags |= RTF_GATEWAY;
 
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
@@ -651,7 +645,10 @@ int connman_inet_add_host_route(int index, const char *host)
 
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
-       addr.sin_addr.s_addr = INADDR_ANY;
+       if (gateway != NULL)
+               addr.sin_addr.s_addr = inet_addr(gateway);
+       else
+               addr.sin_addr.s_addr = INADDR_ANY;
        memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway));
 
        memset(&addr, 0, sizeof(addr));
@@ -785,24 +782,117 @@ int connman_inet_set_gateway_interface(int index)
        DBG("ifname %s", ifr.ifr_name);
 
        memset(&rt, 0, sizeof(rt));
+       rt.rt_flags = RTF_UP;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = INADDR_ANY;
+
+       memcpy(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask));
+       memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
+       memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway));
 
        rt.rt_dev = ifr.ifr_name;
 
-       rt.rt_flags = RTF_UP;
+       err = ioctl(sk, SIOCADDRT, &rt);
+       if (err < 0)
+               connman_error("Setting default interface route failed (%s)",
+                                                       strerror(errno));
+       close(sk);
+
+       return err;
+}
+
+int connman_inet_clear_gateway_address(int index, const char *gateway)
+{
+       struct ifreq ifr;
+       struct rtentry rt;
+       struct sockaddr_in addr;
+       int sk, err;
+
+       DBG("");
+
+       sk = socket(PF_INET, SOCK_DGRAM, 0);
+       if (sk < 0)
+               return -1;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = index;
+
+       if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       DBG("ifname %s", ifr.ifr_name);
+
+       memset(&rt, 0, sizeof(rt));
+       rt.rt_flags = RTF_UP | RTF_GATEWAY;
 
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_addr.s_addr = INADDR_ANY;
+       memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = inet_addr(gateway);
+       memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway));
 
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = INADDR_ANY;
        memcpy(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask));
 
-       memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
+       err = ioctl(sk, SIOCDELRT, &rt);
+       if (err < 0)
+               connman_error("Removing default gateway route failed (%s)",
+                                                       strerror(errno));
 
+       close(sk);
+
+       return err;
+}
+
+int connman_inet_clear_gateway_interface(int index)
+{
+       struct ifreq ifr;
+       struct rtentry rt;
+       struct sockaddr_in addr;
+       int sk, err;
+
+       DBG("");
+
+       sk = socket(PF_INET, SOCK_DGRAM, 0);
+       if (sk < 0)
+               return -1;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = index;
+
+       if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       DBG("ifname %s", ifr.ifr_name);
+
+       memset(&rt, 0, sizeof(rt));
+       rt.rt_flags = RTF_UP;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = INADDR_ANY;
+
+       memcpy(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask));
+       memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
        memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway));
 
-       err = ioctl(sk, SIOCADDRT, &rt);
+       rt.rt_dev = ifr.ifr_name;
+
+       err = ioctl(sk, SIOCDELRT, &rt);
        if (err < 0)
-               connman_error("Setting default interface route failed (%s)",
+               connman_error("Removing default interface route failed (%s)",
                                                        strerror(errno));
        close(sk);