updates.
[silc.git] / apps / irssi / src / silc / core / silc-core.c
index 7afa379ba7805c3267e8c7d38cbd72b9641a8090..9936826d50f8ac12e3e1133e7cced32caac9335b 100644 (file)
@@ -1,5 +1,26 @@
+/*
+
+  silc-core.c
+
+  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+  Copyright (C) 2001 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
+  GNU General Public License for more details.
+
+*/
+
 #include "module.h"
 #include "chat-protocols.h"
+#include "args.h"
 
 #include "chatnets.h"
 #include "servers-setup.h"
 #include "silc-queries.h"
 #include "silc-nicklist.h"
 #include "version_internal.h"
+#include "version.h"
 
 #include "signals.h"
 #include "levels.h"
 #include "settings.h"
 #include "fe-common/core/printtext.h"
 #include "fe-common/core/fe-channels.h"
+#include "fe-common/core/keyboard.h"
+#include "fe-common/silc/module-formats.h"
 
-#define SILC_CLIENT_PUBLIC_KEY_NAME "public_key.pub"
-#define SILC_CLIENT_PRIVATE_KEY_NAME "private_key.prv"
-
-#define SILC_CLIENT_DEF_PKCS "rsa"
-#define SILC_CLIENT_DEF_PKCS_LEN 1024
-
-SilcClient silc_client;
-const char *silc_version_string = SILC_PROTOCOL_VERSION_STRING;
+/* Command line option variables */
+static bool opt_create_keypair = FALSE;
+static bool opt_debug = 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_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;
+#ifdef SILC_SIM
+/* SIM (SILC Module) table */
+SilcSimContext **sims = NULL;
+uint32 sims_count = 0;
+#endif
 
-static void silc_say(SilcClient client, SilcClientConnection conn,
-                    char *msg, ...)
-{
-       SILC_SERVER_REC *server;
-       va_list va;
-       char *str;
-
-       server = conn == NULL ? NULL : conn->context;
-
-       va_start(va, msg);
-       str = g_strdup_vprintf(msg, va);
-       printtext(server, "#silc", MSGLEVEL_CRAP, "%s", str);
-       g_free(str);
-       va_end(va);
-}
-
-static void silc_channel_message(SilcClient c, SilcClientConnection conn,
-                                SilcClientEntry client,
-                                SilcChannelEntry channel, char *msg)
-{
-       SILC_SERVER_REC *server;
-       SILC_NICK_REC *nick;
-        SILC_CHANNEL_REC *chanrec;
-
-       server = conn == NULL ? NULL : conn->context;
-       chanrec = silc_channel_find_entry(server, channel);
-
-       nick = client == NULL ? NULL : silc_nicklist_find(chanrec, client);
-       signal_emit("message public", 6, server, msg,
-                   nick == NULL ? "(unknown)" : nick->nick,
-                   nick == NULL ? NULL : nick->host,
-                   chanrec->name, nick);
-}
-
-static void silc_private_message(SilcClient c, SilcClientConnection conn,
-                                SilcClientEntry client, char *msg)
+static int my_silc_scheduler(void)
 {
-       SILC_SERVER_REC *server;
-
-       server = conn == NULL ? NULL : conn->context;
-       signal_emit("message private", 4, server, msg,
-                   client == NULL ? "(unknown)" : client->nickname,
-                   client == NULL ? NULL : client->username);
+  silc_schedule_one(silc_client->schedule, 0);
+  return 1;
 }
 
