Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2002 Pekka Riikonen
+ Copyright (C) 1997 - 2005 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
return 0;
}
-/* Returns current time as string. */
+/* Returns time as string. If the the `timeval' is non-zero that
+ value is returned as string. If it is zero the current time of the
+ local machine is returned. */
-char *silc_get_time()
+const char *silc_get_time(SilcUInt32 timeval)
{
time_t curtime;
char *return_time;
- curtime = time(NULL);
+ if (!timeval)
+ curtime = time(NULL);
+ else
+ curtime = (time_t)timeval;
return_time = ctime(&curtime);
return_time[strlen(return_time) - 1] = '\0';
- return return_time;
+ return (const char *)return_time;
}
/* Converts string to capital characters. */
}
} else {
if (left)
- *left = strdup(string);
+ *left = silc_memdup(string, strlen(string));
}
return TRUE;
slen2 = strlen(string2);
/* See if they are same already */
- if (!strncmp(string1, string2, strlen(string2)))
+ if (!strncmp(string1, string2, slen2) && slen2 == slen1)
return TRUE;
if (slen2 < slen1)
return h;
}
+/* Hash UTF-8 string */
+
+SilcUInt32 silc_hash_utf8_string(void *key, void *user_context)
+{
+ unsigned char *s = (unsigned char *)key;
+ SilcUInt32 h = 0, g;
+
+ while (*s != '\0') {
+ h = (h << 4) + *s;
+ if ((g = h & 0xf0000000)) {
+ h = h ^ (g >> 24);
+ h = h ^ g;
+ }
+ s++;
+ }
+
+ return h;
+}
+
/* Basic hash function to hash integers. May be used with the SilcHashTable. */
SilcUInt32 silc_hash_uint(void *key, void *user_context)
SilcUInt32 silc_hash_ptr(void *key, void *user_context)
{
- return (SilcUInt32)key;
+ return SILC_PTR_TO_32(key);
}
/* Hash a ID. The `user_context' is the ID type. */
SilcUInt32 silc_hash_id(void *key, void *user_context)
{
- SilcIdType id_type = (SilcIdType)(SilcUInt32)user_context;
+ SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context);
SilcUInt32 h = 0;
int i;
SilcUInt32 silc_hash_data(void *key, void *user_context)
{
- SilcUInt32 len = (SilcUInt32)user_context, h = 0;
+ SilcUInt32 len = SILC_PTR_TO_32(user_context), h = 0;
unsigned char *data = (unsigned char *)key;
int i;
SilcUInt32 silc_hash_public_key(void *key, void *user_context)
{
SilcPublicKey pk = (SilcPublicKey)key;
- return (pk->len + silc_hash_string(pk->name, NULL) +
- silc_hash_string(pk->identifier, NULL) +
- silc_hash_data(pk->pk, (void *)pk->pk_len));
+ return (pk->len + (silc_hash_string(pk->name, NULL) ^
+ silc_hash_string(pk->identifier, NULL) ^
+ silc_hash_data(pk->pk, SILC_32_TO_PTR(pk->pk_len))));
}
/* Compares two strings. It may be used as SilcHashTable comparison
bool silc_hash_id_compare(void *key1, void *key2, void *user_context)
{
- SilcIdType id_type = (SilcIdType)(SilcUInt32)user_context;
+ SilcIdType id_type = (SilcIdType)SILC_PTR_TO_32(user_context);
return (id_type == SILC_ID_CLIENT ?
SILC_ID_COMPARE_HASH((SilcClientID *)key1, (SilcClientID *)key2) :
SILC_ID_COMPARE_TYPE(key1, key2, id_type));
bool silc_hash_data_compare(void *key1, void *key2, void *user_context)
{
- SilcUInt32 len = (SilcUInt32)user_context;
+ SilcUInt32 len = SILC_PTR_TO_32(user_context);
return !memcmp(key1, key2, len);
}
+/* Compares UTF-8 string. */
+
+bool silc_hash_utf8_compare(void *key1, void *key2, void *user_context)
+{
+ int l1 = strlen((char *)key1);
+ int l2 = strlen((char *)key2);
+ if (l1 > l2)
+ l2 = l1;
+ return !memcmp(key1, key2, l2);
+}
+
/* Compares two SILC Public keys. It may be used as SilcHashTable
comparison function. */
if (mode & SILC_CHANNEL_MODE_FOUNDER_AUTH)
strncat(string, "f", 1);
+ if (mode & SILC_CHANNEL_MODE_CHANNEL_AUTH)
+ strncat(string, "C", 1);
+
if (mode & SILC_CHANNEL_MODE_SILENCE_USERS)
strncat(string, "m", 1);
strncat(string, "M", 1);
if (mode & SILC_CHANNEL_MODE_CIPHER)
- strncat(string, cipher, strlen(cipher));
+ strncat(string, "c", 1);
if (mode & SILC_CHANNEL_MODE_HMAC)
- strncat(string, hmac, strlen(hmac));
+ strncat(string, "h", 1);
+
+ if (mode & SILC_CHANNEL_MODE_CIPHER) {
+ if (strlen(cipher) + strlen(string) + 1< sizeof(string)) {
+ strncat(string, " ", 1);
+ strncat(string, cipher, strlen(cipher));
+ }
+ }
+
+ if (mode & SILC_CHANNEL_MODE_HMAC) {
+ if (strlen(hmac) + strlen(string) + 1< sizeof(string)) {
+ strncat(string, " ", 1);
+ strncat(string, hmac, strlen(hmac));
+ }
+ }
/* Rest of mode is ignored */
char *silc_client_chumode(SilcUInt32 mode)
{
- char string[4];
+ char string[64];
if (!mode)
return NULL;
char *silc_client_chumode_char(SilcUInt32 mode)
{
- char string[4];
+ char string[64];
if (!mode)
return NULL;
/* Take protocol version */
maj = atoi(cp);
- cp = strchr(cp, '.');
- if (cp) {
- min = atoi(cp + 1);
- cp++;
- }
+ if (!strchr(cp, '.'))
+ return FALSE;
+ cp = strchr(cp, '.') + 1;
+ if (!cp || !(*cp))
+ return FALSE;
+ min = atoi(cp);
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min);
maj = 0;
min = 0;
- cp = strchr(cp, '-');
- if (!cp)
+ if (!strchr(cp, '-'))
+ return FALSE;
+ cp = strchr(cp, '-') + 1;
+ if (!cp || !(*cp))
return FALSE;
- maj = atoi(cp + 1);
- cp = strchr(cp, '.');
- if (cp)
- min = atoi(cp + 1);
+ maj = atoi(cp);
+ if (strchr(cp, '.')) {
+ cp = strchr(cp, '.') + 1;
+ if (cp && *cp)
+ min = atoi(cp);
+ }
memset(buf, 0, sizeof(buf));
snprintf(buf, sizeof(buf) - 1, "%d%d", maj, min);
/* Take vendor string */
- cp++;
- if (cp) {
- cp = strchr(cp, '.');
- if (cp && cp + 1 && vendor_version)
- *vendor_version = strdup(cp + 1);
+ if (strchr(cp, '.')) {
+ cp = strchr(cp, '.') + 1;
+ if (cp && *cp && vendor_version)
+ *vendor_version = strdup(cp);
}
return TRUE;
char *silc_get_input(const char *prompt, bool echo_off)
{
#ifdef SILC_UNIX
+ int fd;
+ char input[2048];
+
if (echo_off) {
char *ret = NULL;
#ifdef HAVE_TERMIOS_H
- char input[2048];
- int fd;
struct termios to;
struct termios to_old;
tcgetattr(fd, &to);
to_old = to;
- /* Echo OFF */
+ /* Echo OFF, and assure we can prompt and get input */
to.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
+ to.c_lflag |= ICANON;
+ to.c_cc[VMIN] = 255;
tcsetattr(fd, TCSANOW, &to);
memset(input, 0, sizeof(input));
if ((read(fd, input, sizeof(input))) < 0) {
fprintf(stderr, "silc: %s\n", strerror(errno));
+ tcsetattr(fd, TCSANOW, &to_old);
return NULL;
}
tcsetattr(fd, TCSANOW, &to_old);
signal(SIGINT, SIG_DFL);
- ret = silc_calloc(strlen(input), sizeof(char));
- memcpy(ret, input, strlen(input));
+ ret = silc_memdup(input, strlen(input));
memset(input, 0, sizeof(input));
#endif /* HAVE_TERMIOS_H */
return ret;
} else {
- char input[2048];
- int fd;
-
fd = open("/dev/tty", O_RDONLY);
if (fd < 0) {
fprintf(stderr, "silc: %s\n", strerror(errno));
{ STAT(BAD_SERVER_ID), "Server ID is not valid" },
{ STAT(KEY_EXCHANGE_FAILED), "Key exchange failed" },
{ STAT(BAD_VERSION), "Bad version" },
+ { STAT(TIMEDOUT), "Service timed out" },
+ { STAT(UNSUPPORTED_PUBLIC_KEY), "Unsupported public key type" },
+ { STAT(OPERATION_ALLOWED), "Operation is not allowed" },
+ { STAT(BAD_SERVER), "Bad server name" },
+ { STAT(BAD_USERNAME), "Bad user name" },
{ 0, NULL }
};
return "UNKNOWN";
return command_name[command];
}
+
+/* Return TRUE if `smaller' is smaller than `bigger'. */
+
+bool silc_compare_timeval(struct timeval *smaller,
+ struct timeval *bigger)
+{
+ if ((smaller->tv_sec < bigger->tv_sec) ||
+ ((smaller->tv_sec == bigger->tv_sec) &&
+ (smaller->tv_usec < bigger->tv_usec)))
+ return TRUE;
+
+ return FALSE;
+}
projects / silc.git / blobdiff