Changeset 3753 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Sep 18, 2011 2:59:56 PM (13 years ago)

Author:

bennylp

Message:

Modified the libraries to use the new log indentation feature re #1372

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (20 diffs)

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

@@ -375 +375 @@
     pjsua_acc *acc;
     unsigned i, id;
-    pj_status_t status;
-
+    pj_status_t status = PJ_SUCCESS;
+
+    PJ_ASSERT_RETURN(cfg, PJ_EINVAL);
     PJ_ASSERT_RETURN(pjsua_var.acc_cnt < PJ_ARRAY_SIZE(pjsua_var.acc),
                      PJ_ETOOMANY);
@@ -385 +386 @@
     /* Verify media count */
 #if !defined(PJMEDIA_HAS_VIDEO) || (PJMEDIA_HAS_VIDEO == 0)
+    /* Enable PJMEDIA_HAS_VIDEO in your config_site.h! */
     PJ_ASSERT_RETURN(cfg->max_video_cnt == 0, PJ_EINVAL);
 #endif
     PJ_ASSERT_RETURN(cfg->max_audio_cnt + cfg->max_video_cnt <= 
                      PJSUA_MAX_CALL_MEDIA, PJ_ETOOMANY);
+
+    PJ_LOG(4,(THIS_FILE, "Adding account: id=%.*s",
+              (int)cfg->id.slen, cfg->id.ptr));
+    pj_log_push_indent();
 
     PJSUA_LOCK();
@@ -434 +440 @@
     for (i=0; i<acc->cfg.proxy_cnt; ++i) {
         status = normalize_route_uri(acc->pool, &acc->cfg.proxy[i]);
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
+            PJSUA_UNLOCK();
+            pj_log_pop_indent();
             return status;
+        }
     }
 
@@ -444 +453 @@
         acc->pool = NULL;
         PJSUA_UNLOCK();
+        pj_log_pop_indent();
         return status;
     }
@@ -469 +479 @@
     }
 
+    pj_log_pop_indent();
     return PJ_SUCCESS;
 }
@@ -575 +586 @@
     PJ_ASSERT_RETURN(pjsua_var.acc[acc_id].valid, PJ_EINVALIDOP);
 
+    PJ_LOG(4,(THIS_FILE, "Deleting account %d..", acc_id));
+    pj_log_push_indent();
+
     PJSUA_LOCK();
 
@@ -625 +639 @@
     PJ_LOG(4,(THIS_FILE, "Account id %d deleted", acc_id));
 
+    pj_log_pop_indent();
     return PJ_SUCCESS;
 }
@@ -656 +671 @@
                      PJSUA_MAX_CALL_MEDIA, PJ_ETOOMANY);
 
+    PJ_LOG(4,(THIS_FILE, "Modifying accunt %d", acc_id));
+    pj_log_push_indent();
 
     PJSUA_LOCK();
@@ -1041 +1058 @@
 on_return:
     PJSUA_UNLOCK();
+    pj_log_pop_indent();
     return status;
 }
@@ -1056 +1074 @@
     PJ_ASSERT_RETURN(pjsua_var.acc[acc_id].valid, PJ_EINVALIDOP);
 
+    PJ_LOG(4,(THIS_FILE, "Acc %d: setting online status to %d..",
+              acc_id, is_online));
+    pj_log_push_indent();
+
     pjsua_var.acc[acc_id].online_status = is_online;
     pj_bzero(&pjsua_var.acc[acc_id].rpid, sizeof(pjrpid_element));
     pjsua_pres_update_acc(acc_id, PJ_FALSE);
+
+    pj_log_pop_indent();
     return PJ_SUCCESS;
 }
@@ -1074 +1098 @@
     PJ_ASSERT_RETURN(pjsua_var.acc[acc_id].valid, PJ_EINVALIDOP);
 
+    PJ_LOG(4,(THIS_FILE, "Acc %d: setting online status to %d..",
+              acc_id, is_online));
+    pj_log_push_indent();
+
     PJSUA_LOCK();
     pjsua_var.acc[acc_id].online_status = is_online;
@@ -1080 +1108 @@
 
     pjsua_pres_update_acc(acc_id, PJ_TRUE);
+    pj_log_pop_indent();
+
     return PJ_SUCCESS;
 }
@@ -1665 +1695 @@
         return;
 
+    pj_log_push_indent();
     PJSUA_LOCK();
 
@@ -1716 +1747 @@
             if (acc_check_nat_addr(acc, param)) {
                 PJSUA_UNLOCK();
+                pj_log_pop_indent();
                 return;
             }
@@ -1778 +1810 @@
     
     PJSUA_UNLOCK();
+    pj_log_pop_indent();
 }
 
@@ -1965 +1998 @@
     PJ_ASSERT_RETURN(pjsua_var.acc[acc_id].valid, PJ_EINVALIDOP);
 
+    PJ_LOG(4,(THIS_FILE, "Acc %d: setting %sregistration..",
+              acc_id, (renew? "" : "un")));
+    pj_log_push_indent();
+
     PJSUA_LOCK();
 
@@ -2040 +2077 @@
                      status);
     } else {
-        PJ_LOG(3,(THIS_FILE, "%s sent",
+        PJ_LOG(4,(THIS_FILE, "Acc %d: %s sent", acc_id,
                  (renew? "Registration" : "Unregistration")));
     }
@@ -2046 +2083 @@
 on_return:
     PJSUA_UNLOCK();
+    pj_log_pop_indent();
     return status;
 }
@@ -2791 +2829 @@
         return;
 
+    PJ_LOG(4,(THIS_FILE, "Disconnected notification for transport %s",
+              tp->obj_name));
+    pj_log_push_indent();
+
     /* Shutdown this transport, to make sure that the transport manager 
      * will create a new transport for reconnection.
@@ -2818 +2860 @@
 
     PJSUA_UNLOCK();
-}
+    pj_log_pop_indent();
+}