X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-core.c;h=8b6f9f74ed50fc08326068ad805b09a3c27d86d0;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=26c6f379d338f99dec8e1cc9a8e1f39bc35c1039;hpb=56d41461f857007d8228dfc7b0025065c14b5696;p=silc.git

diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c
index 26c6f379..8b6f9f74 100644
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 - 2006 Pekka Riikonen
+  Copyright (C) 2001 - 2007 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
@@ -31,20 +31,26 @@
 #include "silc-nicklist.h"
 #include "silc-chatnets.h"
 #include "silc-cmdqueue.h"
+#include "silc-commands.h"
 
 #include "signals.h"
 #include "levels.h"
 #include "settings.h"
+#include "commands.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"
 
+#ifndef SILC_PLUGIN
 /* Command line option variables */
 static char *opt_pkcs = NULL;
 static int opt_bits = 0;
+#else
+static int init_failed = 0;
+#endif
 
-static int idletag = -1;
+static int running = 0;
 
 /* SILC Client */
 SilcClient silc_client = NULL;
@@ -66,10 +72,66 @@ void silc_expandos_deinit(void);
 void silc_lag_init(void);
 void silc_lag_deinit(void);
 
-static int my_silc_scheduler(void)
+#ifdef SILC_PLUGIN
+void silc_core_deinit(void);
+#endif
+
+static gboolean my_silc_scheduler(gpointer data)
 {
+  SILC_LOG_DEBUG(("Timeout"));
   silc_client_run_one(silc_client);
-  return 1;
+  return FALSE;
+}
+
+static gboolean my_silc_scheduler_fd(GIOChannel *source,
+                                     GIOCondition condition,
+                                     gpointer data)
+{
+  SILC_LOG_DEBUG(("I/O event, %d", SILC_PTR_TO_32(data)));
+  silc_client_run_one(silc_client);
+  return TRUE;
+}
+
+static void scheduler_notify_cb(SilcSchedule schedule,
+				SilcBool added, SilcTask task,
+				SilcBool fd_task, SilcUInt32 fd,
+				SilcTaskEvent event,
+				long seconds, long useconds,
+				void *context)
+{
+  if (added) {
+    if (fd_task) {
+      /* Add fd */
+      GIOChannel *ch;
+      guint e = 0;
+
+      SILC_LOG_DEBUG(("Add fd %d, events %d", fd, event));
+      g_source_remove_by_user_data(SILC_32_TO_PTR(fd));
+
+      if (event & SILC_TASK_READ)
+        e |= (G_IO_IN | G_IO_PRI | G_IO_HUP | G_IO_ERR);
+      if (event & SILC_TASK_WRITE)
+        e |= (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL);
+
+      if (e) {
+	ch = g_io_channel_unix_new(fd);
+	g_io_add_watch(ch, e, my_silc_scheduler_fd, SILC_32_TO_PTR(fd));
+	g_io_channel_unref(ch);
+      }
+    } else {
+      /* Add timeout */
+      guint t;
+
+      t = (seconds * 1000) + (useconds / 1000);
+      SILC_LOG_DEBUG(("interval %d msec", t));
+      g_timeout_add(t, my_silc_scheduler, NULL);
+    }
+  } else {
+    if (fd_task) {
+      /* Remove fd */
+      g_source_remove_by_user_data(SILC_32_TO_PTR(fd));
+    }
+  }
 }
 
 static CHATNET_REC *create_chatnet(void)
@@ -169,8 +231,11 @@ static void silc_init_userinfo(void)
   }
 }
 
-#ifdef SILC_DEBUG
+#if defined(SILC_DEBUG) || defined(SILC_PLUGIN)
 static bool i_debug;
+#endif
+
+#ifdef SILC_DEBUG
 static bool silc_irssi_debug_print(char *file, char *function, int line,
 				   char *message, void *context)
 {
@@ -216,14 +281,6 @@ static bool silc_log_stderr(SilcLogType type, char *message, void *context)
   return TRUE;
 }
 
-static void silc_nickname_format_parse(const char *nickname,
-				       char **ret_nickname)
-{
-  char nick[128 + 1];
-  silc_parse_userfqdn(nickname, nick, sizeof(nick), NULL, 0);
-  *ret_nickname = strdup(nick);
-}
-
 static void silc_register_cipher(SilcClient client, const char *cipher)
 {
   int i;
@@ -237,7 +294,12 @@ static void silc_register_cipher(SilcClient client, const char *cipher)
 
     if (!silc_cipher_is_supported(cipher)) {
       SILC_LOG_ERROR(("Unknown cipher `%s'", cipher));
+#ifdef SILC_PLUGIN
+      init_failed = -1;
+      return;
+#else
       exit(1);
+#endif
     }
   }
 
