Changeset 2291 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Sep 17, 2008 3:32:06 PM (16 years ago)

Author:

nanang

Message:

Ticket #631:

• Added new fields in media transport info: remote address originating RTP & RTCP.
• Updated transport UDP & ICE to fill above fields in getting transport info.
• Updated pjsua call dump, instead of showing remote RTP address from SDP, it will show address of RTP originator.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

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

@@ -2019 +2019 @@
 static void dump_media_session(const char *indent, 
                                char *buf, unsigned maxlen,
-                               pjmedia_session *session)
+                               pjsua_call *call)
 {
     unsigned i;
@@ -2025 +2025 @@
     int len;
     pjmedia_session_info info;
-
+    pjmedia_session *session = call->session;
+    pjmedia_transport_info tp_info;
+
+    pjmedia_transport_info_init(&tp_info);
+
+    pjmedia_transport_get_info(call->med_tp, &tp_info);
     pjmedia_session_get_info(session, &info);
 
@@ -2038 +2043 @@
 
         pjmedia_session_get_stream_stat(session, i, &stat);
-        rem_addr = pj_sockaddr_print(&info.stream_info[i].rem_addr,
-                                     rem_addr_buf, sizeof(rem_addr_buf), 3);
+        // rem_addr will contain actual address of RTP originator, instead of
+        // remote RTP address specified by stream which is fetched from the SDP.
+        // Please note that we are assuming only one stream per call.
+        //rem_addr = pj_sockaddr_print(&info.stream_info[i].rem_addr,
+        //                           rem_addr_buf, sizeof(rem_addr_buf), 3);
+        if (pj_sockaddr_has_addr(&tp_info.rem_rtp_name)) {
+            rem_addr = pj_sockaddr_print(&tp_info.rem_rtp_name, rem_addr_buf, 
+                                         sizeof(rem_addr_buf), 3);
+        } else {
+            pj_ansi_snprintf(rem_addr_buf, sizeof(rem_addr_buf), "-");
+        }
 
         if (info.stream_info[i].dir == PJMEDIA_DIR_ENCODING)
@@ -2628 +2642 @@
 /* Print call info */
 void print_call(const char *title,
-                       int call_id, 
-                       char *buf, pj_size_t size)
+                int call_id, 
+                char *buf, pj_size_t size)
 {
     int len;
@@ -2759 +2773 @@
     /* Dump session statistics */
     if (with_media && call->session)
-        dump_media_session(indent, p, end-p, call->session);
+        dump_media_session(indent, p, end-p, call);
 
     pjsip_dlg_dec_lock(dlg);