diff options
| author | Denys Vlasenko | 2018-06-21 17:36:22 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2018-06-21 17:38:14 +0200 |
| commit | 148788eb0ee96026105755cf3fd1ad3d94f49cd2 (patch) | |
| tree | aa300fa3e844410b823b87ca759060b668ff5b80 /networking/udhcp/d6_dhcpc.c | |
| parent | 6fb8bd795c3f40735ced3f51b8082f91956fd786 (diff) | |
| download | busybox-148788eb0ee96026105755cf3fd1ad3d94f49cd2.zip busybox-148788eb0ee96026105755cf3fd1ad3d94f49cd2.tar.gz | |
udhcpc: remove code which requires server ID to be on local network
This reverts "udhcpc: paranoia when using kernel UDP mode
for sending renew: server ID may be bogus".
Users complain that they do have servers behind routers
(with DHCP relays).
function old new delta
send_packet 168 166 -2
bcast_or_ucast 25 23 -2
udhcp_send_kernel_packet 301 295 -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-10) Total: -10 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp/d6_dhcpc.c')
| -rw-r--r-- | networking/udhcp/d6_dhcpc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index 4dbc2b1..ed2255e 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c @@ -803,15 +803,13 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st opt_ptr = add_d6_client_options(opt_ptr); bb_error_msg("sending %s", "renew"); - if (server_ipv6) { + if (server_ipv6) return d6_send_kernel_packet( &packet, (opt_ptr - (uint8_t*) &packet), our_cur_ipv6, CLIENT_PORT6, server_ipv6, SERVER_PORT6, client_config.ifindex - /* TODO? send_flags: MSG_DONTROUTE (see IPv4 code for reason why) */ ); - } return d6_mcast_from_client_config_ifindex(&packet, opt_ptr); } |