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

diff --git a/dhcp.c b/dhcp.c
index 8e16a442865e75b8c9e43dad4ebeba90146994ec..64964257cb3af2b04eee02da9255e9ab6fbec23b 100644 (file)
--- 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)