Defined SilcIdType as unsigned short, not unsigned char.

diff --git a/lib/silccore/id.h b/lib/silccore/id.h
index 56551c4ae02e2e236eb94209f536be183d76dc7c..9da7f87376c04510ceccb153cd96ab04f3e3647b 100644 (file)
--- a/lib/silccore/id.h
+++ b/lib/silccore/id.h
@@ -42,7 +42,7 @@
 #define SILC_ID_CHANNEL 3
 
 /* Type definition for the ID types. */
 #define SILC_ID_CHANNEL 3
 
 /* Type definition for the ID types. */

-typedef unsigned char SilcIdType;
+typedef unsigned short SilcIdType;

 
 /* 
    64 bit SilcServerID structure:
 
 /* 
    64 bit SilcServerID structure:

diff --git a/lib/silccore/silcpacket.c b/lib/silccore/silcpacket.c
index 63f179aea402b2d441648286fad2151b35121cf2..f2800597b08fd21c4509127d4715ada63b758674 100644 (file)
--- a/lib/silccore/silcpacket.c
+++ b/lib/silccore/silcpacket.c
@@ -764,5 +764,3 @@ SilcPacketContext *silc_packet_context_dup(SilcPacketContext *ctx)
 
   return new;
 }
 
   return new;
 }

-
-

diff --git a/lib/silccore/silcpacket.h b/lib/silccore/silcpacket.h
index fe0c81f436ea9f0f8bd125139bb8a35d8d284f54..a13b726804da0ab0d67bd97650790d177bc03f1b 100644 (file)
--- a/lib/silccore/silcpacket.h
+++ b/lib/silccore/silcpacket.h
@@ -95,11 +95,18 @@ typedef unsigned char SilcPacketFlags;
 
    unsigned char *src_id
    unsigned int src_id_len
 
    unsigned char *src_id
    unsigned int src_id_len

-   SilcIdType src_id_type
+   unsigned char src_id_type

 
        Source ID, its length and type. On packet reception retuned ID's
        are always the hash values of the ID's from the packet.
 
 
        Source ID, its length and type. On packet reception retuned ID's
        are always the hash values of the ID's from the packet.
 

+  unsigned char *dst_id;
+  unsigned int dst_id_len;
+  unsigned char src_id_type;
+
+       Destination ID, its length and type. On packet reception retuned
+       ID's are always the hash values of the ID's from the packet.
+

    SilcHash hash
 
        Pointer to allocated hash object. This must be MD5 hash object.
    SilcHash hash
 
        Pointer to allocated hash object. This must be MD5 hash object.


@@ -113,11 +120,11 @@ typedef struct {
 
   unsigned char *src_id;
   unsigned int src_id_len;
 
   unsigned char *src_id;
   unsigned int src_id_len;

-  SilcIdType src_id_type;
+  unsigned char src_id_type;

 
   unsigned char *dst_id;
   unsigned int dst_id_len;
 
   unsigned char *dst_id;
   unsigned int dst_id_len;

-  SilcIdType dst_id_type;
+  unsigned char dst_id_type;

 
   unsigned int truelen;
   unsigned int padlen;
 
   unsigned int truelen;
   unsigned int padlen;