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 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -8,13 +8,14 @@
8 8
9#include <boost/asio/io_service.hpp> 9#include <boost/asio/io_service.hpp>
10 10
11#include <Swiften/Base/API.h>
11#include <Swiften/Network/ConnectionFactory.h> 12#include <Swiften/Network/ConnectionFactory.h>
12#include <Swiften/Network/BoostConnection.h> 13#include <Swiften/Network/BoostConnection.h>
13 14
14namespace Swift { 15namespace Swift {
15 class BoostConnection; 16 class BoostConnection;
16 17
17 class BoostConnectionFactory : public ConnectionFactory { 18 class SWIFTEN_API BoostConnectionFactory : public ConnectionFactory {
18 public: 19 public:
19 BoostConnectionFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop); 20 BoostConnectionFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
20 21
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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
9#include <boost/asio/io_service.hpp> 15#include <boost/asio/io_service.hpp>
10 16
17#include <Swiften/Base/API.h>
11#include <Swiften/Network/ConnectionServerFactory.h> 18#include <Swiften/Network/ConnectionServerFactory.h>
12#include <Swiften/Network/BoostConnectionServer.h> 19#include <Swiften/Network/BoostConnectionServer.h>
13 20
14namespace Swift { 21namespace Swift {
15 class ConnectionServer; 22 class ConnectionServer;
16 23
17 class BoostConnectionServerFactory : public ConnectionServerFactory { 24 class SWIFTEN_API BoostConnectionServerFactory : public ConnectionServerFactory {
18 public: 25 public:
19 BoostConnectionServerFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop); 26 BoostConnectionServerFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
20 27
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 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -10,13 +10,14 @@
10#include <boost/asio/deadline_timer.hpp> 10#include <boost/asio/deadline_timer.hpp>
11#include <boost/enable_shared_from_this.hpp> 11#include <boost/enable_shared_from_this.hpp>
12 12
13#include <Swiften/Base/API.h>
13#include <Swiften/EventLoop/EventOwner.h> 14#include <Swiften/EventLoop/EventOwner.h>
14#include <Swiften/Network/Timer.h> 15#include <Swiften/Network/Timer.h>
15 16
16namespace Swift { 17namespace Swift {
17 class EventLoop; 18 class EventLoop;
18 19
19 class BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> { 20 class SWIFTEN_API BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> {
20 public: 21 public:
21 typedef boost::shared_ptr<BoostTimer> ref; 22 typedef boost::shared_ptr<BoostTimer> ref;
22 23
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 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -8,6 +8,7 @@
8 8
9#include <boost/asio/io_service.hpp> 9#include <boost/asio/io_service.hpp>
10 10
11#include <Swiften/Base/API.h>
11#include <Swiften/Network/TimerFactory.h> 12#include <Swiften/Network/TimerFactory.h>
12#include <Swiften/Network/BoostTimer.h> 13#include <Swiften/Network/BoostTimer.h>
13 14
@@ -15,7 +16,7 @@ namespace Swift {
15 class BoostTimer; 16 class BoostTimer;
16 class EventLoop; 17 class EventLoop;
17 18
18 class BoostTimerFactory : public TimerFactory { 19 class SWIFTEN_API BoostTimerFactory : public TimerFactory {
19 public: 20 public:
20 BoostTimerFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop); 21 BoostTimerFactory(boost::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
21 22
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 @@
1/* 1/*
2 * Copyright (c) 2012 Isode Limited. 2 * Copyright (c) 2012-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -8,6 +8,7 @@
8 8
9#include <boost/shared_ptr.hpp> 9#include <boost/shared_ptr.hpp>
10 10
11#include <Swiften/Base/API.h>
11#include <Swiften/Network/DomainNameResolver.h> 12#include <Swiften/Network/DomainNameResolver.h>
12#include <Swiften/Network/StaticDomainNameResolver.h> 13#include <Swiften/Network/StaticDomainNameResolver.h>
13 14
@@ -17,7 +18,7 @@
17namespace Swift { 18namespace Swift {
18 class EventLoop; 19 class EventLoop;
19 20
20 class CachingDomainNameResolver : public DomainNameResolver { 21 class SWIFTEN_API CachingDomainNameResolver : public DomainNameResolver {
21 public: 22 public:
22 CachingDomainNameResolver(DomainNameResolver* realResolver, EventLoop* eventLoop); 23 CachingDomainNameResolver(DomainNameResolver* realResolver, EventLoop* eventLoop);
23 ~CachingDomainNameResolver(); 24 ~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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
9#include <boost/shared_ptr.hpp> 15#include <boost/shared_ptr.hpp>
16#include <Swiften/Base/API.h>
10 17
11namespace Swift { 18namespace Swift {
12 class ConnectionServer; 19 class ConnectionServer;
13 class HostAddress; 20 class HostAddress;
14 21
15 class ConnectionServerFactory { 22 class SWIFTEN_API ConnectionServerFactory {
16 public: 23 public:
17 virtual ~ConnectionServerFactory(); 24 virtual ~ConnectionServerFactory();
18 25
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 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#pragma once 7#pragma once
8 8
9#include <Swiften/Base/API.h>
9#include <Swiften/Base/Error.h> 10#include <Swiften/Base/Error.h>
10 11
11namespace Swift { 12namespace Swift {
12 class DomainNameResolveError : public Error { 13 class SWIFTEN_API DomainNameResolveError : public Error {
13 public: 14 public:
14 DomainNameResolveError() {} 15 DomainNameResolveError() {}
15 }; 16 };
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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
15#include <Swiften/Base/API.h>
9#include <Swiften/Network/ProxyProvider.h> 16#include <Swiften/Network/ProxyProvider.h>
10 17
11namespace Swift { 18namespace Swift {
12 class EnvironmentProxyProvider : public ProxyProvider { 19 class SWIFTEN_API EnvironmentProxyProvider : public ProxyProvider {
13 public: 20 public:
14 EnvironmentProxyProvider(); 21 EnvironmentProxyProvider();
15 virtual HostAddressPort getHTTPConnectProxy() const; 22 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 @@
12 12
13#pragma once 13#pragma once
14 14
15#include <Swiften/Base/API.h>
15#include <Swiften/Network/ConnectionFactory.h> 16#include <Swiften/Network/ConnectionFactory.h>
16#include <Swiften/Network/HostAddressPort.h> 17#include <Swiften/Network/HostAddressPort.h>
17#include <Swiften/Base/SafeString.h> 18#include <Swiften/Base/SafeString.h>
@@ -22,7 +23,7 @@ namespace Swift {
22 class EventLoop; 23 class EventLoop;
23 class HTTPTrafficFilter; 24 class HTTPTrafficFilter;
24 25
25 class HTTPConnectProxiedConnectionFactory : public ConnectionFactory { 26 class SWIFTEN_API HTTPConnectProxiedConnectionFactory : public ConnectionFactory {
26 public: 27 public:
27 HTTPConnectProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort, boost::shared_ptr<HTTPTrafficFilter> httpTrafficFilter = boost::shared_ptr<HTTPTrafficFilter>()); 28 HTTPConnectProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort, boost::shared_ptr<HTTPTrafficFilter> httpTrafficFilter = boost::shared_ptr<HTTPTrafficFilter>());
28 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>()); 29 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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
15#include <Swiften/Base/API.h>
9#include <Swiften/Network/HostAddress.h> 16#include <Swiften/Network/HostAddress.h>
10 17
11namespace Swift { 18namespace Swift {
12 class NATPortMapping { 19 class SWIFTEN_API NATPortMapping {
13 public: 20 public:
14 enum Protocol { 21 enum Protocol {
15 TCP, 22 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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
15#include <Swiften/Base/API.h>
9#include <Swiften/Base/boost_bsignals.h> 16#include <Swiften/Base/boost_bsignals.h>
10#include <Swiften/Network/HostAddress.h> 17#include <Swiften/Network/HostAddress.h>
11 18
12namespace Swift { 19namespace Swift {
13 class NATTraversalGetPublicIPRequest { 20 class SWIFTEN_API NATTraversalGetPublicIPRequest {
14 public: 21 public:
15 virtual ~NATTraversalGetPublicIPRequest(); 22 virtual ~NATTraversalGetPublicIPRequest();
16 23
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 @@
1/* 1/*
2 * Copyright (c) 2011 Isode Limited. 2 * Copyright (c) 2011-2015 Isode Limited.
3 * Licensed under the simplified BSD license. 3 * Licensed under the simplified BSD license.
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
@@ -8,10 +8,11 @@
8 8
9#include <boost/optional.hpp> 9#include <boost/optional.hpp>
10 10
11#include <Swiften/Base/API.h>
11#include <Swiften/Network/NATPortMapping.h> 12#include <Swiften/Network/NATPortMapping.h>
12 13
13namespace Swift { 14namespace Swift {
14 class NATTraversalInterface { 15 class SWIFTEN_API NATTraversalInterface {
15 public: 16 public:
16 virtual ~NATTraversalInterface(); 17 virtual ~NATTraversalInterface();
17 18
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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
15#include <Swiften/Base/API.h>
9#include <Swiften/Base/boost_bsignals.h> 16#include <Swiften/Base/boost_bsignals.h>
10#include <Swiften/Network/HostAddress.h> 17#include <Swiften/Network/HostAddress.h>
11 18
12namespace Swift { 19namespace Swift {
13 class NATTraversalRemovePortForwardingRequest { 20 class SWIFTEN_API NATTraversalRemovePortForwardingRequest {
14 public: 21 public:
15 struct PortMapping { 22 struct PortMapping {
16 enum Protocol { 23 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 @@
1/* 1/*
2 * Copyright (c) 2011 Isode Limited. 2 * Copyright (c) 2011-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -8,12 +8,14 @@
8 8
9#include <boost/shared_ptr.hpp> 9#include <boost/shared_ptr.hpp>
10 10
11#include <Swiften/Base/API.h>
12
11namespace Swift { 13namespace Swift {
12 class NATTraversalGetPublicIPRequest; 14 class NATTraversalGetPublicIPRequest;
13 class NATTraversalForwardPortRequest; 15 class NATTraversalForwardPortRequest;
14 class NATTraversalRemovePortForwardingRequest; 16 class NATTraversalRemovePortForwardingRequest;
15 17
16 class NATTraverser { 18 class SWIFTEN_API NATTraverser {
17 public: 19 public:
18 virtual ~NATTraverser(); 20 virtual ~NATTraverser();
19 21
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 @@
1/* 1/*
2 * Copyright (c) 2010-2013 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#pragma once 7#pragma once
8 8
9#include <Swiften/Base/API.h>
10
9namespace Swift { 11namespace Swift {
10 class TimerFactory; 12 class TimerFactory;
11 class ConnectionFactory; 13 class ConnectionFactory;
@@ -24,7 +26,7 @@ namespace Swift {
24 /** 26 /**
25 * An interface collecting network factories. 27 * An interface collecting network factories.
26 */ 28 */
27 class NetworkFactories { 29 class SWIFTEN_API NetworkFactories {
28 public: 30 public:
29 virtual ~NetworkFactories(); 31 virtual ~NetworkFactories();
30 32
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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
9#include <vector> 15#include <vector>
10 16
17#include <Swiften/Base/API.h>
11#include <Swiften/Network/HostAddress.h> 18#include <Swiften/Network/HostAddress.h>
12 19
13namespace Swift { 20namespace Swift {
14 class NetworkInterface { 21 class SWIFTEN_API NetworkInterface {
15 public: 22 public:
16 NetworkInterface(const std::string& name, bool loopback) : name(name), loopback(loopback) { 23 NetworkInterface(const std::string& name, bool loopback) : name(name), loopback(loopback) {
17 } 24 }
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 @@
1/* 1/*
2 * Copyright (c) 2012 Isode Limited. 2 * Copyright (c) 2012-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -9,6 +9,7 @@
9 9
10#include <boost/enable_shared_from_this.hpp> 10#include <boost/enable_shared_from_this.hpp>
11 11
12#include <Swiften/Base/API.h>
12#include <Swiften/Network/Connection.h> 13#include <Swiften/Network/Connection.h>
13#include <Swiften/Network/Connector.h> 14#include <Swiften/Network/Connector.h>
14#include <Swiften/Network/HostAddressPort.h> 15#include <Swiften/Network/HostAddressPort.h>
@@ -24,7 +25,7 @@ namespace boost {
24namespace Swift { 25namespace Swift {
25 class ConnectionFactory; 26 class ConnectionFactory;
26 27
27 class ProxiedConnection : public Connection, public boost::enable_shared_from_this<ProxiedConnection> { 28 class SWIFTEN_API ProxiedConnection : public Connection, public boost::enable_shared_from_this<ProxiedConnection> {
28 public: 29 public:
29 ProxiedConnection(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort); 30 ProxiedConnection(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort);
30 ~ProxiedConnection(); 31 ~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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8#include <map> 14#include <map>
9 15
10#include <Swiften/Network/HostAddressPort.h> 16#include <Swiften/Network/HostAddressPort.h>
11#include <Swiften/Base/String.h> 17#include <Swiften/Base/String.h>
18#include <Swiften/Base/API.h>
12 19
13namespace Swift { 20namespace Swift {
14 class ProxyProvider { 21 class SWIFTEN_API ProxyProvider {
15 public: 22 public:
16 ProxyProvider(); 23 ProxyProvider();
17 virtual ~ProxyProvider(); 24 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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
15#include <Swiften/Base/API.h>
9#include <Swiften/Network/ProxiedConnection.h> 16#include <Swiften/Network/ProxiedConnection.h>
10 17
11namespace Swift { 18namespace Swift {
@@ -13,7 +20,7 @@ namespace Swift {
13 class DomainNameResolver; 20 class DomainNameResolver;
14 class TimerFactory; 21 class TimerFactory;
15 22
16 class SOCKS5ProxiedConnection : public ProxiedConnection { 23 class SWIFTEN_API SOCKS5ProxiedConnection : public ProxiedConnection {
17 public: 24 public:
18 typedef boost::shared_ptr<SOCKS5ProxiedConnection> ref; 25 typedef boost::shared_ptr<SOCKS5ProxiedConnection> ref;
19 26
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 @@
4 * See Documentation/Licenses/BSD-simplified.txt for more information. 4 * See Documentation/Licenses/BSD-simplified.txt for more information.
5 */ 5 */
6 6
7/*
8 * Copyright (c) 2015 Isode Limited.
9 * All rights reserved.
10 * See the COPYING file for more information.
11 */
12
7#pragma once 13#pragma once
8 14
15#include <Swiften/Base/API.h>
9#include <Swiften/Network/ConnectionFactory.h> 16#include <Swiften/Network/ConnectionFactory.h>
10#include <Swiften/Network/HostAddressPort.h> 17#include <Swiften/Network/HostAddressPort.h>
11#include <Swiften/Network/HostNameOrAddress.h> 18#include <Swiften/Network/HostNameOrAddress.h>
@@ -14,7 +21,7 @@ namespace Swift {
14 class DomainNameResolver; 21 class DomainNameResolver;
15 class TimerFactory; 22 class TimerFactory;
16 23
17 class SOCKS5ProxiedConnectionFactory : public ConnectionFactory { 24 class SWIFTEN_API SOCKS5ProxiedConnectionFactory : public ConnectionFactory {
18 public: 25 public:
19 SOCKS5ProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort); 26 SOCKS5ProxiedConnectionFactory(DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory, const std::string& proxyHost, int proxyPort);
20 27
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 @@
1/* 1/*
2 * Copyright (c) 2011 Isode Limited. 2 * Copyright (c) 2011-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -10,6 +10,7 @@
10#include <boost/enable_shared_from_this.hpp> 10#include <boost/enable_shared_from_this.hpp>
11#include <Swiften/Base/boost_bsignals.h> 11#include <Swiften/Base/boost_bsignals.h>
12 12
13#include <Swiften/Base/API.h>
13#include <Swiften/Base/SafeByteArray.h> 14#include <Swiften/Base/SafeByteArray.h>
14#include <Swiften/Network/Connection.h> 15#include <Swiften/Network/Connection.h>
15 16
@@ -18,7 +19,7 @@ namespace Swift {
18 class TLSContextFactory; 19 class TLSContextFactory;
19 class TLSContext; 20 class TLSContext;
20 21
21 class TLSConnection : public Connection { 22 class SWIFTEN_API TLSConnection : public Connection {
22 public: 23 public:
23 24
24 TLSConnection(Connection::ref connection, TLSContextFactory* tlsFactory); 25 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 @@
1/* 1/*
2 * Copyright (c) 2011 Isode Limited. 2 * Copyright (c) 2011-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -8,13 +8,14 @@
8 8
9#include <boost/shared_ptr.hpp> 9#include <boost/shared_ptr.hpp>
10 10
11#include <Swiften/Base/API.h>
11#include <Swiften/Network/ConnectionFactory.h> 12#include <Swiften/Network/ConnectionFactory.h>
12#include <Swiften/TLS/TLSContextFactory.h> 13#include <Swiften/TLS/TLSContextFactory.h>
13 14
14namespace Swift { 15namespace Swift {
15 class Connection; 16 class Connection;
16 17
17 class TLSConnectionFactory : public ConnectionFactory { 18 class SWIFTEN_API TLSConnectionFactory : public ConnectionFactory {
18 public: 19 public:
19 TLSConnectionFactory(TLSContextFactory* contextFactory, ConnectionFactory* connectionFactory); 20 TLSConnectionFactory(TLSContextFactory* contextFactory, ConnectionFactory* connectionFactory);
20 virtual ~TLSConnectionFactory(); 21 virtual ~TLSConnectionFactory();