Commit 73c20f63 authored by Guillaume Roguez's avatar Guillaume Roguez

header dependency cleanup

Remove high dependencies on OpenDHT includes inside Ring internal
header files.
This reduces compile time by not recompiling the whole project
for any changes into opendht.

Change-Id: Iba852e0b889e67ee12b3a9747e6d04de23572c2e
Reviewed-by: default avatarOlivier Soldano <olivier.soldano@savoirfairelinux.com>
parent 598caf51
......@@ -32,6 +32,7 @@
#include "noncopyable.h"
#include "ip_utils.h"
#include "ring_types.h" // enable_if_base_of
#include "security/certstore.h"
#include <opendht/dhtrunner.h>
#include <opendht/default_types.h>
......
......@@ -32,9 +32,9 @@
#include <future>
#include <mutex>
namespace ring { namespace tls {
namespace crypto = ::dht::crypto;
namespace crypto = dht::crypto;
namespace ring { namespace tls {
enum class TrustStatus {
UNTRUSTED = 0,
......
......@@ -19,8 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <ip_utils.h> // DO NOT CHANGE ORDER OF THIS INCLUDE
#include <opendht/crypto.h> // OR MINGWIN FAILS TO BUILD
#include <ip_utils.h> // DO NOT CHANGE ORDER OF THIS INCLUDE OR MINGWIN FAILS TO BUILD
#include "tls_session.h"
......
......@@ -26,13 +26,16 @@
#include "enumclass_utils.h"
#include <opendht/crypto.h>
#include <string>
#include <vector>
#include <memory>
namespace ring {namespace tls {
// OpenDHT
namespace dht { namespace crypto {
struct Certificate;
}} // namespace dht::crypto
namespace ring { namespace tls {
#if !defined (S_IRWXG)
#define S_IRWXG 00070
......
......@@ -28,6 +28,7 @@
#include <pjsip/sip_endpoint.h>
#include <string>
#include <sstream>
#include <thread>
#include <pj/pool.h>
#include <pjsip/sip_ua_layer.h>
#include <pjsip-simple/evsub.h>
......
......@@ -62,6 +62,8 @@
#include "im/instant_messaging.h"
#include <opendht/crypto.h>
#include <unistd.h>
#include <algorithm>
......
......@@ -30,17 +30,21 @@
#include "sip_utils.h"
#include "ip_utils.h"
#include "noncopyable.h"
#include "security/certstore.h"
#include "im/message_engine.h"
#include <pjsip/sip_types.h>
#include <opendht/value.h>
#include <array>
#include <vector>
#include <map>
#include <memory>
#ifdef _WIN32
typedef uint16_t in_port_t;
#else
#include <netinet/in.h> // For in_port_t support
#endif
struct pjsip_dialog;
struct pjsip_inv_session;
struct pjmedia_sdp_session;
......
......@@ -51,6 +51,8 @@
#include "errno.h"
#include <opendht/crypto.h>
namespace ring {
using sip_utils::CONST_PJ_STR;
......
......@@ -30,6 +30,8 @@
#include "client/ring_signal.h"
#include "sip_utils.h"
#include <opendht/crypto.h>
#include <thread>
#include <sstream>
......
......@@ -40,6 +40,8 @@
#include <pjlib.h>
#include <pjlib-util.h>
#include <opendht/crypto.h>
#include <stdexcept>
#include <sstream>
#include <algorithm>
......
......@@ -31,8 +31,6 @@
#include "noncopyable.h"
#include "logger.h"
#include <opendht/crypto.h>
#include <pjsip.h>
#include <pjnath/stun_config.h>
......@@ -45,6 +43,11 @@
#include <list>
#include <memory>
// OpenDHT
namespace dht { namespace crypto {
struct Certificate;
}} // namespace dht::crypto
namespace ring {
struct SipTransportDescr
......
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