X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=9a55d7410785fb9be2fd8e348eb30bede75bc5b1;hp=483108815f2ead9ddd9473f3c2b4a4885fd3df2e;hb=b2ebc3bb0bf9859c67c75abf264ed8e4fa54ec61;hpb=c9ec9e179e5a93a51c1b6e492a4f372662b5d033 diff --git a/system-linux.c b/system-linux.c index 4831088..9a55d74 100644 --- a/system-linux.c +++ b/system-linux.c @@ -1,16 +1,20 @@ #include #include +#include #include #include #include -#include +#include #include #include -#include +#include #include +#include +#include +#include #include "netifd.h" #include "device.h" @@ -18,20 +22,90 @@ static int sock_ioctl = -1; static struct nl_sock *sock_rtnl = NULL; +static struct nl_sock *sock_rtnl_event = NULL; + +static void handler_rtnl_event(struct uloop_fd *u, unsigned int events); +static int cb_rtnl_event(struct nl_msg *msg, void *arg); +static struct uloop_fd rtnl_event = {.cb = handler_rtnl_event}; +static struct nl_cb *nl_cb_rtnl_event; int system_init(void) { sock_ioctl = socket(AF_LOCAL, SOCK_DGRAM, 0); fcntl(sock_ioctl, F_SETFD, fcntl(sock_ioctl, F_GETFD) | FD_CLOEXEC); - if ((sock_rtnl = nl_socket_alloc())) { - if (nl_connect(sock_rtnl, NETLINK_ROUTE)) { - nl_socket_free(sock_rtnl); - sock_rtnl = NULL; - } - } + // Prepare socket for routing / address control + sock_rtnl = nl_socket_alloc(); + if (!sock_rtnl) + return -1; + + if (nl_connect(sock_rtnl, NETLINK_ROUTE)) + goto error_free_sock; + + // Prepare socket for link events + nl_cb_rtnl_event = nl_cb_alloc(NL_CB_DEFAULT); + if (!nl_cb_rtnl_event) + goto error_free_sock; + + nl_cb_set(nl_cb_rtnl_event, NL_CB_VALID, NL_CB_CUSTOM, + cb_rtnl_event, NULL); + + sock_rtnl_event = nl_socket_alloc(); + if (!sock_rtnl_event) + goto error_free_cb; + + if (nl_connect(sock_rtnl_event, NETLINK_ROUTE)) + goto error_free_event; + + // Receive network link events form kernel + nl_socket_add_membership(sock_rtnl_event, RTNLGRP_LINK); + + rtnl_event.fd = nl_socket_get_fd(sock_rtnl_event); + uloop_fd_add(&rtnl_event, ULOOP_READ | ULOOP_EDGE_TRIGGER); + + return 0; + +error_free_event: + nl_socket_free(sock_rtnl_event); + sock_rtnl_event = NULL; +error_free_cb: + nl_cb_put(nl_cb_rtnl_event); + nl_cb_rtnl_event = NULL; +error_free_sock: + nl_socket_free(sock_rtnl); + sock_rtnl = NULL; + return -1; +} + +// If socket is ready for reading parse netlink events +static void handler_rtnl_event(struct uloop_fd *u, unsigned int events) +{ + nl_recvmsgs(sock_rtnl_event, nl_cb_rtnl_event); +} + +// Evaluate netlink messages +static int cb_rtnl_event(struct nl_msg *msg, void *arg) +{ + struct nlmsghdr *nh = nlmsg_hdr(msg); + struct ifinfomsg *ifi = NLMSG_DATA(nh); + struct nlattr *nla[__IFLA_MAX]; + + if (nh->nlmsg_type != RTM_DELLINK && nh->nlmsg_type != RTM_NEWLINK) + goto out; + + nlmsg_parse(nh, sizeof(*ifi), nla, __IFLA_MAX - 1, NULL); + if (!nla[IFLA_IFNAME]) + goto out; - return -(sock_ioctl < 0 || !sock_rtnl); + struct device *dev = device_get(RTA_DATA(nla[IFLA_IFNAME]), false); + if (!dev) + goto out; + + dev->ifindex = ifi->ifi_index; + device_set_present(dev, (nh->nlmsg_type == RTM_NEWLINK)); + +out: + return 0; } static int system_rtnl_call(struct nl_msg *msg) @@ -42,32 +116,116 @@ static int system_rtnl_call(struct nl_msg *msg) return s; } -int system_bridge_addbr(struct device *bridge) -{ - return ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname); -} - int system_bridge_delbr(struct device *bridge) { return ioctl(sock_ioctl, SIOCBRDELBR, bridge->ifname); } -static int system_bridge_if(struct device *bridge, struct device *dev, int cmd) +static int system_bridge_if(const char *bridge, struct device *dev, int cmd) { struct ifreq ifr; ifr.ifr_ifindex = dev->ifindex; - strncpy(ifr.ifr_name, bridge->ifname, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name)); return ioctl(sock_ioctl, cmd, &ifr); } int system_bridge_addif(struct device *bridge, struct device *dev) { - return system_bridge_if(bridge, dev, SIOCBRADDIF); + return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF); } int system_bridge_delif(struct device *bridge, struct device *dev) { - return system_bridge_if(bridge, dev, SIOCBRDELIF); + return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF); +} + +static bool system_is_bridge(const char *name, char *buf, int buflen) +{ + struct stat st; + + snprintf(buf, buflen, "/sys/devices/virtual/net/%s/bridge", name); + if (stat(buf, &st) < 0) + return false; + + return true; +} + +static char *system_get_bridge(const char *name, char *buf, int buflen) +{ + char *path; + ssize_t len; + glob_t gl; + + snprintf(buf, buflen, "/sys/devices/virtual/net/*/brif/%s/bridge", name); + if (glob(buf, GLOB_NOSORT, NULL, &gl) < 0) + return NULL; + + if (gl.gl_pathc == 0) + return NULL; + + len = readlink(gl.gl_pathv[0], buf, buflen); + if (len < 0) + return NULL; + + buf[len] = 0; + path = strrchr(buf, '/'); + if (!path) + return NULL; + + return path + 1; +} + +static int system_if_resolve(struct device *dev) +{ + struct ifreq ifr; + strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name)); + if (!ioctl(sock_ioctl, SIOCGIFINDEX, &ifr)) + return ifr.ifr_ifindex; + else + return 0; +} + +static int system_if_flags(const char *ifname, unsigned add, unsigned rem) +{ + struct ifreq ifr; + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr); + ifr.ifr_flags |= add; + ifr.ifr_flags &= ~rem; + return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr); +} + +/* + * Clear bridge (membership) state and bring down device + */ +static void system_if_clear_state(struct device *dev) +{ + char buf[256]; + char *bridge; + + dev->ifindex = system_if_resolve(dev); + if (!dev->ifindex) + return; + + system_if_flags(dev->ifname, 0, IFF_UP); + + if (system_is_bridge(dev->ifname, buf, sizeof(buf))) { + D(SYSTEM, "Delete existing bridge named '%s'\n", dev->ifname); + system_bridge_delbr(dev); + return; + } + + bridge = system_get_bridge(dev->ifname, buf, sizeof(buf)); + if (bridge) { + D(SYSTEM, "Remove device '%s' from bridge '%s'\n", dev->ifname, bridge); + system_bridge_if(bridge, dev, SIOCBRDELIF); + } +} + +int system_bridge_addbr(struct device *bridge) +{ + system_if_clear_state(bridge); + return ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname); } static int system_vlan(struct device *dev, int id) @@ -82,6 +240,7 @@ static int system_vlan(struct device *dev, int id) int system_vlan_add(struct device *dev, int id) { + system_if_clear_state(dev); return system_vlan(dev, id); } @@ -90,37 +249,21 @@ int system_vlan_del(struct device *dev) return system_vlan(dev, 0); } -static int system_if_flags(struct device *dev, unsigned add, unsigned rem) -{ - struct ifreq ifr; - strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name)); - ioctl(sock_ioctl, SIOCGIFFLAGS, &ifr); - ifr.ifr_flags |= add; - ifr.ifr_flags &= ~rem; - return ioctl(sock_ioctl, SIOCSIFFLAGS, &ifr); -} - int system_if_up(struct device *dev) { - return system_if_flags(dev, IFF_UP, 0); + dev->ifindex = system_if_resolve(dev); + return system_if_flags(dev->ifname, IFF_UP, 0); } int system_if_down(struct device *dev) { - return system_if_flags(dev, 0, IFF_UP); + return system_if_flags(dev->ifname, 0, IFF_UP); } int system_if_check(struct device *dev) { - struct ifreq ifr; - strncpy(ifr.ifr_name, dev->ifname, sizeof(ifr.ifr_name)); - if (ioctl(sock_ioctl, SIOCGIFINDEX, &ifr)) - return -1; - - dev->ifindex = ifr.ifr_ifindex; - - /* if (!strcmp(dev->ifname, "eth0")) - device_set_present(dev, true); */ + system_if_clear_state(dev); + device_set_present(dev, (system_if_resolve(dev) >= 0)); return 0; } @@ -138,7 +281,7 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd) return -1; nlmsg_append(msg, &ifa, sizeof(ifa), 0); - nla_put(msg, IFA_ADDRESS, alen, &addr->addr); + nla_put(msg, IFA_LOCAL, alen, &addr->addr); return system_rtnl_call(msg); }