[package] update busybox to 1.18.4, patch from Peter Wagner

[openwrt.git] / 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 ef9e7f4..d83bf0b 100644 (file)
--- a/package/busybox/patches/241-udhcpc-oversized_packets.patch
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -1,6 +1,8 @@
+diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
+index 2b7528c..94e53dc 100644

 --- a/networking/udhcp/packet.c
 +++ b/networking/udhcp/packet.c
 --- a/networking/udhcp/packet.c
 +++ b/networking/udhcp/packet.c

-@@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void *
+@@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void *addr, int count)

        return ~sum;
  }
  
        return ~sum;
  }
  


@@ -12,7 +14,7 @@
  /* 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,
  /* 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,

-@@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+@@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,

  {
        struct sockaddr_ll dest_sll;
        struct ip_udp_dhcp_packet packet;
  {
        struct sockaddr_ll dest_sll;
        struct ip_udp_dhcp_packet packet;


@@ -24,7 +26,7 @@
  
        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
        if (fd < 0) {
  
        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
        if (fd < 0) {

-@@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+@@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,

        }
  
        memset(&dest_sll, 0, sizeof(dest_sll));
        }
  
        memset(&dest_sll, 0, sizeof(dest_sll));


@@ -35,7 +37,7 @@
  
        dest_sll.sll_family = AF_PACKET;
        dest_sll.sll_protocol = htons(ETH_P_IP);
  
        dest_sll.sll_family = AF_PACKET;
        dest_sll.sll_protocol = htons(ETH_P_IP);

-@@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+@@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,

                goto ret_close;
        }
  
                goto ret_close;
        }
  


@@ -56,14 +58,14 @@
        packet.udp.source = htons(source_port);
        packet.udp.dest = htons(dest_port);
 -      /* size, excluding IP header: */
        packet.udp.source = htons(source_port);
        packet.udp.dest = htons(dest_port);
 -      /* size, excluding IP header: */

--      packet.udp.len = htons(UPD_DHCP_SIZE - padding);
+-      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;
 -      /* 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;

--      packet.udp.check = udhcp_checksum(&packet, IP_UPD_DHCP_SIZE - padding);
+-      packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding);

 -      /* but for sending, it is set to IP packet len */
 -      /* but for sending, it is set to IP packet len */

--      packet.ip.tot_len = htons(IP_UPD_DHCP_SIZE - padding);
+-      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(p_len);
 +      p_len += sizeof(packet.ip);
 +      packet.udp.check = udhcp_checksum(&packet, p_len);
 +      packet.ip.tot_len = htons(p_len);


@@ -73,12 +75,12 @@
        packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip));
  
        udhcp_dump_packet(dhcp_pkt);
        packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip));
  
        udhcp_dump_packet(dhcp_pkt);

--      result = sendto(fd, &packet, IP_UPD_DHCP_SIZE - padding, /*flags:*/ 0,
+-      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:
 +      result = sendto(fd, &packet, p_len, /*flags:*/ 0,
                        (struct sockaddr *) &dest_sll, sizeof(dest_sll));
        msg = "sendto";
   ret_close:

-@@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s
+@@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,

                uint32_t dest_nip, int dest_port)
  {
        struct sockaddr_in client;
                uint32_t dest_nip, int dest_port)
  {
        struct sockaddr_in client;


@@ -86,7 +88,7 @@
        int fd;
        int result = -1;
        const char *msg;
        int fd;
        int result = -1;
        const char *msg;

-@@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s
+@@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,

        }
  
        udhcp_dump_packet(dhcp_pkt);
        }
  
        udhcp_dump_packet(dhcp_pkt);