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;
{
struct nl_msg *msg;
struct nlattr *linkinfo, *data;
- struct ifinfomsg iim = { .ifi_family = AF_INET };
+ struct ifinfomsg iim = { .ifi_family = AF_UNSPEC, };
int ifindex = system_if_resolve(dev);
int i, rv;
static const struct {
if (cfg->flags & MACVLAN_OPT_MACADDR)
nla_put(msg, IFLA_ADDRESS, sizeof(cfg->macaddr), cfg->macaddr);
- nla_put(msg, IFLA_IFNAME, IFNAMSIZ, macvlan->ifname);
+ nla_put_string(msg, IFLA_IFNAME, macvlan->ifname);
nla_put_u32(msg, IFLA_LINK, ifindex);
if (!(linkinfo = nla_nest_start(msg, IFLA_LINKINFO)))
goto nla_put_failure;
- nla_put(msg, IFLA_INFO_KIND, strlen("macvlan"), "macvlan");
+ nla_put_string(msg, IFLA_INFO_KIND, "macvlan");
if (!(data = nla_nest_start(msg, IFLA_INFO_DATA)))
goto 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;
-
- iim.ifi_family = AF_INET;
- iim.ifi_index = 0;
+ struct ifinfomsg iim = {
+ .ifi_family = AF_UNSPEC,
+ .ifi_index = 0,
+ };
- msg = nlmsg_alloc_simple(RTM_DELLINK, 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, dev->ifname);
+ return system_rtnl_call(msg);
+}
- nla_put(msg, IFLA_INFO_KIND, strlen("macvlan"), "macvlan");
- nla_put(msg, IFLA_IFNAME, sizeof(macvlan->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)
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
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;
.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,
};
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);
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;
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;
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)
} else if (!strcmp(str, "ipip6")) {
struct nl_msg *nlm = nlmsg_alloc_simple(RTM_NEWLINK,
NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
-
struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC };
+ int ret = 0;
+
+ if (!nlm)
+ return -1;
+
nlmsg_append(nlm, &ifi, sizeof(ifi), 0);
nla_put_string(nlm, IFLA_IFNAME, name);
nla_put_u32(nlm, IFLA_LINK, link);
struct nlattr *linkinfo = nla_nest_start(nlm, IFLA_LINKINFO);
+ if (!linkinfo) {
+ ret = -ENOMEM;
+ goto failure;
+ }
nla_put_string(nlm, IFLA_INFO_KIND, "ip6tnl");
struct nlattr *infodata = nla_nest_start(nlm, IFLA_INFO_DATA);
+ if (!infodata) {
+ ret = -ENOMEM;
+ goto failure;
+ }
if (link)
nla_put_u32(nlm, IFLA_IPTUN_LINK, link);
struct in6_addr in6buf;
if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
- if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1)
- return -EINVAL;
+ if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) {
+ ret = -EINVAL;
+ goto failure;
+ }
nla_put(nlm, IFLA_IPTUN_LOCAL, sizeof(in6buf), &in6buf);
}
if ((cur = tb[TUNNEL_ATTR_REMOTE])) {
- if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1)
- return -EINVAL;
+ if (inet_pton(AF_INET6, blobmsg_data(cur), &in6buf) < 1) {
+ ret = -EINVAL;
+ goto failure;
+ }
nla_put(nlm, IFLA_IPTUN_REMOTE, sizeof(in6buf), &in6buf);
}
char ip4buf[16];
if (sscanf(blobmsg_get_string(fmr), "%47[^/]/%u,%15[^/]/%u,%u,%u",
- ip6buf, &ip6len, ip4buf, &ip4len, &ealen, &offset) < 5)
- return -EINVAL;
+ ip6buf, &ip6len, ip4buf, &ip4len, &ealen, &offset) < 5) {
+ ret = -EINVAL;
+ goto failure;
+ }
struct in6_addr ip6prefix;
struct in_addr ip4prefix;
if (inet_pton(AF_INET6, ip6buf, &ip6prefix) != 1 ||
- inet_pton(AF_INET, ip4buf, &ip4prefix) != 1)
- return -EINVAL;
+ inet_pton(AF_INET, ip4buf, &ip4prefix) != 1) {
+ ret = -EINVAL;
+ goto failure;
+ }
struct nlattr *rule = nla_nest_start(nlm, ++fmrcnt);
nla_nest_end(nlm, linkinfo);
return system_rtnl_call(nlm);
- } else
+failure:
+ nlmsg_free(nlm);
+ return ret;
+ }
+ else
return -EINVAL;
return 0;
projects / project / netifd.git / blobdiff