diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2012-09-18 09:38:44 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2012-09-18 09:38:44 +0000 |
| commit | 8a001ec6f6a9c628eff9fbd9c9a478d127ed12d3 (patch) | |
| tree | 73d350b094b89dd726e4ce21cb71c9365181c2b0 /pjsip/src/pjsip | |
| parent | 5034a16b8b41674bf4ba042a69d32ba956bb9cfb (diff) | |
Re #1583: Removed testing scenario accidentally left in the code
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4260 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsip')
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_tcp.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/pjsip/src/pjsip/sip_transport_tcp.c b/pjsip/src/pjsip/sip_transport_tcp.c index 8698ea85..967d0670 100644 --- a/pjsip/src/pjsip/sip_transport_tcp.c +++ b/pjsip/src/pjsip/sip_transport_tcp.c @@ -101,7 +101,6 @@ struct tcp_transport /* 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; pj_str_t ka_pkt; @@ -524,36 +523,8 @@ static pj_bool_t on_data_sent(pj_activesock_t *asock, pj_ssize_t sent); /* Callback when connect completes */ -static pj_bool_t on_connect_complete_real(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; -} + pj_status_t status); /* TCP keep-alive timer callback */ static void tcp_keep_alive_timer(pj_timer_heap_t *th, pj_timer_entry *e); @@ -1313,7 +1284,7 @@ static pj_bool_t on_data_read(pj_activesock_t *asock, /* * 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) { struct tcp_transport *tcp; |