Changeset 4440 for pjproject/trunk/pjsip-apps/src/pjsua/main.c

Timestamp:

Mar 14, 2013 7:18:13 AM (12 years ago)

Author:

riza

Message:

Re #1643: add initial support for CLI

File:

• pjproject/trunk/pjsip-apps/src/pjsua/main.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/main.c

@@ -30 +30 @@
 pj_status_t app_init(int argc, char *argv[]);
 pj_status_t app_main(void);
-pj_status_t app_destroy(void);
-
+pj_status_t app_destroy();
+pj_status_t receive_end_sig;
+pj_thread_t *sig_thread;
 
 #if defined(PJ_WIN32) && PJ_WIN32!=0
@@ -39 +40 @@
 
 static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
-{
-    pj_thread_t *thread;
-
+{   
     switch (fdwCtrlType) 
     { 
@@ -51 +50 @@
         case CTRL_LOGOFF_EVENT: 
         case CTRL_SHUTDOWN_EVENT: 
-            pj_thread_register("ctrlhandler", handler_desc, &thread);
+            pj_thread_register("ctrlhandler", handler_desc, &sig_thread);
             PJ_LOG(3,(THIS_FILE, "Ctrl-C detected, quitting.."));
-            app_destroy();
+            receive_end_sig = PJ_TRUE;
+            app_destroy();          
             ExitProcess(1);
             PJ_UNREACHED(return TRUE;)
@@ -88 +88 @@
 static int main_func(int argc, char *argv[])
 {
+    receive_end_sig = PJ_FALSE;
     setup_socket_signal();
 
@@ -99 +100 @@
 
         app_main();
-        app_destroy();
+        if (!receive_end_sig) {
+            app_destroy();
 
-        /* This is on purpose */
-        app_destroy();
+            /* This is on purpose */
+            app_destroy();
+        } else {
+            pj_thread_join(sig_thread);
+        }
     } while (app_restart);