Changeset 2589 for pjproject/trunk/pjnath/src/pjturn-srv/allocation.c

Timestamp:

Apr 13, 2009 8:54:10 AM (15 years ago)

Author:

bennylp

Message:

Ticket #780: Update TURN from draft 09 to draft 13:

• new rules for permissions:
  • permission must be created and refreshed explicitly with CreatePermission?
  • transmitting data does not refresh permission
• attributes changed/added: XOR-PEER-ADDRESS, XOR-RELAYED-ADDRESS, EVEN-PORT, DONT-FRAGMENT
• attribute(s) removed: REQUESTED-PROPS
• new status codes: 401 (Forbidden), 507 (Insufficient Capacity)
• removed status codes: 443 (Invalid IP address), 444 (Invalid Port), 508 (Insufficient Port Capacity)

File:

• pjproject/trunk/pjnath/src/pjturn-srv/allocation.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjturn-srv/allocation.c

@@ -110 +110 @@
     pj_stun_req_transport_attr *attr_req_tp;
     pj_stun_res_token_attr *attr_res_token;
-    pj_stun_req_props_attr *attr_rpp;
     pj_stun_lifetime_attr *attr_lifetime;
 
@@ -165 +164 @@
     }
 
-    /* Get REQUESTED-PROPS attribute, if any */
-    attr_rpp = (pj_stun_req_props_attr*)
-               pj_stun_msg_find_attr(req, PJ_STUN_ATTR_REQ_PROPS, 0);
-    if (attr_rpp) {
-        /* We don't support REQUESTED-PROPS for now */
-        pj_stun_session_respond(sess, rdata, 
-                                PJ_STUN_SC_BAD_REQUEST,
-                                "REQUESTED-PROPS is not supported", 
-                                NULL, PJ_TRUE, src_addr, src_addr_len);
-        return PJ_STATUS_FROM_STUN_CODE(PJ_STUN_SC_BAD_REQUEST);
-    }
-
     /* Get LIFETIME attribute */
     attr_lifetime = (pj_stun_uint_attr*)
@@ -212 +199 @@
         return status;
 
-    /* Add RELAYED-ADDRESS attribute */
+    /* Add XOR-RELAYED-ADDRESS attribute */
     pj_stun_msg_add_sockaddr_attr(tdata->pool, tdata->msg,
-                                  PJ_STUN_ATTR_RELAYED_ADDR, PJ_TRUE,
+                                  PJ_STUN_ATTR_XOR_RELAYED_ADDR, PJ_TRUE,
                                   &alloc->relay.hkey.addr,
                                   pj_sockaddr_get_len(&alloc->relay.hkey.addr));
@@ -1071 +1058 @@
 
         pj_stun_msg_add_sockaddr_attr(tdata->pool, tdata->msg, 
-                                      PJ_STUN_ATTR_PEER_ADDR, PJ_TRUE,
+                                      PJ_STUN_ATTR_XOR_PEER_ADDR, PJ_TRUE,
                                       src_addr, pj_sockaddr_get_len(src_addr));
         pj_stun_msg_add_binary_attr(tdata->pool, tdata->msg,
@@ -1231 +1218 @@
          */
         pj_stun_channel_number_attr *ch_attr;
-        pj_stun_peer_addr_attr *peer_attr;
+        pj_stun_xor_peer_addr_attr *peer_attr;
         pj_turn_permission *p1, *p2;
 
         ch_attr = (pj_stun_channel_number_attr*)
                   pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_CHANNEL_NUMBER, 0);
-        peer_attr = (pj_stun_peer_addr_attr*)
-                    pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_PEER_ADDR, 0);
+        peer_attr = (pj_stun_xor_peer_addr_attr*)
+                    pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_XOR_PEER_ADDR, 0);
 
         if (!ch_attr || !peer_attr) {
@@ -1334 +1321 @@
                                          unsigned src_addr_len)
 {
-    pj_stun_peer_addr_attr *peer_attr;
+    pj_stun_xor_peer_addr_attr *peer_attr;
     pj_stun_data_attr *data_attr;
     pj_turn_allocation *alloc;
@@ -1354 +1341 @@
     }
 
-    /* Get PEER-ADDRESS attribute */
-    peer_attr = (pj_stun_peer_addr_attr*)
-                pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_PEER_ADDR, 0);
-
-    /* MUST have PEER-ADDRESS attribute */
+    /* Get XOR-PEER-ADDRESS attribute */
+    peer_attr = (pj_stun_xor_peer_addr_attr*)
+                pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_XOR_PEER_ADDR, 0);
+
+    /* MUST have XOR-PEER-ADDRESS attribute */
     if (!peer_attr)
         return PJ_SUCCESS;