X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilcutil.h;h=726c67f4f455c6161d0ac3d20ce4573d03196aef;hb=e7b6c157b80152bf9fb9266e6bdd93f9fb0db776;hp=e6472582386c68a91469a58c9664ad447e2695a6;hpb=6e78c1f7fc6b1b87f70561d447c1520d2b09bbf2;p=silc.git diff --git a/lib/silcutil/silcutil.h b/lib/silcutil/silcutil.h index e6472582..726c67f4 100644 --- a/lib/silcutil/silcutil.h +++ b/lib/silcutil/silcutil.h @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1997 - 2006 Pekka Riikonen + Copyright (C) 1997 - 2008 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 @@ -44,21 +44,6 @@ ***/ int silc_gets(char *dest, int destlen, const char *src, int srclen, int begin); -/****f* silcutil/SilcUtilAPI/silc_check_line - * - * SYNOPSIS - * - * int silc_check_line(char *buf); - * - * DESCRIPTION - * - * Checks line for illegal characters. Return -1 when illegal character - * were found. This is used to check for bad lines when reading data from - * for example a configuration file. - * - ***/ -int silc_check_line(char *buf); - /****f* silcutil/SilcUtilAPI/silc_to_upper * * SYNOPSIS @@ -146,222 +131,6 @@ void silc_parse_command_line(unsigned char *buffer, ***/ char *silc_format(char *fmt, ...); -/****f* silcutil/SilcUtilAPI/silc_hash_string - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_string(void *key, void *user_context); - * - * DESCRIPTION - * - * Basic has function to hash strings. May be used with the SilcHashTable. - * Note that this lowers the characters of the string (with tolower()) so - * this is used usually with nicknames, channel and server names to provide - * case insensitive keys. - * - ***/ -SilcUInt32 silc_hash_string(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_utf8_string - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_utf8_string(void *key, void *user_context); - * - * DESCRIPTION - * - * Basic has function to hash UTF-8 strings. May be used with the - * SilcHashTable. Used with identifier strings. The key is - * expected to be casefolded. - * - ***/ -SilcUInt32 silc_hash_utf8_string(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_uint - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_uint(void *key, void *user_context); - * - * DESCRIPTION - * - * Basic hash function to hash integers. May be used with the SilcHashTable. - * - ***/ -SilcUInt32 silc_hash_uint(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_ptr - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_ptr(void *key, void *user_context); - * - * DESCRIPTION - * - * Basic hash funtion to hash pointers. May be used with the SilcHashTable. - * - ***/ -SilcUInt32 silc_hash_ptr(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_id - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_id(void *key, void *user_context); - * - * DESCRIPTION - * - * Hash a ID. The `user_context' is the ID type. - * - ***/ -SilcUInt32 silc_hash_id(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_client_id_hash - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_client_id_hash(void *key, void *user_context) - * - * DESCRIPTION - * - * Hash Client ID's hash. - * - ***/ -SilcUInt32 silc_hash_client_id_hash(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_data - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_data(void *key, void *user_context); - * - * DESCRIPTION - * - * Hash binary data. The `user_context' is the data length. - * - ***/ -SilcUInt32 silc_hash_data(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_public_key - * - * SYNOPSIS - * - * SilcUInt32 silc_hash_public_key(void *key, void *user_context); - * - * DESCRIPTION - * - * Hash public key of any type. - * - ***/ -SilcUInt32 silc_hash_public_key(void *key, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_string_compare - * - * SYNOPSIS - * - * SilcBool silc_hash_string_compare(void *key1, void *key2, - * void *user_context); - * - * DESCRIPTION - * - * Compares two strings. It may be used as SilcHashTable comparison - * function. - * - ***/ -SilcBool silc_hash_string_compare(void *key1, void *key2, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_id_compare - * - * SYNOPSIS - * - * SilcBool silc_hash_id_compare(void *key1, void *key2, - * void *user_context); - * - * DESCRIPTION - * - * Compares two ID's. May be used as SilcHashTable comparison function. - * The Client ID's compares only the hash of the Client ID not any other - * part of the Client ID. Other ID's are fully compared. - * - ***/ -SilcBool silc_hash_id_compare(void *key1, void *key2, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_id_compare_full - * - * SYNOPSIS - * - * SilcBool silc_hash_id_compare_full(void *key1, void *key2, - * void *user_context) - * - * DESCRIPTION - * - * Compares two ID's. May be used as SilcHashTable comparison function. - * To compare full ID's instead of only partial, like the - * silc_hash_id_compare does, use this function. - * - ***/ -SilcBool silc_hash_id_compare_full(void *key1, void *key2, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_client_id_compare - * - * SYNOPSIS - * - * SilcBool silc_hash_client_id_compare(void *key1, void *key2, - * void *user_context); - * - * DESCRIPTION - * - * Compare two Client ID's entirely and not just the hash from the ID. - * - ***/ -SilcBool silc_hash_client_id_compare(void *key1, void *key2, - void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_data_compare - * - * SYNOPSIS - * - * SilcBool silc_hash_data_compare(void *key1, void *key2, - * void *user_context); - * - * DESCRIPTION - * - * Compares binary data. May be used as SilcHashTable comparison function. - * - ***/ -SilcBool silc_hash_data_compare(void *key1, void *key2, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_utf8_compare - * - * SYNOPSIS - * - * SilcBool silc_hash_utf8_compare(void *key1, void *key2, - * void *user_context); - * - * DESCRIPTION - * - * Compares UTF-8 strings. Casefolded and NULL terminated strings are - * expected. May be used as SilcHashTable comparison function. - * - ***/ -SilcBool silc_hash_utf8_compare(void *key1, void *key2, void *user_context); - -/****f* silcutil/SilcUtilAPI/silc_hash_public_key_compare - * - * SYNOPSIS - * - * SilcBool silc_hash_public_key_compare(void *key1, void *key2, - * void *user_context); - * - * DESCRIPTION - * - * Compares two SILC Public keys. It may be used as SilcHashTable - * comparison function. - * - ***/ -SilcBool silc_hash_public_key_compare(void *key1, void *key2, - void *user_context); - /****f* silcutil/SilcUtilAPI/silc_fingerprint * * SYNOPSIS @@ -371,7 +140,9 @@ SilcBool silc_hash_public_key_compare(void *key1, void *key2, * DESCRIPTION * * Return a textual representation of the fingerprint in *data, the - * caller must free the returned string. + * caller must free the returned string. Returns NULL on error. If + * the `data_len' is longer than 255 bytes, only the first 255 bytes are + * used to create the fingerprint. * ***/ char *silc_fingerprint(const unsigned char *data, SilcUInt32 data_len); @@ -452,6 +223,62 @@ char *silc_get_real_name(); * each copied list. * ***/ -void silc_va_copy(va_list dest, va_list src); +#if defined(HAVE_VA_COPY) +#define silc_va_copy(dest, src) va_copy(dest, src); +#elif defined(HAVE___VA_COPY) +#define silc_va_copy(dest, src) __va_copy(dest, src); +#elif defined(SILC_VA_COPY_ARRAY) +#define silc_va_copy(dest, src) memmove(dest, src, sizeof(va_list)); +#else +#define silc_va_copy(dest, src) dest = src; +#endif + +/****f* silcutil/SilcUtilAPI/silc_hexdump + * + * SYNOPSIS + * + * void silc_hexdump(const unsigned char *data, SilcUInt32 data_len, + * FILE *output); + * + * DESCRIPTION + * + * Dumps the `data' of length of `data_len' bytes as HEX. The `output' + * file specifies the destination. + * + ***/ +void silc_hexdump(const unsigned char *data, SilcUInt32 data_len, + FILE *output); + +/****f* silcutil/SilcUtilAPI/silc_hex2data + * + * SYNOPSIS + * + * SilcBool silc_hex2data(const char *hex, unsigned char *data, + * SilcUInt32 data_size, SilcUInt32 *ret_data_len); + * + * DESCRIPTION + * + * Converts HEX character string to binary data. Each HEX numbers must + * have two characters in the `hex' string. + * + ***/ +SilcBool silc_hex2data(const char *hex, unsigned char *data, + SilcUInt32 data_size, SilcUInt32 *ret_data_len); + +/****f* silcutil/SilcUtilAPI/silc_data2hex + * + * SYNOPSIS + * + * SilcBool silc_data2hex(const unsigned char *data, SilcUInt32 data_len, + * char *hex, SilcUInt32 hex_size); + * + * DESCRIPTION + * + * Converts binary data to HEX string. This NULL terminates the `hex' + * buffer automatically. + * + ***/ +SilcBool silc_data2hex(const unsigned char *data, SilcUInt32 data_len, + char *hex, SilcUInt32 hex_size); #endif /* !SILCUTIL_H */