-modified asio and boost include file ordering to avoid multiply defi…

…ned symbol errors on linking -in preparation for upgrade of asio drop and support for latest boost -include asio/ssh.hpp everywhere asio.hpp is included -include boost headers before others, to ensure we are not redefining stdint definitions in some includes and not others git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@11159 ddefafc4-47db-0310-ae44-fa13212b10f2
TafThorne · Apr 25, 2014 · e74d91c · e74d91c
1 parent 9b2fc8f
commit e74d91c
Show file tree

Hide file tree

Showing 45 changed files with 128 additions and 31 deletions.
diff --git a/reTurn/AsyncSocketBase.cxx b/reTurn/AsyncSocketBase.cxx
@@ -1,6 +1,5 @@
 #include "AsyncSocketBase.hxx"
 #include "AsyncSocketBaseHandler.hxx"
-#include <boost/bind.hpp>
 #include <rutil/WinLeakCheck.hxx>
 #include <rutil/Logger.hxx>
 #include "ReTurnSubsystem.hxx"

diff --git a/reTurn/AsyncSocketBase.hxx b/reTurn/AsyncSocketBase.hxx
@@ -1,12 +1,16 @@
 #ifndef ASYNC_SOCKET_BASE_HXX
 #define ASYNC_SOCKET_BASE_HXX
 
-#include <deque>
 #include <asio.hpp>
-#include <boost/bind.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <boost/function.hpp>
+#include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+#include <deque>
+
 #include "DataBuffer.hxx"
 #include "StunTuple.hxx"
 

diff --git a/reTurn/AsyncTcpSocketBase.hxx b/reTurn/AsyncTcpSocketBase.hxx
@@ -2,6 +2,9 @@
 #define ASYNC_TCP_SOCKET_BASE_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <boost/bind.hpp>
 
 #include "AsyncSocketBase.hxx"

diff --git a/reTurn/AsyncUdpSocketBase.hxx b/reTurn/AsyncUdpSocketBase.hxx
@@ -2,6 +2,9 @@
 #define ASYNC_UDP_SOCKET_BASE_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <boost/bind.hpp>
 
 #include "AsyncSocketBase.hxx"

diff --git a/reTurn/ChannelManager.hxx b/reTurn/ChannelManager.hxx
@@ -2,6 +2,9 @@
 #define CHANNELMANAGER_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 
 #include "RemotePeer.hxx"
 

diff --git a/reTurn/ReTurnConfig.hxx b/reTurn/ReTurnConfig.hxx
@@ -3,6 +3,9 @@
 
 #include <map>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <rutil/ConfigParse.hxx>
 #include <rutil/Data.hxx>
 #include <rutil/Log.hxx>

diff --git a/reTurn/RemotePeer.hxx b/reTurn/RemotePeer.hxx
@@ -2,6 +2,9 @@
 #define REMOTEPEER_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 
 #include "StunTuple.hxx"
 

diff --git a/reTurn/StunMessage.cxx b/reTurn/StunMessage.cxx
@@ -3,14 +3,15 @@
   #include "config.h"
 #endif
 
+#include <boost/crc.hpp>
+
 #include "StunMessage.hxx"
 
 #include <rutil/compat.hxx>
 #include <rutil/Timer.hxx>
 #include <rutil/Random.hxx>
 #include <rutil/DataStream.hxx>
 #include <rutil/MD5Stream.hxx>
-#include <boost/crc.hpp>
 #include <rutil/WinLeakCheck.hxx>
 #include <rutil/Logger.hxx>
 #include "ReTurnSubsystem.hxx"

diff --git a/reTurn/StunMessage.hxx b/reTurn/StunMessage.hxx
@@ -5,6 +5,9 @@
 #include <rutil/compat.hxx>
 #include <rutil/Data.hxx>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 
 #include "StunTuple.hxx"
 

