Changeset 2591 for pjproject/trunk

Timestamp:

Apr 13, 2009 6:40:10 PM (16 years ago)

Author:

bennylp

Message:

More ticket #780: fixed compilation errors due to previous modifications related to TURN

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/stun_msg.h (modified) (1 diff)
• src/pjnath-test/server.c (modified) (4 diffs)

pjproject/trunk/pjnath/include/pjnath/stun_msg.h

@@ -1058 +1058 @@
  * part and thus the attribute length field is 0.
  */
-typedef struct pj_stun_empty_attr pj_stun_use_candidate_attr;
+typedef struct pj_stun_empty_attr pj_stun_dont_fragment_attr;
 
 

pjproject/trunk/pjnath/src/pjnath-test/server.c

@@ -467 +467 @@
         }
         pj_stun_msg_add_sockaddr_attr(alloc->pool, alloc->data_ind, 
-                                      PJ_STUN_ATTR_PEER_ADDR, PJ_TRUE,
+                                      PJ_STUN_ATTR_XOR_PEER_ADDR, PJ_TRUE,
                                       &alloc->alloc_addr,
                                       pj_sockaddr_get_len(&alloc->alloc_addr));
@@ -516 +516 @@
                 resp = create_success_response(test_srv, alloc, req, pool, 0, &auth_key);
         } else if (req->hdr.type == PJ_STUN_SEND_INDICATION) {
-            pj_stun_peer_addr_attr *pa;
+            pj_stun_xor_peer_addr_attr *pa;
             pj_stun_data_attr *da;
 
             test_srv->turn_stat.rx_send_ind_cnt++;
 
-            pa = (pj_stun_peer_addr_attr*)
-                 pj_stun_msg_find_attr(req, PJ_STUN_ATTR_PEER_ADDR, 0);
+            pa = (pj_stun_xor_peer_addr_attr*)
+                 pj_stun_msg_find_attr(req, PJ_STUN_ATTR_XOR_PEER_ADDR, 0);
             da = (pj_stun_data_attr*)
                  pj_stun_msg_find_attr(req, PJ_STUN_ATTR_DATA, 0);
@@ -589 +589 @@
 {
     turn_allocation *alloc;
-    pj_stun_peer_addr_attr *pa;
+    pj_stun_xor_peer_addr_attr *pa;
     pj_stun_data_attr *da;
     char peer_info[PJ_INET6_ADDRSTRLEN+10];
@@ -624 +624 @@
 
     /* Format a Data indication */
-    pa = (pj_stun_peer_addr_attr*)
-         pj_stun_msg_find_attr(alloc->data_ind, PJ_STUN_ATTR_PEER_ADDR, 0);
+    pa = (pj_stun_xor_peer_addr_attr*)
+         pj_stun_msg_find_attr(alloc->data_ind, PJ_STUN_ATTR_XOR_PEER_ADDR, 0);
     da = (pj_stun_data_attr*)
          pj_stun_msg_find_attr(alloc->data_ind, PJ_STUN_ATTR_DATA, 0);