emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcpc: send client-id option in DHCPDECLINE

Browse Source 
function                                             old     new   delta
add_serverid_and_clientid_options                      -      46     +46
send_decline                                          88      83      -5
perform_release                                      200     159     -41
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 46/-46)              Total: 0 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-06-15 00:34:04 +02:00
parent 52c4b7ac3b
commit 40a327aeae
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
networking/udhcp/dhcpc.c
View File

@ -663,6 +663,24 @@ static void add_client_options(struct dhcp_packet *packet)
// ...add (DHCP_VENDOR, "udhcp "BB_VER) opt... // ...add (DHCP_VENDOR, "udhcp "BB_VER) opt...
} }
static void add_serverid_and_clientid_options(struct dhcp_packet *packet, uint32_t server)
{
struct option_set *ci;
udhcp_add_simple_option(packet, DHCP_SERVER_ID, server);
/* RFC 2131 section 2:
* If the client uses a 'client identifier' in one message,
* it MUST use that same identifier in all subsequent messages.
* section 3.1.6:
* If the client used a 'client identifier' when it obtained the lease,
* it MUST use the same 'client identifier' in the DHCPRELEASE message.
*/
ci = udhcp_find_option(client_data.options, DHCP_CLIENT_ID);
if (ci)
udhcp_add_binary_option(packet, ci->data);
}
/* RFC 2131 /* RFC 2131
* 4.4.4 Use of broadcast and unicast * 4.4.4 Use of broadcast and unicast
* *
@ -759,7 +777,7 @@ static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requeste
udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server); udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
/* Add options: maxsize, /* Add options: maxsize,
* "param req" option according to -O, and options specified with -x * "param req" option according to -O, options specified with -x
*/ */
add_client_options(&packet); add_client_options(&packet);
@ -803,7 +821,7 @@ static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
packet.ciaddr = ciaddr; packet.ciaddr = ciaddr;
/* Add options: maxsize, /* Add options: maxsize,
* "param req" option according to -O, and options specified with -x * "param req" option according to -O, options specified with -x
*/ */
add_client_options(&packet); add_client_options(&packet);
@ -841,9 +859,7 @@ static NOINLINE int send_decline(/*uint32_t xid,*/ uint32_t server, uint32_t req
/* DHCPDECLINE uses "requested ip", not ciaddr, to store offered IP */ /* DHCPDECLINE uses "requested ip", not ciaddr, to store offered IP */
udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested); udhcp_add_simple_option(&packet, DHCP_REQUESTED_IP, requested);
udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server); add_serverid_and_clientid_options(&packet, server);
//TODO: add client-id opt?
bb_simple_info_msg("broadcasting decline"); bb_simple_info_msg("broadcasting decline");
return raw_bcast_from_client_data_ifindex(&packet, INADDR_ANY); return raw_bcast_from_client_data_ifindex(&packet, INADDR_ANY);
@ -856,7 +872,6 @@ ALWAYS_INLINE /* one caller, help compiler to use this fact */
int send_release(uint32_t server, uint32_t ciaddr) int send_release(uint32_t server, uint32_t ciaddr)
{ {
struct dhcp_packet packet; struct dhcp_packet packet;
struct option_set *ci;
/* Fill in: op, htype, hlen, cookie, chaddr, random xid fields, /* Fill in: op, htype, hlen, cookie, chaddr, random xid fields,
* message type option: * message type option:
@ -866,15 +881,7 @@ int send_release(uint32_t server, uint32_t ciaddr)
/* DHCPRELEASE uses ciaddr, not "requested ip", to store IP being released */ /* DHCPRELEASE uses ciaddr, not "requested ip", to store IP being released */
packet.ciaddr = ciaddr; packet.ciaddr = ciaddr;
udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server); add_serverid_and_clientid_options(&packet, server);
/* RFC 2131 section 3.1.6:
* If the client used a 'client identifier' when it obtained the lease,
* it MUST use the same 'client identifier' in the DHCPRELEASE message.
*/
ci = udhcp_find_option(client_data.options, DHCP_CLIENT_ID);
if (ci)
udhcp_add_binary_option(&packet, ci->data);
bb_info_msg("sending %s", "release"); bb_info_msg("sending %s", "release");
/* Note: normally we unicast here since "server" is not zero. /* Note: normally we unicast here since "server" is not zero.