From 1345c0a23da2a0dc0bbeb6a91783abef1b235fbe Mon Sep 17 00:00:00 2001 From: Maksym Mamontov Date: Mon, 24 Feb 2020 18:02:54 +0200 Subject: [PATCH 1/1] Fix some BSD-related issues. --- libs/CMakeLists.txt | 3 +- stargazer/CMakeLists.txt | 2 +- stargazer/plugins/CMakeLists.txt | 3 +- .../capture/divert_freebsd/divert_cap.cpp | 12 ++-- .../capture/divert_freebsd/divert_cap.h | 63 +++++++++---------- 5 files changed, 39 insertions(+), 44 deletions(-) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 17b90799..f413010e 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -64,8 +64,9 @@ if ( BUILD_LIB_SMUX ) endif ( BUILD_LIB_SMUX ) if ( BUILD_LIB_SRVCONF ) + find_package ( EXPAT REQUIRED ) file ( GLOB PARSERS srvconf/parsers/*.cpp ) add_library ( srvconf STATIC srvconf/servconf.cpp srvconf/netunit.cpp ${PARSERS} ) target_include_directories ( srvconf PUBLIC srvconf/include ) - target_link_libraries ( srvconf crypto common ) + target_link_libraries ( srvconf crypto common EXPAT::EXPAT ) endif ( BUILD_LIB_SRVCONF ) diff --git a/stargazer/CMakeLists.txt b/stargazer/CMakeLists.txt index 43c8e91a..d64efc6c 100644 --- a/stargazer/CMakeLists.txt +++ b/stargazer/CMakeLists.txt @@ -22,7 +22,7 @@ find_package ( Threads REQUIRED ) add_executable ( stargazer ${CPP_FILES} ) -target_link_libraries ( stargazer scriptexecuter dotconfpp logger common Threads::Threads dl ) +target_link_libraries ( stargazer scriptexecuter dotconfpp logger common Threads::Threads ${CMAKE_DL_LIBS} ) add_subdirectory ( plugins ) diff --git a/stargazer/plugins/CMakeLists.txt b/stargazer/plugins/CMakeLists.txt index 086521f9..1d205898 100644 --- a/stargazer/plugins/CMakeLists.txt +++ b/stargazer/plugins/CMakeLists.txt @@ -152,6 +152,7 @@ endif ( BUILD_MOD_STORE_MYSQL ) if ( BUILD_MOD_STORE_POSTGRESQL ) find_package ( PostgreSQL REQUIRED ) + include_directories ( ${PostgreSQL_INCLUDE_DIRS} ) add_library ( mod_store_postgresql MODULE store/postgresql/postgresql_store.cpp store/postgresql/postgresql_store_admins.cpp store/postgresql/postgresql_store_corporations.cpp @@ -160,6 +161,6 @@ if ( BUILD_MOD_STORE_POSTGRESQL ) store/postgresql/postgresql_store_tariffs.cpp store/postgresql/postgresql_store_users.cpp store/postgresql/postgresql_store_utils.cpp ) - target_link_libraries ( mod_store_postgresql crypto logger common PostgreSQL::PostgreSQL ) + target_link_libraries ( mod_store_postgresql crypto logger common ${PostgreSQL_LIBRARIES} ) set_target_properties ( mod_store_postgresql PROPERTIES PREFIX "" ) endif ( BUILD_MOD_STORE_POSTGRESQL ) diff --git a/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp b/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp index 1885835b..6019fa4b 100644 --- a/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp +++ b/stargazer/plugins/capture/divert_freebsd/divert_cap.cpp @@ -64,7 +64,7 @@ DIVERT_DATA cddiv; //capture data //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -extern "C" Plugin* GetPlugin() +extern "C" STG::Plugin* GetPlugin() { static DIVERT_CAP plugin; return &plugin; @@ -83,7 +83,7 @@ DIVERT_CAP::DIVERT_CAP() nonstop(false), isRunning(false), traffCnt(NULL), - logger(PluginLogger::get("cap_divert")) + logger(STG::PluginLogger::get("cap_divert")) { } //----------------------------------------------------------------------------- @@ -159,7 +159,7 @@ dc->isRunning = true; char buffer[pcktSize + 14]; while (dc->nonstop) { - RAW_PACKET rp; + STG::RawPacket rp; dc->DivertCapRead(buffer, sizeof(buffer), NULL); if (buffer[12] != 0x8) @@ -167,7 +167,7 @@ while (dc->nonstop) memcpy(rp.rawPacket.pckt, &buffer[14], pcktSize); - dc->traffCnt->Process(rp); + dc->traffCnt->process(rp); } dc->isRunning = false; @@ -276,8 +276,8 @@ return 0; int DIVERT_CAP::ParseSettings() { int p; -PARAM_VALUE pv; -std::vector::const_iterator pvi; +STG::ParamValue pv; +std::vector::const_iterator pvi; pv.param = "Port"; pvi = std::find(settings.moduleParams.begin(), settings.moduleParams.end(), pv); diff --git a/stargazer/plugins/capture/divert_freebsd/divert_cap.h b/stargazer/plugins/capture/divert_freebsd/divert_cap.h index d8f4d6f8..290754fd 100644 --- a/stargazer/plugins/capture/divert_freebsd/divert_cap.h +++ b/stargazer/plugins/capture/divert_freebsd/divert_cap.h @@ -19,47 +19,43 @@ Author : Boris Mikhailenko */ -/* -$Revision: 1.6 $ -$Date: 2009/06/23 11:32:27 $ -*/ - -#ifndef DIVERT_CAP_H -#define DIVERT_CAP_H - -#include - -#include +#pragma once #include "stg/plugin.h" #include "stg/module_settings.h" #include "stg/logger.h" -class USERS; -class TARIFFS; -class ADMINS; -class TRAFFCOUNTER; -class SETTINGS; +#include + +#include + +namespace STG +{ +struct Users; +struct Tariffs; +struct Admins; +struct TraffCounter; +struct Settings; +} //----------------------------------------------------------------------------- -class DIVERT_CAP : public PLUGIN { +class DIVERT_CAP : public STG::Plugin { public: DIVERT_CAP(); - virtual ~DIVERT_CAP() {} - void SetTraffcounter(TRAFFCOUNTER * tc) { traffCnt = tc; } + void SetTraffcounter(STG::TraffCounter * tc) override { traffCnt = tc; } - int Start(); - int Stop(); - int Reload(const MODULE_SETTINGS & /*ms*/) { return 0; } - bool IsRunning() { return isRunning; } + int Start() override; + int Stop() override; + int Reload(const STG::ModuleSettings & /*ms*/) override { return 0; } + bool IsRunning() override { return isRunning; } - void SetSettings(const MODULE_SETTINGS & s) { settings = s; } - int ParseSettings(); - const std::string & GetStrError() const { return errorStr; } - std::string GetVersion() const; - uint16_t GetStartPosition() const { return 40; } - uint16_t GetStopPosition() const { return 40; } + void SetSettings(const STG::ModuleSettings & s) override { settings = s; } + int ParseSettings() override; + const std::string & GetStrError() const override { return errorStr; } + std::string GetVersion() const override; + uint16_t GetStartPosition() const override { return 40; } + uint16_t GetStopPosition() const override { return 40; } private: DIVERT_CAP(const DIVERT_CAP & rvalue); @@ -73,7 +69,7 @@ private: int DivertCapRead(char * buffer, int blen, char ** iface, int n); int DivertCapClose(); - MODULE_SETTINGS settings; + STG::ModuleSettings settings; int port; bool disableForwarding; @@ -85,10 +81,7 @@ private: bool nonstop; bool isRunning; - TRAFFCOUNTER * traffCnt; + STG::TraffCounter * traffCnt; - PLUGIN_LOGGER logger; + STG::PluginLogger logger; }; -//----------------------------------------------------------------------------- - -#endif -- 2.44.2