Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
- Copyright (C) 2001 Pekka Riikonen
+ Copyright (C) 2001, 2005 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include "silc-channels.h"
#include "silc-queries.h"
#include "silc-nicklist.h"
-#include "silcversion.h"
+#include "silc-chatnets.h"
+#include "silc-cmdqueue.h"
#include "signals.h"
#include "levels.h"
static char *opt_pkcs = NULL;
static int opt_bits = 0;
-static int idletag;
+static int idletag = -1;
SilcClient silc_client = NULL;
extern SilcClientOperations ops;
-extern bool silc_debug;
-extern bool silc_debug_hexdump;
void silc_expandos_init(void);
void silc_expandos_deinit(void);
+void silc_lag_init(void);
+void silc_lag_deinit(void);
+
static int my_silc_scheduler(void)
{
silc_client_run_one(silc_client);
static void silc_init_userinfo(void)
{
const char *set, *nick, *user_name;
- char *str;
-
+ char *str;
+
/* check if nick/username/realname wasn't read from setup.. */
set = settings_get_str("real_name");
if (set == NULL || *set == '\0') {
settings_set_str("real_name",
str != NULL ? str : silc_get_real_name());
}
-
+
/* username */
user_name = settings_get_str("user_name");
if (user_name == NULL || *user_name == '\0') {
if (!str)
str = g_getenv("IRCNICK");
settings_set_str("nick", str != NULL ? str : user_name);
-
+
nick = settings_get_str("nick");
}
-
+
/* alternate nick */
set = settings_get_str("alternate_nick");
if (set == NULL || *set == '\0') {
bool debug = settings_get_bool("debug");
if (debug) {
const char *debug_string = settings_get_str("debug_string");
- i_debug = silc_debug = TRUE;
+ i_debug = TRUE;
+ silc_log_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;
+ silc_log_debug(FALSE);
#endif
}
static bool silc_log_misc(SilcLogType type, char *message, void *context)
{
- printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s: %s",
+ printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, "%s: %s",
(type == SILC_LOG_INFO ? "[Info]" :
type == SILC_LOG_WARNING ? "[Warning]" : "[Error]"), message);
return TRUE;
silc_cipher_register(&(silc_default_ciphers[i]));
break;
}
-
+
if (!silc_cipher_is_supported(cipher)) {
SILC_LOG_ERROR(("Unknown cipher `%s'", cipher));
exit(1);
silc_hash_register(&(silc_default_hash[i]));
break;
}
-
+
if (!silc_hash_is_supported(hash)) {
SILC_LOG_ERROR(("Unknown hash function `%s'", hash));
exit(1);
silc_hmac_register(&(silc_default_hmacs[i]));
break;
}
-
+
if (!silc_hmac_is_supported(hmac)) {
SILC_LOG_ERROR(("Unknown HMAC `%s'", hmac));
exit(1);
/* Finalize init. Init finish signal calls this. */
-void silc_opt_callback(poptContext con,
+void silc_opt_callback(poptContext con,
enum poptCallbackReason reason,
const struct poptOption *opt,
const char *arg, void *data)
{
- 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((char *)arg);
- exit(0);
+ if (strcmp(opt->longName, "nick") == 0) {
+ g_free(silc_client->nickname);
+ silc_client->nickname = g_strdup(arg);
+ }
+
+ if (strcmp(opt->longName, "hostname") == 0) {
+ silc_free(silc_client->hostname);
+ silc_client->hostname = g_strdup(arg);
}
if (strcmp(opt->longName, "list-ciphers") == 0) {
}
if (strcmp(opt->longName, "debug") == 0) {
- silc_debug = TRUE;
- silc_debug_hexdump = TRUE;
+ silc_log_debug(TRUE);
+ silc_log_debug_hexdump(TRUE);
silc_log_set_debug_string(arg);
#ifndef SILC_DEBUG
- fprintf(stdout,
+ fprintf(stdout,
"Run-time debugging is not enabled. To enable it recompile\n"
"the client with --enable-debug configuration option.\n");
sleep(1);
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);
+ silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, TRUE);
+ exit(0);
+ }
+
+ if (strcmp(opt->longName, "passphrase-change") == 0) {
+ /* Change the passphrase of the private key file */
+ silc_cipher_register_default();
+ silc_pkcs_register_default();
+ silc_hash_register_default();
+ silc_hmac_register_default();
+ silc_change_private_key_passphrase(arg, NULL, NULL);
+ exit(0);
+ }
+
+ 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_show_public_key((char *)arg);
exit(0);
}
}
+static void sig_init_finished(void)
+{
+ /* Check ~/.silc directory and public and private keys */
+ if (!silc_client_check_silc_dir())
+ exit(1);
+
+ /* Load public and private key */
+ if (!silc_client_load_keys(silc_client))
+ exit(1);
+
+ /* Initialize the SILC client */
+ if (!silc_client_init(silc_client))
+ exit(1);
+
+ /* register SILC scheduler */
+ idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+}
+
/* 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", 0, POPT_ARG_NONE, NULL, 0,
"List supported ciphers", NULL },
{ "list-hash-funcs", 0, POPT_ARG_NONE, NULL, 0,
"List supported HMACs", NULL },
{ "list-pkcs", 0, POPT_ARG_NONE, NULL, 0,
"List supported PKCSs", NULL },
+#ifdef SILC_DEBUG
{ "debug", 'd', POPT_ARG_STRING, NULL, 0,
"Enable debugging", "STRING" },
+#endif /* SILC_DEBUG */
{ "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 (-C)", "PKCS" },
{ "bits", 0, POPT_ARG_INT, &opt_bits, 0,
"Set the length of the public key pair (-C)", "VALUE" },
+ { "passphrase-change", 'P', POPT_ARG_STRING, NULL, 0,
+ "Change the passphrase of private key file", "FILE" },
+ { "show-key", 'S', POPT_ARG_STRING, NULL, 0,
+ "Show the contents of the public key", "FILE" },
{ NULL, '\0', 0, NULL }
};
settings_add_int("server", "key_exchange_rekey_secs", 3600);
settings_add_int("server", "connauth_request_secs", 2);
settings_add_int("server", "heartbeat", 300);
+ settings_add_bool("server", "ignore_message_signatures", FALSE);
+ settings_add_str("server", "session_filename", "session.$chatnet");
/* Requested Attributes settings */
settings_add_bool("silc", "attr_allow", TRUE);
#endif
signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+ signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
silc_init_userinfo();
silc_client->hostname = silc_net_localhost();
silc_client->realname = g_strdup(settings_get_str("real_name"));
- /* Check ~/.silc directory and public and private keys */
- if (silc_client_check_silc_dir() == FALSE) {
- idletag = -1;
- return;
- }
-
- /* Load public and private key */
- if (silc_client_load_keys(silc_client) == FALSE) {
- idletag = -1;
- return;
- }
-
- /* Initialize the SILC client */
- if (!silc_client_init(silc_client)) {
- idletag = -1;
- 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);
rec->create_channel_setup = create_channel_setup;
rec->create_server_connect = create_server_connect;
rec->destroy_server_connect = destroy_server_connect;
- rec->server_init_connect = silc_server_init_connect;
+ rec->server_init_connect = silc_server_init_connect;
rec->server_connect = silc_server_connect;
- rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *,
+ rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, const char *,
const char *, int))
silc_channel_create;
rec->query_create = (QUERY_REC *(*) (const char *, const char *, int))
silc_query_create;
-
+
chat_protocol_register(rec);
g_free(rec);
+ silc_queue_init();
silc_server_init();
silc_channels_init();
silc_queries_init();
silc_expandos_init();
-
- idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+ silc_lag_init();
+ silc_chatnets_init();
module_register("silc", "core");
}
void silc_core_deinit(void)
{
- if (idletag != -1) {
- signal_emit("chat protocol deinit", 1,
- chat_protocol_find("SILC"));
- signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
-
- silc_server_deinit();
- silc_channels_deinit();
- silc_queries_deinit();
- silc_expandos_deinit();
-
- chat_protocol_unregister("SILC");
-
+ if (idletag != -1)
g_source_remove(idletag);
- }
-
+
+ signal_emit("chat protocol deinit", 1,
+ chat_protocol_find("SILC"));
+ signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+ signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+
+ silc_queue_deinit();
+ silc_server_deinit();
+ silc_channels_deinit();
+ silc_queries_deinit();
+ silc_expandos_deinit();
+ silc_lag_deinit();
+ silc_chatnets_deinit();
+
+ chat_protocol_unregister("SILC");
+
g_free(silc_client->username);
g_free(silc_client->realname);
+ silc_free(silc_client->hostname);
+ silc_pkcs_free(silc_client->pkcs);
+ silc_pkcs_private_key_free(silc_client->private_key);
+ silc_pkcs_public_key_free(silc_client->public_key);
silc_client_free(silc_client);
}
projects / silc.git / blobdiff