Handle command reply lists in threads.

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

diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c
index c68dc4754508a7301bc6d200d90bd7ff28bbf175..da8f0b246f7cdd49abb094969b0eb409f5e5507f 100644 (file)
--- a/lib/silcclient/client_entry.c
+++ b/lib/silcclient/client_entry.c
@@ -750,7 +750,7 @@ SilcClientEntry silc_client_add_client(SilcClient client,
   silc_mutex_unlock(conn->internal->lock);
   silc_client_ref_client(client, conn, client_entry);
 
-  SILC_LOG_DEBUG(("Added"));
+  SILC_LOG_DEBUG(("Added %p", client_entry));
 
   return client_entry;
 }
@@ -841,13 +841,10 @@ SilcBool silc_client_del_client(SilcClient client, SilcClientConnection conn,
   if (!client_entry)
     return FALSE;
 
-  SILC_LOG_DEBUG(("Client %p refcnt %d->%d", client_entry,
-                 silc_atomic_get_int8(&client_entry->internal.refcnt),
-                 silc_atomic_get_int8(&client_entry->internal.refcnt) - 1));
   if (silc_atomic_sub_int8(&client_entry->internal.refcnt, 1) > 0)
     return FALSE;
 
-  SILC_LOG_DEBUG(("Deleting client %p"));
+  SILC_LOG_DEBUG(("Deleting client %p", client_entry));
 
   silc_mutex_lock(conn->internal->lock);
   ret = silc_idcache_del_by_context(conn->internal->client_cache,
@@ -881,13 +878,12 @@ void silc_client_ref_client(SilcClient client, SilcClientConnection conn,
 void silc_client_unref_client(SilcClient client, SilcClientConnection conn,
                              SilcClientEntry client_entry)
 {
-  if (client_entry)
+  if (client_entry) {
     SILC_LOG_DEBUG(("Client %p refcnt %d->%d", client_entry,
                    silc_atomic_get_int8(&client_entry->internal.refcnt),
                    silc_atomic_get_int8(&client_entry->internal.refcnt) - 1));
-  if (client_entry &&
-      silc_atomic_sub_int8(&client_entry->internal.refcnt, 1) == 0)
     silc_client_del_client(client, conn, client_entry);
+  }
 }
 
 /* Free client entry list */
@@ -938,19 +934,23 @@ void silc_client_nickname_format(SilcClient client,
   if (!clients && !client->internal->params->nickname_force_format)
     return;
 
-  len = 0;
-  freebase = TRUE;
-  while ((entry = silc_dlist_get(clients))) {
-    if (entry->internal.valid && entry != client_entry)
-      len++;
-    if (entry->internal.valid && entry != client_entry &&
-       silc_utf8_strcasecmp(entry->nickname, client_entry->nickname)) {
-      freebase = FALSE;
-      unformatted = entry;
+  if (clients) {
+    len = 0;
+    freebase = TRUE;
+    while ((entry = silc_dlist_get(clients))) {
+      if (entry->internal.valid && entry != client_entry)
+       len++;
+      if (entry->internal.valid && entry != client_entry &&
+         silc_utf8_strcasecmp(entry->nickname, client_entry->nickname)) {
+       freebase = FALSE;
+       unformatted = entry;
+      }
+    }
+    if (!len || freebase) {
+      silc_client_list_free(client, conn, clients);
+      return;
     }
   }
-  if (!len || freebase)
-    return;
 
   /* If we are changing nickname of our local entry we'll enforce
      that we will always get the unformatted nickname.  Give our
@@ -1016,18 +1016,20 @@ void silc_client_nickname_format(SilcClient client,
        char tmp[6];
        int num, max = 1;
 
-       if (silc_dlist_count(clients) == 1)
+       if (clients && silc_dlist_count(clients) == 1)
          break;
 
-       silc_dlist_start(clients);
-       while ((entry = silc_dlist_get(clients))) {
-         if (!silc_utf8_strncasecmp(entry->nickname, newnick, off))
-           continue;
-         if (strlen(entry->nickname) <= off)
-           continue;
-         num = atoi(&entry->nickname[off]);
-         if (num > max)
-           max = num;
+       if (clients) {
+         silc_dlist_start(clients);
+         while ((entry = silc_dlist_get(clients))) {
+           if (!silc_utf8_strncasecmp(entry->nickname, newnick, off))
+             continue;
+           if (strlen(entry->nickname) <= off)
+             continue;
+           num = atoi(&entry->nickname[off]);
+           if (num > max)
+             max = num;
+         }
        }
 
        memset(tmp, 0, sizeof(tmp));
@@ -1328,7 +1330,7 @@ SilcChannelEntry silc_client_add_channel(SilcClient client,
   silc_mutex_unlock(conn->internal->lock);
   silc_client_ref_channel(client, conn, channel);
 
-  SILC_LOG_DEBUG(("Added"));
+  SILC_LOG_DEBUG(("Added %p", channel));
 
   return channel;
 }
@@ -1359,6 +1361,7 @@ SilcBool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
     return FALSE;
 
   silc_client_empty_channel(client, conn, channel);
+  silc_hash_table_free(channel->user_list);
   silc_free(channel->channel_name);
   silc_free(channel->topic);
   if (channel->founder_key)
@@ -1420,6 +1423,9 @@ void silc_client_ref_channel(SilcClient client, SilcClientConnection conn,
                             SilcChannelEntry channel_entry)
 {
   silc_atomic_add_int8(&channel_entry->internal.refcnt, 1);
+  SILC_LOG_DEBUG(("Channel %p refcnt %d->%d", channel_entry,
+                 silc_atomic_get_int8(&channel_entry->internal.refcnt) - 1,
+                 silc_atomic_get_int8(&channel_entry->internal.refcnt)));
 }
 
 /* Release reference of channel entry */
@@ -1427,9 +1433,13 @@ void silc_client_ref_channel(SilcClient client, SilcClientConnection conn,
 void silc_client_unref_channel(SilcClient client, SilcClientConnection conn,
                               SilcChannelEntry channel_entry)
 {
-  if (channel_entry &&
-      silc_atomic_sub_int8(&channel_entry->internal.refcnt, 1) == 0)
+  if (channel_entry) {
+    SILC_LOG_DEBUG(("Channel %p refcnt %d->%d", channel_entry,
+                   silc_atomic_get_int8(&channel_entry->internal.refcnt),
+                   silc_atomic_get_int8(&channel_entry->internal.refcnt)
+                   - 1));
     silc_client_del_channel(client, conn, channel_entry);
+  }
 }
 
 /* Free channel entry list */
@@ -1698,7 +1708,7 @@ SilcServerEntry silc_client_add_server(SilcClient client,
   silc_mutex_unlock(conn->internal->lock);
   silc_client_ref_server(client, conn, server_entry);
 
-  SILC_LOG_DEBUG(("Added"));
+  SILC_LOG_DEBUG(("Added %p", server_entry));
 
   return server_entry;
 }
@@ -1780,6 +1790,9 @@ void silc_client_ref_server(SilcClient client, SilcClientConnection conn,
                            SilcServerEntry server_entry)
 {
   silc_atomic_add_int8(&server_entry->internal.refcnt, 1);
+  SILC_LOG_DEBUG(("Server %p refcnt %d->%d", server_entry,
+                 silc_atomic_get_int8(&server_entry->internal.refcnt) - 1,
+                 silc_atomic_get_int8(&server_entry->internal.refcnt)));
 }
 
 /* Release reference of server entry */
@@ -1787,9 +1800,13 @@ void silc_client_ref_server(SilcClient client, SilcClientConnection conn,
 void silc_client_unref_server(SilcClient client, SilcClientConnection conn,
                              SilcServerEntry server_entry)
 {
-  if (server_entry &&
-      silc_atomic_sub_int8(&server_entry->internal.refcnt, 1) == 0)
+  if (server_entry) {
+    SILC_LOG_DEBUG(("Server %p refcnt %d->%d", server_entry,
+                   silc_atomic_get_int8(&server_entry->internal.refcnt),
+                   silc_atomic_get_int8(&server_entry->internal.refcnt)
+                   - 1));
     silc_client_del_server(client, conn, server_entry);
+  }
 }
 
 /* Free server entry list */