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. */
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)
if (mode & SILC_CHANNEL_MODE_SILENCE_OPERS)
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;
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" },
{ 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;
+}