diff options
| author | Hans Dedecker | 2019-01-11 08:49:27 +0000 |
|---|---|---|
| committer | Hans Dedecker | 2019-01-11 09:13:38 +0000 |
| commit | 41494da588b543574196a3cd82eee50115b87be7 (patch) | |
| tree | 235cff381eb4f609733769cb30fe71c7ff1e96b1 | |
| parent | f7437e4d4b97ed829d567b3ca917b25cf5e62dfb (diff) | |
| download | odhcp6c-41494da588b543574196a3cd82eee50115b87be7.tar.gz | |
dhcpv6: get rid of request_prefix
Get rid of the variable request_prefix as it serves no purpose anymore
and even triggers wrong code in dhcpv6_send by setting cnt to 12 which
is an invalid msg_iovlen index
Where appropriate request_prefix check can be replaced by checking the
pd_mode variable.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | src/dhcpv6.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 81887c4..4cb4878 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -103,7 +103,6 @@ static int ifindex = -1; static int64_t t1 = 0, t2 = 0, t3 = 0; // IA states -static int request_prefix = -1; static enum odhcp6c_ia_mode na_mode = IA_MODE_NONE, pd_mode = IA_MODE_NONE; static bool accept_reconfig = false; // Server unicast address @@ -399,9 +398,6 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs) } } - if (ia_pd_entries > 0) - request_prefix = 1; - // Build IA_NAs size_t ia_na_entries, ia_na_len = 0; void *ia_na = NULL; @@ -503,8 +499,6 @@ static void dhcpv6_send(enum dhcpv6_msg type, uint8_t trid[3], uint32_t ecs) size_t cnt = IOV_TOTAL; if (type == DHCPV6_MSG_INFO_REQ) cnt = 8; - else if (!request_prefix) - cnt = 12; // Disable IAs if not used if (type != DHCPV6_MSG_SOLICIT && ia_na_len == 0) @@ -898,7 +892,7 @@ static int dhcpv6_handle_advert(enum dhcpv6_msg orig, const int rc, inf_max_rt <= DHCPV6_INF_MAX_RT_MAX) cand.inf_max_rt = inf_max_rt; - } else if (otype == DHCPV6_OPT_IA_PD && request_prefix && + } else if (otype == DHCPV6_OPT_IA_PD && olen >= -4 + sizeof(struct dhcpv6_ia_hdr)) { struct dhcpv6_ia_hdr *h = (struct dhcpv6_ia_hdr*)&odata[-4]; uint8_t *oend = odata + olen, *d; @@ -1545,7 +1539,7 @@ int dhcpv6_promote_server_cand(void) if (cand->ia_pd_len) { odhcp6c_add_state(STATE_IA_PD, cand->ia_pd, cand->ia_pd_len); free(cand->ia_pd); - if (request_prefix) + if (pd_mode != IA_MODE_NONE) ret = DHCPV6_STATEFUL; } |