@@ -258,7 +320,12 @@ static void silc_register_hash(SilcClient client, const char *hash)
 
     if (!silc_hash_is_supported(hash)) {
       SILC_LOG_ERROR(("Unknown hash function `%s'", hash));
+#ifdef SILC_PLUGIN
+      init_failed = -1;
+      return;
+#else
       exit(1);
+#endif
     }
   }
 
@@ -279,7 +346,12 @@ static void silc_register_hmac(SilcClient client, const char *hmac)
 
     if (!silc_hmac_is_supported(hmac)) {
       SILC_LOG_ERROR(("Unknown HMAC `%s'", hmac));
+#ifdef SILC_PLUGIN
+      init_failed = -1;
+      return;
+#else
       exit(1);
+#endif
     }
   }
 
@@ -289,59 +361,179 @@ static void silc_register_hmac(SilcClient client, const char *hmac)
 
 /* Finalize init. Init finish signal calls this. */
 
+#ifdef SILC_PLUGIN
+#define FUNCTION_EXIT goto out
+void silc_opt_callback(const char *data, SERVER_REC *server,
+			WI_ITEM_REC *item)
+#else
+#define FUNCTION_EXIT exit(0)
 void silc_opt_callback(poptContext con,
 		       enum poptCallbackReason reason,
 		       const struct poptOption *opt,
 		       const char *arg, void *data)
