Revert "Add usage to all plugins"

SiskaPavel · web-flow · commit 8ad55a72111c · 2025-03-31T14:01:58.000+02:00
diff --git a/src/core/ipfixprobe.cpp b/src/core/ipfixprobe.cpp
@@ -94,7 +94,7 @@ static void printPluginsUsage(const std::vector<PluginManifest>& pluginsManifest
 		} else {
 			std::cout << pluginManifest.name << std::endl;
 		}
-		std::cout << std::endl;
+		std::cout << "------------------\n";
 	}
 }
 
diff --git a/src/plugins/process/basicplus/src/basicplus.cpp b/src/plugins/process/basicplus/src/basicplus.cpp
@@ -24,13 +24,7 @@ static const PluginManifest basicplusPluginManifest = {
 	.description = "Basicplus process plugin for parsing basicplus traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser(
-				"basicplus",
-				"Extend basic fields with TTL, TCP window, options, MSS and SYN size");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 BASICPLUSPlugin::BASICPLUSPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/bstats/src/bstats.cpp b/src/plugins/process/bstats/src/bstats.cpp
@@ -24,11 +24,7 @@ static const PluginManifest bstatsPluginManifest = {
 	.description = "Bstats process plugin for computing packet bursts stats.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("bstats", "Compute packet bursts stats");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 const struct timeval BSTATSPlugin::min_packet_in_burst
diff --git a/src/plugins/process/dns/src/dns.cpp b/src/plugins/process/dns/src/dns.cpp
@@ -32,11 +32,7 @@ static const PluginManifest dnsPluginManifest = {
 	.description = "Dns process plugin for parsing dns traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("dns", "Parse DNS traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 // #define DEBUG_DNS
 
diff --git a/src/plugins/process/flowHash/src/flow_hash.cpp b/src/plugins/process/flowHash/src/flow_hash.cpp
@@ -24,11 +24,7 @@ static const PluginManifest flowhashPluginManifest = {
 	.description = "flowhash process plugin for parsing flowhash value.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("flowhash", "Export flow hash as flow id");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 FLOW_HASHPlugin::FLOW_HASHPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/http/src/http.cpp b/src/plugins/process/http/src/http.cpp
@@ -32,11 +32,7 @@ static const PluginManifest httpPluginManifest = {
 	.description = "http process plugin for parsing http traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("http", "Parse HTTP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 // #define DEBUG_HTTP
diff --git a/src/plugins/process/icmp/src/icmp.cpp b/src/plugins/process/icmp/src/icmp.cpp
@@ -24,11 +24,7 @@ static const PluginManifest icmpPluginManifest = {
 	.description = "ICMP process plugin for parsing icmp traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("icmp", "Parse ICMP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 ICMPPlugin::ICMPPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/idpContent/src/idpcontent.cpp b/src/plugins/process/idpContent/src/idpcontent.cpp
@@ -24,11 +24,7 @@ static const PluginManifest idpcontentPluginManifest = {
 	.description = "Idpcontent process plugin for parsing idpcontent traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("idpcontent", "Parse first bytes of flow payload");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
diff --git a/src/plugins/process/mpls/src/mpls.cpp b/src/plugins/process/mpls/src/mpls.cpp
@@ -24,11 +24,7 @@ static const PluginManifest mplsPluginManifest = {
 	.description = "Mpls process plugin for parsing mpls traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("mpls", "Parse MPLS traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 MPLSPlugin::MPLSPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/netbios/src/netbios.cpp b/src/plugins/process/netbios/src/netbios.cpp
@@ -28,11 +28,7 @@ static const PluginManifest netbiosPluginManifest = {
 	.description = "Netbios process plugin for parsing netbios traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("netbios", "Parse netbios traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 NETBIOSPlugin::NETBIOSPlugin(const std::string& params, int pluginID)
 	: ProcessPlugin(pluginID)
diff --git a/src/plugins/process/nettisa/src/nettisa.cpp b/src/plugins/process/nettisa/src/nettisa.cpp
@@ -25,11 +25,7 @@ static const PluginManifest nettisaPluginManifest = {
 	.description = "Nettisa process plugin for parsing Nettisa flow.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("nettisa", "Parse NetTiSA flow");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 NETTISAPlugin::NETTISAPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/ntp/src/ntp.cpp b/src/plugins/process/ntp/src/ntp.cpp
@@ -31,11 +31,7 @@ static const PluginManifest ntpPluginManifest = {
 	.description = "Ntp process plugin for parsing ntp traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("ntp", "Parse NTP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 // #define DEBUG_NTP
diff --git a/src/plugins/process/osquery/src/osquery.cpp b/src/plugins/process/osquery/src/osquery.cpp
@@ -30,13 +30,7 @@ static const PluginManifest osqueryPluginManifest = {
 	.description = "Osquery process plugin for parsing osquery traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser(
-				"osquery",
-				"Collect information about locally outbound flows from OS");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 OSQUERYPlugin::OSQUERYPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/ovpn/src/ovpn.cpp b/src/plugins/process/ovpn/src/ovpn.cpp
@@ -54,11 +54,7 @@ static const PluginManifest ovpnPluginManifest = {
 	.description = "Ovpn process plugin for parsing ovpn traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("ovpn", "OpenVPN detector plugin");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 OVPNPlugin::OVPNPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/passiveDns/src/passivedns.cpp b/src/plugins/process/passiveDns/src/passivedns.cpp
@@ -38,11 +38,7 @@ static const PluginManifest passivednsPluginManifest = {
 	.description = "Passivedns process plugin for parsing DNS A and AAAA records.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("passivedns", "Parse A, AAAA and PTR records from DNS traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 // #define DEBUG_PASSIVEDNS
diff --git a/src/plugins/process/quic/src/quic.cpp b/src/plugins/process/quic/src/quic.cpp
@@ -27,11 +27,7 @@ static const PluginManifest quicPluginManifest = {
 	.description = "Quic process plugin for parsing quic traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("quic", "Parse QUIC traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 QUICPlugin::QUICPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/rtsp/src/rtsp.cpp b/src/plugins/process/rtsp/src/rtsp.cpp
@@ -32,11 +32,7 @@ static const PluginManifest rtspPluginManifest = {
 	.description = "Rtsp process plugin for parsing rtsp traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("rtsp", "Parse RTSP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 // #define DEBUG_RTSP
diff --git a/src/plugins/process/sip/src/sip.cpp b/src/plugins/process/sip/src/sip.cpp
@@ -29,11 +29,7 @@ static const PluginManifest sipPluginManifest = {
 	.description = "Sip process plugin for parsing sip traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("sip", "Parse SIP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 SIPPlugin::SIPPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/smtp/src/smtp.cpp b/src/plugins/process/smtp/src/smtp.cpp
@@ -28,11 +28,7 @@ static const PluginManifest smtpPluginManifest = {
 	.description = "Smtp process plugin for parsing smtp traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("smtp", "Parse SMTP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 SMTPPlugin::SMTPPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/ssaDetector/src/ssadetector.cpp b/src/plugins/process/ssaDetector/src/ssadetector.cpp
@@ -25,13 +25,7 @@ static const PluginManifest ssadetectorPluginManifest = {
 	.description = "Ssadetector process plugin for parsing vpn_automaton traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser(
-				"ssadetector",
-				"Check traffic for SYN-SYNACK-ACK sequence to find possible network tunnels.");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 SSADetectorPlugin::SSADetectorPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/ssaDetector/src/ssadetector.hpp b/src/plugins/process/ssaDetector/src/ssadetector.hpp
@@ -148,10 +148,10 @@ class SSADetectorPlugin : public ProcessPlugin {
 	OptionsParser* get_parser() const
 	{
 		return new OptionsParser(
-			"ssadetector",
+			"SSADetector",
 			"Check traffic for SYN-SYNACK-ACK sequence to find possible network tunnels.");
 	}
-	std::string get_name() const { return "ssadetector"; }
+	std::string get_name() const { return "SSADetector"; }
 	RecordExt* get_ext() const { return new RecordExtSSADetector(m_pluginID); }
 	ProcessPlugin* copy();
 
diff --git a/src/plugins/process/ssdp/src/ssdp.cpp b/src/plugins/process/ssdp/src/ssdp.cpp
@@ -24,11 +24,7 @@ static const PluginManifest ssdpPluginManifest = {
 	.description = "Ssdp process plugin for parsing ssdp traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("ssdp", "Parse SSDP traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 // #define DEBUG_SSDP
diff --git a/src/plugins/process/tls/src/tls.cpp b/src/plugins/process/tls/src/tls.cpp
@@ -33,11 +33,7 @@ static const PluginManifest tlsPluginManifest = {
 	.description = "Tls process plugin for parsing tls traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("tls", "Parse TLS traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 // Print debug message if debugging is allowed.
diff --git a/src/plugins/process/vlan/src/vlan.cpp b/src/plugins/process/vlan/src/vlan.cpp
@@ -24,11 +24,7 @@ static const PluginManifest vlanPluginManifest = {
 	.description = "Vlan process plugin for parsing vlan traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("vlan", "Parse VLAN traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 VLANPlugin::VLANPlugin(const std::string& params, int pluginID)
diff --git a/src/plugins/process/wg/src/wg.cpp b/src/plugins/process/wg/src/wg.cpp
@@ -26,11 +26,7 @@ static const PluginManifest wgPluginManifest = {
 	.description = "Wg process plugin for parsing wg traffic.",
 	.pluginVersion = "1.0.0",
 	.apiVersion = "1.0.0",
-	.usage =
-		[]() {
-			OptionsParser parser("wg", "Parse WireGuard traffic");
-			parser.usage(std::cout);
-		},
+	.usage = nullptr,
 };
 
 WGPlugin::WGPlugin(const std::string& params, int pluginID)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static void printPluginsUsage(const std::vector<PluginManifest>& pluginsManifest`
`94`	`94`	`} else {`
`95`	`95`	`std::cout << pluginManifest.name << std::endl;`
`96`	`96`	`}`
`97`		`- std::cout << std::endl;`
	`97`	`+ std::cout << "------------------\n";`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`