From 53f72bb3f0bd81b1d3af8939a16ec730c7e750c3 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 21 Mar 2010 06:46:09 +0100 Subject: 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 --- networking/udhcp/clientpacket.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'networking/udhcp/clientpacket.c') diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c index a0be42885..b4a75be02 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..."); -- cgit v1.2.3