[dhcp-agent-commits] dhcp-agent/src dhcp-server-conf.c,1.7,1.8 dhcp-server-conf.h,1.6,1.7 dhcp-server-defaults.h,1.1,1.2

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

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

Modified Files:
	dhcp-server-conf.c dhcp-server-conf.h dhcp-server-defaults.h 
Log Message:
added poll timeout conf variable

Index: dhcp-server-conf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-server-conf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dhcp-server-conf.c	14 Jul 2003 05:58:17 -0000	1.7
--- dhcp-server-conf.c	15 Jul 2003 10:56:34 -0000	1.8
***************
*** 41,44 ****
--- 41,45 ----
      "default-renew-percent",
      "default-rebind-percent",
+     "poll-timeout"
  };
  
***************
*** 46,49 ****
--- 47,51 ----
      SERVER_VAR_RENEW_PERCENT,
      SERVER_VAR_REBIND_PERCENT,
+     SERVER_VAR_POLL_TIMEOUT,
  };
  
***************
*** 145,148 ****
--- 147,158 ----
  };
  
+ /* accessors. */
+ 
+ uint16_t server_conf_get_poll_timeout(server_conf_t *sc)
+ {
+     return sc->poll_timeout;
+ }
+ 
+ 
  /* * * * * * * * * * *
   * utility routines. *
***************
*** 206,210 ****
      case SERVER_VAR_REBIND_PERCENT:
  
- 
          if(!is_unsigned_numeric(var_value))  {
              ERROR_MESSAGE("value not unsigned numeric as expected : %s", var_value);
--- 216,219 ----
***************
*** 220,223 ****
--- 229,242 ----
          break;
  
+     case SERVER_VAR_POLL_TIMEOUT:
+ 
+         if(!is_unsigned_numeric(var_value))  {
+             ERROR_MESSAGE("value not unsigned numeric as expected : %s\n", var_value);
+             return 1;
+         }
+ 
+         sscanf(var_value, "%"SCNu16, &server_conf->poll_timeout);
+         break;
+ 
      default:
          
***************
*** 485,488 ****
--- 504,508 ----
      sc->default_rebind_percent = SERVER_DEFAULT_REBIND_PERCENT;
      sc->default_renew_percent  = SERVER_DEFAULT_RENEW_PERCENT;
+     sc->poll_timeout           = SERVER_DEFAULT_POLL_TIMEOUT;
  
      if(server_conf_load_options(sc)) {

Index: dhcp-server-conf.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-server-conf.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dhcp-server-conf.h	14 Jul 2003 05:58:17 -0000	1.6
--- dhcp-server-conf.h	15 Jul 2003 10:56:34 -0000	1.7
***************
*** 37,40 ****
--- 37,41 ----
      uint16_t default_rebind_percent;   /* percent of expiry to assign as rebind time. */
      uint16_t default_renew_percent;    /* percent of expiry to assign as renew time. */
+     uint16_t poll_timeout;             /* poll timeout -- used in server event processing. */
  
  } server_conf_t;
***************
*** 44,48 ****
  /* constants. */
  
! enum var_symbols { SERVER_VAR_RENEW_PERCENT = 0, SERVER_VAR_REBIND_PERCENT };
  enum directive_types { DIRECTIVE_SET = 0, DIRECTIVE_RANGE_LEASE, DIRECTIVE_HOSTNAME_LEASE, DIRECTIVE_MAC_LEASE, DIRECTIVE_OPTION };
  enum group_types { GROUP_NULL = 0, GROUP_LEASE_DEF };
--- 45,49 ----
  /* constants. */
  
! enum var_symbols { SERVER_VAR_RENEW_PERCENT = 0, SERVER_VAR_REBIND_PERCENT, SERVER_VAR_POLL_TIMEOUT };
  enum directive_types { DIRECTIVE_SET = 0, DIRECTIVE_RANGE_LEASE, DIRECTIVE_HOSTNAME_LEASE, DIRECTIVE_MAC_LEASE, DIRECTIVE_OPTION };
  enum group_types { GROUP_NULL = 0, GROUP_LEASE_DEF };
***************
*** 52,55 ****
--- 53,58 ----
  extern server_conf_t *server_conf_create(const char *interface);
  extern void server_conf_destroy(server_conf_t *sc);
+ 
+ extern uint16_t server_conf_get_poll_timeout(server_conf_t *sc);
  
  #endif /* DHCP_SERVER_CONF_H */

Index: dhcp-server-defaults.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-server-defaults.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dhcp-server-defaults.h	6 Jul 2003 17:10:23 -0000	1.1
--- dhcp-server-defaults.h	15 Jul 2003 10:56:34 -0000	1.2
***************
*** 39,41 ****
--- 39,47 ----
  #define SERVER_DEFAULT_REBIND_PERCENT 80
  
+ /* Poll timeout. Set this to a higher value if you want the
+  * server to poll for events less frequently. This only really
+  * affects signals for now. */
+ 
+ #define SERVER_DEFAULT_POLL_TIMEOUT 5
+ 
  #endif /* DHCP_SERVER_DEFAULTS_H */