From c42906c3bbb4b0b5f3d0ee35b56c17448b8f6fed Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 17 Jul 2021 11:09:45 +0200
Subject: [PATCH 1/6] Diagnostics - add DHCP log

---
 plugins/dynamix/scripts/diagnostics | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/dynamix/scripts/diagnostics b/plugins/dynamix/scripts/diagnostics
index 29284ddc3..9401f3c6d 100755
--- a/plugins/dynamix/scripts/diagnostics
+++ b/plugins/dynamix/scripts/diagnostics
@@ -341,6 +341,12 @@ foreach (glob("/var/log/syslog*") as $file) {
   if (basename($file)=='syslog' && filesize($file)>=$max) exert("tail -n 200 ".escapeshellarg("$log.txt")." >".escapeshellarg("$log.last200.txt"));
   exert("truncate -s '<$max' ".escapeshellarg("$log.txt"));
 }
+// copy dhcplog
+$dhcplog = "/var/log/dhcplog";
+if (file_exists($dhcplog)) {
+  $log = "/$diag/logs/dhcplog.txt";
+  exert("todos <$dhcplog >".escapeshellarg($log));
+}
 // copy graphql-api.log
 $graphql = "/var/log/graphql-api.log";
 if (file_exists($graphql)) {

From e7eb3fc1e23b24d1c4dc1694a4b617530c4f194f Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 17 Jul 2021 15:51:18 +0200
Subject: [PATCH 2/6] Suppress IPv6 anycast addresses in routing table

---
 plugins/dynamix/include/RoutingTable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/RoutingTable.php b/plugins/dynamix/include/RoutingTable.php
index df773cd9c..45629d31a 100644
--- a/plugins/dynamix/include/RoutingTable.php
+++ b/plugins/dynamix/include/RoutingTable.php
@@ -27,7 +27,7 @@ case 'Add Route':
   break;
 default:
   exec("ip -4 route show|grep -v '^127.0.0.0'",$ipv4);
-  exec("ip -6 route show|grep -Pv '^([m:]|(f[ef][0-9][0-9])::)|expires'",$ipv6);
+  exec("ip -6 route show|grep -Pv '^([am:]|(f[ef][0-9][0-9])::)|expires'",$ipv6);
   foreach ($ipv4 as $info) {
     $cell = explode(' ',$info);
     $route = $cell[0];

From 28a94f70194e394366860b236d1efdd0be0c236e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:36:09 +0200
Subject: [PATCH 3/6] Add new docker setting: select macvlan or ipvlan type

Mainly for testing purposes
---
 plugins/dynamix.docker.manager/DockerSettings.page | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index c5b60d803..330f50f18 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -238,6 +238,12 @@ _(Template Authoring Mode)_:
 
 :docker_authoring_mode_help:
 
+_(Docker custom network type)_:
+: <select name="DOCKER_NETWORK_TYPE">
+  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '', _('macvlan'))?>
+  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '1', _('ipvlan'))?>
+  </select>
+
 _(Host access to custom networks)_:
 : <select name="DOCKER_ALLOW_ACCESS">
   <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', _('Disabled'))?>
@@ -436,6 +442,9 @@ _(Docker LOG rotation)_:
 
 :docker_log_rotation_active_help:
 
+_(Docker custom network type)_:
+: <?=$dockercfg['DOCKER_NETWORK_TYPE']=='' ? _('macvlan') : _('ipvlan')?>
+
 _(Host access to custom networks)_:
 : <?=$dockercfg['DOCKER_ALLOW_ACCESS']=='yes' ? _('Enabled') : _('Disabled')?>
 

From da11df0bb05b0ebad4e02e3476a1f7db95256b7e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:53:39 +0200
Subject: [PATCH 4/6] Update notify_poller

---
 plugins/dynamix/nchan/notify_poller | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugins/dynamix/nchan/notify_poller b/plugins/dynamix/nchan/notify_poller
index 65cbd419a..fe9cb4127 100755
--- a/plugins/dynamix/nchan/notify_poller
+++ b/plugins/dynamix/nchan/notify_poller
@@ -14,16 +14,11 @@
 <?
 $docroot = '/usr/local/emhttp';
 $notify  = "$docroot/webGui/scripts/notify";
-$unread  = '';
 
 require_once "$docroot/webGui/include/publish.php";
 
 while (true) {
-  $get = shell_exec("$notify get");
-  if ($get != $unread) {
-    publish('notify', $get);
-    $unread = $get;
-  }
+  publish('notify', shell_exec("$notify get"));
   sleep(3);
 }
 ?>

From 452e5fd6d501fe4cb935f9fa614f6eae300a3ddc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 21 Jul 2021 15:09:40 +0200
Subject: [PATCH 5/6] Docker settings: new setting macvlan or ipvlan network
 type

---
 .../DockerSettings.page                       | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index 330f50f18..1962e08d2 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -238,20 +238,22 @@ _(Template Authoring Mode)_:
 
 :docker_authoring_mode_help:
 
-_(Docker custom network type)_:
-: <select name="DOCKER_NETWORK_TYPE">
-  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '', _('macvlan'))?>
-  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '1', _('ipvlan'))?>
-  </select>
-
 _(Host access to custom networks)_:
