ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DHCP4 client process replies when renewing lease

Browse Source 
When a DHCP client is in the bound state, it wakes up
halfway through it's lease (by default) to try and renew
the lease. The ip4-dhcp-client-detect is not enabled as
a feature at this point, so replies sent from the DHCP
server do not get applied to the lease. Eventually the
lease expires, the address is removed from the interface,
a new discovery is performed and the same address is added
back to the interface.

Before sending a request to renew in the bound state, enable
the feature to process the reply.

Change-Id: I95332ee0596f47df6f3c8bf8e3f0698dde9a1fc5
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
This commit is contained in:
Matthew Smith
2018-05-07 07:52:12 -05:00
committed by Dave Barach
parent 23e310a025
commit 7cb7bb3fa1
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/vnet/dhcp/client.c
View File

@ -102,12 +102,18 @@ dhcp_client_addr_callback (dhcp_client_t * c)
dhcp_client_main_t *dcm = &dhcp_client_main; dhcp_client_main_t *dcm = &dhcp_client_main;
void (*fp) (u32, u32, u8 *, u8, u8, u8 *, u8 *, u8 *) = c->event_callback; void (*fp) (u32, u32, u8 *, u8, u8, u8 *, u8 *, u8 *) = c->event_callback;
/* add the advertised subnet and disable the feature */ /* disable the feature */
dhcp_client_acquire_address (dcm, c);
vnet_feature_enable_disable ("ip4-unicast", vnet_feature_enable_disable ("ip4-unicast",
"ip4-dhcp-client-detect", "ip4-dhcp-client-detect",
c->sw_if_index, 0 /* disable */ , 0, 0); c->sw_if_index, 0 /* disable */ , 0, 0);
/* if renewing the lease, the address and route have already been added */
if (c->state == DHCP_BOUND)
return;
/* add the address to the interface */
dhcp_client_acquire_address (dcm, c);
/* /*
* Configure default IP route: * Configure default IP route:
*/ */
@ -326,9 +332,8 @@ dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
break; break;
} }
/* OK, we own the address (etc), add to the routing table(s) */ /* OK, we own the address (etc), add to the routing table(s) */
if (c->state == DHCP_REQUEST) vl_api_rpc_call_main_thread (dhcp_client_addr_callback,
vl_api_rpc_call_main_thread (dhcp_client_addr_callback, (u8 *) c, sizeof (*c));
(u8 *) c, sizeof (*c));
c->state = DHCP_BOUND; c->state = DHCP_BOUND;
c->retry_count = 0; c->retry_count = 0;
@ -607,10 +612,22 @@ static int
dhcp_bound_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now) dhcp_bound_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
{ {
/* /*
* State machine "BOUND" state. Send a dhcp request packet, * State machine "BOUND" state. Send a dhcp request packet to renew
* eventually, when the lease expires, forget the dhcp data * the lease.
* Eventually, when the lease expires, forget the dhcp data
* and go back to the stone age. * and go back to the stone age.
*/ */
/*
* We disable the client detect feature when we bind a
* DHCP address. Turn it back on again on first renew attempt.
* Otherwise, if the DHCP server replies we'll never see it.
*/
if (!c->retry_count)
vnet_feature_enable_disable ("ip4-unicast",
"ip4-dhcp-client-detect",
c->sw_if_index, 1 /* enable */ , 0, 0);
send_dhcp_pkt (dcm, c, DHCP_PACKET_REQUEST, 0 /* is_broadcast */ ); send_dhcp_pkt (dcm, c, DHCP_PACKET_REQUEST, 0 /* is_broadcast */ );
c->retry_count++; c->retry_count++;
@ -650,15 +667,6 @@ dhcp_bound_state (dhcp_client_main_t * dcm, dhcp_client_t * c, f64 now)
c->router_address.as_u32 = 0; c->router_address.as_u32 = 0;
c->lease_renewal_interval = 0; c->lease_renewal_interval = 0;
c->dhcp_server.as_u32 = 0; c->dhcp_server.as_u32 = 0;
/*
* We disable the client detect feature when we bind a
* DHCP address. Turn it back on again here.
* Otherwise, if the DHCP server replies after an outage,
* we'll never see it.
*/
vnet_feature_enable_disable ("ip4-unicast",
"ip4-dhcp-client-detect",
c->sw_if_index, 1 /* enable */ , 0, 0);
return 1; return 1;
} }
return 0; return 0;