Changeset 4260 for pjproject/trunk

Timestamp:

Sep 18, 2012 9:38:44 AM (12 years ago)

Author:

ming

Message:

Re #1583: Removed testing scenario accidentally left in the code

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -102 +102 @@
     /* Keep-alive timer. */
     pj_timer_entry           ka_timer;
-    pj_timer_entry           connect_timer;
     pj_time_val              last_activity;
     pjsip_tx_data_op_key     ka_op_key;
@@ -525 +524 @@
 
 /* Callback when connect completes */
-static pj_bool_t on_connect_complete_real(pj_activesock_t *asock,
+static pj_bool_t on_connect_complete(pj_activesock_t *asock,
                                      pj_status_t status);
-
-static void tcp_connect_timer(pj_timer_heap_t *th, pj_timer_entry *e)
-{
-    struct tcp_transport *tcp = (struct tcp_transport*) e->user_data;
-
-    e->id = 0;
-    on_connect_complete_real(tcp->asock, PJ_SUCCESS);
-}
-
-static pj_bool_t on_connect_complete(pj_activesock_t *asock,
-                                     pj_status_t status)
-{
-    struct tcp_transport *tcp;
-    pj_time_val delay = {35, 0};
-
-    tcp = (struct tcp_transport*) pj_activesock_get_user_data(asock);
-
-    if (status != PJ_SUCCESS) {
-        return on_connect_complete_real(asock, status);
-    }
-
-    PJ_LOG(3,(tcp->base.obj_name, "Delaying CONNECT notification"));
-    pj_timer_entry_init(&tcp->connect_timer, 1, (void*)tcp, &tcp_connect_timer);
-    pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->connect_timer,
-                               &delay);
-
-    return PJ_TRUE;
-}
 
 /* TCP keep-alive timer callback */
@@ -1314 +1285 @@
  * Callback from ioqueue when asynchronous connect() operation completes.
  */
-static pj_bool_t on_connect_complete_real(pj_activesock_t *asock,
+static pj_bool_t on_connect_complete(pj_activesock_t *asock,
                                      pj_status_t status)
 {