Skip to content

Commit

Permalink
Fix DHCP NAK bombs on Windows 7
Browse files Browse the repository at this point in the history
It's been reported DHCP NAK flooding in the event log in some situations,
and often related to restoring from a suspend/hibernate condition.

This fix has been tested by the community.

Trac-ticket: 97
Reported-by: Jan Just Keijser <janjust@nikhef.nl>
Suggested-by: ert <ert@csp.at>
Tested-by: ert <ert@csp.at>
Reviewed-by: James Yonan <james@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
  • Loading branch information
David Sommerseth committed Jul 19, 2012
1 parent 12f27cd commit 5728d5f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/dhcp.c
Expand Up @@ -443,7 +443,7 @@ ProcessDHCP (TapAdapterPointer p_Adapter,
p_Adapter->m_dhcp_received_discover = TRUE;

// Is this a bad DHCPREQUEST?
if (msg_type == DHCPREQUEST && dhcp->ciaddr != p_Adapter->m_dhcp_addr)
if (msg_type == DHCPREQUEST && dhcp->ciaddr && dhcp->ciaddr != p_Adapter->m_dhcp_addr)
++p_Adapter->m_dhcp_bad_requests;

return TRUE;
Expand Down
2 changes: 1 addition & 1 deletion version.m4
@@ -1,6 +1,6 @@
dnl define the TAP version
define([PRODUCT_NAME], [TAP-Windows])
define([PRODUCT_VERSION], [9.9.1])
define([PRODUCT_VERSION], [9.9.2])
define([PRODUCT_VERSION_RESOURCE], [9,0,0,9])
define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
define([PRODUCT_TAP_WIN_MAJOR], [9])
Expand Down

0 comments on commit 5728d5f

Please sign in to comment.