[Dhcp-agent-commits] dhcp-agent CAVEATS,1.3,1.4 Changelog,1.8,1.9 README,1.6,1.7 THANKS,1.8,1.9 TODO,1.30,1.31 configure,1.22,1.23 configure.in,1.22,1.23 dhcp-client-states.c,1.31,1.32 dhcp-client.c,1.34,1.35 dhcp-exception.c,1.1,1.2 dhcp-exception.h,1.1,1.2

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

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv14150

Modified Files:
	CAVEATS Changelog README THANKS TODO configure configure.in 
	dhcp-client-states.c dhcp-client.c dhcp-exception.c 
	dhcp-exception.h 
Log Message:
updates for new 0.37 version -- mostly textual changes

Index: CAVEATS
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/CAVEATS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CAVEATS	11 Feb 2002 18:02:24 -0000	1.3
--- CAVEATS	24 Jun 2002 14:32:24 -0000	1.4
***************
*** 13,14 ****
--- 13,18 ----
  -- dhcpclient's icmp mask discovery has not been tested. Please report
     success if you use this feature (send me a patch too for any bugs).
+ 
+ -- *BSD folks may find serious issues if they're using a BPF
+    device without the select() fix. We've tested this on
+    OpenBSD-3.1, and FreeBSD-4.6

Index: Changelog
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/Changelog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Changelog	31 Jan 2002 14:43:22 -0000	1.8
--- Changelog	24 Jun 2002 14:32:24 -0000	1.9
***************
*** 1,57 ****
! -- 31/01/2001
! 
!    added -m option to fake MAC address. this is useful
!    for diagnostics when you want to see if one machine
!    can't physically get its boot parameters or not.
! 
!    added INADDR_NONE definition to build properly
!    on Solaris
! 
!    dhcpclient now logs renew and wait messages.
!    
!    dhcpsniff now outputs timestamps unix style.
! 
!    Fixed up automake.
!    
!    Fixed dhcp secs bug. Wasn't being set properly.
! 
! -- release 0.35a (alpha)
! 
! -- 30/01/2001
! 
!    Fixed up configure script, although it still needs
!    more work. Needs a proper revamp.
!    
!    dhcpclient should now correctly send RELEASE when
!    shutting down, and deleting the cache and pid file.
!    
!    dhcpclient should now correctly go from WAIT state
!    to REQUEST state to renew, instead of previous
!    behaviour of reverting back to DISCOVER.
! 
!    dhcpclient now can wake a running client if passed -w flag.
!    
!    dhcpclient will now check for an existing client and refuse
!    to start up if it exists.
! 
!    -- tmh
! 
! -- 29/01/2001
! 
!    Added check to client_cache_dump_options to skip possible
!    malformed options.
!    Fixed do_sysconf to stop jumping hoops. It now gets the
!    data in serialized state as a cache entry.
! 
!   -- tmh
! 
! -- 28/01/2001
! 
!    Fixed small memory leak. No apparent memory leaks anymore.
!    Some code clean up.
!    Added rtt mechanism as defined in RFC2131
!    PID filename is now "<interface-name>.pid"
!    Added man page for dhcpclient.
!    Added -k option for killing current dhcpclient daemon process.
  
!    -- tmh
--- 1,3 ----
! -- Changelog
  
!    
\ No newline at end of file

Index: README
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** README	18 May 2002 18:17:59 -0000	1.6
--- README	24 Jun 2002 14:32:24 -0000	1.7
***************
*** 20,27 ****
  -----------------------
  
! The current distribution has only been tested on Linux 2.2.x. I will
! be porting it to other systems in future releases. Also it will only
! work on ethernet interfaces, which is most likely the only type of
! interface people will want to use it on.
  
  dhcp-agent relies on two portable networking libraries: libpcap and
--- 20,30 ----
  -----------------------
  
! Although the current distribution is in alpha state, we are
! porting it about. You can help too. Tests have been run
! successfully on:
! 
! Linux 2.2.x     (Heavily pillaged Slackware 8.0)
! FreeBSD-4.6     (Stock installation with dhclient killed)
! OpenBSD-3.1     (Stock installation with dhclient killed)
  
  dhcp-agent relies on two portable networking libraries: libpcap and
***************
*** 47,58 ****
  See the CAVEATS file for more known issues.
  
! Building
! --------
  
! To build simply: "configure; make; make install;"
  
! Before installing please uninstall any previous distribution, or
! dhcp suite package. Make sure you have also disabled any dhcp client
! or server running on the host.
  
  Uninstalling
--- 50,63 ----
  See the CAVEATS file for more known issues.
  
! Building and Installing
! -----------------------
  
! To build simply: "./configure; make;"
  
! To install: "make install;"
! 
! Before installing please uninstall any previous distribution of
! dhcp-agent, or dhcp suite package. Make sure you have also
! disabled any dhcp client or server running on the host.
  
  Uninstalling
