Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv4690
Modified Files:
dhcp-client-states.c dhcp-client.c dhcp-sysconf.c
Log Message:
cleanup code re-integrated
Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-states.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** dhcp-client-states.c 2 Jul 2002 16:46:11 -0000 1.35
--- dhcp-client-states.c 2 Jul 2002 18:41:40 -0000 1.36
***************
*** 324,328 ****
{
list_t *options;
!
options = client_cache_load_option_string_list(dc->cache, 0);
if(options == NULL) {
--- 324,328 ----
{
list_t *options;
!
options = client_cache_load_option_string_list(dc->cache, 0);
if(options == NULL) {
Index: dhcp-client.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** dhcp-client.c 30 Jun 2002 20:43:10 -0000 1.38
--- dhcp-client.c 2 Jul 2002 18:41:40 -0000 1.39
***************
*** 131,138 ****
static void do_shutdown(dhcp_client_control_t *dc)
{
info_message("shutting down.");
if(dc) { /* only do clean up if we can. */
! // do_sysconf_cleanup(dc);
client_release(dc);
delete_pid_file(dc->interface);
--- 131,148 ----
static void do_shutdown(dhcp_client_control_t *dc)
{
+ list_t *cached_options;
+
info_message("shutting down.");
if(dc) { /* only do clean up if we can. */
!
! /* load what we can from the cache. */
!
! cached_options = client_cache_load_option_string_list(dc->cache, 0);
! if(cached_options != NULL)
! do_sysconf_cleanup(cached_options, dc);
!
! cache_entry_purge_list(cached_options);
!
client_release(dc);
delete_pid_file(dc->interface);
Index: dhcp-sysconf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-sysconf.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** dhcp-sysconf.c 30 Jun 2002 20:43:10 -0000 1.25
--- dhcp-sysconf.c 2 Jul 2002 18:41:40 -0000 1.26
***************
*** 479,481 ****
return;
}
-
--- 479,480 ----
|
