aboutsummaryrefslogtreecommitdiff
path: root/networking/udhcp
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2020-10-01 03:07:22 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2020-10-01 03:07:22 +0200
commit4a0eb0370c4df8ee01973b50bb460560532b79f1 (patch)
treece2324f97b05ae50355961d47dea6cd003a4fc05 /networking/udhcp
parentaaa0709e7b39d0dc22ac92443a86c84eaff58679 (diff)
downloadbusybox-w32-4a0eb0370c4df8ee01973b50bb460560532b79f1.tar.gz
busybox-w32-4a0eb0370c4df8ee01973b50bb460560532b79f1.tar.bz2
busybox-w32-4a0eb0370c4df8ee01973b50bb460560532b79f1.zip
gcc-9.x warning fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/udhcp')
-rw-r--r--networking/udhcp/d6_dhcpc.c2
-rw-r--r--networking/udhcp/d6_packet.c2
-rw-r--r--networking/udhcp/dhcpc.c4
-rw-r--r--networking/udhcp/packet.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index fc2d672b7..ac8af91d3 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -947,7 +947,7 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_pac
947// packet.ip.tot_len = packet.udp.len; /* yes, this is needed */ 947// packet.ip.tot_len = packet.udp.len; /* yes, this is needed */
948// check = packet.udp.check; 948// check = packet.udp.check;
949// packet.udp.check = 0; 949// packet.udp.check = 0;
950// if (check && check != inet_cksum((uint16_t *)&packet, bytes)) { 950// if (check && check != inet_cksum(&packet, bytes)) {
951// log1("packet with bad UDP checksum received, ignoring"); 951// log1("packet with bad UDP checksum received, ignoring");
952// return -2; 952// return -2;
953// } 953// }
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 446497e15..167a813e3 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -103,7 +103,7 @@ int FAST_FUNC d6_send_raw_packet(
103 */ 103 */
104 packet.ip6.ip6_hlim = IPPROTO_UDP; 104 packet.ip6.ip6_hlim = IPPROTO_UDP;
105 packet.udp.check = inet_cksum( 105 packet.udp.check = inet_cksum(
106 (uint16_t *)&packet + 2, 106 (uint8_t *)&packet + 4,
107 offsetof(struct ip6_udp_d6_packet, data) - 4 + d6_pkt_size 107 offsetof(struct ip6_udp_d6_packet, data) - 4 + d6_pkt_size
108 ); 108 );
109 /* fix 'hop limit' and 'next header' after UDP checksumming */ 109 /* fix 'hop limit' and 'next header' after UDP checksumming */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index e13eb3f9f..66aa38c20 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -935,7 +935,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
935 /* verify IP checksum */ 935 /* verify IP checksum */
936 check = packet.ip.check; 936 check = packet.ip.check;
937 packet.ip.check = 0; 937 packet.ip.check = 0;
938 if (check != inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip))) { 938 if (check != inet_cksum(&packet.ip, sizeof(packet.ip))) {
939 log1s("bad IP header checksum, ignoring"); 939 log1s("bad IP header checksum, ignoring");
940 return -2; 940 return -2;
941 } 941 }
@@ -960,7 +960,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
960 packet.ip.tot_len = packet.udp.len; /* yes, this is needed */ 960 packet.ip.tot_len = packet.udp.len; /* yes, this is needed */
961 check = packet.udp.check; 961 check = packet.udp.check;
962 packet.udp.check = 0; 962 packet.udp.check = 0;
963 if (check && check != inet_cksum((uint16_t *)&packet, bytes)) { 963 if (check && check != inet_cksum(&packet, bytes)) {
964 log1s("packet with bad UDP checksum received, ignoring"); 964 log1s("packet with bad UDP checksum received, ignoring");
965 return -2; 965 return -2;
966 } 966 }
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 6d4375237..51374646d 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -164,14 +164,14 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
164 packet.udp.len = htons(UDP_DHCP_SIZE - padding); 164 packet.udp.len = htons(UDP_DHCP_SIZE - padding);
165 /* for UDP checksumming, ip.len is set to UDP packet len */ 165 /* for UDP checksumming, ip.len is set to UDP packet len */
166 packet.ip.tot_len = packet.udp.len; 166 packet.ip.tot_len = packet.udp.len;
167 packet.udp.check = inet_cksum((uint16_t *)&packet, 167 packet.udp.check = inet_cksum(&packet,
168 IP_UDP_DHCP_SIZE - padding); 168 IP_UDP_DHCP_SIZE - padding);
169 /* but for sending, it is set to IP packet len */ 169 /* but for sending, it is set to IP packet len */
170 packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding); 170 packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding);
171 packet.ip.ihl = sizeof(packet.ip) >> 2; 171 packet.ip.ihl = sizeof(packet.ip) >> 2;
172 packet.ip.version = IPVERSION; 172 packet.ip.version = IPVERSION;
173 packet.ip.ttl = IPDEFTTL; 173 packet.ip.ttl = IPDEFTTL;
174 packet.ip.check = inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip)); 174 packet.ip.check = inet_cksum(&packet.ip, sizeof(packet.ip));
175 175
176 udhcp_dump_packet(dhcp_pkt); 176 udhcp_dump_packet(dhcp_pkt);
177 result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0, 177 result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0,