From 3c769526c6537bffce35bc2a52d77814644d2203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 18 Jan 2022 19:11:44 +0100
Subject: [PATCH] manman-sync: make it smarter

---
 .../luasrc/usr/bin/manman-sync                | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/package/gluon-manman-sync/luasrc/usr/bin/manman-sync b/package/gluon-manman-sync/luasrc/usr/bin/manman-sync
index 4cde9a65..fc6e2f87 100755
--- a/package/gluon-manman-sync/luasrc/usr/bin/manman-sync
+++ b/package/gluon-manman-sync/luasrc/usr/bin/manman-sync
@@ -192,9 +192,28 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
   -- check if anything changed since last time
   -- if yes, apply changes and do gluon-reload
 
+  local has_changes = false
+
+  -- Use this when changing something that needs a reload and/or rollback (not the hostname)
+  local function set(a, b, c, d, isbool)
+    local curval = isbool and uci:get_bool(a, b, c) or uci:get(a, b, c)
+
+    if curval ~= d then
+      uci:set(a, b, c, d)
+      print('  Value', a, b, c, 'changed to', d, 'was', curval)
+      has_changes = true
+    else
+      print('  Value', a, b, c, 'unchanged', d)
+    end
+  end
+
+  local has_tunnel = false
 
   for _, net in ipairs(node.interfaces) do
     local net_name = net.name
+    if net_name == 'tunnel' or net_name == 'vpn' or net_name == 'mesh_vpn' then
+      has_tunnel = true
+    end
     local net_mapped = mappings[net_name] or net_name
     if not string.find(net_mapped, '_') then
       net_mapped = 'mesh_' .. net_mapped
@@ -203,9 +222,12 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
     local cidr = ip.new(net.ip, net.netmask):string()
 
     print('Syncing ' .. net_name .. ' as ' .. net_mapped .. ' to ' .. cidr)
-    uci:set('gluon-static-ip', net_mapped, 'ip4', cidr)
+    set('gluon-static-ip', net_mapped, 'ip4', cidr)
   end
 
+  print('Syncing mesh vpn: ' .. (has_tunnel and 'on' or 'off'))
+  set('gluon', 'mesh_vpn', 'enabled', has_tunnel, true)
+
   uci:set('gluon-manman-sync', 'sync', 'last_data', json.stringify(location))
 
   uci:save('system')
@@ -214,9 +236,13 @@ if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
   uci:save('gluon-node-info')
   os.execute('exec uci commit')
 
-  print('Applying changes...')
-  os.execute('exec gluon-reconfigure')
-  os.execute('exec gluon-reload')
+  if has_changes then
+    print('Applying changes...')
+    os.execute('exec gluon-reconfigure')
+    os.execute('exec gluon-reload')
+  else
+    print('No settings changes, no reason to reload')
+  end
 else
   print('manman-sync not enabled, skipping')
 end