merge

1 files changed, 15 insertions, 8 deletions

diff --git a/src/Daemon/CommLayerServerSocket.cpp b/src/Daemon/CommLayerServerSocket.cpp
index 6b62928b..ee775c6d 100644
--- a/src/Daemon/CommLayerServerSocket.cpp
+++ b/src/Daemon/CommLayerServerSocket.cpp
@@ -26,7 +26,7 @@ void CCommLayerServerSocket::Send(const std::string& pData, GIOChannel *pDestina
         ret = g_io_channel_write_chars(pDestination, message + offset, strlen(message + offset), &len, &err);
         if (ret == G_IO_STATUS_ERROR)
         {
-            warn_client("Error during sending data.");
+            error_msg("Error during sending data");
         }
     }
 
@@ -72,7 +72,7 @@ gboolean CCommLayerServerSocket::client_socket_cb(GIOChannel *source, GIOConditi
         ret = g_io_channel_read_chars(source, buff, 1, &len, &err);
         if (ret == G_IO_STATUS_ERROR)
         {
-            warn_client(std::string("Error while reading data from client socket: ") + err->message);
+            error_msg("Error while reading data from client socket: %s", err->message);
             return FALSE;
         }
         message += buff[0];
@@ -101,13 +101,13 @@ gboolean CCommLayerServerSocket::server_socket_cb(GIOChannel *source, GIOConditi
         condition & G_IO_ERR ||
         condition & G_IO_NVAL)
     {
-        warn_client("Server socket error.");
+        error_msg("Server socket error");
         return FALSE;
     }
 
     if ((socket = accept(serverSocket->m_nSocket,  (struct sockaddr *)&remote, &len)) == -1)
     {
-        warn_client("Server can not accept client.");
+        error_msg("Server can not accept client");
         return TRUE;
     }
     log("New socket client connected");
@@ -117,7 +117,7 @@ gboolean CCommLayerServerSocket::server_socket_cb(GIOChannel *source, GIOConditi
                         static_cast<GIOFunc>(client_socket_cb),
                         data))
     {
-        warn_client("Can not init g_io_channel.");
+        error_msg("Can not init g_io_channel");
         return TRUE;
     }
     serverSocket->m_mapClientChannels[socket] = gSocket;
@@ -138,7 +138,9 @@ void CCommLayerServerSocket::ProcessMessage(const std::string& pMessage, GIOChan
     {
         std::string message = pMessage.substr(sizeof(MESSAGE_REPORT) - 1);
         map_crash_report_t report = string_to_crash_report(message);
-        Report(report, UID);
+        map_plugin_settings_t plugin_settings;
+        //FIXME: another hack to make this compile
+//        Report(report, plugin_settings, UID);
     }
     else if (!strncmp(pMessage.c_str(), MESSAGE_CREATE_REPORT, sizeof(MESSAGE_CREATE_REPORT) - 1))
     {
@@ -155,7 +157,7 @@ void CCommLayerServerSocket::ProcessMessage(const std::string& pMessage, GIOChan
     }
     else
     {
-        warn_client("Received unknown message type.");
+        error_msg("Received unknown message type");
     }
 }
 
@@ -227,7 +229,12 @@ vector_crash_infos_t CCommLayerServerSocket::GetCrashInfos(const std::string &pS
 report_status_t CCommLayerServerSocket::Report(const map_crash_report_t& pReport, const std::string& pSender)
 {
     report_status_t rs;
-    rs = ::Report(pReport, pSender);
+    //FIXME: a hack to make this compile, but we don't use sockets anyway
+    /* we could probably remove the sockets and rely only on dbus,
+       as it will become mandatory even on servers, but this needs some investigation
+       and more opinions
+   */
+    //rs = ::Report(pReport, pSettings, pSender);
     return rs;
 }