rpms/dhcp/devel dhcp-3.0.4-libdhcp4client.patch,1.2,1.3

Fri May 26 17:07:33 UTC 2006

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21484

Modified Files:
	dhcp-3.0.4-libdhcp4client.patch 
Log Message:
fill in client->packet.siaddr for pump nextServer option

dhcp-3.0.4-libdhcp4client.patch:
 includes/dhcp4client.h           |   24 +++
 includes/libdhcp_control.h       |  103 ++++++++++++++
 libdhcp4client/client/dhclient.c |  283 +++++++++++++++++++++++++++++++++++++--
 libdhcp4client/common/alloc.c    |    6 
 libdhcp4client/common/discover.c |   17 +-
 libdhcp4client/common/lpf.c      |    1 
 libdhcp4client/dst/hmac_link.c   |   32 +++-
 libdhcp4client/omapip/alloc.c    |   42 +++++
 libdhcp4client/omapip/dispatch.c |    2 
 libdhcp4client/omapip/errwarn.c  |   48 ++++++
 10 files changed, 530 insertions(+), 28 deletions(-)

Index: dhcp-3.0.4-libdhcp4client.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.4-libdhcp4client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- dhcp-3.0.4-libdhcp4client.patch	25 May 2006 19:09:14 -0000	1.2
+++ dhcp-3.0.4-libdhcp4client.patch	26 May 2006 17:07:30 -0000	1.3
@@ -1,5 +1,5 @@
---- dhcp-3.0.4/libdhcp4client/common/alloc.c.libdhcp4client	2006-05-24 19:36:02.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/common/alloc.c	2006-05-24 19:36:53.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/common/alloc.c.libdhcp4client	2006-05-25 20:57:06.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/alloc.c	2006-05-25 20:57:55.000000000 -0400
 @@ -1016,9 +1016,11 @@
  	rc_register (file, line, ptr, bp, bp -> refcnt, 0, RC_MISC);
  	return 1;
@@ -14,8 +14,8 @@
  #if defined (DEBUG_MEMORY_LEAKAGE) || \
  		defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT)
  void relinquish_free_packets ()
---- dhcp-3.0.4/libdhcp4client/common/discover.c.libdhcp4client	2006-05-24 19:36:02.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/common/discover.c	2006-05-24 19:36:53.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/common/discover.c.libdhcp4client	2006-05-25 20:57:06.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/discover.c	2006-05-25 20:57:55.000000000 -0400
 @@ -120,7 +120,9 @@
     For each interface that's of type INET and not the loopback interface,
     register that interface with the network I/O software, figure out what
@@ -60,7 +60,7 @@
  	if (fallback_interface) {
  	    if (fcntl (fallback_interface -> rfdesc, F_SETFD, 1) < 0)
 --- dhcp-3.0.4/libdhcp4client/common/lpf.c.libdhcp4client	2004-11-24 12:39:15.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/common/lpf.c	2006-05-24 20:04:33.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/common/lpf.c	2006-05-25 20:57:55.000000000 -0400
 @@ -216,6 +216,7 @@
  	struct interface_info *info;
  {
@@ -70,7 +70,7 @@
  	/* Set up the bpf filter program structure.    This is defined in
  	   bpf.c */
 --- dhcp-3.0.4/libdhcp4client/dst/hmac_link.c.libdhcp4client	2001-02-22 02:22:08.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/dst/hmac_link.c	2006-05-24 19:36:53.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/dst/hmac_link.c	2006-05-25 20:57:55.000000000 -0400
 @@ -38,6 +38,10 @@
  
  #include "dst_internal.h"
@@ -158,7 +158,7 @@
  		return (0);
  	memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func));
 --- dhcp-3.0.4/libdhcp4client/omapip/alloc.c.libdhcp4client	2006-02-22 17:43:27.000000000 -0500
-+++ dhcp-3.0.4/libdhcp4client/omapip/alloc.c	2006-05-24 19:36:53.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/omapip/alloc.c	2006-05-25 20:57:55.000000000 -0400
 @@ -40,6 +40,41 @@
  
  #include <omapip/omapip_p.h>
@@ -222,8 +222,8 @@
  }
  
  #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \
---- dhcp-3.0.4/libdhcp4client/omapip/dispatch.c.libdhcp4client	2006-05-24 19:36:02.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/omapip/dispatch.c	2006-05-24 19:36:53.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/omapip/dispatch.c.libdhcp4client	2006-05-25 20:57:06.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/omapip/dispatch.c	2006-05-25 20:57:55.000000000 -0400
 @@ -34,7 +34,7 @@
  
  #include <omapip/omapip_p.h>
@@ -233,8 +233,8 @@
  TIME cur_time;
  
  OMAPI_OBJECT_ALLOC (omapi_io,
---- dhcp-3.0.4/libdhcp4client/omapip/errwarn.c.libdhcp4client	2006-05-24 19:36:02.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/omapip/errwarn.c	2006-05-24 19:36:53.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/omapip/errwarn.c.libdhcp4client	2006-05-25 20:57:06.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/omapip/errwarn.c	2006-05-25 20:57:55.000000000 -0400
 @@ -39,6 +39,11 @@
  #include <omapip/omapip_p.h>
  #include <errno.h>
@@ -346,8 +346,8 @@
    return 0;
  }
  
