Merge commit 'origin/silc.1.1.branch'

[silc.git] / lib / silcclient / client_connect.c

diff --git a/lib/silcclient/client_connect.c b/lib/silcclient/client_connect.c
index 765eba24d629094210fb6a3f756465ee5b702538..9d74e0b317124323dd399e99428cf37db422248a 100644 (file)
--- a/lib/silcclient/client_connect.c
+++ b/lib/silcclient/client_connect.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  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,7 +76,7 @@ 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->internal->status = SILC_CLIENT_CONN_ERROR;
@@ -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;
   }
 
@@ -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;
   }
@@ -279,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);
@@ -409,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) */
@@ -449,6 +454,11 @@ SILC_FSM_STATE(silc_client_st_connect_set_stream)
 
   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;
@@ -461,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"));
 
@@ -501,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,
                                                        &params, NULL));
@@ -539,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);
 
@@ -668,6 +688,13 @@ SILC_FSM_STATE(silc_client_st_connected)
   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);
@@ -770,9 +797,8 @@ SILC_FSM_STATE(silc_client_st_rekey)
 
   /* 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;
 
@@ -790,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));
 }