X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_connect.c;h=9d74e0b317124323dd399e99428cf37db422248a;hb=HEAD;hp=87dfe8550fbd4280fd223668419362d472ee191a;hpb=04ac803952a6926e959aadd66d6dda911831e120;p=silc.git diff --git a/lib/silcclient/client_connect.c b/lib/silcclient/client_connect.c index 87dfe855..9d74e0b3 100644 --- a/lib/silcclient/client_connect.c +++ b/lib/silcclient/client_connect.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2006 - 2007 Pekka Riikonen + Copyright (C) 2006 - 2008 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ /* Callback called after connected to remote host */ -static void silc_client_connect_callback(SilcNetStatus status, +static void silc_client_connect_callback(SilcResult status, SilcStream stream, void *context) { SilcFSMThread fsm = context; @@ -35,33 +35,33 @@ static void silc_client_connect_callback(SilcNetStatus status, conn->internal->op = NULL; if (conn->internal->verbose) { switch (status) { - case SILC_NET_OK: + case SILC_OK: break; - case SILC_NET_UNKNOWN_IP: + case SILC_ERR_UNKNOWN_IP: client->internal->ops->say( client, conn, SILC_CLIENT_MESSAGE_ERROR, "Could not connect to host %s: unknown IP address", conn->remote_host); break; - case SILC_NET_UNKNOWN_HOST: + case SILC_ERR_UNKNOWN_HOST: client->internal->ops->say( client, conn, SILC_CLIENT_MESSAGE_ERROR, "Could not connect to host %s: unknown host name", conn->remote_host); break; - case SILC_NET_HOST_UNREACHABLE: + case SILC_ERR_UNREACHABLE: client->internal->ops->say( client, conn, SILC_CLIENT_MESSAGE_ERROR, "Could not connect to host %s: network unreachable", conn->remote_host); break; - case SILC_NET_CONNECTION_REFUSED: + case SILC_ERR_REFUSED: client->internal->ops->say( client, conn, SILC_CLIENT_MESSAGE_ERROR, "Could not connect to host %s: connection refused", conn->remote_host); break; - case SILC_NET_CONNECTION_TIMEOUT: + case SILC_ERR_TIMEOUT: client->internal->ops->say( client, conn, SILC_CLIENT_MESSAGE_ERROR, "Could not connect to host %s: connection timeout", @@ -76,11 +76,10 @@ static void silc_client_connect_callback(SilcNetStatus status, } } - if (status != SILC_NET_OK) { + if (status != SILC_OK) { /* Notify application of failure */ SILC_LOG_DEBUG(("Connecting failed")); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR, 0, - NULL, conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR; silc_fsm_next(fsm, silc_client_st_connect_error); SILC_FSM_CALL_CONTINUE(fsm); return; @@ -88,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); } @@ -96,7 +95,7 @@ static void silc_client_connect_callback(SilcNetStatus status, static void silc_client_ke_verify_key_cb(SilcBool success, void *context) { - VerifyKeyContext verify = (VerifyKeyContext)context; + SilcVerifyKeyContext verify = context; SILC_LOG_DEBUG(("Start")); @@ -119,7 +118,7 @@ static void silc_client_ke_verify_key(SilcSKE ske, SilcFSMThread fsm = context; SilcClientConnection conn = silc_fsm_get_context(fsm); SilcClient client = conn->client; - VerifyKeyContext verify; + SilcVerifyKeyContext verify; /* If we provided repository for SKE and we got here the key was not found from the repository. */ @@ -176,13 +175,11 @@ static void silc_client_ke_completion(SilcSKE ske, conn->remote_host, silc_ske_map_status(status)); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_KE, 0, NULL, - conn->callback_context); - + conn->internal->status = SILC_CLIENT_CONN_ERROR_KE; 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; } @@ -200,13 +197,11 @@ static void silc_client_ke_completion(SilcSKE ske, "Error during key exchange with %s: cannot use keys", conn->remote_host); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_KE, 0, NULL, - conn->callback_context); - + conn->internal->status = SILC_CLIENT_CONN_ERROR_KE; 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,13 +218,11 @@ static void silc_client_ke_completion(SilcSKE ske, "Error during key exchange with %s: cannot use keys", conn->remote_host); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_KE, 0, NULL, - conn->callback_context); - + conn->internal->status = SILC_CLIENT_CONN_ERROR_KE; 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; } @@ -238,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 */ @@ -266,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; } @@ -273,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); @@ -282,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); @@ -314,12 +316,12 @@ static void silc_client_connect_auth_completion(SilcConnAuth connauth, client, conn, SILC_CLIENT_MESSAGE_ERROR, "Authentication failed"); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_AUTH, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR_AUTH; + conn->internal->error = SILC_STATUS_ERR_AUTH_FAILED; silc_fsm_next(fsm, silc_client_st_connect_error); } - SILC_FSM_CALL_CONTINUE(fsm); + SILC_FSM_CALL_CONTINUE_SYNC(fsm); } /********************** CONNECTION_AUTH_REQUEST packet **********************/ @@ -365,12 +367,11 @@ SILC_FSM_STATE(silc_client_connect_auth_request) SILC_TASK_CALLBACK(silc_client_connect_timeout) { SilcClientConnection conn = context; - SilcClient client = conn->client; SILC_LOG_DEBUG(("Connection timeout")); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_TIMEOUT, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR_TIMEOUT; + conn->internal->error = SILC_STATUS_ERR_TIMEDOUT; silc_fsm_next(&conn->internal->event_thread, silc_client_st_connect_error); silc_fsm_continue_sync(&conn->internal->event_thread); @@ -381,7 +382,6 @@ SILC_TASK_CALLBACK(silc_client_connect_timeout) SILC_FSM_STATE(silc_client_st_connect) { SilcClientConnection conn = fsm_context; - SilcClient client = conn->client; SILC_LOG_DEBUG(("Connecting to %s:%d", conn->remote_host, conn->remote_port)); @@ -401,8 +401,7 @@ SILC_FSM_STATE(silc_client_st_connect) if (!conn->internal->params.local_ip) { /** IP address not given */ SILC_LOG_ERROR(("Local UDP IP address not specified")); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR; silc_fsm_next(fsm, silc_client_st_connect_error); return SILC_FSM_CONTINUE; } @@ -415,8 +414,8 @@ SILC_FSM_STATE(silc_client_st_connect) conn->remote_host, conn->remote_port, conn->internal->schedule); - SILC_FSM_CALL(silc_client_connect_callback(stream ? SILC_NET_OK : - SILC_NET_HOST_UNREACHABLE, + SILC_FSM_CALL(silc_client_connect_callback(stream ? SILC_OK : + SILC_ERR_UNREACHABLE, stream, fsm)); } else { /* Connect (TCP) */ @@ -444,18 +443,22 @@ 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")); - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR; silc_fsm_next(fsm, silc_client_st_connect_error); return SILC_FSM_CONTINUE; } silc_packet_set_context(conn->stream, conn); + /* Save socket stream and socket into connection context */ + conn->socket_stream = silc_packet_stream_get_stream(conn->stream); + silc_socket_stream_get_info(conn->socket_stream, &conn->sock, NULL, + NULL, NULL); + /** Start key exchange */ silc_fsm_next(fsm, silc_client_st_connect_key_exchange); return SILC_FSM_CONTINUE; @@ -468,6 +471,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")); @@ -478,8 +482,7 @@ SILC_FSM_STATE(silc_client_st_connect_key_exchange) conn->public_key, conn->private_key, fsm); if (!conn->internal->ske) { /** Out of memory */ - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_KE, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR_KE; silc_fsm_next(fsm, silc_client_st_connect_error); return SILC_FSM_CONTINUE; } @@ -509,6 +512,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)); @@ -520,7 +529,6 @@ SILC_FSM_STATE(silc_client_st_connect_key_exchange) SILC_FSM_STATE(silc_client_st_connect_setup_udp) { SilcClientConnection conn = fsm_context; - SilcClient client = conn->client; SilcStream stream, old; SilcSKESecurityProperties prop; @@ -540,8 +548,7 @@ SILC_FSM_STATE(silc_client_st_connect_setup_udp) conn->internal->schedule); if (!stream) { /** Cannot create UDP stream */ - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR; silc_fsm_next(fsm, silc_client_st_connect_error); return SILC_FSM_CONTINUE; } @@ -549,6 +556,9 @@ SILC_FSM_STATE(silc_client_st_connect_setup_udp) /* Set the new stream to packet stream */ old = silc_packet_stream_get_stream(conn->stream); silc_packet_stream_set_stream(conn->stream, stream); + conn->socket_stream = stream; + silc_socket_stream_get_info(conn->socket_stream, &conn->sock, NULL, + NULL, NULL); silc_packet_stream_set_iv_included(conn->stream); silc_packet_set_sid(conn->stream, 0); @@ -560,7 +570,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) { @@ -627,7 +637,6 @@ SILC_FSM_STATE(silc_client_st_connect_auth_data) SILC_FSM_STATE(silc_client_st_connect_auth_start) { SilcClientConnection conn = fsm_context; - SilcClient client = conn->client; SilcConnAuth connauth; SILC_LOG_DEBUG(("Starting connection authentication protocol")); @@ -648,8 +657,8 @@ SILC_FSM_STATE(silc_client_st_connect_auth_start) conn->internal->params.rekey_secs); if (!connauth) { /** Out of memory */ - conn->callback(client, conn, SILC_CLIENT_CONN_ERROR_AUTH, 0, NULL, - conn->callback_context); + conn->internal->status = SILC_CLIENT_CONN_ERROR_AUTH; + conn->internal->error = SILC_STATUS_ERR_AUTH_FAILED; silc_fsm_next(fsm, silc_client_st_connect_error); return SILC_FSM_CONTINUE; } @@ -672,9 +681,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); @@ -684,9 +704,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 && @@ -712,6 +733,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; } @@ -747,9 +771,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, @@ -764,16 +790,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; @@ -791,5 +816,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)); }