Changeset 5513 for pjproject/branches/projects/uwp/pjnath/src/pjnath/turn_session.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjnath/src/pjnath/turn_session.c (modified) (7 diffs)

pjproject/branches/projects/uwp/pjnath/src/pjnath/turn_session.c

@@ -609 +609 @@
         }
 
+        /* Init DNS resolution option for IPv6 */
+        if (sess->af == pj_AF_INET6())
+            opt |= PJ_DNS_SRV_RESOLVE_AAAA_ONLY;
+
         /* Fallback to DNS A only if default port is specified */
         if (default_port>0 && default_port<65536) {
-            opt = PJ_DNS_SRV_FALLBACK_A;
+            if (sess->af == pj_AF_INET6())
+                opt |= PJ_DNS_SRV_FALLBACK_AAAA;
+            else
+                opt |= PJ_DNS_SRV_FALLBACK_A;
             sess->default_port = (pj_uint16_t)default_port;
         }
@@ -718 +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);
 
@@ -762 +775 @@
                                   PJ_STUN_ATTR_LIFETIME,
                                   sess->alloc_param.lifetime);
+    }
+
+    /* 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);
+        }
     }
 
@@ -778 +808 @@
          * let the application do it if it wants to.
          */
-        set_state(sess, PJ_TURN_STATE_RESOLVED);
+        /* Set state back to RESOLVED may cause infinite loop (see #1942). */
+        //set_state(sess, PJ_TURN_STATE_RESOLVED);
     }
 
@@ -1344 +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: RELAY-ADDRESS with non IPv4"
-                                    " address family is not supported "
-                                    "for now"));
+                        pj_cstr(&s, "Error: Mismatched RELAY-ADDRESS "
+                                    "address family"));
         return;
     }
@@ -1719 +1754 @@
                   cnt<PJ_TURN_MAX_DNS_SRV_CNT; ++j) 
         {
-            pj_sockaddr_in *addr = &sess->srv_addr_list[cnt].ipv4;
-
-            addr->sin_family = sess->af;
-            addr->sin_port = pj_htons(rec->entry[i].port);
-            addr->sin_addr.s_addr = rec->entry[i].server.addr[j].s_addr;
-
-            ++cnt;
+            if (rec->entry[i].server.addr[j].af == sess->af) {
+                pj_sockaddr *addr = &sess->srv_addr_list[cnt];
+
+                addr->addr.sa_family = sess->af;
+                pj_sockaddr_set_port(addr, rec->entry[i].port);
+                if (sess->af == pj_AF_INET6())
+                    addr->ipv6.sin6_addr = rec->entry[i].server.addr[j].ip.v6;
+                else
+                    addr->ipv4.sin_addr = rec->entry[i].server.addr[j].ip.v4;
+
+                ++cnt;
+            }
         }
     }
@@ -1738 +1778 @@
     /* Run pending allocation */
     if (sess->pending_alloc) {
-        pj_turn_session_alloc(sess, NULL);
+        pj_status_t status;
+        status = pj_turn_session_alloc(sess, NULL);
+        if (status != PJ_SUCCESS)
+            on_session_fail(sess, PJ_STUN_ALLOCATE_METHOD, status, NULL);
     }
 }