diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-09 16:35:34 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-09 16:35:34 +0100 |
| commit | 1a7f9ade59d3cf092d8fe2c341d13e9abb834b2c (patch) | |
| tree | c2862c0ce46b80f565a18a25fa96145ef59ad0b2 /src/openvpn/tun.c | |
| parent | 1aff45d6fdfbc63a0256a831a8f8644a84708e9f (diff) | |
| parent | 9d320b2bf4b83f6e2a3c679a399b88dfe57b879e (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/openvpn/tun.c')
| -rw-r--r-- | src/openvpn/tun.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 512ccba..db8fdec 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6388,14 +6388,7 @@ tuntap_dhcp_mask(const struct tuntap *tt, const char *device_guid) { if (tt->topology == TOP_SUBNET) { - if (tt->options.dhcp_masq_custom_offset) - { - ep[2] = dhcp_masq_addr(tt->local, tt->remote_netmask, tt->options.dhcp_masq_offset); - } - else - { - ep[2] = dhcp_masq_addr(tt->local, tt->remote_netmask, -1); - } + ep[2] = dhcp_masq_addr(tt->local, tt->remote_netmask, tt->options.dhcp_masq_custom_offset ? tt->options.dhcp_masq_offset : 0); } else { |