X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fservices%2Ftcpsvcs%2Ftcpsvcs.c;h=188fbfa5a68d27c5f73fcc54a88c4a3dd34c928d;hp=014fcdedfb8c7e93b0168759440c7021421d7ed9;hb=64bc82cc1af8c7ac445c20d3bf073cf697e5bdba;hpb=9ed49dabde41844e059dff6165c6ea13b973f5bc

diff --git a/reactos/services/tcpsvcs/tcpsvcs.c b/reactos/services/tcpsvcs/tcpsvcs.c
index 014fcdedfb8..188fbfa5a68 100644
--- a/reactos/services/tcpsvcs/tcpsvcs.c
+++ b/reactos/services/tcpsvcs/tcpsvcs.c
@@ -15,32 +15,31 @@
  * TODO:
  * - Start tcpsvcs as a service.
  * - write debugging function and print all dbg info via that.
- *
+ * - change 'temp' to something meaningfull
  */
- 
-#include <stdio.h>
-#include <winsock2.h>
-#include <tchar.h>
+
+
 #include "tcpsvcs.h"
 
-#if 0
+//#define NDEBUG
+//#include <debug.h>
+
+
 /*
  * globals
  */
+VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]);
+
 static SERVICE_STATUS hServStatus;
 static SERVICE_STATUS_HANDLE hSStat;
+
 FILE *hLogFile;
-BOOL bLogEvents = TRUE;
-BOOL ShutDown, PauseFlag;
-LPCTSTR LogFileName = "tcpsvcs_log.log";
+BOOL bShutDown = FALSE;
+BOOL bPause = FALSE;
 
-static SERVICE_TABLE_ENTRY
-ServiceTable[2] =
-{
-    {_T("tcpsvcs"), ServiceMain},
-    {NULL, NULL}
-};
-#endif
+LPCTSTR LogFileName = "\\tcpsvcs_log.log";
+LPTSTR ServiceName = _T("Simp Tcp");
+//LPTSTR DisplayName = _T("Simple TCP/IP Services");
 
 static SERVICES
 Services[NUM_SERVICES] =
@@ -53,97 +52,65 @@ Services[NUM_SERVICES] =
 };
 
 
-int main(void)
+int
+main(int argc, char *argv[])
 {
-    DWORD dwThreadId[NUM_SERVICES];
-    HANDLE hThread[NUM_SERVICES];
-    WSADATA wsaData;
-    DWORD RetVal;
-    INT i;
-    
-    if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0)
-    {
-        _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal);
-        return -1;
-    }
-
-    /* Create MAX_THREADS worker threads. */
-    for( i=0; i<NUM_SERVICES; i++ )
+    SERVICE_TABLE_ENTRY ServiceTable[] =
     {
-        _tprintf(_T("Starting %s server....\n"), Services[i].Name);
+        {ServiceName, ServiceMain},
+        {NULL, NULL}
+    };
 
-        hThread[i] = CreateThread(
-            NULL,              // default security attributes
-            0,                 // use default stack size
-            StartServer,       // thread function
-            &Services[i],     // argument to thread function
-            0,                 // use default creation flags
-            &dwThreadId[i]);   // returns the thread identifier
+    //DPRINT("Starting tcpsvcs service. See \system32%s for logs\n", LogFileName);
 
-        /* Check the return value for success. */
-        if (hThread[i] == NULL)
-        {
-            _tprintf(_T("Failed to start %s server....\n"), Services[i].Name);
-            //ExitProcess(i);
-        }
-    }
+    if (! StartServiceCtrlDispatcher(ServiceTable))
+        LogEvent(_T("failed to start the service control dispatcher\n"), -1, TRUE);
 
-    /* Wait until all threads have terminated. */
-    WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE);
+    //DPRINT("Shutdown tcpsvcs service\n");
 
-    /* Close all thread handles upon completion. */
-    for(i=0; i<NUM_SERVICES; i++)
-    {
-        CloseHandle(hThread[i]);
-    }
     return 0;
 }
 
 
