config: make RA curHopLimit configurable via uci

Allow to specify the router advertisement current hop limit via the uci
parameter ra_hoplimit. If hoplimit is not configured the hoplimit is
taken from the interface as before.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>

diff --git a/README b/README
index 3ad17f90b5e4b661a9d58668d0be8831aa20d34b..1099297d39d66c6360d43b829873608475db9c62 100644 (file)
--- a/README
+++ b/README
@@ -116,6 +116,8 @@ ra_lifetime integer 1800                    Value to be placed in Router
 ra_useleasetime        bool    0                       Use configured leasetime as
                                                limit for the preferred and
                                                valid lifetime of a prefix
+ra_hoplimit    integer 0                       Current hoplimit to be advertised
+                                               in RA messages
 ra_mtu         integer 0                       MTU to be advertised in
                                                RA messages
 ndproxy_routing        bool    1                       Learn routes from NDP

diff --git a/src/config.c b/src/config.c
index d6b4e81ab027e8cdbfa1d0784837f4f71afbcb88..1f6877ab68e9786a9e1df72ab66a99511f542f8e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -50,6 +50,7 @@ enum {
        IFACE_ATTR_RA_MAXINTERVAL,
        IFACE_ATTR_RA_LIFETIME,
        IFACE_ATTR_RA_USELEASETIME,
+       IFACE_ATTR_RA_HOPLIMIT,
        IFACE_ATTR_RA_MTU,
        IFACE_ATTR_PD_MANAGER,
        IFACE_ATTR_PD_CER,
@@ -89,6 +90,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_RA_MAXINTERVAL] = { .name = "ra_maxinterval", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_RA_LIFETIME] = { .name = "ra_lifetime", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_RA_USELEASETIME] = { .name = "ra_useleasetime", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_RA_HOPLIMIT] = { .name = "ra_hoplimit", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_RA_MTU] = { .name = "ra_mtu", .type = BLOBMSG_TYPE_INT32 },
        [IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL },
@@ -596,6 +598,12 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
        if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
                iface->managed = blobmsg_get_u32(c);
 
+       if ((c = tb[IFACE_ATTR_RA_HOPLIMIT])) {
+               iface->ra_hoplimit = blobmsg_get_u32(c);
+               if (iface->ra_hoplimit > 255)
+                       goto err;
+       }
+
        if ((c = tb[IFACE_ATTR_RA_MTU])) {
                iface->ra_mtu = blobmsg_get_u32(c);
                if (iface->ra_mtu < 1280)

diff --git a/src/odhcpd.h b/src/odhcpd.h
index 50827a4d1af0a9969199aee4106856921f768ffc..28c81eb9f8f942f5568cff28136f71d9d0c97344 100644 (file)
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -162,6 +162,7 @@ struct interface {
        int ra_maxinterval;
        int ra_mininterval;
        int ra_lifetime;
+       uint32_t ra_hoplimit;
        uint32_t ra_mtu;
 
        // DHCPv4

diff --git a/src/router.c b/src/router.c
index a31bf4e0f2584b8bb8b6febc535410ad67a36867..faf9e9d03c6be3d8ce0c659e4a193b9127d43242 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -260,7 +260,7 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 {
        time_t now = odhcpd_time();
        uint32_t mtu = iface->ra_mtu;
-       int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+       int hlim = iface->ra_hoplimit;
 
        if (mtu == 0)
                 mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
@@ -268,6 +268,9 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        if (mtu < 1280)
                mtu = 1280;
 
+       if (hlim == 0)
+               hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+
        struct {
                struct nd_router_advert h;
                struct icmpv6_opt lladdr;