Added.

[silc.git] / lib / silccore / silcid.h

diff --git a/lib/silccore/silcid.h b/lib/silccore/silcid.h
index 216e29a19ded46d68f65a4a74b3446d476fc9e39..4cab7b75354947305c52ea3813049e18943335f9 100644 (file)
--- a/lib/silccore/silcid.h
+++ b/lib/silccore/silcid.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2006 Pekka Riikonen
+  Copyright (C) 1997 - 2007 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
@@ -82,7 +82,7 @@ typedef SilcUInt16 SilcIdType;
  *
  * SOURCE
  */
-typedef struct {
+typedef struct SilcIDIPStruct {
   unsigned char data[16];      /* IP data (in MSB first order) */
   SilcUInt8 data_len;          /* Length of the data (4 or 16) */
 } SilcIDIP;
@@ -104,7 +104,7 @@ typedef struct {
  *
  * SOURCE
  */
-typedef struct {
+typedef struct SilcServerIDStruct {
   SilcIDIP ip;                 /* n bit IP address */
   SilcUInt16 port;             /* 16 bit port */
   SilcUInt16 rnd;              /* 16 bit random number */
@@ -127,7 +127,7 @@ typedef struct {
  *
  * SOURCE
  */
-typedef struct {
+typedef struct SilcClientIDStruct {
   SilcIDIP ip;                                 /* n bit IP address */
   unsigned char rnd;                           /* 8 bit random number */
   unsigned char hash[CLIENTID_HASH_LEN];       /* 88 bit MD5 hash */
@@ -150,7 +150,7 @@ typedef struct {
  *
  * SOURCE
  */
-typedef struct {
+typedef struct SilcChannelIDStruct {
   SilcIDIP ip;                 /* n bit IP address */
   SilcUInt16 port;             /* 16 bit port */
   SilcUInt16 rnd;              /* 16 bit random number */
@@ -172,7 +172,7 @@ typedef struct {
  *
  * SOURCE
  */
-typedef struct {
+typedef struct SilcIDStruct {
   union {
     SilcServerID server_id;
     SilcChannelID channel_id;
@@ -492,6 +492,22 @@ SilcBool silc_id_id2str(const void *id, SilcIdType type,
 SilcBool silc_id_str2id(const unsigned char *id, SilcUInt32 id_len,
                        SilcIdType type, void *ret_id, SilcUInt32 ret_id_size);
 
+/****f* silccore/SilcIDAPI/silc_id_str2id2
+ *
+ * SYNOPSIS
+ *
+ *    SilcBool silc_id_str2id2(const unsigned char *id, SilcUInt32 id_len,
+ *                             SilcIdType type, SilcID *ret_id);
+ *
+ * DESCRIPTION
+ *
+ *    Same as silc_id_str2id but returns the ID into SilcID structure in
+ *    `ret_id' pointer.  This does not allocate any memory.
+ *
+ ***/
+SilcBool silc_id_str2id2(const unsigned char *id, SilcUInt32 id_len,
+                        SilcIdType type, SilcID *ret_id);
+
 /****f* silccore/SilcIDAPI/silc_id_get_len
  *
  * SYNOPSIS