From c509d0e6caae55106a2fbde3059652a493ed3903 Mon Sep 17 00:00:00 2001
From: khramshinr <khramshinr@gmail.com>
Date: Mon, 8 Jul 2024 16:38:22 +0600
Subject: T6362: Create conntrack logger daemon

---
 .../include/conntrack/log-common.xml.i             | 20 ------
 .../include/conntrack/log-protocols.xml.i          | 26 +++++++
 interface-definitions/system_conntrack.xml.in      | 81 ++++++++++++++++------
 3 files changed, 85 insertions(+), 42 deletions(-)
 delete mode 100644 interface-definitions/include/conntrack/log-common.xml.i
 create mode 100644 interface-definitions/include/conntrack/log-protocols.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/conntrack/log-common.xml.i b/interface-definitions/include/conntrack/log-common.xml.i
deleted file mode 100644
index 38799f8f4..000000000
--- a/interface-definitions/include/conntrack/log-common.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from conntrack/log-common.xml.i -->
-<leafNode name="destroy">
-  <properties>
-    <help>Log connection deletion</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<leafNode name="new">
-  <properties>
-    <help>Log connection creation</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<leafNode name="update">
-  <properties>
-    <help>Log connection updates</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/conntrack/log-protocols.xml.i b/interface-definitions/include/conntrack/log-protocols.xml.i
new file mode 100644
index 000000000..019250760
--- /dev/null
+++ b/interface-definitions/include/conntrack/log-protocols.xml.i
@@ -0,0 +1,26 @@
+<!-- include start from conntrack/log-protocols.xml.i -->
+<leafNode name="icmp">
+  <properties>
+    <help>Log connection tracking events for ICMP</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="other">
+  <properties>
+    <help>Log connection tracking events for all protocols other than TCP, UDP and ICMP</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="tcp">
+  <properties>
+    <help>Log connection tracking events for TCP</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="udp">
+  <properties>
+    <help>Log connection tracking events for UDP</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/system_conntrack.xml.in b/interface-definitions/system_conntrack.xml.in
index 0dfa2ea81..cd59d1308 100644
--- a/interface-definitions/system_conntrack.xml.in
+++ b/interface-definitions/system_conntrack.xml.in
@@ -223,41 +223,78 @@
           </node>
           <node name="log">
             <properties>
-              <help>Log connection tracking events per protocol</help>
+              <help>Log connection tracking</help>
             </properties>
             <children>
-              <node name="icmp">
+              <node name="event">
                 <properties>
-                  <help>Log connection tracking events for ICMP</help>
+                  <help>Event type and protocol</help>
                 </properties>
                 <children>
-                  #include <include/conntrack/log-common.xml.i>
+                  <node name="destroy">
+                    <properties>
+                      <help>Log connection deletion</help>
+                    </properties>
+                    <children>
+                      #include <include/conntrack/log-protocols.xml.i>
+                    </children>
+                  </node>
+                  <node name="new">
+                    <properties>
+                      <help>Log connection creation</help>
+                    </properties>
+                    <children>
+                      #include <include/conntrack/log-protocols.xml.i>
+                    </children>
+                  </node>
+                  <node name="update">
+                    <properties>
+                      <help>Log connection updates</help>
+                    </properties>
+                    <children>
+                      #include <include/conntrack/log-protocols.xml.i>
+                    </children>
+                  </node>
                 </children>
               </node>
-              <node name="other">
+              <leafNode name="timestamp">
                 <properties>
-                  <help>Log connection tracking events for all protocols other than TCP, UDP and ICMP</help>
+                  <help>Log connection tracking events include flow-based timestamp</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  #include <include/conntrack/log-common.xml.i>
-                </children>
-              </node>
-              <node name="tcp">
+              </leafNode>
+              <leafNode name="queue-size">
                 <properties>
-                  <help>Log connection tracking events for TCP</help>
+                  <help>Internal message queue size</help>
+                  <valueHelp>
+                    <format>u32:100-999999</format>
+                    <description>Queue size</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-999999"/>
+                  </constraint>
+                  <constraintErrorMessage>Queue size must be between 100 and 999999</constraintErrorMessage>
                 </properties>
-                <children>
-                  #include <include/conntrack/log-common.xml.i>
-                </children>
-              </node>
-              <node name="udp">
+              </leafNode>
+              <leafNode name="log-level">
                 <properties>
-                  <help>Log connection tracking events for UDP</help>
+                  <help>Set log-level. Log must be enable.</help>
+                  <completionHelp>
+                    <list>info debug</list>
+                  </completionHelp>
+                  <valueHelp>
+                    <format>info</format>
+                    <description>Info log level</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>debug</format>
+                    <description>Debug log level</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>(info|debug)</regex>
+                  </constraint>
                 </properties>
-                <children>
-                  #include <include/conntrack/log-common.xml.i>
-                </children>
-              </node>
+              </leafNode>
             </children>
           </node>
           <node name="modules">
-- 
cgit v1.2.3