-typedef struct {
-       int type;
-       const char *name;
-} NOTIFY_REC;
-
-#define MAX_NOTIFY (sizeof(notifies)/sizeof(notifies[0]))
-static NOTIFY_REC notifies[] = {
-       { SILC_NOTIFY_TYPE_NONE,                NULL },
-       { SILC_NOTIFY_TYPE_INVITE,              "invite" },
-       { SILC_NOTIFY_TYPE_JOIN,                "join" },
-       { SILC_NOTIFY_TYPE_LEAVE,               "leave" },
-       { SILC_NOTIFY_TYPE_SIGNOFF,             "signoff" },
-       { SILC_NOTIFY_TYPE_TOPIC_SET,           "topic" },
-       { SILC_NOTIFY_TYPE_NICK_CHANGE,         "nick" },
-       { SILC_NOTIFY_TYPE_CMODE_CHANGE,        "cmode" },
-       { SILC_NOTIFY_TYPE_CUMODE_CHANGE,       "cumode" },
-       { SILC_NOTIFY_TYPE_MOTD,                "motd" }
-};
-
-static void silc_notify(SilcClient client, SilcClientConnection conn,
-                        SilcNotifyType type, ...)
+static CHATNET_REC *create_chatnet(void)
 {
-       SILC_SERVER_REC *server;
-       va_list va;
-
-       server = conn == NULL ? NULL : conn->context;
-       va_start(va, type);
-
-       if (type == SILC_NOTIFY_TYPE_NONE) {
-               /* some generic notice from server */
-               printtext(server, NULL, MSGLEVEL_CRAP, "%s",
-                         (char *) va_arg(va, char *));
-       } else if (type < MAX_NOTIFY) {
-               /* send signal about the notify event */
-               char signal[50];
-
-               g_snprintf(signal, sizeof(signal), "silc event %s",
-                          notifies[type].name);
-               signal_emit(signal, 2, server, va);
-       } else {
-               /* unknown notify */
-               printtext(server, NULL, MSGLEVEL_CRAP,
-                         "Unknown notify %d", type);
-       }
-       va_end(va);
+  return g_malloc0(sizeof(CHATNET_REC));
 }
 
-static void silc_connect(SilcClient client, SilcClientConnection conn, int success)
+static SERVER_SETUP_REC *create_server_setup(void)
 {
-       SILC_SERVER_REC *server = conn->context;
-
-       if (success) {
-               server->connected = TRUE;
-               signal_emit("event connected", 1, server);
-       } else {
-               server->connection_lost = TRUE;
-                server->conn->context = NULL;
-               server_disconnect(SERVER(server));
-       }
+  return g_malloc0(sizeof(SERVER_SETUP_REC));
 }
 
-static void silc_disconnect(SilcClient client, SilcClientConnection conn)
+static CHANNEL_SETUP_REC *create_channel_setup(void)
 {
-       SILC_SERVER_REC *server = conn->context;
-
-       server->conn->context = NULL;
-       server->conn = NULL;
-       server->connection_lost = TRUE;
-       server_disconnect(SERVER(server));
+  return g_malloc0(sizeof(CHANNEL_SETUP_REC));
 }
 
-static void silc_command(SilcClient client, SilcClientConnection conn,
-                        SilcClientCommandContext cmd_context, int success,
-                        SilcCommand command)
+static SERVER_CONNECT_REC *create_server_connect(void)
 {
+  return g_malloc0(sizeof(SILC_SERVER_CONNECT_REC));
 }
 
