From d8b3515cd4068d01b4c0792cea9b6b06951ec768 Mon Sep 17 00:00:00 2001 From: Roger Pueyo Centelles Date: Mon, 21 Nov 2016 11:27:23 +0100 Subject: [PATCH 1/1] luci-proto-ipip: Add package This package adds LuCI support for IPIP tunnels (IPv4-in-IPv4 RFC2003) Signed-off-by: Roger Pueyo Centelles --- protocols/luci-proto-ipip/Makefile | 16 +++++++++ .../luasrc/model/cbi/admin_network/proto_ipip.lua | 34 ++++++++++++++++++ .../luasrc/model/network/proto_ipip.lua | 40 ++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 protocols/luci-proto-ipip/Makefile create mode 100644 protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua create mode 100644 protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua diff --git a/protocols/luci-proto-ipip/Makefile b/protocols/luci-proto-ipip/Makefile new file mode 100644 index 000000000..6af85647e --- /dev/null +++ b/protocols/luci-proto-ipip/Makefile @@ -0,0 +1,16 @@ +# +# Copyright 2016 Roger Pueyo Centelles +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Support for IPIP tunnels (IPv4-in-IPv4 RFC2003) +LUCI_DEPENDS:=+ipip + +PKG_MAINTAINER:=Roger Pueyo Centelles + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua b/protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua new file mode 100644 index 000000000..8817f18d6 --- /dev/null +++ b/protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua @@ -0,0 +1,34 @@ +-- Copyright 2016 Roger Pueyo Centelles +-- Licensed to the public under the Apache License 2.0. + +local map, section, net = ... + +local peeraddr, ipaddr, ttl, tos, df, mtu, tunlink + +peeraddr = section:taboption("general", Value, "peeraddr", translate("Remote IPv4 address or FQDN"), translate("The IPv4 address or the fully-qualified domain name of the remote tunnel end.")) +peeraddr.optional = false +peeraddr.datatype = "or(hostname,ip4addr)" + +ipaddr = section:taboption("general", Value, "ipaddr", translate("Local IPv4 address"), translate("The local IPv4 address over which the tunnel is created (optional).")) +ipaddr.optional = true +ipaddr.datatype = "ip4addr" + +tunlink = section:taboption("general", Value, "tunlink", translate("Bind interface"), translate("Bind the tunnel to this interface (optional).")) +ipaddr.optional = true + + +mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"), translate("Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes).")) +mtu.optional = true +mtu.placeholder = 1280 +mtu.datatype = "range(68, 9200)" + +ttl = section:taboption("advanced", Value, "ttl", translate("Override TTL"), translate("Specify a TTL (Time to Live) for the encapsulating packet other than the default (64).")) +ttl.optional = true +ttl.placeholder = 64 +ttl.datatype = "min(1)" + +tos = section:taboption("advanced", Value, "tos", translate("Override TOS"), translate("Specify a TOS (Type of Service).")) +tos.optional = true +tos.datatype = "range(0, 255)" + +df = section:taboption("advanced", Flag, "df", translate("Don't Fragment"), translate("Enable the DF (Don't Fragment) flag of the encapsulating packets.")) diff --git a/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua b/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua new file mode 100644 index 000000000..5c3761c9c --- /dev/null +++ b/protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua @@ -0,0 +1,40 @@ +-- Copyright 2016 Roger Pueyo Centelles +-- Licensed to the public under the Apache License 2.0. + +local netmod = luci.model.network +local interface = luci.model.network.interface +local proto = netmod:register_protocol("ipip") + +function proto.get_i18n(self) + return luci.i18n.translate("IPv4-in-IPv4 (RFC2003)") +end + +function proto.ifname(self) + return "ipip-" .. self.sid +end + +function proto.opkg_package(self) + return "ipip" +end + +function proto.is_installed(self) + return nixio.fs.access("/lib/netifd/proto/ipip.sh") +end + +function proto.is_floating(self) + return true +end + +function proto.is_virtual(self) + return true +end + +function proto.get_interfaces(self) + return nil +end + +function proto.contains_interface(self, ifc) + return (netmod:ifnameof(ifc) == self:ifname()) +end + +netmod:register_pattern_virtual("^ipip-%w") -- 2.11.0