in/out interfaces in the metadata of dumped packets

yanet-platform · Jan 23, 2024 · 3f08381 · 3f08381
1 parent 45366f5
commit 3f08381
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 45 deletions.
diff --git a/cli/convert.h b/cli/convert.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "common/icontrolplane.h"
+#include "helper.h"
+
+namespace convert
+{
+
+inline void logical_module()
+{
+	interface::controlPlane controlPlane;
+	const auto response = controlPlane.convert("logical_module");
+
+	table_t table;
+	table.insert("id",
+	             "name");
+
+	for (const auto& [id, name] : response)
+	{
+		table.insert(id, name);
+	}
+
+	table.print();
+}
+
+} /* namespace convert */
diff --git a/cli/main.cpp b/cli/main.cpp
@@ -1,14 +1,12 @@
 #include <functional>
-#include <iostream>
-#include <map>
 #include <numeric>
 #include <string>
-#include <variant>
 #include <vector>
 
 #include "acl.h"
 #include "balancer.h"
 #include "config.h"
+#include "convert.h"
 #include "develop.h"
 #include "dregress.h"
 #include "helper.h"
@@ -121,7 +119,9 @@ std::vector<std::tuple<std::string,
                     {"version", "", [](const auto& args) { call(show::version, args); }},
                     {"latch update dataplane", "<latch name> <state>", [](const auto& args) { call(latch::dataplane_update, args); }},
                     {"counter", "[counter_name] <core_id>", [](const auto& args) { call(show::counter_by_name, args); }},
-                    {"latch update dataplane", "<latch name> <state>", [](const auto& args) { call(latch::dataplane_update, args); }}};
+                    {"latch update dataplane", "<latch name> <state>", [](const auto& args) { call(latch::dataplane_update, args); }},
+                    {},
+                    {"convert logical_module", "", [](const auto& args) { call(convert::logical_module, args); }}};
 
 void printUsage()
 {

diff --git a/cli/show.h b/cli/show.h
@@ -13,7 +13,7 @@
 namespace show
 {
 
-void physicalPort()
+inline void physicalPort()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getPhysicalPorts();
@@ -49,9 +49,9 @@ void physicalPort()
 	table.print();
 }
 
-void physical_port_dump(const std::string& direction,
-                        const std::string& interface_name,
-                        const std::string& state)
+inline void physical_port_dump(const std::string& direction,
+                               const std::string& interface_name,
+                               const std::string& state)
 {
 	interface::dataPlane dataplane;
 
@@ -68,7 +68,7 @@ void physical_port_dump(const std::string& direction,
 	}
 }
 
-void logicalPort()
+inline void logicalPort()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getLogicalPorts();
@@ -108,7 +108,7 @@ static inline std::string convertToString(const common::defender::status& status
 	}
 }
 
-void defenders()
+inline void defenders()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getDefenders();
@@ -135,7 +135,7 @@ void defenders()
 namespace tun64
 {
 
-void summary(std::optional<std::string> module)
+inline void summary(std::optional<std::string> module)
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.tun64_tunnels();
@@ -167,7 +167,7 @@ void summary(std::optional<std::string> module)
 	table.print();
 }
 
-void announce(std::optional<std::string> module)
+inline void announce(std::optional<std::string> module)
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.tun64_prefixes();
@@ -194,7 +194,7 @@ void announce(std::optional<std::string> module)
 	table.print();
 }
 
-void mappings(std::optional<std::string> module)
+inline void mappings(std::optional<std::string> module)
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.tun64_mappings();
@@ -228,7 +228,7 @@ void mappings(std::optional<std::string> module)
 namespace decap
 {
 
-void summary()
+inline void summary()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getDecaps();
@@ -268,7 +268,7 @@ void summary()
 	table.print();
 }
 
-void announce()
+inline void announce()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getDecapPrefixes();
@@ -296,7 +296,7 @@ void announce()
 namespace nat64stateless
 {
 
-void summary()
+inline void summary()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getNat64statelesses();
@@ -322,7 +322,7 @@ void summary()
 	table.print();
 }
 
-void translation()
+inline void translation()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getNat64statelessTranslations();
@@ -355,7 +355,7 @@ void translation()
 	table.print();
 }
 
-void announce()
+inline void announce()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getNat64statelessPrefixes();
@@ -384,7 +384,7 @@ void announce()
 
 }
 
-void snmp()
+inline void snmp()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getPortStatsEx();
@@ -589,7 +589,7 @@ static void list_fw_rules(unsigned int mask, bool list)
 	table.print();
 }
 
-void fw(std::optional<std::string> str)
+inline void fw(std::optional<std::string> str)
 {
 	const auto type = str.value_or("original");
 
@@ -605,7 +605,7 @@ void fw(std::optional<std::string> str)
 	}
 }
 
