upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-10 09:11:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always issue the pxe request

Browse source 
All the code are now only issueing one single dhcp request at startup of the
loader meaning we can always request a the PXE informations from the
dhcp server.

Previous code lost that information, meaning no option 55 anymore (meaning not
working with the kea dhcp server) and no request for rootpath etc, no user class

Remove the flags from the bootp function which is not needed anymore

Reviewed by:	tsoome
Differential Revision:	https://reviews.freebsd.org/D10952
This commit is contained in:
Baptiste Daroussin 2017-05-27 12:35:01 +00:00
parent 5fe86cd909
commit 4dfd16670e
4 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
lib/libstand/bootp.c
View file

@ -95,7 +95,7 @@ size_t bootp_response_size;
/* Fetch required bootp infomation */
void
bootp(int sock, int flag)
bootp(int sock)
{
void *pkt;
struct iodesc *d;
@ -138,32 +138,29 @@ bootp(int sock, int flag)
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 @@ bootp(int sock, int flag)
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;

6
lib/libstand/bootp.h
View file

@ -123,12 +123,6 @@ struct bootp {
#define DHCPRELEASE 7
#endif
/*
* bootp flags
*/
#define BOOTP_NONE 0x0000 /* No flags */
#define BOOTP_PXE 0x0001 /* Booting from PXE. */
/*
* "vendor" data permitted for CMU bootp clients.
*/

2
lib/libstand/net.h
View file

@ -119,7 +119,7 @@ ssize_t sendrecv(struct iodesc *,
void **, void **);
/* bootp/DHCP */
void bootp(int, int);
void bootp(int);
/* Utilities: */
char *ether_sprintf(u_char *);

2
sys/boot/common/dev_net.c
View file

@ -284,7 +284,7 @@ net_getparams(int sock)
d->myip = myip;
}
if (rc < 0)
bootp(sock, BOOTP_NONE);
bootp(sock);
}
if (myip.s_addr != 0)
goto exit;