From 2389679380a96ef0f01dfd5b14715a1c1c94e0ea Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Sun, 7 Jul 2019 03:33:22 +0200 Subject: [PATCH 1/2] gluon-mesh-babel: use babel 1.9.0 feature to set pref-src on installed routes --- .../luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig b/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig index 43eaa428..e9a62dbe 100755 --- a/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig +++ b/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig @@ -1,6 +1,8 @@ #!/usr/bin/lua local site = require 'gluon.site' +local uci = require('simple-uci').cursor() +local nodeip = uci:get('network', 'loopback', 'ip6addr'):match('^[^/]+') local babelconf='/etc/gluon-babeld.conf' local file = io.open(babelconf, "w") @@ -15,7 +17,7 @@ file:write("redistribute ip " .. site.prefix6() .. " eq 128 allow\n") file:write("redistribute ip " .. site.node_client_prefix6() .. " eq 128 allow\n") file:write("redistribute ip " .. site.node_prefix6() .. " eq 128 allow\n") file:write("redistribute ip 2000::/3 allow\n") - file:write("redistribute local if br-wan deny\n") file:write("redistribute local ip 0.0.0.0/0 deny\n") +file:write("install pref-src " .. nodeip .."\n") file:close() From d5b08fe6c9ebc91c1aaa45bedb132b45c380aef8 Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Fri, 23 Aug 2019 20:36:00 +0200 Subject: [PATCH 2/2] gluon-mesh-babel: depend on gluon-mmfd --- package/gluon-mesh-babel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gluon-mesh-babel/Makefile b/package/gluon-mesh-babel/Makefile index 4d5f1197..bdc3d4bc 100644 --- a/package/gluon-mesh-babel/Makefile +++ b/package/gluon-mesh-babel/Makefile @@ -10,7 +10,7 @@ include ../gluon.mk define Package/gluon-mesh-babel TITLE:=Babel mesh - DEPENDS:=+gluon-core +babeld +mmfd +libiwinfo +libgluonutil +firewall +libjson-c +libnl-tiny +libubus +libubox +libblobmsg-json +libbabelhelper +luabitop +gluon-l3roamd + DEPENDS:=+gluon-core +babeld +gluon-mmfd +libiwinfo +libgluonutil +firewall +libjson-c +libnl-tiny +libubus +libubox +libblobmsg-json +libbabelhelper +luabitop PROVIDES:=gluon-mesh-provider endef