Classify all incoming dhcp packets. Process class scopes.

diff --git a/server/dhcp.c b/server/dhcp.c
index 5bd0ed7f51703a11389afdc9f8e1d74412b03d45..bd43c073f4780c767513a5b876baa6719bcba9ca 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.69 1998/11/06 01:04:32 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.70 1998/11/06 02:59:11 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -57,6 +57,9 @@ void dhcp (packet)
        if (!locate_network (packet) && packet -> packet_type != DHCPREQUEST)
                return;
 
+       /* Classify the client. */
+       classify_client (packet);
+
        switch (packet -> packet_type) {
              case DHCPDISCOVER:
                dhcpdiscover (packet);
@@ -88,9 +91,6 @@ void dhcpdiscover (packet)
 {
        struct lease *lease;
 
-       /* Classify the client. */
-       classify_client (packet);
-
        note ("DHCPDISCOVER from %s via %s",
              print_hw_addr (packet -> raw -> htype,
                             packet -> raw -> hlen,
@@ -544,8 +544,6 @@ void ack_lease (packet, lease, offer, when)
                return;
        }
 
-       /* XXX Process class restrictions. */
-
        /* Allocate a lease state structure... */
        state = new_lease_state ("ack_lease");
        if (!state)
@@ -599,7 +597,12 @@ void ack_lease (packet, lease, offer, when)
 
        /* Vendor and user classes are only supported for DHCP clients. */
        if (state -> offer) {
-               /* XXX process class stuff here. */
+               for (i = packet -> class_count; i > 0; i--) {
+                        execute_statements_in_scope
+                               (packet, &state -> options,
+                                packet -> classes [i - 1] -> group,
+                                (struct group *)0);
+               }
        }
 
        /* If we have a host_decl structure, run the options associated