Changeset 1873

Timestamp:

Mar 17, 2008 4:05:35 PM (16 years ago)

Author:

bennylp

Message:

More ticket #479: bug in pjmedia_transport_get_info(), the info should be initialized by caller

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/transport.h (modified) (2 diffs)
• pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)
• pjmedia/src/pjmedia/transport_udp.c (modified) (1 diff)
• pjsip-apps/src/samples/simpleua.c (modified) (1 diff)
• pjsip-apps/src/samples/siprtp.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -406 +406 @@
 
 /**
- * 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
@@ -457 +457 @@
 
 /**
- * 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_info_init(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.

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

@@ -701 +701 @@
     }
 
-    info->specific_info_cnt = 0;
-
     return PJ_SUCCESS;
 }

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -565 +565 @@
                      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;
@@ -579 +575 @@
               sizeof(srtp_info));
 
-    return PJ_SUCCESS;
+    return pjmedia_transport_get_info(srtp->real_tp, info);
 }
 

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

@@ -594 +594 @@
     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;

pjproject/trunk/pjsip-apps/src/samples/simpleua.c

@@ -302 +302 @@
      * the SDP).
      */
+    pjmedia_transport_info_init(&g_med_tpinfo);
     pjmedia_transport_get_info(g_med_transport, &g_med_tpinfo);
 

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -1013 +1013 @@
 
     /* Get transport info */
-    pj_bzero(&tpinfo, sizeof(tpinfo));
+    pjmedia_transport_info_init(&tpinfo);
     pjmedia_transport_get_info(audio->transport, &tpinfo);
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -2261 +2261 @@
 
     /* Get SRTP status */
+    pjmedia_transport_info_init(&tp_info);
     pjmedia_transport_get_info(call->med_tp, &tp_info);
     if (tp_info.specific_info_cnt > 0) {
@@ -2471 +2472 @@
         pjmedia_transport_info ti;
 
+        pjmedia_transport_info_init(&ti);
         pjmedia_transport_get_info(call->med_tp, &ti);
         status = pjmedia_endpt_create_sdp(pjsua_var.med_endpt, tdata->pool, 
@@ -2582 +2584 @@
 
     /* Get media socket info */
+    pjmedia_transport_info_init(&tp_info);
     pjmedia_transport_get_info(call->med_tp, &tp_info);
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -321 +321 @@
 
     /* Get media socket info */
+    pjmedia_transport_info_init(&tpinfo);
     pjmedia_transport_get_info(pjsua_var.calls[0].med_tp, &tpinfo);
 
@@ -2065 +2066 @@
 
         /* MSVC complains about tpinfo not being initialized */
-        pj_bzero(&tpinfo, sizeof(tpinfo));
-
+        //pj_bzero(&tpinfo, sizeof(tpinfo));
+
+        pjmedia_transport_info_init(&tpinfo);
         pjmedia_transport_get_info(call->med_tp, &tpinfo);
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -840 +840 @@
 
     /* Get media socket info */
+    pjmedia_transport_info_init(&tpinfo);
     pjmedia_transport_get_info(call->med_tp, &tpinfo);