Changeset 197 for pjproject/trunk/pjsip/src/pjsua/pjsua_core.c

Timestamp:

Feb 19, 2006 1:38:06 AM (18 years ago)

Author:

bennylp

Message:

Initial SIMPLE implementation

File:

• pjproject/trunk/pjsip/src/pjsua/pjsua_core.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/pjsua/pjsua_core.c

@@ -80 +80 @@
 
     pj_list_init(&pjsua.inv_list);
+
+    /* Init server presence subscription list: */
+    
+    pj_list_init(&pjsua.pres_srv_list);
+
 }
 
@@ -392 +397 @@
 
 
-static int PJ_THREAD_FUNC pjsua_worker_thread(void *arg)
+static int PJ_THREAD_FUNC pjsua_poll(void *arg)
 {
     PJ_UNUSED_ARG(arg);
 
-    while (!pjsua.quit_flag) {
+    do {
         pj_time_val timeout = { 0, 10 };
         pjsip_endpt_handle_events (pjsua.endpt, &timeout);
-    }
+    } while (!pjsua.quit_flag);
 
     return 0;
@@ -436 +441 @@
 
 
-    /* Init PJSIP and all the modules: */
+    /* Init PJSIP : */
 
     status = init_stack();
@@ -444 +449 @@
         return status;
     }
+
+
+    /* Init core SIMPLE module : */
+
+    pjsip_evsub_init_module(pjsua.endpt);
+
+    /* Init presence module: */
+
+    pjsip_pres_init_module( pjsua.endpt, pjsip_evsub_instance());
+
+
+    /* Init pjsua presence handler: */
+
+    pjsua_pres_init();
 
 
@@ -610 +629 @@
 
     for (i=0; i<pjsua.thread_cnt; ++i) {
-        status = pj_thread_create( pjsua.pool, "pjsua", &pjsua_worker_thread,
+        status = pj_thread_create( pjsua.pool, "pjsua", &pjsua_poll,
                                    NULL, 0, 0, &pjsua.threads[i]);
         if (status != PJ_SUCCESS) {
@@ -636 +655 @@
 
 
-
+    PJ_LOG(3,(THIS_FILE, "PJSUA version %s started", PJ_VERSION));
     return PJ_SUCCESS;
 }
 
+
+/* Sleep with polling */
+static void busy_sleep(unsigned msec)
+{
+    pj_time_val timeout, now;
+
+    pj_gettimeofday(&timeout);
+    timeout.msec += msec;
+    pj_time_val_normalize(&timeout);
+
+    do {
+        pjsua_poll(NULL);
+        pj_gettimeofday(&now);
+    } while (PJ_TIME_VAL_LT(now, timeout));
+}
 
 /*
@@ -648 +682 @@
     int i;
 
-    /* Unregister, if required: */
-    if (pjsua.regc) {
-
-        pjsua_regc_update(0);
-
-        /* Wait for some time to allow unregistration to complete: */
-
-        pj_thread_sleep(500);
-    }
-
     /* Signal threads to quit: */
-
     pjsua.quit_flag = 1;
 
-
-    /* Shutdown pjmedia-codec: */
-
-    pjmedia_codec_deinit();
-
-
-    /* Destroy sound framework: 
-     * (this should be done in pjmedia_shutdown())
-     */
-    pj_snd_deinit();
-
     /* Wait worker threads to quit: */
-
     for (i=0; i<pjsua.thread_cnt; ++i) {
         
@@ -684 +695 @@
     }
 
+
+    /* Terminate all calls. */
+    pjsua_inv_shutdown();
+
+    /* Terminate all presence subscriptions. */
+    pjsua_pres_shutdown();
+
+    /* Unregister, if required: */
+    if (pjsua.regc) {
+        pjsua_regc_update(0);
+    }
+
+    /* Wait for some time to allow unregistration to complete: */
+    PJ_LOG(4,(THIS_FILE, "Shutting down..."));
+    busy_sleep(1000);
+
+    /* Shutdown pjmedia-codec: */
+    pjmedia_codec_deinit();
+
+    /* Destroy sound framework: 
+     * (this should be done in pjmedia_shutdown())
+     */
+    pj_snd_deinit();
+
     /* Destroy endpoint. */