updates. New data types.

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

diff --git a/lib/silccore/silcnotify.c b/lib/silccore/silcnotify.c
index e3c8169dafb35166cdb7f1dad098faf1c38eb149..a3f54556fa5ed1264509b351f330df1c15df02aa 100644 (file)
--- a/lib/silccore/silcnotify.c
+++ b/lib/silccore/silcnotify.c
@@ -39,7 +39,7 @@ struct SilcNotifyPayloadStruct {
 SilcNotifyPayload silc_notify_payload_parse(SilcBuffer buffer)
 {
   SilcNotifyPayload new;
-  unsigned short len;
+  uint16 len;
   int ret;
 
   SILC_LOG_DEBUG(("Parsing Notify payload"));
@@ -72,27 +72,27 @@ SilcNotifyPayload silc_notify_payload_parse(SilcBuffer buffer)
 
 /* Encode notify payload with variable argument list. If `argc' is > 0
    argument payloads will be associated to the notify payload. Variable
-   arguments must be {usigned char *, unsigned int (len)}. */
+   arguments must be {usigned char *, uint32 (len)}. */
 
-SilcBuffer silc_notify_payload_encode(SilcNotifyType type, unsigned int argc, 
+SilcBuffer silc_notify_payload_encode(SilcNotifyType type, uint32 argc, 
                                      va_list ap)
 {
   SilcBuffer buffer;
   SilcBuffer args = NULL;
   unsigned char **argv;
-  unsigned int *argv_lens = NULL, *argv_types = NULL;
+  uint32 *argv_lens = NULL, *argv_types = NULL;
   unsigned char *x;
-  unsigned int x_len;
+  uint32 x_len;
   int i, k = 0, len = 0;
 
   if (argc) {
     argv = silc_calloc(argc, sizeof(unsigned char *));
-    argv_lens = silc_calloc(argc, sizeof(unsigned int));
-    argv_types = silc_calloc(argc, sizeof(unsigned int));
+    argv_lens = silc_calloc(argc, sizeof(uint32));
+    argv_types = silc_calloc(argc, sizeof(uint32));
     
     for (i = 0, k = 0; i < argc; i++) {
       x = va_arg(ap, unsigned char *);
-      x_len = va_arg(ap, unsigned int);
+      x_len = va_arg(ap, uint32);
 
       if (!x || !x_len)
        continue;
@@ -135,6 +135,35 @@ SilcBuffer silc_notify_payload_encode(SilcNotifyType type, unsigned int argc,
   return buffer;
 }
 
+/* Same as above but takes argument from the `args' Argument Payload. */
+
+SilcBuffer silc_notify_payload_encode_args(SilcNotifyType type, 
+                                          uint32 argc,
+                                          SilcBuffer args)
+{
+  SilcBuffer buffer;
+  int len;
+
+  len = 5 + (args ? args->len : 0);
+  buffer = silc_buffer_alloc(len);
+  silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
+  silc_buffer_format(buffer,
+                    SILC_STR_UI_SHORT(type),
+                    SILC_STR_UI_SHORT(len),
+                    SILC_STR_UI_CHAR(argc),
+                    SILC_STR_END);
+
+  if (args) {
+    silc_buffer_pull(buffer, 5);
+    silc_buffer_format(buffer,
+                      SILC_STR_UI_XNSTRING(args->data, args->len),
+                      SILC_STR_END);
+    silc_buffer_push(buffer, 5);
+  }
+
+  return buffer;
+}
+
 /* Free's notify payload */
 
 void silc_notify_payload_free(SilcNotifyPayload payload)
@@ -154,7 +183,7 @@ SilcNotifyType silc_notify_get_type(SilcNotifyPayload payload)
 
 /* Return argument nums */
 
-unsigned int silc_notify_get_arg_num(SilcNotifyPayload payload)
+uint32 silc_notify_get_arg_num(SilcNotifyPayload payload)
 {
   return payload->argc;
 }