From 3435b2514ccd75fa9919ec5cdbe5e4e7e10b0818 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 18 Jul 2020 14:43:03 +0200
Subject: monitor: ndp: T2706: remove ability to send commands

The "monitor" operational mode tree is for listening in on logfiles, chatter
on the wire or other things - it subscribes to the system. Hence it should under
no circumstances - ever - generate data. Sending our those requests, same as
e.g. calling ndisc6 should be placed under a different node.

Which one? I yet have no idea.
---
 op-mode-definitions/monitor-ntp.xml | 44 +++++++++++++++++++++++++++
 op-mode-definitions/ndp-monitor.xml | 60 -------------------------------------
 2 files changed, 44 insertions(+), 60 deletions(-)
 create mode 100644 op-mode-definitions/monitor-ntp.xml
 delete mode 100644 op-mode-definitions/ndp-monitor.xml

diff --git a/op-mode-definitions/monitor-ntp.xml b/op-mode-definitions/monitor-ntp.xml
new file mode 100644
index 000000000..e25eccf3a
--- /dev/null
+++ b/op-mode-definitions/monitor-ntp.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="monitor">
+    <children>
+      <node name="ndp">
+        <properties>
+          <help>Monitors the NDP information received by the router through the device</help>
+        </properties>
+        <command>sudo ndptool monitor</command>
+        <children>
+          <tagNode name="interface">
+            <command>sudo ndptool monitor --ifname=$4</command>
+            <properties>
+              <help>Monitor ndp protocol on specified interface</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <tagNode name="type">
+                <command>sudo ndptool monitor --ifname=$4 --msg-type=$6</command>
+                <properties>
+                  <help>Monitor ndp protocol on specified interface</help>
+                  <completionHelp>
+                    <list>rs ra ns na</list>
+                  </completionHelp>
+                </properties>
+              </tagNode>
+            </children>
+          </tagNode>
+          <tagNode name="type">
+            <command>sudo ndptool monitor --msg-type=$4</command>
+            <properties>
+              <help>Monitor ndp protocol on specified interface</help>
+              <completionHelp>
+                <list>rs ra ns na</list>
+              </completionHelp>
+            </properties>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/ndp-monitor.xml b/op-mode-definitions/ndp-monitor.xml
deleted file mode 100644
index 6ef3bce60..000000000
--- a/op-mode-definitions/ndp-monitor.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="monitor">
-    <children>
-      <node name="ndp">
-        <properties>
-          <help>Monitors the NDP information received by the router through the device</help>
-        </properties>
-        <command>sudo ndptool monitor</command>
-        <children>
-          <tagNode name="interface">
-            <command>sudo ndptool monitor --ifname=$4</command>
-            <properties>
-              <help>Monitor ndp protocol on specified interface</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py</script>
-              </completionHelp>
-            </properties>
-            <children>
-              <tagNode name="type">
-                <command>sudo ndptool monitor --ifname=$4 --msg-type=$6</command>
-                <properties>
-                  <help>Monitor ndp protocol on specified interface</help>
-                  <completionHelp>
-                    <list>rs ra ns na</list>
-                  </completionHelp>
-                </properties>
-                <children>
-                  <tagNode name="send">
-                    <command>sudo ndptool send --ifname=$4 --msg-type=$6</command>
-                    <properties>
-                      <help>Send a specified type of NDP message</help>
-                    </properties>
-                  </tagNode>
-                </children>
-              </tagNode>
-            </children>
-          </tagNode>
-          <tagNode name="type">
-            <command>sudo ndptool monitor --msg-type=$4</command>
-            <properties>
-              <help>Monitor ndp protocol on specified interface</help>
-              <completionHelp>
-                <list>rs ra ns na</list>
-              </completionHelp>
-            </properties>
-            <children>
-              <tagNode name="send">
-                <command>sudo ndptool send --msg-type=$4</command>
-                <properties>
-                  <help>Send a specified type of NDP message</help>
-                </properties>
-              </tagNode>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3