WIP

Author: Pavel Siska

include/ipfixprobe/outputPlugin.hpp

@@ -43,6 +43,8 @@ class IPXP_API OutputPlugin : public Plugin {
 	}
 	virtual ~OutputPlugin() {}
 
+	using Plugin::init;
+
 	virtual void init(const char* params, ProcessPlugins& plugins) = 0;
 
 	enum class Result { EXPORTED = 0, DROPPED };

src/core/ipfixprobe.cpp

@@ -26,9 +26,8 @@
  *
  */
 
-#include "ipfixprobe.hpp"
-
 #include "buildConfig.hpp"
+#include "ipfixprobe.hpp"
 #include "stacktrace.hpp"
 #include "stats.hpp"
 
@@ -134,30 +133,6 @@ static void printPluginsUsage(const std::string& pluginName)
 	}
 }
 
-static void printRegisteredPlugins(
-	const std::string& pluginType,
-	const std::vector<PluginManifest>& pluginsManifest)
-{
-	std::cout << "Registered " << pluginType << " plugins:" << std::endl;
-	for (const auto& pluginManifest : pluginsManifest) {
-		std::cout << "  " << pluginManifest.name << std::endl;
-	}
-	std::cout << "#####################\n";
-}
-
-static void printPlugins()
-{
-	auto& inputPluginFactory = InputPluginFactory::getInstance();
-	auto& storagePluginFactory = StoragePluginFactory::getInstance();
-	auto& processPluginFactory = ProcessPluginFactory::getInstance();
-	auto& outputPluginFactory = OutputPluginFactory::getInstance();
-
-	printRegisteredPlugins("input", inputPluginFactory.getRegisteredPlugins());
-	printRegisteredPlugins("storage", storagePluginFactory.getRegisteredPlugins());
-	printRegisteredPlugins("process", processPluginFactory.getRegisteredPlugins());
-	printRegisteredPlugins("output", outputPluginFactory.getRegisteredPlugins());
-}
-
 void print_help(const std::string& arg)
 {
 	if (arg == "input") {
@@ -679,8 +654,6 @@ int run(int argc, char* argv[])
 
 	conf.pluginManager.loadPlugins(parser.m_plugins_path, loadPluginsRecursive);
 
-	// printPlugins();
-
 	if (parser.m_help) {
 		if (parser.m_help_str.empty()) {
 			parser.usage(std::cout, 0, IPXP_APP_NAME);

src/plugins/input/raw/src/raw.hpp

@@ -150,6 +150,4 @@ class RawReader : public InputPlugin {
 	void print_available_ifcs();
 };
 
-void packet_handler(u_char* arg, const struct pcap_pkthdr* h, const u_char* data);
-
 } // namespace ipxp