***************
*** 66,73 ****
  Read the man page for dhcpsniff for command line options.
  
! Simply run dhcpsniff with no arguments to have it sniff the default
! interface pcap chooses. You need to run this as root since it needs
! access to a packet capturing device. If the interface is down, you
! need to bring it up (even if your settings are bogus).
  
  Using dhcpclient
--- 71,77 ----
  Read the man page for dhcpsniff for command line options.
  
! Simply run dhcpsniff with no arguments to have it sniff the first
! ethernet interface it finds. You need to run this as root since
! it needs access to a packet capturing device.
  
  Using dhcpclient
***************
*** 75,83 ****
  
  Read the man page for dhcpclient for command line options.
- (No really, read it)
  
  dhcpclient currently only sets up the interface, routing, and domain
  name system if the appropriate DHCP options are received. More
  options will be added later.
  
  Support
--- 79,94 ----
  
  Read the man page for dhcpclient for command line options.
  
  dhcpclient currently only sets up the interface, routing, and domain
  name system if the appropriate DHCP options are received. More
  options will be added later.
+ 
+ dhcpclient is still a pit finnicky about which interface it
+ picks. Use the -i option to force it to choose an interface. Or
+ down the ethernet interface you wish to use and it will
+ automatically detect a downed ethernet interface.
+ 
+ We're still working on a nicer way of making things
+ automagic. Feel free to offer your suggestions.
  
  Support

Index: THANKS
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/THANKS,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** THANKS	11 Jun 2002 01:50:27 -0000	1.8
--- THANKS	24 Jun 2002 14:32:24 -0000	1.9
***************
*** 17,18 ****
--- 17,20 ----
  
  -- Brian J. Kifiak for assisting in development.
+ 
+ -- Chris Keelan for some spare PC133 RAM.

Index: TODO
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/TODO,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** TODO	23 Jun 2002 03:29:12 -0000	1.30
--- TODO	24 Jun 2002 14:32:24 -0000	1.31
***************
*** 93,94 ****
--- 93,101 ----
     create_dhcp_option(data, len, tag)
  -- document output from dhcpsniff -- especially how brief mode is layed out.
+ -- dhcpclient startup needs a more clever way of detecting interfaces:
+ 
+         -- detect which interfaces already have clients on them
+         -- accept a list from globconf
+         -- apply only to a specific interface.
+ 
+    more importantly though we need

Index: configure
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** configure	23 Jun 2002 03:29:12 -0000	1.22
--- configure	24 Jun 2002 14:32:25 -0000	1.23
***************
*** 1,5 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.50 for dhcp-agent 0.36.
  #
  # Report bugs to <tm...@wh...>.
--- 1,5 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by Autoconf 2.50 for dhcp-agent 0.37.
  #
  # Report bugs to <tm...@wh...>.
***************
*** 145,150 ****
  PACKAGE_NAME='dhcp-agent'
  PACKAGE_TARNAME='dhcp-agent'
! PACKAGE_VERSION='0.36'
! PACKAGE_STRING='dhcp-agent 0.36'
  PACKAGE_BUGREPORT='tm...@wh...'
  
--- 145,150 ----
  PACKAGE_NAME='dhcp-agent'
  PACKAGE_TARNAME='dhcp-agent'
! PACKAGE_VERSION='0.37'
! PACKAGE_STRING='dhcp-agent 0.37'
  PACKAGE_BUGREPORT='tm...@wh...'
  
