Changeset 2966 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Oct 25, 2009 9:02:07 AM (14 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/pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -60 +60 @@
     pj_bool_t               no_refersub;
     pj_bool_t               ipv6;
+    pj_bool_t               enable_qos;
     pj_bool_t               no_tcp;
     pj_bool_t               no_udp;
@@ -208 +209 @@
     puts  ("  --ipv6              Use IPv6 instead for SIP and media.");
 #endif
+    puts  ("  --set-qos           Enable QoS tagging for SIP and media.");
     puts  ("  --local-port=port   Set TCP/UDP port. This implicitly enables both ");
     puts  ("                      TCP and UDP transports on the specified port, unless");
@@ -501 +503 @@
            OPT_CAPTURE_DEV, OPT_PLAYBACK_DEV,
            OPT_CAPTURE_LAT, OPT_PLAYBACK_LAT, OPT_NO_TONES, OPT_JB_MAX_SIZE,
-           OPT_STDOUT_REFRESH, OPT_STDOUT_REFRESH_TEXT, OPT_IPV6,
+           OPT_STDOUT_REFRESH, OPT_STDOUT_REFRESH_TEXT, OPT_IPV6, OPT_QOS,
 #ifdef _IONBF
            OPT_STDOUT_NO_BUF,
@@ -617 +619 @@
         { "ipv6",        0, 0, OPT_IPV6},
 #endif
+        { "set-qos",     0, 0, OPT_QOS},
         { "use-timer",  0, 0, OPT_TIMER},
         { "timer-se",   1, 0, OPT_TIMER_SE},
@@ -1328 +1331 @@
             break;
 #endif
-
+        case OPT_QOS:
+            cfg->enable_qos = PJ_TRUE;
+            /* Set RTP traffic type to Voice */
+            cfg->rtp_cfg.qos_type = PJ_QOS_TYPE_VOICE;
+            /* Directly apply DSCP value to SIP traffic. Say lets
+             * set it to CS3 (DSCP 011000). Note that this will not 
+             * work on all platforms.
+             */
+            cfg->udp_cfg.qos_params.flags = PJ_QOS_PARAM_HAS_DSCP;
+            cfg->udp_cfg.qos_params.dscp_val = 0x18;
+            break;
         default:
             PJ_LOG(1,(THIS_FILE, 
@@ -1607 +1620 @@
     if (config->ipv6) {
         pj_strcat2(&cfg, "--ipv6\n");
+    }
+    if (config->enable_qos) {
+        pj_strcat2(&cfg, "--set-qos\n");
     }