X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fudhcp%2Fserverpacket.c;h=cfead413cf3675f9bcbea4868d2d768b19912d5d;hb=e40c04b82695c1cde8ad9ed1e2aa1756463d73a7;hp=32d3c8098c46d3583789f7cd4bb5a95c47c917ab;hpb=76729b8c692cc47775fd95d41edf486cc9a57434;p=oweals%2Fbusybox.git diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c index 32d3c8098..cfead413c 100644 --- a/networking/udhcp/serverpacket.c +++ b/networking/udhcp/serverpacket.c @@ -1,6 +1,7 @@ +/* vi: set sw=4 ts=4: */ /* serverpacket.c * - * Constuct and send DHCP server packets + * Construct and send DHCP server packets * * Russ Dill July 2001 * @@ -25,17 +26,18 @@ #include #include +#include "common.h" #include "serverpacket.h" #include "dhcpd.h" #include "options.h" -#include "common.h" +#include "static_leases.h" /* send a packet to giaddr using the kernel ip stack */ static int send_packet_to_relay(struct dhcpMessage *payload) { - DEBUG(LOG_INFO, "Forwarding packet to relay"); + DEBUG("Forwarding packet to relay"); - return kernel_packet(payload, server_config.server, SERVER_PORT, + return udhcp_kernel_packet(payload, server_config.server, SERVER_PORT, payload->giaddr, SERVER_PORT); } @@ -43,27 +45,27 @@ static int send_packet_to_relay(struct dhcpMessage *payload) /* send a packet to a specific arp address and ip address by creating our own ip packet */ static int send_packet_to_client(struct dhcpMessage *payload, int force_broadcast) { - unsigned char *chaddr; - u_int32_t ciaddr; - + uint8_t *chaddr; + uint32_t ciaddr; + if (force_broadcast) { - DEBUG(LOG_INFO, "broadcasting packet to client (NAK)"); + DEBUG("broadcasting packet to client (NAK)"); ciaddr = INADDR_BROADCAST; chaddr = MAC_BCAST_ADDR; } else if (payload->ciaddr) { - DEBUG(LOG_INFO, "unicasting packet to client ciaddr"); + DEBUG("unicasting packet to client ciaddr"); ciaddr = payload->ciaddr; chaddr = payload->chaddr; } else if (ntohs(payload->flags) & BROADCAST_FLAG) { - DEBUG(LOG_INFO, "broadcasting packet to client (requested)"); + DEBUG("broadcasting packet to client (requested)"); ciaddr = INADDR_BROADCAST; chaddr = MAC_BCAST_ADDR; } else { - DEBUG(LOG_INFO, "unicasting packet to client yiaddr"); + DEBUG("unicasting packet to client yiaddr"); ciaddr = payload->yiaddr; chaddr = payload->chaddr; } - return raw_packet(payload, server_config.server, SERVER_PORT, + return udhcp_raw_packet(payload, server_config.server, SERVER_PORT, ciaddr, CLIENT_PORT, chaddr, server_config.ifindex); } @@ -82,7 +84,7 @@ static int send_packet(struct dhcpMessage *payload, int force_broadcast) static void init_packet(struct dhcpMessage *packet, struct dhcpMessage *oldpacket, char type) { - init_header(packet, type); + udhcp_init_header(packet, type); packet->xid = oldpacket->xid; memcpy(packet->chaddr, oldpacket->chaddr, 16); packet->flags = oldpacket->flags; @@ -97,31 +99,37 @@ static void add_bootp_options(struct dhcpMessage *packet) { packet->siaddr = server_config.siaddr; if (server_config.sname) - strncpy(packet->sname, server_config.sname, sizeof(packet->sname) - 1); + strncpy((char*)packet->sname, server_config.sname, sizeof(packet->sname) - 1); if (server_config.boot_file) - strncpy(packet->file, server_config.boot_file, sizeof(packet->file) - 1); + strncpy((char*)packet->file, server_config.boot_file, sizeof(packet->file) - 1); } - + /* send a DHCP OFFER to a DHCP DISCOVER */ int sendOffer(struct dhcpMessage *oldpacket) { struct dhcpMessage packet; struct dhcpOfferedAddr *lease = NULL; - u_int32_t req_align, lease_time_align = server_config.lease; - unsigned char *req, *lease_time; + uint32_t req_align, lease_time_align = server_config.lease; + uint8_t *req, *lease_time; struct option_set *curr; struct in_addr addr; + uint32_t static_lease_ip; + init_packet(&packet, oldpacket, DHCPOFFER); - + + static_lease_ip = getIpByMac(server_config.static_leases, oldpacket->chaddr); + /* ADDME: if static, short circuit */ + if(!static_lease_ip) + { /* the client is in our lease/offered table */ if ((lease = find_lease_by_chaddr(oldpacket->chaddr))) { - if (!lease_expired(lease)) + if (!lease_expired(lease)) lease_time_align = lease->expires - time(0); packet.yiaddr = lease->yiaddr; - + /* Or the client has a requested ip */ } else if ((req = get_option(oldpacket, DHCP_REQUESTED_IP)) && @@ -131,43 +139,52 @@ int sendOffer(struct dhcpMessage *oldpacket) /* and the ip is in the lease range */ ntohl(req_align) >= ntohl(server_config.start) && ntohl(req_align) <= ntohl(server_config.end) && - - /* and its not already taken/offered */ /* ADDME: check that its not a static lease */ + + !static_lease_ip && /* Check that its not a static lease */ + /* and is not already taken/offered */ ((!(lease = find_lease_by_yiaddr(req_align)) || - + /* or its taken, but expired */ /* ADDME: or maybe in here */ lease_expired(lease)))) { packet.yiaddr = req_align; /* FIXME: oh my, is there a host using this IP? */ - /* otherwise, find a free IP */ /*ADDME: is it a static lease? */ + /* otherwise, find a free IP */ } else { + /* Is it a static lease? (No, because find_address skips static lease) */ packet.yiaddr = find_address(0); - + /* try for an expired lease */ if (!packet.yiaddr) packet.yiaddr = find_address(1); } - + if(!packet.yiaddr) { - LOG(LOG_WARNING, "no IP addresses to give -- OFFER abandoned"); + bb_error_msg("No IP addresses to give - OFFER abandoned"); return -1; } - + if (!add_lease(packet.chaddr, packet.yiaddr, server_config.offer_time)) { - LOG(LOG_WARNING, "lease pool is full -- OFFER abandoned"); + bb_error_msg("Lease pool is full - OFFER abandoned"); return -1; - } + } if ((lease_time = get_option(oldpacket, DHCP_LEASE_TIME))) { memcpy(&lease_time_align, lease_time, 4); lease_time_align = ntohl(lease_time_align); - if (lease_time_align > server_config.lease) + if (lease_time_align > server_config.lease) lease_time_align = server_config.lease; } /* Make sure we aren't just using the lease time from the previous offer */ - if (lease_time_align < server_config.min_lease) + if (lease_time_align < server_config.min_lease) lease_time_align = server_config.lease; - /* ADDME: end of short circuit */ + } + /* ADDME: end of short circuit */ + else + { + /* It is a static lease... use it */ + packet.yiaddr = static_lease_ip; + } + add_simple_option(packet.options, DHCP_LEASE_TIME, htonl(lease_time_align)); curr = server_config.options; @@ -178,9 +195,9 @@ int sendOffer(struct dhcpMessage *oldpacket) } add_bootp_options(&packet); - + addr.s_addr = packet.yiaddr; - LOG(LOG_INFO, "sending OFFER of %s", inet_ntoa(addr)); + bb_info_msg("Sending OFFER of %s", inet_ntoa(addr)); return send_packet(&packet, 0); } @@ -190,34 +207,34 @@ int sendNAK(struct dhcpMessage *oldpacket) struct dhcpMessage packet; init_packet(&packet, oldpacket, DHCPNAK); - - DEBUG(LOG_INFO, "sending NAK"); + + DEBUG("Sending NAK"); return send_packet(&packet, 1); } -int sendACK(struct dhcpMessage *oldpacket, u_int32_t yiaddr) +int sendACK(struct dhcpMessage *oldpacket, uint32_t yiaddr) { struct dhcpMessage packet; struct option_set *curr; - unsigned char *lease_time; - u_int32_t lease_time_align = server_config.lease; + uint8_t *lease_time; + uint32_t lease_time_align = server_config.lease; struct in_addr addr; init_packet(&packet, oldpacket, DHCPACK); packet.yiaddr = yiaddr; - + if ((lease_time = get_option(oldpacket, DHCP_LEASE_TIME))) { memcpy(&lease_time_align, lease_time, 4); lease_time_align = ntohl(lease_time_align); - if (lease_time_align > server_config.lease) + if (lease_time_align > server_config.lease) lease_time_align = server_config.lease; - else if (lease_time_align < server_config.min_lease) + else if (lease_time_align < server_config.min_lease) lease_time_align = server_config.lease; } - + add_simple_option(packet.options, DHCP_LEASE_TIME, htonl(lease_time_align)); - + curr = server_config.options; while (curr) { if (curr->data[OPT_CODE] != DHCP_LEASE_TIME) @@ -228,9 +245,9 @@ int sendACK(struct dhcpMessage *oldpacket, u_int32_t yiaddr) add_bootp_options(&packet); addr.s_addr = packet.yiaddr; - LOG(LOG_INFO, "sending ACK to %s", inet_ntoa(addr)); + bb_info_msg("Sending ACK to %s", inet_ntoa(addr)); - if (send_packet(&packet, 0) < 0) + if (send_packet(&packet, 0) < 0) return -1; add_lease(packet.chaddr, packet.yiaddr, lease_time_align); @@ -245,7 +262,7 @@ int send_inform(struct dhcpMessage *oldpacket) struct option_set *curr; init_packet(&packet, oldpacket, DHCPACK); - + curr = server_config.options; while (curr) { if (curr->data[OPT_CODE] != DHCP_LEASE_TIME)