mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 03:52:28 +02:00
Code

Skip DHCP renew with Wintun adapter

Browse Source 
Wintun does not support DHCP.
Running  DHCP renew with Wintun adapter fails with a logged warning.

Fixed so that DHCP renewing is called only for TAP-Windows6 adapters.
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Message-Id: <20201215173004.26170-1-domagoj@pensa.hr>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21364.html

Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Domagoj Pensa 2020-12-15 18:30:04 +01:00 committed by Gert Doering
parent b1a8213ee3
commit e0e7625c6b
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/openvpn/tun.c
View File

@ -6154,35 +6154,35 @@ tuntap_set_ip_addr(struct tuntap *tt,
status,
strerror_win32(status, &gc));
}
}
/*
* If the TAP-Windows driver is masquerading as a DHCP server
* make sure the TCP/IP properties for the adapter are
* set correctly.
*/
if (dhcp_masq_post)
{
/* check dhcp enable status */
if (dhcp_status(index) == DHCP_STATUS_DISABLED)
/*
* If the TAP-Windows driver is masquerading as a DHCP server
* make sure the TCP/IP properties for the adapter are
* set correctly.
*/
if (dhcp_masq_post)
{
msg(M_WARN, "WARNING: You have selected '--ip-win32 dynamic', which will not work unless the TAP-Windows TCP/IP properties are set to 'Obtain an IP address automatically'");
}
/* check dhcp enable status */
if (dhcp_status(index) == DHCP_STATUS_DISABLED)
{
msg(M_WARN, "WARNING: You have selected '--ip-win32 dynamic', which will not work unless the TAP-Windows TCP/IP properties are set to 'Obtain an IP address automatically'");
}
/* force an explicit DHCP lease renewal on TAP adapter? */
if (tt->options.dhcp_pre_release)
{
dhcp_release(tt);
/* force an explicit DHCP lease renewal on TAP adapter? */
if (tt->options.dhcp_pre_release)
{
dhcp_release(tt);
}
if (tt->options.dhcp_renew)
{
dhcp_renew(tt);
}
}
if (tt->options.dhcp_renew)
else
{
dhcp_renew(tt);
fork_dhcp_action(tt);
}
}
else
{
fork_dhcp_action(tt);
}
if (tt->did_ifconfig_setup && tt->options.ip_win32_type == IPW32_SET_IPAPI)
{