HI, On Fri, Dec 02, 2016 at 02:42:09PM -0500, Selva Nair wrote: > Also correct the default ifconfig-pool end in docs and comments > > Signed-off-by: Selva Nair <selva.n...@gmail.com> > --- > doc/openvpn.8 | 4 ++-- > src/openvpn/helper.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-)
"why oh why"... options.c: o->tuntap_options.dhcp_masq_offset = 0; /* use network address as intern tun.c: /* At what IP address should the DHCP server masquerade at? */ if (tt->type == DEV_TYPE_TUN) { if (tt->topology == TOP_SUBNET) { if (tt->options.dhcp_masq_custom_offset) ep[2] = dhcp_masq_addr (tt->local, tt->remote_netmask, tt->optio ns.dhcp_masq_offset); else ep[2] = dhcp_masq_addr (tt->local, tt->remote_netmask, -1); } "if no offset was specified, do not use the default setting of the variable, as the code suggest, but use -1 instead, which conflicts with both man page and code documentation" But it goes on... else { ASSERT (tt->type == DEV_TYPE_TAP); ep[2] = dhcp_masq_addr (tt->local, tt->adapter_netmask, tt->options.dh cp_masq_custom_offset ? tt->options.dhcp_masq_offset : 0); } "except if it's a TAP device, in which case we actually *do* use the same value that this was initialized to, namely, 0". I'm going to merge your documentation patch now, for 2.4.0 and 2.3.14, but for git master we should revisit this piece of <deleted>, get rid of "dhcp_masq_custom_offset" *and* make it default to 0 for both tun and tap... (since there is no difference that the windows side of things can see, if .0 works in tap mode, I can't see a reason why it would not work in windows' "tun" mode). ... or why we can't just use route-gateway for this... gert -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany g...@greenie.muc.de fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today.http://sdm.link/xeonphi
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel