Changeset 5481 for pjproject/trunk/pjnath/src/pjnath/turn_session.c

Timestamp:

Nov 14, 2016 6:13:01 AM (7 years ago)

Author:

nanang

Message:

Re #1971: Request IPv4 relay address to an IPv6 TURN server for IPv6-IPv4 connectivity.

File:

• pjproject/trunk/pjnath/src/pjnath/turn_session.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -725 +725 @@
                      PJ_EINVALIDOP);
 
+    /* Verify address family in allocation param */
+    if (param && param->af) {
+        PJ_ASSERT_RETURN(param->af==pj_AF_INET() || param->af==pj_AF_INET6(),
+                         PJ_EINVAL);
+    }
+
     pj_grp_lock_acquire(sess->grp_lock);
 
@@ -771 +777 @@
     }
 
-    /* Include ADDRESS-FAMILY for IPv6 request */
-    if (sess->af == pj_AF_INET6()) {
-        enum { IPV6_AF_TYPE = 0x02 << 24 };
-        pj_stun_msg_add_uint_attr(tdata->pool, tdata->msg,
-                                  PJ_STUN_ATTR_REQ_ADDR_TYPE, IPV6_AF_TYPE);
+    /* Include ADDRESS-FAMILY if requested */
+    if (sess->alloc_param.af || sess->af == pj_AF_INET6()) {
+        enum  { IPV4_AF_TYPE = 0x01 << 24,
+                IPV6_AF_TYPE = 0x02 << 24 };
+
+        if (sess->alloc_param.af == pj_AF_INET6() ||
+            (sess->alloc_param.af == 0 && sess->af == pj_AF_INET6()))
+        {
+            pj_stun_msg_add_uint_attr(tdata->pool, tdata->msg,
+                                      PJ_STUN_ATTR_REQ_ADDR_TYPE, IPV6_AF_TYPE);
+        } else if (sess->alloc_param.af == pj_AF_INET()) {
+            /* For IPv4, only add the attribute when explicitly requested */
+            pj_stun_msg_add_uint_attr(tdata->pool, tdata->msg,
+                                      PJ_STUN_ATTR_REQ_ADDR_TYPE, IPV4_AF_TYPE);
+        }
     }
 
@@ -1359 +1375 @@
         return;
     }
-    if (raddr_attr && raddr_attr->sockaddr.addr.sa_family != sess->af) {
+    if (raddr_attr &&
+        ((sess->alloc_param.af != 0 &&
+          raddr_attr->sockaddr.addr.sa_family != sess->alloc_param.af) ||
+         (sess->alloc_param.af == 0 &&
+          raddr_attr->sockaddr.addr.sa_family != sess->af)))
+    {
         on_session_fail(sess, method, PJNATH_EINSTUNMSG,
                         pj_cstr(&s, "Error: Mismatched RELAY-ADDRESS "