X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=apps%2Fsilcd%2Fpacket_receive.c;h=73424a68988fe7b2016030d9c8de39bb8f33b7a9;hp=c8d4068d765b444754a4dc29c7301099d95cca14;hb=4d26d9f598384d7cd49c6238ea4a81b9f4e6f212;hpb=32607f5db7ea3393765be5421e754ef191894dd5

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index c8d4068d..73424a68 100644
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -356,6 +356,7 @@ static void silc_server_notify_process(SilcServer server,
     client->mode = 0;
     client->router = NULL;
     client->connection = NULL;
+    client->data.created = silc_time();
     silc_dlist_del(server->expired_clients, client);
     silc_dlist_add(server->expired_clients, client);
     break;
@@ -1264,6 +1265,7 @@ static void silc_server_notify_process(SilcServer server,
 	      silc_server_del_from_watcher_list(server, client);
 
 	    /* Remove the client */
+	    silc_dlist_del(server->expired_clients, client);
 	    silc_idlist_del_data(client);
 	    silc_idlist_del_client(local ? server->local_list :
 				   server->global_list, client);
@@ -1505,6 +1507,7 @@ static void silc_server_notify_process(SilcServer server,
       client->mode = 0;
       client->router = NULL;
       client->connection = NULL;
+      client->data.created = silc_time();
       silc_dlist_del(server->expired_clients, client);
       silc_dlist_add(server->expired_clients, client);
       break;
@@ -1666,6 +1669,7 @@ static void silc_server_notify_process(SilcServer server,
 
 	silc_server_remove_from_channels(server, NULL, client, TRUE,
 					 NULL, TRUE, FALSE);
+	silc_dlist_del(server->expired_clients, client);
 	silc_idlist_del_data(client);
 	silc_idlist_del_client(server->global_list, client);
       }
@@ -3717,6 +3721,7 @@ void silc_server_resume_client(SilcServer server,
     detached_client->data.status &= ~SILC_IDLIST_STATUS_RESUME_RES;
     detached_client->mode &= ~SILC_UMODE_DETACHED;
     server->stat.my_detached--;
+    silc_dlist_del(server->expired_clients, detached_client);
 
     /* We are finished - reset resuming client */
     detached_client->resuming_client = NULL;
@@ -3734,6 +3739,7 @@ void silc_server_resume_client(SilcServer server,
     silc_server_remove_from_channels(server, NULL, client, FALSE,
 				     NULL, FALSE, FALSE);
     silc_server_del_from_watcher_list(server, client);
+    silc_dlist_del(server->expired_clients, client);
     if (!silc_idlist_del_client(server->local_list, client))
       silc_idlist_del_client(server->global_list, client);
     client = detached_client;
@@ -3953,7 +3959,6 @@ void silc_server_resume_client(SilcServer server,
     detached_client->data.status |= SILC_IDLIST_STATUS_RESUMED;
     detached_client->data.status &= ~SILC_IDLIST_STATUS_LOCAL;
     silc_dlist_del(server->expired_clients, detached_client);
-    silc_dlist_del(server->expired_clients, detached_client);
 
     /* Check if anyone is watching this client */
     if (server->server_type == SILC_ROUTER)