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.




git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2291 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 28 insertions, 11 deletions

diff --git a/pjmedia/include/pjmedia/transport.h b/pjmedia/include/pjmedia/transport.h
index 6c5ffde6..2ce195e5 100644
--- a/pjmedia/include/pjmedia/transport.h
+++ b/pjmedia/include/pjmedia/transport.h
@@ -493,6 +493,12 @@ struct pjmedia_transport_info
     pjmedia_sock_info sock_info;
 
     /**
+     * Remote address where RTP/RTCP originated from.
+     */
+    pj_sockaddr	    rem_rtp_name;
+    pj_sockaddr	    rem_rtcp_name;
+
+    /**
      * Specifies number of transport specific info included.
      */
     int specific_info_cnt;
diff --git a/pjmedia/src/pjmedia/transport_ice.c b/pjmedia/src/pjmedia/transport_ice.c
index 99964aab..461d5768 100644
--- a/pjmedia/src/pjmedia/transport_ice.c
+++ b/pjmedia/src/pjmedia/transport_ice.c
@@ -1424,6 +1424,10 @@ static pj_status_t transport_get_info(pjmedia_transport *tp,
 	pj_sockaddr_cp(&info->sock_info.rtcp_addr_name, &cand.addr);
     }
 
+    /* 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;
 }
 
@@ -1547,7 +1551,6 @@ static void ice_on_rx_data(pj_ice_strans *ice_st, unsigned comp_id,
 	 * have been received.
 	 */
 	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 )
 	{
 	    /* Check if the source address is recognized. */
@@ -1561,7 +1564,9 @@ static void ice_on_rx_data(pj_ice_strans *ice_st, unsigned comp_id,
 
 	    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];
 
@@ -1605,20 +1610,22 @@ static void ice_on_rx_data(pj_ice_strans *ice_st, unsigned comp_id,
 	 * different.
 	 */
 	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));
+	    if ((tp_ice->options & PJMEDIA_ICE_NO_SRC_ADDR_CHECKING)==0) {
+		char addr_text[80];
 
-	    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)));
+		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)));
+	    }
 	}
     }
 
diff --git a/pjmedia/src/pjmedia/transport_udp.c b/pjmedia/src/pjmedia/transport_udp.c
index 0ef28ccb..3b49421b 100644
--- a/pjmedia/src/pjmedia/transport_udp.c
+++ b/pjmedia/src/pjmedia/transport_udp.c
@@ -605,6 +605,10 @@ static pj_status_t transport_get_info(pjmedia_transport *tp,
     info->sock_info.rtcp_sock = udp->rtcp_sock;
     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;
 }