From: Roy Marples <roy@marples.name>
Date: Fri, 28 Mar 2008 11:45:34 +0000 (+0000)
Subject: It appears that some DHCP servers don't reply to a DISCOVER if we just have DNS_SERVE... 
X-Git-Tag: v4.0.2~532
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5773891d0a84fdd717bcc9f31e706b19db154723;p=thirdparty%2Fdhcpcd.git

It appears that some DHCP servers don't reply to a DISCOVER if we just have DNS_SERVER in the parameter list, so just use the whole list all the time.
---

diff --git a/dhcp.c b/dhcp.c
index 2f6fe475..7faf5c13 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -397,50 +397,41 @@ send_message(const struct interface *iface, const struct dhcp *dhcp,
 		*p++ = DHCP_PARAMETERREQUESTLIST;
 		n_params = p;
 		*p++ = 0;
-		/* Only request DNSSERVER in discover to keep the packets small.
-		 * RFC2131 Section 3.5 states that the REQUEST must include the
-		 * list from the DISCOVER message, so I think this is ok. */
-
-		if (type == DHCP_DISCOVER && !options->test)
-			*p++ = DHCP_DNSSERVER;
-		else {
-			if (type != DHCP_INFORM) {
-				*p++ = DHCP_RENEWALTIME;
-				*p++ = DHCP_REBINDTIME;
-			}
-			*p++ = DHCP_NETMASK;
-			*p++ = DHCP_BROADCAST;
-
-			/* -S means request CSR and MSCSR
-			 * -SS means only request MSCSR incase DHCP message
-			 *  is too big */
-			if (options->domscsr < 2)
-				*p++ = DHCP_CSR;
-			if (options->domscsr > 0)
-				*p++ = DHCP_MSCSR;
-			/* RFC 3442 states classless static routes should be
-			 * before routers and static routes as classless static
-			 * routes override them both */
-			*p++ = DHCP_STATICROUTE;
-			*p++ = DHCP_ROUTERS;
-			*p++ = DHCP_HOSTNAME;
-			*p++ = DHCP_DNSSEARCH;
-			*p++ = DHCP_DNSDOMAIN;
-			*p++ = DHCP_DNSSERVER;
+		if (type != DHCP_INFORM) {
+			*p++ = DHCP_RENEWALTIME;
+			*p++ = DHCP_REBINDTIME;
+		}
+		*p++ = DHCP_NETMASK;
+		*p++ = DHCP_BROADCAST;
+
+		/* -S means request CSR and MSCSR
+		 * -SS means only request MSCSR incase DHCP message
+		 *  is too big */
+		if (options->domscsr < 2)
+			*p++ = DHCP_CSR;
+		if (options->domscsr > 0)
+			*p++ = DHCP_MSCSR;
+		/* RFC 3442 states classless static routes should be
+		 * before routers and static routes as classless static
+		 * routes override them both */
+		*p++ = DHCP_STATICROUTE;
+		*p++ = DHCP_ROUTERS;
+		*p++ = DHCP_HOSTNAME;
+		*p++ = DHCP_DNSSEARCH;
+		*p++ = DHCP_DNSDOMAIN;
+		*p++ = DHCP_DNSSERVER;
 #ifdef ENABLE_NIS
-			*p++ = DHCP_NISDOMAIN;
-			*p++ = DHCP_NISSERVER;
+		*p++ = DHCP_NISDOMAIN;
+		*p++ = DHCP_NISSERVER;
 #endif
 #ifdef ENABLE_NTP
-			*p++ = DHCP_NTPSERVER;
+		*p++ = DHCP_NTPSERVER;
 #endif
-			*p++ = DHCP_MTU;
+		*p++ = DHCP_MTU;
 #ifdef ENABLE_INFO
-			*p++ = DHCP_ROOTPATH;
-			*p++ = DHCP_SIPSERVER;
+		*p++ = DHCP_ROOTPATH;
+		*p++ = DHCP_SIPSERVER;
 #endif
-		}
-
 		*n_params = p - n_params - 1;
 	}
 	*p++ = DHCP_END;