- spelling

[oweals/busybox.git] / networking / udhcp / serverpacket.c

diff --git a/networking/udhcp/serverpacket.c b/networking/udhcp/serverpacket.c
index bc9d822a9ee3b7d2322ab95a28a1930308c05455..e40432ebe48e54a18e687013201c9af1b7b14551 100644 (file)
--- a/networking/udhcp/serverpacket.c
+++ b/networking/udhcp/serverpacket.c
@@ -25,17 +25,18 @@
 #include <string.h>
 #include <time.h>
 
+#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");
 
-       return kernel_packet(payload, server_config.server, SERVER_PORT,
+       return udhcp_kernel_packet(payload, server_config.server, SERVER_PORT,
                        payload->giaddr, SERVER_PORT);
 }
 
@@ -63,7 +64,7 @@ static int send_packet_to_client(struct dhcpMessage *payload, int force_broadcas
                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 +83,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,9 +98,9 @@ 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);
 }
 
 
@@ -113,9 +114,15 @@ int sendOffer(struct dhcpMessage *oldpacket)
        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))
@@ -131,16 +138,18 @@ 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 */
@@ -167,7 +176,14 @@ int sendOffer(struct dhcpMessage *oldpacket)
        /* Make sure we aren't just using the lease time from the previous offer */
        if (lease_time_align < server_config.min_lease)
                lease_time_align = server_config.lease;
+       }
        /* 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;