[dhcp-agent-commits] dhcp-agent/src dhcp-client-conf.h,1.17,1.18 dhcp-client-conf.c,1.27,1.28 dhcp-client-defaults.h,1.5,1.6

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

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

Modified Files:
	dhcp-client-conf.h dhcp-client-conf.c dhcp-client-defaults.h 
Log Message:
added default rebind/renew timer percent directive

Index: dhcp-client-conf.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-conf.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dhcp-client-conf.h	17 Jun 2003 07:34:15 -0000	1.17
--- dhcp-client-conf.h	23 Jun 2003 06:04:33 -0000	1.18
***************
*** 82,86 ****
                     CLIENT_VAR_ICMP_RETRIES, CLIENT_VAR_ARP_RETRIES, CLIENT_VAR_INTERFACE_MTU, CLIENT_VAR_DO_MEASURE_ROUTER_LATENCY_ICMP, 
                     CLIENT_VAR_REQUEST_OPTIONS, CLIENT_VAR_REQUIRE_OPTIONS, CLIENT_VAR_CONFIGURE_OPTIONS, CLIENT_VAR_APPEND_OPTIONS, 
!                    CLIENT_VAR_PREPEND_OPTIONS, CLIENT_VAR_OVERRIDE_OPTIONS, CLIENT_VAR_SUBNET_MASK };
  
  /* server symbol substitution. */
--- 82,87 ----
                     CLIENT_VAR_ICMP_RETRIES, CLIENT_VAR_ARP_RETRIES, CLIENT_VAR_INTERFACE_MTU, CLIENT_VAR_DO_MEASURE_ROUTER_LATENCY_ICMP, 
                     CLIENT_VAR_REQUEST_OPTIONS, CLIENT_VAR_REQUIRE_OPTIONS, CLIENT_VAR_CONFIGURE_OPTIONS, CLIENT_VAR_APPEND_OPTIONS, 
!                    CLIENT_VAR_PREPEND_OPTIONS, CLIENT_VAR_OVERRIDE_OPTIONS, CLIENT_VAR_SUBNET_MASK, CLIENT_VAR_RENEW_PERCENT,
!                    CLIENT_VAR_REBIND_PERCENT };
  
  /* server symbol substitution. */
***************
*** 111,114 ****
--- 112,117 ----
  extern int client_conf_get_default_mtu(client_conf_t *cc);
  extern const char *client_conf_get_default_subnet_mask(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr);
+ extern int client_conf_get_renew_percent(client_conf_t *cc);
+ extern int client_conf_get_rebind_percent(client_conf_t *cc);
  
  #endif                          /* DHCP_CLIENT_CONF_H */

Index: dhcp-client-conf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-conf.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dhcp-client-conf.c	17 Jun 2003 07:34:15 -0000	1.27
--- dhcp-client-conf.c	23 Jun 2003 06:04:33 -0000	1.28
***************
*** 77,80 ****
--- 77,85 ----
      "default-interface-mtu",
      "default-subnet-mask",
+ 
+     /* lease time default percent */
+     "default-renew-percent",
+     "default-rebind-percent",
+ 
  };
  
***************
*** 105,108 ****
--- 110,115 ----
      CLIENT_VAR_INTERFACE_MTU,
      CLIENT_VAR_SUBNET_MASK,
+     CLIENT_VAR_RENEW_PERCENT,
+     CLIENT_VAR_REBIND_PERCENT,
  };
  
***************
*** 507,510 ****
--- 514,519 ----
          break;
  
+     case CLIENT_VAR_RENEW_PERCENT:
+     case CLIENT_VAR_REBIND_PERCENT:
      case CLIENT_VAR_INTERFACE_MTU:
  
***************
*** 827,830 ****
--- 836,849 ----
      client_conf_params_t *params = find_best_params_for(cc, ip_addr, eth_addr);
      return get_conf_string_val(params, CLIENT_VAR_SUBNET_MASK, CLIENT_DEFAULT_SUBNET_MASK);
+ }
+ 
+ int client_conf_get_renew_percent(client_conf_t *cc)
+ {
+     return get_conf_uint16_val(cc->params, CLIENT_VAR_RENEW_PERCENT, CLIENT_DEFAULT_RENEW_PERCENT);
+ }
+ 
+ int client_conf_get_rebind_percent(client_conf_t *cc)
+ {
+     return get_conf_uint16_val(cc->params, CLIENT_VAR_REBIND_PERCENT, CLIENT_DEFAULT_REBIND_PERCENT);
  }
  

Index: dhcp-client-defaults.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-defaults.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dhcp-client-defaults.h	20 Jun 2003 01:37:15 -0000	1.5
--- dhcp-client-defaults.h	23 Jun 2003 06:04:33 -0000	1.6
***************
*** 88,90 ****
--- 88,98 ----
  #define CLIENT_DEFAULT_SUBNET_MASK "255.255.255.0"
  
+ /* Percent of lease time to use as renew. */
+ 
+ #define CLIENT_DEFAULT_RENEW_PERCENT 50
+ 
+ /* Percent of lease time to use as rebind. */
+ 
+ #define CLIENT_DEFAULT_REBIND_PERCENT 80
+ 
  #endif /* DHCP_CLIENT_DEFAULTS_H */