mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
c6d3a62919
This commit modifies the /lib/netifd/proto/gre.sh script so that, when
GRE-TAP tunnels are created, either IPv4 or IPv6, the prefix before the chosen
interface name contains the "tap" substring, to differentiate them from non-TAP
GRE tunnels.
Right now, both GRE and GRE-TAP tunnel (either IPv4 or IPv6) interfaces defined
in /etc/config/network are named equally ("gre-"+$ifname or "grev6"+$ifname)
upon creation. For instance, the following tunnels:
config interface 'tuna'
option peeraddr '172.30.22.1'
option proto 'gre'
config interface 'tunb'
option peeraddr '192.168.233.4'
option proto 'gretap'
config interface 'tunc'
option peer6addr 'fdc5:7c9e:e93d:45af::1'
option proto 'grev6'
config interface 'tund'
option peer6addr 'fdc0:6071:1348:31ff::2'
option proto 'grev6tap'
are named, respectively, "gre-tuna", "gre-tunb", "grev6-tunc" and "grev6-tund".
The current change makes that each GRE tunnel interface of the four different
types available (gre, gretap, grev6 and grev6tap) gets a different prefix.
Therefore, the abovementioned tunnels will be named, respectively:
"gre4-tuna", "gre4t-tunb", "gre6-tunc" and "gre6t-tund".
This is coherent with other types of virtual interfaces (i.e. PPP, PPPoE, PPPoA)
where the whole protocol name is used. For instance, a PPPoA interface named
"p1" and a PPPoE interface named "p2" will respectively appear as "pppoa-p1"
and "pppoe-p2", not as "ppp-p1" and "ppp-p2").
Since Linux interfaces names are limited to 15 characters, these prefixes leave,
for the worst case (TAP tunnels), 9 characters for the actual name.
Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
74 lines
1.5 KiB
Makefile
74 lines
1.5 KiB
Makefile
#
|
|
# Copyright (C) 2014 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=gre
|
|
PKG_VERSION:=1
|
|
PKG_RELEASE:=6
|
|
PKG_LICENSE:=GPL-2.0
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define Package/gre/Default
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
|
|
endef
|
|
|
|
define Package/gre
|
|
$(call Package/gre/Default)
|
|
TITLE:=Generic Routing Encapsulation config support
|
|
endef
|
|
|
|
define Package/gre/description
|
|
Generic Routing Encapsulation config support (IPv4 and IPv6) in /etc/config/network.
|
|
endef
|
|
|
|
define Package/grev4
|
|
$(call Package/gre/Default)
|
|
TITLE:=Generic Routing Encapsulation (IPv4) config support
|
|
DEPENDS:=@(PACKAGE_gre) +kmod-gre +resolveip
|
|
endef
|
|
|
|
define Package/grev4/description
|
|
Generic Routing Encapsulation config support (IPv4) in /etc/config/network.
|
|
endef
|
|
|
|
define Package/grev6
|
|
$(call Package/gre/Default)
|
|
TITLE:=Generic Routing Encapsulation (IPv6) config support
|
|
DEPENDS:=@(PACKAGE_gre) @IPV6 +kmod-gre6 +resolveip
|
|
endef
|
|
|
|
define Package/grev6/description
|
|
Generic Routing Encapsulation config support (IPv6) in /etc/config/network.
|
|
endef
|
|
|
|
define Build/Compile
|
|
endef
|
|
|
|
define Build/Configure
|
|
endef
|
|
|
|
define Package/gre/install
|
|
$(INSTALL_DIR) $(1)/lib/netifd/proto
|
|
$(INSTALL_BIN) ./files/gre.sh $(1)/lib/netifd/proto/gre.sh
|
|
endef
|
|
|
|
define Package/grev4/install
|
|
:
|
|
endef
|
|
|
|
define Package/grev6/install
|
|
:
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,gre))
|
|
$(eval $(call BuildPackage,grev4))
|
|
$(eval $(call BuildPackage,grev6))
|