projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle command reply lists in threads.
[silc.git]
/
lib
/
silcclient
/
client_connect.c
diff --git
a/lib/silcclient/client_connect.c
b/lib/silcclient/client_connect.c
index 8c1491943b9f91518a6a19c66528cd0923eebd97..ccf5793c20718a1fcf190787db03b7b88821863a 100644
(file)
--- a/
lib/silcclient/client_connect.c
+++ b/
lib/silcclient/client_connect.c
@@
-32,12
+32,6
@@
static void silc_client_connect_callback(SilcNetStatus status,
SilcClientConnection conn = silc_fsm_get_context(fsm);
SilcClient client = conn->client;
SilcClientConnection conn = silc_fsm_get_context(fsm);
SilcClient client = conn->client;
- if (conn->internal->aborted) {
- silc_fsm_next(fsm, silc_client_st_connect_error);
- SILC_FSM_CALL_CONTINUE(fsm);
- return;
- }
-
conn->internal->op = NULL;
if (conn->internal->verbose) {
switch (status) {
conn->internal->op = NULL;
if (conn->internal->verbose) {
switch (status) {
@@
-127,14
+121,6
@@
static void silc_client_ke_verify_key(SilcSKE ske,
SilcClient client = conn->client;
VerifyKeyContext verify;
SilcClient client = conn->client;
VerifyKeyContext verify;
- if (conn->internal->aborted) {
- completion(ske, SILC_SKE_STATUS_UNSUPPORTED_PUBLIC_KEY,
- completion_context);
- silc_fsm_next(fsm, silc_client_st_connect_error);
- SILC_FSM_CALL_CONTINUE(fsm);
- return;
- }
-
/* If we provided repository for SKE and we got here the key was not
found from the repository. */
if (conn->internal->params.repository &&
/* If we provided repository for SKE and we got here the key was not
found from the repository. */
if (conn->internal->params.repository &&
@@
-178,13
+164,6
@@
static void silc_client_ke_completion(SilcSKE ske,
SilcCipher send_key, receive_key;
SilcHmac hmac_send, hmac_receive;
SilcCipher send_key, receive_key;
SilcHmac hmac_send, hmac_receive;
- if (conn->internal->aborted) {
- silc_ske_free_rekey_material(rekey);
- silc_fsm_next(fsm, silc_client_st_connect_error);
- SILC_FSM_CALL_CONTINUE(fsm);
- return;
- }
-
conn->internal->op = NULL;
if (status != SILC_SKE_STATUS_OK) {
/* Key exchange failed */
conn->internal->op = NULL;
if (status != SILC_SKE_STATUS_OK) {
/* Key exchange failed */
@@
-328,12
+307,6
@@
static void silc_client_connect_auth_completion(SilcConnAuth connauth,
SilcClientConnection conn = silc_fsm_get_context(fsm);
SilcClient client = conn->client;
SilcClientConnection conn = silc_fsm_get_context(fsm);
SilcClient client = conn->client;
- if (conn->internal->aborted) {
- silc_fsm_next(fsm, silc_client_st_connect_error);
- SILC_FSM_CALL_CONTINUE(fsm);
- return;
- }
-
conn->internal->op = NULL;
silc_connauth_free(connauth);
conn->internal->op = NULL;
silc_connauth_free(connauth);