-void fwlist(std::optional<std::string> str)
+inline void fwlist(std::optional<std::string> str)
 {
 	const auto type = str.value_or("generated");
 
@@ -621,7 +621,7 @@ void fwlist(std::optional<std::string> str)
 	}
 }
 
-void errors()
+inline void errors()
 {
 	table_t table;
 	table.insert("name", "counter");
@@ -637,7 +637,7 @@ void errors()
 	table.print();
 }
 
-void samples()
+inline void samples()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getSamples();
@@ -675,7 +675,7 @@ void samples()
 	table.print();
 }
 
-void samples_dump()
+inline void samples_dump()
 {
 	interface::controlPlane controlPlane;
 	const auto response = controlPlane.getSamples();
@@ -703,7 +703,7 @@ void samples_dump()
 	std::cout << "]\n";
 }
 
-void values()
+inline void values()
 {
 	interface::controlPlane controlplane;
 	const auto controlplane_values = controlplane.controlplane_values();
@@ -723,7 +723,7 @@ void values()
 	table.print();
 }
 
-void durations()
+inline void durations()
 {
 	interface::controlPlane controlplane;
 	const auto controlplane_durations = controlplane.controlplane_durations();
@@ -743,7 +743,7 @@ void durations()
 	table.print();
 }
 
-void version()
+inline void version()
 {
 	table_t table;
 	table.insert("application",
@@ -796,8 +796,8 @@ void version()
 	table.print();
 }
 
-void counter_by_name(std::string counter_name,
-                     const std::optional<tCoreId>& core_id)
+inline void counter_by_name(std::string counter_name,
+                            const std::optional<tCoreId>& core_id)
 {
 	interface::dataPlane dataplane;
 
@@ -827,7 +827,7 @@ void counter_by_name(std::string counter_name,
 	table.print();
 }
 
-void shm_info()
+inline void shm_info()
 {
 	interface::dataPlane dataplane;
 	const auto response = dataplane.get_shm_info();

diff --git a/common/bufferring.h b/common/bufferring.h
@@ -1,4 +1,4 @@
-#include <inttypes.h>
+#include <cstdint>
 
 namespace common
 {
@@ -47,6 +47,9 @@ class bufferring
 	{
 		uint32_t size;
 		uint32_t tag;
+		uint32_t in_logicalport_id;
+		uint32_t out_logicalport_id;
+		uint8_t flow_type;
 	} __attribute__((__aligned__(64)));
 
 	struct item_t

diff --git a/common/icontrolplane.h b/common/icontrolplane.h
@@ -332,6 +332,11 @@ class controlPlane
 		return get<common::icp::requestType::nat46clat_stats, common::icp::nat46clat_stats::response>();
 	}
 
+	auto convert(const common::icp::convert::request& request) const
+	{
+		return get<common::icp::requestType::convert, common::icp::convert::response>(request);
+	}
+
 protected:
 	void connectToControlPlane() const
 	{

diff --git a/common/icp.h b/common/icp.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <inttypes.h>
-
 #include <array>
 #include <map>
 #include <optional>
@@ -88,7 +86,8 @@ enum class requestType : uint32_t
 	nat46clat_config,
 	nat46clat_announce,
 	nat46clat_stats,
-	size
+	convert,
+	size // size should always be at the bottom of the list, this enum allows us to find out the size of the enum list
 };
 
 inline const char* requestType_toString(requestType t)
@@ -219,6 +218,8 @@ inline const char* requestType_toString(requestType t)
 			return "nat46clat_announce";
 		case requestType::nat46clat_stats:
 			return "nat46clat_stats";
+		case requestType::convert:
+			return "convert";
 		case requestType::size:
 			return "unknown";
 	}
@@ -898,6 +899,14 @@ using response = std::tuple<unsigned int, ///< major
                             std::string>; ///< custom
 }
 
+namespace convert
+{
+using request = std::string; // module
+
+using response = std::vector<std::tuple<unsigned int, ///< id
+                                        std::string>>; ///< name
+}
+
 using request = std::tuple<requestType,
                            std::variant<std::tuple<>,
                                         acl_unwind::request,
@@ -912,7 +921,8 @@ using request = std::tuple<requestType,
                                         resolve_fqdn_to_ip::request,
                                         getAclConfig::request,
                                         getFwList::request,
-                                        loadConfig::request>>;
+                                        loadConfig::request,
+                                        convert::request>>;
 
 using response = std::variant<std::tuple<>,
                               telegraf_unsafe::response,
@@ -963,7 +973,8 @@ using response = std::variant<std::tuple<>,
                               loadConfig::response,
                               nat46clat_config::response,
                               nat46clat_announce::response,
-                              nat46clat_stats::response>;
+                              nat46clat_stats::response,
+                              convert::response>;
 }
 
 }