d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the dhcp server provides an interface-mtu option, parse the value and

Browse Source 
set that mtu on the interface.

These changes are based on the patch submitted by Robert Blayzor in the
PR, but I changed things around a bit, so the blame for any mistakes
belongs to me.

PR:		187094
This commit is contained in:
Ian Lepore 2016-03-21 14:51:51 +00:00
parent 678849441d
commit a6c1490807
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/nfs/bootp_subr.c
View File

@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/endian.h>
#include <sys/jail.h>
#include <sys/kernel.h>
#include <sys/sockio.h>
@ -158,6 +159,7 @@ struct bootpc_ifcontext {
int dhcpquerytype; /* dhcp type sent */
struct in_addr dhcpserver;
int gotdhcpserver;
uint16_t mtu;
};
#define TAG_MAXLEN 1024
@ -199,6 +201,7 @@ struct bootpc_globalcontext {
#define TAG_ROUTERS 3 /* Routers (in order of preference) */
#define TAG_HOSTNAME 12 /* Client host name */
#define TAG_ROOT 17 /* Root path */
#define TAG_INTF_MTU 26 /* Interface MTU Size (RFC2132) */
/* DHCP specific tags */
#define TAG_OVERLOAD 52 /* Option Overload */
@ -1034,7 +1037,19 @@ bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
return (0);
}
printf("Adjusted interface %s\n", ifctx->ireq.ifr_name);
printf("Adjusted interface %s", ifctx->ireq.ifr_name);
/* Do BOOTP interface options */
if (ifctx->mtu != 0) {
printf(" (MTU=%d%s)", ifctx->mtu,
(ifctx->mtu > 1514) ? "/JUMBO" : "");
ifr->ifr_mtu = ifctx->mtu;
error = ifioctl(bootp_so, SIOCSIFMTU, (caddr_t) ifr, td);
if (error != 0)
panic("%s: SIOCSIFMTU, error=%d", __func__, error);
}
printf("\n");
/*
* Do enough of ifconfig(8) so that the chosen interface
* can talk to the servers. (just set the address)
@ -1522,6 +1537,11 @@ bootpc_decode_reply(struct nfsv3_diskless *nd, struct bootpc_ifcontext *ifctx,
p[i] = '\0';
}
p = bootpc_tag(&gctx->tag, &ifctx->reply, ifctx->replylen,
TAG_INTF_MTU);
if (p != NULL) {
ifctx->mtu = be16dec(p);
}
printf("\n");