updates

diff --git a/CHANGES b/CHANGES
index cae450b341d3ea69df32f65507dd15c8fd5cb2b2..9d97eb001ac2cc787378f32b6dc1b21ccad3777f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,42 @@
-Fri Oct  5 21:16:28 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
+Sun Oct  8 19:33:08 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Added flags parameter into silc_ske_assemble_security_properties
+         function in lib/silcske/silcske.[ch].
+
+       * Changed notify client operation to fit better for notify messages
+         sent by server.  The notify payload received from server is now
+         passed to the application (after parsing it to SilcNotifyPayload).
+         It is application's responsibility to retrieve the arguments
+         from the payload and show the message the way it wants.  The message
+         sent by server is implementation specific.
+
+       * Changed public keys to comply with the protocol specification.
+         Old public keys are not supported anymore and are not compatible.
+
+       * Removed nickname from Channel Payload as the latest draft removed
+         it.  The client must resolve the nickname from the NAMES command
+         reply received when it joined the channel.
+
+         Also, changed all channel_xxxx_payload to channel_payload_xxxx.
+
+Sat Oct  7 21:55:01 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Fixed some errors in protocol specification drafts.
+
+       * Created lib/silccore/silcnotify.c to implement Notify Payload
+         encoding and decoding, lib/silccore/silcpayload.[ch] to implement
+         generic payloads described by protocol specifications.  The file
+         includes implementations for ID Payload and Argument Payload.
+
+       * Changed Command Payload implementation to use the new Argument
+         Payload.  Changed command_xxxx_payload to command_payload_xxxx
+         to comply with SILC coding conventions.
+
+       * Added suppport for Argument Payload handling in Notify Payload
+         implementation as protocol requires it.  Added the new support
+         into server and client lib as well.
+
+Thu Oct  5 21:16:28 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Added support for multiple nicknames on same channel.  [n] is
          added locally to the nickname if there are more than one same
@@ -15,7 +53,7 @@ Fri Oct  5 21:16:28 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Changed version strings to comply ISO 8601.
 
-Thu Oct  4 23:29:06 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
+Wed Oct  4 23:29:06 EEST 2000  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Fixed protocol error handling in client library.  It should now
          cope even if the SKE fails for some reason.

diff --git a/configure.in b/configure.in
index 1857776cea994864f7d46d4b79aabb5164d63297..b211f1a1d021a61bb5835c1b0f59a4843385e867 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ case "$target" in
     ;;
 esac
 
-AM_INIT_AUTOMAKE(silc, 20001006)
+AM_INIT_AUTOMAKE(silc, 20001009)
 AC_PREREQ(2.3)
 AM_CONFIG_HEADER(includes/silcdefs.h)
 

diff --git a/doc/draft-riikonen-silc-pp-01.nroff b/doc/draft-riikonen-silc-pp-01.nroff
index 8830fdb9d0744c1fa433edc3def9691e1bec707c..e1efe7de01272f50090fa43bcbd1013e7d489d57 100644 (file)
--- a/doc/draft-riikonen-silc-pp-01.nroff
+++ b/doc/draft-riikonen-silc-pp-01.nroff
@@ -1020,8 +1020,10 @@ Notify Payload.
                      1                   2                   3
  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|          Notify Type          | Argument Nums |               |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+               +
+|          Notify Type          |        Message Length         |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+| Argument Nums |                                               |
++-+-+-+-+-+-+-+-+                                               +
 |                                                               |
 ~                        Notify Message                         ~
 |                                                               |
@@ -1036,6 +1038,9 @@ Figure 9:  Notify Payload
 o Notify Type (2 bytes) - Indicates the type of the notify
   message.
 
+o Message Length (2 bytes) - Length of the Notify Message area 
+  not ncluding the length of any other fields in the payload.
+
 o Argument Nums (2 bytes) - Indicates the number of Argument
   Payloads associated to this payload.  Notify types may define
   arguments to be send along the notify message.
@@ -1059,7 +1064,7 @@ Following notify types has been defined:
 
       Sent when receiver has been invited to a channel.
 
-      This type includes three arguments: nickname and channel name.
+      This type includes two arguments: nickname and channel name.
 
 2     SILC_NOTIFY_TYPE_JOIN
 
@@ -1073,7 +1078,7 @@ Following notify types has been defined:
 
       Sent when client has left a channel.
 
-      This type includes three arguments: nickname, server name,
+      This type includes four arguments: nickname, server name,
       Channel ID and channel name.  The Channel ID is sent inside ID
       Payload.
 
@@ -1088,14 +1093,14 @@ Following notify types has been defined:
 
       Sent when topic is set/changed on a channel.
 
-      This type includes three arguments: Channel ID, topic, nickname and
+      This type includes four arguments: Channel ID, topic, nickname and
       hostname.  The Channel ID is sent inside ID Payload.
 
 6     SILC_NOTIFY_TYPE_NICK_CHANGE
 
       Sent when client changes nick on a channel.
 
-      This type includes three arguments: nickname and Channel ID.
+      This type includes two arguments: nickname and Channel ID.
       The Channel ID is sent inside ID Payload.
 .in 3
 

diff --git a/doc/draft-riikonen-silc-spec-01.nroff b/doc/draft-riikonen-silc-spec-01.nroff
index b995ab661da13fa27abc4abcb5c4255f05c7d8c3..3f18465102ed7c1d453b69ea4de7e96ed3d6af13 100644 (file)
--- a/doc/draft-riikonen-silc-spec-01.nroff
+++ b/doc/draft-riikonen-silc-spec-01.nroff
@@ -1700,11 +1700,11 @@ Every command reply also defines set of status message that it
 may return inside the <Status Payload>.  All status messages
 are defined in the section 5.3 SILC Command Status Types.
 
+.in 3
 Every command that has some kind of ID as argument (for example
 <Client ID>) are actually ID Payloads, defined in [SILC2] that includes
 the type of the ID, length of the ID and the actual ID data.  This
 way variable length ID's can be sent as arguments.
-.in 3
 
 
 .ti 0

diff --git a/includes/silcincludes.h b/includes/silcincludes.h
index 3e5e1ba64d8720fe7a7bf50bd003a96ad717cb45..2115e1b80ea0a00d7443fc97a622fcb451f76a93 100644 (file)
--- a/includes/silcincludes.h
+++ b/includes/silcincludes.h
@@ -107,6 +107,10 @@
 #include <dlfcn.h>
 #endif
 
+#ifndef HAVE_GETOPT_LONG
+#include "../lib/contrib/getopt.h"
+#endif
+
 #ifndef TRUE
 #define TRUE 1
 #endif