X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Fpacket.c;h=30675eaabf2cec9dca71945ef96be3a7e638ead8;hb=e40c04b82695c1cde8ad9ed1e2aa1756463d73a7;hp=7cbd83a35f2ee653cd81e9f245f4fd01e82307cb;hpb=c7bda1ce659294d6e22c06e087f6f265983c7578;p=oweals%2Fbusybox.git diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 7cbd83a35..30675eaab 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -1,10 +1,11 @@ +/* vi: set sw=4 ts=4: */ #include #include #include #include #include #include -#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1 +#if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION #include #include #else @@ -14,13 +15,13 @@ #endif #include +#include "common.h" #include "packet.h" #include "dhcpd.h" #include "options.h" -#include "common.h" -void init_header(struct dhcpMessage *packet, char type) +void udhcp_init_header(struct dhcpMessage *packet, char type) { memset(packet, 0, sizeof(struct dhcpMessage)); switch (type) { @@ -44,51 +45,50 @@ void init_header(struct dhcpMessage *packet, char type) /* read a packet from socket fd, return -1 on read error, -2 on packet error */ -int get_packet(struct dhcpMessage *packet, int fd) +int udhcp_get_packet(struct dhcpMessage *packet, int fd) { - int bytes; - int i; - const char broken_vendors[][8] = { + static const char broken_vendors[][8] = { "MSFT 98", "" }; + int bytes; + int i; char unsigned *vendor; memset(packet, 0, sizeof(struct dhcpMessage)); bytes = read(fd, packet, sizeof(struct dhcpMessage)); if (bytes < 0) { - DEBUG(LOG_INFO, "couldn't read on listening socket, ignoring"); + DEBUG("couldn't read on listening socket, ignoring"); return -1; } if (ntohl(packet->cookie) != DHCP_MAGIC) { - LOG(LOG_ERR, "received bogus message, ignoring"); + bb_error_msg("Received bogus message, ignoring"); return -2; } - DEBUG(LOG_INFO, "Received a packet"); + DEBUG("Received a packet"); if (packet->op == BOOTREQUEST && (vendor = get_option(packet, DHCP_VENDOR))) { for (i = 0; broken_vendors[i][0]; i++) { if (vendor[OPT_LEN - 2] == (uint8_t) strlen(broken_vendors[i]) && - !strncmp(vendor, broken_vendors[i], vendor[OPT_LEN - 2])) { - DEBUG(LOG_INFO, "broken client (%s), forcing broadcast", - broken_vendors[i]); - packet->flags |= htons(BROADCAST_FLAG); + !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])) { + DEBUG("broken client (%s), forcing broadcast", + broken_vendors[i]); + packet->flags |= htons(BROADCAST_FLAG); } } } - return bytes; } -uint16_t checksum(void *addr, int count) +uint16_t udhcp_checksum(void *addr, int count) { /* Compute Internet Checksum for "count" bytes * beginning at location "addr". */ - register int32_t sum = 0; + int32_t sum = 0; uint16_t *source = (uint16_t *) addr; while (count > 1) { @@ -113,8 +113,8 @@ uint16_t checksum(void *addr, int count) } -/* Constuct a ip/udp header for a packet, and specify the source and dest hardware address */ -int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, +/* 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, uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex) { int fd; @@ -123,7 +123,7 @@ int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, struct udp_dhcp_packet packet; if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) { - DEBUG(LOG_ERR, "socket call failed: %m"); + bb_perror_msg("socket"); return -1; } @@ -136,7 +136,7 @@ int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, dest.sll_halen = 6; memcpy(dest.sll_addr, dest_arp, 6); if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) { - DEBUG(LOG_ERR, "bind call failed: %m"); + bb_perror_msg("bind"); close(fd); return -1; } @@ -149,17 +149,17 @@ int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, packet.udp.len = htons(sizeof(packet.udp) + sizeof(struct dhcpMessage)); /* cheat on the psuedo-header */ packet.ip.tot_len = packet.udp.len; memcpy(&(packet.data), payload, sizeof(struct dhcpMessage)); - packet.udp.check = checksum(&packet, sizeof(struct udp_dhcp_packet)); + packet.udp.check = udhcp_checksum(&packet, sizeof(struct udp_dhcp_packet)); packet.ip.tot_len = htons(sizeof(struct udp_dhcp_packet)); packet.ip.ihl = sizeof(packet.ip) >> 2; packet.ip.version = IPVERSION; packet.ip.ttl = IPDEFTTL; - packet.ip.check = 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)); if (result <= 0) { - DEBUG(LOG_ERR, "write on socket failed: %m"); + bb_perror_msg("sendto"); } close(fd); return result; @@ -167,7 +167,7 @@ int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, /* Let the kernel do all the work for packet generation */ -int kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, +int udhcp_kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, uint32_t dest_ip, int dest_port) { int n = 1; @@ -177,24 +177,30 @@ int kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_po if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) return -1; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) { + close(fd); return -1; + } memset(&client, 0, sizeof(client)); client.sin_family = AF_INET; client.sin_port = htons(source_port); client.sin_addr.s_addr = source_ip; - if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) + if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) { + close(fd); return -1; + } memset(&client, 0, sizeof(client)); client.sin_family = AF_INET; client.sin_port = htons(dest_port); client.sin_addr.s_addr = dest_ip; - if (connect(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) + if (connect(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) { + close(fd); return -1; + } result = write(fd, payload, sizeof(struct dhcpMessage)); close(fd);