Page MenuHomeFreeBSD
Files F106047130

D10952.diff
No OneTemporary
Actions

D10952.diff
View Options

Index: head/lib/libstand/bootp.h
===================================================================
--- head/lib/libstand/bootp.h
+++ head/lib/libstand/bootp.h
@@ -124,12 +124,6 @@
#endif
/*
- * bootp flags
- */
-#define BOOTP_NONE 0x0000 /* No flags */
-#define BOOTP_PXE 0x0001 /* Booting from PXE. */
-
-/*
* "vendor" data permitted for CMU bootp clients.
*/
Index: head/lib/libstand/bootp.c
===================================================================
--- head/lib/libstand/bootp.c
+++ head/lib/libstand/bootp.c
@@ -95,7 +95,7 @@
/* Fetch required bootp infomation */
void
-bootp(int sock, int flag)
+bootp(int sock)
{
void *pkt;
struct iodesc *d;
@@ -138,32 +138,29 @@
bp->bp_vend[6] = DHCPDISCOVER;
/*
- * If we are booting from PXE, we want to send the string
+ * We are booting from PXE, we want to send the string
* 'PXEClient' to the DHCP server so you have the option of
* only responding to PXE aware dhcp requests.
*/
- if (flag & BOOTP_PXE) {
- bp->bp_vend[7] = TAG_CLASSID;
- bp->bp_vend[8] = 9;
- bcopy("PXEClient", &bp->bp_vend[9], 9);
- bp->bp_vend[18] = TAG_USER_CLASS;
- /* len of each user class + number of user class */
- bp->bp_vend[19] = 8;
- /* len of the first user class */
- bp->bp_vend[20] = 7;
- bcopy("FREEBSD", &bp->bp_vend[21], 7);
- bp->bp_vend[28] = TAG_PARAM_REQ;
- bp->bp_vend[29] = 7;
- bp->bp_vend[30] = TAG_ROOTPATH;
- bp->bp_vend[31] = TAG_HOSTNAME;
- bp->bp_vend[32] = TAG_SWAPSERVER;
- bp->bp_vend[33] = TAG_GATEWAY;
- bp->bp_vend[34] = TAG_SUBNET_MASK;
- bp->bp_vend[35] = TAG_INTF_MTU;
- bp->bp_vend[36] = TAG_SERVERID;
- bp->bp_vend[37] = TAG_END;
- } else
- bp->bp_vend[7] = TAG_END;
+ bp->bp_vend[7] = TAG_CLASSID;
+ bp->bp_vend[8] = 9;
+ bcopy("PXEClient", &bp->bp_vend[9], 9);
+ bp->bp_vend[18] = TAG_USER_CLASS;
+ /* len of each user class + number of user class */
+ bp->bp_vend[19] = 8;
+ /* len of the first user class */
+ bp->bp_vend[20] = 7;
+ bcopy("FREEBSD", &bp->bp_vend[21], 7);
+ bp->bp_vend[28] = TAG_PARAM_REQ;
+ bp->bp_vend[29] = 7;
+ bp->bp_vend[30] = TAG_ROOTPATH;
+ bp->bp_vend[31] = TAG_HOSTNAME;
+ bp->bp_vend[32] = TAG_SWAPSERVER;
+ bp->bp_vend[33] = TAG_GATEWAY;
+ bp->bp_vend[34] = TAG_SUBNET_MASK;
+ bp->bp_vend[35] = TAG_INTF_MTU;
+ bp->bp_vend[36] = TAG_SERVERID;
+ bp->bp_vend[37] = TAG_END;
#else
bp->bp_vend[4] = TAG_END;
#endif
@@ -199,13 +196,10 @@
bp->bp_vend[20] = 4;
leasetime = htonl(300);
bcopy(&leasetime, &bp->bp_vend[21], 4);
- if (flag & BOOTP_PXE) {
- bp->bp_vend[25] = TAG_CLASSID;
- bp->bp_vend[26] = 9;
- bcopy("PXEClient", &bp->bp_vend[27], 9);
- bp->bp_vend[36] = TAG_END;
- } else
- bp->bp_vend[25] = TAG_END;
+ bp->bp_vend[25] = TAG_CLASSID;
+ bp->bp_vend[26] = 9;
+ bcopy("PXEClient", &bp->bp_vend[27], 9);
+ bp->bp_vend[36] = TAG_END;
expected_dhcpmsgtype = DHCPACK;
Index: head/lib/libstand/net.h
===================================================================
--- head/lib/libstand/net.h
+++ head/lib/libstand/net.h
@@ -119,7 +119,7 @@
void **, void **);
/* bootp/DHCP */
-void bootp(int, int);
+void bootp(int);
/* Utilities: */
char *ether_sprintf(u_char *);
Index: head/sys/boot/common/dev_net.c
===================================================================
--- head/sys/boot/common/dev_net.c
+++ head/sys/boot/common/dev_net.c
@@ -284,7 +284,7 @@
d->myip = myip;
}
if (rc < 0)
- bootp(sock, BOOTP_NONE);
+ bootp(sock);
}
if (myip.s_addr != 0)
goto exit;

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 11:17 AM (10 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15596464
Default Alt Text
D10952.diff (3 KB)

Event Timeline