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);
}
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(opt->arg);
+ silc_client_show_key((char *)arg);
exit(0);
}
silc_server_init();
silc_channels_init();
silc_queries_init();
+ silc_expandos_init();
idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
silc_server_deinit();
silc_channels_deinit();
silc_queries_deinit();
+ silc_expandos_deinit();
chat_protocol_unregister("SILC");