Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add a NetBSD Vendor Class Identifier option as proposed on tech-net 

in message <20020216172527.C23901@dr-evil.shagadelic.org>.
* Print the bootp/dhcp response, as is done for rarp/bootparam
  responses.
* Nuke bootp_flags and BOOTP_PXE; they're not used, nor should they be.
This commit is contained in:
thorpej 2002-03-20 23:10:39 +00:00
parent df292ba439
commit 6440db6488
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/lib/libsa/bootp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootp.c,v 1.21 2001/07/19 16:13:01 wiz Exp $ */
/* $NetBSD: bootp.c,v 1.22 2002/03/20 23:10:39 thorpej Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@ -39,7 +39,7 @@
* @(#) Header: bootp.c,v 1.4 93/09/11 03:13:51 leres Exp (LBL)
*/
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@ -105,6 +105,10 @@ bootp(sock)
u_char header[HEADER_SIZE];
struct bootp rbootp;
} rbuf;
#ifdef SUPPORT_DHCP
char vci[64];
int vcilen;
#endif
#ifdef BOOTP_DEBUG
if (debug)
@ -137,17 +141,14 @@ bootp(sock)
bp->bp_vend[5] = 1;
bp->bp_vend[6] = DHCPDISCOVER;
/*
* If we are booting from PXE, we want to send the string
* "PXEClient" to the DHCP server in case it only wants to
* respond to PXE clients.
* Insert a NetBSD Vendor Class Identifier option.
*/
if (bootp_flags & 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_END;
} else
bp->bp_vend[7] = TAG_END;
sprintf(vci, "NetBSD:%s:libsa", MACHINE);
vcilen = strlen(vci);
bp->bp_vend[7] = TAG_CLASSID;
bp->bp_vend[8] = vcilen;
bcopy(vci, &bp->bp_vend[9], vcilen);
bp->bp_vend[9 + vcilen] = TAG_END;
#else
bp->bp_vend[4] = TAG_END;
#endif
@ -184,13 +185,15 @@ bootp(sock)
bp->bp_vend[20] = 4;
leasetime = htonl(300);
bcopy(&leasetime, &bp->bp_vend[21], 4);
if (bootp_flags & 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;
}
bp->bp_vend[25] = TAG_END;
/*
* Insert a NetBSD Vendor Class Identifier option.
*/
sprintf(vci, "NetBSD:%s:libsa", MACHINE);
vcilen = strlen(vci);
bp->bp_vend[25] = TAG_CLASSID;
bp->bp_vend[26] = vcilen;
bcopy(vci, &bp->bp_vend[27], vcilen);
bp->bp_vend[27 + vcilen] = TAG_END;
expected_dhcpmsgtype = DHCPACK;
@ -257,6 +260,17 @@ bootp(sock)
gateip.s_addr = 0;
}
printf("net_open: client addr: %s\n", inet_ntoa(myip));
if (smask)
printf("net_open: subnet mask: %s\n", intoa(smask));
if (gateip.s_addr != 0)
printf("net_open: net gateway: %s\n", inet_ntoa(gateip));
printf("net_open: server addr: %s\n", inet_ntoa(rootip));
if (rootpath[0] != '\0')
printf("net_open: server path: %s\n", rootpath);
if (bootfile[0] != '\0')
printf("net_open: file name: %s\n", bootfile);
/* Bump xid so next request will be unique. */
++d->xid;
}

9
sys/lib/libsa/bootp.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootp.h,v 1.6 2000/11/02 03:22:23 thorpej Exp $ */
/* $NetBSD: bootp.h,v 1.7 2002/03/20 23:10:39 thorpej Exp $ */
/*
* Bootstrap Protocol (BOOTP). RFC951 and RFC1048.
@ -117,13 +117,6 @@ struct bootp {
#define DHCPRELEASE 7
#endif
extern int bootp_flags;
/*
* Flags for bootp_flags.
*/
#define BOOTP_PXE 0x01 /* we're a PXE client */
/*
* "vendor" data permitted for CMU bootp clients.
*/