From: Pekka Riikonen Date: Tue, 24 Apr 2007 17:29:29 +0000 (+0000) Subject: Fixed completion sending. X-Git-Tag: silc.toolkit.1.1.beta1~31 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=516f5551371ace2646140a435bb6b9d9a6f854d0 Fixed completion sending. --- diff --git a/lib/silcske/silcconnauth.c b/lib/silcske/silcconnauth.c index e7b41c55..dba6ace1 100644 --- a/lib/silcske/silcconnauth.c +++ b/lib/silcske/silcconnauth.c @@ -384,8 +384,13 @@ SILC_FSM_STATE(silc_connauth_st_initiator_failure) SILC_PUT32_MSB(SILC_AUTH_FAILED, error); silc_packet_send(connauth->ske->stream, SILC_PACKET_FAILURE, 0, error, 4); + silc_packet_stream_unlink(connauth->ske->stream, + &silc_connauth_stream_cbs, connauth); + silc_schedule_task_del_by_context(silc_fsm_get_schedule(fsm), connauth); + /* Call completion callback */ connauth->completion(connauth, FALSE, connauth->context); + return SILC_FSM_FINISH; } silc_packet_stream_unlink(connauth->ske->stream, @@ -654,13 +659,13 @@ SILC_FSM_STATE(silc_connauth_st_responder_success) SILC_PUT32_MSB(SILC_AUTH_OK, tmp); silc_packet_send(connauth->ske->stream, SILC_PACKET_SUCCESS, 0, tmp, 4); - /* Call completion callback */ - connauth->completion(connauth, TRUE, connauth->context); - silc_packet_stream_unlink(connauth->ske->stream, &silc_connauth_stream_cbs, connauth); silc_schedule_task_del_by_context(silc_fsm_get_schedule(fsm), connauth); + /* Call completion callback */ + connauth->completion(connauth, TRUE, connauth->context); + return SILC_FSM_FINISH; } @@ -676,8 +681,14 @@ SILC_FSM_STATE(silc_connauth_st_responder_failure) SILC_PUT32_MSB(SILC_AUTH_FAILED, error); silc_packet_send(connauth->ske->stream, SILC_PACKET_FAILURE, 0, error, 4); + silc_packet_stream_unlink(connauth->ske->stream, + &silc_connauth_stream_cbs, connauth); + silc_schedule_task_del_by_context(silc_fsm_get_schedule(fsm), connauth); + /* Call completion callback */ connauth->completion(connauth, FALSE, connauth->context); + + return SILC_FSM_FINISH; } silc_packet_stream_unlink(connauth->ske->stream,