Changeset 1926 for pjproject/branches/projects/ice-turn07/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Apr 14, 2008 1:48:39 AM (16 years ago)

Author:

bennylp

Message:

More ticket #485: huge changeset to integrate TURN with ICE and PJSUA-LIB/pjsua. Still experimental

File:

• pjproject/branches/projects/ice-turn07/pjmedia/src/pjmedia/transport_ice.c (modified) (4 diffs)

pjproject/branches/projects/ice-turn07/pjmedia/src/pjmedia/transport_ice.c

@@ -129 +129 @@
                                        const char *name,
                                        unsigned comp_cnt,
-                                       pj_stun_config *stun_cfg,
+                                       const pj_ice_strans_cfg *cfg,
                                        const pjmedia_ice_cb *cb,
                                        pjmedia_transport **p_tp)
@@ -146 +146 @@
 
     /* Create ICE */
-    status = pj_ice_strans_create(stun_cfg, name, comp_cnt, NULL, 
-                              &ice_st_cb, &ice_st);
+    status = pj_ice_strans_create(cfg, name, comp_cnt, NULL, 
+                                  &ice_st_cb, &ice_st);
     if (status != PJ_SUCCESS)
         return status;
@@ -177 +177 @@
 PJ_DEF(pj_status_t) pjmedia_ice_start_init( pjmedia_transport *tp,
                                             unsigned options,
-                                            const pj_sockaddr_in *start_addr,
-                                            const pj_sockaddr_in *stun_srv,
-                                            const pj_sockaddr_in *turn_srv)
+                                            const pj_sockaddr_in *start_addr)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
     pj_status_t status;
-
-    status = pj_ice_strans_set_stun_srv(tp_ice->ice_st, stun_srv, turn_srv);
-    if (status != PJ_SUCCESS)
-        return status;
 
     status = pj_ice_strans_create_comp(tp_ice->ice_st, 1, options, start_addr);
@@ -350 +344 @@
             PJ_TODO(RELATED_ADDR_FOR_RELAYED_ADDR);
             len = pj_ansi_snprintf(buffer+len, MAXLEN-len,
-                             "srflx raddr %s rport %d",
+                             "relay raddr %s rport %d",
                              pj_inet_ntoa(cand->base_addr.ipv4.sin_addr),
                              (int)pj_ntohs(cand->base_addr.ipv4.sin_port));