+#endif
 {
+#ifdef SILC_PLUGIN
+  unsigned char **argv=NULL, *tmp;
+  SilcUInt32 *argv_lens=NULL, *argv_types=NULL, argc=0;
+  int i;
+  unsigned char privkey[128], pubkey[128];
+
+  memset(privkey, 0, sizeof(privkey));
+  memset(pubkey, 0, sizeof(pubkey));
+  snprintf(pubkey, sizeof(pubkey) - 1, "%s/%s", get_irssi_dir(),
+	   SILC_CLIENT_PUBLIC_KEY_NAME);
+  snprintf(privkey, sizeof(privkey) - 1, "%s/%s", get_irssi_dir(),
+	   SILC_CLIENT_PRIVATE_KEY_NAME);
+
+  tmp = g_strconcat("SILC", " ", data, NULL);
+  silc_parse_command_line(tmp, &argv, &argv_lens, &argv_types, &argc, 6);
+  g_free(tmp);
+
+  if (argc < 2)
+    goto err;
+#else
   if (strcmp(opt->longName, "nick") == 0) {
     g_free(opt_nickname);
     opt_nickname = g_strdup(arg);
   }
 
   if (strcmp(opt->longName, "hostname") == 0) {
-    g_free(opt_hostname);
-    opt_hostname = g_strdup(arg);
+    silc_free(opt_hostname);
+    opt_hostname = strdup(arg);
   }
+#endif
 
+#ifdef SILC_PLUGIN
+  if ((argc == 2) && (strcasecmp(argv[1], "list-ciphers") == 0)) {
+#else
   if (strcmp(opt->longName, "list-ciphers") == 0) {
     silc_cipher_register_default();
+#endif
     silc_client_list_ciphers();
-    exit(0);
+    FUNCTION_EXIT;
   }
 
+#ifdef SILC_PLUGIN
+  if ((argc == 2) && (strcasecmp(argv[1], "list-hash-funcs") == 0)) {
+#else
   if (strcmp(opt->longName, "list-hash-funcs") == 0) {
     silc_hash_register_default();
+#endif
     silc_client_list_hash_funcs();
-    exit(0);
+    FUNCTION_EXIT;
   }
 
+#ifdef SILC_PLUGIN
+  if ((argc == 2) && (strcasecmp(argv[1], "list-hmacs") == 0)) {
+#else
   if (strcmp(opt->longName, "list-hmacs") == 0) {
     silc_hmac_register_default();
+#endif
     silc_client_list_hmacs();
-    exit(0);
+    FUNCTION_EXIT;
   }
 
+#ifdef SILC_PLUGIN
+  if ((argc == 2) && (strcasecmp(argv[1], "list-pkcs") == 0)) {
+#else
   if (strcmp(opt->longName, "list-pkcs") == 0) {
     silc_pkcs_register_default();
+#endif
     silc_client_list_pkcs();
-    exit(0);
+    FUNCTION_EXIT;
   }
 
+#ifdef SILC_PLUGIN
+  if ((argc < 5) && (strcasecmp(argv[1], "debug") == 0)) {
+#else
   if (strcmp(opt->longName, "debug") == 0) {
     silc_log_debug(TRUE);
     silc_log_debug_hexdump(TRUE);
     silc_log_set_debug_string(arg);
+#endif
+#ifdef SILC_PLUGIN
+    if (argc == 2) {
+      printformat_module("fe-common/silc", NULL, NULL,
+		         MSGLEVEL_CRAP, SILCTXT_CONFIG_DEBUG,
+			 (i_debug == TRUE ? "enabled" : "disabled"));
+      goto out;
+    }
+#endif
 #ifndef SILC_DEBUG
+#ifdef SILC_PLUGIN
+    printformat_module("fe-common/silc", NULL, NULL,
+		       MSGLEVEL_CRAP, SILCTXT_CONFIG_NODEBUG);
+#else
     fprintf(stdout,
 	    "Run-time debugging is not enabled. To enable it recompile\n"
 	    "the client with --enable-debug configuration option.\n");
     sleep(1);
+#endif
+#else
+#ifdef SILC_PLUGIN
+    if (strcasecmp(argv[2], "on") == 0) {
+      settings_set_bool("debug", TRUE);
+      if (argc == 4)
+	 settings_set_str("debug_string", argv[3]);
+    } else if ((argc == 3) && (strcasecmp(argv[2], "off") == 0)) {
+      settings_set_bool("debug", FALSE);
+    } else
+      goto err;
+    sig_setup_changed();
+    printformat_module("fe-common/silc", NULL, NULL,
+		       MSGLEVEL_CRAP, SILCTXT_CONFIG_DEBUG,
+		       (settings_get_bool("debug") == TRUE ?
+			"enabled" : "disabled"));
+    goto out;
+#endif
 #endif
   }
 
+#ifdef SILC_PLUGIN
+  if (strcasecmp(argv[1], "create-key-pair") == 0) {
+#else
   if (strcmp(opt->longName, "create-key-pair") == 0) {
+#endif
     /* Create new key pair and exit */
+#ifdef SILC_PLUGIN
+    char *endptr, *pkcs=NULL;
+    long int val;
+    int bits=0;
+    CREATE_KEY_REC *rec;
+
+    if ((argc == 3) || (argc == 5))
+      goto err;
+
+    for (i=2; i<argc-1; i+=2)
+      if (strcasecmp(argv[i], "-pkcs") == 0) {
+	if (pkcs == NULL)
+	  pkcs = argv[i+1];
+	else
+	  goto err;
+      } else if (strcasecmp(argv[i], "-bits") == 0) {
+	if (bits == 0) {
+	  val = strtol(argv[i+1], &endptr, 10);
+	  if ((*endptr != '\0') || (val <= 0) || (val >= INT_MAX))
+	    goto err;
+          bits = val;
+	} else
+	  goto err;
+      } else
+	goto err;
+
+    rec = g_new0(CREATE_KEY_REC, 1);
+    rec->pkcs = (pkcs == NULL ? NULL : g_strdup(pkcs));
+    rec->bits = bits;
+
+    keyboard_entry_redirect((SIGNAL_FUNC) create_key_passphrase,
+		    	    format_get_text("fe-common/silc", NULL, NULL,
+				    	    NULL, SILCTXT_CONFIG_PASS_ASK2),
+			    ENTRY_REDIRECT_FLAG_HIDDEN, rec);
+    printformat_module("fe-common/silc", NULL, NULL,
+		       MSGLEVEL_CRAP, SILCTXT_CONFIG_NEXTTIME);
+    goto out;
+#else
     silc_cipher_register_default();
     silc_pkcs_register_default();
     silc_hash_register_default();
@@ -349,18 +541,37 @@ void silc_opt_callback(poptContext con,
     silc_create_key_pair(opt_pkcs, opt_bits, NULL, NULL,
 			 NULL, NULL, NULL, NULL, TRUE);
     exit(0);
+#endif
   }
 
+#ifdef SILC_PLUGIN
+  if ((argc < 4) && (strcasecmp(argv[1], "passphrase-change") == 0)) {
+#else
   if (strcmp(opt->longName, "passphrase-change") == 0) {
+#endif
     /* Change the passphrase of the private key file */
+#ifdef SILC_PLUGIN
+    CREATE_KEY_REC *rec;
+
+    rec = g_new0(CREATE_KEY_REC, 1);
+    rec->file = g_strdup((argc == 3 ? argv[2] : privkey));
+
+    keyboard_entry_redirect((SIGNAL_FUNC) change_private_key_passphrase,
+		    	    format_get_text("fe-common/silc", NULL, NULL,
+				    	    NULL, SILCTXT_CONFIG_PASS_ASK1),
+			    ENTRY_REDIRECT_FLAG_HIDDEN, rec);
+    goto out;
+#else
     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);
+#endif
   }
 
+#ifndef SILC_PLUGIN
   if (strcmp(opt->longName, "show-key") == 0) {
     /* Dump the key */
     silc_cipher_register_default();
@@ -370,21 +581,31 @@ void silc_opt_callback(poptContext con,
     silc_show_public_key_file((char *)arg);
     exit(0);
   }
+#endif
+
+#ifdef SILC_PLUGIN
+err:
+  printformat_module("fe-common/silc", NULL, NULL,
+		     MSGLEVEL_CRAP, SILCTXT_CONFIG_UNKNOWN,
+		     data);
+
+out:
+  for (i=0; i<argc; i++)
+    silc_free(argv[i]);
+
+  silc_free(argv);
+  silc_free(argv_lens);
+  silc_free(argv_types);
+#endif
 }
+#undef FUNCTION_EXIT
 
 /* Called to indicate the client library has stopped. */
-
 static void
 silc_stopped(SilcClient client, void *context)
 {
   SILC_LOG_DEBUG(("Client library has stopped"));
-  if (idletag != -1)
-    g_source_remove(idletag);
-}
-
-static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
-{
-  silc_client_stop(silc_client, silc_stopped, NULL);
+  *(int*)context = -1;
 }
 
 /* Called to indicate the client library is running. */
@@ -392,6 +613,7 @@ static void sig_gui_quit(SILC_SERVER_REC *server, const char *msg)
 static void
 silc_running(SilcClient client, void *context)
 {
+  running = 1;
   SILC_LOG_DEBUG(("Client library is running"));
 }
 
@@ -399,27 +621,42 @@ static void sig_init_finished(void)
 {
   /* Check ~/.silc directory and public and private keys */
   if (!silc_client_check_silc_dir()) {
+#ifdef SILC_PLUGIN
+    init_failed = -1;
+#else
     sleep(1);
     exit(1);
+#endif
     return;
   }
 
   /* Load public and private key */
   if (!silc_client_load_keys(silc_client)) {
+#ifdef SILC_PLUGIN
+    init_failed = -1;
+#else
     sleep(1);
     exit(1);
+#endif
     return;
   }
 
   /* Initialize the SILC client */
+  opt_hostname = (opt_hostname ? opt_hostname : silc_net_localhost());
   if (!silc_client_init(silc_client, settings_get_str("user_name"),
-			opt_hostname ? opt_hostname : silc_net_localhost(),
-			settings_get_str("real_name"), silc_running, NULL)) {
+			opt_hostname, settings_get_str("real_name"),
+			silc_running, NULL)) {
+#ifdef SILC_PLUGIN
+    init_failed = -1;
+#else
     sleep(1);
     exit(1);
+#endif
     return;
   }
 
+  silc_schedule_set_notify(silc_client->schedule, scheduler_notify_cb, NULL);
+
   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);
@@ -427,14 +664,15 @@ static void sig_init_finished(void)
 
   silc_hash_alloc("sha1", &sha1hash);
 
-  /* register SILC scheduler */
-  idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+  /* Run SILC scheduler */
+  my_silc_scheduler(NULL);
 }
 
 /* Init SILC. Called from src/fe-text/silc.c */
 
 void silc_core_init(void)
 {
+#ifndef SILC_PLUGIN
   static struct poptOption silc_options[] = {
     { NULL, '\0', POPT_ARG_CALLBACK, (void *)&silc_opt_callback, '\0', NULL },
     { "list-ciphers", 0, POPT_ARG_NONE, NULL, 0,
@@ -461,16 +699,21 @@ void silc_core_init(void)
       "Show the contents of the public key", "FILE" },
     { NULL, '\0', 0, NULL }
   };
+#endif
 
   CHAT_PROTOCOL_REC *rec;
   SilcClientParams params;
   const char *def_cipher, *def_hash, *def_hmac;
 
+#ifndef SILC_PLUGIN
   args_register(silc_options);
+#endif
 
   /* Settings */
+#ifndef SILC_PLUGIN
   settings_add_bool("server", "skip_motd", FALSE);
   settings_add_str("server", "alternate_nick", NULL);
+#endif
   settings_add_bool("server", "use_auto_addr", FALSE);
   settings_add_str("server", "auto_bind_ip", "");
   settings_add_str("server", "auto_public_ip", "");
@@ -481,12 +724,12 @@ 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_bool("server", "key_exchange_rekey_pfs", FALSE);
-  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");
   settings_add_bool("server", "sign_channel_messages", FALSE);
   settings_add_bool("server", "sign_private_messages", FALSE);
+  settings_add_str("silc", "nickname_format", "%n#%a");
 
   /* Requested Attributes settings */
   settings_add_bool("silc", "attr_allow", TRUE);
@@ -508,8 +751,14 @@ void silc_core_init(void)
 #endif
 
   signal_add("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+#ifndef SILC_PLUGIN
   signal_add("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
-  signal_add("gui exit", (SIGNAL_FUNC) sig_gui_quit);
+#endif
+
+#if defined (SILC_PLUGIN) && defined (SILC_DEBUG)
+  if (settings_get_bool("debug") == TRUE)
+    sig_setup_changed();
+#endif
 
   silc_init_userinfo();
 
@@ -520,9 +769,8 @@ void silc_core_init(void)
 
   /* Initialize client parameters */
   memset(&params, 0, sizeof(params));
-  strcat(params.nickname_format, "%n@%h%a");
-  params.nickname_parse = silc_nickname_format_parse;
-  params.connauth_request_secs = settings_get_int("connauth_request_secs");
+  strcat(params.nickname_format, settings_get_str("nickname_format"));
+  params.full_channel_names = TRUE;
 
   /* Allocate SILC client */
   silc_client = silc_client_alloc(&ops, &params, NULL, silc_version_string);
@@ -532,10 +780,26 @@ void silc_core_init(void)
   def_hash = settings_get_str("crypto_default_hash");
   def_hmac = settings_get_str("crypto_default_hmac");
   silc_register_cipher(silc_client, def_cipher);
+#ifdef SILC_PLUGIN
+  if (init_failed)
+    return;
+#endif
   silc_register_hash(silc_client, def_hash);
+#ifdef SILC_PLUGIN
+  if (init_failed)
+    return;
+#endif
   silc_register_hmac(silc_client, def_hmac);
+#ifdef SILC_PLUGIN
+  if (init_failed)
+    return;
+#endif
   silc_pkcs_register_default();
 
+#ifdef SILC_PLUGIN
+  command_bind("silc", MODULE_NAME, (SIGNAL_FUNC) silc_opt_callback);
+#endif
+
   /* Register SILC to the irssi */
   rec = g_new0(CHAT_PROTOCOL_REC, 1);
   rec->name = "SILC";
@@ -565,6 +829,14 @@ void silc_core_init(void)
   silc_lag_init();
   silc_chatnets_init();
 
+#ifdef SILC_PLUGIN
+  sig_init_finished();
+  if (init_failed) {
+    silc_core_deinit();
+    return;
+  }
+#endif
+
   module_register("silc", "core");
 }
 
@@ -572,14 +844,28 @@ void silc_core_init(void)
 
 void silc_core_deinit(void)
 {
-  if (idletag != -1)
-    g_source_remove(idletag);
+  if (running) {
+    volatile int stopped = 0;
+    silc_client_stop(silc_client, silc_stopped, (void *)&stopped);
+    while (!stopped)
+      silc_client_run_one(silc_client);
+  }
+
+  if (opt_hostname)
+    silc_free(opt_hostname);
+  if (opt_nickname)
+    g_free(opt_nickname);
 
-  signal_emit("chat protocol deinit", 1,
-      	chat_protocol_find("SILC"));
   signal_remove("setup changed", (SIGNAL_FUNC) sig_setup_changed);
+#ifdef SILC_PLUGIN
+  command_unbind("silc", (SIGNAL_FUNC) silc_opt_callback);
+#else
   signal_remove("irssi init finished", (SIGNAL_FUNC) sig_init_finished);
-  signal_remove("gui exit", (SIGNAL_FUNC) sig_gui_quit);
+#endif
+
+  signal_emit("chat protocol deinit", 1, chat_protocol_find("SILC"));
+
+  silc_hash_free(sha1hash);
 
   silc_queue_deinit();
   silc_server_deinit();
@@ -591,7 +877,9 @@ void silc_core_deinit(void)
 
   chat_protocol_unregister("SILC");
 
-  silc_pkcs_private_key_free(irssi_privkey);
-  silc_pkcs_public_key_free(irssi_pubkey);
+  if (irssi_pubkey)
+    silc_pkcs_public_key_free(irssi_pubkey);
+  if (irssi_privkey)
+    silc_pkcs_private_key_free(irssi_privkey);
   silc_client_free(silc_client);
 }