diff options
| author | Ted Lemon <source@isc.org> | 1999-07-02 20:58:48 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 1999-07-02 20:58:48 +0000 |
| commit | da38df14336d62b999bdba8f600d86777e98653a (patch) | |
| tree | 1486bbae2f42d28a21a0cfd0bd72b4b23ba84a23 /server/class.c | |
| parent | 15eda2482666252724334793c1fef856ea61003f (diff) | |
| download | isc-dhcp-da38df14336d62b999bdba8f600d86777e98653a.tar.gz | |
Pervasive changes to support leased_address, reverse and binary_to_ascii.
Diffstat (limited to 'server/class.c')
| -rw-r--r-- | server/class.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/server/class.c b/server/class.c index d63de40f..90cdc4d0 100644 --- a/server/class.c +++ b/server/class.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: class.c,v 1.11 1999/04/05 16:34:33 mellon Exp $ Copyright (c) 1998 The Internet Software Consortium. All rights reserved.\n"; +"$Id: class.c,v 1.12 1999/07/02 20:58:48 mellon Exp $ Copyright (c) 1998 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -70,13 +70,14 @@ void classification_setup () void classify_client (packet) struct packet *packet; { - execute_statements (packet, packet -> options, + execute_statements (packet, (struct lease *)0, packet -> options, (struct option_state *)0, default_classification_rules); } -int check_collection (packet, collection) +int check_collection (packet, lease, collection) struct packet *packet; + struct lease *lease; struct collection *collection; { struct class *class, *nc; @@ -92,8 +93,10 @@ int check_collection (packet, collection) /* If a class is for billing, don't put the client in the class if we've already billed it to a different class. */ if (class -> submatch) { - status = evaluate_data_expression (&data, packet, + status = evaluate_data_expression (&data, + packet, packet -> options, + lease, class -> submatch); if (status) { if ((nc = ((struct class *) @@ -159,7 +162,7 @@ int check_collection (packet, collection) } status = (evaluate_boolean_expression_result - (packet, packet -> options, class -> expr)); + (packet, packet -> options, lease, class -> expr)); if (status) { matched = 1; #if defined (DEBUG_CLASS_MATCHING) |