Changeset 5444 for pjproject

Timestamp:

Oct 5, 2016 9:07:17 AM (8 years ago)

Author:

riza

Message:

Re #1963: Implement QoS for IPv6 for platform that supports IPV6_TCLASS.

Location:

pjproject/trunk/pjlib

Files:

• include/pj/sock.h (modified) (1 diff)
• src/pj/sock_bsd.c (modified) (1 diff)
• src/pj/sock_common.c (modified) (1 diff)
• src/pj/sock_qos_bsd.c (modified) (4 diffs)

pjproject/trunk/pjlib/include/pj/sock.h

@@ -277 +277 @@
 
 
+/** IPV6_TCLASS optname in setsockopt(). @see pj_IPV6_TCLASS() */
+extern const pj_uint16_t PJ_IPV6_TCLASS;
+
+
+#if defined(PJ_DLL)
+    /** Get #PJ_IPV6_TCLASS constant */
+    PJ_DECL(int) pj_IPV6_TCLASS(void);
+#else
+    /** Get #PJ_IPV6_TCLASS constant */
+#   define pj_IPV6_TCLASS()     PJ_IPV6_TCLASS
+#endif
+
+
 /**
  * Values to be specified as \c optname when calling #pj_sock_setsockopt() 

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

@@ -132 +132 @@
 
 
+/* IPV6_TCLASS */
+#ifdef IPV6_TCLASS
+const pj_uint16_t PJ_IPV6_TCLASS = IPV6_TCLASS;
+#else
+const pj_uint16_t PJ_IPV6_TCLASS = 0xFFFF;
+#endif
+
+
 /* optname values. */
 const pj_uint16_t PJ_SO_TYPE    = SO_TYPE;

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

@@ -1245 +1245 @@
 }
 
+PJ_DEF(int) pj_IPV6_TCLASS(void)
+{
+    return PJ_IPV6_TCLASS;
+}
+
 PJ_DEF(pj_uint16_t) pj_SO_TYPE(void)
 {

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

@@ -23 +23 @@
 
 /* This is the implementation of QoS with BSD socket's setsockopt(),
- * using IP_TOS and SO_PRIORITY
+ * using IP_TOS/IPV6_TCLASS and SO_PRIORITY
  */ 
 #if !defined(PJ_QOS_IMPLEMENTATION) || PJ_QOS_IMPLEMENTATION==PJ_QOS_BSD
@@ -42 +42 @@
     /* Set TOS/DSCP */
     if (param->flags & PJ_QOS_PARAM_HAS_DSCP) {
+        /* We need to know if the socket is IPv4 or IPv6 */
+        pj_sockaddr sa;
+        int salen = sizeof(salen);
+
         /* 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));
+
+        status = pj_sock_getsockname(sock, &sa, &salen);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        if (sa.addr.sa_family == pj_AF_INET()) {
+            /* In IPv4, the DS field goes in the TOS field */
+            status = pj_sock_setsockopt(sock, pj_SOL_IP(), pj_IP_TOS(), 
+                                        &val, sizeof(val));
+        } else if (sa.addr.sa_family == pj_AF_INET6()) {
+            /* In IPv6, the DS field goes in the Traffic Class field */
+            status = pj_sock_setsockopt(sock, pj_SOL_IPV6(),
+                                        pj_IPV6_TCLASS(),
+                                        &val, sizeof(val));
+        } else {
+            status = PJ_EINVAL;
+        }
+
         if (status != PJ_SUCCESS) {
             param->flags &= ~(PJ_QOS_PARAM_HAS_DSCP);
@@ -85 +105 @@
     pj_status_t last_err = PJ_ENOTSUP;
     int val, optlen;
+    pj_sockaddr sa;
+    int salen = sizeof(salen);
     pj_status_t status;
 
@@ -90 +112 @@
 
     /* Get DSCP/TOS value */
-    optlen = sizeof(val);
-    status = pj_sock_getsockopt(sock, pj_SOL_IP(), pj_IP_TOS(), 
-                                &val, &optlen);
+    status = pj_sock_getsockname(sock, &sa, &salen);
     if (status == PJ_SUCCESS) {
-        p_param->flags |= PJ_QOS_PARAM_HAS_DSCP;
-        p_param->dscp_val = (pj_uint8_t)(val >> 2);
+        optlen = sizeof(val);
+        if (sa.addr.sa_family == pj_AF_INET()) {
+            status = pj_sock_getsockopt(sock, pj_SOL_IP(), pj_IP_TOS(), 
+                                        &val, &optlen);
+        } else if (sa.addr.sa_family == pj_AF_INET6()) {
+            status = pj_sock_getsockopt(sock, pj_SOL_IPV6(),
+                                        pj_IPV6_TCLASS(),
+                                        &val, &optlen);
+        } else {
+            status = PJ_EINVAL;
+        }
+
+        if (status == PJ_SUCCESS) {
+            p_param->flags |= PJ_QOS_PARAM_HAS_DSCP;
+            p_param->dscp_val = (pj_uint8_t)(val >> 2);
+        } else {
+            last_err = status;
+        }
     } else {
         last_err = status;