Fixed nickname setting with 1.3 protocol version.

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

diff --git a/lib/silcclient/client_connect.c b/lib/silcclient/client_connect.c
index 78e24c60189ce2bbdb3aa0dd4f50c93d6f8e6c14..ee8eb611afc96518485687ad98edfcdfe64f012d 100644 (file)
--- 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);
 }
 
@@ -95,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"));
 
@@ -118,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. */
@@ -232,7 +232,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 +260,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 +269,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);
@@ -313,7 +318,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 +440,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"));
@@ -547,7 +552,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,6 +663,10 @@ 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;
 
@@ -670,9 +679,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 +708,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 +746,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,7 +765,7 @@ 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;
@@ -777,5 +792,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));
 }