Changeset 831 for pjproject

Timestamp:

Nov 25, 2006 2:50:25 PM (18 years ago)

Author:

bennylp

Message:

Print media statistic when call is disconnected in pjsua, to assist tracing media problems

Location:

pjproject/trunk

Files:

• pjlib/src/pj/config.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/config.c

@@ -22 +22 @@
 
 static const char *id = "config.c";
-const char *PJ_VERSION = "0.5.8.5";
+const char *PJ_VERSION = "0.5.8.9";
 
 PJ_DEF(void) pj_dump_config(void)

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

@@ -1328 +1328 @@
         }
 
+        /* Dump media state upon disconnected */
+        if (1) {
+            char buf[1024];
+            pjsua_call_dump(call_id, PJ_TRUE, buf, 
+                            sizeof(buf), "  ");
+            PJ_LOG(5,(THIS_FILE, 
+                      "Call %d disconnected, dumping media stats\n%s", 
+                      call_id, buf));
+        }
+
     } else {
 
@@ -1344 +1354 @@
         }
 
-        PJ_LOG(3,(THIS_FILE, "Call %d state changed to %s", 
-                  call_id,
-                  call_info.state_text.ptr));
+        if (call_info.state == PJSIP_INV_STATE_EARLY) {
+            int code;
+            pj_str_t reason;
+            pjsip_msg *msg;
+
+            /* This can only occur because of TX or RX message */
+            pj_assert(e->type == PJSIP_EVENT_TSX_STATE);
+
+            if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG) {
+                msg = e->body.tsx_state.src.rdata->msg_info.msg;
+            } else {
+                msg = e->body.tsx_state.src.tdata->msg;
+            }
+
+            code = msg->line.status.code;
+            reason = msg->line.status.reason;
+
+            PJ_LOG(3,(THIS_FILE, "Call %d state changed to %s (%d %.*s)", 
+                      call_id, call_info.state_text.ptr,
+                      code, (int)reason.slen, reason.ptr));
+        } else {
+            PJ_LOG(3,(THIS_FILE, "Call %d state changed to %s", 
+                      call_id,
+                      call_info.state_text.ptr));
+        }
 
         if (current_call==PJSUA_INVALID_ID)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -36 +36 @@
 static const char *inv_state_names[] =
 {
-    "NULL      ",
-    "CALLING   ",
-    "INCOMING  ",
-    "EARLY     ",
+    "NULL",
+    "CALLING",
+    "INCOMING",
+    "EARLY",
     "CONNECTING",
     "CONFIRMED ",

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

@@ -91 +91 @@
     call->last_text.ptr = call->last_text_buf_;
     call->last_text.slen = 0;
+    call->conn_time.sec = 0;
+    call->conn_time.msec = 0;
+    call->res_time.sec = 0;
+    call->res_time.msec = 0;
 }
 
@@ -1777 +1781 @@
 
     /* Calculate call duration */
-    if (call->inv->state >= PJSIP_INV_STATE_CONFIRMED) {
+    if (call->conn_time.sec != 0) {
         pj_gettimeofday(&duration);
         PJ_TIME_VAL_SUB(duration, call->conn_time);
@@ -1788 +1792 @@
 
     /* Calculate first response delay */
-    if (call->inv->state >= PJSIP_INV_STATE_EARLY) {
+    if (call->res_time.sec != 0) {
         res_delay = call->res_time;
         PJ_TIME_VAL_SUB(res_delay, call->start_time);
@@ -1977 +1981 @@
         call->inv = NULL;
         --pjsua_var.call_cnt;
+
+        /* Reset call */
+        reset_call(call->index);
+
     }