summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-06-07 22:34:19 (GMT)
committerTobias Markmann <tm@ayena.de>2015-06-08 09:37:53 (GMT)
commitb6b0695643f932827add43b9de0e09ed74eb6799 (patch)
tree72456efba9fab6fbc6004a98f0a61b7a8167f791 /Swiften/Network
parent3741c9ad5c0cc6f92e4ed913d67b3b530882334e (diff)
downloadswift-b6b0695643f932827add43b9de0e09ed74eb6799.zip
swift-b6b0695643f932827add43b9de0e09ed74eb6799.tar.bz2
Add missing SWIFTEN_API annotations to public Swiften API
Test-Information: Tested build on Windows 8 with VS 2014 and ran unit tests. Change-Id: I3d8096df4801be6901f22564e36eecba0e7310c4
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BoostConnectionFactory.h5
-rw-r--r--Swiften/Network/BoostConnectionServerFactory.h9
-rw-r--r--Swiften/Network/BoostTimer.h5
-rw-r--r--Swiften/Network/BoostTimerFactory.h5
-rw-r--r--Swiften/Network/CachingDomainNameResolver.h5
-rw-r--r--Swiften/Network/ConnectionServerFactory.h9
-rw-r--r--Swiften/Network/DomainNameResolveError.h5
-rw-r--r--Swiften/Network/EnvironmentProxyProvider.h9
-rw-r--r--Swiften/Network/HTTPConnectProxiedConnectionFactory.h3
-rw-r--r--Swiften/Network/NATPortMapping.h9
-rw-r--r--Swiften/Network/NATTraversalGetPublicIPRequest.h9
-rw-r--r--Swiften/Network/NATTraversalInterface.h5
-rw-r--r--Swiften/Network/NATTraversalRemovePortForwardingRequest.h9
-rw-r--r--Swiften/Network/NATTraverser.h6
-rw-r--r--Swiften/Network/NetworkFactories.h6
-rw-r--r--Swiften/Network/NetworkInterface.h9
-rw-r--r--Swiften/Network/ProxiedConnection.h5
-rw-r--r--Swiften/Network/ProxyProvider.h9
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnection.h9
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnectionFactory.h9
-rw-r--r--Swiften/Network/TLSConnection.h5
-rw-r--r--Swiften/Network/TLSConnectionFactory.h5
22 files changed, 117 insertions, 33 deletions
diff --git a/Swiften/Network/BoostConnectionFactory.h b/Swiften/Network/BoostConnectionFactory.h
index 6f2278f..574ea3e 100644
--- a/Swiften/Network/BoostConnectionFactory.h
+++ b/Swiften/Network/BoostConnectionFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,13 +8,14 @@
#include <boost/asio/io_service.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ConnectionFactory.h>
#include <Swiften/Network/BoostConnection.h>
namespace Swift {
class BoostConnection;
- class BoostConnectionFactory : public ConnectionFactory {
+ class SWIFTEN_API BoostConnectionFactory : public ConnectionFactory {
public:
BoostConnectionFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
diff --git a/Swiften/Network/BoostConnectionServerFactory.h b/Swiften/Network/BoostConnectionServerFactory.h
index 9132b5c..1ef4951 100644
--- a/Swiften/Network/BoostConnectionServerFactory.h
+++ b/Swiften/Network/BoostConnectionServerFactory.h
@@ -4,17 +4,24 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <boost/asio/io_service.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ConnectionServerFactory.h>
#include <Swiften/Network/BoostConnectionServer.h>
namespace Swift {
class ConnectionServer;
- class BoostConnectionServerFactory : public ConnectionServerFactory {
+ class SWIFTEN_API BoostConnectionServerFactory : public ConnectionServerFactory {
public:
BoostConnectionServerFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
diff --git a/Swiften/Network/BoostTimer.h b/Swiften/Network/BoostTimer.h
index aae1708..1562887 100644
--- a/Swiften/Network/BoostTimer.h
+++ b/Swiften/Network/BoostTimer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,13 +10,14 @@
#include <boost/asio/deadline_timer.hpp>
#include <boost/enable_shared_from_this.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/EventLoop/EventOwner.h>
#include <Swiften/Network/Timer.h>
namespace Swift {
class EventLoop;
- class BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> {
+ class SWIFTEN_API BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> {
public:
typedef boost::shared_ptr<BoostTimer> ref;
diff --git a/Swiften/Network/BoostTimerFactory.h b/Swiften/Network/BoostTimerFactory.h
index d7be77f..9b97467 100644
--- a/Swiften/Network/BoostTimerFactory.h
+++ b/Swiften/Network/BoostTimerFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,6 +8,7 @@
#include <boost/asio/io_service.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/TimerFactory.h>
#include <Swiften/Network/BoostTimer.h>
@@ -15,7 +16,7 @@ namespace Swift {
class BoostTimer;
class EventLoop;
- class BoostTimerFactory : public TimerFactory {
+ class SWIFTEN_API BoostTimerFactory : public TimerFactory {
public:
BoostTimerFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
diff --git a/Swiften/Network/CachingDomainNameResolver.h b/Swiften/Network/CachingDomainNameResolver.h
index fa5737c..2a0b1b7 100644
--- a/Swiften/Network/CachingDomainNameResolver.h
+++ b/Swiften/Network/CachingDomainNameResolver.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,6 +8,7 @@
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/DomainNameResolver.h>
#include <Swiften/Network/StaticDomainNameResolver.h>
@@ -17,7 +18,7 @@
namespace Swift {
class EventLoop;
- class CachingDomainNameResolver : public DomainNameResolver {
+ class SWIFTEN_API CachingDomainNameResolver : public DomainNameResolver {
public:
CachingDomainNameResolver(DomainNameResolver* realResolver, EventLoop* eventLoop);
~CachingDomainNameResolver();
diff --git a/Swiften/Network/ConnectionServerFactory.h b/Swiften/Network/ConnectionServerFactory.h
index df5f912..672cac7 100644
--- a/Swiften/Network/ConnectionServerFactory.h
+++ b/Swiften/Network/ConnectionServerFactory.h
@@ -4,15 +4,22 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
namespace Swift {
class ConnectionServer;
class HostAddress;
- class ConnectionServerFactory {
+ class SWIFTEN_API ConnectionServerFactory {
public:
virtual ~ConnectionServerFactory();
diff --git a/Swiften/Network/DomainNameResolveError.h b/Swiften/Network/DomainNameResolveError.h
index 6edab56..c788537 100644
--- a/Swiften/Network/DomainNameResolveError.h
+++ b/Swiften/Network/DomainNameResolveError.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Base/Error.h>
namespace Swift {
- class DomainNameResolveError : public Error {
+ class SWIFTEN_API DomainNameResolveError : public Error {
public:
DomainNameResolveError() {}
};
diff --git a/Swiften/Network/EnvironmentProxyProvider.h b/Swiften/Network/EnvironmentProxyProvider.h
index 224d301..0afad9d 100644
--- a/Swiften/Network/EnvironmentProxyProvider.h
+++ b/Swiften/Network/EnvironmentProxyProvider.h
@@ -4,12 +4,19 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ProxyProvider.h>
namespace Swift {
- class EnvironmentProxyProvider : public ProxyProvider {
+ class SWIFTEN_API EnvironmentProxyProvider : public ProxyProvider {
public:
EnvironmentProxyProvider();
virtual HostAddressPort getHTTPConnectProxy() const;
diff --git a/Swiften/Network/HTTPConnectProxiedConnectionFactory.h b/Swiften/Network/HTTPConnectProxiedConnectionFactory.h
index b4ddd4e..9d2c982 100644
--- a/Swiften/Network/HTTPConnectProxiedConnectionFactory.h
+++ b/Swiften/Network/HTTPConnectProxiedConnectionFactory.h
@@ -12,6 +12,7 @@
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ConnectionFactory.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Base/SafeString.h>
@@ -22,7 +23,7 @@ namespace Swift {
class EventLoop;
class HTTPTrafficFilter;
- class HTTPConnectProxiedConnectionFactory : public ConnectionFactory {
+ class SWIFTEN_API HTTPConnectProxiedConnectionFactory : public ConnectionFactory {
public:
HTTPConnectProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort, boost::shared_ptr<HTTPTrafficFilter> httpTrafficFilter = boost::shared_ptr<HTTPTrafficFilter>());
HTTPConnectProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort, const SafeString& authID, const SafeString& authPassword, boost::shared_ptr<HTTPTrafficFilter> httpTrafficFilter = boost::shared_ptr<HTTPTrafficFilter>());
diff --git a/Swiften/Network/NATPortMapping.h b/Swiften/Network/NATPortMapping.h
index 0f6bd95..3ddf39e 100644
--- a/Swiften/Network/NATPortMapping.h
+++ b/Swiften/Network/NATPortMapping.h
@@ -4,12 +4,19 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Network/HostAddress.h>
namespace Swift {
- class NATPortMapping {
+ class SWIFTEN_API NATPortMapping {
public:
enum Protocol {
TCP,
diff --git a/Swiften/Network/NATTraversalGetPublicIPRequest.h b/Swiften/Network/NATTraversalGetPublicIPRequest.h
index 1270db3..725afd2 100644
--- a/Swiften/Network/NATTraversalGetPublicIPRequest.h
+++ b/Swiften/Network/NATTraversalGetPublicIPRequest.h
@@ -4,13 +4,20 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Network/HostAddress.h>
namespace Swift {
- class NATTraversalGetPublicIPRequest {
+ class SWIFTEN_API NATTraversalGetPublicIPRequest {
public:
virtual ~NATTraversalGetPublicIPRequest();
diff --git a/Swiften/Network/NATTraversalInterface.h b/Swiften/Network/NATTraversalInterface.h
index 09367cb..4e5f5fc 100644
--- a/Swiften/Network/NATTraversalInterface.h
+++ b/Swiften/Network/NATTraversalInterface.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
@@ -8,10 +8,11 @@
#include <boost/optional.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/NATPortMapping.h>
namespace Swift {
- class NATTraversalInterface {
+ class SWIFTEN_API NATTraversalInterface {
public:
virtual ~NATTraversalInterface();
diff --git a/Swiften/Network/NATTraversalRemovePortForwardingRequest.h b/Swiften/Network/NATTraversalRemovePortForwardingRequest.h
index 210cbcb..efbf6ea 100644
--- a/Swiften/Network/NATTraversalRemovePortForwardingRequest.h
+++ b/Swiften/Network/NATTraversalRemovePortForwardingRequest.h
@@ -4,13 +4,20 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Network/HostAddress.h>
namespace Swift {
- class NATTraversalRemovePortForwardingRequest {
+ class SWIFTEN_API NATTraversalRemovePortForwardingRequest {
public:
struct PortMapping {
enum Protocol {
diff --git a/Swiften/Network/NATTraverser.h b/Swiften/Network/NATTraverser.h
index 75df3d6..e86704a 100644
--- a/Swiften/Network/NATTraverser.h
+++ b/Swiften/Network/NATTraverser.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,12 +8,14 @@
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
+
namespace Swift {
class NATTraversalGetPublicIPRequest;
class NATTraversalForwardPortRequest;
class NATTraversalRemovePortForwardingRequest;
- class NATTraverser {
+ class SWIFTEN_API NATTraverser {
public:
virtual ~NATTraverser();
diff --git a/Swiften/Network/NetworkFactories.h b/Swiften/Network/NetworkFactories.h
index a0c4bf9..81ce0c5 100644
--- a/Swiften/Network/NetworkFactories.h
+++ b/Swiften/Network/NetworkFactories.h
@@ -1,11 +1,13 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <Swiften/Base/API.h>
+
namespace Swift {
class TimerFactory;
class ConnectionFactory;
@@ -24,7 +26,7 @@ namespace Swift {
/**
* An interface collecting network factories.
*/
- class NetworkFactories {
+ class SWIFTEN_API NetworkFactories {
public:
virtual ~NetworkFactories();
diff --git a/Swiften/Network/NetworkInterface.h b/Swiften/Network/NetworkInterface.h
index 1d302cb..0c1ba07 100644
--- a/Swiften/Network/NetworkInterface.h
+++ b/Swiften/Network/NetworkInterface.h
@@ -4,14 +4,21 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <vector>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/HostAddress.h>
namespace Swift {
- class NetworkInterface {
+ class SWIFTEN_API NetworkInterface {
public:
NetworkInterface(const std::string& name, bool loopback) : name(name), loopback(loopback) {
}
diff --git a/Swiften/Network/ProxiedConnection.h b/Swiften/Network/ProxiedConnection.h
index e6c9730..91488a1 100644
--- a/Swiften/Network/ProxiedConnection.h
+++ b/Swiften/Network/ProxiedConnection.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -9,6 +9,7 @@
#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>
@@ -24,7 +25,7 @@ namespace boost {
namespace Swift {
class ConnectionFactory;
- class ProxiedConnection : public Connection, public boost::enable_shared_from_this<ProxiedConnection> {
+ class SWIFTEN_API ProxiedConnection : public Connection, public boost::enable_shared_from_this<ProxiedConnection> {
public:
ProxiedConnection(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort);
~ProxiedConnection();
diff --git a/Swiften/Network/ProxyProvider.h b/Swiften/Network/ProxyProvider.h
index 9a1ccee..b5e3eca 100644
--- a/Swiften/Network/ProxyProvider.h
+++ b/Swiften/Network/ProxyProvider.h
@@ -4,14 +4,21 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <map>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Base/String.h>
+#include <Swiften/Base/API.h>
namespace Swift {
- class ProxyProvider {
+ class SWIFTEN_API ProxyProvider {
public:
ProxyProvider();
virtual ~ProxyProvider();
diff --git a/Swiften/Network/SOCKS5ProxiedConnection.h b/Swiften/Network/SOCKS5ProxiedConnection.h
index 2c93468..ee58d96 100644
--- a/Swiften/Network/SOCKS5ProxiedConnection.h
+++ b/Swiften/Network/SOCKS5ProxiedConnection.h
@@ -4,8 +4,15 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ProxiedConnection.h>
namespace Swift {
@@ -13,7 +20,7 @@ namespace Swift {
class DomainNameResolver;
class TimerFactory;
- class SOCKS5ProxiedConnection : public ProxiedConnection {
+ class SWIFTEN_API SOCKS5ProxiedConnection : public ProxiedConnection {
public:
typedef boost::shared_ptr<SOCKS5ProxiedConnection> ref;
diff --git a/Swiften/Network/SOCKS5ProxiedConnectionFactory.h b/Swiften/Network/SOCKS5ProxiedConnectionFactory.h
index 4c5c585..0915a9b 100644
--- a/Swiften/Network/SOCKS5ProxiedConnectionFactory.h
+++ b/Swiften/Network/SOCKS5ProxiedConnectionFactory.h
@@ -4,8 +4,15 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ConnectionFactory.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Network/HostNameOrAddress.h>
@@ -14,7 +21,7 @@ namespace Swift {
class DomainNameResolver;
class TimerFactory;
- class SOCKS5ProxiedConnectionFactory : public ConnectionFactory {
+ class SWIFTEN_API SOCKS5ProxiedConnectionFactory : public ConnectionFactory {
public:
SOCKS5ProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort);
diff --git a/Swiften/Network/TLSConnection.h b/Swiften/Network/TLSConnection.h
index 3c2d8f7..ebf2e43 100644
--- a/Swiften/Network/TLSConnection.h
+++ b/Swiften/Network/TLSConnection.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,6 +10,7 @@
#include <boost/enable_shared_from_this.hpp>
#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/API.h>
#include <Swiften/Base/SafeByteArray.h>
#include <Swiften/Network/Connection.h>
@@ -18,7 +19,7 @@ namespace Swift {
class TLSContextFactory;
class TLSContext;
- class TLSConnection : public Connection {
+ class SWIFTEN_API TLSConnection : public Connection {
public:
TLSConnection(Connection::ref connection, TLSContextFactory* tlsFactory);
diff --git a/Swiften/Network/TLSConnectionFactory.h b/Swiften/Network/TLSConnectionFactory.h
index 54fba6e..3dfee06 100644
--- a/Swiften/Network/TLSConnectionFactory.h
+++ b/Swiften/Network/TLSConnectionFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,13 +8,14 @@
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/API.h>
#include <Swiften/Network/ConnectionFactory.h>
#include <Swiften/TLS/TLSContextFactory.h>
namespace Swift {
class Connection;
- class TLSConnectionFactory : public ConnectionFactory {
+ class SWIFTEN_API TLSConnectionFactory : public ConnectionFactory {
public:
TLSConnectionFactory(TLSContextFactory* contextFactory, ConnectionFactory* connectionFactory);
virtual ~TLSConnectionFactory();