[dhcp-agent-commits] dhcp-agent/conf default.sysconf,1.1,1.2

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

Update of /cvsroot/dhcp-agent/dhcp-agent/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv8131/conf

Modified Files:
	default.sysconf 
Log Message:
now using hooks for guile extension

Index: default.sysconf
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/conf/default.sysconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default.sysconf	11 May 2003 17:00:05 -0000	1.1
--- default.sysconf	20 May 2003 01:43:39 -0000	1.2
***************
*** 9,33 ****
  ;
  
! (if (defined? 'dhcp-requested-ip-address)
!     (let
  
                                          ; if the mtu wasn't passed by the server, get the user configured one
!         ((mtu 
!           (if (defined? 'dhcp-interface-mtu) 
!               dhcp-interface-mtu
!               (client-get-default-mtu client-control)))
  
                                          ; if the subnet mask wasn't specified, get the user configured one
!          (subnet-mask
!           (if (defined? 'dhcp-subnet-mask)
!               dhcp-subnet-mask
!               (client-get-default-subnet-mask client-control))))
  
                                          ; that's it we're ready to bring up the interface
  
!       (begin 
!         (client-info-message "bringing up interface...")
!         (if (not (client-interface-up client-control dhcp-requested-ip-address subnet-mask mtu))
!             (client-fatal-message "could not bring up interface... exiting.")))))
  
  ; XXX
--- 9,35 ----
  ;
  
! (define configure-interface
!   (lambda ()
!     (if (defined? 'dhcp-requested-ip-address)
!         (let
  
                                          ; if the mtu wasn't passed by the server, get the user configured one
!             ((mtu 
!               (if (defined? 'dhcp-interface-mtu) 
!                   dhcp-interface-mtu
!                   (client-get-default-mtu client-control)))
  
                                          ; if the subnet mask wasn't specified, get the user configured one
!              (subnet-mask
!               (if (defined? 'dhcp-subnet-mask)
!                   dhcp-subnet-mask
!                   (client-get-default-subnet-mask client-control))))
  
                                          ; that's it we're ready to bring up the interface
  
!           (begin 
!             (client-info-message "bringing up interface...")
!             (if (not (client-interface-up client-control dhcp-requested-ip-address subnet-mask mtu))
!                 (client-fatal-message "could not bring up interface... exiting.")))))))
  
  ; XXX
***************
*** 38,54 ****
  ;
  
! (if (and (client-configure? client-control 'dhcp-domain-name-servers) 
!          (client-configure? client-control 'dhcp-domain-name)
!          (defined? 'dhcp-domain-name-servers)
!          (defined? 'dhcp-domain-name))
  
!     (let ((resolv-conf-file-port (open "/etc/resolv.conf" O_WRONLY 0644)))
!       (begin
!         (client-info-message "configuring resolver")
!         (map-in-order
!          (lambda (dns-server)
!            (simple-format resolv-conf-file-port "nameserver ~A\n" dns-server))  dhcp-domain-name-servers)
!         (simple-format resolv-conf-file-port "search ~A\n" dhcp-domain-name)
!         (close-port resolv-conf-file-port))))
  
  
--- 40,58 ----
  ;
  
! (define configure-dns
!   (lambda ()
!     (if (and (client-configure? client-control 'dhcp-domain-name-servers) 
!              (client-configure? client-control 'dhcp-domain-name)
!              (defined? 'dhcp-domain-name-servers)
!              (defined? 'dhcp-domain-name))
  
!         (let ((resolv-conf-file-port (open "/etc/resolv.conf" O_WRONLY 0644)))
!           (begin
!             (client-info-message "configuring resolver")
!             (map-in-order
!              (lambda (dns-server)
!                (simple-format resolv-conf-file-port "nameserver ~A\n" dns-server))  dhcp-domain-name-servers)
!             (simple-format resolv-conf-file-port "search ~A\n" dhcp-domain-name)
!             (close-port resolv-conf-file-port))))))
  
  
***************
*** 56,62 ****
  ;
  
! (if (and (client-configure? client-control 'dhcp-routers) 
!          (defined? 'dhcp-routers))
!     (begin
!       (client-info-message (string-append "adding default route to: " (car dhcp-routers)))
!       (client-set-default-route client-control (car dhcp-routers))))
--- 60,80 ----
  ;
  
! (define configure-default-route
!   (lambda()
!     (if (and (client-configure? client-control 'dhcp-routers) 
!              (defined? 'dhcp-routers))
!         (begin
!           (client-info-message (string-append "adding default route to: " (car dhcp-routers)))
!           (client-set-default-route client-control (car dhcp-routers))))))
! 
! 
! ; After everything is defined set to hooks
! ;
! ; We have four hooks. dhcp-bound, dhcp-rebind, dhcp-renew, dhcp-release
! 
! ; setup options on dhcp-bound
! ;
! 
! (add-hook! dhcp-bound-hook configure-dns)
! (add-hook! dhcp-bound-hook configure-default-route)
! (add-hook! dhcp-bound-hook configure-interface)