Add support for onlink-flags for IPv4 routes

Signed-off-by: Steven Barth <steven@midlink.org>

diff --git a/interface-ip.c b/interface-ip.c
index 33b5d4326d3b3ecf20026201f8382533577bf65b..bd6f16483a245086cc2170dee7769181e2c79795 100644 (file)
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -38,6 +38,7 @@ enum {
        ROUTE_VALID,
        ROUTE_TABLE,
        ROUTE_SOURCE,
+       ROUTE_ONLINK,
        __ROUTE_MAX
 };
 
@@ -51,6 +52,7 @@ static const struct blobmsg_policy route_attr[__ROUTE_MAX] = {
        [ROUTE_TABLE] = { .name = "table", .type = BLOBMSG_TYPE_STRING },
        [ROUTE_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_INT32 },
        [ROUTE_SOURCE] = { .name = "source", .type = BLOBMSG_TYPE_STRING },
+       [ROUTE_ONLINK] = { .name = "onlink", .type = BLOBMSG_TYPE_BOOL },
 };
 
 const struct uci_blob_param_list route_attr_list = {
@@ -347,6 +349,9 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
                route->sourcemask = (mask) ? atoi(mask) : ((af == AF_INET6) ? 128 : 32);
        }
 
+       if ((cur = tb[ROUTE_ONLINK]) != NULL && blobmsg_get_bool(cur))
+               route->flags |= DEVROUTE_ONLINK;
+
        if (is_proto_route) {
                route->table = (v6) ? iface->ip6table : iface->ip4table;
                route->flags |= DEVROUTE_SRCTABLE;

diff --git a/interface-ip.h b/interface-ip.h
index de8343d04e14643a135b14fdd7948ad440f5e6a5..93d55eee61247fd98de68676fb197a3368e2feff 100644 (file)
--- a/interface-ip.h
+++ b/interface-ip.h
@@ -42,6 +42,9 @@ enum device_addr_flags {
 
        /* route resides in default source-route table */
        DEVROUTE_SRCTABLE       = (1 << 8),
+
+       /* route is on-link */
+       DEVROUTE_ONLINK         = (1 << 9),
 };
 
 union if_addr {

diff --git a/system-linux.c b/system-linux.c
index 06226ef68fd2824bf8de20332f1adee5620753b6..744742279efc719a2f1e666947b08153de0f89da 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -1221,6 +1221,7 @@ static int system_rt(struct device *dev, struct device_route *route, int cmd)
                .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC,
                .rtm_scope = scope,
                .rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST,
+               .rtm_flags = (route->flags & DEVROUTE_ONLINK) ? RTNH_F_ONLINK : 0,
        };
        struct nl_msg *msg;