From 088d86511f9e407a27a62e16af60ced1fb05944f Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 20 Aug 2008 14:00:34 +0000 Subject: upgrade busybox to v1.11.1 and add current upstream fixes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12348 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/241-udhcpc-oversized_packets.patch | 94 +++++++++------------- 1 file changed, 40 insertions(+), 54 deletions(-) (limited to 'package/busybox/patches/241-udhcpc-oversized_packets.patch') diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch index 93794916c8..6d5ec3607d 100644 --- a/package/busybox/patches/241-udhcpc-oversized_packets.patch +++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch @@ -1,89 +1,75 @@ -Index: busybox-1.7.2/networking/udhcp/packet.c -=================================================================== ---- busybox-1.7.2.orig/networking/udhcp/packet.c 2007-10-30 15:35:00.000000000 -0500 -+++ busybox-1.7.2/networking/udhcp/packet.c 2007-10-30 15:35:01.000000000 -0500 -@@ -121,6 +121,10 @@ +--- a/networking/udhcp/packet.c ++++ b/networking/udhcp/packet.c +@@ -114,6 +114,10 @@ return ~sum; } +int udhcp_get_payload_len(struct dhcpMessage *payload) +{ -+ return sizeof(struct dhcpMessage) - MAX_OPTIONS_LEN + end_option(payload->options) + sizeof(payload->options[0]); ++ return sizeof(struct dhcpMessage) - DHCP_OPTIONS_BUFSIZE + end_option(payload->options) + sizeof(payload->options[0]); +} - /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */ - void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void); -@@ -132,6 +136,7 @@ - int result; - struct sockaddr_ll dest; - struct udp_dhcp_packet packet; + /* Construct a ip/udp header for a packet, send packet */ + int udhcp_send_raw_packet(struct dhcpMessage *payload, +@@ -125,11 +129,7 @@ + int fd; + int result = -1; + const char *msg; +- +- enum { +- IP_UPD_DHCP_SIZE = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, +- UPD_DHCP_SIZE = IP_UPD_DHCP_SIZE - offsetof(struct udp_dhcp_packet, udp), +- }; + int p_len = udhcp_get_payload_len(payload); fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); if (fd < 0) { -@@ -141,6 +146,7 @@ +@@ -139,7 +139,7 @@ memset(&dest, 0, sizeof(dest)); memset(&packet, 0, sizeof(packet)); +- packet.data = *payload; /* struct copy */ + memcpy(&(packet.data), payload, p_len); dest.sll_family = AF_PACKET; dest.sll_protocol = htons(ETH_P_IP); -@@ -158,12 +164,13 @@ +@@ -156,23 +156,18 @@ packet.ip.daddr = dest_ip; packet.udp.source = htons(source_port); packet.udp.dest = htons(dest_port); -- packet.udp.len = htons(sizeof(packet.udp) + sizeof(struct dhcpMessage)); /* cheat on the psuedo-header */ +- /* size, excluding IP header: */ +- packet.udp.len = htons(UPD_DHCP_SIZE); +- /* for UDP checksumming, ip.len is set to UDP packet len */ + p_len += sizeof(packet.udp); + packet.udp.len = htons(p_len); packet.ip.tot_len = packet.udp.len; -- memcpy(&(packet.data), payload, sizeof(struct dhcpMessage)); -- packet.udp.check = udhcp_checksum(&packet, sizeof(struct udp_dhcp_packet)); +- packet.udp.check = udhcp_checksum(&packet, IP_UPD_DHCP_SIZE); +- /* but for sending, it is set to IP packet len */ +- packet.ip.tot_len = htons(IP_UPD_DHCP_SIZE); + p_len += sizeof(packet.ip); + packet.udp.check = udhcp_checksum(&packet, p_len); - -- packet.ip.tot_len = htons(sizeof(struct udp_dhcp_packet)); + packet.ip.tot_len = htons(p_len); packet.ip.ihl = sizeof(packet.ip) >> 2; packet.ip.version = IPVERSION; packet.ip.ttl = IPDEFTTL; -@@ -172,7 +179,7 @@ - if (sizeof(struct udp_dhcp_packet) != 576) - BUG_sizeof_struct_udp_dhcp_packet_must_be_576(); + packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip)); -- result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, +- /* Currently we send full-sized DHCP packets (zero padded). +- * If you need to change this: last byte of the packet is +- * packet.data.options[end_option(packet.data.options)] +- */ +- result = sendto(fd, &packet, IP_UPD_DHCP_SIZE, 0, + result = sendto(fd, &packet, p_len, 0, - (struct sockaddr *) &dest, sizeof(dest)); - if (result <= 0) { - bb_perror_msg("sendto"); -@@ -216,7 +223,7 @@ - return -1; + (struct sockaddr *) &dest, sizeof(dest)); + msg = "sendto"; + ret_close: +@@ -224,8 +219,7 @@ + goto ret_close; } -- result = write(fd, payload, sizeof(struct dhcpMessage)); -+ result = write(fd, payload, udhcp_get_payload_len(payload)); +- /* Currently we send full-sized DHCP packets (see above) */ +- result = safe_write(fd, payload, DHCP_SIZE); ++ result = safe_write(fd, payload, udhcp_get_payload_len(payload)); + msg = "write"; + ret_close: close(fd); - return result; - } -Index: busybox-1.7.2/networking/udhcp/common.h -=================================================================== ---- busybox-1.7.2.orig/networking/udhcp/common.h 2007-10-30 15:35:00.000000000 -0500 -+++ busybox-1.7.2/networking/udhcp/common.h 2007-10-30 15:35:01.000000000 -0500 -@@ -21,6 +21,8 @@ - #include - #include - -+#define MAX_OPTIONS_LEN 308 -+ - struct dhcpMessage { - uint8_t op; - uint8_t htype; -@@ -37,7 +39,7 @@ - uint8_t sname[64]; - uint8_t file[128]; - uint32_t cookie; -- uint8_t options[308]; /* 312 - cookie */ -+ uint8_t options[MAX_OPTIONS_LEN]; /* 312 - cookie */ - }; - - struct udp_dhcp_packet { -- cgit v1.2.3