Changeset 2291

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.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/transport.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_ice.c (modified) (4 diffs)
• pjmedia/src/pjmedia/transport_udp.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

pjproject/trunk/pjmedia/include/pjmedia/transport.h

@@ -492 +492 @@
      */
     pjmedia_sock_info sock_info;
+
+    /**
+     * Remote address where RTP/RTCP originated from.
+     */
+    pj_sockaddr     rem_rtp_name;
+    pj_sockaddr     rem_rtcp_name;
 
     /**

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -1425 +1425 @@
     }
 
+    /* Get remote address originating RTP & RTCP. */
+    info->rem_rtp_name  = tp_ice->rtp_src_addr;
+    info->rem_rtcp_name = tp_ice->rtcp_src_addr;
+
     return PJ_SUCCESS;
 }
@@ -1548 +1552 @@
          */
         if (!tp_ice->use_ice &&
-            (tp_ice->options & PJMEDIA_ICE_NO_SRC_ADDR_CHECKING) == 0 &&
             pj_sockaddr_cmp(&tp_ice->remote_rtp, src_addr) != 0 )
         {
@@ -1562 +1565 @@
             tp_ice->rtp_src_cnt++;
 
-            if (tp_ice->rtp_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
+            if ((tp_ice->options & PJMEDIA_ICE_NO_SRC_ADDR_CHECKING) == 0 &&
+                tp_ice->rtp_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) 
+            {
         
                 char addr_text[80];
@@ -1606 +1611 @@
          */
         if (!tp_ice->use_ice &&
-            (tp_ice->options & PJMEDIA_ICE_NO_SRC_ADDR_CHECKING)==0 &&
             pj_sockaddr_cmp(&tp_ice->remote_rtcp, src_addr) != 0)
         {
-            char addr_text[80];
-
-            pj_sockaddr_cp(&tp_ice->remote_rtcp, src_addr);
             pj_sockaddr_cp(&tp_ice->rtcp_src_addr, src_addr);
 
-            pj_assert(tp_ice->addr_len == pj_sockaddr_get_len(src_addr));
-
-            PJ_LOG(4,(tp_ice->base.name,
-                      "Remote RTCP address switched to %s",
-                      pj_sockaddr_print(&tp_ice->remote_rtcp, addr_text,
-                                        sizeof(addr_text), 3)));
+            if ((tp_ice->options & PJMEDIA_ICE_NO_SRC_ADDR_CHECKING)==0) {
+                char addr_text[80];
+
+                pj_sockaddr_cp(&tp_ice->remote_rtcp, src_addr);
+
+                pj_assert(tp_ice->addr_len == pj_sockaddr_get_len(src_addr));
+
+                PJ_LOG(4,(tp_ice->base.name,
+                          "Remote RTCP address switched to %s",
+                          pj_sockaddr_print(&tp_ice->remote_rtcp, addr_text,
+                                            sizeof(addr_text), 3)));
+            }
         }
     }

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -606 +606 @@
     info->sock_info.rtcp_addr_name = udp->rtcp_addr_name;
 
+    /* Get remote address originating RTP & RTCP. */
+    info->rem_rtp_name  = udp->rtp_src_addr;
+    info->rem_rtcp_name = udp->rtcp_src_addr;
+
     return PJ_SUCCESS;
 }

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);