-
-/* code to run tcpsvcs as a service through services.msc */
-#if 0
-int
-main(int argc, char *argv[])
+VOID WINAPI
+ServiceMain(DWORD argc, LPTSTR argv[])
 {
-    //DPRINT("tcpsvcs: main() started. See tcpsvcs_log.txt for info\n");
+	TCHAR LogFilePath[MAX_PATH];
 
-    if (!StartServiceCtrlDispatcher(ServiceTable))
-        _tprintf(_T("failed to start the service control dispatcher\n"));
+    if(! GetSystemDirectory(LogFilePath, MAX_PATH))
+        return;
 
-    //DPRINT("tcpsvcs: main() done\n");
+    _tcscat(LogFilePath, LogFileName);
 
-    return 0;
-}
+	hLogFile = fopen(LogFilePath, _T("a+"));
+    if (hLogFile == NULL)
+    {
+        TCHAR buf[50];
 
+        _stprintf(buf, _T("Could not open log file: %s\n"), LogFilePath);
+        MessageBox(NULL, buf, NULL, MB_OK);
+        return;
+    }
 
-static VOID WINAPI
-ServiceMain(DWORD argc, LPTSTR argv[])
-{
-    DWORD i;
 
-    hLogFile = fopen(LogFileName, _T("w+"));
-    if (hLogFile == NULL)
-        return;
-        
-    LogEvent(_T("Entering ServiceMain"), 0, FALSE);
+    LogEvent(_T("Entering ServiceMain\n"), 0, FALSE);
 
     hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
     hServStatus.dwCurrentState = SERVICE_START_PENDING;
     hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP |
         SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE;
     hServStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR;
-    hServStatus.dwServiceSpecificExitCode = 0;
+    hServStatus.dwServiceSpecificExitCode = NO_ERROR;
     hServStatus.dwCheckPoint = 0;
     hServStatus.dwWaitHint = 2*CS_TIMEOUT;
-    
-    hSStat = RegisterServiceCtrlHandler("tcpsvcs", ServerCtrlHandler);
+
+    hSStat = RegisterServiceCtrlHandler(ServiceName, ServerCtrlHandler);
     if (hSStat == 0)
-        LogEvent(_T("Failed to register service\n"), 100, TRUE);
+        LogEvent(_T("Failed to register service\n"), -1, TRUE);
 
-	LogEvent(_T("Control handler registered successfully"), 0, FALSE);
+	LogEvent(_T("Control handler registered successfully\n"), 0, FALSE);
 	SetServiceStatus (hSStat, &hServStatus);
-	LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE);
+	LogEvent(_T("Service status set to SERVICE_START_PENDING\n"), 0, FALSE);
 
     if (CreateServers() != 0)
     {
@@ -152,13 +119,16 @@ ServiceMain(DWORD argc, LPTSTR argv[])
         SetServiceStatus(hSStat, &hServStatus);
         return;
     }
-    
-	LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE);
+
+	LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status\n"), 0, FALSE);
 	/*  We will only return here when the ServiceSpecific function
 		completes, indicating system shutdown. */
 	UpdateStatus (SERVICE_STOPPED, 0);
-	LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE);
-	fclose(hLogFile);  /*  Clean up everything, in general */
+	LogEvent(_T("Service status set to SERVICE_STOPPED\n"), 0, FALSE);
+	LogEvent(_T("Leaving ServiceMain\n"), 0, FALSE);
+	
+	fclose(hLogFile);
+
 	return;
 
 }
