Ticket #479: ticket479.2.patch

pjmedia/include/pjmedia/transport.h

@@ -405 +405 @@
 };
 
 /**
- * This structure describes buffer storage of transport specific info.
+ * This structure describes storage buffer of transport specific info.
  * The actual transport specific info contents will be defined by transport
  * implementation. Note that some transport implementations do not need to
  * provide specific info, since the general socket info is enough.
@@ -456 +456 @@
 
 
 /**
- * Get media socket info from the specified transport. The socket info
- * contains information about the local address of this transport, and
- * would be needed for example to fill in the "c=" and "m=" line of local 
- * SDP.
+ * Initialize transport info.
  *
+ * @param info      Transport info to be initialized.
+ */
+PJ_INLINE(void) pjmedia_transport_init_info(pjmedia_transport_info *info)
+{
+    pj_bzero(&info->sock_info, sizeof(pjmedia_sock_info));
+    info->sock_info.rtp_sock = info->sock_info.rtcp_sock = PJ_INVALID_SOCKET;
+    info->specific_info_cnt = 0;
+}
+
+
+/**
+ * Get media transport info from the specified transport and all underlying 
+ * transports if any. The transport also contains information about socket info
+ * which describes the local address of the transport, and would be needed
+ * for example to fill in the "c=" and "m=" line of local SDP.
+ *
  * @param tp        The transport.
  * @param info      Media socket info to be initialized.
  *

pjsip/src/pjsua-lib/pjsua_media.c

@@ -839 +839 @@
     }
 
     /* Get media socket info */
+    pjmedia_transport_init_info(&tpinfo);
     pjmedia_transport_get_info(call->med_tp, &tpinfo);
 
     /* Create SDP */

pjsip/src/pjsua-lib/pjsua_core.c

@@ -320 +320 @@
     }
 
     /* Get media socket info */
+    pjmedia_transport_init_info(&tpinfo);
     pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo);
 
     /* Add SDP body, using call0's RTP address */
@@ -2064 +2065 @@
         char addr_buf[80];
 
         /* MSVC complains about tpinfo not being initialized */
-        pj_bzero(&tpinfo, sizeof(tpinfo));
+        //pj_bzero(&tpinfo, sizeof(tpinfo));
 
+        pjmedia_transport_init_info(&tpinfo);
         pjmedia_transport_get_info(call->med_tp, &tpinfo);
 
         PJ_LOG(3,(THIS_FILE, " %s: %s",

pjsip/src/pjsua-lib/pjsua_call.c

@@ -2260 +2260 @@
     }
 
     /* Get SRTP status */
+    pjmedia_transport_init_info(&tp_info);
     pjmedia_transport_get_info(call->med_tp, &tp_info);
     if (tp_info.specific_info_cnt > 0) {
         int i;
@@ -2470 +2471 @@
         pjmedia_sdp_session *local_sdp;
         pjmedia_transport_info ti;
 
+        pjmedia_transport_init_info(&ti);
         pjmedia_transport_get_info(call->med_tp, &ti);
         status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 
                                           1, &ti.sock_info, &local_sdp);
@@ -2581 +2583 @@
     pjmedia_sdp_session *sdp;
 
     /* Get media socket info */
+    pjmedia_transport_init_info(&tp_info);
     pjmedia_transport_get_info(call->med_tp, &tp_info);
 
     /* Create new offer */

pjsip-apps/src/samples/simpleua.c

@@ -301 +301 @@
      * need this info to create SDP (i.e. the address and port info in
      * the SDP).
      */
+    pjmedia_transport_init_info(&g_med_tpinfo);
     pjmedia_transport_get_info(g_med_transport, &g_med_tpinfo);
 
 

pjsip-apps/src/samples/siprtp.c

@@ -1012 +1012 @@
 
 
     /* Get transport info */
-    pj_bzero(&tpinfo, sizeof(tpinfo));
+    pjmedia_transport_init_info(&tpinfo);
     pjmedia_transport_get_info(audio->transport, &tpinfo);
 
     /* Create and initialize basic SDP session */

pjmedia/src/pjmedia/transport_udp.c

@@ -593 +593 @@
     info->sock_info.rtp_addr_name = udp->rtp_addr_name;
     info->sock_info.rtcp_sock = udp->rtcp_sock;
     info->sock_info.rtcp_addr_name = udp->rtcp_addr_name;
-    info->specific_info_cnt = 0;
 
     return PJ_SUCCESS;
 }

pjmedia/src/pjmedia/transport_ice.c

@@ -700 +700 @@
                   sizeof(pj_sockaddr_in));
     }
 
-    info->specific_info_cnt = 0;
-
     return PJ_SUCCESS;
 }
 

pjmedia/src/pjmedia/transport_srtp.c

@@ -564 +564 @@
     PJ_ASSERT_RETURN(sizeof(pjmedia_srtp_info) <=
                      PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE, PJ_ENOMEM);
 
-    status = pjmedia_transport_get_info(srtp->real_tp, info);
-    if (status != PJ_SUCCESS)
-        return status;
-
     srtp_info.active = srtp->session_inited;
     srtp_info.rx_policy = srtp->rx_policy;
     srtp_info.tx_policy = srtp->tx_policy;
@@ -578 +574 @@
     pj_memcpy(&info->spc_info[spc_info_idx].buffer, &srtp_info, 
               sizeof(srtp_info));
 
-    return PJ_SUCCESS;
+    return pjmedia_transport_get_info(srtp->real_tp, info);
 }
 
 static pj_status_t transport_attach(pjmedia_transport *tp,