diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2014-06-18 05:55:48 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-06-18 13:02:19 +0200 |
| commit | cd23fd6bf7983741b9a72bea78749278716248ec (patch) | |
| tree | ae4244fb6cff9fb2e51b0091d6119206b1876c34 /interface-ip.c | |
| parent | 5d655d1d3f6880b53ea5bafda159c02da038548f (diff) | |
| download | netifd-cd23fd6bf7983741b9a72bea78749278716248ec.tar.gz | |
netifd: Route type support
Patch adds route type support in netifd by means of the route parameter type.
By default the route type was unicast; the parameter adss support for local/broadcast/multicast/unicast routes which will be put into the appropriate routing table.
If route type parameter is unset the route type will be unicast as before.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'interface-ip.c')
| -rw-r--r-- | interface-ip.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/interface-ip.c b/interface-ip.c index bd6f164..715e498 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -39,6 +39,7 @@ enum { ROUTE_TABLE, ROUTE_SOURCE, ROUTE_ONLINK, + ROUTE_TYPE, __ROUTE_MAX }; @@ -53,6 +54,7 @@ static const struct blobmsg_policy route_attr[__ROUTE_MAX] = { [ROUTE_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 }, [ROUTE_SOURCE] = { .name = "source", .type = BLOBMSG_TYPE_STRING }, [ROUTE_ONLINK] = { .name = "onlink", .type = BLOBMSG_TYPE_BOOL }, + [ROUTE_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING } }; const struct uci_blob_param_list route_attr_list = { @@ -374,6 +376,14 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) route->valid_until = valid_until; } + if ((cur = tb[ROUTE_TYPE]) != NULL) { + if (!system_resolve_rt_type(blobmsg_data(cur), &route->type)) { + DPRINTF("Failed to resolve routing type: %s\n", (char *) blobmsg_data(cur)); + goto error; + } + route->flags |= DEVROUTE_TYPE; + } + vlist_add(&ip->route, &route->node, route); return; @@ -586,7 +596,8 @@ interface_update_proto_route(struct vlist_tree *tree, if (node_old && node_new) keep = !memcmp(&route_old->nexthop, &route_new->nexthop, sizeof(route_old->nexthop)) && - (route_old->mtu == route_new->mtu) && !route_old->failed; + (route_old->mtu == route_new->mtu) && (route_old->type == route_new->type) && + !route_old->failed; if (node_old) { if (!(route_old->flags & DEVADDR_EXTERNAL) && route_old->enabled && !keep) @@ -1223,7 +1234,6 @@ interface_ip_init(struct interface *iface) __interface_ip_init(&iface->proto_ip, iface); __interface_ip_init(&iface->config_ip, iface); vlist_init(&iface->host_routes, route_cmp, interface_update_host_route); - } static void |