X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-core.c;h=421fe6fc5874bd4ef432666f32c78bf229c94d53;hb=413da0f8686910f5e627393157566ae729ca99c4;hp=a58a1ec3a2d9e92b8ec75899bcd7a7de2459887b;hpb=030955992dd0663ddb907a06fd92af62afb9a015;p=silc.git

diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c
index a58a1ec3..421fe6fc 100644
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -29,7 +29,6 @@
 #include "silc-channels.h"
 #include "silc-queries.h"
 #include "silc-nicklist.h"
-#include "silcversion.h"
 
 #include "signals.h"
 #include "levels.h"
@@ -40,7 +39,6 @@
 #include "fe-common/silc/module-formats.h"
 
 /* Command line option variables */
-static bool opt_create_keypair = FALSE;
 static char *opt_pkcs = NULL;
 static int opt_bits = 0;
 
@@ -54,6 +52,9 @@ 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);
@@ -100,7 +101,7 @@ static void silc_init_userinfo(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 */
@@ -110,8 +111,8 @@ static void silc_init_userinfo(void)
     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");
   }
 
@@ -129,12 +130,7 @@ static void silc_init_userinfo(void)
   /* 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);
   }
@@ -150,11 +146,41 @@ static void silc_init_userinfo(void)
   }
 }
 
+#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;
+}
+#endif
+
+static void sig_setup_changed(void)
+{
+#ifdef SILC_DEBUG
+  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;
 }
 
@@ -171,7 +197,7 @@ static void silc_register_cipher(SilcClient client, const char *cipher)
   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;
       }
     
@@ -192,7 +218,7 @@ static void silc_register_hash(SilcClient client, const char *hash)
   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;
       }
     
@@ -213,7 +239,7 @@ static void silc_register_hmac(SilcClient client, const char *hmac)
   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;
       }
     
@@ -234,16 +260,6 @@ void silc_opt_callback(poptContext con,
 		       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, "list-ciphers") == 0) {
     silc_cipher_register_default();
     silc_client_list_ciphers();
@@ -272,10 +288,6 @@ void silc_opt_callback(poptContext con,
     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"
@@ -283,51 +295,88 @@ void silc_opt_callback(poptContext con,
     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();
     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()) {
+    idletag = -1;
+    exit(1);
+  }
+
+  /* Load public and private key */
+  if (!silc_client_load_keys(silc_client)) {
+    idletag = -1;
+    exit(1);
+  }
+
+  /* Initialize the SILC client */
+  if (!silc_client_init(silc_client)) {
+    idletag = -1;
+    exit(1);
+  }
+}
+
 /* 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-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 },
+#ifdef SILC_DEBUG
     { "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,
+#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", "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" },
+    { "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 }
   };
 
@@ -335,8 +384,7 @@ void silc_core_init(void)
   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);
@@ -351,6 +399,30 @@ void silc_core_init(void)
   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);
+  settings_add_int("server", "heartbeat", 300);
+  settings_add_bool("server", "ignore_message_signatures", FALSE);
+
+  /* Requested Attributes settings */
+  settings_add_bool("silc", "attr_allow", TRUE);
+  settings_add_str("silc", "attr_vcard", "");
+  settings_add_str("silc", "attr_services", "");
+  settings_add_str("silc", "attr_status_mood", "NORMAL");
+  settings_add_str("silc", "attr_status_text", "");
+  settings_add_str("silc", "attr_status_message", NULL);
+  settings_add_str("silc", "attr_preferred_language", "");
+  settings_add_str("silc", "attr_preferred_contact", "CHAT");
+  settings_add_bool("silc", "attr_timezone", TRUE);
+  settings_add_str("silc", "attr_geolocation", "");
+  settings_add_str("silc", "attr_device_info", NULL);
+  settings_add_str("silc", "attr_public_keys", "");
+
+#ifdef SILC_DEBUG
+  settings_add_bool("debug", "debug", FALSE);
+  settings_add_str("debug", "debug_string", "");
+#endif
+
+  signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+  signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
 
   silc_init_userinfo();
 
@@ -379,23 +451,10 @@ void silc_core_init(void)
   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);
+  silc_log_set_callback(SILC_LOG_FATAL, silc_log_misc, NULL);
 
   /* Register SILC to the irssi */
   rec = g_new0(CHAT_PROTOCOL_REC, 1);
@@ -407,9 +466,10 @@ void silc_core_init(void)
   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))
+  rec->server_init_connect = silc_server_init_connect; 
+  rec->server_connect = silc_server_connect;
+  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;
@@ -421,6 +481,7 @@ void silc_core_init(void)
   silc_channels_init();
   silc_queries_init();
   silc_expandos_init();
+  silc_lag_init();
 
   idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
 
@@ -434,11 +495,14 @@ 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);
+    signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
+
     silc_server_deinit();
     silc_channels_deinit();
     silc_queries_deinit();
     silc_expandos_deinit();
+    silc_lag_deinit();
     
     chat_protocol_unregister("SILC");
     
@@ -447,5 +511,9 @@ void silc_core_deinit(void)
   
   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);
 }