From 9522e3a263193f9d0971720fb4dd277773694c60 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 3 Sep 2014 12:46:28 +0200 Subject: [PATCH 1/2] dhcp4: do not release and remove lease without request The request/config defines if the lease has to be released or not on a drop request. Do not remove lease file when not requested. --- dhcp4/fsm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dhcp4/fsm.c b/dhcp4/fsm.c index c809e7efa..636356e4f 100644 --- a/dhcp4/fsm.c +++ b/dhcp4/fsm.c @@ -473,9 +473,12 @@ ni_dhcp4_fsm_release(ni_dhcp4_device_t *dev) if (dev->config->release_lease) { ni_debug_dhcp("%s: releasing lease", dev->ifname); ni_dhcp4_device_send_message(dev, DHCP4_RELEASE, dev->lease); + ni_dhcp4_fsm_commit_lease(dev, NULL); + } else { + ni_dhcp4_device_drop_lease(dev); + ni_dhcp4_send_event(NI_DHCP4_EVENT_RELEASED, dev, NULL); + ni_dhcp4_fsm_restart(dev); } - - ni_dhcp4_fsm_commit_lease(dev, NULL); } /* From d235e1e98922e1be5e0e45d8873da71c44e122b3 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 3 Sep 2014 12:52:16 +0200 Subject: [PATCH 2/2] dhcp4: do not use compat but wicked variable names --- dhcp4/fsm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dhcp4/fsm.c b/dhcp4/fsm.c index 636356e4f..5ef46e7ca 100644 --- a/dhcp4/fsm.c +++ b/dhcp4/fsm.c @@ -53,7 +53,9 @@ ni_dhcp4_defer_timeout(void *user_data, const ni_timer_t *timer) ni_warn("%s: bad timer handle", __func__); return; } - ni_note("%s: DHCLIENT_WAIT_AT_BOOT=%u reached (state %s)", dev->ifname, dev->config->defer_timeout, ni_dhcp4_fsm_state_name(dev->fsm.state)); + ni_note("%s: defer timeout %u reached (state %s)", + dev->ifname, dev->config->defer_timeout, + ni_dhcp4_fsm_state_name(dev->fsm.state)); ni_dhcp4_send_event(NI_DHCP4_EVENT_DEFERRED, dev, NULL); }