Emacs/cc-ide: More robust function movement master

Network/MediaServ: Sync with SENF updates

diff --git a/Server/HTTPConnection.hh b/Server/HTTPConnection.hh
index 178cec2..76d17b0 100644 (file)
--- a/Server/HTTPConnection.hh
+++ b/Server/HTTPConnection.hh
@@ -13,6 +13,7 @@
 #include "Utils/intrusive_refcount.hh"
 #include "Scheduler/ReadHelper.hh"
 #include "Scheduler/WriteHelper.hh"
+#include "Socket/Protocols/INet/INetAddressing.hh"
 #include "HTTPLogger.hh"
 #include "HTTPRequest.hh"
 
@@ -37,7 +38,9 @@ namespace mediaserv {
            senf::MakeSocketPolicy<senf::ConnectedCommunicationPolicy,
                                          senf::StreamFramingPolicy,
                                          senf::ReadablePolicy,
-                                         senf::WriteablePolicy>::policy> ClientHandle;
+                                         senf::WriteablePolicy,
+                                         senf::INet4AddressingPolicy
+                                  >::policy> ClientHandle;
 
        static const unsigned MaxRequestSize = 16384;
        static const unsigned StreamBufferMSecs = 4000;

diff --git a/Server/HTTPLogger.cc b/Server/HTTPLogger.cc
index f2f880e..d69363c 100644 (file)
--- a/Server/HTTPLogger.cc
+++ b/Server/HTTPLogger.cc
@@ -10,7 +10,7 @@
 //#include "HTTPLogger.ih"
 
 // Custom includes
-#include "Socket/INetAddressing.hh"
+#include "Socket/Protocols/INet/INetAddressing.hh"
 #include "Socket/CommunicationPolicy.hh"
 
 //#include "HTTPLogger.mpp"

diff --git a/Server/HTTPRequest.cc b/Server/HTTPRequest.cc
index 31b546c..ea1aeae 100644 (file)
--- a/Server/HTTPRequest.cc
+++ b/Server/HTTPRequest.cc
@@ -11,7 +11,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/range.hpp>
 #include "Socket/ClientSocketHandle.hh"
-#include "Socket/INetAddressing.hh"
+#include "Socket/Protocols/INet/INetAddressing.hh"
 #include "Socket/CommunicationPolicy.hh"
 
 //#include "HTTPRequest.mpp"

diff --git a/main.cc b/main.cc
index c1b4193..b5f01c6 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -24,7 +24,7 @@
 #include "Utils/DaemonTools.hh"
 #include "Server/HTTPLogger.hh"
 #include "Server/SimpleHTTPServer.hh"
-#include "Socket/TCPSocketHandle.hh"
+#include "Socket/Protocols/INet/TCPSocketHandle.hh"
 
 //#include "main.mpp"
 #define prefix_

diff --git a/testclient.cc b/testclient.cc
index f74f517..e439e1f 100644 (file)
--- a/testclient.cc
+++ b/testclient.cc
@@ -9,7 +9,7 @@
 
 // Custom includes
 #include <iostream>
-#include "Socket/TCPSocketHandle.hh"
+#include "Socket/Protocols/INet/TCPSocketHandle.hh"
 #include "Utils/MicroTime.hh"
 
 //#include "testclient.mpp"