[dhcp-agent-commits] dhcp-agent/src dhcp-lease.c,1.6,1.7 dhcp-lease.h,1.5,1.6

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5061/src

Modified Files:
	dhcp-lease.c dhcp-lease.h 
Log Message:
leases now accept subnet definition

Index: dhcp-lease.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-lease.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dhcp-lease.c	14 Jul 2003 05:58:17 -0000	1.6
--- dhcp-lease.c	26 Jul 2003 23:47:08 -0000	1.7
***************
*** 85,88 ****
--- 85,90 ----
  
  lease_definition_t *lease_definition_create(lease_constraint_t *constraint,
+                                             ip_addr_t subnet_address,
+                                             ip_addr_t subnet_mask,
                                              int lease_type,
                                              void *data,
***************
*** 103,106 ****
--- 105,112 ----
      lease_def->constraint = constraint;
  
+     /* assign subnet. */
+     lease_def->subnet = subnet_address;
+     lease_def->subnet_mask = subnet_mask;
+ 
      /* setup addresses. */
      switch(lease_type) {
***************
*** 227,230 ****
--- 233,246 ----
  }
  
+ ip_addr_t lease_definition_get_subnet_addr(lease_definition_t *lease)
+ {
+     return lease->subnet;
+ }
+ 
+ ip_addr_t lease_definition_get_subnet_mask(lease_definition_t *lease)
+ {
+     return lease->subnet_mask;
+ }
+ 
  /* * * * * * * * * *
   * misc utilities. *
***************
*** 238,241 ****
--- 254,258 ----
      dhcp_opt_t *option;
      char *bottom_addr, *top_addr;
+     char *subnet_addr, *subnet_mask;
  
      INFO_MESSAGE("Lease type: %s", lease_type_to_string(lease_def));
***************
*** 291,294 ****
--- 308,319 ----
      }
  
+     subnet_addr = ip_addr_to_string(lease_definition_get_subnet_addr(lease_def));
+     subnet_mask = ip_addr_to_string(lease_definition_get_subnet_mask(lease_def));
+ 
+     INFO_MESSAGE("Subnet: %s %s", subnet_addr, subnet_mask);
+ 
+     xfree(subnet_addr);
+     xfree(subnet_mask);
+ 
      INFO_MESSAGE(" ");
      INFO_MESSAGE("Lease options:");
***************
*** 313,316 ****
--- 338,342 ----
      }
  
+     INFO_MESSAGE("----------------------------------------");
      INFO_MESSAGE(" ");
      return;

Index: dhcp-lease.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-lease.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dhcp-lease.h	13 Jul 2003 05:44:30 -0000	1.5
--- dhcp-lease.h	26 Jul 2003 23:47:08 -0000	1.6
***************
*** 56,59 ****
--- 56,62 ----
      } address_info;
  
+     ip_addr_t subnet;                      /* subnet address. */
+     ip_addr_t subnet_mask;                 /* subnet address. */
+ 
      list_t *options;                       /* options to be passed. */
  
***************
*** 64,76 ****
  } lease_definition_t;
  
! /* assigned lease data. */
  typedef struct {
  
      lease_definition_t *definition;         /* lease definition. */
  
      time_t ini_assigned;                   /* initially assigned timestamp. */
      time_t last_assigned;                  /* last assigned timestamp. */
  
! } assigned_lease_data_t;
  
  /* constants. */
--- 67,80 ----
  } lease_definition_t;
  
! /* lease data. */
  typedef struct {
  
      lease_definition_t *definition;         /* lease definition. */
  
+     ip_addr_t address;                     /* assigned address. */
      time_t ini_assigned;                   /* initially assigned timestamp. */
      time_t last_assigned;                  /* last assigned timestamp. */
  
! } lease_t;
  
  /* constants. */
***************
*** 84,87 ****
--- 88,93 ----
  extern void lease_constraint_destroy(lease_constraint_t *lease_constraint);
  extern lease_definition_t *lease_definition_create(lease_constraint_t *constraint,
+                                                    ip_addr_t subnet,
+                                                    ip_addr_t subnet_mask,
                                                     int lease_type,
                                                     void *data,
***************
*** 107,110 ****
--- 113,118 ----
  extern ip_addr_t lease_definition_get_top_addr(lease_definition_t *lease);
  extern ip_addr_t lease_definition_get_addr(lease_definition_t *lease);
+ extern ip_addr_t lease_definition_get_subnet_addr(lease_definition_t *lease);
+ extern ip_addr_t lease_definition_get_subnet_mask(lease_definition_t *lease);
  
  extern void pretty_print_lease_def(lease_definition_t *lease_def);