Changeset 2966 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Oct 25, 2009 9:02:07 AM (15 years ago)

Author:

bennylp

Message:

Initial commit for ticket #950: QoS support:

• implementation:
  • PJLIB (sock_qos*.*)
• added QoS support in:
  • SIP UDP transport,
  • SIP TCP transport,
  • media UDP transport (done in pjsua-lib),
  • pjnath ICE stream transport,
  • pjnath STUN socket,
  • pjnath TURN client
• added QoS options in pjsua-lib:
  • QoS fields in pjsua_transport_config
• added "--set-qos" parameter in pjsua

Notes:

• QoS in TLS transport is not yet implemented, waiting for #957
• build ok on VS6, VS2005 (multiple targets), Carbide, and Mingw
• no run-time testing yet

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (4 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -212 +212 @@
     pj_stun_sock_cfg_default(&cfg->stun.cfg);
     pj_turn_alloc_param_default(&cfg->turn.alloc_param);
+    pj_turn_sock_cfg_default(&cfg->turn.cfg);
 
     pj_ice_sess_options_default(&cfg->opt);
@@ -274 +275 @@
         stun_sock_cb.on_data_sent = &stun_on_data_sent;
         
+        /* Override component specific QoS settings, if any */
+        if (ice_st->cfg.comp[comp_id-1].qos_type) {
+            ice_st->cfg.stun.cfg.qos_type = 
+                ice_st->cfg.comp[comp_id-1].qos_type;
+        }
+        if (ice_st->cfg.comp[comp_id-1].qos_params.flags) {
+            pj_memcpy(&ice_st->cfg.stun.cfg.qos_params,
+                      &ice_st->cfg.comp[comp_id-1].qos_params,
+                      sizeof(ice_st->cfg.stun.cfg.qos_params));
+        }
+
         /* Create the STUN transport */
         status = pj_stun_sock_create(&ice_st->cfg.stun_cfg, NULL,
@@ -392 +404 @@
         turn_sock_cb.on_state = &turn_on_state;
 
+        /* Override with component specific QoS settings, if any */
+        if (ice_st->cfg.comp[comp_id-1].qos_type) {
+            ice_st->cfg.turn.cfg.qos_type = 
+                ice_st->cfg.comp[comp_id-1].qos_type;
+        }
+        if (ice_st->cfg.comp[comp_id-1].qos_params.flags) {
+            pj_memcpy(&ice_st->cfg.turn.cfg.qos_params,
+                      &ice_st->cfg.comp[comp_id-1].qos_params,
+                      sizeof(ice_st->cfg.turn.cfg.qos_params));
+        }
+
+        /* Create the TURN transport */
         status = pj_turn_sock_create(&ice_st->cfg.stun_cfg, ice_st->cfg.af,
                                      ice_st->cfg.turn.conn_type,
-                                     &turn_sock_cb, 0, comp, 
-                                     &comp->turn_sock);
+                                     &turn_sock_cb, &ice_st->cfg.turn.cfg, 
+                                     comp, &comp->turn_sock);
         if (status != PJ_SUCCESS) {
             return status;
@@ -454 +478 @@
         return status;
 
-    PJ_ASSERT_RETURN(comp_cnt && cb && p_ice_st, PJ_EINVAL);
+    PJ_ASSERT_RETURN(comp_cnt && cb && p_ice_st &&
+                     comp_cnt <= PJ_ICE_MAX_COMP , PJ_EINVAL);
 
     if (name == NULL)