Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Network
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-09-17 18:01:03 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-09-17 18:01:03 (GMT)
commit3d6aa3b50090c19b50ae488494f1459bade88da3 (patch)
tree60db50a40f01d2dc4b48e5aee1011f0e72643c39 /Swiften/Network
parent7693734b10699b5fc4bfc3d7dc33128d558e202d (diff)
downloadswift-contrib-3d6aa3b50090c19b50ae488494f1459bade88da3.zip
swift-contrib-3d6aa3b50090c19b50ae488494f1459bade88da3.tar.bz2
Support for building swiften as a DLL
Added missing SWIFTEN_API declarations. Changed test infrastructure to extend path before running tests.
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BOSHConnection.h5
-rw-r--r--Swiften/Network/BOSHConnectionPool.h3
-rw-r--r--Swiften/Network/ChainedConnector.h3
-rw-r--r--Swiften/Network/Connection.h3
-rw-r--r--Swiften/Network/ConnectionFactory.h4
-rw-r--r--Swiften/Network/Connector.h3
-rw-r--r--Swiften/Network/DomainNameServiceQuery.h3
-rw-r--r--Swiften/Network/DummyConnection.h3
-rw-r--r--Swiften/Network/DummyTimerFactory.h3
-rw-r--r--Swiften/Network/FakeConnection.h3
-rw-r--r--Swiften/Network/HTTPConnectProxiedConnection.h3
-rw-r--r--Swiften/Network/StaticDomainNameResolver.h3
-rw-r--r--Swiften/Network/Timer.h3
-rw-r--r--Swiften/Network/TimerFactory.h3
-rw-r--r--Swiften/Network/WindowsProxyProvider.h4
15 files changed, 33 insertions, 16 deletions
diff --git a/Swiften/Network/BOSHConnection.h b/Swiften/Network/BOSHConnection.h
index a2abfcd..01341cc 100644
--- a/Swiften/Network/BOSHConnection.h
+++ b/Swiften/Network/BOSHConnection.h
@@ -14,8 +14,9 @@
#pragma once
#include <boost/enable_shared_from_this.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/Connection.h>
#include <Swiften/Network/Connector.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Base/String.h>
@@ -35,9 +36,9 @@ class BOSHConnectionTest;
namespace Swift {
class XMLParserFactory;
class TLSContextFactory;
- class BOSHError : public SessionStream::SessionStreamError {
+ class SWIFTEN_API BOSHError : public SessionStream::SessionStreamError {
public:
enum Type {BadRequest, HostGone, HostUnknown, ImproperAddressing,
InternalServerError, ItemNotFound, OtherRequest, PolicyViolation,
RemoteConnectionFailed, RemoteStreamError, SeeOtherURI, SystemShutdown, UndefinedCondition,
@@ -50,9 +51,9 @@ namespace Swift {
};
- class BOSHConnection : public boost::enable_shared_from_this<BOSHConnection> {
+ class SWIFTEN_API BOSHConnection : public boost::enable_shared_from_this<BOSHConnection> {
public:
typedef boost::shared_ptr<BOSHConnection> ref;
static ref create(const URL& boshURL, Connector::ref connector, XMLParserFactory* parserFactory) {
return ref(new BOSHConnection(boshURL, connector, parserFactory));
diff --git a/Swiften/Network/BOSHConnectionPool.h b/Swiften/Network/BOSHConnectionPool.h
index 028a1f3..de707e8 100644
--- a/Swiften/Network/BOSHConnectionPool.h
+++ b/Swiften/Network/BOSHConnectionPool.h
@@ -8,8 +8,9 @@
#pragma once
#include <vector>
+#include <Swiften/Base/API.h>
#include <Swiften/Base/SafeString.h>
#include <Swiften/Network/BOSHConnection.h>
namespace Swift {
@@ -17,9 +18,9 @@ namespace Swift {
class TLSConnectionFactory;
class CachingDomainNameResolver;
class EventLoop;
- class BOSHConnectionPool : public boost::bsignals::trackable {
+ class SWIFTEN_API BOSHConnectionPool : public boost::bsignals::trackable {
public:
BOSHConnectionPool(const URL& boshURL, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory, TimerFactory* timerFactory, EventLoop* eventLoop, const std::string& to, unsigned long long initialRID, const URL& boshHTTPConnectProxyURL, const SafeString& boshHTTPConnectProxyAuthID, const SafeString& boshHTTPConnectProxyAuthPassword);
~BOSHConnectionPool();
void write(const SafeByteArray& data);
diff --git a/Swiften/Network/ChainedConnector.h b/Swiften/Network/ChainedConnector.h
index 60aea05..4110522 100644
--- a/Swiften/Network/ChainedConnector.h
+++ b/Swiften/Network/ChainedConnector.h
@@ -10,8 +10,9 @@
#include <vector>
#include <deque>
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Base/Error.h>
namespace Swift {
@@ -20,9 +21,9 @@ namespace Swift {
class ConnectionFactory;
class TimerFactory;
class DomainNameResolver;
- class ChainedConnector {
+ class SWIFTEN_API ChainedConnector {
public:
ChainedConnector(const std::string& hostname, int port, bool doServiceLookups, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*);
void setTimeoutMilliseconds(int milliseconds);
diff --git a/Swiften/Network/Connection.h b/Swiften/Network/Connection.h
index 6ad2999..97c287d 100644
--- a/Swiften/Network/Connection.h
+++ b/Swiften/Network/Connection.h
@@ -8,14 +8,15 @@
#include <boost/shared_ptr.hpp>
#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/API.h>
#include <Swiften/Base/SafeByteArray.h>
namespace Swift {
class HostAddressPort;
- class Connection {
+ class SWIFTEN_API Connection {
public:
typedef boost::shared_ptr<Connection> ref;
enum Error {
diff --git a/Swiften/Network/ConnectionFactory.h b/Swiften/Network/ConnectionFactory.h
index 9e92c36..c8be2fc 100644
--- a/Swiften/Network/ConnectionFactory.h
+++ b/Swiften/Network/ConnectionFactory.h
@@ -7,12 +7,14 @@
#pragma once
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
+
namespace Swift {
class Connection;
- class ConnectionFactory {
+ class SWIFTEN_API ConnectionFactory {
public:
virtual ~ConnectionFactory();
virtual boost::shared_ptr<Connection> createConnection() = 0;
diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h
index e3fd51f..26a98b8 100644
--- a/Swiften/Network/Connector.h
+++ b/Swiften/Network/Connector.h
@@ -9,8 +9,9 @@
#include <deque>
#include <Swiften/Base/boost_bsignals.h>
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/DomainNameServiceQuery.h>
#include <Swiften/Network/Connection.h>
#include <Swiften/Network/Timer.h>
#include <Swiften/Network/HostAddressPort.h>
@@ -22,9 +23,9 @@ namespace Swift {
class DomainNameResolver;
class ConnectionFactory;
class TimerFactory;
- class Connector : public boost::bsignals::trackable, public boost::enable_shared_from_this<Connector> {
+ class SWIFTEN_API Connector : public boost::bsignals::trackable, public boost::enable_shared_from_this<Connector> {
public:
typedef boost::shared_ptr<Connector> ref;
static Connector::ref create(const std::string& hostname, int port, bool doServiceLookups, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) {
diff --git a/Swiften/Network/DomainNameServiceQuery.h b/Swiften/Network/DomainNameServiceQuery.h
index 0e80233..fdf5b5d 100644
--- a/Swiften/Network/DomainNameServiceQuery.h
+++ b/Swiften/Network/DomainNameServiceQuery.h
@@ -11,14 +11,15 @@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <string>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/DomainNameResolveError.h>
namespace Swift {
class RandomGenerator;
- class DomainNameServiceQuery {
+ class SWIFTEN_API DomainNameServiceQuery {
public:
typedef boost::shared_ptr<DomainNameServiceQuery> ref;
struct Result {
diff --git a/Swiften/Network/DummyConnection.h b/Swiften/Network/DummyConnection.h
index 5191e30..36bf897 100644
--- a/Swiften/Network/DummyConnection.h
+++ b/Swiften/Network/DummyConnection.h
@@ -7,15 +7,16 @@
#pragma once
#include <boost/enable_shared_from_this.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/Connection.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/EventLoop/EventLoop.h>
#include <Swiften/EventLoop/EventOwner.h>
namespace Swift {
- class DummyConnection : public Connection, public EventOwner, public boost::enable_shared_from_this<DummyConnection> {
+ class SWIFTEN_API DummyConnection : public Connection, public EventOwner, public boost::enable_shared_from_this<DummyConnection> {
public:
DummyConnection(EventLoop* eventLoop);
void listen();
diff --git a/Swiften/Network/DummyTimerFactory.h b/Swiften/Network/DummyTimerFactory.h
index 0c49f3d..1e9413b 100644
--- a/Swiften/Network/DummyTimerFactory.h
+++ b/Swiften/Network/DummyTimerFactory.h
@@ -7,12 +7,13 @@
#pragma once
#include <list>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/TimerFactory.h>
namespace Swift {
- class DummyTimerFactory : public TimerFactory {
+ class SWIFTEN_API DummyTimerFactory : public TimerFactory {
public:
class DummyTimer;
DummyTimerFactory();
diff --git a/Swiften/Network/FakeConnection.h b/Swiften/Network/FakeConnection.h
index 99cb584..eca45da 100644
--- a/Swiften/Network/FakeConnection.h
+++ b/Swiften/Network/FakeConnection.h
@@ -9,15 +9,16 @@
#include <boost/optional.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <vector>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/Connection.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/EventLoop/EventOwner.h>
#include <Swiften/EventLoop/EventLoop.h>
namespace Swift {
- class FakeConnection :
+ class SWIFTEN_API FakeConnection :
public Connection,
public EventOwner,
public boost::enable_shared_from_this<FakeConnection> {
public:
diff --git a/Swiften/Network/HTTPConnectProxiedConnection.h b/Swiften/Network/HTTPConnectProxiedConnection.h
index e6c8629..c209dc1 100644
--- a/Swiften/Network/HTTPConnectProxiedConnection.h
+++ b/Swiften/Network/HTTPConnectProxiedConnection.h
@@ -12,17 +12,18 @@
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ProxiedConnection.h>
namespace Swift {
class DomainNameResolver;
class ConnectionFactory;
class EventLoop;
class TimerFactory;
- class HTTPConnectProxiedConnection : public ProxiedConnection {
+ class SWIFTEN_API HTTPConnectProxiedConnection : public ProxiedConnection {
public:
typedef boost::shared_ptr<HTTPConnectProxiedConnection> ref;
static ref create(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort, const SafeString& authID, const SafeString& authPassword) {
diff --git a/Swiften/Network/StaticDomainNameResolver.h b/Swiften/Network/StaticDomainNameResolver.h
index 29d1629..386179b 100644
--- a/Swiften/Network/StaticDomainNameResolver.h
+++ b/Swiften/Network/StaticDomainNameResolver.h
@@ -8,17 +8,18 @@
#include <vector>
#include <map>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/HostAddress.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Network/DomainNameResolver.h>
#include <Swiften/Network/DomainNameServiceQuery.h>
#include <Swiften/Network/DomainNameAddressQuery.h>
#include <Swiften/EventLoop/EventLoop.h>
namespace Swift {
- class StaticDomainNameResolver : public DomainNameResolver {
+ class SWIFTEN_API StaticDomainNameResolver : public DomainNameResolver {
public:
typedef std::map<std::string, std::vector<HostAddress> > AddressesMap;
typedef std::vector< std::pair<std::string, DomainNameServiceQuery::Result> > ServicesCollection;
diff --git a/Swiften/Network/Timer.h b/Swiften/Network/Timer.h
index b7578f2..d08cf3c 100644
--- a/Swiften/Network/Timer.h
+++ b/Swiften/Network/Timer.h
@@ -6,14 +6,15 @@
#pragma once
#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/API.h>
namespace Swift {
/**
* A class for triggering an event after a given period.
*/
- class Timer {
+ class SWIFTEN_API Timer {
public:
typedef boost::shared_ptr<Timer> ref;
virtual ~Timer();
diff --git a/Swiften/Network/TimerFactory.h b/Swiften/Network/TimerFactory.h
index 99903c3..62850bc 100644
--- a/Swiften/Network/TimerFactory.h
+++ b/Swiften/Network/TimerFactory.h
@@ -7,12 +7,13 @@
#pragma once
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/Timer.h>
namespace Swift {
- class TimerFactory {
+ class SWIFTEN_API TimerFactory {
public:
virtual ~TimerFactory();
virtual Timer::ref createTimer(int milliseconds) = 0;
diff --git a/Swiften/Network/WindowsProxyProvider.h b/Swiften/Network/WindowsProxyProvider.h
index c2d1f51..12aa18d 100644
--- a/Swiften/Network/WindowsProxyProvider.h
+++ b/Swiften/Network/WindowsProxyProvider.h
@@ -4,12 +4,14 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#pragma once
+
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ProxyProvider.h>
namespace Swift {
- class WindowsProxyProvider : public ProxyProvider {
+ class SWIFTEN_API WindowsProxyProvider : public ProxyProvider {
public:
WindowsProxyProvider();
virtual HostAddressPort getHTTPConnectProxy() const;
virtual HostAddressPort getSOCKS5Proxy() const;