#include "silc-channels.h"
#include "silc-queries.h"
#include "silc-nicklist.h"
-#include "version_internal.h"
-#include "version.h"
+#include "silcversion.h"
#include "signals.h"
#include "levels.h"
extern SilcClientOperations ops;
extern bool silc_debug;
extern bool silc_debug_hexdump;
-#ifdef SILC_SIM
-/* SIM (SILC Module) table */
-SilcSimContext **sims = NULL;
-uint32 sims_count = 0;
-#endif
+
+void silc_expandos_init(void);
+void silc_expandos_deinit(void);
static int my_silc_scheduler(void)
{
if (!str)
str = g_getenv("IRCNAME");
settings_set_str("real_name",
- str != NULL ? str : g_get_real_name());
+ str != NULL ? str : silc_get_real_name());
}
/* username */
if (!str)
str = g_getenv("IRCUSER");
settings_set_str("user_name",
- str != NULL ? str : g_get_user_name());
-
+ str != NULL ? str : silc_get_username());
+
user_name = settings_get_str("user_name");
}
/* alternate nick */
set = settings_get_str("alternate_nick");
if (set == NULL || *set == '\0') {
- if (strlen(nick) < 9)
- str = g_strconcat(nick, "_", NULL);
- else {
- str = g_strdup(nick);
- str[strlen(str)-1] = '_';
- }
+ str = g_strconcat(nick, "_", NULL);
settings_set_str("alternate_nick", str);
g_free(str);
}
}
}
+#ifdef SILC_DEBUG
+static bool i_debug;
+static bool silc_irssi_debug_print(char *file, char *function, int line,
+ char *message, void *context)
+{
+ printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
+ "DEBUG: %s:%d: %s", function, line, message);
+ return TRUE;
+}
+
+static void sig_debug_setup_changed(void)
+{
+ bool debug = settings_get_bool("debug");
+ if (debug) {
+ const char *debug_string = settings_get_str("debug_string");
+ i_debug = silc_debug = TRUE;
+ if (strlen(debug_string))
+ silc_log_set_debug_string(debug_string);
+ silc_log_set_debug_callbacks(silc_irssi_debug_print, NULL, NULL, NULL);
+ return;
+ }
+ if (i_debug)
+ silc_debug = FALSE;
+}
+#endif
+
/* Log callbacks */
static bool silc_log_misc(SilcLogType type, char *message, void *context)
{
- fprintf(stderr, "%s\n", message);
+ printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s", message);
return TRUE;
}
if (cipher) {
for (i = 0; silc_default_ciphers[i].name; i++)
if (!strcmp(silc_default_ciphers[i].name, cipher)) {
- silc_cipher_register(&silc_default_ciphers[i]);
+ silc_cipher_register(&(silc_default_ciphers[i]));
break;
}
if (hash) {
for (i = 0; silc_default_hash[i].name; i++)
if (!strcmp(silc_default_hash[i].name, hash)) {
- silc_hash_register(&silc_default_hash[i]);
+ silc_hash_register(&(silc_default_hash[i]));
break;
}
if (hmac) {
for (i = 0; silc_default_hmacs[i].name; i++)
if (!strcmp(silc_default_hmacs[i].name, hmac)) {
- silc_hmac_register(&silc_default_hmacs[i]);
+ silc_hmac_register(&(silc_default_hmacs[i]));
break;
}
silc_pkcs_register_default();
silc_hash_register_default();
silc_hmac_register_default();
- silc_client_show_key(opt->arg);
+ silc_client_show_key((char *)arg);
exit(0);
}
settings_add_int("server", "key_exchange_rekey_secs", 3600);
settings_add_int("server", "connauth_request_secs", 2);
+#ifdef SILC_DEBUG
+ settings_add_bool("debug", "debug", FALSE);
+ settings_add_str("debug", "debug_string", "");
+ signal_add("setup changed", (SIGNAL_FUNC) sig_debug_setup_changed);
+#endif
+
silc_init_userinfo();
/* Initialize client parameters */
silc_server_init();
silc_channels_init();
silc_queries_init();
+ silc_expandos_init();
idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
if (idletag != -1) {
signal_emit("chat protocol deinit", 1,
chat_protocol_find("SILC"));
+ signal_remove("irssi init read settings",
+ (SIGNAL_FUNC) sig_init_read_settings);
+#ifdef SILC_DEBUG
+ signal_remove("setup changed", (SIGNAL_FUNC) sig_debug_setup_changed);
+#endif
silc_server_deinit();
silc_channels_deinit();
silc_queries_deinit();
+ silc_expandos_deinit();
chat_protocol_unregister("SILC");