[dhcp-agent-commits] dhcp-agent/src dhcp-client-conf.c,1.24,1.25 dhcp-client-conf.h,1.14,1.15 dhcp-client-defaults.h,1.2,1.3 dhcp-client-guile.c,1.3,1.4

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

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

Modified Files:
	dhcp-client-conf.c dhcp-client-conf.h dhcp-client-defaults.h 
	dhcp-client-guile.c 
Log Message:
added default subnet mask

Index: dhcp-client-conf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-conf.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** dhcp-client-conf.c	15 May 2003 05:08:14 -0000	1.24
--- dhcp-client-conf.c	15 May 2003 06:53:47 -0000	1.25
***************
*** 63,66 ****
--- 63,67 ----
      "icmp-retries",
      "default-interface-mtu",
+     "default-subnet-mask",
  };
  
***************
*** 83,86 ****
--- 84,88 ----
      CLIENT_VAR_ICMP_RETRIES,
      CLIENT_VAR_INTERFACE_MTU,
+     CLIENT_VAR_SUBNET_MASK,
  };
  
***************
*** 457,460 ****
--- 459,463 ----
  
      case CLIENT_VAR_HOSTNAME:
+     case CLIENT_VAR_SUBNET_MASK:
          var = dhcp_conf_var_create(var_symbol, xstrdup(var_value));
          break;
***************
*** 608,612 ****
  }
  
! static const char *get_conf_string_val(client_conf_params_t *params, var_type_t var_type)
  {
      conf_var_t *var;
--- 611,615 ----
  }
  
! static const char *get_conf_string_val(client_conf_params_t *params, var_type_t var_type, const char *default_val)
  {
      conf_var_t *var;
***************
*** 618,622 ****
          string_val = dhcp_conf_var_get_val(var);
  
!     return string_val;
  }
  
--- 621,628 ----
          string_val = dhcp_conf_var_get_val(var);
  
!     if(string_val)
!         return string_val;
!     else
!         return default_val;
  }
  
***************
*** 728,732 ****
  const char *client_conf_get_hostname(client_conf_t *cc)
  {
!     return get_conf_string_val(cc->params, CLIENT_VAR_HOSTNAME);
  }
  
--- 734,738 ----
  const char *client_conf_get_hostname(client_conf_t *cc)
  {
!     return get_conf_string_val(cc->params, CLIENT_VAR_HOSTNAME, NULL);
  }
  
***************
*** 742,745 ****
--- 748,757 ----
  {
      return get_conf_uint16_val(cc->params, CLIENT_VAR_INTERFACE_MTU, CLIENT_DEFAULT_MTU);
+ }
+ 
+ const char *client_conf_get_default_subnet_mask(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr)
+ {
+     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);
  }
  

Index: dhcp-client-conf.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-conf.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dhcp-client-conf.h	27 Mar 2003 01:39:16 -0000	1.14
--- dhcp-client-conf.h	15 May 2003 06:53:47 -0000	1.15
***************
*** 81,85 ****
                     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 };
  
  /* server symbol substitution. */
--- 81,85 ----
                     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. */
***************
*** 103,107 ****
  extern int client_conf_get_icmp_retries(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr);
  extern uint8_t client_conf_get_do_measure_router_latency_icmp(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr);
! extern int client_conf_get_default_mtu(client_conf_t *cc);
  
  #endif                          /* DHCP_CLIENT_CONF_H */
--- 103,107 ----
  extern int client_conf_get_icmp_retries(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr);
  extern uint8_t client_conf_get_do_measure_router_latency_icmp(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr);
! extern const char *client_conf_get_default_subnet_mask(client_conf_t *cc, ip_addr_t ip_addr, eth_addr_t eth_addr);
  
  #endif                          /* DHCP_CLIENT_CONF_H */

Index: dhcp-client-defaults.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-defaults.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dhcp-client-defaults.h	25 Mar 2003 03:01:53 -0000	1.2
--- dhcp-client-defaults.h	15 May 2003 06:53:48 -0000	1.3
***************
*** 68,70 ****
--- 68,74 ----
  #define CLIENT_DEFAULT_DO_MEASURE_LATENCY_ICMP 1
  
+ /* The default subnet mask. Define this in string format. */
+ 
+ #define CLIENT_DEFAULT_SUBNET_MASK "255.255.255.0"
+ 
  #endif /* DHCP_CLIENT_DEFAULTS_H */

Index: dhcp-client-guile.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-guile.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dhcp-client-guile.c	15 May 2003 05:08:14 -0000	1.3
--- dhcp-client-guile.c	15 May 2003 06:53:48 -0000	1.4
***************
*** 155,159 ****
  
      /* fixme: implement default client subnet-mask option in client conf. */
!     subnet_mask = SCM_BOOL_F;
      return subnet_mask;
  }
--- 155,162 ----
  
      /* fixme: implement default client subnet-mask option in client conf. */
!     subnet_mask = scm_makfrom0str(client_conf_get_default_subnet_mask(dc->conf, 
!                                                                       dhcp_client_get_server_ip_address(dc),
!                                                                       dhcp_client_get_server_hw_address(dc)));
! 
      return subnet_mask;
  }