-static void silc_command_reply(SilcClient client, SilcClientConnection conn,
-                              SilcCommandPayload cmd_payload, int success,
-                              SilcCommand command,
-                              SilcCommandStatus status, ...)
-{
-        SILC_SERVER_REC *server = conn->context;
-       SILC_CHANNEL_REC *chanrec;
-       va_list va;
-
-       va_start(va, status);
-
-       /*g_snprintf(signal, sizeof(signal), "silc command reply %s",
-                  silc_commands[type]);
-       signal_emit(signal, 2, server, va);*/
-
-       switch(command) {
-       case SILC_COMMAND_JOIN: {
-               char *channel, *mode;
-
-               channel = va_arg(va, char *);
-               (void)va_arg(va, SilcChannelEntry);
-               mode = silc_client_chmode(va_arg(va, unsigned int));
-
-               chanrec = silc_channel_find(server, channel);
-               if (chanrec != NULL && !success)
-                       channel_destroy(CHANNEL(chanrec));
-               else if (chanrec == NULL && success)
-                       chanrec = silc_channel_create(server, channel, TRUE);
-
-               g_free_not_null(chanrec->mode);
-               chanrec->mode = g_strdup(mode == NULL ? "" : mode);
-               signal_emit("channel mode changed", 1, chanrec);
-               break;
-       }
-       case SILC_COMMAND_NICK: {
-               SilcClientEntry client = va_arg(va, SilcClientEntry);
-                char *old;
-
-                old = g_strdup(server->nick);
-               server_change_nick(SERVER(server), client->nickname);
-               nicklist_rename_unique(SERVER(server),
-                                      server->conn->local_entry, server->nick,
-                                       client, client->nickname);
-
-               signal_emit("message own_nick", 4,
-                           server, server->nick, old, "");
-                g_free(old);
-               break;
-       }
-       case SILC_COMMAND_USERS: {
-               SilcChannelEntry channel;
-               SilcChannelUser user;
-                NICK_REC *ownnick;
-
-               channel = va_arg(va, SilcChannelEntry);
-               chanrec = silc_channel_find_entry(server, channel);
-               if (chanrec == NULL)
-                       break;
-
-               silc_list_start(channel->clients);
-               while ((user = silc_list_get(channel->clients)) != NULL)
-                       silc_nicklist_insert(chanrec, user, FALSE);
-
-                ownnick = NICK(silc_nicklist_find(chanrec, conn->local_entry));
-               nicklist_set_own(CHANNEL(chanrec), ownnick);
-                signal_emit("channel joined", 1, chanrec);
-               fe_channels_nicklist(CHANNEL(chanrec),
-                                    CHANNEL_NICKLIST_FLAG_ALL);
-               break;
-       }
-       }
-
-       va_end(va);
-}
+/* Checks user information and saves them to the config file it they
+   do not exist there already. */
 
-static int silc_verify_server_key(SilcClient client, SilcClientConnection conn,
-                                 unsigned char *pk, unsigned int pk_len,
-                                 SilcSKEPKType pk_type)
+static void silc_init_userinfo(void)
 {
-       return TRUE;
+  const char *set, *nick, *user_name;
+  char *str;   
+        
+  /* check if nick/username/realname wasn't read from setup.. */
+  set = settings_get_str("real_name");
+  if (set == NULL || *set == '\0') {
+    str = g_getenv("SILCNAME");
+    if (!str)
+      str = g_getenv("IRCNAME");
+    settings_set_str("real_name",
+                    str != NULL ? str : g_get_real_name());
+  }
+  /* username */
+  user_name = settings_get_str("user_name");
+  if (user_name == NULL || *user_name == '\0') {
+    str = g_getenv("SILCUSER");
+    if (!str)
+      str = g_getenv("IRCUSER");
+    settings_set_str("user_name",
+                    str != NULL ? str : g_get_user_name());
+    
+    user_name = settings_get_str("user_name");
+  }
+         
+  /* nick */
+  nick = settings_get_str("nick");
+  if (nick == NULL || *nick == '\0') {
+    str = g_getenv("SILCNICK");
+    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') {
+    if (strlen(nick) < 9)
+      str = g_strconcat(nick, "_", NULL);
+    else { 
+      str = g_strdup(nick);
+      str[strlen(str)-1] = '_';
+    }
+    settings_set_str("alternate_nick", str);
+    g_free(str);
+  }
+
+  /* host name */
+  set = settings_get_str("hostname");
+  if (set == NULL || *set == '\0') {
+    str = g_getenv("SILCHOST");
+    if (!str)
+      str = g_getenv("IRCHOST");
+    if (str != NULL)
+      settings_set_str("hostname", str);
+  }
 }
 
