extern SilcClientOperations ops;
extern bool silc_debug;
extern bool silc_debug_hexdump;
-#ifdef SILC_SIM
-/* SIM (SILC Module) table */
-SilcSimContext **sims = NULL;
-SilcUInt32 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_CLIENTCRAP,
+ "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: %s",
+ (type == SILC_LOG_INFO ? "[Info]" :
+ type == SILC_LOG_WARNING ? "[Warning]" : "[Error]"), 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((SilcCipherObject *)&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((SilcHashObject *)&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((SilcHmacObject *)&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(arg);
+ silc_client_show_key((char *)arg);
exit(0);
}
silc_debug = TRUE;
silc_debug_hexdump = TRUE;
silc_log_set_debug_string(arg);
- silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL);
- silc_log_set_callback(SILC_LOG_WARNING, silc_log_misc, NULL);
- silc_log_set_callback(SILC_LOG_ERROR, silc_log_misc, NULL);
- silc_log_set_callback(SILC_LOG_FATAL, silc_log_misc, NULL);
#ifndef SILC_DEBUG
fprintf(stdout,
"Run-time debugging is not enabled. To enable it recompile\n"
sleep(1);
#endif
}
-}
-static void sig_init_read_settings(void)
-{
- if (opt_create_keypair) {
+ if (strcmp(opt->longName, "create-key-pair") == 0) {
/* Create new key pair and exit */
silc_cipher_register_default();
silc_pkcs_register_default();
{ NULL, '\0', POPT_ARG_CALLBACK, (void *)&silc_opt_callback, '\0', NULL },
{ "show-key", 'S', POPT_ARG_STRING, NULL, 0,
"Show the contents of the public key", "FILE" },
- { "list-ciphers", 'c', POPT_ARG_NONE, NULL, 0,
+ { "list-ciphers", 0, POPT_ARG_NONE, NULL, 0,
"List supported ciphers", NULL },
- { "list-hash-funcs", 'H', POPT_ARG_NONE, NULL, 0,
+ { "list-hash-funcs", 0, POPT_ARG_NONE, NULL, 0,
"List supported hash functions", NULL },
- { "list-hmacs", 'M', POPT_ARG_NONE, NULL, 0,
+ { "list-hmacs", 0, POPT_ARG_NONE, NULL, 0,
"List supported HMACs", NULL },
- { "list-pkcs", 'P', POPT_ARG_NONE, NULL, 0,
+ { "list-pkcs", 0, POPT_ARG_NONE, NULL, 0,
"List supported PKCSs", NULL },
{ "debug", 'd', POPT_ARG_STRING, NULL, 0,
"Enable debugging", "STRING" },
- { NULL, '\0', 0, NULL }
- };
-
- static struct poptOption options[] = {
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, silc_options, 0, NULL, NULL },
- { "create-key-pair", 'C', POPT_ARG_NONE, &opt_create_keypair, 0,
+ { "create-key-pair", 'C', POPT_ARG_NONE, NULL, 0,
"Create new public key pair", NULL },
{ "pkcs", 0, POPT_ARG_STRING, &opt_pkcs, 0,
- "Set the PKCS of the public key pair", "PKCS" },
+ "Set the PKCS of the public key pair (-C)", "PKCS" },
{ "bits", 0, POPT_ARG_INT, &opt_bits, 0,
- "Set the length of the public key pair", "VALUE" },
+ "Set the length of the public key pair (-C)", "VALUE" },
{ NULL, '\0', 0, NULL }
};
SilcClientParams params;
const char *def_cipher, *def_hash, *def_hmac;
- args_register(options);
- signal_add("irssi init read settings", (SIGNAL_FUNC) sig_init_read_settings);
+ args_register(silc_options);
/* Settings */
settings_add_bool("server", "skip_motd", FALSE);
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 */
return;
}
+ silc_log_set_callback(SILC_LOG_INFO, silc_log_misc, NULL);
+ silc_log_set_callback(SILC_LOG_WARNING, silc_log_misc, NULL);
+ silc_log_set_callback(SILC_LOG_ERROR, silc_log_misc, NULL);
+ silc_log_set_callback(SILC_LOG_FATAL, silc_log_misc, NULL);
+
/* Register SILC to the irssi */
rec = g_new0(CHAT_PROTOCOL_REC, 1);
rec->name = "SILC";
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"));
+#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");
projects / silc.git / blobdiff