@@ -166,18 +136,23 @@ ServiceMain(DWORD argc, LPTSTR argv[])
 VOID WINAPI
 ServerCtrlHandler(DWORD Control)
 {
+	TCHAR buf[256];
+
     switch (Control)
     {
         case SERVICE_CONTROL_SHUTDOWN: /* fall through */
         case SERVICE_CONTROL_STOP:
-            ShutDown = TRUE;
+			LogEvent(_T("stopping service\n"), 0, FALSE);
+            InterlockedExchange((LONG *)&bShutDown, TRUE);
             UpdateStatus(SERVICE_STOP_PENDING, -1);
             break;
-        case SERVICE_CONTROL_PAUSE:
-            PauseFlag = TRUE;
+        case SERVICE_CONTROL_PAUSE: /* not yet implemented */
+			LogEvent(_T("pausing service\n"), 0, FALSE);
+            InterlockedExchange((LONG *)&bPause, TRUE);
             break;
         case SERVICE_CONTROL_CONTINUE:
-            PauseFlag = FALSE;
+			LogEvent(_T("continuing service\n"), 0, FALSE);
+            InterlockedExchange((LONG *)&bPause, FALSE);
             break;
         case SERVICE_CONTROL_INTERROGATE:
             break;
@@ -193,11 +168,17 @@ ServerCtrlHandler(DWORD Control)
 void UpdateStatus (int NewStatus, int Check)
 /*  Set a new service status and checkpoint (either specific value or increment) */
 {
-	if (Check < 0 ) hServStatus.dwCheckPoint++;
-	else			hServStatus.dwCheckPoint = Check;
-	if (NewStatus >= 0) hServStatus.dwCurrentState = NewStatus;
-	if (!SetServiceStatus (hSStat, &hServStatus))
-		LogEvent (_T("Cannot set service status"), 101, TRUE);
+	if (Check < 0 )
+        hServStatus.dwCheckPoint++;
+	else
+        hServStatus.dwCheckPoint = Check;
+
+	if (NewStatus >= 0)
+        hServStatus.dwCurrentState = NewStatus;
+
+	if (! SetServiceStatus (hSStat, &hServStatus))
+		LogEvent(_T("Cannot set service status\n"), -1, TRUE);
+
 	return;
 }
 
@@ -206,14 +187,27 @@ CreateServers()
 {
     DWORD dwThreadId[NUM_SERVICES];
     HANDLE hThread[NUM_SERVICES];
+	WSADATA wsaData;
+	TCHAR buf[256];
     INT i;
-    
+    DWORD RetVal;
+
+    if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0)
+    {
+        _stprintf(buf, _T("WSAStartup() failed : %lu\n"), RetVal);
+        LogEvent(buf, RetVal, TRUE);
+        return -1;
+    }
+
     UpdateStatus(-1, -1); /* increment checkpoint */
 
+    LogEvent(_T("Creating server Threads\n"), 0, FALSE);
+
     /* Create MAX_THREADS worker threads. */
     for( i=0; i<NUM_SERVICES; i++ )
     {
-        _tprintf(_T("Starting %s server....\n"), Services[i].Name);
+        _stprintf(buf, _T("Starting %s server....\n"), Services[i].Name);
+        LogEvent(buf, 0, FALSE);
 
         hThread[i] = CreateThread(
             NULL,              // default security attributes
@@ -226,11 +220,18 @@ CreateServers()
         /* Check the return value for success. */
         if (hThread[i] == NULL)
         {
-            _tprintf(_T("Failed to start %s server....\n"), Services[i].Name);
+            _stprintf(buf, _T("Failed to start %s server....\n"), Services[i].Name);
+            /* don't exit process via LogEvent. We want to exit via the server
+             * which failed to start, which could mean i=0 */
+            LogEvent(buf, 0, TRUE);
             ExitProcess(i);
         }
     }
 
+    LogEvent(_T("setting service status to running\n"), 0, FALSE);
+
+    UpdateStatus(SERVICE_RUNNING, 0);
+
     /* Wait until all threads have terminated. */
     WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE);
 
@@ -239,6 +240,10 @@ CreateServers()
     {
         CloseHandle(hThread[i]);
     }
+    
+    LogEvent(_T("Detaching Winsock2...\n"), 0, FALSE);
+    WSACleanup();
+    
     return 0;
 }
 
@@ -254,26 +259,28 @@ LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg)
 	LPTSTR lpvSysMsg;
 	TCHAR MessageBuffer[512];
 
-	if (PrintErrorMsg) {
+
+
+	if (PrintErrorMsg)
+    {
 		eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
 			FORMAT_MESSAGE_FROM_SYSTEM, NULL,
 			ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
 			(LPTSTR)&lpvSysMsg, 0, NULL);
 
-		_stprintf (MessageBuffer, _T("\n%s %s ErrNum = %d. ExitCode = %d."),
+		_stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %lu."),
 			UserMessage, lpvSysMsg, ErrNum, ExitCode);
-		HeapFree (GetProcessHeap (), 0, lpvSysMsg);
-	} else {
-		_stprintf (MessageBuffer, _T("\n%s ExitCode = %d."),
-			UserMessage, ExitCode);
+		HeapFree(GetProcessHeap (), 0, lpvSysMsg);
+	}
+    else
+    {
+		_stprintf(MessageBuffer, _T("%s"), UserMessage);
 	}
 
 	fputs (MessageBuffer, hLogFile);
 
-	if (ExitCode > 0)
-		ExitProcess (ExitCode);
+	if (ExitCode != 0)
+		ExitProcess(ExitCode);
 	else
 		return;
 }
-
-#endif