-static unsigned char *silc_ask_passphrase(SilcClient client,
-                                         SilcClientConnection conn)
-{
-       return NULL;
-}
+/* Log callbacks */
 
-static int silc_get_auth_method(SilcClient client, SilcClientConnection conn,
-                               char *hostname, unsigned short port,
-                               SilcProtocolAuthMeth *auth_meth,
-                               unsigned char **auth_data,
-                               unsigned int *auth_data_len)
+static void silc_log_info(char *message)
 {
-       return FALSE;
+  fprintf(stderr, "%s\n", message);
 }
 
-static void silc_failure(SilcClient client, SilcClientConnection conn,
-                        SilcProtocol protocol, void *failure)
+static void silc_log_warning(char *message)
 {
+  fprintf(stderr, "%s\n", message);
 }
 
-static int key_agreement(SilcClient client, SilcClientConnection conn,
-                        SilcClientEntry client_entry, char *hostname,
-                        int port)
+static void silc_log_error(char *message)
 {
-        return FALSE;
+  fprintf(stderr, "%s\n", message);
 }
 
-SilcClientOperations ops = {
-       silc_say,
-       silc_channel_message,
-       silc_private_message,
-       silc_notify,
-       silc_command,
-       silc_command_reply,
-       silc_connect,
-       silc_disconnect,
-       silc_get_auth_method,
-       silc_verify_server_key,
-       silc_ask_passphrase,
-       silc_failure,
-        key_agreement
-};
-
-/* Loads public and private key from files. */
-
-static void silc_client_create_key_pair(char *pkcs_name, int bits,
-                                       char *identifier,
-                                       SilcPublicKey *pub_key,
-                                       SilcPrivateKey *prv_key)
-{
-       SilcPKCS pkcs;
-       SilcRng rng;
-       unsigned char *key;
-       unsigned int key_len;
-
-       rng = silc_rng_alloc();
-       silc_rng_init(rng);
-       silc_rng_global_init(rng);
-
-       silc_pkcs_alloc(pkcs_name, &pkcs);
-       pkcs->pkcs->init(pkcs->context, bits, rng);
-
-       /* Create public key */
-       key = silc_pkcs_get_public_key(pkcs, &key_len);
-       *pub_key = silc_pkcs_public_key_alloc(pkcs->pkcs->name, identifier,
-                                             key, key_len);
+/* Init SILC. Called from src/fe-text/silc.c */
 
-       memset(key, 0, sizeof(key_len));
-       silc_free(key);
-
-       /* Create private key */
-       key = silc_pkcs_get_private_key(pkcs, &key_len);
-       *prv_key = silc_pkcs_private_key_alloc(pkcs->pkcs->name, key, key_len);
-
-       memset(key, 0, sizeof(key_len));
-       silc_free(key);
-
-       silc_rng_free(rng);
-       silc_pkcs_free(pkcs);
-}
-
-static int read_keyfiles(SilcClient client, char *public_file,
-                        char *private_file)
-{
-       struct stat statbuf;
-
-       if (stat(public_file, &statbuf) != 0 ||
-           stat(private_file, &statbuf) != 0)
-               return FALSE;
-
-       if (!silc_pkcs_load_private_key(private_file, &client->private_key,
-                                       SILC_PKCS_FILE_BIN) &&
-           !silc_pkcs_load_private_key(private_file, &client->private_key,
-                                       SILC_PKCS_FILE_PEM))
-               return FALSE;
-
-       if (!silc_pkcs_load_public_key(public_file, &client->public_key,
-                                      SILC_PKCS_FILE_PEM) &&
-           !silc_pkcs_load_public_key(public_file, &client->public_key,
-                                      SILC_PKCS_FILE_BIN))
-               return FALSE;
-
-       return TRUE;
-}
-
-static char *silc_create_identifier(SilcClient client)
-{
-       char hostname[256], *email, *ret;
-
-       if (gethostname(hostname, sizeof(hostname)) != 0)
-               hostname[0] = '\0';
-
-       email = g_strdup_printf("%s@%s", client->username, hostname);
-       ret = silc_pkcs_encode_identifier(client->username, hostname,
-                                         client->realname, email,
-                                         NULL, NULL);
-       g_free(email);
-       return ret;
-}
-
-static int load_keys(SilcClient client)
-{
-       char *public_file, *private_file;
-       char *identifier;
-
-       public_file = g_strdup_printf("%s/.irssi/%s", g_get_home_dir(),
-                                     SILC_CLIENT_PUBLIC_KEY_NAME);
-       private_file = g_strdup_printf("%s/.irssi/%s", g_get_home_dir(),
-                                      SILC_CLIENT_PRIVATE_KEY_NAME);
-
-       if (!read_keyfiles(client, public_file, private_file)) {
-               /* couldn't read key files, recreate them */
-               identifier = silc_create_identifier(client);
-               silc_client_create_key_pair(SILC_CLIENT_DEF_PKCS,
-                                           SILC_CLIENT_DEF_PKCS_LEN,
-                                           identifier,
-                                           &client->public_key,
-                                           &client->private_key);
-               silc_free(identifier);
-
-               silc_pkcs_save_public_key(public_file, client->public_key,
-                                         SILC_PKCS_FILE_PEM);
-               silc_pkcs_save_private_key(private_file, client->private_key,
-                                          NULL, SILC_PKCS_FILE_BIN);
-       }
-
-       g_free(public_file);
-       g_free(private_file);
-       return TRUE;
-}
-
-static int my_silc_scheduler(void)
-{
-       silc_schedule_one(0);
-       return 1;
-}
-
-static CHATNET_REC *create_chatnet(void)
+void silc_core_init(void)
 {
-        return g_malloc0(sizeof(CHATNET_REC));
+  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_NONE, &opt_debug, 0,
+      "Enable debugging", NULL },
+    { "version", 'V', POPT_ARG_NONE, &opt_version, 0,
+      "Show version", NULL },
+    { NULL, '\0', 0, NULL }
+  };
+
+  args_register(options);
 }
 
