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

udhcpc: remove code which requires server ID to be on local network

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2018-06-21 17:36:22 +02:00
parent 6fb8bd795c
commit 148788eb0e
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
networking/udhcp/common.h
View File

@ -317,9 +317,7 @@ int udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
uint32_t source_nip, int source_port, uint32_t source_nip, int source_port,
uint32_t dest_nip, int dest_port, uint32_t dest_nip, int dest_port) FAST_FUNC;
int send_flags
) FAST_FUNC;
void udhcp_sp_setup(void) FAST_FUNC; void udhcp_sp_setup(void) FAST_FUNC;
void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC; void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;

4
networking/udhcp/d6_dhcpc.c
View File

@ -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); opt_ptr = add_d6_client_options(opt_ptr);
bb_error_msg("sending %s", "renew"); bb_error_msg("sending %s", "renew");
if (server_ipv6) { if (server_ipv6)
return d6_send_kernel_packet( return d6_send_kernel_packet(
&packet, (opt_ptr - (uint8_t*) &packet), &packet, (opt_ptr - (uint8_t*) &packet),
our_cur_ipv6, CLIENT_PORT6, our_cur_ipv6, CLIENT_PORT6,
server_ipv6, SERVER_PORT6, server_ipv6, SERVER_PORT6,
client_config.ifindex client_config.ifindex
/* TODO? send_flags: MSG_DONTROUTE (see IPv4 code for reason why) */
); );
}
return d6_mcast_from_client_config_ifindex(&packet, opt_ptr); return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
} }

10
networking/udhcp/dhcpc.c
View File

@ -693,16 +693,10 @@ static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet, uint
static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t server) static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t server)
{ {
if (server) { if (server)
/* Without MSG_DONTROUTE, the packet was seen routed over
* _other interface_ if server ID is bogus (example: 1.1.1.1).
*/
return udhcp_send_kernel_packet(packet, return udhcp_send_kernel_packet(packet,
ciaddr, CLIENT_PORT, ciaddr, CLIENT_PORT,
server, SERVER_PORT, server, SERVER_PORT);
/*send_flags: "to hosts only on directly connected networks" */ MSG_DONTROUTE
);
}
return raw_bcast_from_client_config_ifindex(packet, ciaddr); return raw_bcast_from_client_config_ifindex(packet, ciaddr);
} }

4
networking/udhcp/dhcpd.c
View File

@ -591,9 +591,7 @@ static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
udhcp_send_kernel_packet(dhcp_pkt, udhcp_send_kernel_packet(dhcp_pkt,
server_config.server_nip, SERVER_PORT, server_config.server_nip, SERVER_PORT,
dhcp_pkt->gateway_nip, SERVER_PORT, dhcp_pkt->gateway_nip, SERVER_PORT);
/*send_flags:*/ 0
);
} }
static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast) static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast)

7
networking/udhcp/packet.c
View File

@ -189,8 +189,7 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
/* Let the kernel do all the work for packet generation */ /* Let the kernel do all the work for packet generation */
int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt, int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
uint32_t source_nip, int source_port, uint32_t source_nip, int source_port,
uint32_t dest_nip, int dest_port, uint32_t dest_nip, int dest_port)
int send_flags)
{ {
struct sockaddr_in sa; struct sockaddr_in sa;
unsigned padding; unsigned padding;
@ -227,8 +226,8 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options); padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options);
if (padding > DHCP_SIZE - 300) if (padding > DHCP_SIZE - 300)
padding = DHCP_SIZE - 300; padding = DHCP_SIZE - 300;
result = send(fd, dhcp_pkt, DHCP_SIZE - padding, send_flags); result = safe_write(fd, dhcp_pkt, DHCP_SIZE - padding);
msg = "send"; msg = "write";
ret_close: ret_close:
close(fd); close(fd);
if (result < 0) { if (result < 0) {