***************
*** 554,558 ****
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<EOF
! \`configure' configures dhcp-agent 0.36 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
--- 554,558 ----
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<EOF
! \`configure' configures dhcp-agent 0.37 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
***************
*** 616,620 ****
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of dhcp-agent 0.36:";;
     esac
    cat <<\EOF
--- 616,620 ----
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of dhcp-agent 0.37:";;
     esac
    cat <<\EOF
***************
*** 682,686 ****
  if $ac_init_version; then
    cat <<\EOF
! dhcp-agent configure 0.36
  generated by GNU Autoconf 2.50
  
--- 682,686 ----
  if $ac_init_version; then
    cat <<\EOF
! dhcp-agent configure 0.37
  generated by GNU Autoconf 2.50
  
***************
*** 697,701 ****
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by dhcp-agent $as_me 0.36, which was
  generated by GNU Autoconf 2.50.  Invocation command line was
  
--- 697,701 ----
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by dhcp-agent $as_me 0.37, which was
  generated by GNU Autoconf 2.50.  Invocation command line was
  
***************
*** 1103,1107 ****
  PACKAGE=dhcp-agent
  
! VERSION=0.36
  
  if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--- 1103,1107 ----
  PACKAGE=dhcp-agent
  
! VERSION=0.37
  
  if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
***************
*** 3350,3354 ****
  cat >>$CONFIG_STATUS <<EOF
  ac_cs_version="\\
! dhcp-agent config.status 0.36
  configured by $0, generated by GNU Autoconf 2.50,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 3350,3354 ----
  cat >>$CONFIG_STATUS <<EOF
  ac_cs_version="\\
! dhcp-agent config.status 0.37
  configured by $0, generated by GNU Autoconf 2.50,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
***************
*** 3438,3442 ****
  ## ----------------------- ##
  
! This file was extended by $as_me (dhcp-agent 0.36) 2.50, executed with
    > $ac_cs_invocation
  on `(hostname || uname -n) 2>/dev/null | sed 1q`
--- 3438,3442 ----
  ## ----------------------- ##
  
! This file was extended by $as_me (dhcp-agent 0.37) 2.50, executed with
    > $ac_cs_invocation
  on `(hostname || uname -n) 2>/dev/null | sed 1q`

Index: configure.in
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** configure.in	23 Jun 2002 03:29:12 -0000	1.22
--- configure.in	24 Jun 2002 14:32:25 -0000	1.23
***************
*** 5,10 ****
  
  dnl init
! AC_INIT(dhcp-agent, 0.36, tm...@wh...)
! AM_INIT_AUTOMAKE(dhcp-agent, 0.36)
  AM_CONFIG_HEADER(config.h)
  
--- 5,10 ----
  
  dnl init
! AC_INIT(dhcp-agent, 0.37, tm...@wh...)
! AM_INIT_AUTOMAKE(dhcp-agent, 0.37)
  AM_CONFIG_HEADER(config.h)
  

Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-states.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** dhcp-client-states.c	22 Jun 2002 01:47:57 -0000	1.31
--- dhcp-client-states.c	24 Jun 2002 14:32:25 -0000	1.32
***************
*** 312,316 ****
      return STATE_REQUEST_ACK; /* if we didn't an ALARM get it it's probably a HUP 
                                 * or a TERM. in either case we can
!                                * return STATE_REQUEST here. */
  }
  
--- 312,316 ----
      return STATE_REQUEST_ACK; /* if we didn't an ALARM get it it's probably a HUP 
                                 * or a TERM. in either case we can
!                                * return STATE_REQUEST_ACK here. */
  }
  

Index: dhcp-client.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** dhcp-client.c	24 Jun 2002 02:04:56 -0000	1.34
--- dhcp-client.c	24 Jun 2002 14:32:25 -0000	1.35
***************
*** 161,164 ****
--- 161,167 ----
  }
  
+ /* wrapper around interface retrieval routines. */
+ 
+ /* get active or inactive interfaces. */
  static char *interface_get_proc(int active)
  {
***************
*** 179,182 ****
--- 182,186 ----
  }
  
+ /* get interface which is active. */
  static char *interface_get_active(void)
  {
***************
*** 184,187 ****
--- 188,192 ----
  }
  
+ /* get interface which is inactive. */
  static char *interface_get_inactive(void)
  {
***************
*** 189,193 ****
  }
  
! /* main loop: if only_setup is called we exit after setup. */
  static int do_client_dhcp_loop(int only_setup, dhcp_client_control_t *dc, int state)
  {
--- 194,200 ----
  }
  
! /* main loop: if only_setup is called we exit after setup --
!  * this is useful for running through the loop only long
!  * enough to setup the interface. */
  static int do_client_dhcp_loop(int only_setup, dhcp_client_control_t *dc, int state)
  {
***************
*** 291,294 ****
--- 298,302 ----
      }
  
+     info_message("woke client on pid %u : for interface: %s", pid, interface);
      return;
  }
***************
*** 329,332 ****
--- 337,341 ----
  }
  
+ /* change int our working directory. */
  static void do_change_work_dir(void)
  {
***************
*** 353,356 ****
--- 362,366 ----
  }
  
+ /* do client: perform dhcp client proper functions. */
  static void do_client(char *interface)
  {

Index: dhcp-exception.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-exception.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dhcp-exception.c	22 Jun 2002 18:11:25 -0000	1.1
--- dhcp-exception.c	24 Jun 2002 14:32:25 -0000	1.2
***************
*** 54,57 ****
--- 54,63 ----
  
      exceptions.cur_index++;
+ 
+     if(exceptions.cur_index == MAX_EXCEPTION_STACK) {
+         fatal_error("push_exception: ran out of exception stack space!");
+         exit(1);
+     }
+ 
  }
  

Index: dhcp-exception.h
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-exception.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dhcp-exception.h	22 Jun 2002 18:11:25 -0000	1.1
--- dhcp-exception.h	24 Jun 2002 14:32:25 -0000	1.2
***************
*** 36,37 ****
--- 36,39 ----
                             char *fmt, ...);
  extern stringbuffer *unroll_exceptions(void);
+ 
+ #define THROW_EXCEPTION(module_name, func_name, msg, return_val) { (push_exception(module_name, func_name, msg); return return_val;) }