diff options
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ping/ping.c | 11 | ||||
| -rw-r--r-- | sbin/route/route.c | 12 | ||||
| -rw-r--r-- | sbin/route/show.c | 3 |
3 files changed, 5 insertions, 21 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 } |