[dhcp-agent-commits] dhcp-agent/src dhcp-server-guile.c,1.11,1.12

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

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12355

Modified Files:
	dhcp-server-guile.c 
Log Message:
redid interface to backend


Index: dhcp-server-guile.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-server-guile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** dhcp-server-guile.c	18 Aug 2003 16:17:43 -0000	1.11
--- dhcp-server-guile.c	2 Jun 2004 02:06:54 -0000	1.12
***************
*** 43,47 ****
  
  static scm_t_bits server_control_tag;
! SCM leases_initialize, lease_available, lease_lookup, lease_acquire, lease_release, lease_expire;
  
  /* * * * * * * * * * * * * * * * * * * *
--- 43,47 ----
  
  static scm_t_bits server_control_tag;
! static SCM leases_initialize, lease_available, lease_lookup, lease_acquire, lease_release, lease_expire;
  
  /* * * * * * * * * * * * * * * * * * * *
***************
*** 181,184 ****
--- 181,186 ----
      scm_c_define_gsubr("server-get-local-address", 1, 0, 0, dhcp_scm_get_local_address);
      scm_c_define_gsubr("server-get-local-subnet-mask", 1, 0, 0, dhcp_scm_get_local_subnet_mask);
+     scm_c_define_gsubr("server-info-message", 1, 0, 1, scm_info_message);
+     scm_c_define_gsubr("server-error-message", 1, 0, 1, scm_error_message);
  
      return;
***************
*** 247,270 ****
      /* bind symbols to top level so that the user defined script can hook into them. */
  
!     leases_initialize = scm_str2symbol("initialize-leases");
      lease_available = scm_str2symbol("lease-available?");
      lease_lookup = scm_str2symbol("lease-lookup");
      lease_acquire = scm_str2symbol("lease-acquire");
      lease_release = scm_str2symbol("lease-release");
!     lease_expire = scm_str2symbol("lease-expire");
! 
!     /* bind false to all the subroutines. */
! 
!     scm_define(leases_initialize, SCM_BOOL_F);
!     scm_define(lease_available, SCM_BOOL_F);
!     scm_define(lease_lookup, SCM_BOOL_F);
!     scm_define(lease_acquire, SCM_BOOL_F);
!     scm_define(lease_release, SCM_BOOL_F);
!     scm_define(lease_expire, SCM_BOOL_F);
! 
!     /* bind some utility routines. */
!     scm_c_define_gsubr("server-info-message", 1, 0, 1, scm_info_message);
!     scm_c_define_gsubr("server-error-message", 1, 0, 1, scm_error_message);
!     scm_c_define_gsubr("server-fatal-error-message", 1, 0, 1, scm_fatal_error_message);
  
      /* bind to a top level list of all the lease definitions. */
--- 249,258 ----
      /* bind symbols to top level so that the user defined script can hook into them. */
  
!     /*    leases_initialize = scm_str2symbol("initialize-leases");
      lease_available = scm_str2symbol("lease-available?");
      lease_lookup = scm_str2symbol("lease-lookup");
      lease_acquire = scm_str2symbol("lease-acquire");
      lease_release = scm_str2symbol("lease-release");
!     lease_expire = scm_str2symbol("lease-expire"); */
  
      /* bind to a top level list of all the lease definitions. */
***************
*** 278,282 ****
  
      /* do lease defs binding. */
!     scm_c_define("lease-definitions", scm_lease_defs);
      
      /* bind our server control object. */
--- 266,270 ----
  
      /* do lease defs binding. */
!     scm_c_define("*lease-definitions*", scm_lease_defs);
      
      /* bind our server control object. */
***************
*** 287,290 ****
--- 275,288 ----
      load_guile_backend(sc);
  
+     /* lookup the backend interface.
+      * FIXME: error if backend is not suitable */
+ 
+     leases_initialize = scm_c_lookup("initialize-leases");
+     lease_available = scm_c_lookup("lease-available?");
+     lease_lookup = scm_c_lookup("lease-lookup");
+     lease_acquire = scm_c_lookup("lease-acquire");
+     lease_release = scm_c_lookup("lease-release");
+     lease_expire = scm_c_lookup("lease-expire");
+ 
      return;
  }