projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b3bc1d0
)
Fixed completion sending.
author
Pekka Riikonen
<priikone@silcnet.org>
Tue, 24 Apr 2007 17:29:29 +0000
(17:29 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Tue, 24 Apr 2007 17:29:29 +0000
(17:29 +0000)
lib/silcske/silcconnauth.c
patch
|
blob
|
history
diff --git
a/lib/silcske/silcconnauth.c
b/lib/silcske/silcconnauth.c
index e7b41c55e6b6b36f042db9d3b221b44ba45b8b0e..dba6ace132ac46de1b641f105a3335f9345b4d18 100644
(file)
--- 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_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);
/* Call completion callback */
connauth->completion(connauth, FALSE, connauth->context);
+ return SILC_FSM_FINISH;
}
silc_packet_stream_unlink(connauth->ske->stream,
}
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);
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);
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;
}
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_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);
/* Call completion callback */
connauth->completion(connauth, FALSE, connauth->context);
+
+ return SILC_FSM_FINISH;
}
silc_packet_stream_unlink(connauth->ske->stream,
}
silc_packet_stream_unlink(connauth->ske->stream,