Fixed CMODE sending and receiving when it comes to channel

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

diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c
index b799d82d200427f1db5f0b77367aac0443b1dd8c..fb6479a7c6b5eb525d39ff009de79ee4cdc444c9 100644 (file)
--- a/lib/silcclient/client_entry.c
+++ b/lib/silcclient/client_entry.c
@@ -77,7 +77,7 @@ SilcDList silc_client_get_clients_local_ext(SilcClient client,
   if (!client || !conn || !nickname)
     return NULL;
 
-  /* Parse nickname if it is formatted */
+  /* Parse nickname in case it is formatted */
   if (!silc_client_nickname_parse(client, conn, (char *)nickname, &parsed))
     return NULL;
 
@@ -157,6 +157,8 @@ SilcDList silc_client_get_clients_local_ext(SilcClient client,
     return NULL;
   }
 
+  SILC_LOG_DEBUG(("Found %d clients", silc_dlist_count(clients)));
+
   silc_dlist_start(clients);
   return clients;
 }
@@ -255,8 +257,11 @@ silc_client_get_client_by_id_resolve(SilcClient client,
   SilcBuffer idp;
   SilcUInt16 cmd_ident;
 
-  if (!client || !conn | !client_id)
+  if (!client || !conn | !client_id) {
+    SILC_LOG_ERROR(("Missing arguments to "
+                   "silc_client_get_clients_by_id_resolve call"));
     return 0;
+  }
 
   SILC_LOG_DEBUG(("Resolve client by ID (%s)",
                  silc_id_render(client_id, SILC_ID_CLIENT)));
@@ -318,22 +323,39 @@ static SilcUInt16 silc_client_get_clients_i(SilcClient client,
                                            void *context)
 {
   SilcClientGetClientInternal i;
-  char userhost[768 + 1];
+  char nick[128 + 1], serv[256 + 1], userhost[768 + 1], *parsed = NULL;
   int len;
 
   SILC_LOG_DEBUG(("Resolve client by %s command",
                  silc_get_command_name(command)));
 
-  if (!client || !conn)
+  if (!client || !conn) {
+    SILC_LOG_ERROR(("Missing arguments to silc_client_get_clients call"));
     return 0;
-  if (!nickname && !attributes)
+  }
+  if (!nickname && !attributes) {
+    SILC_LOG_ERROR(("Missing arguments to silc_client_get_clients call"));
     return 0;
+  }
+
+  /* Parse server name from the nickname if set */
+  if (silc_parse_userfqdn(nickname, nick, sizeof(nick),
+                         serv, sizeof(serv) == 2))
+    server = (const char *)serv;
+  nickname = (const char *)nick;
+
+  /* Parse nickname in case it is formatted */
+  if (silc_client_nickname_parse(client, conn, (char *)nickname, &parsed))
+    nickname = (const char *)parsed;
 
   i = silc_calloc(1, sizeof(*i));
-  if (!i)
+  if (!i) {
+    silc_free(parsed);
     return 0;
+  }
   i->clients = silc_dlist_init();
   if (!i->clients) {
+    silc_free(parsed);
     silc_free(i);
     return 0;
   }
@@ -349,6 +371,7 @@ static SilcUInt16 silc_client_get_clients_i(SilcClient client,
   } else if (nickname) {
     silc_strncat(userhost, sizeof(userhost) - 1, nickname, strlen(nickname));
   }
+  silc_free(parsed);
 
   /* Send the command */
   if (command == SILC_COMMAND_IDENTIFY)