ipfixprobe - introduce process NETBIOS plugin

Author: Pavel Siska

src/plugins/process/CMakeLists.txt

@@ -18,3 +18,4 @@ add_subdirectory(ssaDetector)
 add_subdirectory(mqtt)
 add_subdirectory(dns)
 add_subdirectory(dnssd)
+add_subdirectory(netbios)

src/plugins/process/netbios/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(ipfixprobe-process-netbios VERSION 1.0.0 DESCRIPTION "ipfixprobe-process-netbios plugin")
+
+add_library(ipfixprobe-process-netbios MODULE
+    src/netbios.cpp
+    src/netbios.hpp
+)
+
+set_target_properties(ipfixprobe-process-netbios PROPERTIES
+    CXX_VISIBILITY_PRESET hidden
+    VISIBILITY_INLINES_HIDDEN YES
+)
+
+target_include_directories(ipfixprobe-process-netbios PRIVATE
+    ${CMAKE_SOURCE_DIR}/include/
+    ${CMAKE_SOURCE_DIR}/src/plugins/process/common
+)
+
+install(TARGETS ipfixprobe-process-netbios
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixprobe/process/"
+)

src/plugins/process/netbios/README.md

@@ -1,53 +1,41 @@
 /**
- * \file netbios.cpp
- * \brief Plugin for parsing netbios traffic.
- * \author Ondrej Sedlacek <[email protected]>
- * \date 2020
- */
-/*
- * Copyright (C) 2020 CESNET
- *
- * LICENSE TERMS
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of the Company nor the names of its contributors
- *    may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
+ * @file
+ * @brief Plugin for parsing netbios traffic.
+ * @author Ondrej Sedlacek <[email protected]>
+ * @author Pavel Siska <[email protected]>
+ * @date 2025
  *
+ * Copyright (c) 2025 CESNET
  *
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <iostream>
+#include "netbios.hpp"
 
 #ifdef WITH_NEMEA
 #include <unirec/unirec.h>
 #endif
 
-#include "netbios.hpp"
+#include <iostream>
 
-namespace ipxp {
+#include <ipfixprobe/pluginFactory/pluginManifest.hpp>
+#include <ipfixprobe/pluginFactory/pluginRegistrar.hpp>
 
-int RecordExtNETBIOS::REGISTERED_ID = -1;
+namespace ipxp {
 
-__attribute__((constructor)) static void register_this_plugin()
-{
-	static PluginRecord rec = PluginRecord("netbios", []() { return new NETBIOSPlugin(); });
-	register_plugin(&rec);
-	RecordExtNETBIOS::REGISTERED_ID = register_extension();
-}
+int RecordExtNETBIOS::REGISTERED_ID = ProcessPluginIDGenerator::instance().generatePluginID();
 
-NETBIOSPlugin::NETBIOSPlugin()
+static const PluginManifest netbiosPluginManifest = {
+	.name = "netbios",
+	.description = "Netbios process plugin for parsing netbios traffic.",
+	.pluginVersion = "1.0.0",
+	.apiVersion = "1.0.0",
+	.usage = nullptr,
+};
+NETBIOSPlugin::NETBIOSPlugin(const std::string& params)
 	: total_netbios_packets(0)
 {
+	init(params.c_str());
 }
 
 NETBIOSPlugin::~NETBIOSPlugin()
@@ -154,4 +142,7 @@ void NETBIOSPlugin::finish(bool print_stats)
 	}
 }
 
+static const PluginRegistrar<NETBIOSPlugin, ProcessPluginFactory>
+	netbiosRegistrar(netbiosPluginManifest);
+
 } // namespace ipxp

src/plugins/process/netbios.cpp …/plugins/process/netbios/src/netbios.cppsrc/plugins/process/netbios.cpp renamed to src/plugins/process/netbios/src/netbios.cpp src/plugins/process/netbios.cpp renamed to src/plugins/process/netbios/src/netbios.cpp

@@ -1,33 +1,16 @@
 /**
- * \file netbios.h
- * \brief Plugin for parsing netbios traffic.
- * \author Ondrej Sedlacek <[email protected]>
- * \date 2020
- */
-/*
- * Copyright (C) 2020 CESNET
- *
- * LICENSE TERMS
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name of the Company nor the names of its contributors
- *    may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
+ * @file
+ * @brief Plugin for parsing netbios traffic.
+ * @author Ondrej Sedlacek <[email protected]>
+ * @author Pavel Siska <[email protected]>
+ * @date 2025
  *
+ * Copyright (c) 2025 CESNET
  *
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef IPXP_PROCESS_NETBIOS_HPP
-#define IPXP_PROCESS_NETBIOS_HPP
+#pragma once
 
 #include <cstring>
 #include <sstream>
@@ -37,12 +20,11 @@
 #include "fields.h"
 #endif
 
-#include "dns-utils.hpp"
-
+#include <dns-utils.hpp>
 #include <ipfixprobe/flowifc.hpp>
 #include <ipfixprobe/ipfix-elements.hpp>
 #include <ipfixprobe/packet.hpp>
-#include <ipfixprobe/process.hpp>
+#include <ipfixprobe/processPlugin.hpp>
 
 namespace ipxp {
 
@@ -110,7 +92,7 @@ struct RecordExtNETBIOS : public RecordExt {
  */
 class NETBIOSPlugin : public ProcessPlugin {
 public:
-	NETBIOSPlugin();
+	NETBIOSPlugin(const std::string& params);
 	~NETBIOSPlugin();
 	void init(const char* params);
 	void close();
@@ -138,4 +120,3 @@ class NETBIOSPlugin : public ProcessPlugin {
 };
 
 } // namespace ipxp
-#endif /* IPXP_PROCESS_NETBIOS_HPP */