summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/ping/ping.c11
-rw-r--r--sbin/route/route.c12
-rw-r--r--sbin/route/show.c3
-rw-r--r--share/man/man4/route.45
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/net/route.h5
-rw-r--r--sys/netinet/ip_output.c10
-rw-r--r--sys/netinet/ip_var.h3
-rw-r--r--sys/netinet/raw_ip.c4
-rw-r--r--sys/netinet/udp_usrreq.c5
-rw-r--r--sys/sys/socket.h3
-rw-r--r--usr.bin/nc/netcat.c17
-rw-r--r--usr.bin/netstat/show.c3
13 files changed, 22 insertions, 63 deletions
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index ecd94569c69..5bef1fcf3e9 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping.c,v 1.91 2011/09/20 09:46:19 deraadt Exp $ */
+/* $OpenBSD: ping.c,v 1.92 2012/03/17 10:16:40 dlg Exp $ */
/* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */
/*
@@ -105,7 +105,6 @@ int options;
#define F_SADDR 0x0200
#define F_HDRINCL 0x0400
#define F_TTL 0x0800
-#define F_SO_JUMBO 0x1000
#define F_AUD_RECV 0x2000
#define F_AUD_MISS 0x4000
@@ -204,7 +203,7 @@ main(int argc, char *argv[])
preload = 0;
datap = &outpack[8 + sizeof(struct tvi)];
while ((ch = getopt(argc, argv,
- "DEI:LRS:c:defi:jl:np:qrs:T:t:V:vw:")) != -1)
+ "DEI:LRS:c:defi:l:np:qrs:T:t:V:vw:")) != -1)
switch(ch) {
case 'c':
npackets = (unsigned long)strtonum(optarg, 0,
@@ -259,9 +258,6 @@ main(int argc, char *argv[])
options |= F_INTERVAL;
break;
- case 'j':
- options |= F_SO_JUMBO;
- break;
case 'L':
moptions |= MULTICAST_NOLOOP;
loop = 0;
@@ -410,9 +406,6 @@ main(int argc, char *argv[])
if (options & F_SO_DONTROUTE)
(void)setsockopt(s, SOL_SOCKET, SO_DONTROUTE, &hold,
sizeof(hold));
- if (options & F_SO_JUMBO)
- (void)setsockopt(s, SOL_SOCKET, SO_JUMBO, &hold,
- sizeof(hold));
if (options & F_TTL) {
if (IN_MULTICAST(ntohl(to->sin_addr.s_addr)))
diff --git a/sbin/route/route.c b/sbin/route/route.c
index d543cc43866..ad421971428 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.155 2011/07/04 22:48:31 claudio Exp $ */
+/* $OpenBSD: route.c,v 1.156 2012/03/17 10:16:40 dlg Exp $ */
/* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */
/*
@@ -555,14 +555,6 @@ newroute(int argc, char **argv)
case K_MPATH:
flags |= RTF_MPATH;
break;
- case K_JUMBO:
- flags |= RTF_JUMBO;
- fmask |= RTF_JUMBO;
- break;
- case K_NOJUMBO:
- flags &= ~RTF_JUMBO;
- fmask |= RTF_JUMBO;
- break;
case K_MTU:
case K_HOPCOUNT:
case K_EXPIRE:
@@ -1212,7 +1204,7 @@ char metricnames[] =
"\011priority\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire\2hopcount\1mtu";
char routeflags[] =
"\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE\010MASK_PRESENT\011CLONING"
-"\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016PROTO3\017PROTO2\020PROTO1\021CLONED\022SOURCE\023MPATH\024JUMBO\025MPLS";
+"\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016PROTO3\017PROTO2\020PROTO1\021CLONED\022SOURCE\023MPATH\025MPLS";
char ifnetflags[] =
"\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6NOTRAILERS\7RUNNING\010NOARP\011PPROMISC"
"\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1\017LINK2\020MULTICAST";
diff --git a/sbin/route/show.c b/sbin/route/show.c
index e1c0d4ff802..c401e4cca56 100644
--- a/sbin/route/show.c
+++ b/sbin/route/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.90 2011/07/09 00:45:40 henning Exp $ */
+/* $OpenBSD: show.c,v 1.91 2012/03/17 10:16:40 dlg Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -99,7 +99,6 @@ static const struct bits bits[] = {
{ RTF_PROTO2, '2' },
{ RTF_PROTO3, '3' },
{ RTF_CLONED, 'c' },
- { RTF_JUMBO, 'J' },
{ RTF_MPATH, 'P' },
{ RTF_MPLS, 'T' },
{ 0 }
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index 3e030d86abe..00ce9e1edb1 100644
--- a/share/man/man4/route.4
+++ b/share/man/man4/route.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: route.4,v 1.33 2011/12/08 20:58:49 blambert Exp $
+.\" $OpenBSD: route.4,v 1.34 2012/03/17 10:16:41 dlg Exp $
.\" $NetBSD: route.4,v 1.3 1994/11/30 16:22:31 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)route.4 8.6 (Berkeley) 4/19/94
.\"
-.Dd $Mdocdate: December 8 2011 $
+.Dd $Mdocdate: March 17 2012 $
.Dt ROUTE 4
.Os
.Sh NAME
@@ -365,7 +365,6 @@ Flags include the values:
#define RTF_PROTO1 0x8000 /* protocol specific routing flag */
#define RTF_CLONED 0x10000 /* this is a cloned route */
#define RTF_MPATH 0x40000 /* multipath route or operation */
-#define RTF_JUMBO 0x80000 /* try to use jumbo frames */
#define RTF_MPLS 0x100000 /* MPLS additional infos */
.Ed
.Pp
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index f2070f6b35a..5375e11220d 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_socket.c,v 1.96 2012/03/14 21:27:01 kettenis Exp $ */
+/* $OpenBSD: uipc_socket.c,v 1.97 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */
/*
@@ -1390,7 +1390,6 @@ sosetopt(struct socket *so, int level, int optname, struct mbuf *m0)
case SO_REUSEADDR:
case SO_REUSEPORT:
case SO_OOBINLINE:
- case SO_JUMBO:
case SO_TIMESTAMP:
if (m == NULL || m->m_len < sizeof (int)) {
error = EINVAL;
@@ -1569,7 +1568,6 @@ sogetopt(struct socket *so, int level, int optname, struct mbuf **mp)
case SO_REUSEPORT:
case SO_BROADCAST:
case SO_OOBINLINE:
- case SO_JUMBO:
case SO_TIMESTAMP:
*mtod(m, int *) = so->so_options & optname;
break;
diff --git a/sys/net/route.h b/sys/net/route.h
index 2095a373d2b..de2ea27be6a 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.h,v 1.75 2010/10/28 17:18:35 claudio Exp $ */
+/* $OpenBSD: route.h,v 1.76 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */
/*
@@ -144,12 +144,11 @@ struct rtentry {
#define RTF_PROTO1 0x8000 /* protocol specific routing flag */
#define RTF_CLONED 0x10000 /* this is a cloned route */
#define RTF_MPATH 0x40000 /* multipath route or operation */
-#define RTF_JUMBO 0x80000 /* try to use jumbo frames */
#define RTF_MPLS 0x100000 /* MPLS additional infos */
/* mask of RTF flags that are allowed to be modified by RTM_CHANGE */
#define RTF_FMASK \
- (RTF_JUMBO | RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
+ (RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
RTF_REJECT | RTF_STATIC)
#ifndef _KERNEL
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 2894f72bedf..1a6b27271e3 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.225 2011/12/29 12:10:52 haesbaert Exp $ */
+/* $OpenBSD: ip_output.c,v 1.226 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -733,14 +733,6 @@ sendit:
}
#endif
- /* XXX
- * Try to use jumbograms based on socket option, or the route
- * or... for other reasons later on.
- */
- if ((flags & IP_JUMBO) && ro->ro_rt && (ro->ro_rt->rt_flags & RTF_JUMBO) &&
- ro->ro_rt->rt_ifp)
- mtu = ro->ro_rt->rt_ifp->if_hardmtu;
-
/*
* If small enough for interface, can just send directly.
*/
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 045304469bd..9fe0fdf817c 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_var.h,v 1.42 2011/04/19 03:47:29 dlg Exp $ */
+/* $OpenBSD: ip_var.h,v 1.43 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $ */
/*
@@ -141,7 +141,6 @@ struct ipstat {
#define IP_RAWOUTPUT 0x2 /* raw ip header exists */
#define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */
#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */
-#define IP_JUMBO SO_JUMBO /* try to use the jumbo mtu */
#define IP_MTUDISC 0x0800 /* pmtu discovery, set DF */
#define IP_ROUTETOETHER 0x1000 /* ether addresses given */
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 56fec6b6ad1..91b445d966e 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ip.c,v 1.60 2011/07/04 17:35:01 yasuoka Exp $ */
+/* $OpenBSD: raw_ip.c,v 1.61 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */
/*
@@ -218,7 +218,7 @@ rip_output(struct mbuf *m, ...)
va_end(ap);
inp = sotoinpcb(so);
- flags = (so->so_options & (SO_DONTROUTE|SO_JUMBO)) | IP_ALLOWBROADCAST;
+ flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST;
/*
* If the user handed us a complete IP packet, use it.
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index b3fd28f017e..460711190e2 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_usrreq.c,v 1.145 2011/07/08 18:30:17 yasuoka Exp $ */
+/* $OpenBSD: udp_usrreq.c,v 1.146 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@@ -1034,8 +1034,7 @@ udp_output(struct mbuf *m, ...)
m->m_pkthdr.rdomain = inp->inp_rtableid;
error = ip_output(m, inp->inp_options, &inp->inp_route,
- inp->inp_socket->so_options &
- (SO_DONTROUTE | SO_BROADCAST | SO_JUMBO),
+ inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
inp->inp_moptions, inp);
if (error == EACCES) /* translate pf(4) error for userland */
error = EHOSTUNREACH;
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 0446c0cb9e9..9cb4adf13a0 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: socket.h,v 1.78 2011/12/03 12:38:30 fgsch Exp $ */
+/* $OpenBSD: socket.h,v 1.79 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: socket.h,v 1.14 1996/02/09 18:25:36 christos Exp $ */
/*
@@ -66,7 +66,6 @@
#define SO_LINGER 0x0080 /* linger on close if data present */
#define SO_OOBINLINE 0x0100 /* leave received OOB data in line */
#define SO_REUSEPORT 0x0200 /* allow local address & port reuse */
-#define SO_JUMBO 0x0400 /* try to use jumbograms */
#define SO_TIMESTAMP 0x0800 /* timestamp received dgram traffic */
#define SO_BINDANY 0x1000 /* allow bind to any address */
diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
index cc4683aa32b..c0a0e474a55 100644
--- a/usr.bin/nc/netcat.c
+++ b/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.105 2012/02/09 06:25:35 lum Exp $ */
+/* $OpenBSD: netcat.c,v 1.106 2012/03/17 10:16:41 dlg Exp $ */
/*
* Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
*
@@ -67,7 +67,6 @@
/* Command Line Options */
int dflag; /* detached, no stdin */
unsigned int iflag; /* Interval Flag */
-int jflag; /* use jumbo frames if we can */
int kflag; /* More than one connect */
int lflag; /* Bind to local port */
int nflag; /* Don't do name look up */
@@ -131,7 +130,7 @@ main(int argc, char *argv[])
sv = NULL;
while ((ch = getopt(argc, argv,
- "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
+ "46DdhI:i:klnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
switch (ch) {
case '4':
family = AF_INET;
@@ -163,9 +162,6 @@ main(int argc, char *argv[])
if (errstr)
errx(1, "interval %s: %s", errstr, optarg);
break;
- case 'j':
- jflag = 1;
- break;
case 'k':
kflag = 1;
break;
@@ -358,7 +354,7 @@ main(int argc, char *argv[])
struct sockaddr_storage z;
len = sizeof(z);
- plen = jflag ? 16384 : 2048;
+ plen = 2048;
rv = recvfrom(s, buf, plen, MSG_PEEK,
(struct sockaddr *)&z, &len);
if (rv < 0)
@@ -717,7 +713,7 @@ readwrite(int nfd)
int lfd = fileno(stdout);
int plen;
- plen = jflag ? 16384 : 2048;
+ plen = 2048;
/* Setup Network FD */
pfd[0].fd = nfd;
@@ -896,11 +892,6 @@ set_common_sockopts(int s)
&x, sizeof(x)) == -1)
err(1, NULL);
}
- if (jflag) {
- if (setsockopt(s, SOL_SOCKET, SO_JUMBO,
- &x, sizeof(x)) == -1)
- err(1, NULL);
- }
if (Tflag != -1) {
if (setsockopt(s, IPPROTO_IP, IP_TOS,
&Tflag, sizeof(Tflag)) == -1)
diff --git a/usr.bin/netstat/show.c b/usr.bin/netstat/show.c
index 5e35b541519..4de07b68f8c 100644
--- a/usr.bin/netstat/show.c
+++ b/usr.bin/netstat/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.35 2011/11/01 17:30:04 mikeb Exp $ */
+/* $OpenBSD: show.c,v 1.36 2012/03/17 10:16:41 dlg Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -93,7 +93,6 @@ static const struct bits bits[] = {
{ RTF_PROTO2, '2' },
{ RTF_PROTO3, '3' },
{ RTF_CLONED, 'c' },
- { RTF_JUMBO, 'J' },
{ RTF_MPATH, 'P' },
{ RTF_MPLS, 'T' },
{ 0 }
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.