X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=5c960b40119854e42e7d5531a6929e7ca6736626;hp=ad3adec91a685675cee485cf12c97c2e094d536d;hb=a3bf8cbe10b0bad85475f4c3dc2bae4afb65774b;hpb=5e837916aa1ea128fa833f0803436c24f50cb5df diff --git a/system-linux.c b/system-linux.c index ad3adec..5c960b4 100644 --- a/system-linux.c +++ b/system-linux.c @@ -164,6 +164,46 @@ create_event_socket(struct event_socket *ev, int protocol, return true; } +static bool +system_rtn_aton(const char *src, unsigned int *dst) +{ + char *e; + unsigned int n; + + if (!strcmp(src, "local")) + n = RTN_LOCAL; + else if (!strcmp(src, "nat")) + n = RTN_NAT; + else if (!strcmp(src, "broadcast")) + n = RTN_BROADCAST; + else if (!strcmp(src, "anycast")) + n = RTN_ANYCAST; + else if (!strcmp(src, "multicast")) + n = RTN_MULTICAST; + else if (!strcmp(src, "prohibit")) + n = RTN_PROHIBIT; + else if (!strcmp(src, "unreachable")) + n = RTN_UNREACHABLE; + else if (!strcmp(src, "blackhole")) + n = RTN_BLACKHOLE; + else if (!strcmp(src, "xresolve")) + n = RTN_XRESOLVE; + else if (!strcmp(src, "unicast")) + n = RTN_UNICAST; + else if (!strcmp(src, "throw")) + n = RTN_THROW; + else if (!strcmp(src, "failed_policy")) + n = RTN_FAILED_POLICY; + else { + n = strtoul(src, &e, 0); + if (!e || *e || e == src || n > 255) + return false; + } + + *dst = n; + return true; +} + int system_init(void) { static struct event_socket rtnl_event; @@ -412,15 +452,27 @@ static char *system_get_bridge(const char *name, char *buf, int buflen) return path + 1; } +static void system_bridge_set_wireless(const char *bridge, const char *dev) +{ + snprintf(dev_buf, sizeof(dev_buf), + "/sys/devices/virtual/net/%s/brif/%s/multicast_to_unicast", + bridge, dev); + system_set_sysctl(dev_buf, "1"); +} + int system_bridge_addif(struct device *bridge, struct device *dev) { char *oldbr; + int ret = 0; oldbr = system_get_bridge(dev->ifname, dev_buf, sizeof(dev_buf)); - if (oldbr && !strcmp(oldbr, bridge->ifname)) - return 0; + if (!oldbr || strcmp(oldbr, bridge->ifname) != 0) + ret = system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL); - return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL); + if (dev->wireless) + system_bridge_set_wireless(bridge->ifname, dev->ifname); + + return ret; } int system_bridge_delif(struct device *bridge, struct device *dev) @@ -751,7 +803,7 @@ nla_put_failure: return -ENOMEM; } -int system_macvlan_del(struct device *macvlan) +static int system_link_del(struct device *dev) { struct nl_msg *msg; struct ifinfomsg iim = { @@ -765,12 +817,13 @@ int system_macvlan_del(struct device *macvlan) return -1; nlmsg_append(msg, &iim, sizeof(iim), 0); + nla_put_string(msg, IFLA_IFNAME, dev->ifname); + return system_rtnl_call(msg); +} - nla_put_string(msg, IFLA_IFNAME, macvlan->ifname); - - system_rtnl_call(msg); - - return 0; +int system_macvlan_del(struct device *macvlan) +{ + return system_link_del(macvlan); } static int system_vlan(struct device *dev, int id) @@ -856,24 +909,7 @@ nla_put_failure: int system_vlandev_del(struct device *vlandev) { - struct nl_msg *msg; - struct ifinfomsg iim = { - .ifi_family = AF_UNSPEC, - .ifi_index = 0, - }; - - msg = nlmsg_alloc_simple(RTM_DELLINK, NLM_F_REQUEST); - - if (!msg) - return -1; - - nlmsg_append(msg, &iim, sizeof(iim), 0); - - nla_put_string(msg, IFLA_IFNAME, vlandev->ifname); - - system_rtnl_call(msg); - - return 0; + return system_link_del(vlandev); } static void @@ -1281,9 +1317,6 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) route->nexthop.in6.s6_addr32[2] || route->nexthop.in6.s6_addr32[3]; - unsigned char scope = (cmd == RTM_DELROUTE) ? RT_SCOPE_NOWHERE : - (have_gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK; - unsigned int table = (route->flags & (DEVROUTE_TABLE | DEVROUTE_SRCTABLE)) ? route->table : RT_TABLE_MAIN; @@ -1293,7 +1326,7 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) .rtm_src_len = route->sourcemask, .rtm_table = (table < 256) ? table : RT_TABLE_UNSPEC, .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC, - .rtm_scope = scope, + .rtm_scope = RT_SCOPE_NOWHERE, .rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST, .rtm_flags = (route->flags & DEVROUTE_ONLINK) ? RTNH_F_ONLINK : 0, }; @@ -1306,6 +1339,23 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd) rtm.rtm_scope = RT_SCOPE_UNIVERSE; rtm.rtm_type = RTN_UNREACHABLE; } + else + rtm.rtm_scope = (have_gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK; + } + + if (route->flags & DEVROUTE_TYPE) { + rtm.rtm_type = route->type; + if (!(route->flags & (DEVROUTE_TABLE | DEVROUTE_SRCTABLE))) { + if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_BROADCAST || + rtm.rtm_type == RTN_NAT || rtm.rtm_type == RTN_ANYCAST) + rtm.rtm_table = RT_TABLE_LOCAL; + } + + if (rtm.rtm_type == RTN_LOCAL || rtm.rtm_type == RTN_NAT) + rtm.rtm_scope = RT_SCOPE_HOST; + else if (rtm.rtm_type == RTN_BROADCAST || rtm.rtm_type == RTN_MULTICAST || + rtm.rtm_type == RTN_ANYCAST) + rtm.rtm_scope = RT_SCOPE_LINK; } msg = nlmsg_alloc_simple(cmd, flags); @@ -1379,6 +1429,11 @@ int system_flush_routes(void) return 0; } +bool system_resolve_rt_type(const char *type, unsigned int *id) +{ + return system_rtn_aton(type, id); +} + bool system_resolve_rt_table(const char *name, unsigned int *id) { FILE *f; @@ -1421,14 +1476,15 @@ bool system_resolve_rt_table(const char *name, unsigned int *id) if (table == RT_TABLE_UNSPEC) return false; - /* do not consider main table special */ - if (table == RT_TABLE_MAIN) - table = RT_TABLE_UNSPEC; - *id = table; return true; } +bool system_is_default_rt_table(unsigned int id) +{ + return (id == RT_TABLE_MAIN); +} + static int system_iprule(struct iprule *rule, int cmd) { int alen = ((rule->flags & IPRULE_FAMILY) == IPRULE_INET4) ? 4 : 16; @@ -1564,41 +1620,7 @@ int system_flush_iprules(void) bool system_resolve_iprule_action(const char *action, unsigned int *id) { - char *e; - unsigned int n; - - if (!strcmp(action, "local")) - n = RTN_LOCAL; - else if (!strcmp(action, "nat")) - n = RTN_NAT; - else if (!strcmp(action, "broadcast")) - n = RTN_BROADCAST; - else if (!strcmp(action, "anycast")) - n = RTN_ANYCAST; - else if (!strcmp(action, "multicast")) - n = RTN_MULTICAST; - else if (!strcmp(action, "prohibit")) - n = RTN_PROHIBIT; - else if (!strcmp(action, "unreachable")) - n = RTN_UNREACHABLE; - else if (!strcmp(action, "blackhole")) - n = RTN_BLACKHOLE; - else if (!strcmp(action, "xresolve")) - n = RTN_XRESOLVE; - else if (!strcmp(action, "unicast")) - n = RTN_UNICAST; - else if (!strcmp(action, "throw")) - n = RTN_THROW; - else if (!strcmp(action, "failed_policy")) - n = RTN_FAILED_POLICY; - else { - n = strtoul(action, &e, 0); - if (!e || *e || e == action || n > 255) - return false; - } - - *id = n; - return true; + return system_rtn_aton(action, id); } time_t system_get_rtime(void)