Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Retire EtherIP, we have L2TP instead.
details: https://anonhg.NetBSD.org/src/rev/9f1b8c8c0fde
branches: trunk
changeset: 363892:9f1b8c8c0fde
user: maxv <maxv%NetBSD.org@localhost>
date: Tue Aug 14 14:49:13 2018 +0000
description:
Retire EtherIP, we have L2TP instead.
diffstat:
distrib/sets/lists/comp/mi | 4 +-
distrib/sets/lists/man/mi | 8 +-
doc/TODO.smpnet | 3 +-
share/man/man4/Makefile | 4 +-
share/man/man4/etherip.4 | 171 ---------
sys/conf/files | 3 +-
sys/net/Makefile | 4 +-
sys/net/files.net | 5 +-
sys/net/if_etherip.c | 708 -----------------------------------------
sys/net/if_etherip.h | 73 ----
sys/netinet/in_proto.c | 24 +-
sys/netinet/ip_etherip.c | 267 ---------------
sys/netinet/ip_etherip.h | 38 --
sys/netinet6/in6_proto.c | 24 +-
sys/netinet6/ip6_etherip.c | 269 ---------------
sys/netinet6/ip6_etherip.h | 38 --
sys/rump/include/opt/etherip.h | 3 -
17 files changed, 17 insertions(+), 1629 deletions(-)
diffs (truncated from 1879 to 300 lines):
diff -r 7d6455aae240 -r 9f1b8c8c0fde distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Tue Aug 14 14:48:01 2018 +0000
+++ b/distrib/sets/lists/comp/mi Tue Aug 14 14:49:13 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2218 2018/08/13 08:26:49 christos Exp $
+# $NetBSD: mi,v 1.2219 2018/08/14 14:49:13 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2299,7 +2299,7 @@
./usr/include/net/if_bridgevar.h comp-c-include
./usr/include/net/if_dl.h comp-c-include
./usr/include/net/if_ether.h comp-c-include
-./usr/include/net/if_etherip.h comp-c-include
+./usr/include/net/if_etherip.h comp-obsolete obsolete
./usr/include/net/if_fddi.h comp-c-include
./usr/include/net/if_gif.h comp-c-include
./usr/include/net/if_gre.h comp-c-include
diff -r 7d6455aae240 -r 9f1b8c8c0fde distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Aug 14 14:48:01 2018 +0000
+++ b/distrib/sets/lists/man/mi Tue Aug 14 14:49:13 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1608 2018/08/12 17:11:55 christos Exp $
+# $NetBSD: mi,v 1.1609 2018/08/14 14:49:13 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1071,7 +1071,7 @@
./usr/share/man/cat4/esp.0 man-sys-catman .cat
./usr/share/man/cat4/ess.0 man-sys-catman .cat
./usr/share/man/cat4/et.0 man-sys-catman .cat
-./usr/share/man/cat4/etherip.0 man-sys-catman .cat
+./usr/share/man/cat4/etherip.0 man-obsolete obsolete
./usr/share/man/cat4/etphy.0 man-sys-catman .cat
./usr/share/man/cat4/evbarm/bcmgpio.0 man-sys-catman .cat
./usr/share/man/cat4/evbarm/cpsw.0 man-sys-catman .cat
@@ -4221,7 +4221,7 @@
./usr/share/man/html4/esp.html man-sys-htmlman html
./usr/share/man/html4/ess.html man-sys-htmlman html
./usr/share/man/html4/et.html man-sys-htmlman html
-./usr/share/man/html4/etherip.html man-sys-htmlman html
+./usr/share/man/html4/etherip.html man-obsolete obsolete
./usr/share/man/html4/etphy.html man-sys-htmlman html
./usr/share/man/html4/evbarm/bcmgpio.html man-sys-htmlman html
./usr/share/man/html4/evbarm/cpsw.html man-sys-htmlman html
@@ -7143,7 +7143,7 @@
./usr/share/man/man4/esp.4 man-sys-man .man
./usr/share/man/man4/ess.4 man-sys-man .man
./usr/share/man/man4/et.4 man-sys-man .man
-./usr/share/man/man4/etherip.4 man-sys-man .man
+./usr/share/man/man4/etherip.4 man-obsolete obsolete
./usr/share/man/man4/etphy.4 man-sys-man .man
./usr/share/man/man4/evbarm/bcmgpio.4 man-sys-man .man
./usr/share/man/man4/evbarm/cpsw.4 man-sys-man .man
diff -r 7d6455aae240 -r 9f1b8c8c0fde doc/TODO.smpnet
--- a/doc/TODO.smpnet Tue Aug 14 14:48:01 2018 +0000
+++ b/doc/TODO.smpnet Tue Aug 14 14:49:13 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.22 2018/08/07 07:19:28 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.23 2018/08/14 14:49:13 maxv Exp $
MP-safe components
==================
@@ -75,7 +75,6 @@
- Interfaces
- agr(4)
- carp(4)
- - etherip(4)
- faith(4)
- gre(4)
- ppp(4)
diff -r 7d6455aae240 -r 9f1b8c8c0fde share/man/man4/Makefile
--- a/share/man/man4/Makefile Tue Aug 14 14:48:01 2018 +0000
+++ b/share/man/man4/Makefile Tue Aug 14 14:49:13 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.663 2018/08/08 21:15:41 maya Exp $
+# $NetBSD: Makefile,v 1.664 2018/08/14 14:49:13 maxv Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -22,7 +22,7 @@
ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \
dmphy.4 dpt.4 dpti.4 drm.4 drum.4 drvctl.4 dtv.4 dtviic.4 dwctwo.4 \
eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 \
- esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \
+ esa.4 esiop.4 esm.4 eso.4 et.4 etphy.4 exphy.4 \
fd.4 filemon.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 \
fujbp.4 full.4 fxp.4 \
gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \
diff -r 7d6455aae240 -r 9f1b8c8c0fde share/man/man4/etherip.4
--- a/share/man/man4/etherip.4 Tue Aug 14 14:48:01 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-.\" $NetBSD: etherip.4,v 1.8 2017/07/03 21:30:58 wiz Exp $
-.\"
-.\" Copyright (c) 2006, Hans Rosenfeld <rosenfeld%grumpf.hope-2000.org@localhost>.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of Hans Rosenfeld nor the names of his contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"
-.\" Copyright (c) 2004, 2005 The NetBSD Foundation.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"
-.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd November 23, 2006
-.Dt ETHERIP 4
-.Os
-.Sh NAME
-.Nm etherip
-.Nd EtherIP tunneling device
-.Sh SYNOPSIS
-.Cd "pseudo-device etherip"
-.Sh DESCRIPTION
-The
-.Nm
-interface is a tunneling pseudo device for Ethernet frames.
-It can tunnel Ethernet traffic over IPv4 and IPv6 using the EtherIP
-protocol specified in RFC 3378.
-.Pp
-The only difference between an
-.Nm
-interface and a real Ethernet interface is that there is an IP tunnel
-instead of a wire.
-Therefore, to use
-.Nm
-the administrator must first create the interface and then configure
-protocol and addresses used for the outer header.
-This can be done by using
-.Xr ifconfig 8
-.Cm create
-and
-.Cm tunnel
-subcommands, or
-.Dv SIOCIFCREATE
-and
-.Dv SIOCSLIFPHYADDR
-ioctls.
-.Ss Packet format
-Ethernet frames are prepended with a EtherIP header as described by
-RFC 3378.
-The resulting EtherIP packets will be encapsulated in an
-outer packet, which may be either an IPv4 or IPv6 packet, with IP
-protocol number 97.
-.Ss Ethernet address
-When a
-.Nm
-device is created, it is assigned an Ethernet address
-of the form f2:0b:a5:xx:xx:xx.
-This address can later be changed through a sysctl node.
-.Pp
-The sysctl node is net.link.etherip.<iface>.
-Any string of six colon-separated hexadecimal numbers will be accepted.
-Reading that node will provide a string representation of the current
-Ethernet address.
-.Ss Security
-The EtherIP header of incoming packets is not checked for
-validity.
-This is because there seems to be some confusion about how
-such a header has to look like.
-For outgoing packets, the header is set up the same way as done in
-.Ox ,
-.Fx ,
-and Linux to be compatible with those systems.
-.Ss Converting from previous implementation
-A tunnel configured for the previous (undocumented) implementation
-will work with just renaming the device from gif to
-.Nm .
-.Sh SEE ALSO
-.Xr bridge 4 ,
-.Xr gif 4 ,
-.Xr inet 4 ,
-.Xr inet6 4 ,
-.Xr tap 4 ,
-.Xr ifconfig 8
-.\"
-.Sh HISTORY
-The
-.Nm
-device first appeared in
-.Nx 4.0 ,
-it is based on
-.Xr tap 4 ,
-.Xr gif 4 ,
-and the former gif-based EtherIP implementation ported from
-.Ox .
-.\"
-.Sh BUGS
-Probably many.
-There is lots of code duplication between
-.Nm ,
-.Xr tap 4 ,
-.Xr gif 4 ,
-and probably other tunnelling drivers which should be cleaned up.
diff -r 7d6455aae240 -r 9f1b8c8c0fde sys/conf/files
--- a/sys/conf/files Tue Aug 14 14:48:01 2018 +0000
+++ b/sys/conf/files Tue Aug 14 14:49:13 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1202 2018/07/15 07:07:15 martin Exp $
+# $NetBSD: files,v 1.1203 2018/08/14 14:49:13 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1456,7 +1456,6 @@
defpseudo stf: ifnet
defpseudodev tap: ifnet, ether, arp
defpseudo carp: ifnet, ether, arp
-defpseudodev etherip: ifnet, ether, arp
defpseudodev l2tp: ifnet, ether, arp
defpseudo canloop: ifnet
defpseudo ipsecif: ifnet # avoid to confuse ipsec itself option
diff -r 7d6455aae240 -r 9f1b8c8c0fde sys/net/Makefile
--- a/sys/net/Makefile Tue Aug 14 14:48:01 2018 +0000
+++ b/sys/net/Makefile Tue Aug 14 14:49:13 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2018/02/16 10:19:04 knakahara Exp $
+# $NetBSD: Makefile,v 1.37 2018/08/14 14:49:13 maxv Exp $
INCSDIR= /usr/include/net
INCS= bpf.h bpfjit.h bpfdesc.h dlt.h ethertypes.h if.h if_arc.h if_arp.h \
- if_atm.h if_bridgevar.h if_dl.h if_ether.h if_etherip.h if_fddi.h if_gif.h \
+ if_atm.h if_bridgevar.h if_dl.h if_ether.h if_fddi.h if_gif.h \
if_gre.h if_hippi.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
if_pflog.h if_ppp.h if_pppoe.h if_l2tp.h if_sppp.h if_srt.h if_stf.h \
if_tap.h if_token.h if_tun.h if_types.h if_vlanvar.h net_stats.h \
diff -r 7d6455aae240 -r 9f1b8c8c0fde sys/net/files.net
--- a/sys/net/files.net Tue Aug 14 14:48:01 2018 +0000
+++ b/sys/net/files.net Tue Aug 14 14:49:13 2018 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index