mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 22:05:23 +00:00
Code Issues Releases Wiki Activity

Fix up matching code and add debugging for it.

Browse Source
This commit is contained in:
Ted Lemon
1998-11-06 03:25:45 +00:00
parent 5fd5c0a35f
commit 74a2049e09
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/class.c
View File

@@ -42,7 +42,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: class.c,v 1.4 1998/11/06 00:16:22 mellon Exp $ Copyright (c) 1998 The Internet Software Consortium. All rights reserved.\n"; "$Id: class.c,v 1.5 1998/11/06 03:25:45 mellon Exp $ Copyright (c) 1998 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -211,6 +211,9 @@ int check_collection (packet, collection)
int status; int status;
for (class = collection -> classes; class; class = class -> nic) { for (class = collection -> classes; class; class = class -> nic) {
#if defined (DEBUG_CLASS_MATCHING)
note ("checking against class %s...", class -> name);
#endif
if (class -> hash) { if (class -> hash) {
memset (&data, 0, sizeof data); memset (&data, 0, sizeof data);
status = evaluate_data_expression (&data, packet, status = evaluate_data_expression (&data, packet,
@@ -220,20 +223,32 @@ int check_collection (packet, collection)
(nc = (struct class *)hash_lookup (class -> hash, (nc = (struct class *)hash_lookup (class -> hash,
data.data, data.data,
data.len))) { data.len))) {
#if defined (DEBUG_CLASS_MATCHING)
note ("matches subclass %s.",
data.len, data.data);
#endif
classify (packet, class); classify (packet, class);
matched = 1; matched = 1;
continue; continue;
} }
} }
memset (&data, 0, sizeof data); memset (&data, 0, sizeof data);
if ((matched = status = (evaluate_boolean_expression_result
evaluate_boolean_expression_result (packet, (packet, &packet -> options, class -> expr));
&packet -> options, if (status)
class -> expr) && matched = 1;
#if defined (DEBUG_CLASS_MATCHING)
note ("matches class.");
#endif
if (status &&
class -> spawn && class -> spawn &&
evaluate_data_expression (&data, packet, evaluate_data_expression (&data, packet,
&packet -> options, &packet -> options,
class -> spawn))) { class -> spawn)) {
#if defined (DEBUG_CLASS_MATCHING)
note ("spawning subclass %s.",
print_hex_1 (data.len, data.data));
#endif
nc = (struct class *) nc = (struct class *)
dmalloc (sizeof (struct class), "class spawn"); dmalloc (sizeof (struct class), "class spawn");
memset (nc, 0, sizeof *nc); memset (nc, 0, sizeof *nc);
@@ -244,9 +259,8 @@ int check_collection (packet, collection)
data.data, data.len, data.data, data.len,
(unsigned char *)nc); (unsigned char *)nc);
classify (packet, nc); classify (packet, nc);
} else } else if (status)
classify (packet, class); classify (packet, class);
matched = 1;
} }
return matched; return matched;
} }