Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Mar 2018 04:16:37 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r331179 - stable/11/sbin/dhclient
Message-ID:  <201803190416.w2J4Gbqt021135@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Mon Mar 19 04:16:37 2018
New Revision: 331179
URL: https://svnweb.freebsd.org/changeset/base/331179

Log:
  MFC r305306:
  
  dhclient: add support for interface-mtu (26)
  
  Make dhclient set interface MTU if it was provided.
  
  This version implements MTU setting in dhclient itself before it runs
  dhclient-script.
  
  PR:		206721

Modified:
  stable/11/sbin/dhclient/clparse.c
  stable/11/sbin/dhclient/dhclient.c
  stable/11/sbin/dhclient/dhcpd.h
  stable/11/sbin/dhclient/dispatch.c
  stable/11/sbin/dhclient/privsep.c
  stable/11/sbin/dhclient/privsep.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/dhclient/clparse.c
==============================================================================
--- stable/11/sbin/dhclient/clparse.c	Mon Mar 19 04:08:22 2018	(r331178)
+++ stable/11/sbin/dhclient/clparse.c	Mon Mar 19 04:16:37 2018	(r331179)
@@ -104,6 +104,8 @@ read_client_conf(void)
 	    [top_level_config.requested_option_count++] = DHO_HOST_NAME;
 	top_level_config.requested_options
 	    [top_level_config.requested_option_count++] = DHO_DOMAIN_SEARCH;
+	top_level_config.requested_options
+	    [top_level_config.requested_option_count++] = DHO_INTERFACE_MTU;
 
 	if ((cfile = fopen(path_dhclient_conf, "r")) != NULL) {
 		do {

Modified: stable/11/sbin/dhclient/dhclient.c
==============================================================================
--- stable/11/sbin/dhclient/dhclient.c	Mon Mar 19 04:08:22 2018	(r331178)
+++ stable/11/sbin/dhclient/dhclient.c	Mon Mar 19 04:16:37 2018	(r331179)
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include "privsep.h"
 
 #include <sys/capsicum.h>
+#include <sys/endian.h>
 
 #include <net80211/ieee80211_freebsd.h>
 
@@ -138,6 +139,9 @@ int		 fork_privchld(int, int);
 	    ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
 #define	ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
 
+/* Minimum MTU is 68 as per RFC791, p. 24 */
+#define MIN_MTU 68
+
 static time_t	scripttime;
 
 int
@@ -820,8 +824,19 @@ dhcpack(struct packet *packet)
 void
 bind_lease(struct interface_info *ip)
 {
+	struct option_data *opt;
+
 	/* Remember the medium. */
 	ip->client->new->medium = ip->client->medium;
+
+	opt = &ip->client->new->options[DHO_INTERFACE_MTU];
+	if (opt->len == sizeof(u_int16_t)) {
+		u_int16_t mtu = be16dec(opt->data);
+		if (mtu < MIN_MTU)
+			warning("mtu size %u < %d: ignored", (unsigned)mtu, MIN_MTU);
+		else
+			interface_set_mtu_unpriv(privfd, mtu);
+	}
 
 	/* Write out the new lease. */
 	write_client_lease(ip, ip->client->new, 0);

Modified: stable/11/sbin/dhclient/dhcpd.h
==============================================================================
--- stable/11/sbin/dhclient/dhcpd.h	Mon Mar 19 04:08:22 2018	(r331178)
+++ stable/11/sbin/dhclient/dhcpd.h	Mon Mar 19 04:16:37 2018	(r331179)
@@ -321,6 +321,8 @@ void cancel_timeout(void (*)(void *), void *);
 void add_protocol(char *, int, void (*)(struct protocol *), void *);
 void remove_protocol(struct protocol *);
 int interface_link_status(char *);
+void interface_set_mtu_unpriv(int, u_int16_t);
+void interface_set_mtu_priv(char *, u_int16_t); 
 
 /* hash.c */
 struct hash_table *new_hash(void);

Modified: stable/11/sbin/dhclient/dispatch.c
==============================================================================
--- stable/11/sbin/dhclient/dispatch.c	Mon Mar 19 04:08:22 2018	(r331178)
+++ stable/11/sbin/dhclient/dispatch.c	Mon Mar 19 04:16:37 2018	(r331179)
@@ -45,6 +45,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "dhcpd.h"
+#include "privsep.h"
 
 #include <sys/ioctl.h>
 
@@ -498,4 +499,47 @@ interface_link_status(char *ifname)
 		}
 	}
 	return (1);
+}
+
+void
+interface_set_mtu_unpriv(int privfd, u_int16_t mtu)
+{
+	struct imsg_hdr hdr;
+	struct buf *buf;
+	int errs = 0;
+
+	hdr.code = IMSG_SET_INTERFACE_MTU;
+	hdr.len = sizeof(hdr) +
+		sizeof(u_int16_t);
+
+	if ((buf = buf_open(hdr.len)) == NULL)
+		error("buf_open: %m");
+
+	errs += buf_add(buf, &hdr, sizeof(hdr));
+	errs += buf_add(buf, &mtu, sizeof(mtu));
+	if (errs)
+		error("buf_add: %m");
+	
+	if (buf_close(privfd, buf) == -1)
+		error("buf_close: %m");
+}
+
+void
+interface_set_mtu_priv(char *ifname, u_int16_t mtu)
+{
+	struct ifreq ifr;
+	int sock;
+
+	if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
+		error("Can't create socket");
+
+	memset(&ifr, 0, sizeof(ifr));
+
+	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+	ifr.ifr_mtu = mtu;
+
+	if (ioctl(sock, SIOCSIFMTU, &ifr) == -1)
+		warning("SIOCSIFMTU failed (%d): %s", mtu,
+			strerror(errno));
+	close(sock);
 }

