Commit e28a5d26 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

More work on headers and include to make it work with external plugins

parent 5d0ae5be
Pipeline #2120 passed with stages
in 43 minutes and 17 seconds
......@@ -26,12 +26,14 @@ set(HEADER_FILES
configmanager.hh
event.hh
eventlogs.hh
expressionparser.hh
flexisip-exception.hh
forkbasiccontext.hh
forkcallcontext.hh
forkcontext.hh
forkmessagecontext.hh
global.hh
logmanager.hh
module-auth.hh
module-registrar.hh
module-router.hh
module.hh
......
......@@ -23,11 +23,11 @@
#define FLEXISIP_INCLUDED
#endif
#include "common.hh"
#include "configmanager.hh"
#include "event.hh"
#include "transaction.hh"
#include "eventlogs.hh"
#include <flexisip/common.hh>
#include <flexisip/configmanager.hh>
#include <flexisip/event.hh>
#include <flexisip/transaction.hh>
#include <flexisip/eventlogs.hh>
#include <sofia-sip/sip.h>
#include <sofia-sip/sip_protos.h>
......
......@@ -19,7 +19,7 @@
#pragma once
#include "logmanager.hh"
#include <flexisip/logmanager.hh>
#include <cstdlib>
#include <cstdarg>
......
......@@ -61,9 +61,9 @@ typedef unsigned long oid;
extern oid company_id;
#include "expressionparser.hh"
#include "global.hh"
#include "utils/flexisip-exception.hh"
#include <flexisip/expressionparser.hh>
#include <flexisip/global.hh>
#include <flexisip/flexisip-exception.hh>
namespace flexisip {
......@@ -687,4 +687,4 @@ class GenericManager : protected ConfigValueListener {
NotificationEntry *mNotifier;
};
}
\ No newline at end of file
}
......@@ -18,7 +18,7 @@
#pragma once
#include "common.hh"
#include <flexisip/common.hh>
#include <sofia-sip/sip.h>
#include <sofia-sip/sip_protos.h>
......
......@@ -19,12 +19,12 @@
#pragma once
#ifndef NO_SOFIA
#include "sofia-sip/sip.h"
#include <sofia-sip/sip.h>
#endif
#include <string>
#include <memory>
#include "utils/flexisip-exception.hh"
#include <flexisip/flexisip-exception.hh>
void log_boolean_expression_evaluation(bool value);
void log_boolean_expression_parsing(bool value);
......
......@@ -21,6 +21,7 @@
#include "bctoolbox/exception.hh"
#include <string.h>
namespace flexisip {
/**
* @brief This exception inherits \ref BctoolboxException.
......@@ -42,3 +43,5 @@ public:
};
#define FLEXISIP_EXCEPTION FlexisipException() << " " << __FILE__ << ":" << __LINE__ << " "
}
\ No newline at end of file
......@@ -18,10 +18,10 @@
#pragma once
#include "agent.hh"
#include "event.hh"
#include "transaction.hh"
#include "forkcontext.hh"
#include <flexisip/agent.hh>
#include <flexisip/event.hh>
#include <flexisip/transaction.hh>
#include <flexisip/forkcontext.hh>
#include <list>
#include <map>
......
......@@ -18,10 +18,10 @@
#pragma once
#include "agent.hh"
#include "event.hh"
#include "transaction.hh"
#include "forkcontext.hh"
#include <flexisip/agent.hh>
#include <flexisip/event.hh>
#include <flexisip/transaction.hh>
#include <flexisip/forkcontext.hh>
#include <list>
......
......@@ -18,10 +18,10 @@
#pragma once
#include "agent.hh"
#include "event.hh"
#include "transaction.hh"
#include "registrardb.hh"
#include <flexisip/agent.hh>
#include <flexisip/event.hh>
#include <flexisip/transaction.hh>
#include <flexisip/registrardb.hh>
namespace flexisip {
......
......@@ -18,10 +18,10 @@
#pragma once
#include "agent.hh"
#include "event.hh"
#include "transaction.hh"
#include "forkcontext.hh"
#include <flexisip/agent.hh>
#include <flexisip/event.hh>
#include <flexisip/transaction.hh>
#include <flexisip/forkcontext.hh>
#include <list>
#include <map>
......
......@@ -18,9 +18,9 @@
#pragma once
#include "module.hh"
#include "agent.hh"
#include "registrardb.hh"
#include <flexisip/module.hh>
#include <flexisip/agent.hh>
#include <flexisip/registrardb.hh>
#include <sofia-sip/sip_status.h>
#include <sofia-sip/su_random.h>
......
......@@ -18,12 +18,12 @@
#pragma once
#include "module.hh"
#include "agent.hh"
#include "registrardb.hh"
#include "forkcallcontext.hh"
#include "forkmessagecontext.hh"
#include "forkbasiccontext.hh"
#include <flexisip/module.hh>
#include <flexisip/agent.hh>
#include <flexisip/registrardb.hh>
#include <flexisip/forkcallcontext.hh>
#include <flexisip/forkmessagecontext.hh>
#include <flexisip/forkbasiccontext.hh>
namespace flexisip {
......
......@@ -18,8 +18,8 @@
#pragma once
#include "configmanager.hh"
#include "event.hh"
#include <flexisip/configmanager.hh>
#include <flexisip/event.hh>
#include <sofia-sip/nta_tport.h>
#include <sofia-sip/tport.h>
......
......@@ -18,31 +18,20 @@
#pragma once
#include "flexisip_gitversion.h"
#include "module.hh"
// =============================================================================
// -----------------------------------------------------------------------------
// Private API.
// -----------------------------------------------------------------------------
#include <flexisip/module.hh>
#ifndef FLEXISIP_GIT_VERSION
#define FLEXISIP_GIT_VERSION "undefined"
#endif // ifndef FLEXISIP_GIT_VERSION
#define FLEXISIP_PLUGIN_API_VERSION FLEXISIP_GIT_VERSION
#ifdef WIN32
#define FLEXISIP_PLUGIN_EXPORT extern "C" __declspec(dllexport)
#else
#define FLEXISIP_PLUGIN_EXPORT extern "C"
#endif // ifdef WIN32
// -----------------------------------------------------------------------------
// Public API.
// -----------------------------------------------------------------------------
#define FLEXISIP_PLUGIN_API_VERSION FLEXISIP_GIT_VERSION
namespace flexisip {
class Plugin {
......@@ -92,6 +81,6 @@ inline std::ostream &operator<< (std::ostream &os, const PluginInfo &info) {
NAME, \
VERSION, \
FLEXISIP_PLUGIN_API_VERSION \
}; \
};
}
\ No newline at end of file
......@@ -18,9 +18,9 @@
#pragma once
#include "logmanager.hh"
#include "agent.hh"
#include "module.hh"
#include <flexisip/logmanager.hh>
#include <flexisip/agent.hh>
#include <flexisip/module.hh>
#include <sofia-sip/sip.h>
#include <sofia-sip/url.h>
......
......@@ -18,7 +18,7 @@
#pragma once
#include "event.hh"
#include <flexisip/event.hh>
#include <sofia-sip/msg.h>
#include <sofia-sip/sip.h>
......
......@@ -346,7 +346,7 @@ endif()
# expression parser tester
if(MEDIASTREAMER2_FOUND)
add_executable(expr test/expr.cc expressionparser.cc expressionparser.hh sipattrextractor.hh utils/flexisip-exception.hh)
add_executable(expr test/expr.cc expressionparser.cc sipattrextractor.hh)
target_link_libraries(expr ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES})
set_property(TARGET expr PROPERTY CXX_STANDARD 11)
set_property(TARGET expr PROPERTY CXX_STANDARD_REQUIRED ON)
......
......@@ -21,7 +21,7 @@
#include <list>
#include <string>
#include <memory>
#include "expressionparser.hh"
#include <flexisip/expressionparser.hh>
#include <flexisip/agent.hh>
......
......@@ -25,13 +25,13 @@
#include <tuple>
#include <stdexcept>
#include <algorithm>
#include "expressionparser.hh"
#include "sipattrextractor.hh"
#include <regex.h>
#include <flexisip/expressionparser.hh>
#include <flexisip/logmanager.hh>
#include "utils/flexisip-exception.hh"
#include <flexisip/flexisip-exception.hh>
using namespace std;
using namespace flexisip;
......
......@@ -45,7 +45,7 @@
#include <cstdio>
#include <csignal>
#include "expressionparser.hh"
#include <flexisip/expressionparser.hh>
#include "configdumper.hh"
#include <sofia-sip/su_log.h>
......
......@@ -20,7 +20,7 @@
#include <sofia-sip/sip_extra.h>
#include <sofia-sip/sip_status.h>
#include <flexisip/module-auth.hh>
#include "module-auth.hh"
using namespace std;
using namespace flexisip;
......
......@@ -19,7 +19,7 @@
#pragma once
#include "auth/flexisip-auth-module.hh"
#include "module.hh"
#include <flexisip/module.hh>
namespace flexisip {
......@@ -81,4 +81,4 @@ private:
bool mTrustDomainCertificates = false;
};
}
\ No newline at end of file
}
......@@ -24,7 +24,7 @@
#include <flexisip/logmanager.hh>
#include <flexisip/configmanager.hh>
#include "expressionparser.hh"
#include <flexisip/expressionparser.hh>
#include "domain-registrations.hh"
#include "utils/signaling-exception.hh"
......
......@@ -25,6 +25,7 @@
#include <sofia-sip/sip_header.h>
#include <sofia-sip/sip_status.h>
#include "flexisip_gitversion.h"
#include <flexisip/plugin.hh>
#include "module-external-authentication.hh"
......
......@@ -26,7 +26,8 @@ extern "C" {
}
#include <flexisip/agent.hh>
#include <flexisip/module-auth.hh>
#include "module-auth.hh"
#include "flexisip_gitversion.h"
#include <flexisip/plugin.hh>
// =============================================================================
......
......@@ -19,6 +19,7 @@
#include <unordered_map>
#include "plugin-loader.hh"
#include "flexisip_gitversion.h"
#include <flexisip/plugin.hh>
// =============================================================================
......
......@@ -19,7 +19,7 @@
#pragma once
#include "string"
#include "utils/flexisip-exception.hh"
#include <flexisip/flexisip-exception.hh>
namespace flexisip {
class PresentityPresenceInformation;
......
......@@ -20,7 +20,7 @@
#include "etag-manager.hh"
#include "string"
#include "utils/flexisip-exception.hh"
#include <flexisip/flexisip-exception.hh>
namespace flexisip {
class PresentityPresenceInformationListener;
......
......@@ -29,7 +29,7 @@
#include "presentity-manager.hh"
#include "presentity-presenceinformation.hh"
#include "rpid.hh"
#include "utils/flexisip-exception.hh"
#include <flexisip/flexisip-exception.hh>
#include "utils/string-utils.hh"
#define ETAG_SIZE 8
......
......@@ -22,7 +22,7 @@
#include <map>
#include "pidf+xml.hh"
#include "utils/flexisip-exception.hh"
#include <flexisip/flexisip-exception.hh>
typedef struct _belle_sip_uri belle_sip_uri_t;
typedef struct belle_sip_source belle_sip_source_t;
......
......@@ -16,7 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../expressionparser.hh"
#include <flexisip/expressionparser.hh>
#include <memory>
#include <map>
#include <stdexcept>
......
......@@ -18,9 +18,9 @@
#pragma once
#include "flexisip-exception.hh"
#include <string.h>
#include <flexisip/flexisip-exception.hh>
namespace flexisip {
/**
* @brief This exception inherits \ref FlexisipException and allows a SIP error code to be carried along.
......@@ -49,3 +49,5 @@ class SignalingException : public FlexisipException {
};
#define SIGNALING_EXCEPTION(code) SignalingException(code) << " " << __FILE__ << ":" << __LINE__ << " "
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment