X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_connect.c;h=de87143f047ff3f9dc6be0eb51df4c66b2743fd9;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=c40856a354cebc76eb745beae65d2c10f43b5f12;hpb=5e0534a2c468177c5c2b0c503f529380e8dd3df4;p=silc.git diff --git a/lib/silcclient/client_connect.c b/lib/silcclient/client_connect.c index c40856a3..de87143f 100644 --- a/lib/silcclient/client_connect.c +++ b/lib/silcclient/client_connect.c @@ -87,7 +87,7 @@ static void silc_client_connect_callback(SilcNetStatus status, /* Connection created successfully */ SILC_LOG_DEBUG(("Connected")); - conn->stream = (void *)stream; + conn->internal->user_stream = stream; SILC_FSM_CALL_CONTINUE(fsm); } @@ -176,11 +176,10 @@ static void silc_client_ke_completion(SilcSKE ske, silc_ske_map_status(status)); conn->internal->status = SILC_CLIENT_CONN_ERROR_KE; - conn->internal->error = status; silc_ske_free_rekey_material(rekey); silc_fsm_next(fsm, silc_client_st_connect_error); - SILC_FSM_CALL_CONTINUE(fsm); + SILC_FSM_CALL_CONTINUE_SYNC(fsm); return; } @@ -202,7 +201,7 @@ static void silc_client_ke_completion(SilcSKE ske, silc_ske_free_rekey_material(rekey); silc_fsm_next(fsm, silc_client_st_connect_error); - SILC_FSM_CALL_CONTINUE(fsm); + SILC_FSM_CALL_CONTINUE_SYNC(fsm); return; } @@ -223,7 +222,7 @@ static void silc_client_ke_completion(SilcSKE ske, silc_ske_free_rekey_material(rekey); silc_fsm_next(fsm, silc_client_st_connect_error); - SILC_FSM_CALL_CONTINUE(fsm); + SILC_FSM_CALL_CONTINUE_SYNC(fsm); return; } @@ -232,7 +231,7 @@ static void silc_client_ke_completion(SilcSKE ske, SILC_LOG_DEBUG(("Key Exchange completed")); /* Key exchange done */ - SILC_FSM_CALL_CONTINUE(fsm); + SILC_FSM_CALL_CONTINUE_SYNC(fsm); } /* Rekey protocol completion callback */ @@ -260,6 +259,8 @@ static void silc_client_rekey_completion(SilcSKE ske, conn->remote_host, silc_ske_map_status(status)); + silc_ske_free(conn->internal->ske); + conn->internal->ske = NULL; silc_fsm_finish(fsm); return; } @@ -267,7 +268,10 @@ static void silc_client_rekey_completion(SilcSKE ske, silc_ske_free_rekey_material(conn->internal->rekey); conn->internal->rekey = rekey; - SILC_LOG_DEBUG(("Rekey completed")); + silc_ske_free(conn->internal->ske); + conn->internal->ske = NULL; + + SILC_LOG_DEBUG(("Rekey completed conn %p", conn)); /* Rekey done */ silc_fsm_finish(fsm); @@ -276,14 +280,18 @@ static void silc_client_rekey_completion(SilcSKE ske, /* Callback called by application to return authentication data */ static void silc_client_connect_auth_method(SilcAuthMethod auth_meth, - void *auth, SilcUInt32 auth_len, + const void *auth, + SilcUInt32 auth_len, void *context) { SilcFSMThread fsm = context; SilcClientConnection conn = silc_fsm_get_context(fsm); conn->internal->params.auth_method = auth_meth; - conn->internal->params.auth = auth; + if (auth_meth == SILC_AUTH_PASSWORD) + conn->internal->params.auth = silc_memdup(auth, auth_len); + else + conn->internal->params.auth = (void *)auth; conn->internal->params.auth_len = auth_len; SILC_FSM_CALL_CONTINUE(fsm); @@ -313,7 +321,7 @@ static void silc_client_connect_auth_completion(SilcConnAuth connauth, silc_fsm_next(fsm, silc_client_st_connect_error); } - SILC_FSM_CALL_CONTINUE(fsm); + SILC_FSM_CALL_CONTINUE_SYNC(fsm); } /********************** CONNECTION_AUTH_REQUEST packet **********************/ @@ -435,7 +443,7 @@ SILC_FSM_STATE(silc_client_st_connect_set_stream) /* Create packet stream */ conn->stream = silc_packet_stream_create(client->internal->packet_engine, conn->internal->schedule, - (SilcStream)conn->stream); + conn->internal->user_stream); if (!conn->stream) { /** Cannot create packet stream */ SILC_LOG_DEBUG(("Could not create packet stream")); @@ -458,6 +466,7 @@ SILC_FSM_STATE(silc_client_st_connect_key_exchange) SilcClientConnection conn = fsm_context; SilcClient client = conn->client; SilcSKEParamsStruct params; + SilcClientID cid; SILC_LOG_DEBUG(("Starting key exchange protocol")); @@ -498,6 +507,12 @@ SILC_FSM_STATE(silc_client_st_connect_key_exchange) /** Run key exchange (TCP) */ silc_fsm_next(fsm, silc_client_st_connect_auth_resolve); + /* Old server version requires empty Client ID in packets. Remove this + backwards support somepoint after 1.1 server is released. */ + memset(&cid, 0, sizeof(cid)); + cid.ip.data_len = 4; + silc_packet_set_ids(conn->stream, SILC_ID_CLIENT, &cid, 0, NULL); + SILC_FSM_CALL(conn->internal->op = silc_ske_initiator(conn->internal->ske, conn->stream, ¶ms, NULL)); @@ -547,7 +562,7 @@ SILC_FSM_STATE(silc_client_st_connect_setup_udp) return SILC_FSM_CONTINUE; } -/* Resolved authentication method to be used in authentication protocol */ +/* Resolve authentication method to be used in authentication protocol */ SILC_FSM_STATE(silc_client_st_connect_auth_resolve) { @@ -658,9 +673,20 @@ SILC_FSM_STATE(silc_client_st_connected) SilcClientConnection conn = fsm_context; SilcClient client = conn->client; + /* Get SILC protocol version remote supports */ + silc_ske_parse_version(conn->internal->ske, &conn->internal->remote_version, + NULL, NULL, NULL, NULL); + silc_ske_free(conn->internal->ske); conn->internal->ske = NULL; + if (!conn->internal->params.auth_set && + conn->internal->params.auth_method == SILC_AUTH_PASSWORD && + conn->internal->params.auth) { + silc_free(conn->internal->params.auth); + conn->internal->params.auth = NULL; + } + if (conn->internal->disconnected) { /** Disconnected */ silc_fsm_next(fsm, silc_client_st_connect_error); @@ -670,9 +696,10 @@ SILC_FSM_STATE(silc_client_st_connected) SILC_LOG_DEBUG(("Connection established")); /* Install rekey timer */ - silc_schedule_task_add_timeout(conn->internal->schedule, - silc_client_rekey_timer, conn, - conn->internal->params.rekey_secs, 0); + if (conn->type != SILC_CONN_CLIENT) + silc_schedule_task_add_timeout(conn->internal->schedule, + silc_client_rekey_timer, conn, + conn->internal->params.rekey_secs, 0); /* If we connected to server, now register to network. */ if (conn->type == SILC_CONN_SERVER && @@ -698,6 +725,9 @@ SILC_FSM_STATE(silc_client_st_connected) conn->callback(client, conn, SILC_CLIENT_CONN_SUCCESS, 0, NULL, conn->callback_context); + silc_async_free(conn->internal->cop); + conn->internal->cop = NULL; + return SILC_FSM_FINISH; } @@ -733,9 +763,11 @@ SILC_TASK_CALLBACK(silc_client_rekey_timer) SilcClientConnection conn = context; /* Signal to start rekey */ - conn->internal->rekey_responder = FALSE; - conn->internal->rekeying = TRUE; - SILC_FSM_EVENT_SIGNAL(&conn->internal->wait_event); + if (!silc_fsm_is_started(&conn->internal->event_thread)) { + conn->internal->rekey_responder = FALSE; + conn->internal->rekeying = TRUE; + SILC_FSM_EVENT_SIGNAL(&conn->internal->wait_event); + } /* Reinstall rekey timer */ silc_schedule_task_add_timeout(conn->internal->schedule, @@ -750,16 +782,15 @@ SILC_FSM_STATE(silc_client_st_rekey) SilcClientConnection conn = fsm_context; SilcClient client = conn->client; - SILC_LOG_DEBUG(("Rekey")); + SILC_LOG_DEBUG(("Rekey conn %p", conn)); if (conn->internal->disconnected) return SILC_FSM_FINISH; /* Allocate SKE */ conn->internal->ske = - silc_ske_alloc(client->rng, conn->internal->schedule, - conn->internal->params.repository, - conn->public_key, conn->private_key, fsm); + silc_ske_alloc(client->rng, conn->internal->schedule, NULL, + conn->public_key, NULL, fsm); if (!conn->internal->ske) return SILC_FSM_FINISH; @@ -777,5 +808,6 @@ SILC_FSM_STATE(silc_client_st_rekey) SILC_FSM_CALL(conn->internal->op = silc_ske_rekey_responder( conn->internal->ske, conn->stream, - conn->internal->rekey)); + conn->internal->rekey, + NULL)); }