Modified: stable/11/sbin/dhclient/privsep.c
==============================================================================
--- stable/11/sbin/dhclient/privsep.c	Mon Mar 19 04:08:22 2018	(r331178)
+++ stable/11/sbin/dhclient/privsep.c	Mon Mar 19 04:16:37 2018	(r331179)
@@ -112,6 +112,7 @@ dispatch_imsg(struct interface_info *ifi, int fd)
 	struct client_lease	 lease;
 	int			 ret, i;
 	struct buf		*buf;
+	u_int16_t		mtu;
 
 	buf_read(fd, &hdr, sizeof(hdr));
 
@@ -235,6 +236,13 @@ dispatch_imsg(struct interface_info *ifi, int fd)
 		break;
 	case IMSG_SEND_PACKET:
 		send_packet_priv(ifi, &hdr, fd);
+		break;
+	case IMSG_SET_INTERFACE_MTU:
+		if (hdr.len < sizeof(hdr) + sizeof(u_int16_t))
+			error("corrupted message received");	
+	
+		buf_read(fd, &mtu, sizeof(u_int16_t));
+		interface_set_mtu_priv(ifi->name, mtu);
 		break;
 	default:
 		error("received unknown message, code %d", hdr.code);

Modified: stable/11/sbin/dhclient/privsep.h
==============================================================================
--- stable/11/sbin/dhclient/privsep.h	Mon Mar 19 04:08:22 2018	(r331178)
+++ stable/11/sbin/dhclient/privsep.h	Mon Mar 19 04:16:37 2018	(r331179)
@@ -36,7 +36,8 @@ enum imsg_code {
 	IMSG_SCRIPT_WRITE_PARAMS,
 	IMSG_SCRIPT_GO,
 	IMSG_SCRIPT_GO_RET,
-	IMSG_SEND_PACKET
+	IMSG_SEND_PACKET,
+	IMSG_SET_INTERFACE_MTU,
 };
 
 struct imsg_hdr {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803190416.w2J4Gbqt021135>