diff options
| author | Matija Amidzic <matija.amidzic@sartura.hr> | 2018-12-21 15:58:47 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2019-01-15 11:33:43 +0100 |
| commit | 7abbed4fba6c9b75ec5331291eb7dc787f99a977 (patch) | |
| tree | 16f27e93fe6e49c7b99e60eed26d588465ec2f87 /src | |
| parent | dd1aefd24fa2b23a3f54a327636e06a782248b66 (diff) | |
dhcpv6: add setting to choose IA_NA, IA_PD or both
Adds the config options to set if DHCPv6 'stateful addresing' hands out
IA_NA (Internet Address - Network Address), IA_PD (Internet Address -
Prefix Delegation), both or none.
Signed-off-by: Matija Amidzic <matija.amidzic@sartura.hr>
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 12 | ||||
| -rw-r--r-- | src/dhcpv6-ia.c | 6 | ||||
| -rw-r--r-- | src/odhcpd.h | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/config.c b/src/config.c index 29d7181..68aacd8 100644 --- a/src/config.c +++ b/src/config.c @@ -45,6 +45,8 @@ enum { IFACE_ATTR_DHCPV4_FORCERECONF, IFACE_ATTR_DHCPV6_RAW, IFACE_ATTR_DHCPV6_ASSIGNALL, + IFACE_ATTR_DHCPV6_PD, + IFACE_ATTR_DHCPV6_NA, IFACE_ATTR_RA_DEFAULT, IFACE_ATTR_RA_MANAGEMENT, IFACE_ATTR_RA_OFFLINK, @@ -89,6 +91,8 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_DHCPV4_FORCERECONF] = { .name = "dhcpv4_forcereconf", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_DHCPV6_RAW] = { .name = "dhcpv6_raw", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DHCPV6_ASSIGNALL] = { .name ="dhcpv6_assignall", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_DHCPV6_PD] = { .name = "dhcpv6_pd", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_DHCPV6_NA] = { .name = "dhcpv6_na", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_PD_MANAGER] = { .name = "pd_manager", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_PD_CER] = { .name = "pd_cer", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_RA_DEFAULT] = { .name = "ra_default", .type = BLOBMSG_TYPE_INT32 }, @@ -216,6 +220,8 @@ static void set_interface_defaults(struct interface *iface) iface->learn_routes = 1; iface->dhcpv4_leasetime = 43200; iface->dhcpv6_assignall = true; + iface->dhcpv6_pd = true; + iface->dhcpv6_na = true; iface->ra_managed = RA_MANAGED_MFLAG; iface->ra_maxinterval = 600; iface->ra_mininterval = iface->ra_maxinterval/3; @@ -651,6 +657,12 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_DHCPV6_ASSIGNALL])) iface->dhcpv6_assignall = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_DHCPV6_PD])) + iface->dhcpv6_pd = blobmsg_get_bool(c); + + if ((c = tb[IFACE_ATTR_DHCPV6_NA])) + iface->dhcpv6_na = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_RA_DEFAULT])) iface->default_router = blobmsg_get_u32(c); diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 3b2dfaf..415ec2a 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -1262,7 +1262,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface, (hdr->msg_type == DHCPV6_MSG_REBIND && !a)) { bool assigned = !!a; - if (!a && !iface->no_dynamic_dhcp) { + if (!a && !iface->no_dynamic_dhcp && (iface->dhcpv6_pd || iface->dhcpv6_na)) { /* Create new binding */ a = calloc(1, sizeof(*a) + clid_len); if (a) { @@ -1282,10 +1282,10 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface, odhcpd_urandom(a->key, sizeof(a->key)); memcpy(a->clid_data, clid_data, clid_len); - if (is_pd) + if (is_pd && iface->dhcpv6_pd) while (!(assigned = assign_pd(iface, a)) && !a->managed_size && ++a->length <= 64); - else + else if (is_na && iface->dhcpv6_na) assigned = assign_na(iface, a); if (a->managed_size && !assigned) diff --git a/src/odhcpd.h b/src/odhcpd.h index 10f26b1..5157f1f 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -236,6 +236,8 @@ struct interface { void *dhcpv6_raw; size_t dhcpv6_raw_len; bool dhcpv6_assignall; + bool dhcpv6_pd; + bool dhcpv6_na; char *upstream; size_t upstream_len; |