cjdns: support the supernodes feature (#884)

Signed-off-by: William Fleurant <[email protected]>
(cherry picked from commit d705f7989080f38feba4329e5f24d2c85f99a902)
Signed-off-by: Nick Hainke <[email protected]>

diff --git a/cjdns/Makefile b/cjdns/Makefile
index e1c217a4353fc8deadba801dd945dc886fc0f769..6bdcd83e47a85fc348bb554aa39cbe32a4c6cefe 100644 (file)
--- a/cjdns/Makefile
+++ b/cjdns/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cjdns
 PKG_VERSION:=v21.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/cjdelisle/cjdns/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?

diff --git a/cjdns/lua/cjdns/uci.lua b/cjdns/lua/cjdns/uci.lua
index f4716b772bf89e219980d7e707d37b35f306a4b2..d6b6633e9968a69c30bd68075f93b5f649782c55 100644 (file)
--- a/cjdns/lua/cjdns/uci.lua
+++ b/cjdns/lua/cjdns/uci.lua
@@ -53,6 +53,10 @@ function UCI.get()
     obj.router.interface.tunDevice = config.tun_device
   end
 
+  cursor:foreach("cjdns", "supernodes", function(supernodes)
+    table.insert(obj.router.supernodes, supernodes.public_key)
+  end)
+
   for i,section in pairs(obj.security) do
     if type(section.seccomp) == "number" then
       obj.security[i].seccomp = tonumber(config.seccomp)

diff --git a/luci-app-cjdns/Makefile b/luci-app-cjdns/Makefile
index 9396528017e3dd2cec64c256eb0d6d3df8ef3584..0b6485a1264a5f18d1972928a3a503ec4490b63a 100644 (file)
--- a/luci-app-cjdns/Makefile
+++ b/luci-app-cjdns/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-cjdns
 PKG_VERSION:=1.3
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_MAINTAINER:=William Fleurant <[email protected]>
 PKG_LICENSE:=GPL-3.0-or-later

diff --git a/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua b/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua
index 2b1fc1be95e2682826e5cbebcf977c514f106404..3526afe03f2766814d337c9ed50182a1d4446ce2 100644 (file)
--- a/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua
+++ b/luci-app-cjdns/luasrc/model/cbi/cjdns/peering.lua
@@ -70,4 +70,13 @@ eth_peers:option(Value, "address", translate("MAC address")).datatype = "macaddr
 eth_peers:option(Value, "public_key", translate("Public key"))
 eth_peers:option(Value, "password", translate("Password"))
 
+-- Supernodes
+supernodes = m:section(TypedSection, "supernodes", translate("List of Supernodes"),
+  translate("If none are specified they'll be taken from your peers"))
+supernodes.anonymous = true
+supernodes.addremove = true
+supernodes.template  = "cbi/tblsection"
+
+supernodes:option(Value, "public_key", translate("Public Key")).size = 55
+
 return m