Changeset 5877 for pjproject

Timestamp:

Sep 4, 2018 2:57:07 PM (6 years ago)

Author:

riza

Message:

Re #2049 (misc): Add local RTP/RTCP address information to MediaTransportInfo?.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/call.hpp (modified) (1 diff)
• src/pjsua2/call.cpp (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua2/call.hpp

@@ -286 +286 @@
 /**
  * This structure describes media transport informations. It corresponds to the
- * pjmedia_transport_info structure.
+ * pjmedia_transport_info structure. The address name field can be empty string
+ * if the address in the pjmedia_transport_info is invalid.
  */
 struct MediaTransportInfo
 {
     /**
-     * Remote address where RTP originated from.
+     * Address to be advertised as the local address for the RTP socket, 
+     * which does not need to be equal as the bound address (for example, 
+     * this address can be the address resolved with STUN).
+     */
+    SocketAddress   localRtpName;
+
+    /**
+     * Address to be advertised as the local address for the RTCP socket, 
+     * which does not need to be equal as the bound address (for example, 
+     * this address can be the address resolved with STUN).
+     */
+    SocketAddress   localRtcpName;
+
+    /**
+     * Remote address where RTP originated from. This can be empty string if 
+     * no data is received from the remote.
      */
     SocketAddress   srcRtpName;
 
     /**
-     * Remote address where RTCP originated from.
+     * Remote address where RTCP originated from. This can be empty string if 
+     * no data is recevied from the remote.
      */
     SocketAddress   srcRtcpName;

pjproject/trunk/pjsip/src/pjsua2/call.cpp

@@ -132 +132 @@
 {
     char straddr[PJ_INET6_ADDRSTRLEN+10];
-    
-    pj_sockaddr_print(&info.src_rtp_name, straddr, sizeof(straddr), 3);
-    srcRtpName = straddr;
-    pj_sockaddr_print(&info.src_rtcp_name, straddr, sizeof(straddr), 3);
-    srcRtcpName = straddr;
+   
+    localRtpName = localRtcpName = srcRtpName = srcRtcpName = "";    
+    if (pj_sockaddr_has_addr(&info.sock_info.rtp_addr_name)) { 
+        pj_sockaddr_print(&info.sock_info.rtp_addr_name, straddr, 
+                          sizeof(straddr), 3);
+        localRtpName = straddr;
+    }
+
+    if (pj_sockaddr_has_addr(&info.sock_info.rtcp_addr_name)) { 
+        pj_sockaddr_print(&info.sock_info.rtcp_addr_name, straddr, 
+                          sizeof(straddr), 3);
+        localRtcpName = straddr;
+    }
+
+    if (pj_sockaddr_has_addr(&info.src_rtp_name)) {     
+        pj_sockaddr_print(&info.src_rtp_name, straddr, sizeof(straddr), 3);
+        srcRtpName = straddr;
+    }
+
+    if (pj_sockaddr_has_addr(&info.src_rtcp_name)) { 
+        pj_sockaddr_print(&info.src_rtcp_name, straddr, sizeof(straddr), 3);
+        srcRtcpName = straddr;
+    }
 }