From 90e389f6ec12e60a62c362296ffcf314feb5b03d Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 8 Apr 2011 15:44:11 +0300 Subject: [PATCH] Remove 'stg' prefixes from headers and add it to libraries --- include/stg/auth.h | 2 +- include/stg/{stg_const.h => const.h} | 0 include/stg/{stg_message.h => message.h} | 0 include/stg/raw_ip_packet.h | 2 +- include/stg/store.h | 2 +- include/stg/tariff_conf.h | 2 +- include/stg/user.h | 2 +- include/stg/user_conf.h | 2 +- include/stg/user_property.h | 4 ++-- include/stg/user_traff.h | 2 +- projects/convertor/Makefile | 6 +++--- projects/convertor/build | 4 ++-- projects/convertor/main.cpp | 2 +- projects/make_tarball/mt.sh | 4 ++-- projects/rlm_stg/Makefile | 4 ++-- projects/rscriptd/Makefile | 10 +++++----- projects/rscriptd/build | 6 +++--- projects/rscriptd/listener.cpp | 2 +- projects/rscriptd/listener.h | 2 +- projects/rscriptd/main.cpp | 4 ++-- projects/sgauth/Makefile | 8 ++++---- projects/sgauth/build | 2 +- projects/sgauth/main.cpp | 2 +- projects/sgauth/web.h | 2 +- projects/sgconf/Makefile | 8 ++++---- projects/sgconf/request.h | 2 +- projects/sgconf_xml/Makefile | 8 ++++---- projects/sgconf_xml/request.h | 2 +- projects/stargazer/Makefile | 8 ++++---- projects/stargazer/actions.inl.h | 2 +- projects/stargazer/admin_impl.h | 2 +- projects/stargazer/admins_impl.h | 2 +- projects/stargazer/build | 6 +++--- projects/stargazer/eventloop.cpp | 2 +- projects/stargazer/main.cpp | 2 +- projects/stargazer/plugins/authorization/ao/Makefile | 2 +- .../plugins/authorization/inetaccess/Makefile | 2 +- .../plugins/authorization/inetaccess/inetaccess.cpp | 2 +- .../plugins/authorization/inetaccess/inetaccess.h | 2 +- projects/stargazer/plugins/capture/cap_debug/Makefile | 2 +- projects/stargazer/plugins/capture/cap_nf/Makefile | 2 +- .../stargazer/plugins/capture/divert_freebsd/Makefile | 2 +- .../stargazer/plugins/capture/ether_freebsd/Makefile | 2 +- .../stargazer/plugins/capture/ether_linux/Makefile | 2 +- projects/stargazer/plugins/capture/ipq_linux/Makefile | 2 +- .../stargazer/plugins/configuration/rpcconfig/Makefile | 2 +- .../configuration/rpcconfig/messages_methods.cpp | 2 +- .../plugins/configuration/sgconfig-ng/Makefile | 2 +- .../stargazer/plugins/configuration/sgconfig/Makefile | 2 +- .../plugins/configuration/sgconfig/configproto.h | 2 +- .../stargazer/plugins/configuration/sgconfig/parser.h | 4 ++-- .../stargazer/plugins/configuration/sgconfig2/Makefile | 2 +- .../plugins/configuration/sgconfig2/configproto.h | 2 +- .../stargazer/plugins/configuration/sgconfig2/parser.h | 4 ++-- projects/stargazer/plugins/other/ping/Makefile | 2 +- projects/stargazer/plugins/other/ping/ping.cpp | 2 +- projects/stargazer/plugins/other/radius/Makefile | 2 +- projects/stargazer/plugins/other/rscript/Makefile | 2 +- projects/stargazer/plugins/other/rscript/rscript.cpp | 2 +- projects/stargazer/plugins/other/userstat/Makefile | 4 ++-- projects/stargazer/plugins/store/files/Makefile | 2 +- projects/stargazer/plugins/store/files/file_store.cpp | 6 +++--- projects/stargazer/plugins/store/firebird/Makefile | 2 +- .../stargazer/plugins/store/firebird/firebird_store.h | 2 +- .../plugins/store/firebird/firebird_store_users.cpp | 2 +- projects/stargazer/plugins/store/mysql/Makefile | 2 +- projects/stargazer/plugins/store/postgresql/Makefile | 2 +- .../store/postgresql/postgresql_store_admins.cpp | 2 +- .../store/postgresql/postgresql_store_corporations.cpp | 2 +- .../store/postgresql/postgresql_store_messages.cpp | 4 ++-- .../store/postgresql/postgresql_store_services.cpp | 2 +- .../store/postgresql/postgresql_store_tariffs.cpp | 2 +- .../store/postgresql/postgresql_store_users.cpp | 4 ++-- projects/stargazer/settings_impl.cpp | 2 +- projects/stargazer/settings_impl.h | 2 +- projects/stargazer/tariffs_impl.cpp | 4 ++-- projects/stargazer/traffcounter_impl.cpp | 2 +- projects/stargazer/traffcounter_impl.h | 2 +- projects/stargazer/user_impl.h | 4 ++-- projects/stargazer/users_impl.h | 2 +- stglibs/common.lib/Makefile | 4 ++-- stglibs/common.lib/common.h | 2 +- stglibs/common.lib/{stg_strptime.cpp => strptime.cpp} | 0 stglibs/conffiles.lib/Makefile | 2 +- stglibs/crypto.lib/Makefile | 2 +- stglibs/crypto.lib/blowfish.cpp | 2 +- stglibs/{ia_auth_c.lib => ia.lib}/Makefile | 10 +++++----- stglibs/{ia_auth_c.lib/ia_auth_c.bpf => ia.lib/ia.bpf} | 0 stglibs/{ia_auth_c.lib/ia_auth_c.bpr => ia.lib/ia.bpr} | 0 stglibs/{ia_auth_c.lib/ia_auth_c.cpp => ia.lib/ia.cpp} | 2 +- stglibs/{ia_auth_c.lib/ia_auth_c.h => ia.lib/ia.h} | 0 stglibs/{stg_locker.lib => locker.lib}/Makefile | 8 ++++---- .../stg_locker.cpp => locker.lib/locker.cpp} | 2 +- .../stg_locker.h => locker.lib/locker.h} | 0 stglibs/{stg_logger.lib => logger.lib}/Makefile | 6 +++--- .../stg_logger.cpp => logger.lib/logger.cpp} | 2 +- .../stg_logger.h => logger.lib/logger.h} | 0 stglibs/pinger.lib/Makefile | 4 ++-- stglibs/pinger.lib/pinger.cpp | 2 +- .../Makefile | 6 +++--- .../scriptexecuter.cpp} | 2 +- .../scriptexecuter.h} | 0 stglibs/srvconf.lib/Makefile | 6 +++--- stglibs/srvconf.lib/parser.cpp | 2 +- stglibs/srvconf.lib/servconf.h | 2 +- tests/Makefile | 6 +++--- tests/raw_ip_packet_old.h | 2 +- 107 files changed, 151 insertions(+), 151 deletions(-) rename include/stg/{stg_const.h => const.h} (100%) rename include/stg/{stg_message.h => message.h} (100%) rename stglibs/common.lib/{stg_strptime.cpp => strptime.cpp} (100%) rename stglibs/{ia_auth_c.lib => ia.lib}/Makefile (73%) rename stglibs/{ia_auth_c.lib/ia_auth_c.bpf => ia.lib/ia.bpf} (100%) rename stglibs/{ia_auth_c.lib/ia_auth_c.bpr => ia.lib/ia.bpr} (100%) rename stglibs/{ia_auth_c.lib/ia_auth_c.cpp => ia.lib/ia.cpp} (99%) rename stglibs/{ia_auth_c.lib/ia_auth_c.h => ia.lib/ia.h} (100%) rename stglibs/{stg_locker.lib => locker.lib}/Makefile (76%) rename stglibs/{stg_locker.lib/stg_locker.cpp => locker.lib/locker.cpp} (97%) rename stglibs/{stg_locker.lib/stg_locker.h => locker.lib/locker.h} (100%) rename stglibs/{stg_logger.lib => logger.lib}/Makefile (80%) rename stglibs/{stg_logger.lib/stg_logger.cpp => logger.lib/logger.cpp} (98%) rename stglibs/{stg_logger.lib/stg_logger.h => logger.lib/logger.h} (100%) rename stglibs/{script_executer.lib => scriptexecuter.lib}/Makefile (76%) rename stglibs/{script_executer.lib/script_executer.cpp => scriptexecuter.lib/scriptexecuter.cpp} (98%) rename stglibs/{script_executer.lib/script_executer.h => scriptexecuter.lib/scriptexecuter.h} (100%) diff --git a/include/stg/auth.h b/include/stg/auth.h index 8cdc3f2d..f597f6d1 100644 --- a/include/stg/auth.h +++ b/include/stg/auth.h @@ -27,7 +27,7 @@ #define AUTH_H #include "plugin.h" -#include "stg_message.h" +#include "message.h" #include "noncopyable.h" class AUTH : public PLUGIN { diff --git a/include/stg/stg_const.h b/include/stg/const.h similarity index 100% rename from include/stg/stg_const.h rename to include/stg/const.h diff --git a/include/stg/stg_message.h b/include/stg/message.h similarity index 100% rename from include/stg/stg_message.h rename to include/stg/message.h diff --git a/include/stg/raw_ip_packet.h b/include/stg/raw_ip_packet.h index a1bdda71..bf8bc577 100644 --- a/include/stg/raw_ip_packet.h +++ b/include/stg/raw_ip_packet.h @@ -10,7 +10,7 @@ #include -#include "stg_const.h" +#include "const.h" #include "common.h" #define IPv4 (2) diff --git a/include/stg/store.h b/include/stg/store.h index f33a0653..0eaf6c3e 100644 --- a/include/stg/store.h +++ b/include/stg/store.h @@ -38,7 +38,7 @@ #include "admin_conf.h" #include "tariff_conf.h" #include "module_settings.h" -#include "stg_message.h" +#include "message.h" //----------------------------------------------------------------------------- class STORE { diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h index 30f19815..31df4ec9 100644 --- a/include/stg/tariff_conf.h +++ b/include/stg/tariff_conf.h @@ -31,7 +31,7 @@ #include #include "resetable.h" -#include "stg_const.h" +#include "const.h" //----------------------------------------------------------------------------- enum diff --git a/include/stg/user.h b/include/stg/user.h index adf140de..51e8a76d 100644 --- a/include/stg/user.h +++ b/include/stg/user.h @@ -26,7 +26,7 @@ #include "os_int.h" #include "notifer.h" -#include "stg_message.h" +#include "message.h" #include "tariff.h" #include "user_traff.h" diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h index 9a6efb23..70cb4fa7 100644 --- a/include/stg/user_conf.h +++ b/include/stg/user_conf.h @@ -9,7 +9,7 @@ #include #include -#include "stg_const.h" +#include "const.h" #include "user_ips.h" #include "resetable.h" #include "os_int.h" diff --git a/include/stg/user_property.h b/include/stg/user_property.h index 78e5675a..8b934167 100644 --- a/include/stg/user_property.h +++ b/include/stg/user_property.h @@ -18,8 +18,8 @@ $Author: faust $ #include "store.h" #include "admin.h" #include "notifer.h" -#include "stg_logger.h" -#include "stg_locker.h" +#include "logger.h" +#include "locker.h" #include "script_executer.h" #include "noncopyable.h" diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h index fdefee0f..fa4cc7fd 100644 --- a/include/stg/user_traff.h +++ b/include/stg/user_traff.h @@ -30,7 +30,7 @@ #include #include -#include "stg_const.h" +#include "const.h" #include "os_int.h" enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD}; diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile index a143687c..569917d2 100644 --- a/projects/convertor/Makefile +++ b/projects/convertor/Makefile @@ -9,10 +9,10 @@ PROG = convertor SRCS = ./main.cpp \ ./settings_impl.cpp -STGLIBS = -lstg_logger \ - -lstg_common \ +STGLIBS = -lstglogger \ + -lstgcommon \ -ldotconfpp \ - -lstg_crypto + -lstgcrypto LIBS += $(LIB_THREAD) diff --git a/projects/convertor/build b/projects/convertor/build index 0ffb2b8b..07fb1e2f 100755 --- a/projects/convertor/build +++ b/projects/convertor/build @@ -52,8 +52,8 @@ echo "########################################################################## echo " Building convertor for $sys $release" echo "#############################################################################" -STG_LIBS="stg_logger.lib - stg_locker.lib +STG_LIBS="logger.lib + locker.lib crypto.lib common.lib conffiles.lib diff --git a/projects/convertor/main.cpp b/projects/convertor/main.cpp index f6491c7b..e0679d07 100644 --- a/projects/convertor/main.cpp +++ b/projects/convertor/main.cpp @@ -43,7 +43,7 @@ #include "stg/admin_conf.h" #include "stg/tariff_conf.h" #include "stg/settings.h" -#include "stg/stg_message.h" +#include "stg/message.h" #include "settings_impl.h" diff --git a/projects/make_tarball/mt.sh b/projects/make_tarball/mt.sh index 0ad2e6b1..bbfa45a1 100755 --- a/projects/make_tarball/mt.sh +++ b/projects/make_tarball/mt.sh @@ -19,8 +19,8 @@ arc_name=$src_dir.tar.gz ./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/common_settings.lib $src_dir ./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/conffiles.lib $src_dir ./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/crypto.lib $src_dir -./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/stg_logger.lib $src_dir -./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/stg_locker.lib $src_dir +./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/logger.lib $src_dir +./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/locker.lib $src_dir ./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/hostallow.lib $src_dir ./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/pinger.lib $src_dir ./get_from_cvs $cvs_user $cvs_pass $cvs_host /cvsroot/stglibs stglibs/dotconfpp.lib $src_dir diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile index 20530c52..da1a5768 100644 --- a/projects/rlm_stg/Makefile +++ b/projects/rlm_stg/Makefile @@ -11,8 +11,8 @@ PROG = $(LIB_NAME).so SRCS = ./rlm_stg.cpp \ ./stg_client.cpp -STGLIBS = -lstg_common \ - -lstg_crypto +STGLIBS = -lstgcommon \ + -lstgcrypto LIBS += $(LIB_THREAD) diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile index ff08de0d..2b6cbc1c 100644 --- a/projects/rscriptd/Makefile +++ b/projects/rscriptd/Makefile @@ -10,11 +10,11 @@ SRCS = ./main.cpp \ ./listener.cpp \ ./pidfile.cpp -STGLIBS = -lstg_logger \ - -lstg_common \ - -lstg_crypto \ - -lscript_executer \ - -lconffiles +STGLIBS = -lstglogger \ + -lstgcommon \ + -lstgcrypto \ + -lstgscriptexecuter \ + -lstgconffiles LIBS += $(LIB_THREAD) diff --git a/projects/rscriptd/build b/projects/rscriptd/build index 173e3afc..a91d70c8 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -65,11 +65,11 @@ echo "########################################################################## echo " Building rscriptd for $sys $release" echo "#############################################################################" -STG_LIBS="stg_logger.lib - stg_locker.lib +STG_LIBS="logger.lib + locker.lib crypto.lib common.lib - script_executer.lib + scriptexecuter.lib conffiles.lib" if [ "$OS" = "linux" ] diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp index e6bd4d77..47adc93b 100644 --- a/projects/rscriptd/listener.cpp +++ b/projects/rscriptd/listener.cpp @@ -34,7 +34,7 @@ #include #include "stg/script_executer.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/common.h" #include "listener.h" diff --git a/projects/rscriptd/listener.h b/projects/rscriptd/listener.h index 16c49219..1c88149a 100644 --- a/projects/rscriptd/listener.h +++ b/projects/rscriptd/listener.h @@ -29,7 +29,7 @@ #include "stg/os_int.h" #include "stg/blowfish.h" #include "stg/rs_packets.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" struct UserData { diff --git a/projects/rscriptd/main.cpp b/projects/rscriptd/main.cpp index 2f5f0baa..714da320 100644 --- a/projects/rscriptd/main.cpp +++ b/projects/rscriptd/main.cpp @@ -39,8 +39,8 @@ #include #include "stg/common.h" -#include "stg/stg_logger.h" -#include "stg/script_executer.h" +#include "stg/logger.h" +#include "stg/scriptexecuter.h" #include "stg/conffiles.h" #include "stg/version.h" #include "listener.h" diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile index e586695b..338e3500 100644 --- a/projects/sgauth/Makefile +++ b/projects/sgauth/Makefile @@ -10,10 +10,10 @@ SRCS = ./main.cpp \ ./settings_impl.cpp \ ./web.cpp -STGLIBS = -lconffiles \ - -lstg_crypto \ - -lstg_common \ - -lia_auth_c +STGLIBS = -lstgconffiles \ + -lstgcrypto \ + -lstgcommon \ + -lstgia LIBS += $(LIB_THREAD) diff --git a/projects/sgauth/build b/projects/sgauth/build index 29109a37..7155188b 100755 --- a/projects/sgauth/build +++ b/projects/sgauth/build @@ -68,7 +68,7 @@ echo "########################################################################## STG_LIBS="crypto.lib common.lib conffiles.lib - ia_auth_c.lib" + ia.lib" if [ "$OS" = "linux" ] then diff --git a/projects/sgauth/main.cpp b/projects/sgauth/main.cpp index c78f18ed..96c58203 100644 --- a/projects/sgauth/main.cpp +++ b/projects/sgauth/main.cpp @@ -35,7 +35,7 @@ #include #include -#include "stg/ia_auth_c.h" +#include "stg/ia.h" #include "stg/common.h" #include "web.h" #include "settings_impl.h" diff --git a/projects/sgauth/web.h b/projects/sgauth/web.h index a4dfcb48..aa2227ee 100644 --- a/projects/sgauth/web.h +++ b/projects/sgauth/web.h @@ -39,7 +39,7 @@ #include #include -#include "stg/stg_const.h" +#include "stg/const.h" #include "stg/ia_packets.h" using namespace std; diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile index 4a051412..99135556 100644 --- a/projects/sgconf/Makefile +++ b/projects/sgconf/Makefile @@ -9,10 +9,10 @@ PROG = sgconf SRCS = ./main.cpp \ ./common_sg.cpp -STGLIBS = -lconffiles \ - -lstg_common \ - -lstg_crypto \ - -lsrvconf +STGLIBS = -lstgconffiles \ + -lstgcommon \ + -lstgcrypto \ + -lstgsrvconf LIBS += -lexpat \ $(LIB_THREAD) diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h index c8098661..daddec1d 100644 --- a/projects/sgconf/request.h +++ b/projects/sgconf/request.h @@ -34,7 +34,7 @@ #include #include "stg/resetable.h" -#include "stg/stg_const.h" +#include "stg/const.h" #include "stg/os_int.h" #define TARIFF_NOW (0) diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile index 33989ae2..752f05a5 100644 --- a/projects/sgconf_xml/Makefile +++ b/projects/sgconf_xml/Makefile @@ -9,10 +9,10 @@ PROG = sgconf_xml SRCS = ./main.cpp \ ./parser.cpp -LIBS = -lconffiles \ - -lstg_crypto \ - -lstg_common \ - -lsrvconf +LIBS = -lstgconffiles \ + -lstgcrypto \ + -lstgcommon \ + -lstgsrvconf LIBS += -lexpat \ $(LIB_THREAD) diff --git a/projects/sgconf_xml/request.h b/projects/sgconf_xml/request.h index bbd46325..004f89b0 100644 --- a/projects/sgconf_xml/request.h +++ b/projects/sgconf_xml/request.h @@ -34,7 +34,7 @@ #include "stg/resetable.h" #include "stg/os_int.h" -#include "stg/stg_const.h" +#include "stg/const.h" #ifndef ENODATA #define ENODATA 61 diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index beac6fc6..56a1ebf9 100644 --- a/projects/stargazer/Makefile +++ b/projects/stargazer/Makefile @@ -22,10 +22,10 @@ SRCS = ./admin_impl.cpp \ ./user_property.cpp \ ./users_impl.cpp -STGLIBS = -lstg_logger \ - -lstg_locker \ - -lstg_common \ - -lscript_executer \ +STGLIBS = -lstglogger \ + -lstglocker \ + -lstgcommon \ + -lstgscriptexecuter \ -ldotconfpp LIBS += -lexpat diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h index 29dce606..d7874373 100644 --- a/projects/stargazer/actions.inl.h +++ b/projects/stargazer/actions.inl.h @@ -3,7 +3,7 @@ #include -#include "stg/stg_locker.h" +#include "stg/locker.h" // Polymorphick action invocation template diff --git a/projects/stargazer/admin_impl.h b/projects/stargazer/admin_impl.h index 69f38420..6d58336e 100644 --- a/projects/stargazer/admin_impl.h +++ b/projects/stargazer/admin_impl.h @@ -36,7 +36,7 @@ #include "stg/admin.h" #include "stg/os_int.h" #include "stg/admin_conf.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" class ADMIN_IMPL : public ADMIN { public: diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h index 9ca571e3..170f3a4f 100644 --- a/projects/stargazer/admins_impl.h +++ b/projects/stargazer/admins_impl.h @@ -38,7 +38,7 @@ #include "stg/admins.h" #include "stg/admin.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/store.h" #include "stg/noncopyable.h" #include "admin_impl.h" diff --git a/projects/stargazer/build b/projects/stargazer/build index 36f2f733..1779160b 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -112,11 +112,11 @@ echo "########################################################################## echo " Building STG 2.4 for $sys $release" echo "#############################################################################" -STG_LIBS="stg_logger.lib - stg_locker.lib +STG_LIBS="logger.lib + locker.lib crypto.lib common.lib - script_executer.lib + scriptexecuter.lib conffiles.lib pinger.lib dotconfpp.lib" diff --git a/projects/stargazer/eventloop.cpp b/projects/stargazer/eventloop.cpp index 96c1ca4f..1d1a209d 100644 --- a/projects/stargazer/eventloop.cpp +++ b/projects/stargazer/eventloop.cpp @@ -1,7 +1,7 @@ #include #include -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/common.h" #include "eventloop.h" diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 3ba9ccf3..46ea717d 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -43,7 +43,7 @@ #include "stg/user.h" #include "stg/common.h" #include "stg/plugin.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "stg/script_executer.h" #include "stg/conffiles.h" #include "stg/version.h" diff --git a/projects/stargazer/plugins/authorization/ao/Makefile b/projects/stargazer/plugins/authorization/ao/Makefile index a47cea23..a8651d64 100644 --- a/projects/stargazer/plugins/authorization/ao/Makefile +++ b/projects/stargazer/plugins/authorization/ao/Makefile @@ -8,7 +8,7 @@ PROG = mod_auth_ao.so SRCS = ./ao.cpp -STGLIBS = -lstg_common +STGLIBS = -lstgcommon include ../../Makefile.in diff --git a/projects/stargazer/plugins/authorization/inetaccess/Makefile b/projects/stargazer/plugins/authorization/inetaccess/Makefile index 62997715..15fd5287 100644 --- a/projects/stargazer/plugins/authorization/inetaccess/Makefile +++ b/projects/stargazer/plugins/authorization/inetaccess/Makefile @@ -10,7 +10,7 @@ PROG = mod_auth_ia.so SRCS = ./inetaccess.cpp -STGLIBS = -lstg_common -lstg_crypto +STGLIBS = -lstgcommon -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp index c58e8db1..8e44ed5e 100644 --- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp +++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp @@ -40,7 +40,7 @@ #include #include "stg/common.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/tariff.h" #include "stg/user_property.h" #include "stg/settings.h" diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h index 707ed968..e16c0257 100644 --- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h +++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.h @@ -47,7 +47,7 @@ #include "stg/users.h" #include "stg/ia_packets.h" #include "stg/blowfish.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "stg/utime.h" extern "C" PLUGIN * GetPlugin(); diff --git a/projects/stargazer/plugins/capture/cap_debug/Makefile b/projects/stargazer/plugins/capture/cap_debug/Makefile index ade37382..916ae175 100644 --- a/projects/stargazer/plugins/capture/cap_debug/Makefile +++ b/projects/stargazer/plugins/capture/cap_debug/Makefile @@ -16,7 +16,7 @@ SRCS = ./debug_cap.cpp \ ./tcp.c \ ./udp.c -STGLIBS = -lstg_common +STGLIBS = -lstgcommon LIBS += $(LIB_THREAD) diff --git a/projects/stargazer/plugins/capture/cap_nf/Makefile b/projects/stargazer/plugins/capture/cap_nf/Makefile index 3eddb29e..b0f7713d 100644 --- a/projects/stargazer/plugins/capture/cap_nf/Makefile +++ b/projects/stargazer/plugins/capture/cap_nf/Makefile @@ -9,7 +9,7 @@ PROG = mod_cap_nf.so SRCS = ./cap_nf.cpp LIBS += $(LIB_THREAD) -STGLIBS = -lstg_common +STGLIBS = -lstgcommon include ../../Makefile.in diff --git a/projects/stargazer/plugins/capture/divert_freebsd/Makefile b/projects/stargazer/plugins/capture/divert_freebsd/Makefile index cd7824a7..2fbc97d6 100644 --- a/projects/stargazer/plugins/capture/divert_freebsd/Makefile +++ b/projects/stargazer/plugins/capture/divert_freebsd/Makefile @@ -8,7 +8,7 @@ PROG = mod_cap_divert.so SRCS = ./divert_cap.cpp -STGLIBS = -lstg_common +STGLIBS = -lstgcommon LIBS += $(LIB_THREAD) diff --git a/projects/stargazer/plugins/capture/ether_freebsd/Makefile b/projects/stargazer/plugins/capture/ether_freebsd/Makefile index 4ab0480c..f4b86e21 100644 --- a/projects/stargazer/plugins/capture/ether_freebsd/Makefile +++ b/projects/stargazer/plugins/capture/ether_freebsd/Makefile @@ -8,7 +8,7 @@ PROG = mod_cap_bpf.so SRCS = ./ether_cap.cpp -STGLIBS = -lstg_common +STGLIBS = -lstgcommon LIBS += $(LIB_THREAD) diff --git a/projects/stargazer/plugins/capture/ether_linux/Makefile b/projects/stargazer/plugins/capture/ether_linux/Makefile index f10886c6..4cd78a3c 100644 --- a/projects/stargazer/plugins/capture/ether_linux/Makefile +++ b/projects/stargazer/plugins/capture/ether_linux/Makefile @@ -9,7 +9,7 @@ PROG = mod_cap_ether.so SRCS = ./ether_cap.cpp LIBS += $(LIB_THREAD) -STGLIBS = -lstg_common +STGLIBS = -lstgcommon include ../../Makefile.in diff --git a/projects/stargazer/plugins/capture/ipq_linux/Makefile b/projects/stargazer/plugins/capture/ipq_linux/Makefile index 7cf92996..988cd948 100644 --- a/projects/stargazer/plugins/capture/ipq_linux/Makefile +++ b/projects/stargazer/plugins/capture/ipq_linux/Makefile @@ -10,7 +10,7 @@ SRCS = ./ipq_cap.cpp \ ./libipq.c LIBS += $(LIB_THREAD) -STGLIBS = -lstg_common +STGLIBS = -lstgcommon include ../../Makefile.in diff --git a/projects/stargazer/plugins/configuration/rpcconfig/Makefile b/projects/stargazer/plugins/configuration/rpcconfig/Makefile index c2fb03d6..e0e09052 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/Makefile +++ b/projects/stargazer/plugins/configuration/rpcconfig/Makefile @@ -24,7 +24,7 @@ ifneq ($(OS),linux) LIBS += -liconv endif -STGLIBS = -lstg_common -lstg_logger +STGLIBS = -lstgcommon -lstglogger include ../../Makefile.in diff --git a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp index 695da284..14319aa1 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/messages_methods.cpp @@ -1,4 +1,4 @@ -#include "stg/stg_message.h" +#include "stg/message.h" #include "stg/common.h" #include "utils.h" #include "messages_methods.h" diff --git a/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile b/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile index 13bf5484..6d1a7a7b 100644 --- a/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile +++ b/projects/stargazer/plugins/configuration/sgconfig-ng/Makefile @@ -18,6 +18,6 @@ SRCS = ./stgconfig.cpp \ LIBS += -lexpat \ -lboost_thread-mt -STGLIBS = -lstg_common -lstg_logger -lcrypto +STGLIBS = -lstgcommon -lstglogger -lcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/configuration/sgconfig/Makefile b/projects/stargazer/plugins/configuration/sgconfig/Makefile index 8f065d16..f49ed018 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/Makefile +++ b/projects/stargazer/plugins/configuration/sgconfig/Makefile @@ -16,7 +16,7 @@ SRCS = ./stgconfig.cpp \ LIBS += -lexpat \ $(LIB_THREAD) -STGLIBS = -lstg_common -lstg_logger -lstg_crypto +STGLIBS = -lstgcommon -lstglogger -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h index 8c5aa3c5..efecd121 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h @@ -38,7 +38,7 @@ #include "stg/users.h" #include "stg/admins.h" #include "stg/tariffs.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "parser.h" #define STG_HEADER "SG04" diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index af85b710..da62dcb4 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -12,12 +12,12 @@ #include #include "stg/resetable.h" -#include "stg/stg_const.h" +#include "stg/const.h" #include "stg/store.h" #include "stg/admins.h" #include "stg/admin.h" #include "stg/users.h" -#include "stg/stg_message.h" +#include "stg/message.h" class TARIFFS; class SETTINGS; diff --git a/projects/stargazer/plugins/configuration/sgconfig2/Makefile b/projects/stargazer/plugins/configuration/sgconfig2/Makefile index ab02cdff..290a616b 100644 --- a/projects/stargazer/plugins/configuration/sgconfig2/Makefile +++ b/projects/stargazer/plugins/configuration/sgconfig2/Makefile @@ -16,7 +16,7 @@ SRCS = ./stgconfig.cpp \ LIBS += -lexpat \ $(LIB_THREAD) -STGLIBS = -lstg_common -lstg_logger +STGLIBS = -lstgcommon -lstglogger include ../../Makefile.in diff --git a/projects/stargazer/plugins/configuration/sgconfig2/configproto.h b/projects/stargazer/plugins/configuration/sgconfig2/configproto.h index 7bdfb21f..5aea5499 100644 --- a/projects/stargazer/plugins/configuration/sgconfig2/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig2/configproto.h @@ -39,7 +39,7 @@ #include "users.h" #include "admins.h" #include "tariffs.h" -#include "stg_logger.h" +#include "logger.h" using namespace std; diff --git a/projects/stargazer/plugins/configuration/sgconfig2/parser.h b/projects/stargazer/plugins/configuration/sgconfig2/parser.h index 9e8a8bd9..7deac334 100644 --- a/projects/stargazer/plugins/configuration/sgconfig2/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig2/parser.h @@ -13,11 +13,11 @@ using namespace std; #include "resetable.h" -#include "stg_const.h" +#include "const.h" #include "store.h" #include "admins.h" #include "users.h" -#include "stg_message.h" +#include "message.h" //----------------------------------------------------------------------------- class BASE_PARSER { diff --git a/projects/stargazer/plugins/other/ping/Makefile b/projects/stargazer/plugins/other/ping/Makefile index 3e4d36d5..212bd288 100644 --- a/projects/stargazer/plugins/other/ping/Makefile +++ b/projects/stargazer/plugins/other/ping/Makefile @@ -10,7 +10,7 @@ PROG = mod_ping.so SRCS = ./ping.cpp -STGLIBS = -lstg_pinger -lstg_common +STGLIBS = -lstgpinger -lstgcommon include ../../Makefile.in diff --git a/projects/stargazer/plugins/other/ping/ping.cpp b/projects/stargazer/plugins/other/ping/ping.cpp index 5f87a99f..0fb5d30b 100644 --- a/projects/stargazer/plugins/other/ping/ping.cpp +++ b/projects/stargazer/plugins/other/ping/ping.cpp @@ -5,7 +5,7 @@ #include #include "stg/user.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/user_property.h" #include "ping.h" diff --git a/projects/stargazer/plugins/other/radius/Makefile b/projects/stargazer/plugins/other/radius/Makefile index 68be7618..9735fb67 100644 --- a/projects/stargazer/plugins/other/radius/Makefile +++ b/projects/stargazer/plugins/other/radius/Makefile @@ -10,7 +10,7 @@ PROG = mod_radius.so SRCS = ./radius.cpp -STGLIBS = -lstg_common -lstg_crypto +STGLIBS = -lstgcommon -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/other/rscript/Makefile b/projects/stargazer/plugins/other/rscript/Makefile index cad853c7..343d1150 100644 --- a/projects/stargazer/plugins/other/rscript/Makefile +++ b/projects/stargazer/plugins/other/rscript/Makefile @@ -11,7 +11,7 @@ PROG = mod_remote_script.so SRCS = ./rscript.cpp \ ./nrmap_parser.cpp -STGLIBS = -lstg_common -lstg_crypto +STGLIBS = -lstgcommon -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index df172364..12c00a40 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -32,7 +32,7 @@ #include #include "stg/common.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/user_property.h" #include "rscript.h" #include "ur_functor.h" diff --git a/projects/stargazer/plugins/other/userstat/Makefile b/projects/stargazer/plugins/other/userstat/Makefile index 0046e2cf..ccc63727 100644 --- a/projects/stargazer/plugins/other/userstat/Makefile +++ b/projects/stargazer/plugins/other/userstat/Makefile @@ -23,8 +23,8 @@ PROG = mod_userstat.so SRCS = ./userstat.cpp \ ./datathread.cpp -LIBS += -lstg_common \ - -lstg_crypto +LIBS += -lstgcommon \ + -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/store/files/Makefile b/projects/stargazer/plugins/store/files/Makefile index 3357a501..8bf5777a 100644 --- a/projects/stargazer/plugins/store/files/Makefile +++ b/projects/stargazer/plugins/store/files/Makefile @@ -8,7 +8,7 @@ PROG = mod_store_files.so SRCS = ./file_store.cpp -STGLIBS = -lconffiles -lstg_common -lstg_locker -lstg_crypto +STGLIBS = -lstgconffiles -lstgcommon -lstglocker -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp index 555020b7..a0c3f915 100644 --- a/projects/stargazer/plugins/store/files/file_store.cpp +++ b/projects/stargazer/plugins/store/files/file_store.cpp @@ -47,10 +47,10 @@ #include "stg/user_ips.h" #include "stg/user_conf.h" #include "stg/user_stat.h" -#include "stg/stg_const.h" +#include "stg/const.h" #include "stg/blowfish.h" -#include "stg/stg_logger.h" -#include "stg/stg_locker.h" +#include "stg/logger.h" +#include "stg/locker.h" #include "file_store.h" #define DELETED_USERS_DIR "deleted_users" diff --git a/projects/stargazer/plugins/store/firebird/Makefile b/projects/stargazer/plugins/store/firebird/Makefile index 7304d4de..8b175fd9 100644 --- a/projects/stargazer/plugins/store/firebird/Makefile +++ b/projects/stargazer/plugins/store/firebird/Makefile @@ -17,7 +17,7 @@ SRCS = ./firebird_store.cpp \ ./firebird_store_users.cpp \ ./firebird_store_utils.cpp -STGLIBS = -libpp -lstg_common -lstg_locker -lstg_crypto +STGLIBS = -libpp -lstgcommon -lstglocker -lstgcrypto include ../../Makefile.in diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.h b/projects/stargazer/plugins/store/firebird/firebird_store.h index 73c2f19e..69815fe5 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store.h +++ b/projects/stargazer/plugins/store/firebird/firebird_store.h @@ -35,7 +35,7 @@ #include #include "stg/store.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/ibpp.h" struct ToLower { diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp index 5e959abd..a31ca3f8 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp +++ b/projects/stargazer/plugins/store/firebird/firebird_store_users.cpp @@ -26,7 +26,7 @@ * */ -#include "stg/stg_const.h" +#include "stg/const.h" #include "firebird_store.h" #include "stg/ibpp.h" diff --git a/projects/stargazer/plugins/store/mysql/Makefile b/projects/stargazer/plugins/store/mysql/Makefile index 0c01bd5a..81196222 100644 --- a/projects/stargazer/plugins/store/mysql/Makefile +++ b/projects/stargazer/plugins/store/mysql/Makefile @@ -8,7 +8,7 @@ PROG = mod_store_mysql.so SRCS = ./mysql_store.cpp -STGLIBS = -lstg_common -lstg_crypto +STGLIBS = -lstgcommon -lstgcrypto MYSQL_CFLAGS = $(shell mysql_config --cflags) MYSQL_LDFLAGS = $(shell mysql_config --libs_r) diff --git a/projects/stargazer/plugins/store/postgresql/Makefile b/projects/stargazer/plugins/store/postgresql/Makefile index 522058dd..fa6ebf0d 100644 --- a/projects/stargazer/plugins/store/postgresql/Makefile +++ b/projects/stargazer/plugins/store/postgresql/Makefile @@ -15,7 +15,7 @@ SRCS = ./postgresql_store.cpp \ ./postgresql_store_users.cpp \ ./postgresql_store_utils.cpp -STGLIBS = -lstg_common -lstg_crypto +STGLIBS = -lstgcommon -lstgcrypto PG_CFLAGS = $(shell pg_config --includedir) PG_LDFLAGS = $(shell pg_config --libdir) diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp index 9670ce83..5b27cb80 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp @@ -32,7 +32,7 @@ #include -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "stg/admin_conf.h" #include "stg/blowfish.h" #include "postgresql_store.h" diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp index 08848ea4..c358a4c5 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp @@ -33,7 +33,7 @@ #include #include "postgresql_store.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetCorpsList(vector * corpsList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp index e4c87cdd..4260c3b4 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp @@ -34,8 +34,8 @@ #include #include "postgresql_store.h" -#include "stg/stg_locker.h" -#include "stg/stg_message.h" +#include "stg/locker.h" +#include "stg/message.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::AddMessage(STG_MSG * msg, const string & login) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp index 82a999f7..b509c0f0 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp @@ -34,7 +34,7 @@ #include #include "postgresql_store.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetServicesList(vector * servicesList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp index fc35f788..bb647563 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp @@ -33,7 +33,7 @@ #include #include "postgresql_store.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetTariffsList(vector * tariffsList) const diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp index c1c48e25..11c757f2 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp @@ -33,8 +33,8 @@ #include -#include "stg/stg_const.h" -#include "stg/stg_locker.h" +#include "stg/const.h" +#include "stg/locker.h" #include "../../../stg_timer.h" #include "postgresql_store.h" diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp index 361993c9..e0eb4639 100644 --- a/projects/stargazer/settings_impl.cpp +++ b/projects/stargazer/settings_impl.cpp @@ -32,7 +32,7 @@ $Author: faust $ #include #include -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "stg/dotconfpp.h" #include "settings_impl.h" diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h index f7ded853..c7829b27 100644 --- a/projects/stargazer/settings_impl.h +++ b/projects/stargazer/settings_impl.h @@ -42,7 +42,7 @@ #include "stg/settings.h" #include "stg/common.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "stg/module_settings.h" //----------------------------------------------------------------------------- diff --git a/projects/stargazer/tariffs_impl.cpp b/projects/stargazer/tariffs_impl.cpp index c244cb69..61e3e12c 100644 --- a/projects/stargazer/tariffs_impl.cpp +++ b/projects/stargazer/tariffs_impl.cpp @@ -32,8 +32,8 @@ #include #include -#include "stg/stg_locker.h" -#include "stg/stg_logger.h" +#include "stg/locker.h" +#include "stg/logger.h" #include "stg/store.h" #include "stg/admin.h" #include "tariffs_impl.h" diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index 45ba883e..3f6eb0c0 100644 --- a/projects/stargazer/traffcounter_impl.cpp +++ b/projects/stargazer/traffcounter_impl.cpp @@ -39,7 +39,7 @@ #include // fopen and similar #include "stg/common.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #include "traffcounter_impl.h" #include "stg_timer.h" diff --git a/projects/stargazer/traffcounter_impl.h b/projects/stargazer/traffcounter_impl.h index 27e7c03c..c30f6be4 100644 --- a/projects/stargazer/traffcounter_impl.h +++ b/projects/stargazer/traffcounter_impl.h @@ -37,7 +37,7 @@ #include "stg/traffcounter.h" #include "stg/os_int.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "stg/raw_ip_packet.h" #include "stg/users.h" #include "stg/noncopyable.h" diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h index 935dcd0e..be28cc96 100644 --- a/projects/stargazer/user_impl.h +++ b/projects/stargazer/user_impl.h @@ -34,13 +34,13 @@ #include "stg/user.h" #include "stg/os_int.h" -#include "stg/stg_const.h" +#include "stg/const.h" #include "stg/user_stat.h" #include "stg/user_conf.h" #include "stg/user_ips.h" #include "stg/user_property.h" #include "stg/auth.h" -#include "stg/stg_message.h" +#include "stg/message.h" #include "stg/noncopyable.h" //----------------------------------------------------------------------------- diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h index 37edef7a..f0b8ae25 100644 --- a/projects/stargazer/users_impl.h +++ b/projects/stargazer/users_impl.h @@ -41,7 +41,7 @@ $Author: faust $ #include "stg/users.h" #include "stg/user.h" #include "stg/tariffs.h" -#include "stg/stg_logger.h" +#include "stg/logger.h" #include "stg/notifer.h" #include "stg/noncopyable.h" #include "actions.h" diff --git a/stglibs/common.lib/Makefile b/stglibs/common.lib/Makefile index eb0959b7..3e52ad8d 100644 --- a/stglibs/common.lib/Makefile +++ b/stglibs/common.lib/Makefile @@ -4,11 +4,11 @@ include ../../Makefile.conf -LIB_NAME = stg_common +LIB_NAME = stgcommon PROG = lib$(LIB_NAME) SRCS = common.cpp \ - stg_strptime.cpp + strptime.cpp INCS = common.h diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h index beba4508..3752822a 100644 --- a/stglibs/common.lib/common.h +++ b/stglibs/common.lib/common.h @@ -35,7 +35,7 @@ #include #include "stg/os_int.h" -#include "stg/stg_const.h" +#include "stg/const.h" #define STAT_TIME_3 (1) #define STAT_TIME_2 (2) diff --git a/stglibs/common.lib/stg_strptime.cpp b/stglibs/common.lib/strptime.cpp similarity index 100% rename from stglibs/common.lib/stg_strptime.cpp rename to stglibs/common.lib/strptime.cpp diff --git a/stglibs/conffiles.lib/Makefile b/stglibs/conffiles.lib/Makefile index 2cd4fb3d..28505b6f 100644 --- a/stglibs/conffiles.lib/Makefile +++ b/stglibs/conffiles.lib/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 1.4 2007/05/08 14:29:19 faust Exp $ ############################################################################### -LIB_NAME = conffiles +LIB_NAME = stgconffiles PROG = lib$(LIB_NAME) SRCS = conffiles.cpp diff --git a/stglibs/crypto.lib/Makefile b/stglibs/crypto.lib/Makefile index 6fe383ad..36ef7ee6 100644 --- a/stglibs/crypto.lib/Makefile +++ b/stglibs/crypto.lib/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 1.5 2009/10/09 07:15:48 nobunaga Exp $ ############################################################################### -LIB_NAME = stg_crypto +LIB_NAME = stgcrypto PROG = lib$(LIB_NAME) SRCS = ag_md5.cpp \ diff --git a/stglibs/crypto.lib/blowfish.cpp b/stglibs/crypto.lib/blowfish.cpp index e9d2bde4..ad482b79 100644 --- a/stglibs/crypto.lib/blowfish.cpp +++ b/stglibs/crypto.lib/blowfish.cpp @@ -8,7 +8,7 @@ #include #include "blowfish.h" -#include "stg/stg_const.h" +#include "stg/const.h" /*typedef struct _BCoptions { diff --git a/stglibs/ia_auth_c.lib/Makefile b/stglibs/ia.lib/Makefile similarity index 73% rename from stglibs/ia_auth_c.lib/Makefile rename to stglibs/ia.lib/Makefile index fb49f948..f6638bce 100644 --- a/stglibs/ia_auth_c.lib/Makefile +++ b/stglibs/ia.lib/Makefile @@ -2,15 +2,15 @@ # $Id: Makefile,v 1.11 2010/08/18 07:47:03 faust Exp $ ############################################################################### -LIB_NAME = ia_auth_c +LIB_NAME = stgia PROG = lib$(LIB_NAME) -SRCS = ia_auth_c.cpp +SRCS = ia.cpp -INCS = ia_auth_c.h +INCS = ia.h -STGLIBS = -lstg_common \ - -lstg_crypto +STGLIBS = -lstgcommon \ + -lstgcrypto LIBS = $(LIB_THREAD) include ../Makefile.in diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.bpf b/stglibs/ia.lib/ia.bpf similarity index 100% rename from stglibs/ia_auth_c.lib/ia_auth_c.bpf rename to stglibs/ia.lib/ia.bpf diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.bpr b/stglibs/ia.lib/ia.bpr similarity index 100% rename from stglibs/ia_auth_c.lib/ia_auth_c.bpr rename to stglibs/ia.lib/ia.bpr diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.cpp b/stglibs/ia.lib/ia.cpp similarity index 99% rename from stglibs/ia_auth_c.lib/ia_auth_c.cpp rename to stglibs/ia.lib/ia.cpp index 075a1913..f08c4614 100644 --- a/stglibs/ia_auth_c.lib/ia_auth_c.cpp +++ b/stglibs/ia.lib/ia.cpp @@ -50,7 +50,7 @@ #endif #include "stg/common.h" -#include "ia_auth_c.h" +#include "ia.h" #define IA_NONE (0) #define IA_CONNECT (1) diff --git a/stglibs/ia_auth_c.lib/ia_auth_c.h b/stglibs/ia.lib/ia.h similarity index 100% rename from stglibs/ia_auth_c.lib/ia_auth_c.h rename to stglibs/ia.lib/ia.h diff --git a/stglibs/stg_locker.lib/Makefile b/stglibs/locker.lib/Makefile similarity index 76% rename from stglibs/stg_locker.lib/Makefile rename to stglibs/locker.lib/Makefile index 5f99d5c7..c490ce69 100644 --- a/stglibs/stg_locker.lib/Makefile +++ b/stglibs/locker.lib/Makefile @@ -2,13 +2,13 @@ # $Id: Makefile,v 1.2 2008/12/04 17:11:55 faust Exp $ ############################################################################### -LIB_NAME = stg_locker +LIB_NAME = stglocker PROG = lib$(LIB_NAME) -SRCS = stg_locker.cpp +SRCS = locker.cpp -INCS = stg_locker.h +INCS = locker.h -LIBS=$(LIB_THREAD) +LIBS = $(LIB_THREAD) include ../Makefile.in diff --git a/stglibs/stg_locker.lib/stg_locker.cpp b/stglibs/locker.lib/locker.cpp similarity index 97% rename from stglibs/stg_locker.lib/stg_locker.cpp rename to stglibs/locker.lib/locker.cpp index 0f4007cc..0d97fcb4 100644 --- a/stglibs/stg_locker.lib/stg_locker.cpp +++ b/stglibs/locker.lib/locker.cpp @@ -28,7 +28,7 @@ #include -#include "stg_locker.h" +#include "locker.h" #ifdef DEBUG_LOCKER diff --git a/stglibs/stg_locker.lib/stg_locker.h b/stglibs/locker.lib/locker.h similarity index 100% rename from stglibs/stg_locker.lib/stg_locker.h rename to stglibs/locker.lib/locker.h diff --git a/stglibs/stg_logger.lib/Makefile b/stglibs/logger.lib/Makefile similarity index 80% rename from stglibs/stg_logger.lib/Makefile rename to stglibs/logger.lib/Makefile index e19b8928..95aca37e 100644 --- a/stglibs/stg_logger.lib/Makefile +++ b/stglibs/logger.lib/Makefile @@ -2,11 +2,11 @@ # $Id: Makefile,v 1.3 2007/05/08 14:29:21 faust Exp $ ############################################################################### -LIB_NAME = stg_logger +LIB_NAME = stglogger PROG = lib$(LIB_NAME) -SRCS = stg_logger.cpp +SRCS = logger.cpp -INCS = stg_logger.h +INCS = logger.h include ../Makefile.in diff --git a/stglibs/stg_logger.lib/stg_logger.cpp b/stglibs/logger.lib/logger.cpp similarity index 98% rename from stglibs/stg_logger.lib/stg_logger.cpp rename to stglibs/logger.lib/logger.cpp index cb96e506..18c9de7e 100644 --- a/stglibs/stg_logger.lib/stg_logger.cpp +++ b/stglibs/logger.lib/logger.cpp @@ -2,7 +2,7 @@ #include #include -#include "stg_logger.h" +#include "logger.h" #ifdef STG_TIME extern const volatile time_t stgTime; diff --git a/stglibs/stg_logger.lib/stg_logger.h b/stglibs/logger.lib/logger.h similarity index 100% rename from stglibs/stg_logger.lib/stg_logger.h rename to stglibs/logger.lib/logger.h diff --git a/stglibs/pinger.lib/Makefile b/stglibs/pinger.lib/Makefile index 5f368b64..91f6322d 100644 --- a/stglibs/pinger.lib/Makefile +++ b/stglibs/pinger.lib/Makefile @@ -2,7 +2,7 @@ # $Id: Makefile,v 1.5 2008/12/04 17:13:14 faust Exp $ ############################################################################### -LIB_NAME = stg_pinger +LIB_NAME = stgpinger PROG = lib$(LIB_NAME) SRCS = pinger.cpp @@ -15,4 +15,4 @@ include ../Makefile.in test: all g++ -c test.cpp - g++ -o test test.o ./libstg_pinger.a -lpthread + g++ -o test test.o ./libstgpinger.a -lpthread diff --git a/stglibs/pinger.lib/pinger.cpp b/stglibs/pinger.lib/pinger.cpp index 68137d7c..216b5977 100644 --- a/stglibs/pinger.lib/pinger.cpp +++ b/stglibs/pinger.lib/pinger.cpp @@ -16,7 +16,7 @@ #include "pinger.h" #include "stg/common.h" -#include "stg/stg_locker.h" +#include "stg/locker.h" #ifdef STG_TIME extern volatile time_t stgTime; diff --git a/stglibs/script_executer.lib/Makefile b/stglibs/scriptexecuter.lib/Makefile similarity index 76% rename from stglibs/script_executer.lib/Makefile rename to stglibs/scriptexecuter.lib/Makefile index 90691ab3..52f8259f 100644 --- a/stglibs/script_executer.lib/Makefile +++ b/stglibs/scriptexecuter.lib/Makefile @@ -2,11 +2,11 @@ # $Id: Makefile,v 1.6 2010/01/21 13:02:12 faust Exp $ ############################################################################### -LIB_NAME = script_executer +LIB_NAME = stgscriptexecuter PROG = lib$(LIB_NAME) -SRCS = script_executer.cpp +SRCS = scriptexecuter.cpp -INCS = script_executer.h +INCS = scriptexecuter.h include ../Makefile.in diff --git a/stglibs/script_executer.lib/script_executer.cpp b/stglibs/scriptexecuter.lib/scriptexecuter.cpp similarity index 98% rename from stglibs/script_executer.lib/script_executer.cpp rename to stglibs/scriptexecuter.lib/scriptexecuter.cpp index 00ff0949..6e21a28f 100644 --- a/stglibs/script_executer.lib/script_executer.cpp +++ b/stglibs/scriptexecuter.lib/scriptexecuter.cpp @@ -8,7 +8,7 @@ #include #include -#include "script_executer.h" +#include "scriptexecuter.h" using namespace std; diff --git a/stglibs/script_executer.lib/script_executer.h b/stglibs/scriptexecuter.lib/scriptexecuter.h similarity index 100% rename from stglibs/script_executer.lib/script_executer.h rename to stglibs/scriptexecuter.lib/scriptexecuter.h diff --git a/stglibs/srvconf.lib/Makefile b/stglibs/srvconf.lib/Makefile index 96ad48c2..f2f379d0 100644 --- a/stglibs/srvconf.lib/Makefile +++ b/stglibs/srvconf.lib/Makefile @@ -2,11 +2,11 @@ # $Id: Makefile,v 1.9 2010/08/18 07:47:03 faust Exp $ ############################################################################### -LIB_NAME = srvconf +LIB_NAME = stgsrvconf PROG = lib$(LIB_NAME) -STGLIBS = -lstg_common \ - -lstg_crypto +STGLIBS = -lstgcommon \ + -lstgcrypto LIBS = -lexpat SRCS = netunit.cpp \ diff --git a/stglibs/srvconf.lib/parser.cpp b/stglibs/srvconf.lib/parser.cpp index d7c7568f..0038f03d 100644 --- a/stglibs/srvconf.lib/parser.cpp +++ b/stglibs/srvconf.lib/parser.cpp @@ -34,7 +34,7 @@ #include #include "stg/common.h" -#include "stg/stg_const.h" +#include "stg/const.h" #include "servconf.h" using namespace std; diff --git a/stglibs/srvconf.lib/servconf.h b/stglibs/srvconf.lib/servconf.h index a2a74081..67c2f248 100644 --- a/stglibs/srvconf.lib/servconf.h +++ b/stglibs/srvconf.lib/servconf.h @@ -33,7 +33,7 @@ #include #include "stg/os_int.h" -#include "stg/stg_const.h" +#include "stg/const.h" #include "netunit.h" void Start(void *data, const char *el, const char **attr); diff --git a/tests/Makefile b/tests/Makefile index ecb054ab..2364db74 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/conffiles.lib -I. +CXXFLAGS+=-g3 -Wall -W -Wextra -DLINUX -I../include -I../projects/stargazer -I../stglibs/stgconffiles.lib -I. LIBS=-lpthread PROG=tests @@ -6,9 +6,9 @@ SOURCES=main.cpp \ test_raw_ip.cpp \ test_admin_conf.cpp \ test_tariff.cpp \ - test_conffiles.cpp \ + test_stgconffiles.cpp \ ../projects/stargazer/tariff.cpp \ - ../stglibs/conffiles.lib/conffiles.cpp + ../stglibs/stgconffiles.lib/stgconffiles.cpp all: $(PROG) diff --git a/tests/raw_ip_packet_old.h b/tests/raw_ip_packet_old.h index 60af8ace..1fbfe5f3 100644 --- a/tests/raw_ip_packet_old.h +++ b/tests/raw_ip_packet_old.h @@ -6,7 +6,7 @@ #include -#include "stg_const.h" +#include "const.h" #define IPv4 (2) -- 2.43.2