Changeset 5805

Timestamp:

Jun 13, 2018 4:58:49 PM (6 years ago)

Author:

riza

Message:

Re #2119 (closed): Don't raise assert when receiving an incoming call with no
pjsua account available.

Location:

pjproject/trunk/pjsip/src/pjsua-lib

Files:

• pjsua_acc.c (modified) (1 diff)
• pjsua_call.c (modified) (1 diff)
• pjsua_im.c (modified) (2 diffs)
• pjsua_pres.c (modified) (1 diff)

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

@@ -3001 +3001 @@
     unsigned i;
 
-    /* Check that there's at least one account configured */
-    PJ_ASSERT_RETURN(pjsua_var.acc_cnt!=0, pjsua_var.default_acc);
+    if (pjsua_var.acc_cnt == 0) {
+        PJ_LOG(2, (THIS_FILE, "No available account to handle %s",
+                  pjsip_rx_data_get_info(rdata)));
+
+        return PJSUA_INVALID_ID;
+    }
 
     uri = rdata->msg_info.to->uri;

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

@@ -1320 +1320 @@
      */
     acc_id = call->acc_id = pjsua_acc_find_for_incoming(rdata);
+    if (acc_id == PJSUA_INVALID_ID) {
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata,
+                                      PJSIP_SC_TEMPORARILY_UNAVAILABLE, NULL,
+                                      NULL, NULL);
+
+        PJ_LOG(2,(THIS_FILE,
+                  "Unable to accept incoming call (no available account)"));
+
+        goto on_return;
+    }
     call->call_hold_type = pjsua_var.acc[acc_id].cfg.call_hold_type;
 

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

@@ -210 +210 @@
             }
 
-
-            (*pjsua_var.ua_cfg.cb.on_typing2)(call_id, from, to, &contact,
-                                              is_typing, rdata, acc_id);
+            if (acc_id != PJSUA_INVALID_ID) {
+                (*pjsua_var.ua_cfg.cb.on_typing2)(call_id, from, to, &contact,
+                                                  is_typing, rdata, acc_id);
+            }
         }
 
@@ -259 +260 @@
             }
 
-            (*pjsua_var.ua_cfg.cb.on_pager2)(call_id, from, to, &contact, 
-                                             &mime_type, &text_body, rdata,
-                                             acc_id);
+            if (acc_id != PJSUA_INVALID_ID) {
+                (*pjsua_var.ua_cfg.cb.on_pager2)(call_id, from, to, &contact,
+                                                 &mime_type, &text_body, rdata,
+                                                 acc_id);
+            }
         }
     }

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

@@ -831 +831 @@
     /* Find which account for the incoming request. */
     acc_id = pjsua_acc_find_for_incoming(rdata);
+    if (acc_id == PJSUA_INVALID_ID) {
+        PJ_LOG(2, (THIS_FILE, 
+                   "Unable to process incoming message %s "
+                   "due to no available account", 
+                   pjsip_rx_data_get_info(rdata)));
+
+        PJSUA_UNLOCK();
+        pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 
+                                      PJSIP_SC_TEMPORARILY_UNAVAILABLE, NULL,
+                                      NULL, NULL);
+        pj_log_pop_indent();
+        return PJ_TRUE; 
+    }
     acc = &pjsua_var.acc[acc_id];