-: <select name="DOCKER_ALLOW_ACCESS">
+: <select name="DOCKER_ALLOW_ACCESS" onchange="changeAccess(this.value)">
   <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', _('Disabled'))?>
   <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', _('Enabled'))?>
   </select>
 
 :docker_custom_network_access_help:
 
+<div markdown="1" id="network-type" style="display:none">
+_(Docker custom network type)_:
+: <select name="DOCKER_NETWORK_TYPE">
+  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '', _('macvlan'))?>
+  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '1', _('ipvlan'))?>
+  </select>
+
+</div>
 _(Preserve user defined networks)_:
 : <select name="DOCKER_USER_NETWORKS">
   <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', _('No'))?>
@@ -442,14 +444,16 @@ _(Docker LOG rotation)_:
 
 :docker_log_rotation_active_help:
 
-_(Docker custom network type)_:
-: <?=$dockercfg['DOCKER_NETWORK_TYPE']=='' ? _('macvlan') : _('ipvlan')?>
-
 _(Host access to custom networks)_:
 : <?=$dockercfg['DOCKER_ALLOW_ACCESS']=='yes' ? _('Enabled') : _('Disabled')?>
 
 :docker_custom_network_active_help:
 
+<div markdown="1" style="<?=$dockercfg['DOCKER_ALLOW_ACCESS']=='' ? 'display:none' : ''?>">
+_(Docker custom network type)_:
+: <?=$dockercfg['DOCKER_NETWORK_TYPE']=='' ? _('macvlan') : _('ipvlan')?>
+
+</div>
 _(Preserve user defined networks)_:
 : <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve' ? _('Yes') : _('No')?>
 
@@ -722,6 +726,9 @@ function changeDHCP(id,ip,sid) {
     }
   }
 }
+function changeAccess(value) {
+  if (value=='') $('#network-type').hide('slow'); else $('#network-type').show('slow');
+}
 function customDHCP(id,ip) {
   var checked = $('#'+id).prop('checked');
   id = '#'+id.substr(0,id.length-4);
@@ -983,5 +990,6 @@ $(function() {
     $.cookie('dockersettings_view_mode', $('.advancedview').is(':checked') ? 'advanced':'basic', {expires:3650});
   });
   showStatus('pid','dockerd');
+  changeAccess("<?=$dockercfg['DOCKER_ALLOW_ACCESS']?>");
 });
 </script>

From bac5a3fe61392fe9117ed0225f780b3263230531 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 22 Jul 2021 15:36:15 +0200
Subject: [PATCH 6/6] Revert "Docker settings: new setting macvlan or ipvlan
 network type"

This reverts commit 452e5fd6d501fe4cb935f9fa614f6eae300a3ddc.
---
 .../DockerSettings.page                       | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index 1962e08d2..330f50f18 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -238,22 +238,20 @@ _(Template Authoring Mode)_:
 
 :docker_authoring_mode_help:
 
-_(Host access to custom networks)_:
-: <select name="DOCKER_ALLOW_ACCESS" onchange="changeAccess(this.value)">
-  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', _('Disabled'))?>
-  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', _('Enabled'))?>
-  </select>
-
-:docker_custom_network_access_help:
-
-<div markdown="1" id="network-type" style="display:none">
 _(Docker custom network type)_:
 : <select name="DOCKER_NETWORK_TYPE">
   <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '', _('macvlan'))?>
   <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '1', _('ipvlan'))?>
   </select>
 
-</div>
+_(Host access to custom networks)_:
+: <select name="DOCKER_ALLOW_ACCESS">
+  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', _('Disabled'))?>
+  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', _('Enabled'))?>
+  </select>
+
+:docker_custom_network_access_help:
+
 _(Preserve user defined networks)_:
 : <select name="DOCKER_USER_NETWORKS">
   <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', _('No'))?>
@@ -444,16 +442,14 @@ _(Docker LOG rotation)_:
 
 :docker_log_rotation_active_help:
 
+_(Docker custom network type)_:
+: <?=$dockercfg['DOCKER_NETWORK_TYPE']=='' ? _('macvlan') : _('ipvlan')?>
+
 _(Host access to custom networks)_:
 : <?=$dockercfg['DOCKER_ALLOW_ACCESS']=='yes' ? _('Enabled') : _('Disabled')?>
 
 :docker_custom_network_active_help:
 
-<div markdown="1" style="<?=$dockercfg['DOCKER_ALLOW_ACCESS']=='' ? 'display:none' : ''?>">
-_(Docker custom network type)_:
-: <?=$dockercfg['DOCKER_NETWORK_TYPE']=='' ? _('macvlan') : _('ipvlan')?>
-
-</div>
 _(Preserve user defined networks)_:
 : <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve' ? _('Yes') : _('No')?>
 
@@ -726,9 +722,6 @@ function changeDHCP(id,ip,sid) {
     }
   }
 }
-function changeAccess(value) {
-  if (value=='') $('#network-type').hide('slow'); else $('#network-type').show('slow');
-}
 function customDHCP(id,ip) {
   var checked = $('#'+id).prop('checked');
   id = '#'+id.substr(0,id.length-4);
@@ -990,6 +983,5 @@ $(function() {
     $.cookie('dockersettings_view_mode', $('.advancedview').is(':checked') ? 'advanced':'basic', {expires:3650});
   });
   showStatus('pid','dockerd');
-  changeAccess("<?=$dockercfg['DOCKER_ALLOW_ACCESS']?>");
 });
 </script>