Changeset 1913 for pjproject/trunk/pjnath/src/pjnath/nat_detect.c

Timestamp:

Apr 9, 2008 9:38:12 AM (16 years ago)

Author:

bennylp

Message:

More ticket #485: huge changeset to support TURN TCP. Please see ticket #485 for the details

File:

• pjproject/trunk/pjnath/src/pjnath/nat_detect.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -114 +114 @@
 static void on_request_complete(pj_stun_session *sess,
                                 pj_status_t status,
+                                void *token,
                                 pj_stun_tx_data *tdata,
                                 const pj_stun_msg *response,
@@ -119 +120 @@
                                 unsigned src_addr_len);
 static pj_status_t on_send_msg(pj_stun_session *sess,
+                               void *token,
                                const void *pkt,
                                pj_size_t pkt_size,
@@ -415 +417 @@
         pj_stun_session_on_rx_pkt(sess->stun_sess, sess->rx_pkt, bytes_read,
                                   PJ_STUN_IS_DATAGRAM|PJ_STUN_CHECK_PACKET, 
-                                  NULL, &sess->src_addr, sess->src_addr_len);
+                                  NULL, NULL, 
+                                  &sess->src_addr, sess->src_addr_len);
     }
 
@@ -439 +442 @@
  */
 static pj_status_t on_send_msg(pj_stun_session *stun_sess,
+                               void *token,
                                const void *pkt,
                                pj_size_t pkt_size,
@@ -447 +451 @@
     pj_ssize_t pkt_len;
     pj_status_t status;
+
+    PJ_UNUSED_ARG(token);
 
     sess = (nat_detect_session*) pj_stun_session_get_user_data(stun_sess);
@@ -463 +469 @@
 static void on_request_complete(pj_stun_session *stun_sess,
                                 pj_status_t status,
+                                void *token,
                                 pj_stun_tx_data *tdata,
                                 const pj_stun_msg *response,
@@ -475 +482 @@
     unsigned test_id;
 
+    PJ_UNUSED_ARG(token);
     PJ_UNUSED_ARG(tdata);
     PJ_UNUSED_ARG(src_addr);
@@ -813 +821 @@
 
     /* Send the request */
-    status = pj_stun_session_send_msg(sess->stun_sess, PJ_TRUE, 
-                                      sess->cur_server, 
+    status = pj_stun_session_send_msg(sess->stun_sess, NULL, PJ_TRUE,
+                                      PJ_TRUE, sess->cur_server, 
                                       sizeof(pj_sockaddr_in),
                                       sess->result[test_id].tdata);