X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilccore%2Fsilcstatus.c;h=6da212c929d85d0ca5ec60e6674e818a294db54f;hp=8829a8509ff75b9bd96fe4347bc8858801ffa45d;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hpb=6210937137137fe4019e808686dd1fcf99360af6

diff --git a/lib/silccore/silcstatus.c b/lib/silccore/silcstatus.c
index 8829a850..6da212c9 100644
--- a/lib/silccore/silcstatus.c
+++ b/lib/silccore/silcstatus.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2003 Pekka Riikonen
+  Copyright (C) 2003 - 2005 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silcstatus.h"
 
 /* Returns arguments by the status type. */
@@ -56,8 +56,38 @@ SilcUInt32 silc_status_get_args(SilcStatus status,
 
   case SILC_STATUS_ERR_NO_SUCH_CLIENT_ID:
   case SILC_STATUS_ERR_BAD_CLIENT_ID:
+    {
+      SilcClientID client_id;
+      tmp = silc_argument_get_arg_type(args, 2, &len);
+      if (!tmp)
+	return 0;
+      if (silc_id_payload_parse_id(tmp, len, NULL, &client_id,
+				   sizeof(client_id)))
+	return 0;
+      *ret_arg1 = silc_id_dup(&client_id, SILC_ID_CLIENT);
+      if (!(*ret_arg1))
+	return 0;
+      num = 1;
+    }
+    break;
+
   case SILC_STATUS_ERR_NO_SUCH_SERVER_ID:
   case SILC_STATUS_ERR_BAD_SERVER_ID:
+    {
+      SilcServerID server_id;
+      tmp = silc_argument_get_arg_type(args, 2, &len);
+      if (!tmp)
+	return 0;
+      if (silc_id_payload_parse_id(tmp, len, NULL, &server_id,
+				   sizeof(server_id)))
+	return 0;
+      *ret_arg1 = silc_id_dup(&server_id, SILC_ID_SERVER);
+      if (!(*ret_arg1))
+	return 0;
+      num = 1;
+    }
+    break;
+
   case SILC_STATUS_ERR_NO_SUCH_CHANNEL_ID:
   case SILC_STATUS_ERR_BAD_CHANNEL_ID:
   case SILC_STATUS_ERR_NOT_ON_CHANNEL:
@@ -66,31 +96,48 @@ SilcUInt32 silc_status_get_args(SilcStatus status,
   case SILC_STATUS_ERR_BANNED_FROM_CHANNEL:
   case SILC_STATUS_ERR_NO_CHANNEL_PRIV:
   case SILC_STATUS_ERR_NO_CHANNEL_FOPRIV:
-    tmp = silc_argument_get_arg_type(args, 2, &len);
-    if (!tmp)
-      return 0;
-    *ret_arg1 = silc_id_payload_parse_id(tmp, len, NULL);
-    if (!(*ret_arg1))
-      return 0;
-    num = 1;
+    {
+      SilcChannelID channel_id;
+      tmp = silc_argument_get_arg_type(args, 2, &len);
+      if (!tmp)
+	return 0;
+      if (silc_id_payload_parse_id(tmp, len, NULL, &channel_id,
+				   sizeof(channel_id)))
+	return 0;
+      *ret_arg1 = silc_id_dup(&channel_id, SILC_ID_CHANNEL);
+      if (!(*ret_arg1))
+	return 0;
+      num = 1;
+    }
     break;
 
   case SILC_STATUS_ERR_USER_NOT_ON_CHANNEL:
   case SILC_STATUS_ERR_USER_ON_CHANNEL:
-    tmp = silc_argument_get_arg_type(args, 2, &len);
-    if (!tmp)
-      return 0;
-    *ret_arg1 = silc_id_payload_parse_id(tmp, len, NULL);
-    if (!(*ret_arg1))
-      return 0;
-    num = 1;
-    tmp = silc_argument_get_arg_type(args, 3, &len);
-    if (!tmp)
-      return num;
-    *ret_arg2 = silc_id_payload_parse_id(tmp, len, NULL);
-    if (!(*ret_arg2))
-      return num;
-    num = 2;
+    {
+      SilcClientID client_id;
+      SilcChannelID channel_id;
+      SilcIdType type;
+      tmp = silc_argument_get_arg_type(args, 2, &len);
+      if (!tmp)
+	return 0;
+      if (silc_id_payload_parse_id(tmp, len, &type, &client_id,
+				   sizeof(client_id)))
+	return 0;
+      *ret_arg1 = silc_id_dup(&client_id, type);
+      if (!(*ret_arg1))
+	return 0;
+      num = 1;
+      tmp = silc_argument_get_arg_type(args, 3, &len);
+      if (!tmp)
+	return num;
+      if (silc_id_payload_parse_id(tmp, len, &type, &channel_id,
+				   sizeof(channel_id)))
+	return 0;
+      *ret_arg2 = silc_id_dup(&channel_id, type);
+      if (!(*ret_arg2))
+	return num;
+      num = 2;
+    }
     break;
 
   default: