Changeset 1860 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Mar 11, 2008 9:38:05 PM (14 years ago)

Author:

bennylp

Message:

Ticket #479: allow media transport framework to return transport specific info (for example, to know whether SRTP is enabled)

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (4 diffs)

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

@@ -56 +56 @@
  */
 static pj_status_t transport_get_info (pjmedia_transport *tp,
-                                       pjmedia_sock_info *info);
+                                       pjmedia_transport_info *info);
 static pj_status_t transport_attach   (pjmedia_transport *tp,
                                        void *user_data,
@@ -674 +674 @@
 
 static pj_status_t transport_get_info(pjmedia_transport *tp,
-                                      pjmedia_sock_info *info)
+                                      pjmedia_transport_info *info)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -680 +680 @@
     pj_ice_strans_comp *comp;
 
-    pj_bzero(info, sizeof(*info));
-    info->rtp_sock = info->rtcp_sock = PJ_INVALID_SOCKET;
+    pj_bzero(&info->sock_info, sizeof(info->sock_info));
+    info->sock_info.rtp_sock = info->sock_info.rtcp_sock = PJ_INVALID_SOCKET;
 
     /* Retrieve address of default candidate for component 1 (RTP) */
     comp = ice_st->comp[0];
     pj_assert(comp->default_cand >= 0);
-    info->rtp_sock = comp->sock;
-    pj_memcpy(&info->rtp_addr_name, 
+    info->sock_info.rtp_sock = comp->sock;
+    pj_memcpy(&info->sock_info.rtp_addr_name, 
               &comp->cand_list[comp->default_cand].addr,
               sizeof(pj_sockaddr_in));
@@ -695 +695 @@
         comp = ice_st->comp[1];
         pj_assert(comp->default_cand >= 0);
-        info->rtp_sock = comp->sock;
-        pj_memcpy(&info->rtcp_addr_name, 
+        info->sock_info.rtp_sock = comp->sock;
+        pj_memcpy(&info->sock_info.rtcp_addr_name, 
                   &comp->cand_list[comp->default_cand].addr,
                   sizeof(pj_sockaddr_in));
     }
 
+    info->specific_info_cnt = 0;
 
     return PJ_SUCCESS;