diff options
| author | Denys Vlasenko | 2010-03-21 06:46:09 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-03-21 06:46:09 +0100 |
| commit | 53f72bb3f0bd81b1d3af8939a16ec730c7e750c3 (patch) | |
| tree | 0d3f302f7692b5cbd473a76eeb28a506c5d9cf5f /networking/udhcp/clientpacket.c | |
| parent | c7dc79e71ddbc1498736a2bbf65a3da179557f83 (diff) | |
| download | busybox-53f72bb3f0bd81b1d3af8939a16ec730c7e750c3.zip busybox-53f72bb3f0bd81b1d3af8939a16ec730c7e750c3.tar.gz | |
dhcpd: apparently, sometimes IP is in ciaddr, not requested_ip...
also revert the part which appempted to "fix" that in client
function old new delta
udhcpd_main 1949 1964 +15
send_renew 142 105 -37
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 15/-37) Total: -22 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/clientpacket.c')
| -rw-r--r-- | networking/udhcp/clientpacket.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index a0be428..b4a75be 100644 --- a/networking/udhcp/clientpacket.c +++ b/networking/udhcp/clientpacket.c @@ -156,20 +156,7 @@ int FAST_FUNC send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr) init_packet(&packet, DHCPREQUEST); packet.xid = xid; - /* RFC 2131: - * "3.2 Client-server interaction - reusing a previously - * allocated network address"... - * The client broadcasts a DHCPREQUEST message on its local subnet. - * The message includes the client's network address in the - * REQUESTED_IP option. As the client has not received its - * network address, it MUST NOT fill in the 'ciaddr' field." - * - * FIXME: we seem to not follow this, we do set ciaddr. - */ packet.ciaddr = ciaddr; - add_simple_option(packet.options, DHCP_REQUESTED_IP, ciaddr); - if (server) - add_simple_option(packet.options, DHCP_SERVER_ID, server); add_param_req_option(&packet); bb_info_msg("Sending renew..."); |