[dhcp-agent-commits] dhcp-agent/src dhcp-client-defaults.h,1.4,1.5 dhcp-client-states.c,1.34,1.35

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

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

Modified Files:
	dhcp-client-defaults.h dhcp-client-states.c 
Log Message:
fixed issues with default timeouts and timeout conf hooks

Index: dhcp-client-defaults.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-defaults.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dhcp-client-defaults.h	8 Jun 2003 22:14:51 -0000	1.4
--- dhcp-client-defaults.h	20 Jun 2003 01:37:15 -0000	1.5
***************
*** 48,64 ****
  /* amount of retry for dhcp DISCOVER messages. */
  
! #define CLIENT_DEFAULT_DHCP_DISCOVER_RETRIES RECOMMENDED_MAX_SECS_WAIT
  
  /* amount of retry for dhcp REQUEST messages. */
  
! #define CLIENT_DEFAULT_DHCP_REQUEST_RETRIES RECOMMENDED_MAX_SECS_WAIT
  
  /* amount of retry for ICMP messages. */
  
! #define CLIENT_DEFAULT_ICMP_RETRIES RECOMMENDED_MAX_SECS_WAIT
  
  /* amount of retry for ARP messages. */
  
! #define CLIENT_DEFAULT_ARP_RETRIES RECOMMENDED_MAX_SECS_WAIT
  
  /* default MTU to use on interface during initialization
--- 48,64 ----
  /* amount of retry for dhcp DISCOVER messages. */
  
! #define CLIENT_DEFAULT_DHCP_DISCOVER_RETRIES 3
  
  /* amount of retry for dhcp REQUEST messages. */
  
! #define CLIENT_DEFAULT_DHCP_REQUEST_RETRIES 3
  
  /* amount of retry for ICMP messages. */
  
! #define CLIENT_DEFAULT_ICMP_RETRIES 3
  
  /* amount of retry for ARP messages. */
  
! #define CLIENT_DEFAULT_ARP_RETRIES 3
  
  /* default MTU to use on interface during initialization

Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-states.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** dhcp-client-states.c	17 Jun 2003 07:34:15 -0000	1.34
--- dhcp-client-states.c	20 Jun 2003 01:37:15 -0000	1.35
***************
*** 388,392 ****
      }
  
!     do_sysconf_setup_timers(options, dc);
      do_sysconf(options, dc, STATE_SETUP);
  
--- 388,392 ----
      }
  
!     client_setup_timers(dc);
      do_sysconf(options, dc, STATE_SETUP);
  
***************
*** 615,619 ****
      /* get the number of retries we will attempt. */
      retries = client_conf_get_dhcp_discovery_retries(dc->conf);
!     timeout = client_conf_get_dhcp_request_retries(dc->conf);
  
      /* build discovery option list. */
--- 615,619 ----
      /* get the number of retries we will attempt. */
      retries = client_conf_get_dhcp_discovery_retries(dc->conf);
!     timeout = client_conf_get_dhcp_discover_timeout(dc->conf);
  
      /* build discovery option list. */