From: Roy Marples <roy@marples.name>
Date: Thu, 24 Apr 2008 15:06:06 +0000 (+0000)
Subject: Add server_name and filename env vars. Also, fix network_number to match dhclient.
X-Git-Tag: v4.0.2~452
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd2c83dbbc0d502f595c6796f31728066b9a03e3;p=thirdparty%2Fdhcpcd.git

Add server_name and filename env vars. Also, fix network_number to match dhclient.
---

diff --git a/dhcp.c b/dhcp.c
index 8e16a442..64964257 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -1139,14 +1139,22 @@ configure_env(const char *prefix, const struct dhcp_message *dhcp)
 			_setenv(prefix, "broadcast_address", inet_ntoa(net));
 		}
 		addr.s_addr = dhcp->yiaddr & net.s_addr;
-		_setenv(prefix, "network_address", inet_ntoa(addr));
-
+		_setenv(prefix, "network_number", inet_ntoa(addr));
 	} else {
 		_setenv(prefix, "ip_address", NULL);
 		_setenv(prefix, "subnet_cidr", NULL);
-		_setenv(prefix, "network_address", NULL);
+		_setenv(prefix, "network_number", NULL);
 	}
 
+	if (*dhcp->bootfile)
+		_setenv(prefix, "filename", (char *)dhcp->bootfile);
+	else
+		_setenv(prefix, "filename", NULL);
+	if (*dhcp->servername)
+		_setenv(prefix, "server_name", (char *)dhcp->servername);
+	else
+		_setenv(prefix, "server_name", NULL);
+
 	for (i = 0; i < sizeof(dhcp_options) / sizeof(dhcp_options[0]); i++) {
 		opt = &dhcp_options[i];
 		if (!opt->var)