Changeset 109 for pjproject/trunk/pjsip/src/pjsip/sip_transport_loop.c

Timestamp:

Jan 7, 2006 6:44:25 PM (18 years ago)

Author:

bennylp

Message:

Added test functions for UAC transaction

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_loop.c (modified) (13 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_loop.c

@@ -28 +28 @@
 
 
-#define FAIL_IMMEDIATE  1
-#define FAIL_CALLBACK   2
-
 #define ADDR_LOOP       "128.0.0.1"
 #define ADDR_LOOP_DGRAM "129.0.0.1"
@@ -62 +59 @@
     pj_bool_t                discard;
     int                      fail_mode;
-    unsigned                 delay;
+    unsigned                 recv_delay;
+    unsigned                 send_delay;
     struct recv_list         recv_list;
     struct send_list         send_list;
@@ -101 +99 @@
     /* When do we need to "deliver" this packet. */
     pj_gettimeofday(&pkt->rdata.pkt_info.timestamp);
-    pkt->rdata.pkt_info.timestamp.msec += loop->delay;
+    pkt->rdata.pkt_info.timestamp.msec += loop->recv_delay;
     pj_time_val_normalize(&pkt->rdata.pkt_info.timestamp);
 
@@ -131 +129 @@
 
     pj_gettimeofday(&sent_status->sent_time);
-    sent_status->sent_time.msec += loop->delay;
+    sent_status->sent_time.msec += loop->send_delay;
     pj_time_val_normalize(&sent_status->sent_time);
 
@@ -161 +159 @@
 
 
-    /* Need to send failure immediately? */
-    if (loop->fail_mode == FAIL_IMMEDIATE) {
-        return PJ_STATUS_FROM_OS(OSERR_ECONNRESET);
-
-    /* Need to send failure later? */
-    } else if (loop->fail_mode == FAIL_CALLBACK) {
-
-        add_notification(loop, tdata, -PJ_STATUS_FROM_OS(OSERR_ECONNRESET), 
-                         token, cb);
-
-        return PJ_EPENDING;
+    /* Need to send failure? */
+    if (loop->fail_mode) {
+        if (loop->send_delay == 0) {
+            return PJ_STATUS_FROM_OS(OSERR_ECONNRESET);
+        } else {
+            add_notification(loop, tdata, -PJ_STATUS_FROM_OS(OSERR_ECONNRESET),
+                             token, cb);
+
+            return PJ_EPENDING;
+        }
     }
 
@@ -184 +181 @@
 
     /* If delay is not configured, deliver this packet now! */
-    if (loop->delay == 0) {
+    if (loop->recv_delay == 0) {
         pj_ssize_t size_eaten;
 
@@ -193 +190 @@
         pjsip_endpt_release_pool(loop->base.endpt, 
                                  recv_pkt->rdata.tp_info.pool);
-        return PJ_SUCCESS;
 
     } else {
         /* Otherwise if delay is configured, add the "packet" to the 
-         * receive list to be processed by worker thread, and add
-         * pending notification for calling the callback.
+         * receive list to be processed by worker thread.
          */
-        add_notification(loop, tdata, tdata->buf.cur - tdata->buf.start, 
-                         token, cb);
-
         pj_lock_acquire(loop->base.lock);
         pj_list_push_back(&loop->recv_list, recv_pkt);
         pj_lock_release(loop->base.lock);
+    }
+
+    if (loop->send_delay != 0) {
+        add_notification(loop, tdata, tdata->buf.cur - tdata->buf.start,
+                         token, cb);
         return PJ_EPENDING;
+    } else {
+        return PJ_SUCCESS;
     }
 }
@@ -224 +223 @@
     pj_thread_destroy(loop->thread);
 
+    /* Clear pending send notifications. */
+    while (!pj_list_empty(&loop->send_list)) {
+        struct send_list *node = loop->send_list.next;
+        /* Notify callback. */
+        if (node->callback) {
+            (*node->callback)(&loop->base, node->token, -PJSIP_ESHUTDOWN);
+        }
+        pj_list_erase(node);
+        pjsip_tx_data_dec_ref(node->tdata);
+    }
+
+    /* Clear "incoming" packets in the queue. */
+    while (!pj_list_empty(&loop->recv_list)) {
+        struct recv_list *node = loop->recv_list.next;
+        pj_list_erase(node);
+        pjsip_endpt_release_pool(loop->base.endpt,
+                                 node->rdata.tp_info.pool);
+    }
+
+    /* Self destruct.. heheh.. */
     pj_lock_destroy(loop->base.lock);
     pj_atomic_destroy(loop->base.ref_cnt);
@@ -239 +258 @@
         pj_time_val now;
 
-        pj_thread_sleep(10);
+        pj_thread_sleep(1);
         pj_gettimeofday(&now);
 
@@ -321 +340 @@
         goto on_error;
     loop->base.key.type = PJSIP_TRANSPORT_LOOP_DGRAM;
-    loop->base.key.rem_addr.sa_family = PJ_AF_INET;
+    //loop->base.key.rem_addr.sa_family = PJ_AF_INET;
     loop->base.type_name = "LOOP-DGRAM";
     loop->base.info = "LOOP-DGRAM";
@@ -357 +376 @@
      */
 
-    *transport = &loop->base;
+    if (transport)
+        *transport = &loop->base;
+
     return PJ_SUCCESS;
 
@@ -406 +427 @@
 
 
-PJ_DEF(pj_status_t) pjsip_loop_set_delay( pjsip_transport *tp,
-                                          unsigned delay,
-                                          unsigned *prev_value)
+PJ_DEF(pj_status_t) pjsip_loop_set_recv_delay( pjsip_transport *tp,
+                                               unsigned delay,
+                                               unsigned *prev_value)
 {
     struct loop_transport *loop = (struct loop_transport*)tp;
@@ -416 +437 @@
 
     if (prev_value)
-        *prev_value = loop->delay;
-    loop->delay = delay;
-
-    return PJ_SUCCESS;
-}
-
+        *prev_value = loop->recv_delay;
+    loop->recv_delay = delay;
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjsip_loop_set_send_callback_delay( pjsip_transport *tp,
+                                                        unsigned delay,
+                                                        unsigned *prev_value)
+{
+    struct loop_transport *loop = (struct loop_transport*)tp;
+
+    PJ_ASSERT_RETURN(tp && (tp->key.type == PJSIP_TRANSPORT_LOOP ||
+                     tp->key.type == PJSIP_TRANSPORT_LOOP_DGRAM), PJ_EINVAL);
+
+    if (prev_value)
+        *prev_value = loop->send_delay;
+    loop->send_delay = delay;
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjsip_loop_set_delay( pjsip_transport *tp, unsigned delay )
+{
+    struct loop_transport *loop = (struct loop_transport*)tp;
+
+    PJ_ASSERT_RETURN(tp && (tp->key.type == PJSIP_TRANSPORT_LOOP ||
+                     tp->key.type == PJSIP_TRANSPORT_LOOP_DGRAM), PJ_EINVAL);
+
+    loop->recv_delay = delay;
+    loop->send_delay = delay;
+
+    return PJ_SUCCESS;
+}
+