Changeset 1913 for pjproject/trunk/pjnath/src/pjnath/ice_strans.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/ice_strans.c (modified) (11 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -61 +61 @@
 /* STUN session callback */
 static pj_status_t stun_on_send_msg(pj_stun_session *sess,
+                                    void *token,
                                     const void *pkt,
                                     pj_size_t pkt_size,
@@ -67 +68 @@
 static void stun_on_request_complete(pj_stun_session *sess,
                                      pj_status_t status,
+                                     void *token,
                                      pj_stun_tx_data *tdata,
                                      const pj_stun_msg *response,
@@ -491 +493 @@
                                                    bytes_read, 
                                                    PJ_STUN_IS_DATAGRAM, NULL,
-                                                   &comp->src_addr, 
+                                                   NULL, &comp->src_addr, 
                                                    comp->src_addr_len);
             } else if (ice_st->ice) {
@@ -601 +603 @@
         //tdata->user_data = NULL;
 
-        // We need this to support mapped address change
-        tdata->user_data = &comp->cand_list[j];
         ++comp->pending_cnt;
 
@@ -610 +610 @@
                   pj_inet_ntoa(comp->local_addr.ipv4.sin_addr),
                   pj_ntohs(comp->local_addr.ipv4.sin_port)));
-        status = pj_stun_session_send_msg(comp->stun_sess, PJ_FALSE, 
-                                          &ice_st->stun_srv, 
+        status = pj_stun_session_send_msg(comp->stun_sess, &comp->cand_list[j],
+                                          PJ_FALSE, PJ_TRUE, &ice_st->stun_srv,
                                           sizeof(pj_sockaddr_in), tdata);
         if (status != PJ_SUCCESS) {
@@ -701 +701 @@
         return status;
 
-    /* Attach alias instance to tdata */
+    /* Will be attached to tdata in send_msg() */
     cand = &comp->cand_list[comp->cand_cnt];
-    tdata->user_data = (void*)cand;
 
     /* Add pending count first, since stun_on_request_complete()
@@ -721 +720 @@
 
     /* Send STUN binding request */
-    status = pj_stun_session_send_msg(comp->stun_sess, PJ_FALSE, 
-                                      &ice_st->stun_srv, 
+    status = pj_stun_session_send_msg(comp->stun_sess, (void*)cand, PJ_FALSE, 
+                                      PJ_TRUE, &ice_st->stun_srv, 
                                       sizeof(pj_sockaddr_in), tdata);
     if (status != PJ_SUCCESS) {
@@ -1079 +1078 @@
  */
 static pj_status_t stun_on_send_msg(pj_stun_session *sess,
+                                    void *token,
                                     const void *pkt,
                                     pj_size_t size,
@@ -1087 +1087 @@
     pj_ssize_t pkt_size;
     pj_status_t status;
+
+    PJ_UNUSED_ARG(token);
 
     comp = (pj_ice_strans_comp*) pj_stun_session_get_user_data(sess);
@@ -1103 +1105 @@
 static void stun_on_request_complete(pj_stun_session *sess,
                                      pj_status_t status,
+                                     void *token,
                                      pj_stun_tx_data *tdata,
                                      const pj_stun_msg *response,
@@ -1116 +1119 @@
 
     comp = (pj_ice_strans_comp*) pj_stun_session_get_user_data(sess);
-    cand = (pj_ice_strans_cand*) tdata->user_data;
-
+    cand = (pj_ice_strans_cand*) token;
+
+    PJ_UNUSED_ARG(token);
+    PJ_UNUSED_ARG(tdata);
     PJ_UNUSED_ARG(src_addr);
     PJ_UNUSED_ARG(src_addr_len);