diff options
Diffstat (limited to 'networking/udhcp/dhcpc.c')
-rw-r--r-- | networking/udhcp/dhcpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 331f13a8c..c757fb37c 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -658,7 +658,7 @@ static void add_client_options(struct dhcp_packet *packet) | |||
658 | 658 | ||
659 | // This will be needed if we remove -V VENDOR_STR in favor of | 659 | // This will be needed if we remove -V VENDOR_STR in favor of |
660 | // -x vendor:VENDOR_STR | 660 | // -x vendor:VENDOR_STR |
661 | //if (!udhcp_find_option(packet.options, DHCP_VENDOR)) | 661 | //if (!udhcp_find_option(packet.options, DHCP_VENDOR, /*dhcpv6:*/ 0)) |
662 | // /* not set, set the default vendor ID */ | 662 | // /* not set, set the default vendor ID */ |
663 | // ...add (DHCP_VENDOR, "udhcp "BB_VER) opt... | 663 | // ...add (DHCP_VENDOR, "udhcp "BB_VER) opt... |
664 | } | 664 | } |
@@ -676,7 +676,7 @@ static void add_serverid_and_clientid_options(struct dhcp_packet *packet, uint32 | |||
676 | * If the client used a 'client identifier' when it obtained the lease, | 676 | * If the client used a 'client identifier' when it obtained the lease, |
677 | * it MUST use the same 'client identifier' in the DHCPRELEASE message. | 677 | * it MUST use the same 'client identifier' in the DHCPRELEASE message. |
678 | */ | 678 | */ |
679 | ci = udhcp_find_option(client_data.options, DHCP_CLIENT_ID); | 679 | ci = udhcp_find_option(client_data.options, DHCP_CLIENT_ID, /*dhcpv6:*/ 0); |
680 | if (ci) | 680 | if (ci) |
681 | udhcp_add_binary_option(packet, ci->data); | 681 | udhcp_add_binary_option(packet, ci->data); |
682 | } | 682 | } |
@@ -1328,7 +1328,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) | |||
1328 | } | 1328 | } |
1329 | 1329 | ||
1330 | clientid_mac_ptr = NULL; | 1330 | clientid_mac_ptr = NULL; |
1331 | if (!(opt & OPT_C) && !udhcp_find_option(client_data.options, DHCP_CLIENT_ID)) { | 1331 | if (!(opt & OPT_C) && !udhcp_find_option(client_data.options, DHCP_CLIENT_ID, /*dhcpv6:*/ 0)) { |
1332 | /* not suppressed and not set, create default client ID */ | 1332 | /* not suppressed and not set, create default client ID */ |
1333 | clientid_mac_ptr = udhcp_insert_new_option( | 1333 | clientid_mac_ptr = udhcp_insert_new_option( |
1334 | &client_data.options, DHCP_CLIENT_ID, | 1334 | &client_data.options, DHCP_CLIENT_ID, |