-static SERVER_SETUP_REC *create_server_setup(void)
+static void silc_nickname_format_parse(const char *nickname,
+                                      char **ret_nickname)
 {
-        return g_malloc0(sizeof(SERVER_SETUP_REC));
+  silc_parse_userfqdn(nickname, ret_nickname, NULL);
 }
 
-static CHANNEL_SETUP_REC *create_channel_setup(void)
-{
-        return g_malloc0(sizeof(CHANNEL_SETUP_REC));
-}
+/* Finalize init. Called from src/fe-text/silc.c */
 
-static SERVER_CONNECT_REC *create_server_connect(void)
+void silc_core_init_finish(void)
 {
-        return g_malloc0(sizeof(SILC_SERVER_CONNECT_REC));
+  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) {
+    /* 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);
+    exit(0);
+  }
+
+  if (opt_list_ciphers) {
+    silc_cipher_register_default();
+    silc_client_list_ciphers();
+    exit(0);
+  }
+
+  if (opt_list_hash) {
+    silc_hash_register_default();
+    silc_client_list_hash_funcs();
+    exit(0);
+  }
+
+  if (opt_list_hmac) {
+    silc_hmac_register_default();
+    silc_client_list_hmacs();
+    exit(0);
+  }
+
+  if (opt_list_pkcs) {
+    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 <priikone@silcnet.org>\n");
+    exit(0); 
+  }
+
+  silc_debug = opt_debug;
+  silc_log_set_callbacks(silc_log_info, silc_log_warning,
+                        silc_log_error, NULL);
+
+  /* Do some irssi initializing */
+  settings_add_bool("server", "skip_motd", FALSE);
+  settings_add_str("server", "alternate_nick", NULL);
+  silc_init_userinfo();
+
+  /* Initialize client parameters */
+  memset(&params, 0, sizeof(params));
+  strcat(params.nickname_format, "%n@%h%a");
+  params.nickname_parse = silc_nickname_format_parse;
+
+  /* Allocate SILC client */
+  silc_client = silc_client_alloc(&ops, &params, NULL, silc_version_string);
+
+  /* Load local config file */
+  silc_config = silc_client_config_alloc(SILC_CLIENT_HOME_CONFIG_FILE);
+
+  /* Get user information */
+  silc_client->username = g_strdup(settings_get_str("user_name"));
+  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;
+    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;
+  }
+
+  /* Register SILC to the irssi */
+  rec = g_new0(CHAT_PROTOCOL_REC, 1);
+  rec->name = "SILC";
+  rec->fullname = "Secure Internet Live Conferencing";
+  rec->chatnet = "silcnet";
+  rec->create_chatnet = create_chatnet;
+  rec->create_server_setup = create_server_setup;
+  rec->create_channel_setup = create_channel_setup;
+  rec->create_server_connect = create_server_connect;
+  rec->server_connect = (SERVER_REC *(*) (SERVER_CONNECT_REC *))
+    silc_server_connect; 
+  rec->channel_create = (CHANNEL_REC *(*) (SERVER_REC *, 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_server_init();
+  silc_channels_init();
+  silc_queries_init();
+
+  idletag = g_timeout_add(50, (GSourceFunc) my_silc_scheduler, NULL);
 }
 
-/* Command line option variables */
-void silc_core_init(void)
-{
-       CHAT_PROTOCOL_REC *rec;
-
-       silc_client = silc_client_alloc(&ops, NULL);
-       silc_client->username = g_strdup(settings_get_str("user_name"));
-       silc_client->hostname = silc_net_localhost();
-       silc_client->realname = g_strdup(settings_get_str("real_name"));
-
-       if (!load_keys(silc_client)) {
-               idletag = -1;
-               return;
-       }
-
-       silc_client_init(silc_client);
-
-       rec = g_new0(CHAT_PROTOCOL_REC, 1);
-       rec->name = "SILC";
-       rec->fullname = "Secure Internet Live Conferencing";
-       rec->chatnet = "silcnet";
-
-       rec->create_chatnet = create_chatnet;
-        rec->create_server_setup = create_server_setup;
-        rec->create_channel_setup = create_channel_setup;
-       rec->create_server_connect = create_server_connect;
-
-       rec->server_connect = (SERVER_REC *(*) (SERVER_CONNECT_REC *))
-               silc_server_connect;
-       rec->channel_create =
-               (CHANNEL_REC *(*) (SERVER_REC *, 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_server_init();
-       silc_channels_init();
-       silc_queries_init();
-
-       idletag = g_timeout_add(100, (GSourceFunc) my_silc_scheduler, NULL);
-}
+/* Deinit SILC. Called from src/fe-text/silc.c */
 
 void silc_core_deinit(void)
 {
-       if (idletag != -1) {
-               signal_emit("chat protocol deinit", 1,
-                           chat_protocol_find("SILC"));
-
-               silc_server_deinit();
-               silc_channels_deinit();
-               silc_queries_deinit();
-
-               chat_protocol_unregister("SILC");
-
-               g_source_remove(idletag);
-       }
-
-       g_free(silc_client->username);
-       g_free(silc_client->realname);
-       silc_client_free(silc_client);
+  if (idletag != -1) {
+    signal_emit("chat protocol deinit", 1,
+               chat_protocol_find("SILC"));
+    
+    silc_server_deinit();
+    silc_channels_deinit();
+    silc_queries_deinit();
+    
+    chat_protocol_unregister("SILC");
+    
+    g_source_remove(idletag);
+  }
+  
+  g_free(silc_client->username);
+  g_free(silc_client->realname);
+  silc_client_free(silc_client);
 }