ipfixprobe - add option -L PATH to specify plugins path

Author: Pavel Šiška

src/buildConfig.hpp.in

@@ -13,3 +13,5 @@
 
 #define IPXP_APP_NAME "ipfixprobe"
 #define IPXP_APP_VERSION "@VERSION@"
+
+#define IPXP_DEFAULT_PLUGINS_DIR "@INSTALL_DIR_LIB@/ipfixprobe/"

src/core/ipfixprobe.cpp

@@ -28,8 +28,6 @@
 
 #include "ipfixprobe.hpp"
 
-#include "buildConfig.hpp"
-
 #include <fstream>
 #include <future>
 #include <iomanip>
@@ -637,7 +635,7 @@ int run(int argc, char* argv[])
 		goto EXIT;
 	}
 
-	conf.pluginManager.loadPlugins("/usr/local/lib64/ipfixprobe/", loadPluginsRecursive);
+	conf.pluginManager.loadPlugins(parser.m_plugins_path, loadPluginsRecursive);
 
 	printPlugins();
 

src/core/ipfixprobe.hpp

@@ -29,6 +29,7 @@
 #ifndef IPXP_IPFIXPROBE_HPP
 #define IPXP_IPFIXPROBE_HPP
 
+#include "buildConfig.hpp"
 #include "pluginManager.hpp"
 #include "workers.hpp"
 
@@ -91,6 +92,7 @@ class IpfixprobeOptParser : public OptionsParser {
 	std::string m_help_str;
 	bool m_version;
 	std::vector<int> m_cpu_mask;
+	std::string m_plugins_path;
 
 	IpfixprobeOptParser()
 		: OptionsParser("ipfixprobe", "flow exporter supporting various custom IPFIX elements")
@@ -105,6 +107,7 @@ class IpfixprobeOptParser : public OptionsParser {
 		, m_help(false)
 		, m_help_str("")
 		, m_version(false)
+		, m_plugins_path(IPXP_DEFAULT_PLUGINS_DIR)
 	{
 		m_delim = ' ';
 
@@ -238,6 +241,16 @@ class IpfixprobeOptParser : public OptionsParser {
 				return m_pid != "";
 			},
 			OptionFlags::RequiredArgument);
+		register_option(
+			"-L",
+			"--plugins-path",
+			"PATH",
+			"Path to the directory with plugins. Default: " IPXP_DEFAULT_PLUGINS_DIR,
+			[this](const char* arg) {
+				m_plugins_path = arg;
+				return m_plugins_path != "";
+			},
+			OptionFlags::RequiredArgument);
 		register_option(
 			"-d",
 			"--daemon",