Netzwerk-Code auf boost::asio umgestellt

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mad.cpp b/src/mad.cpp
index 035c0be..22a3b44 100644
--- a/src/mad.cpp
+++ b/src/mad.cpp
@@ -17,8 +17,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Net/FdManager.h"
-#include "Net/IPAddress.h"
 #include "Net/ThreadManager.h"
 #include "Common/ConfigManager.h"
 #include "Common/LogManager.h"
@@ -26,10 +24,10 @@
 #include "Common/ModuleManager.h"
 #include "Common/RequestManager.h"
 #include "Common/ClientConnection.h"
+#include "Common/Requests/IdentifyRequest.h"
 #include "Common/RequestHandlers/FSInfoRequestHandler.h"
 #include "Common/RequestHandlers/StatusRequestHandler.h"
 #include "Daemon/Backends/NetworkLogger.h"
-#include "Daemon/Requests/IdentifyRequest.h"
 #include "Daemon/RequestHandlers/CommandRequestHandler.h"
 
 #include <unistd.h>
@@ -57,7 +55,8 @@ int main() {
   Common::ClientConnection *connection = new Common::ClientConnection;
 
   try {
-    connection->connect(Net::IPAddress("127.0.0.1"), true);
+    connection->connect(boost::asio::ip::tcp::endpoint(
+        boost::asio::ip::address_v4::from_string("127.0.0.1"), 6666));
 
     while(connection->isConnecting())
       usleep(100000);
@@ -71,7 +70,7 @@ int main() {
     //char hostname[256];
     //gethostname(hostname, sizeof(hostname));
     //Common::RequestManager::get()->sendRequest<Daemon::Requests::IdentifyRequest>(connection, sigc::ptr_fun(requestFinished), hostname);
-    Common::RequestManager::get()->sendRequest<Daemon::Requests::IdentifyRequest>(connection, &requestFinished, "test");
+    Common::RequestManager::get()->sendRequest<Common::Requests::IdentifyRequest>(connection, &requestFinished, "test");
 
     while(connection->isConnected())
       usleep(100000);