Changeset 247

Timestamp:

Feb 27, 2006 11:54:23 PM (19 years ago)

Author:

bennylp

Message:

Fixed bug in conference instantiation when max-ports is not properly set

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

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

@@ -420 +420 @@
 static int PJ_THREAD_FUNC pjsua_poll(void *arg)
 {
+    pj_status_t last_err = 0;
+
     PJ_UNUSED_ARG(arg);
 
     do {
         pj_time_val timeout = { 0, 10 };
-        pjsip_endpt_handle_events (pjsua.endpt, &timeout);
+        pj_status_t status;
+        
+        status = pjsip_endpt_handle_events (pjsua.endpt, &timeout);
+        if (status != last_err) {
+            last_err = status;
+            pjsua_perror(THIS_FILE, "handle_events() returned error", status);
+        }
     } while (!pjsua.quit_flag);
 
@@ -508 +516 @@
         return status;
     }
+
+    /* Init pjmedia-codecs: */
+
+    status = pjmedia_codec_init(pjsua.med_endpt);
+    if (status != PJ_SUCCESS) {
+        pj_caching_pool_destroy(&pjsua.cp);
+        pjsua_perror(THIS_FILE, 
+                     "Media codec initialization has returned error", 
+                     status);
+        return status;
+    }
+
+
+    /* Done. */
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Find account for incoming request.
+ */
+int pjsua_find_account_for_incoming(pjsip_rx_data *rdata)
+{
+    pjsip_uri *uri;
+    pjsip_sip_uri *sip_uri;
+    int acc_index;
+
+    uri = rdata->msg_info.to->uri;
+
+    /* Just return account #0 if To URI is not SIP: */
+    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && 
+        !PJSIP_URI_SCHEME_IS_SIPS(uri)) 
+    {
+        return 0;
+    }
+
+
+    sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);
+
+    /* Find account which has matching username and domain. */
+    for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
+
+        pjsua_acc *acc = &pjsua.acc[acc_index];
+
+        if (pj_stricmp(&acc->user_part, &sip_uri->user)==0 &&
+            pj_stricmp(&acc->host_part, &sip_uri->host)==0) 
+        {
+            /* Match ! */
+            return acc_index;
+        }
+    }
+
+    /* No matching, try match domain part only. */
+    for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
+
+        pjsua_acc *acc = &pjsua.acc[acc_index];
+
+        if (pj_stricmp(&acc->host_part, &sip_uri->host)==0) {
+            /* Match ! */
+            return acc_index;
+        }
+    }
+
+    /* Still no match, just return account #0 */
+    return 0;
+}
+
+
+/*
+ * Find account for outgoing request.
+ */
+int pjsua_find_account_for_outgoing(const pj_str_t *url)
+{
+    PJ_UNUSED_ARG(url);
+
+    /* Just use account #0 */
+    return 0;
+}
+
+
+/*
+ * Start pjsua stack.
+ * This will start the registration process, if registration is configured.
+ */
+pj_status_t pjsua_start(void)
+{
+    int i;  /* Must be signed */
+    pjsip_transport *udp_transport;
+    pj_status_t status = PJ_SUCCESS;
 
     /* Init conference bridge. */
@@ -521 +618 @@
         return status;
     }
-
-    /* Init pjmedia-codecs: */
-
-    status = pjmedia_codec_init(pjsua.med_endpt);
-    if (status != PJ_SUCCESS) {
-        pj_caching_pool_destroy(&pjsua.cp);
-        pjsua_perror(THIS_FILE, 
-                     "Media codec initialization has returned error", 
-                     status);
-        return status;
-    }
-
-
-    /* Done. */
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Find account for incoming request.
- */
-int pjsua_find_account_for_incoming(pjsip_rx_data *rdata)
-{
-    pjsip_uri *uri;
-    pjsip_sip_uri *sip_uri;
-    int acc_index;
-
-    uri = rdata->msg_info.to->uri;
-
-    /* Just return account #0 if To URI is not SIP: */
-    if (!PJSIP_URI_SCHEME_IS_SIP(uri) && 
-        !PJSIP_URI_SCHEME_IS_SIPS(uri)) 
-    {
-        return 0;
-    }
-
-
-    sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);
-
-    /* Find account which has matching username and domain. */
-    for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
-
-        pjsua_acc *acc = &pjsua.acc[acc_index];
-
-        if (pj_stricmp(&acc->user_part, &sip_uri->user)==0 &&
-            pj_stricmp(&acc->host_part, &sip_uri->host)==0) 
-        {
-            /* Match ! */
-            return acc_index;
-        }
-    }
-
-    /* No matching, try match domain part only. */
-    for (acc_index=0; acc_index < pjsua.acc_cnt; ++acc_index) {
-
-        pjsua_acc *acc = &pjsua.acc[acc_index];
-
-        if (pj_stricmp(&acc->host_part, &sip_uri->host)==0) {
-            /* Match ! */
-            return acc_index;
-        }
-    }
-
-    /* Still no match, just return account #0 */
-    return 0;
-}
-
-
-/*
- * Find account for outgoing request.
- */
-int pjsua_find_account_for_outgoing(const pj_str_t *url)
-{
-    PJ_UNUSED_ARG(url);
-
-    /* Just use account #0 */
-    return 0;
-}
-
-
-/*
- * Start pjsua stack.
- * This will start the registration process, if registration is configured.
- */
-pj_status_t pjsua_start(void)
-{
-    int i;  /* Must be signed */
-    pjsip_transport *udp_transport;
-    pj_status_t status = PJ_SUCCESS;
 
     /* Create WAV file player if required: */