aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-10-20 18:04:36 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-10-20 18:04:36 +0200
commit2c3b71a0d2e6e94d8fb75c6879b1b8203cea9e5a (patch)
tree2303e0ffaeb1f95a9f38b2071b0feb47dae0dc9a
parentc59e06e47199fedc97fbaa080f9ea63049c7176b (diff)
downloadbusybox-w32-2c3b71a0d2e6e94d8fb75c6879b1b8203cea9e5a.tar.gz
busybox-w32-2c3b71a0d2e6e94d8fb75c6879b1b8203cea9e5a.tar.bz2
busybox-w32-2c3b71a0d2e6e94d8fb75c6879b1b8203cea9e5a.zip
dhcp: typo fix: UPD_DHCP_SIZE -> UDP_DHCP_SIZE
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--networking/udhcp/common.h6
-rw-r--r--networking/udhcp/packet.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 9020b9c96..f8f18ff01 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -63,14 +63,14 @@ struct udp_dhcp_packet {
63} PACKED; 63} PACKED;
64 64
65enum { 65enum {
66 IP_UPD_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, 66 IP_UDP_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
67 UPD_DHCP_SIZE = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, 67 UDP_DHCP_SIZE = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
68 DHCP_SIZE = sizeof(struct dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, 68 DHCP_SIZE = sizeof(struct dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,
69}; 69};
70 70
71/* Let's see whether compiler understood us right */ 71/* Let's see whether compiler understood us right */
72struct BUG_bad_sizeof_struct_ip_udp_dhcp_packet { 72struct BUG_bad_sizeof_struct_ip_udp_dhcp_packet {
73 char c[IP_UPD_DHCP_SIZE == 576 ? 1 : -1]; 73 char c[IP_UDP_DHCP_SIZE == 576 ? 1 : -1];
74}; 74};
75 75
76 76
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index d8f9c5daa..2b7528cc7 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -216,19 +216,19 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
216 packet.udp.source = htons(source_port); 216 packet.udp.source = htons(source_port);
217 packet.udp.dest = htons(dest_port); 217 packet.udp.dest = htons(dest_port);
218 /* size, excluding IP header: */ 218 /* size, excluding IP header: */
219 packet.udp.len = htons(UPD_DHCP_SIZE - padding); 219 packet.udp.len = htons(UDP_DHCP_SIZE - padding);
220 /* for UDP checksumming, ip.len is set to UDP packet len */ 220 /* for UDP checksumming, ip.len is set to UDP packet len */
221 packet.ip.tot_len = packet.udp.len; 221 packet.ip.tot_len = packet.udp.len;
222 packet.udp.check = udhcp_checksum(&packet, IP_UPD_DHCP_SIZE - padding); 222 packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding);
223 /* but for sending, it is set to IP packet len */ 223 /* but for sending, it is set to IP packet len */
224 packet.ip.tot_len = htons(IP_UPD_DHCP_SIZE - padding); 224 packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding);
225 packet.ip.ihl = sizeof(packet.ip) >> 2; 225 packet.ip.ihl = sizeof(packet.ip) >> 2;
226 packet.ip.version = IPVERSION; 226 packet.ip.version = IPVERSION;
227 packet.ip.ttl = IPDEFTTL; 227 packet.ip.ttl = IPDEFTTL;
228 packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip)); 228 packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip));
229 229
230 udhcp_dump_packet(dhcp_pkt); 230 udhcp_dump_packet(dhcp_pkt);
231 result = sendto(fd, &packet, IP_UPD_DHCP_SIZE - padding, /*flags:*/ 0, 231 result = sendto(fd, &packet, IP_UDP_DHCP_SIZE - padding, /*flags:*/ 0,
232 (struct sockaddr *) &dest_sll, sizeof(dest_sll)); 232 (struct sockaddr *) &dest_sll, sizeof(dest_sll));
233 msg = "sendto"; 233 msg = "sendto";
234 ret_close: 234 ret_close: