Hi,
On 02/07/15 14:16, Jonathan K. Bullard wrote:
On Thu, Jul 2, 2015 at 2:56 AM, Jan Just Keijser <[email protected]> wrote:
Attached is the patch to add the TFTP and WPAD DHCP options. The patch
is based on openvpn 2.3.7 as I did not know how to do a windows mingw
build of the git version ...
The patch was tested on Windows XP 32bit and Windows 7sp1 64bit.
A 64bit windows binary can be found @
http://www.nikhef.nl/~janjust/openvpn-2.3.7-dhcp-win64.exe
Signed-off-by: Jan Just Keijser <[email protected]>
<snip>
NAK, but easy to fix (I think). Three small problems are described below.
@@ -6153,6 +6157,14 @@
{
o->disable_nbt = 1;
}
+ else if (streq (p[1], "TFTP") && p[2])
+ {
+ o->tftp = p[2];
+ }
+ else if (streq (p[1], "WPAD") && p[2])
+ {
+ o->wpad_url = p[2];
+ }
else
{
msg (msglevel, "--dhcp-option: unknown option type '%s' or
missing parameter", p[1]);
1. Shouldn't "dhcp_option_address_parse()" be used to set o->tftp and
o->wpad_url? (In the code just before this, it is used for NTP, WINS,
etc.)
nope : both options are strings, not inet addresses. You can specify a
hostname for both (as the RFC states)
--- openvpn-2.3.7/src/openvpn/tun.c 2015-06-08 08:16:35.000000000 +0200
+++ /tmp/build-x86_64/openvpn-2.3.7/src/openvpn/tun.c 2015-07-02
11:30:19.979658823 +0200
@@ -4692,6 +4692,23 @@
buf_write_u8 (buf, 4); /* length of the vendor specified field */
buf_write_u32 (buf, 0x002);
}
+
+ write_dhcp_str (buf, 66, o->tftp, &error);
+ write_dhcp_str (buf, 150, o->tftp, &error);
+
+ /* IE6 seems to requires an extra charachter at the end of the URL */
<snip>
2. This should be "character", not "charachter".
thx
3. This should be documented on the man page, too.
ah, yes, will do
thx for the review,
JJK
