[dhcp-agent-commits] dhcp-agent/src dhcp-client-control.c,1.18,1.19 dhcp-client.h,1.18,1.19

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

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

Modified Files:
	dhcp-client-control.c dhcp-client.h 
Log Message:
removed old discover_offer_retries

Index: dhcp-client-control.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-control.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dhcp-client-control.c	23 Jun 2003 06:05:03 -0000	1.18
--- dhcp-client-control.c	25 Jun 2003 03:08:32 -0000	1.19
***************
*** 51,60 ****
  }
  
- /* dhcp reset discover offer retries. */
- void dhcp_client_reset_discover_offer_retries(dhcp_client_control_t *dc)
- {
-     dc->discover_offer_retries = 0;
- }
- 
  /* dhcp set lease time to be infinite. */
  void dhcp_client_lease_time_is_infinite(dhcp_client_control_t *dc)
--- 51,54 ----
***************
*** 69,84 ****
  }
  
- /* dhcp increment and check whether we should give up on discover offer retries. */
- int dhcp_client_discover_offer_can_retry(dhcp_client_control_t *dc)
- {
-     uint32_t discover_offer_retries = client_conf_get_dhcp_discovery_retries(dc->conf);
-     dc->discover_offer_retries++;
- 
-     if(dc->discover_offer_retries > discover_offer_retries);
-         return 1;
- 
-     return 0;
- }
- 
  /* create client id from a string in the format of xx:xx:xx:xx:xx:xx */
  static unsigned char *create_fake_client_id(unsigned char *mac_string)
--- 63,66 ----
***************
*** 206,212 ****
      dhcp_client_update_secs(dc);
  
-     /* discover offer retries. */
-     dhcp_client_reset_discover_offer_retries(dc);
- 
  #ifdef HAVE_UNAME
      sb = stringbuffer_create();
--- 188,191 ----
***************
*** 231,235 ****
  
      dc->client_id = create_client_id(interface_addr);
-     dc->discover_offer_retries = 0; /* reset discover offer. */
      dc->lease_time_is_infinite = 0; /* reset lease time infinite bit. */
  
--- 210,213 ----

Index: dhcp-client.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dhcp-client.h	23 Jun 2003 06:05:03 -0000	1.18
--- dhcp-client.h	25 Jun 2003 03:08:32 -0000	1.19
***************
*** 54,58 ****
      unsigned char *class_id, *client_id; /* client_id, class_id */
      int state;                  /* our current state. */
-     int discover_offer_retries; /* counter for retries on discover_offer */
      uint8_t lease_time_is_infinite; /* whether or not the lease time is infinite. */
  
--- 54,57 ----
***************
*** 104,109 ****
  extern void dhcp_client_update_secs(dhcp_client_control_t *dc);
  extern void dhcp_client_reset_secs(dhcp_client_control_t *dc);
- extern void dhcp_client_reset_discover_offer_retries(dhcp_client_control_t *dc);
- extern int  dhcp_client_discover_offer_can_retry(dhcp_client_control_t *dc);
  extern void dhcp_client_update_xid(dhcp_client_control_t *dc);
  extern void dhcp_client_control_use_fake_hw_addr(dhcp_client_control_t *dc, char *fake_hw_addr);
--- 103,106 ----