X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9eafd1cb17da2076804266cfcc8f9f6b54694352..86143fe01068cd4a7703629b88ce41e51bccb03b:/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 d041bf5c3..0ee4c542e 100644 --- a/package/busybox/patches/241-udhcpc-oversized_packets.patch +++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch @@ -1,85 +1,89 @@ -diff -ruN busybox-1.2.1-old/networking/udhcp/packet.c busybox-1.2.1-new/networking/udhcp/packet.c ---- busybox-1.2.1-old/networking/udhcp/packet.c 2006-07-01 00:42:02.000000000 +0200 -+++ busybox-1.2.1-new/networking/udhcp/packet.c 2006-11-19 01:04:40.000000000 +0100 -@@ -111,6 +111,10 @@ +--- a/networking/udhcp/packet.c ++++ b/networking/udhcp/packet.c +@@ -164,6 +164,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * return ~sum; } -+int udhcp_get_payload_len(struct dhcpMessage *payload) ++int udhcp_get_payload_len(struct dhcp_packet *dhcp_pkt) +{ -+ return sizeof(struct dhcpMessage) - MAX_OPTIONS_LEN + end_option(payload->options) + sizeof(payload->options[0]); ++ return sizeof(struct dhcp_packet) - DHCP_OPTIONS_BUFSIZE + end_option(dhcp_pkt->options) + sizeof(dhcp_pkt->options[0]); +} ++ + /* Construct a ip/udp header for a packet, send packet */ + int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, + uint32_t source_ip, int source_port, +@@ -175,11 +180,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru + int fd; + int result = -1; + const char *msg; +- +- enum { +- IP_UPD_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, +- UPD_DHCP_SIZE = IP_UPD_DHCP_SIZE - offsetof(struct ip_udp_dhcp_packet, udp), +- }; ++ int p_len = udhcp_get_payload_len(dhcp_pkt); - /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */ - int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, -@@ -120,6 +124,7 @@ - int result; - struct sockaddr_ll dest; - struct udp_dhcp_packet packet; -+ int p_len = udhcp_get_payload_len(payload); - - if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) { - DEBUG(LOG_ERR, "socket call failed: %m"); -@@ -128,6 +133,7 @@ + fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); + if (fd < 0) { +@@ -189,7 +190,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru memset(&dest, 0, sizeof(dest)); memset(&packet, 0, sizeof(packet)); -+ memcpy(&(packet.data), payload, p_len); +- packet.data = *dhcp_pkt; /* struct copy */ ++ memcpy(&(packet.data), dhcp_pkt, p_len); dest.sll_family = AF_PACKET; dest.sll_protocol = htons(ETH_P_IP); -@@ -145,18 +151,19 @@ +@@ -206,24 +207,19 @@ int FAST_FUNC udhcp_send_raw_packet(stru 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; - packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip)); + packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip)); -- result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest)); -+ result = sendto(fd, &packet, p_len, 0, (struct sockaddr *) &dest, sizeof(dest)); - if (result <= 0) { - DEBUG(LOG_ERR, "write on socket failed: %m"); - } -@@ -201,7 +208,7 @@ - return -1; +- /* 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)] +- */ + udhcp_dump_packet(dhcp_pkt); +- result = sendto(fd, &packet, IP_UPD_DHCP_SIZE, 0, ++ result = sendto(fd, &packet, p_len, 0, + (struct sockaddr *) &dest, sizeof(dest)); + msg = "sendto"; + ret_close: +@@ -245,10 +241,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s + int result = -1; + const char *msg; + +- enum { +- DHCP_SIZE = sizeof(struct dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, +- }; +- + fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (fd < 0) { + msg = "socket(%s)"; +@@ -274,9 +266,8 @@ int FAST_FUNC udhcp_send_kernel_packet(s + 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) */ + udhcp_dump_packet(dhcp_pkt); +- result = safe_write(fd, dhcp_pkt, DHCP_SIZE); ++ result = safe_write(fd, dhcp_pkt, udhcp_get_payload_len(dhcp_pkt)); + msg = "write"; + ret_close: close(fd); - return result; - } -diff -ruN busybox-1.2.1-old/networking/udhcp/packet.h busybox-1.2.1-new/networking/udhcp/packet.h ---- busybox-1.2.1-old/networking/udhcp/packet.h 2006-07-01 00:42:02.000000000 +0200 -+++ busybox-1.2.1-new/networking/udhcp/packet.h 2006-11-19 00:49:38.000000000 +0100 -@@ -4,6 +4,8 @@ - #include - #include - -+#define MAX_OPTIONS_LEN 308 -+ - struct dhcpMessage { - uint8_t op; - uint8_t htype; -@@ -20,7 +22,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 {