Permalink
Browse files

Now dhcpdiscover() works and the DHCP Offer contains port set option …

…( .leases must be empty)
  • Loading branch information...
1 parent 996ad6a commit c69012b8785ac7474bf02d714085bf48a0f7dfec @gnocuil committed Oct 9, 2012
Showing with 9 additions and 9 deletions.
  1. +1 −1 dhcp-4.2.3-P2/server/confpars.c
  2. +4 −4 dhcp-4.2.3-P2/server/dhcp.c
  3. +4 −4 dhcp-4.2.3-P2/server/dhcpd.leases
@@ -1699,7 +1699,7 @@ void parse_pool_statement (cfile, group, type)
;
pool_reference (p, pool, MDL);
}
-if (!debug_pool) debug_pool = pool -> shared_network -> pools;//[pset]
+
/* Don't allow a pool declaration with no addresses, since it is
probably a configuration error. */
if (!lpchain) {
@@ -793,10 +793,10 @@ void dhcprelease (packet, ms_nulltp)
(struct client_state *)0,
packet -> options, (struct option_state *)0,
&global_scope, oc, MDL)) {
- memcpy(&cipset.index, data.data, 2);
- cipset.index = ntohs(cipset.index);
- memcpy(&cipset,mask, data.data + 2, 2);
- cipset.mask = ntohs(cipset.mask);
+ memcpy(&cipset.pset_index, data.data, 2);
+ cipset.pset_index = ntohs(cipset.pset_index);
+ memcpy(&cipset.pset_mask, data.data + 2, 2);
+ cipset.pset_mask = ntohs(cipset.pset_mask);
data_string_forget (&data, MDL);
}else{
log_info ("there is no information about pset in the packet!!\n");
@@ -1,12 +1,12 @@
# The format of this file is documented in the dhcpd.leases(5) manual page.
# This lease file was written by isc-dhcp-4.2.3-P2
-server-duid "\000\001\000\001\030\006iq\010\000'\366\002\307";
+server-duid "\000\001\000\001\030\006n$\010\000'\366\002\307";
lease 192.168.2.151 {
- starts 2 2012/10/09 04:50:19;
- ends 2 2012/10/09 05:00:19;
- cltt 2 2012/10/09 04:50:19;
+ starts 2 2012/10/09 05:10:05;
+ ends 2 2012/10/09 05:20:05;
+ cltt 2 2012/10/09 05:10:05;
binding state active;
next binding state free;
rewind binding state free;

0 comments on commit c69012b

Please sign in to comment.