Changeset 97

Timestamp:

08/24/10 08:57:23 (18 months ago)

Author:

jay

Message:

-- Added svcregistry module. This is the initial commit for using the windows registry to store the configuration file's path. The config path is hard-coded

Location:

trunk/sources/win32service/win32service

Files:

• include/rtmpserver/rtmpserver.h (modified) (1 diff)
• include/svc/serviceregistry.h (added)
• include/svc/svcdefines.h (modified) (1 diff)
• src/rtmpserver/rtmpserver.cpp (modified) (3 diffs)
• src/svc/serviceregistry.cpp (added)
• src/svc/svc.cpp (modified) (3 diffs)

trunk/sources/win32service/win32service/include/rtmpserver/rtmpserver.h

@@ -7 +7 @@
 void Run();
 void Cleanup();
-void rtmpserver();
+void rtmpserver(char * config_filePath);

trunk/sources/win32service/win32service/include/svc/svcdefines.h

@@ -3 +3 @@
 #define SVCNAME TEXT("evo") //name of the service
 
+//For Registry. Everything is set manually, NOT following any convention.
+#define ADD_KEY 1
+#define GET_KEY_VALUE 2
+#define REGIST_SUCCESS "reg_success"
+#define REGIST_ERROR "reg_error"
 
 // The following are message definitions.

trunk/sources/win32service/win32service/src/rtmpserver/rtmpserver.cpp

@@ -32 +32 @@
 struct RunningStatus {
     // startup parameters
-    int argc;
- //   char **argv;
+ //   int argc;
+    char * configPath;
 
     //Configuration file
@@ -50 +50 @@
 RunningStatus gRs = {0};
 
-void rtmpserver() {
+void rtmpserver(char * config_filePath) {
         InitNetworking();
 
+        gRs.configPath = config_filePath;
     do {
         //2. Reset the run flag
@@ -82 +83 @@
 
     gRs.pConfigFile = new ConfigFile();
-        string configFilePath = "C:\\rtmpd-clean\\builders\\VS2010\\Debug\\rtmpserver.lua"/*"rtmpserver.lua"*/;
+        string configFilePath = gRs.configPath/*"C:\\rtmpd-clean\\builders\\VS2010\\Debug\\rtmpserver.lua"*/;
     string fileName;
     string extension;

trunk/sources/win32service/win32service/src/svc/svc.cpp

@@ -28 +28 @@
     if( lstrcmpi( argv[1], TEXT("installService")) == 0 )
     {
-                SvcInstall();
-                //OpenRegistry();
+                if(GetSvcRegistry() != REGIST_ERROR)
+                        SvcInstall();
+                else
+                        printf("\n The service is not installed because of error(s) in registry\n");
         return;
     }else if( lstrcmpi( argv[1], TEXT("uninstallService")) == 0)
@@ -65 +67 @@
                         if (!DoQuerySvc){
                                 printf("Server will start normally.\n\n");
-                                rtmpserver();
+                                rtmpserver(GetSvcRegistry());
                                 return;
                         }else{
-                                printf("\nERROR: Server cannot be started normally.\n\n");
-                                printf("Service described above is already installed.\n");
+                                printf("\nERROR: Server cannot be started normally because the service described above is already installed. .\n\n");
                                 printf("Start/Stop the server by starting/stopping the service.\n\n");
                                 printf("To start server normally, enter 'uninstallService' command to delete the service.\n\n");
@@ -392 +393 @@
 DWORD WINAPI ThreadProc( __in  LPVOID lpParameter)
 {
-        rtmpserver();
+        rtmpserver(SvcRegistry(GET_KEY_VALUE));
         //the lines below works too.
         /*if(Initialize())