-Start to convert tcpsvcs to a proper NT service. Supports starting and stopping...

[reactos.git] / reactos / services / tcpsvcs / discard.c

diff --git a/reactos/services/tcpsvcs/discard.c b/reactos/services/tcpsvcs/discard.c
index a521521..2b2853e 100644 (file)
--- a/reactos/services/tcpsvcs/discard.c
+++ b/reactos/services/tcpsvcs/discard.c
@@ -12,9 +12,6 @@
  *\r
  */\r
 \r
-#include <stdio.h>\r
-#include <winsock2.h>\r
-#include <tchar.h>\r
 #include "tcpsvcs.h"\r
 \r
 DWORD WINAPI DiscardHandler(VOID* Sock_)\r
@@ -24,22 +21,20 @@ DWORD WINAPI DiscardHandler(VOID* Sock_)
 \r
     if (!RecieveIncomingPackets(Sock))\r
     {\r
-        _tprintf(_T("RecieveIncomingPackets failed\n"));\r
+        LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE);\r
         RetVal = -1;\r
     }\r
 \r
-    _tprintf(_T("Shutting connection down...\n"));\r
+    LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE);\r
     if (ShutdownConnection(Sock, TRUE))\r
-    {\r
-        _tprintf(_T("Connection is down.\n"));\r
-    }\r
+        LogEvent(_T("Discard: Connection is down.\n"), 0, FALSE);\r
     else\r
     {\r
-        _tprintf(_T("Connection shutdown failed\n"));\r
+        LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE);\r
         RetVal = -1;\r
     }\r
     \r
-    _tprintf(_T("Terminating discard thread\n"));\r
+    LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE);\r
     ExitThread(RetVal);\r
 }\r
 \r
@@ -48,20 +43,25 @@ DWORD WINAPI DiscardHandler(VOID* Sock_)
 BOOL RecieveIncomingPackets(SOCKET Sock)\r
 {\r
     TCHAR ReadBuffer[BUF];\r
+    TCHAR temp[512]; // temp for holding LogEvent text\r
     INT ReadBytes;\r
 \r
     do\r
     {\r
         ReadBytes = recv(Sock, ReadBuffer, BUF, 0);\r
         if (ReadBytes > 0)\r
-            _tprintf(_T("Received %d bytes from client\n"), ReadBytes);\r
+        {\r
+            _stprintf(temp, _T("Received %d bytes from client\n"), ReadBytes);\r
+            LogEvent(temp, 0, FALSE);\r
+        }\r
         else if (ReadBytes == SOCKET_ERROR)\r
         {\r
-            _tprintf(("Socket Error: %d\n"), WSAGetLastError());\r
+            _stprintf(temp, ("Socket Error: %d\n"), WSAGetLastError());\r
+            LogEvent(temp, 0, TRUE);\r
             return FALSE;\r
         }\r
     } while (ReadBytes > 0);\r
 \r
-    _tprintf(("Connection closed by peer.\n"));\r
+    LogEvent(_T("Discard: Connection closed by peer.\n"), 0, FALSE);\r
     return TRUE;\r
 }\r