X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-core.c;h=80dc21431eac327eb5355a883b5bc8b1729a11ad;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=ffc5e2a7f77368fb651e2f7b1df8392e8851d7f6;hpb=a822fca4344037f17da731b4cebb2c0d4a67ba60;p=silc.git diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c index ffc5e2a7..80dc2143 100644 --- a/apps/irssi/src/silc/core/silc-core.c +++ b/apps/irssi/src/silc/core/silc-core.c @@ -29,8 +29,7 @@ #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" @@ -42,31 +41,24 @@ /* Command line option variables */ static bool opt_create_keypair = FALSE; -static bool opt_list_ciphers = FALSE; -static bool opt_list_hash = FALSE; -static bool opt_list_hmac = FALSE; -static bool opt_list_pkcs = FALSE; -static bool opt_version = FALSE; -static char *opt_debug = FALSE; static char *opt_pkcs = NULL; -static char *opt_keyfile = NULL; static int opt_bits = 0; static int idletag; SilcClient silc_client = NULL; -SilcClientConfig silc_config = NULL; extern SilcClientOperations ops; -extern int silc_debug; +extern bool silc_debug; +extern bool silc_debug_hexdump; #ifdef SILC_SIM /* SIM (SILC Module) table */ SilcSimContext **sims = NULL; -uint32 sims_count = 0; +SilcUInt32 sims_count = 0; #endif static int my_silc_scheduler(void) { - silc_schedule_one(silc_client->schedule, 0); + silc_client_run_one(silc_client); return 1; } @@ -90,6 +82,11 @@ static SERVER_CONNECT_REC *create_server_connect(void) return g_malloc0(sizeof(SILC_SERVER_CONNECT_REC)); } +static void destroy_server_connect(SERVER_CONNECT_REC *conn) +{ + +} + /* Checks user information and saves them to the config file it they do not exist there already. */ @@ -119,7 +116,7 @@ static void silc_init_userinfo(void) user_name = settings_get_str("user_name"); } - + /* nick */ nick = settings_get_str("nick"); if (nick == NULL || *nick == '\0') { @@ -157,174 +154,233 @@ static void silc_init_userinfo(void) /* Log callbacks */ -static void silc_log_info(char *message) +static bool silc_log_misc(SilcLogType type, char *message, void *context) { fprintf(stderr, "%s\n", message); + return TRUE; } -static void silc_log_warning(char *message) +static void silc_nickname_format_parse(const char *nickname, + char **ret_nickname) { - fprintf(stderr, "%s\n", message); + silc_parse_userfqdn(nickname, ret_nickname, NULL); } -static void silc_log_error(char *message) +static void silc_register_cipher(SilcClient client, const char *cipher) { - fprintf(stderr, "%s\n", message); -} + int i; + + 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]); + break; + } + + if (!silc_cipher_is_supported(cipher)) { + SILC_LOG_ERROR(("Unknown cipher `%s'", cipher)); + exit(1); + } + } -/* Init SILC. Called from src/fe-text/silc.c */ + /* Register other defaults */ + silc_cipher_register_default(); +} -void silc_core_init(void) +static void silc_register_hash(SilcClient client, const char *hash) { - static struct poptOption options[] = { - { "create-key-pair", 'C', POPT_ARG_NONE, &opt_create_keypair, 0, - "Create new public key pair", NULL }, - { "pkcs", 0, POPT_ARG_STRING, &opt_pkcs, 0, - "Set the PKCS of the public key pair", "PKCS" }, - { "bits", 0, POPT_ARG_INT, &opt_bits, 0, - "Set the length of the public key pair", "VALUE" }, - { "show-key", 'S', POPT_ARG_STRING, &opt_keyfile, 0, - "Show the contents of the public key", "FILE" }, - { "list-ciphers", 'C', POPT_ARG_NONE, &opt_list_ciphers, 0, - "List supported ciphers", NULL }, - { "list-hash-funcs", 'H', POPT_ARG_NONE, &opt_list_hash, 0, - "List supported hash functions", NULL }, - { "list-hmacs", 'H', POPT_ARG_NONE, &opt_list_hmac, 0, - "List supported HMACs", NULL }, - { "list-pkcs", 'P', POPT_ARG_NONE, &opt_list_pkcs, 0, - "List supported PKCSs", NULL }, - { "debug", 'd', POPT_ARG_STRING, &opt_debug, 0, - "Enable debugging", NULL }, - { "version", 'V', POPT_ARG_NONE, &opt_version, 0, - "Show version", NULL }, - { NULL, '\0', 0, NULL } - }; + int i; + + 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]); + break; + } + + if (!silc_hash_is_supported(hash)) { + SILC_LOG_ERROR(("Unknown hash function `%s'", hash)); + exit(1); + } + } - args_register(options); + /* Register other defaults */ + silc_hash_register_default(); } -static void silc_nickname_format_parse(const char *nickname, - char **ret_nickname) +static void silc_register_hmac(SilcClient client, const char *hmac) { - silc_parse_userfqdn(nickname, ret_nickname, NULL); + int i; + + 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]); + break; + } + + if (!silc_hmac_is_supported(hmac)) { + SILC_LOG_ERROR(("Unknown HMAC `%s'", hmac)); + exit(1); + } + } + + /* Register other defaults */ + silc_hmac_register_default(); } -/* Finalize init. Called from src/fe-text/silc.c */ +/* Finalize init. Init finish signal calls this. */ -void silc_core_init_finish(void) +void silc_opt_callback(poptContext con, + enum poptCallbackReason reason, + const struct poptOption *opt, + const char *arg, void *data) { - CHAT_PROTOCOL_REC *rec; - SilcClientParams params; - - if (opt_create_keypair == TRUE) { - /* Create new key pair and exit */ - silc_cipher_register_default(); - silc_pkcs_register_default(); - silc_hash_register_default(); - silc_hmac_register_default(); - silc_client_create_key_pair(opt_pkcs, opt_bits, - NULL, NULL, NULL, NULL, NULL); - exit(0); - } - - if (opt_keyfile) { + if (strcmp(opt->longName, "show-key") == 0) { /* Dump the key */ silc_cipher_register_default(); silc_pkcs_register_default(); silc_hash_register_default(); silc_hmac_register_default(); - silc_client_show_key(opt_keyfile); + silc_client_show_key(opt->arg); exit(0); } - if (opt_list_ciphers) { + if (strcmp(opt->longName, "list-ciphers") == 0) { silc_cipher_register_default(); silc_client_list_ciphers(); exit(0); } - if (opt_list_hash) { + if (strcmp(opt->longName, "list-hash-funcs") == 0) { silc_hash_register_default(); silc_client_list_hash_funcs(); exit(0); } - if (opt_list_hmac) { + if (strcmp(opt->longName, "list-hmacs") == 0) { silc_hmac_register_default(); silc_client_list_hmacs(); exit(0); } - if (opt_list_pkcs) { + if (strcmp(opt->longName, "list-pkcs") == 0) { silc_pkcs_register_default(); silc_client_list_pkcs(); exit(0); } - if (opt_version) { - printf("SILC Secure Internet Live Conferencing, version %s " - "(base: SILC Toolkit %s)\n", silc_dist_version, silc_version); - printf("(c) 1997 - 2001 Pekka Riikonen \n"); - exit(0); + if (strcmp(opt->longName, "debug") == 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" + "the client with --enable-debug configuration option.\n"); + sleep(1); +#endif } +} - if (opt_debug) { - silc_debug = TRUE; - silc_log_set_debug_string(opt_debug); - silc_log_set_callbacks(silc_log_info, silc_log_warning, - silc_log_error, NULL); +static void sig_init_read_settings(void) +{ + if (opt_create_keypair) { + /* Create new key pair and exit */ + silc_cipher_register_default(); + silc_pkcs_register_default(); + silc_hash_register_default(); + silc_hmac_register_default(); + silc_client_create_key_pair(opt_pkcs, opt_bits, + NULL, NULL, NULL, NULL, NULL); + exit(0); } +} + +/* Init SILC. Called from src/fe-text/silc.c */ + +void silc_core_init(void) +{ + static struct poptOption silc_options[] = { + { 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 supported ciphers", NULL }, + { "list-hash-funcs", 'H', POPT_ARG_NONE, NULL, 0, + "List supported hash functions", NULL }, + { "list-hmacs", 'M', POPT_ARG_NONE, NULL, 0, + "List supported HMACs", NULL }, + { "list-pkcs", 'P', 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 new public key pair", NULL }, + { "pkcs", 0, POPT_ARG_STRING, &opt_pkcs, 0, + "Set the PKCS of the public key pair", "PKCS" }, + { "bits", 0, POPT_ARG_INT, &opt_bits, 0, + "Set the length of the public key pair", "VALUE" }, + { NULL, '\0', 0, NULL } + }; + + CHAT_PROTOCOL_REC *rec; + SilcClientParams params; + const char *def_cipher, *def_hash, *def_hmac; - /* Do some irssi initializing */ + args_register(options); + signal_add("irssi init read settings", (SIGNAL_FUNC) sig_init_read_settings); + + /* Settings */ settings_add_bool("server", "skip_motd", FALSE); settings_add_str("server", "alternate_nick", NULL); - - /* Initialize the auto_addr variables Is "server" the best choice for - * this? No existing category seems to apply. - */ - settings_add_bool("server", "use_auto_addr", FALSE); settings_add_str("server", "auto_bind_ip", ""); settings_add_str("server", "auto_public_ip", ""); settings_add_int("server", "auto_bind_port", 0); - + settings_add_str("server", "crypto_default_cipher", SILC_DEFAULT_CIPHER); + settings_add_str("server", "crypto_default_hash", SILC_DEFAULT_HASH); + settings_add_str("server", "crypto_default_hmac", SILC_DEFAULT_HMAC); + settings_add_int("server", "key_exchange_timeout_secs", 120); + settings_add_int("server", "key_exchange_rekey_secs", 3600); + settings_add_int("server", "connauth_request_secs", 2); + silc_init_userinfo(); /* Initialize client parameters */ memset(¶ms, 0, sizeof(params)); strcat(params.nickname_format, "%n@%h%a"); params.nickname_parse = silc_nickname_format_parse; + params.rekey_secs = settings_get_int("key_exchange_rekey_secs"); + params.connauth_request_secs = settings_get_int("connauth_request_secs"); /* Allocate SILC client */ silc_client = silc_client_alloc(&ops, ¶ms, NULL, silc_version_string); - /* Load local config file */ - silc_config = silc_client_config_alloc(SILC_CLIENT_HOME_CONFIG_FILE); + /* Get the ciphers and stuff from config file */ + def_cipher = settings_get_str("crypto_default_cipher"); + def_hash = settings_get_str("crypto_default_hash"); + def_hmac = settings_get_str("crypto_default_hmac"); + silc_register_cipher(silc_client, def_cipher); + silc_register_hash(silc_client, def_hash); + silc_register_hmac(silc_client, def_hmac); + silc_pkcs_register_default(); /* Get user information */ silc_client->username = g_strdup(settings_get_str("user_name")); + silc_client->nickname = g_strdup(settings_get_str("nick")); silc_client->hostname = silc_net_localhost(); silc_client->realname = g_strdup(settings_get_str("real_name")); - /* Register all configured ciphers, PKCS and hash functions. */ - if (silc_config) { - silc_config->client = silc_client; - if (!silc_client_config_register_ciphers(silc_config)) - silc_cipher_register_default(); - if (!silc_client_config_register_pkcs(silc_config)) - silc_pkcs_register_default(); - if (!silc_client_config_register_hashfuncs(silc_config)) - silc_hash_register_default(); - if (!silc_client_config_register_hmacs(silc_config)) - silc_hmac_register_default(); - } else { - /* Register default ciphers, pkcs, hash funtions and hmacs. */ - silc_cipher_register_default(); - silc_pkcs_register_default(); - silc_hash_register_default(); - silc_hmac_register_default(); - } - /* Check ~/.silc directory and public and private keys */ if (silc_client_check_silc_dir() == FALSE) { idletag = -1; @@ -352,6 +408,7 @@ void silc_core_init_finish(void) rec->create_server_setup = create_server_setup; rec->create_channel_setup = create_channel_setup; rec->create_server_connect = create_server_connect; + rec->destroy_server_connect = destroy_server_connect; rec->server_connect = (SERVER_REC *(*) (SERVER_CONNECT_REC *)) silc_server_connect; rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *, int)) @@ -367,6 +424,8 @@ void silc_core_init_finish(void) silc_queries_init(); idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL); + + module_register("silc", "core"); } /* Deinit SILC. Called from src/fe-text/silc.c */