---- dhcp-3.0.4/libdhcp4client/client/dhclient.c.libdhcp4client	2006-05-24 19:36:02.000000000 -0400
-+++ dhcp-3.0.4/libdhcp4client/client/dhclient.c	2006-05-24 19:36:53.000000000 -0400
+--- dhcp-3.0.4/libdhcp4client/client/dhclient.c.libdhcp4client	2006-05-25 20:57:06.000000000 -0400
++++ dhcp-3.0.4/libdhcp4client/client/dhclient.c	2006-05-25 21:03:53.000000000 -0400
 @@ -78,7 +78,9 @@
  int extended_option_environment = 0;
  #endif
@@ -624,7 +624,33 @@
  	/*NOTREACHED*/
  	return 0;
  }
-@@ -1266,6 +1442,9 @@
+@@ -1227,8 +1403,25 @@
+ 	client -> new -> rebind += cur_time;
+ 	if (client -> new -> rebind < cur_time)
+ 		client -> new -> rebind = TIME_MAX;
++#ifdef LIBDHCP
++	/* We need the server's siaddr for the 'bootServer'
++         * pump option 
++	 */
++	u_int32_t set_siaddr = 0;	
++
++	set_siaddr = client -> packet.siaddr.s_addr ;
++	     
++	client->packet.siaddr.s_addr = packet->raw->siaddr.s_addr ;
++#endif
+ 
+ 	bind_lease (client);
++
++
++#ifdef LIBDHCP
++
++	client -> packet.siaddr.s_addr = set_siaddr ;
++#endif
++	
+ }
+ 
+ void bind_lease (client)
+@@ -1266,6 +1459,9 @@
  		return;
  	}
  
@@ -634,7 +660,7 @@
  	/* Write out the new lease. */
  	write_client_lease (client, client -> new, 0, 0);
  
-@@ -1367,13 +1546,13 @@
+@@ -1367,13 +1563,13 @@
  {
  	return 0;
  }
@@ -650,7 +676,7 @@
  int write_host (host)
  	struct host_decl *host;
  {
-@@ -1925,6 +2104,10 @@
+@@ -1925,6 +2121,10 @@
  	   tell the shell script that we failed to allocate an address,
  	   and try again later. */
  	if (onetry) {
@@ -661,7 +687,7 @@
  		if (!quiet)
  			log_info ("Unable to obtain a lease on first try.%s",
  				  "  Exiting.");
-@@ -2536,7 +2719,9 @@
+@@ -2536,7 +2736,9 @@
  	free_client_lease (lease, MDL);
  }
  
@@ -671,7 +697,7 @@
  
  void rewrite_client_leases ()
  {
-@@ -2984,6 +3169,54 @@
+@@ -2984,6 +3186,54 @@
  int script_go (client)
  	struct client_state *client;
  {
@@ -726,7 +752,7 @@
  	int rval;
  	char *scriptName;
  	char *argv [2];
-@@ -2992,7 +3225,9 @@
+@@ -2992,7 +3242,9 @@
  	char reason [] = "REASON=NBI";
  	static char client_path [] = CLIENT_PATH;
  	int i;
@@ -736,7 +762,7 @@
  	int pid, wpid, wstatus;
  
  	if (client)
-@@ -3149,6 +3384,9 @@
+@@ -3149,6 +3401,9 @@
  
  	/* Don't become a daemon if the user requested otherwise. */
  	if (no_daemon) {
@@ -746,7 +772,7 @@
  		write_client_pid_file ();
  		return;
  	}
-@@ -3157,7 +3395,9 @@
+@@ -3157,7 +3412,9 @@
  	if (state)
  		return;
  	state = 1;
@@ -757,8 +783,8 @@
  	/* Stop logging to stderr... */
  	log_perror = 0;
  
---- /dev/null	2006-05-24 12:14:44.813776500 -0400
-+++ dhcp-3.0.4/includes/dhcp4client.h	2006-05-24 19:36:53.000000000 -0400
+--- /dev/null	2006-05-25 14:24:27.864979750 -0400
++++ dhcp-3.0.4/includes/dhcp4client.h	2006-05-25 20:57:55.000000000 -0400
 @@ -0,0 +1,24 @@
 +/* dhcp4client.h
 + *
@@ -784,8 +810,8 @@
 +extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp);
 +    /* The ISC IPv4 DHCP client main() function .
 +     */
---- /dev/null	2006-05-24 12:14:44.813776500 -0400
-+++ dhcp-3.0.4/includes/libdhcp_control.h	2006-05-24 19:36:53.000000000 -0400
+--- /dev/null	2006-05-25 14:24:27.864979750 -0400
++++ dhcp-3.0.4/includes/libdhcp_control.h	2006-05-25 20:57:55.000000000 -0400
 @@ -0,0 +1,103 @@
 +/* libdhcp_control.h
 + *


