From da870794e77f0fd30e032935d98962fe737a7679 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Thu, 1 Apr 2010 22:45:44 +0000 Subject: [PATCH] make this compile again, and only warn if sipctrl module is to be loaded. git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1770 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmPlugIn.cpp | 7 +++++++ core/SipCtrlInterface.h | 12 +++++++----- core/sems.h | 4 ---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/core/AmPlugIn.cpp b/core/AmPlugIn.cpp index 3f118276..1710ab61 100644 --- a/core/AmPlugIn.cpp +++ b/core/AmPlugIn.cpp @@ -184,6 +184,13 @@ int AmPlugIn::load(const string& directory, const string& plugins) for (vector::iterator it = plugins_list.begin(); it != plugins_list.end(); it++) { string plugin_file = *it; + if (plugin_file == "sipctrl") { + WARN("sipctrl is integrated into the core, loading sipctrl " + "module is not necessary any more\n"); + WARN("please update your configuration to not load sipctrl module\n"); + continue; + } + if(plugin_file.find(".so",plugin_file.length()-3) == string::npos ) plugin_file+=".so"; diff --git a/core/SipCtrlInterface.h b/core/SipCtrlInterface.h index 23f352ab..99d53710 100644 --- a/core/SipCtrlInterface.h +++ b/core/SipCtrlInterface.h @@ -46,11 +46,6 @@ struct sip_header; class SipCtrlInterface: public sip_ua { - static string outbound_host; - static unsigned int outbound_port; - static bool log_parsed_messages; - static int log_raw_messages; - static bool accept_fr_without_totag; //string bind_addr; //unsigned short bind_port; @@ -60,6 +55,13 @@ class SipCtrlInterface: static int cancel(const AmSipRequest& req); public: + + static string outbound_host; + static unsigned int outbound_port; + static bool log_parsed_messages; + static int log_raw_messages; + static bool accept_fr_without_totag; + SipCtrlInterface(); ~SipCtrlInterface(){} diff --git a/core/sems.h b/core/sems.h index cec2c077..7037ce11 100644 --- a/core/sems.h +++ b/core/sems.h @@ -28,10 +28,6 @@ #ifndef _ans_machine_h_ #define _ans_machine_h_ -#define SEMS_VERSION "1.3.0-dev" -#define OS "Darwin" -#define ARCH "i386" - #define CONFIG_FILE "/usr/local/etc/sems/sems.conf" #define MOD_CFG_PATH "/usr/local/etc/sems/etc/" #define ANNOUNCE_PATH "/usr/local/lib/sems/audio"