X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9eafd1cb17da2076804266cfcc8f9f6b54694352..db6dd42004d8a0bb033af7ac108f5a66ae59f232:/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..471d704a7 100644
--- a/package/busybox/patches/241-udhcpc-oversized_packets.patch
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -1,85 +1,99 @@
-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
+@@ -158,6 +158,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 + udhcp_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_nip, int source_port,
+@@ -166,10 +171,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+ {
+ 	struct sockaddr_ll dest_sll;
+ 	struct ip_udp_dhcp_packet packet;
+-	unsigned padding;
+ 	int fd;
+ 	int result = -1;
+ 	const char *msg;
++	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);
+ 	fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
+ 	if (fd < 0) {
+@@ -178,8 +183,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+ 	}
  
- 	if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
- 		DEBUG(LOG_ERR, "socket call failed: %m");
-@@ -128,6 +133,7 @@
+ 	memset(&dest_sll, 0, sizeof(dest_sll));
+-	memset(&packet, 0, offsetof(struct ip_udp_dhcp_packet, data));
+-	packet.data = *dhcp_pkt; /* struct copy */
++	memset(&packet, 0, sizeof(packet));
++	memcpy(&(packet.data), dhcp_pkt, p_len);
  
- 	memset(&dest, 0, sizeof(dest));
- 	memset(&packet, 0, sizeof(packet));
-+	memcpy(&(packet.data), payload, p_len);
+ 	dest_sll.sll_family = AF_PACKET;
+ 	dest_sll.sll_protocol = htons(ETH_P_IP);
+@@ -192,36 +197,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+ 		goto ret_close;
+ 	}
  
- 	dest.sll_family = AF_PACKET;
- 	dest.sll_protocol = htons(ETH_P_IP);
-@@ -145,18 +151,19 @@
- 	packet.ip.daddr = dest_ip;
+-	/* We were sending full-sized DHCP packets (zero padded),
+-	 * but some badly configured servers were seen dropping them.
+-	 * Apparently they drop all DHCP packets >576 *ethernet* octets big,
+-	 * whereas they may only drop packets >576 *IP* octets big
+-	 * (which for typical Ethernet II means 590 octets: 6+6+2 + 576).
+-	 *
+-	 * In order to work with those buggy servers,
+-	 * we truncate packets after end option byte.
+-	 */
+-	padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(packet.data.options);
+-
+ 	packet.ip.protocol = IPPROTO_UDP;
+ 	packet.ip.saddr = source_nip;
+ 	packet.ip.daddr = dest_nip;
  	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(UDP_DHCP_SIZE - padding);
+-	/* 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_UDP_DHCP_SIZE - padding);
+-	/* but for sending, it is set to IP packet len */
+-	packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding);
 +	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;
+ 	udhcp_dump_packet(dhcp_pkt);
+-	result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0,
++	result = sendto(fd, &packet, p_len, /*flags:*/ 0,
+ 			(struct sockaddr *) &dest_sll, sizeof(dest_sll));
+ 	msg = "sendto";
+  ret_close:
+@@ -239,7 +232,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s
+ 		uint32_t dest_nip, int dest_port)
+ {
+ 	struct sockaddr_in client;
+-	unsigned padding;
+ 	int fd;
+ 	int result = -1;
+ 	const char *msg;
+@@ -270,9 +262,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s
  	}
  
--	result = write(fd, payload, sizeof(struct dhcpMessage));
-+	result = write(fd, payload, udhcp_get_payload_len(payload));
+ 	udhcp_dump_packet(dhcp_pkt);
+-
+-	padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options);
+-	result = safe_write(fd, dhcp_pkt, DHCP_SIZE - padding);
++	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 <netinet/udp.h>
- #include <netinet/ip.h>
- 
-+#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 {