Changeset 1080 for pjproject/trunk/pjnath/src/pjnath/stun_transaction.c

Timestamp:

Mar 18, 2007 5:39:27 PM (18 years ago)

Author:

bennylp

Message:

Changed pj_sockaddr structure and added pjnath project for ICE/STUN stuffs

File:

• pjproject/trunk/pjnath/src/pjnath/stun_transaction.c (modified) (12 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_transaction.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjlib-util/stun_transaction.h>
-#include <pjlib-util/errno.h>
+#include <pjnath/stun_transaction.h>
+#include <pjnath/errno.h>
 #include <pj/assert.h>
 #include <pj/log.h>
@@ -32 +32 @@
 {
     char                 obj_name[PJ_MAX_OBJ_NAME];
-    pj_stun_endpoint    *endpt;
+    pj_stun_config      *cfg;
     pj_stun_tsx_cb       cb;
     void                *user_data;
@@ -64 +64 @@
  * Create a STUN client transaction.
  */
-PJ_DEF(pj_status_t) pj_stun_client_tsx_create(pj_stun_endpoint *endpt,
+PJ_DEF(pj_status_t) pj_stun_client_tsx_create(pj_stun_config *cfg,
                                               pj_pool_t *pool,
                                               const pj_stun_tsx_cb *cb,
@@ -71 +71 @@
     pj_stun_client_tsx *tsx;
 
-    PJ_ASSERT_RETURN(endpt && cb && p_tsx, PJ_EINVAL);
+    PJ_ASSERT_RETURN(cfg && cb && p_tsx, PJ_EINVAL);
     PJ_ASSERT_RETURN(cb->on_send_msg, PJ_EINVAL);
 
     tsx = PJ_POOL_ZALLOC_T(pool, pj_stun_client_tsx);
-    tsx->endpt = endpt;
+    tsx->cfg = cfg;
     pj_memcpy(&tsx->cb, cb, sizeof(*cb));
 
@@ -98 +98 @@
 
     if (tsx->timer.id != 0) {
-        pj_timer_heap_cancel(tsx->endpt->timer_heap, &tsx->timer);
+        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
         tsx->timer.id = 0;
     }
@@ -150 +150 @@
         if (tsx->transmit_count == 0) {
             tsx->retransmit_time.sec = 0;
-            tsx->retransmit_time.msec = tsx->endpt->rto_msec;
+            tsx->retransmit_time.msec = tsx->cfg->rto_msec;
 
         } else if (tsx->transmit_count < PJ_STUN_MAX_RETRANSMIT_COUNT-1) {
@@ -169 +169 @@
          * cancel transmission).
          */;
-        status = pj_timer_heap_schedule(tsx->endpt->timer_heap, &tsx->timer,
+        status = pj_timer_heap_schedule(tsx->cfg->timer_heap, &tsx->timer,
                                         &tsx->retransmit_time);
         if (status != PJ_SUCCESS) {
@@ -183 +183 @@
     if (status != PJ_SUCCESS) {
         if (tsx->timer.id != 0) {
-            pj_timer_heap_cancel(tsx->endpt->timer_heap, &tsx->timer);
+            pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
             tsx->timer.id = 0;
         }
@@ -236 +236 @@
         tsx->complete = PJ_TRUE;
         if (tsx->cb.on_complete) {
-            tsx->cb.on_complete(tsx, PJLIB_UTIL_ESTUNNOTRESPOND, NULL);
+            tsx->cb.on_complete(tsx, PJNATH_ESTUNNOTRESPOND, NULL);
         }
         return;
@@ -269 +269 @@
         PJ_LOG(4,(tsx->obj_name, 
                   "STUN rx_msg() error: not response message"));
-        return PJLIB_UTIL_ESTUNNOTRESPONSE;
+        return PJNATH_ESTUNNOTRESPONSE;
     }
 
@@ -277 +277 @@
      */
     if (tsx->timer.id) {
-        pj_timer_heap_cancel(tsx->endpt->timer_heap, &tsx->timer);
+        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
         tsx->timer.id = 0;
     }
@@ -301 +301 @@
         status = PJ_SUCCESS;
     } else {
-        status = PJLIB_UTIL_ESTUNTSXFAILED;
+        status = PJNATH_ESTUNTSXFAILED;
     }