Added SILC Server library.

[silc.git] / lib / silccore / silccommand.c

diff --git a/lib/silccore/silccommand.c b/lib/silccore/silccommand.c
index d8470570c205f7cb363b0d0b7d093db4138bf295..83dbde8cf6263e1f218019c410123a572747e1cc 100644 (file)
--- a/lib/silccore/silccommand.c
+++ b/lib/silccore/silccommand.c
@@ -4,13 +4,12 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2001 Pekka Riikonen
+  Copyright (C) 1997 - 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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,7 +18,7 @@
 */
 /* $Id$ */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silccommand.h"
 
 /******************************************************************************
@@ -58,31 +57,34 @@ SilcCommandPayload silc_command_payload_parse(const unsigned char *payload,
     return NULL;
 
   /* Parse the Command Payload */
-  ret = silc_buffer_unformat(&buffer, 
+  ret = silc_buffer_unformat(&buffer,
                             SILC_STR_UI_SHORT(&p_len),
                             SILC_STR_UI_CHAR(&newp->cmd),
                             SILC_STR_UI_CHAR(&args_num),
                             SILC_STR_UI_SHORT(&newp->ident),
                             SILC_STR_END);
   if (ret == -1) {
+    SILC_LOG_ERROR(("Incorrect command payload in packet"));
     silc_free(newp);
     return NULL;
   }
 
-  if (p_len != buffer.len) {
-    SILC_LOG_ERROR(("Incorrect command payload in packet, packet dropped"));
+  if (p_len != silc_buffer_len(&buffer)) {
+    SILC_LOG_ERROR(("Incorrect command payload in packet"));
     silc_free(newp);
     return NULL;
   }
 
   if (newp->cmd == 0) {
+    SILC_LOG_ERROR(("Incorrect command type in command payload"));
     silc_free(newp);
     return NULL;
   }
 
   silc_buffer_pull(&buffer, SILC_COMMAND_PAYLOAD_LEN);
   if (args_num) {
-    newp->args = silc_argument_payload_parse(buffer.data, buffer.len, 
+    newp->args = silc_argument_payload_parse(buffer.data,
+                                            silc_buffer_len(&buffer),
                                             args_num);
     if (!newp->args) {
       silc_free(newp);
@@ -111,7 +113,9 @@ SilcBuffer silc_command_payload_encode(SilcCommand cmd,
 
   if (argc) {
     args = silc_argument_payload_encode(argc, argv, argv_lens, argv_types);
-    len = args->len;
+    if (!args)
+      return NULL;
+    len = silc_buffer_len(args);
   }
 
   len += SILC_COMMAND_PAYLOAD_LEN;
@@ -131,7 +135,8 @@ SilcBuffer silc_command_payload_encode(SilcCommand cmd,
   if (argc) {
     silc_buffer_pull(buffer, SILC_COMMAND_PAYLOAD_LEN);
     silc_buffer_format(buffer,
-                      SILC_STR_UI_XNSTRING(args->data, args->len),
+                      SILC_STR_UI_XNSTRING(args->data,
+                                           silc_buffer_len(args)),
                       SILC_STR_END);
     silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN);
     silc_buffer_free(args);
@@ -154,7 +159,8 @@ SilcBuffer silc_command_payload_encode_payload(SilcCommandPayload payload)
 
   if (payload->args) {
     args = silc_argument_payload_encode_payload(payload->args);
-    len = args->len;
+    if (args)
+      len = silc_buffer_len(args);
     argc = silc_argument_get_arg_num(payload->args);
   }
 
@@ -178,7 +184,8 @@ SilcBuffer silc_command_payload_encode_payload(SilcCommandPayload payload)
   if (args) {
     silc_buffer_pull(buffer, SILC_COMMAND_PAYLOAD_LEN);
     silc_buffer_format(buffer,
-                      SILC_STR_UI_XNSTRING(args->data, args->len),
+                      SILC_STR_UI_XNSTRING(args->data,
+                                           silc_buffer_len(args)),
                       SILC_STR_END);
     silc_buffer_push(buffer, SILC_COMMAND_PAYLOAD_LEN);
     silc_buffer_free(args);
@@ -188,15 +195,15 @@ SilcBuffer silc_command_payload_encode_payload(SilcCommandPayload payload)
 }
 
 /* Encodes Command payload with variable argument list. The arguments
-   must be: SilcUInt32, unsigned char *, unsigned int, ... One 
-   {SilcUInt32, unsigned char * and unsigned int} forms one argument, 
-   thus `argc' in case when sending one {SilcUInt32, unsigned char * 
+   must be: SilcUInt32, unsigned char *, unsigned int, ... One
+   {SilcUInt32, unsigned char * and unsigned int} forms one argument,
+   thus `argc' in case when sending one {SilcUInt32, unsigned char *
    and SilcUInt32} equals one (1) and when sending two of those it
    equals two (2), and so on. This has to be preserved or bad things
    will happen. The variable arguments is: {type, data, data_len}. */
 
-SilcBuffer silc_command_payload_encode_va(SilcCommand cmd, 
-                                         SilcUInt16 ident, 
+SilcBuffer silc_command_payload_encode_va(SilcCommand cmd,
+                                         SilcUInt16 ident,
                                          SilcUInt32 argc, ...)
 {
   va_list ap;
@@ -211,8 +218,8 @@ SilcBuffer silc_command_payload_encode_va(SilcCommand cmd,
 
 /* Same as above but with va_list. */
 
-SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd, 
-                                          SilcUInt16 ident, 
+SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
+                                          SilcUInt16 ident,
                                           SilcUInt32 argc, va_list ap)
 {
   unsigned char **argv = NULL;
@@ -238,10 +245,10 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
       x_type = va_arg(ap, SilcUInt32);
       x = va_arg(ap, unsigned char *);
       x_len = va_arg(ap, SilcUInt32);
-      
+
       if (!x_type || !x || !x_len)
        continue;
-      
+
       argv[k] = silc_memdup(x, x_len);
       if (!argv[k])
        goto out;
@@ -251,7 +258,7 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
     }
   }
 
-  buffer = silc_command_payload_encode(cmd, k, argv, argv_lens, 
+  buffer = silc_command_payload_encode(cmd, k, argv, argv_lens,
                                       argv_types, ident);
 
  out:
@@ -269,8 +276,8 @@ SilcBuffer silc_command_payload_encode_vap(SilcCommand cmd,
    extra argument to this function. The `argc' must not count `status'
    as on argument. */
 
-SilcBuffer 
-silc_command_reply_payload_encode_va(SilcCommand cmd, 
+SilcBuffer
+silc_command_reply_payload_encode_va(SilcCommand cmd,
                                     SilcStatus status,
                                     SilcStatus error,
                                     SilcUInt16 ident,
@@ -287,11 +294,11 @@ silc_command_reply_payload_encode_va(SilcCommand cmd,
   return buffer;
 }
 
-SilcBuffer 
-silc_command_reply_payload_encode_vap(SilcCommand cmd, 
+SilcBuffer
+silc_command_reply_payload_encode_vap(SilcCommand cmd,
                                      SilcStatus status,
                                      SilcStatus error,
-                                     SilcUInt16 ident, SilcUInt32 argc, 
+                                     SilcUInt16 ident, SilcUInt32 argc,
                                      va_list ap)
 {
   unsigned char **argv;
@@ -347,7 +354,7 @@ silc_command_reply_payload_encode_vap(SilcCommand cmd,
     k++;
   }
 
-  buffer = silc_command_payload_encode(cmd, k, argv, argv_lens, 
+  buffer = silc_command_payload_encode(cmd, k, argv, argv_lens,
                                       argv_types, ident);
 
  out:
@@ -393,7 +400,7 @@ SilcUInt16 silc_command_get_ident(SilcCommandPayload payload)
 
 /* Return command status */
 
-bool silc_command_get_status(SilcCommandPayload payload, 
+SilcBool silc_command_get_status(SilcCommandPayload payload,
                             SilcStatus *status,
                             SilcStatus *error)
 {