Changeset 5853 for pjproject

Timestamp:

Aug 3, 2018 9:21:51 AM (6 years ago)

Author:

ming

Message:

Re #2096: re r5852, fixed assertion in pj_sockaddr_cp() because the address can actually be zero if we haven't received any packets

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/transport.h (modified) (1 diff)
• src/pjmedia/transport_ice.c (modified) (1 diff)

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

@@ -554 +554 @@
     /**
      * Remote address where RTP/RTCP originated from. In case this transport
-     * hasn't ever received packet, the 
+     * hasn't ever received packet, the address can be invalid (zero).
      */
     pj_sockaddr     src_rtp_name;

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

@@ -1766 +1766 @@
      */
     if (tp_ice->use_ice || tp_ice->rtp_src_cnt) {
-        pj_sockaddr_cp(&info->src_rtp_name, &tp_ice->rtp_src_addr);
+        info->src_rtp_name = tp_ice->rtp_src_addr;
         if (tp_ice->use_rtcp_mux)
-            pj_sockaddr_cp(&info->src_rtcp_name, &tp_ice->rtp_src_addr);
+            info->src_rtcp_name = tp_ice->rtp_src_addr;
     }
     if ((!tp_ice->use_rtcp_mux) &&
         (tp_ice->use_ice || tp_ice->rtcp_src_cnt))
     {
-        pj_sockaddr_cp(&info->src_rtcp_name, &tp_ice->rtcp_src_addr);
+        info->src_rtcp_name = tp_ice->rtcp_src_addr;
     }