Revert "Added support to add ipv6 route using netlink." 75/189075/1
authorSeonah Moon <seonah1.moon@samsung.com>
Thu, 13 Sep 2018 07:15:27 +0000 (16:15 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Thu, 13 Sep 2018 07:15:33 +0000 (16:15 +0900)
This reverts commit cb573910888d91558cf3d2beb28187850eccc9ad.

Change-Id: I4e11785eb874be44dfe2988d7902aae9d1ccd514

include/util.h
src/network-state.c
src/utils/util.c

index f1efcce..6e9b936 100755 (executable)
@@ -39,14 +39,6 @@ extern "C" {
 #define WIFI_DIRECT_FEATURE "http://tizen.org/feature/network.wifi.direct"
 #define WIFI_SOFTAP_FEATURE "http://tizen.org/feature/network.wifi.softap"
 
-/** Macros to handle rtattributes */
-#define RTA_ALIGNTO    4
-#define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) )
-#define RTA_LENGTH(len)        (RTA_ALIGN(sizeof(struct rtattr)) + (len))
-#define RTA_DATA(rta)   ((void*)(((char*)(rta)) + RTA_LENGTH(0)))
-#define NLMSG_TAIL(nmsg) \
-       ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
-
 typedef enum {
        NETCONFIG_SUPPORTED_FEATURE_ETHERNET = 0,
        NETCONFIG_SUPPORTED_FEATURE_TETHERING,
@@ -83,7 +75,7 @@ int netconfig_execute_file(const char *file_path, char *const args[], char *cons
 int netconfig_execute_file_no_wait(const char *file_path,
                char *const args[]);
 int netconfig_execute_clatd(const char *file_path, char *const args[]);
-int netconfig_add_route_ipv6(gchar *interface, gchar *gateway);
+int netconfig_add_route_ipv6(gchar *ip_addr, gchar *interface, gchar *gateway, unsigned char prefix_len);
 int netconfig_del_route_ipv6(gchar *ip_addr, gchar *interface, gchar *gateway, unsigned char prefix_len);
 int netconfig_add_route_ipv4(gchar *ip_addr, gchar *subnet, gchar *interface, gint address_family);
 int netconfig_del_route_ipv4(gchar *ip_addr, gchar *subnet, gchar *interface, gint address_family);
index 48c6778..f2862de 100755 (executable)
@@ -1300,6 +1300,10 @@ static gboolean handle_add_route(
        gchar *const args[] = { "/sbin/route", "add", "-net", ip_addr, gw_str,
                "netmask", netmask, "dev", interface, NULL };
        gchar *const envs[] = { NULL };
+       const gchar* buf = NULL;
+       gchar* ch = NULL;
+       int prefix_len = 0;
+       int pos = 0;
 
        DBG("ip_addr(%s), netmask(%s), interface(%s), gateway(%s)", ip_addr, netmask, interface, gateway);
 
@@ -1325,7 +1329,17 @@ static gboolean handle_add_route(
                        return TRUE;
                }
 
-               if (netconfig_add_route_ipv6(interface, gateway) < 0) {
+               buf = ip_addr;
+               ch = strchr(buf, '/');
+               pos = ch - buf + 1;
+               if (ch) {
+                       prefix_len = atoi(ch + 1);
+                       ip_addr[pos-1] = '\0';
+               } else {
+                       prefix_len = 128;
+               }
+
+               if (netconfig_add_route_ipv6(ip_addr, interface, gateway, prefix_len) < 0) {
                        DBG("Failed to add a new route");
                        netconfig_error_permission_denied(context);
                        return TRUE;
index 9df35d6..27c2238 100755 (executable)
@@ -34,9 +34,6 @@
 #include <vconf-keys.h>
 #include <tzplatform_config.h>
 #include <system_info.h>
-#include <stdint.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
 
 #include "log.h"
 #include "util.h"
 #define HEADED_PLUGIN_FILEPATH         "/usr/lib/net-config-plugin-headed.so"
 #define TELEPHONY_PLUGIN_FILEPATH      "/usr/lib/net-config-plugin-telephony.so"
 
-typedef struct {
-       uint8_t family;
-       uint8_t bytelen;
-       int16_t bitlen;
-       uint32_t flags;
-       uint32_t data[8];
-} netconfig_inet_prefix_s;
-
-typedef struct {
-       int                     fd;
-       struct sockaddr_nl      local;
-       struct sockaddr_nl      peer;
-       uint32_t                seq;
-       uint32_t                dump;
-} netconfig_rtnl_s;
-netconfig_rtnl_s rth = { .fd = -1 };
-
 static gboolean netconfig_device_picker_test = FALSE;
 static int mdnsd_ref_count = 0;
 typedef struct {
@@ -782,190 +762,36 @@ int netconfig_del_route_ipv4(gchar *ip_addr, gchar *subnet, gchar *interface, gi
        return 1;
 }
 
-static int __netconfig_rtnl_talk(netconfig_rtnl_s *rtnl, struct nlmsghdr *n, pid_t peer,
-               unsigned groups, struct nlmsghdr *answer)
+int netconfig_add_route_ipv6(gchar *ip_addr, gchar *interface, gchar *gateway, unsigned char prefix_len)
 {
-       struct nlmsghdr *h;
-       struct sockaddr_nl nladdr;
-       struct iovec iov = {
-               .iov_base = (void*)n,
-               .iov_len = n->nlmsg_len
-       };
-       struct msghdr msg = {
-               .msg_name = &nladdr,
-               .msg_namelen = sizeof(nladdr),
-               .msg_iov = &iov,
-               .msg_iovlen = 1,
-       };
-       int status;
-       unsigned seq;
-       char buf[16384];
+       struct in6_rtmsg rt;
+       int fd = 0;
+       int err = 0;
        char error_buf[MAX_SIZE_ERROR_BUFFER] = {0, };
 
-       memset(&nladdr, 0, sizeof(nladdr));
-       nladdr.nl_family = AF_NETLINK;
-       nladdr.nl_pid = peer;
-       nladdr.nl_groups = groups;
+       memset(&rt, 0, sizeof(rt));
 
-       n->nlmsg_seq = seq = ++rtnl->seq;
+       rt.rtmsg_dst_len = prefix_len;
 
-       if (answer == NULL)
-               n->nlmsg_flags |= NLM_F_ACK;
+       rt.rtmsg_flags = RTF_UP | RTF_HOST;
 
-       status = sendmsg(rtnl->fd, &msg, 0);
-       if (status < 0) {
-               DBG("failed to send message to kernel, status: %d", status);
+       errno = 0;
+       if (inet_pton(AF_INET6, ip_addr, &rt.rtmsg_dst) < 0) {
+               strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
+               DBG("inet_pton failed : %s", error_buf);
                return -1;
        }
 
-       memset(buf, 0, sizeof(buf));
-
-       iov.iov_base = buf;
-
-       while (1) {
-               iov.iov_len = sizeof(buf);
-               status = recvmsg(rtnl->fd, &msg, 0);
-               DBG("status: %d", status);
-
-               if (status < 0) {
-                       if (errno == EINTR || errno == EAGAIN)
-                               continue;
+       if (gateway != NULL) {
+               rt.rtmsg_flags |= RTF_GATEWAY;
+               if (inet_pton(AF_INET6, gateway, &rt.rtmsg_gateway) < 0) {
                        strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-                       DBG("netlink receive error %s (%d)", error_buf, errno);
-                       return -1;
-               }
-               if (status == 0) {
-                       DBG("EOF on netlink");
-                       return -1;
-               }
-               if (msg.msg_namelen != sizeof(nladdr)) {
-                       DBG("sender address length == %d", msg.msg_namelen);
-                       return -1;
-               }
-               for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) {
-                       int len = h->nlmsg_len;
-                       int l = len - sizeof(*h);
-
-                       if (l < 0 || len > status) {
-                               if (msg.msg_flags & MSG_TRUNC) {
-                                       DBG("truncated message");
-                                       return -1;
-                               }
-                               DBG("malformed message: len=%d", len);
-                               return -1;
-                       }
-
-                       if (nladdr.nl_pid != peer ||
-                                       h->nlmsg_pid != rtnl->local.nl_pid ||
-                                       h->nlmsg_seq != seq) {
-                               /** Don't forget to skip that message. */
-                               status -= NLMSG_ALIGN(len);
-                               h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
-                               continue;
-                       }
-
-                       if (h->nlmsg_type == NLMSG_ERROR) {
-                               struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
-                               if (l < sizeof(struct nlmsgerr)) {
-                                       DBG("Error truncated message");
-                               } else {
-                                       if (!err->error) {
-                                               if (answer)
-                                                       memcpy(answer, h, h->nlmsg_len);
-                                               return 0;
-                                       }
-
-                                       errno = -err->error;
-                                       strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-                                       DBG("RTNETLINK answers: %s", error_buf);
-                               }
-                               return -1;
-                       }
-                       if (answer) {
-                               memcpy(answer, h, h->nlmsg_len);
-                               return 0;
-                       }
-
-                       DBG("Unexpected reply");
-
-                       status -= NLMSG_ALIGN(len);
-                       h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
-               }
-               if (msg.msg_flags & MSG_TRUNC) {
-                       DBG("Message truncated");
-                       continue;
-               }
-               if (status) {
-                       DBG("Remnant of size %d", status);
+                       DBG("inet_pton failed : %s", error_buf);
                        return -1;
                }
        }
-}
-
-static int __netconfig_get_prefix(netconfig_inet_prefix_s *dst, char *arg, int family)
-{
-       if (family != AF_UNSPEC && family != AF_INET6) {
-               DBG("Error: invalid address family.");
-               return -1;
-       }
-
-       memset(dst, 0, sizeof(*dst));
-
-       if (strchr(arg, ':')) {
-               dst->family = AF_INET6;
-               if (inet_pton(AF_INET6, arg, dst->data) <= 0) {
-                       DBG("Error: invalid ipv6 address.");
-                       return -1;
-               }
-               dst->bytelen = 16;
-               dst->bitlen = 128;
-       }
-
-       return 0;
-}
-
-static int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
-               int alen)
-{
-       int len = RTA_LENGTH(alen);
-       struct rtattr *rta;
-
-       if (NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) {
-               DBG("Error message exceeded bound of %d", maxlen);
-               return -1;
-       }
-       rta = NLMSG_TAIL(n);
-       rta->rta_type = type;
-       rta->rta_len = len;
-       memcpy(RTA_DATA(rta), data, alen);
-       n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
 
-       return 0;
-}
-
-static int __netconfig_iproute_modify(int cmd, unsigned flags, char *interface, char *ip_addr)
-{
-       struct {
-               struct nlmsghdr n;
-               struct rtmsg    r;
-               char            buf[1024];
-       } req;
-
-       struct ifreq ifr;
-       int fd, idx, ret;
-       char error_buf[MAX_SIZE_ERROR_BUFFER] = {0, };
-
-       memset(&req, 0, sizeof(req));
-
-       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-       req.n.nlmsg_flags = NLM_F_REQUEST|flags;
-       req.n.nlmsg_type = cmd;
-       req.r.rtm_family = AF_INET6;
-
-       if (cmd != RTM_DELROUTE) {
-               req.r.rtm_protocol = RTPROT_BOOT;
-               req.r.rtm_type = RTN_UNICAST;
-       }
+       rt.rtmsg_metric = 1;
 
        fd = socket(AF_INET6, SOCK_DGRAM, 0);
        if (fd < 0) {
@@ -974,125 +800,26 @@ static int __netconfig_iproute_modify(int cmd, unsigned flags, char *interface,
                return -1;
        }
 
-       memset(&ifr, 0, sizeof(ifr));
-       strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)-1);
-       ioctl(fd, SIOCGIFINDEX, &ifr);
-       idx = ifr.ifr_ifindex;
-       close(fd);
-
-       if (ifr.ifr_ifindex == 0) {
-               DBG("Cannot find device %s", interface);
-               return -1;
-       }
-
-       netconfig_inet_prefix_s dst;
-
-       ret = __netconfig_get_prefix(&dst, ip_addr, req.r.rtm_family);
-       if (ret < 0)
-               return -1;
-
-       req.r.rtm_dst_len = dst.bitlen;
-       if (dst.bytelen) {
-               ret = addattr_l(&req.n, sizeof(req), RTA_DST, &dst.data, dst.bytelen);
-               if (ret < 0)
-                       return -1;
-       }
-
-       ret = addattr_l(&req.n, sizeof(req), RTA_OIF, &idx, sizeof(uint32_t));
-       if (ret < 0)
-               return -1;
-
-       if (__netconfig_rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0) {
-               DBG("__netconfig_rtnl_talk failed");
-               return -1;
-       }
-
-       return 0;
-}
-
-static void __netconfig_rtnl_close()
-{
-       if (rth.fd >= 0) {
-               close(rth.fd);
-               rth.fd = -1;
-       }
-}
-
-static int __netconfig_rtnl_open(netconfig_rtnl_s *rth, unsigned subscriptions,
-               int protocol)
-{
-       socklen_t addr_len;
-       int sndbuf = 32768;
-       int rcvbuf = 1024 * 1024;
-       char error_buf[MAX_SIZE_ERROR_BUFFER] = {0, };
-
-       memset(rth, 0, sizeof(*rth));
-
-       rth->fd = socket(AF_NETLINK, SOCK_RAW, protocol);
-       if (rth->fd < 0) {
-               strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-               DBG("Failed to open netlink socket: %s", error_buf);
-               return -1;
-       }
-
-       if (setsockopt(rth->fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf)) < 0) {
-               strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-               DBG("Failed to set option(SO_SNDBUF) on socket [Error: %s]", error_buf);
-               return -1;
-       }
-
-       if (setsockopt(rth->fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf)) < 0) {
-               strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-               DBG("Failed to set option(SO_RCVBUF) on socket [Error: %s]", error_buf);
-               return -1;
-       }
-
-       memset(&rth->local, 0, sizeof(rth->local));
-       rth->local.nl_family = AF_NETLINK;
-       rth->local.nl_groups = subscriptions;
+       rt.rtmsg_ifindex = 0;
 
-       if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
-               strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-               DBG("Failed to bind netlink socket [Error: %s]", error_buf);
-               return -1;
+       if (interface) {
+               struct ifreq ifr;
+               memset(&ifr, 0, sizeof(ifr));
+               strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)-1);
+               ioctl(fd, SIOCGIFINDEX, &ifr);
+               rt.rtmsg_ifindex = ifr.ifr_ifindex;
        }
 
-       addr_len = sizeof(rth->local);
-       if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
+       if ((err = ioctl(fd, SIOCADDRT, &rt)) < 0) {
                strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
-               DBG("Failed to getsockname [Error: %s]", error_buf);
-               return -1;
-       }
-       if (addr_len != sizeof(rth->local)) {
-               DBG("Wrong address length %d", addr_len);
-               return -1;
-       }
-       if (rth->local.nl_family != AF_NETLINK) {
-               DBG("Wrong address family %d", rth->local.nl_family);
-               return -1;
-       }
-       rth->seq = time(NULL);
-
-       return 0;
-}
-
-int netconfig_add_route_ipv6(gchar *interface, gchar *gateway)
-{
-       int ret = __netconfig_rtnl_open(&rth, 0, NETLINK_ROUTE);
-       if (ret < 0) {
-               DBG("Failed to open rtnl socket");
+               DBG("Failed to add route: %s", error_buf);
+               close(fd);
                return -1;
        }
 
-       ret = __netconfig_iproute_modify(RTM_NEWROUTE, NLM_F_CREATE|NLM_F_EXCL, interface, gateway);
-       if (ret < 0) {
-               DBG("Failed to modify ipv6 route.");
-               __netconfig_rtnl_close();
-               return -1;
-       }
+       close(fd);
 
-       __netconfig_rtnl_close();
-       return 0;
+       return 1;
 }
 
 int netconfig_del_route_ipv6(gchar *ip_addr, gchar *interface, gchar *gateway, unsigned char prefix_len)