Changeset 1926 for pjproject/branches/projects/ice-turn07/pjsip/src/pjsua-lib/pjsua_media.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/pjsip/src/pjsua-lib/pjsua_media.c (modified) (5 diffs)

pjproject/branches/projects/ice-turn07/pjsip/src/pjsua-lib/pjsua_media.c

@@ -625 +625 @@
     unsigned i;
     pj_sockaddr_in addr;
+    pj_ice_strans_cfg ice_cfg;
     pj_status_t status;
 
@@ -635 +636 @@
 
     pj_sockaddr_in_init(&addr, 0, (pj_uint16_t)cfg->port);
+
+    /* Init ICE config */
+    pj_bzero(&ice_cfg, sizeof(ice_cfg));
+
+    /* Duplicate STUN config */
+    pj_memcpy(&ice_cfg.stun_cfg, &pjsua_var.stun_cfg, sizeof(pj_stun_config));
+
+    /* Set STUN server, if any */
+    if (pj_sockaddr_has_addr(&pjsua_var.stun_srv))
+        pj_sockaddr_cp(&ice_cfg.stun_srv, &pjsua_var.stun_srv);
+
+    if (pjsua_var.ua_cfg.turn_host.slen) {
+        /* Set TURN server.
+         * TODO: DNS SRV
+         */
+        status = pj_sockaddr_in_init(&ice_cfg.turn_srv.ipv4, 
+                                     &pjsua_var.ua_cfg.turn_host,
+                                     pjsua_var.ua_cfg.turn_port);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error resolving TURN server", status);
+            return status;
+        }
+
+        /* Copy TURN credential */
+        pj_memcpy(&ice_cfg.turn_cred, &pjsua_var.ua_cfg.turn_cred,
+                  sizeof(pjsua_var.ua_cfg.turn_cred));
+
+        /* TURN connection type. */
+        if (pjsua_var.ua_cfg.turn_tcp)
+            ice_cfg.turn_conn_type = PJ_TURN_TP_TCP;
+        else
+            ice_cfg.turn_conn_type = PJ_TURN_TP_UDP;
+    }
 
     /* Create each media transport */
@@ -642 +676 @@
         int next_port;
         char name[32];
-#if PJMEDIA_ADVERTISE_RTCP
-        enum { COMP_CNT=2 };
+        unsigned options, comp_cnt;
+
+#if PJMEDIA_ADVERTISE_RTCP==0
+        comp_cnt = 1;
 #else
-        enum { COMP_CNT=1 };
+        if (pjsua_var.media_cfg.ice_no_rtcp)
+            comp_cnt = 1;
+        else
+            comp_cnt = 2;
 #endif
+
+        options = pjsua_var.media_cfg.ice_options;
 
         pj_bzero(&ice_cb, sizeof(pjmedia_ice_cb));
@@ -653 +694 @@
         pj_ansi_snprintf(name, sizeof(name), "icetp%02d", i);
                          
-        status = pjmedia_ice_create(pjsua_var.med_endpt, name, COMP_CNT,
-                                    &pjsua_var.stun_cfg, &ice_cb,
+        status = pjmedia_ice_create(pjsua_var.med_endpt, name, comp_cnt,
+                                    &ice_cfg, &ice_cb,
                                     &pjsua_var.calls[i].med_tp);
         if (status != PJ_SUCCESS) {
@@ -670 +711 @@
                                         pjsua_var.media_cfg.rx_drop_pct);
 
-        status = pjmedia_ice_start_init(pjsua_var.calls[i].med_tp, 0, &addr,
-                                        &pjsua_var.stun_srv.ipv4, NULL);
+        status = pjmedia_ice_start_init(pjsua_var.calls[i].med_tp, options, 
+                                        &addr);
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error starting ICE transport",