diff --git a/reTurn/StunTuple.hxx b/reTurn/StunTuple.hxx
@@ -2,6 +2,9 @@
 #define STUNTUPLE_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <rutil/resipfaststreams.hxx>
 
 namespace reTurn {

diff --git a/reTurn/TcpConnection.hxx b/reTurn/TcpConnection.hxx
@@ -2,6 +2,9 @@
 #define TCP_CONNECTION_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <boost/array.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>

diff --git a/reTurn/TcpServer.hxx b/reTurn/TcpServer.hxx
@@ -2,6 +2,9 @@
 #define TCP_SERVER_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <string>
 #include <boost/noncopyable.hpp>
 #include "TcpConnection.hxx"

diff --git a/reTurn/TurnAllocation.hxx b/reTurn/TurnAllocation.hxx
@@ -4,6 +4,9 @@
 #include <map>
 #include <boost/noncopyable.hpp>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 
 #include "StunTuple.hxx"
 #include "StunAuth.hxx"

diff --git a/reTurn/TurnAllocationManager.hxx b/reTurn/TurnAllocationManager.hxx
@@ -3,6 +3,9 @@
 
 #include <map>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include "TurnAllocationKey.hxx"
 #include "ReTurnConfig.hxx"
 #include "StunTuple.hxx"

diff --git a/reTurn/TurnManager.hxx b/reTurn/TurnManager.hxx
@@ -3,6 +3,9 @@
 
 #include <map>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include "ReTurnConfig.hxx"
 #include "StunTuple.hxx"
 

diff --git a/reTurn/TurnPermission.hxx b/reTurn/TurnPermission.hxx
@@ -2,6 +2,9 @@
 #define TURNPERMISSION_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 
 #include "StunTuple.hxx"
 

diff --git a/reTurn/UdpRelayServer.hxx b/reTurn/UdpRelayServer.hxx
@@ -2,6 +2,9 @@
 #define UDP_REALY_SERVER_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <string>
 #include <boost/noncopyable.hpp>
 #include "RequestHandler.hxx"

diff --git a/reTurn/UdpServer.hxx b/reTurn/UdpServer.hxx
@@ -2,6 +2,9 @@
 #define UDP_SERVER_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <string>
 #include <boost/noncopyable.hpp>
 #include "RequestHandler.hxx"

diff --git a/reTurn/client/TurnAsyncSocket.cxx b/reTurn/client/TurnAsyncSocket.cxx
@@ -1,7 +1,6 @@
 #include "TurnAsyncSocket.hxx"
 #include "../AsyncSocketBase.hxx"
 #include "ErrorCode.hxx"
-#include <boost/bind.hpp>
 #include <rutil/WinLeakCheck.hxx>
 #include <rutil/Logger.hxx>
 #include "../ReTurnSubsystem.hxx"

diff --git a/reTurn/client/TurnAsyncSocket.hxx b/reTurn/client/TurnAsyncSocket.hxx
@@ -7,12 +7,18 @@
 #error You must define ASIO_ENABLE_CANCELIO in your build settings.
 #endif
 
-#include <map>
-#include <queue>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+
 #include <rutil/Data.hxx>
 #include <rutil/Mutex.hxx>
-#include <boost/function.hpp>
+
+#include <map>
+#include <queue>
 
 #include "reTurn/StunTuple.hxx"
 #include "reTurn/StunMessage.hxx"

diff --git a/reTurn/client/TurnAsyncSocketHandler.hxx b/reTurn/client/TurnAsyncSocketHandler.hxx
@@ -3,6 +3,9 @@
 
 #include <rutil/compat.hxx>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include "reTurn/AsyncSocketBaseHandler.hxx"
 #include "reTurn/DataBuffer.hxx"
 #include "reTurn/StunTuple.hxx"

diff --git a/reTurn/client/TurnAsyncTcpSocket.cxx b/reTurn/client/TurnAsyncTcpSocket.cxx
@@ -1,5 +1,4 @@
 #include "TurnAsyncTcpSocket.hxx"
-#include <boost/bind.hpp>
 
 // Remove warning about 'this' use in initiator list - pointer is only stored
 #if defined(WIN32) && !defined(__GNUC__)

diff --git a/reTurn/client/TurnAsyncTcpSocket.hxx b/reTurn/client/TurnAsyncTcpSocket.hxx
@@ -2,6 +2,10 @@
 #define TURNASYNCTCPSOCKET_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
+#include <boost/bind.hpp>
 
 #include "TurnAsyncSocket.hxx"
 #include "reTurn/AsyncTcpSocketBase.hxx"

diff --git a/reTurn/client/TurnAsyncTlsSocket.cxx b/reTurn/client/TurnAsyncTlsSocket.cxx
@@ -5,7 +5,6 @@
 
 #ifdef USE_SSL
 #include "TurnAsyncTlsSocket.hxx"
-#include <boost/bind.hpp>
 
 using namespace std;
 

diff --git a/reTurn/client/TurnAsyncTlsSocket.hxx b/reTurn/client/TurnAsyncTlsSocket.hxx
@@ -9,6 +9,7 @@
 
 #include <asio.hpp>
 #include <asio/ssl.hpp>
+#include <boost/bind.hpp>
 
 #include "TurnAsyncTcpSocket.hxx"
 #include "reTurn/AsyncTlsSocketBase.hxx"

diff --git a/reTurn/client/TurnAsyncUdpSocket.cxx b/reTurn/client/TurnAsyncUdpSocket.cxx
@@ -1,5 +1,4 @@
 #include "TurnAsyncUdpSocket.hxx"
-#include <boost/bind.hpp>
 
 // Remove warning about 'this' use in initiator list - pointer is only stored
 #if defined(WIN32) && !defined(__GNUC__)

diff --git a/reTurn/client/TurnAsyncUdpSocket.hxx b/reTurn/client/TurnAsyncUdpSocket.hxx
@@ -2,6 +2,10 @@
 #define TURNASYNCUDPSOCKET_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
+#include <boost/bind.hpp>
 
 #include "TurnAsyncSocket.hxx"
 #include "reTurn/AsyncUdpSocketBase.hxx"

diff --git a/reTurn/client/TurnSocket.cxx b/reTurn/client/TurnSocket.cxx
@@ -1,6 +1,5 @@
 #include "TurnSocket.hxx"
 #include "ErrorCode.hxx"
-#include <boost/bind.hpp>
 #include <rutil/Lock.hxx>
 #include <rutil/WinLeakCheck.hxx>
 #include <rutil/Logger.hxx>

diff --git a/reTurn/client/TurnSocket.hxx b/reTurn/client/TurnSocket.hxx
@@ -7,8 +7,14 @@
 #error You must define ASIO_ENABLE_CANCELIO in your build settings.
 #endif
 
-#include <vector>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
+#include <boost/bind.hpp>
+
+#include <vector>
+
 #include <rutil/Data.hxx>
 #include <rutil/Mutex.hxx>
 

diff --git a/reTurn/client/TurnTcpSocket.cxx b/reTurn/client/TurnTcpSocket.cxx
@@ -3,7 +3,6 @@
 #endif
 
 #include "TurnTcpSocket.hxx"
-#include <boost/bind.hpp>
 #include <rutil/Logger.hxx>
 #include "../ReTurnSubsystem.hxx"
 

diff --git a/reTurn/client/TurnTcpSocket.hxx b/reTurn/client/TurnTcpSocket.hxx
@@ -2,6 +2,10 @@
 #define TURNTCPSOCKET_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
+#include <boost/bind.hpp>
 
 #include "TurnSocket.hxx"
 

diff --git a/reTurn/client/TurnTlsSocket.cxx b/reTurn/client/TurnTlsSocket.cxx
@@ -4,10 +4,11 @@
 #endif
 
 #ifdef USE_SSL
+#include <boost/bind.hpp>
+
 #include "TurnTlsSocket.hxx"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include <boost/bind.hpp>
 #include <rutil/Logger.hxx>
 #include "../ReTurnSubsystem.hxx"
 

diff --git a/reTurn/client/TurnUdpSocket.cxx b/reTurn/client/TurnUdpSocket.cxx
@@ -3,7 +3,6 @@
 #endif
 
 #include "TurnUdpSocket.hxx"
-#include <boost/bind.hpp>
 
 using namespace std;
 

diff --git a/reTurn/client/TurnUdpSocket.hxx b/reTurn/client/TurnUdpSocket.hxx
@@ -2,6 +2,10 @@
 #define TURNUDPSOCKET_HXX
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
+#include <boost/bind.hpp>
 
 #include "TurnSocket.hxx"
 

diff --git a/reTurn/reTurnServer.cxx b/reTurn/reTurnServer.cxx
@@ -2,6 +2,9 @@
 #include <csignal>
 #include <string>
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/lexical_cast.hpp>

diff --git a/reflow/Flow.cxx b/reflow/Flow.cxx
@@ -3,7 +3,11 @@
 #endif
 
 #include <asio.hpp>
+#ifdef USE_SSL
+#include <asio/ssl.hpp>
+#endif
 #include <boost/function.hpp>
+
 #include <rutil/Log.hxx>
 #include <rutil/Logger.hxx>
 #include <rutil/Timer.hxx>

diff --git a/reflow/FlowDtlsSocketContext.cxx b/reflow/FlowDtlsSocketContext.cxx
@@ -3,14 +3,15 @@
 #endif
 
 #ifdef USE_SSL
-#include <rutil/Log.hxx>
-#include <rutil/Logger.hxx>
-#include <rutil/Timer.hxx>
-
 #include <asio.hpp>
+#include <asio/ssl.hpp>
 #include <boost/function.hpp>
 #include <iostream>
 
+#include <rutil/Log.hxx>
+#include <rutil/Logger.hxx>
+#include <rutil/Timer.hxx>
+
 #include "FlowDtlsSocketContext.hxx"
 #include "FlowManagerSubsystem.hxx"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     #endif
     #include "TurnUdpSocket.hxx"
-    #include <boost/bind.hpp>
     using namespace std;
@@ Expand Down @@