[dhcp-agent-commits] dhcp-agent/src dhcp-lease.c,1.7,1.8 dhcp-lease.h,1.6,1.7
Status: Alpha
Brought to you by:
actmodern
From: <act...@us...> - 2003-08-05 04:59:14
|
Update of /cvsroot/dhcp-agent/dhcp-agent/src In directory sc8-pr-cvs1:/tmp/cvs-serv26361/src Modified Files: dhcp-lease.c dhcp-lease.h Log Message: new routines for lease data Index: dhcp-lease.c =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-lease.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dhcp-lease.c 26 Jul 2003 23:47:08 -0000 1.7 --- dhcp-lease.c 5 Aug 2003 04:59:12 -0000 1.8 *************** *** 165,168 **** --- 165,194 ---- }; + lease_t *lease_create(ip_addr_t ip_address, ip_addr_t subnet_mask, uint32_t lease_expiry, + uint32_t renew_time, uint32_t rebind_time) + { + lease_t *lease; + + lease = xcalloc(sizeof(lease_t)); + lease->address = ip_address; + lease->subnet_mask = subnet_mask; + lease->lease_expiry = lease_expiry; + lease->renew_time = renew_time; + lease->rebind_time = rebind_time; + + return lease; + } + + void lease_destroy(lease_t *lease) + { + xfree(lease); + } + + lease_t *lease_copy(lease_t *lease) + { + return lease_create(lease->address, lease->subnet_mask, lease->lease_expiry, + lease->renew_time, lease->rebind_time); + } + /* * * * * * * * * accessors. * *************** *** 241,244 **** --- 267,365 ---- { return lease->subnet_mask; + } + + uint32_t lease_definition_get_renew(lease_definition_t *lease) + { + return lease->renew_time; + } + + uint32_t lease_definition_get_rebind(lease_definition_t *lease) + { + return lease->rebind_time; + } + + uint32_t lease_definition_get_expiry(lease_definition_t *lease) + { + return lease->lease_expiry; + } + + list_t *lease_definition_get_options(lease_definition_t *lease) + { + return lease->options; + } + + /* lease. */ + + list_t *lease_get_options(lease_t *lease_data) + { + return lease_data->options; + } + + uint32_t lease_get_renew(lease_t *lease_data) + { + return lease_data->renew_time; + } + + uint32_t lease_get_rebind(lease_t *lease_data) + { + return lease_data->rebind_time; + } + + uint32_t lease_get_expiry(lease_t *lease_data) + { + return lease_data->lease_expiry; + } + + ip_addr_t lease_get_subnet_mask(lease_t *lease_data) + { + return lease_data->subnet_mask; + } + + ip_addr_t lease_get_address(lease_t *lease_data) + { + return lease_data->address; + } + + /* modifiers. */ + + /* lease_t */ + + void lease_set_options(lease_t *lease_data, list_t *options) + { + if(lease_data->options != NULL) + dhcp_opt_destroy_option_list(lease_data->options); + + lease_data->options = options; + return; + } + + void lease_set_renew(lease_t *lease_data, uint32_t renew_time) + { + lease_data->renew_time = renew_time; + return; + } + + void lease_set_rebind(lease_t *lease_data, uint32_t rebind_time) + { + lease_data->rebind_time = rebind_time; + return; + } + + void lease_set_expiry(lease_t *lease_data, uint32_t lease_expiry) + { + lease_data->lease_expiry = lease_expiry; + return; + } + + void lease_set_subnet_mask(lease_t *lease_data, ip_addr_t subnet_mask) + { + lease_data->subnet_mask = subnet_mask; + return; + } + + void lease_set_address(lease_t *lease_data, ip_addr_t ip_address) + { + lease_data->address = ip_address; + return; } Index: dhcp-lease.h =================================================================== RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-lease.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dhcp-lease.h 26 Jul 2003 23:47:08 -0000 1.6 --- dhcp-lease.h 5 Aug 2003 04:59:12 -0000 1.7 *************** *** 70,79 **** 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; --- 70,84 ---- typedef struct { ip_addr_t address; /* assigned address. */ + ip_addr_t subnet_mask; /* subnet mask. */ + + uint32_t lease_expiry; /* lease expiry time. */ + uint32_t renew_time; /* renewal time. */ + uint32_t rebind_time; /* rebind time. */ + time_t ini_assigned; /* initially assigned timestamp. */ time_t last_assigned; /* last assigned timestamp. */ + list_t *options; /* options. */ } lease_t; *************** *** 115,118 **** --- 120,145 ---- 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 list_t *lease_definition_get_options(lease_definition_t *lease); + extern uint32_t lease_definition_get_renew(lease_definition_t *lease); + extern uint32_t lease_definition_get_rebind(lease_definition_t *lease); + extern uint32_t lease_definition_get_expiry(lease_definition_t *lease); + + extern list_t *lease_get_options(lease_t *lease_data); + extern uint32_t lease_get_renew(lease_t *lease_data); + extern uint32_t lease_get_rebind(lease_t *lease_data); + extern uint32_t lease_get_expiry(lease_t *lease_data); + extern ip_addr_t lease_get_subnet_mask(lease_t *lease_data); + extern ip_addr_t lease_get_address(lease_t *lease_data); + extern void lease_set_options(lease_t *lease_data, list_t *options); + extern void lease_set_renew(lease_t *lease_data, uint32_t renew_time); + extern void lease_set_rebind(lease_t *lease_data, uint32_t rebind_time); + extern void lease_set_expiry(lease_t *lease_data, uint32_t lease_expiry); + extern void lease_set_subnet_mask(lease_t *lease_data, ip_addr_t subnet_mask); + extern void lease_set_address(lease_t *lease_data, ip_addr_t ip_address); + + extern lease_t *lease_create(ip_addr_t ip_address, ip_addr_t subnet_mask, uint32_t lease_expiry, + uint32_t renew_time, uint32_t rebind_time); + extern void lease_destroy(lease_t *lease); + extern lease_t *lease_copy(lease_t *lease); extern void pretty_print_lease_def(lease_definition_t *lease_def); |