Changeset 2967 for pjproject/trunk/pjlib/src/pj/sock_qos_bsd.c

Timestamp:

Oct 25, 2009 10:50:17 AM (15 years ago)

Author:

bennylp

Message:

More ticket #950 (QoS):

• fixed wrong DSCP field operation with sock_qos_bsd.c backend
• tested on Linux for SIP (UDP/TCP), UDP RTP/RTCP, and ICE
• renamed 801_1_P names to SO_PRIO
• changed a bit of doxygen documentation (the title etc)

File:

• pjproject/trunk/pjlib/src/pj/sock_qos_bsd.c (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/sock_qos_bsd.c

@@ -42 +42 @@
     /* Set TOS/DSCP */
     if (param->flags & PJ_QOS_PARAM_HAS_DSCP) {
-        int val = param->dscp_val;
+        /* Value is dscp_val << 2 */
+        int val = (param->dscp_val << 2);
         status = pj_sock_setsockopt(sock, pj_SOL_IP(), pj_IP_TOS(), 
                                     &val, sizeof(val));
@@ -52 +53 @@
 
     /* Set SO_PRIORITY */
-    if (param->flags & PJ_QOS_PARAM_HAS_802_1_P) {
+    if (param->flags & PJ_QOS_PARAM_HAS_SO_PRIO) {
         int val = param->so_prio;
         status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_PRIORITY(),
                                     &val, sizeof(val));
         if (status != PJ_SUCCESS) {
-            param->flags &= ~(PJ_QOS_PARAM_HAS_802_1_P);
+            param->flags &= ~(PJ_QOS_PARAM_HAS_SO_PRIO);
             last_err = status;
         }
@@ -94 +95 @@
     if (status == PJ_SUCCESS) {
         p_param->flags |= PJ_QOS_PARAM_HAS_DSCP;
-        p_param->dscp_val = (pj_uint8_t)val;
+        p_param->dscp_val = (pj_uint8_t)(val >> 2);
     } else {
         last_err = status;
@@ -104 +105 @@
                                 &val, &optlen);
     if (status == PJ_SUCCESS) {
-        p_param->flags |= PJ_QOS_PARAM_HAS_802_1_P;
+        p_param->flags |= PJ_QOS_PARAM_HAS_SO_PRIO;
         p_param->so_prio = (pj_uint8_t)val;
     } else {
@@ -129 +130 @@
 
 #endif  /* PJ_QOS_IMPLEMENTATION */
+