Attachment 702551 Details for Bug 658855 – Stuff siaddr/next-server into the client script options.

[patch] Stuff siaddr/next-server into the client script options.

next-server.patch (text/plain), 1.73 KB, created by Dan Williams on 2013-02-25 23:14:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Williams

Created: 2013-02-25 23:14:16 UTC

Size: 1.73 KB

patch

obsolete

>diff -up dhcp-4.2.5/client/dhclient.c.next-server dhcp-4.2.5/client/dhclient.c
>--- dhcp-4.2.5/client/dhclient.c.next-server	2013-02-26 00:02:52.865820517 +0100
>+++ dhcp-4.2.5/client/dhclient.c	2013-02-26 00:12:22.259702114 +0100
>@@ -1473,7 +1473,7 @@ void state_selecting (cpp)
> 		client -> state = S_REQUESTING;
> 
> 		/* Bind to the address we received. */
>-		bind_lease (client);
>+		bind_lease (client, NULL);
> 		return;
> 	}
> 
>@@ -1663,11 +1663,12 @@ void dhcpack (packet)
> 	if (client -> new -> rebind < cur_time)
> 		client -> new -> rebind = TIME_MAX;
> 
>-	bind_lease (client);
>+	bind_lease (client, &packet -> raw -> siaddr);
> }
> 
>-void bind_lease (client)
>+void bind_lease (client, siaddr)
> 	struct client_state *client;
>+	struct in_addr *siaddr;
> {
> 	struct timeval tv;
> 
>@@ -1689,6 +1690,13 @@ void bind_lease (client)
> 	if (client -> alias)
> 		script_write_params (client, "alias_", client -> alias);
> 
>+	if (siaddr) {
>+		char buf[INET_ADDRSTRLEN];
>+
>+		if (inet_ntop (AF_INET, (void *) siaddr, buf, sizeof (buf)))
>+			client_envadd (client, "", "next_server", "%s", buf);
>+	}
>+
> 	/* If the BOUND/RENEW code detects another machine using the
> 	   offered address, it exits nonzero.  We need to send a
> 	   DHCPDECLINE and toss the lease. */
>diff -up dhcp-4.2.5/includes/dhcpd.h.next-server dhcp-4.2.5/includes/dhcpd.h
>--- dhcp-4.2.5/includes/dhcpd.h.next-server	2013-02-26 00:02:52.834820904 +0100
>+++ dhcp-4.2.5/includes/dhcpd.h	2013-02-26 00:11:09.523611440 +0100
>@@ -2718,7 +2718,7 @@ void state_bound (void *);
> void state_stop (void *);
> void state_panic (void *);
> 
>-void bind_lease (struct client_state *);
>+void bind_lease (struct client_state *, struct in_addr *);
> 
> void make_client_options (struct client_state *,
> 			  struct client_lease *, u_int8_t *,

Actions: View | Diff

Attachments on bug 658855: 702551 | 730817