Browse Source

Always request DNS server. DHCP handling will be generalised in future.

tags/v0.9.3
Michael Brown 20 years ago
parent
commit
552f33c663
1 changed files with 3 additions and 19 deletions
  1. 3
    19
      src/core/nic.c

+ 3
- 19
src/core/nic.c View File

94
 #else
94
 #else
95
 #define DHCPDISCOVER_PARAMS_PXE 0
95
 #define DHCPDISCOVER_PARAMS_PXE 0
96
 #endif /* PXE_DHCP_STRICT */
96
 #endif /* PXE_DHCP_STRICT */
97
-#ifdef  DNS_RESOLVER
98
 #define DHCPDISCOVER_PARAMS_DNS  1
97
 #define DHCPDISCOVER_PARAMS_DNS  1
99
-#else
100
-#define DHCPDISCOVER_PARAMS_DNS  0
101
-#endif /* DNS_RESOLVER */
102
 	( DHCPDISCOVER_PARAMS_BASE +
98
 	( DHCPDISCOVER_PARAMS_BASE +
103
 	  DHCPDISCOVER_PARAMS_PXE+
99
 	  DHCPDISCOVER_PARAMS_PXE+
104
 	  DHCPDISCOVER_PARAMS_DNS ),
100
 	  DHCPDISCOVER_PARAMS_DNS ),
105
 	RFC1533_NETMASK,
101
 	RFC1533_NETMASK,
106
 	RFC1533_GATEWAY,
102
 	RFC1533_GATEWAY,
107
 	RFC1533_HOSTNAME,
103
 	RFC1533_HOSTNAME,
108
-	RFC1533_VENDOR
104
+	RFC1533_VENDOR,
109
 #ifdef PXE_DHCP_STRICT
105
 #ifdef PXE_DHCP_STRICT
110
 	,RFC2132_VENDOR_CLASS_ID,
106
 	,RFC2132_VENDOR_CLASS_ID,
111
 	RFC1533_VENDOR_PXE_OPT128,
107
 	RFC1533_VENDOR_PXE_OPT128,
115
 	RFC1533_VENDOR_PXE_OPT132,
111
 	RFC1533_VENDOR_PXE_OPT132,
116
 	RFC1533_VENDOR_PXE_OPT133,
112
 	RFC1533_VENDOR_PXE_OPT133,
117
 	RFC1533_VENDOR_PXE_OPT134,
113
 	RFC1533_VENDOR_PXE_OPT134,
118
-	RFC1533_VENDOR_PXE_OPT135
114
+	RFC1533_VENDOR_PXE_OPT135,
119
 #endif /* PXE_DHCP_STRICT */
115
 #endif /* PXE_DHCP_STRICT */
120
-#ifdef	DNS_RESOLVER
121
-	,RFC1533_DNS
122
-#endif
116
+	RFC1533_DNS
123
 };
117
 };
124
 static const unsigned char dhcprequest [] = {
118
 static const unsigned char dhcprequest [] = {
125
 	RFC2132_MSG_TYPE,1,DHCPREQUEST,
119
 	RFC2132_MSG_TYPE,1,DHCPREQUEST,
162
 #else
156
 #else
163
 #define DHCPREQUEST_PARAMS_FREEBSD 0
157
 #define DHCPREQUEST_PARAMS_FREEBSD 0
164
 #endif /* IMAGE_FREEBSD */
158
 #endif /* IMAGE_FREEBSD */
165
-#ifdef  DNS_RESOLVER
166
 #define DHCPREQUEST_PARAMS_DNS     1
159
 #define DHCPREQUEST_PARAMS_DNS     1
167
-#else
168
-#define DHCPREQUEST_PARAMS_DNS     0
169
-#endif /* DNS_RESOLVER */
170
 	( DHCPREQUEST_PARAMS_BASE +
160
 	( DHCPREQUEST_PARAMS_BASE +
171
 	  DHCPREQUEST_PARAMS_PXE +
161
 	  DHCPREQUEST_PARAMS_PXE +
172
 	  DHCPREQUEST_PARAMS_VENDOR_PXE +
162
 	  DHCPREQUEST_PARAMS_VENDOR_PXE +
191
 	RFC1533_VENDOR_HOWTO,
181
 	RFC1533_VENDOR_HOWTO,
192
 	RFC1533_VENDOR_KERNEL_ENV,
182
 	RFC1533_VENDOR_KERNEL_ENV,
193
 #endif
183
 #endif
194
-#ifdef	DNS_RESOLVER
195
 	/* 1 DNS option */
184
 	/* 1 DNS option */
196
 	RFC1533_DNS,
185
 	RFC1533_DNS,
197
-#endif
198
 #ifdef  PXE_DHCP_STRICT
186
 #ifdef  PXE_DHCP_STRICT
199
 	RFC2132_VENDOR_CLASS_ID,
187
 	RFC2132_VENDOR_CLASS_ID,
200
 	RFC1533_VENDOR_PXE_OPT128,
188
 	RFC1533_VENDOR_PXE_OPT128,
282
 			BOOTP_DATA_ADDR->bootp_reply.bp_giaddr.s_addr);
270
 			BOOTP_DATA_ADDR->bootp_reply.bp_giaddr.s_addr);
283
 	if (arptable[ARP_GATEWAY].ipaddr.s_addr)
271
 	if (arptable[ARP_GATEWAY].ipaddr.s_addr)
284
 		printf(", Gateway %@", arptable[ARP_GATEWAY].ipaddr.s_addr);
272
 		printf(", Gateway %@", arptable[ARP_GATEWAY].ipaddr.s_addr);
285
-#ifdef	DNS_RESOLVER
286
 	if (arptable[ARP_NAMESERVER].ipaddr.s_addr)
273
 	if (arptable[ARP_NAMESERVER].ipaddr.s_addr)
287
 		printf(", Nameserver %@", arptable[ARP_NAMESERVER].ipaddr.s_addr);
274
 		printf(", Nameserver %@", arptable[ARP_NAMESERVER].ipaddr.s_addr);
288
-#endif
289
 	putchar('\n');
275
 	putchar('\n');
290
 
276
 
291
 #ifdef	MDEBUG
277
 #ifdef	MDEBUG
1599
 			}
1585
 			}
1600
 		}
1586
 		}
1601
 #endif
1587
 #endif
1602
-#ifdef	DNS_RESOLVER
1603
 		else if (NON_ENCAP_OPT c == RFC1533_DNS) {
1588
 		else if (NON_ENCAP_OPT c == RFC1533_DNS) {
1604
 			// TODO: Copy the DNS IP somewhere reasonable
1589
 			// TODO: Copy the DNS IP somewhere reasonable
1605
 			if (TAG_LEN(p) >= sizeof(in_addr))
1590
 			if (TAG_LEN(p) >= sizeof(in_addr))
1606
 				memcpy(&arptable[ARP_NAMESERVER].ipaddr, p+2, sizeof(in_addr));
1591
 				memcpy(&arptable[ARP_NAMESERVER].ipaddr, p+2, sizeof(in_addr));
1607
 		}
1592
 		}
1608
-#endif
1609
 		else {
1593
 		else {
1610
 #if 0
1594
 #if 0
1611
 			unsigned char *q;
1595
 			unsigned char *q;

Loading…
Cancel
Save