diff options
| author | Denis Vlasenko | 2007-11-23 00:08:54 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-11-23 00:08:54 +0000 |
| commit | 6884f665bd7bc101f56ff9047afaffbc06dc99e2 (patch) | |
| tree | 9eb497068cdee02c112c2f55bd0def8ae6354e92 /networking/udhcp/packet.c | |
| parent | 68af8e7a084317191effa9b257483a50d994b11c (diff) | |
| download | busybox-6884f665bd7bc101f56ff9047afaffbc06dc99e2.zip busybox-6884f665bd7bc101f56ff9047afaffbc06dc99e2.tar.gz | |
dhcp: stop using magic constants; use (htonl(CONST) != a) - it's smaller
function old new delta
udhcp_get_packet 146 134 -12
get_raw_packet 368 353 -15
Diffstat (limited to 'networking/udhcp/packet.c')
| -rw-r--r-- | networking/udhcp/packet.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 41cd321..0abe851 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -57,7 +57,7 @@ int udhcp_get_packet(struct dhcpMessage *packet, int fd) return -1; } - if (ntohl(packet->cookie) != DHCP_MAGIC) { + if (packet->cookie != htonl(DHCP_MAGIC)) { bb_error_msg("received bogus message, ignoring"); return -2; } @@ -123,7 +123,6 @@ uint16_t udhcp_checksum(void *addr, int count) /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */ -void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void); int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, uint32_t dest_ip, int dest_port, const uint8_t *dest_arp, int ifindex) @@ -169,9 +168,6 @@ int udhcp_raw_packet(struct dhcpMessage *payload, packet.ip.ttl = IPDEFTTL; packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip)); - if (sizeof(struct udp_dhcp_packet) != 576) - BUG_sizeof_struct_udp_dhcp_packet_must_be_576(); - result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest)); if (result <= 0) { |