Check server name in nick@server string. Return matching clients.

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

diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c
index a97adecd326319c7344132c011090937afd8a560..6a92210a32c5d9a1c63332d1822a8bfd6338797f 100644 (file)
--- a/lib/silcclient/client_entry.c
+++ b/lib/silcclient/client_entry.c
@@ -72,19 +72,23 @@ SilcDList silc_client_get_clients_local_ext(SilcClient client,
   SilcList list;
   SilcDList clients;
   SilcClientEntry entry;
-  char *nicknamec, *parsed = NULL, *format = NULL;
+  char nick[128 + 1], *nicknamec, *parsed = NULL, *format = NULL;
+  char server[256 + 1];
 
   if (!client || !conn || !nickname)
     return NULL;
 
+  /* Get nickname from nickname@server string */
+  silc_parse_userfqdn(nickname, nick, sizeof(nick), server, sizeof(server));
+
   /* Parse nickname in case it is formatted */
-  if (!silc_client_nickname_parse(client, conn, (char *)nickname, &parsed))
+  if (!silc_client_nickname_parse(client, conn, (char *)nick, &parsed))
     return NULL;
 
   if (!get_all && parsed)
-    format = (char *)nickname;
+    format = (char *)nick;
   if (!parsed) {
-    parsed = silc_memdup(nickname, strlen(nickname));
+    parsed = silc_memdup(nick, strlen(nick));
     if (!parsed)
       return NULL;
   }
@@ -133,6 +137,14 @@ SilcDList silc_client_get_clients_local_ext(SilcClient client,
     /* Check multiple cache entries for exact match */
     while ((id_cache = silc_list_get(list))) {
       entry = id_cache->context;
+
+      /* If server was provided, find entries that either have no server
+        set or have the same server.  Ignore those that have different
+        server. */
+      if (server[0] && entry->server &&
+         !silc_utf8_strcasecmp(entry->server, server))
+       continue;
+
       if (silc_utf8_strcasecmp(entry->nickname,
                               format ? format : parsed) &&
          (!get_valid || entry->internal.valid)) {
@@ -340,7 +352,7 @@ static SilcUInt16 silc_client_get_clients_i(SilcClient client,
 
   /* Parse server name from the nickname if set */
   if (silc_parse_userfqdn(nickname, nick, sizeof(nick),
-                         serv, sizeof(serv) == 2))
+                         serv, sizeof(serv)) == 2)
     server = (const char *)serv;
   nickname = (const char *)nick;