X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2Fsilc-channels.c;h=1952eb90acbcc9bd4bed1b888c62654d75fa45bc;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=da14bcdd5e1aee79c7bca1a41845cfd56c6ff3ec;hpb=5abf57fab042a9f9e4ea497cea5cdf6bb170ef62;p=silc.git

diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c
index da14bcdd..1952eb90 100644
--- a/apps/irssi/src/silc/core/silc-channels.c
+++ b/apps/irssi/src/silc/core/silc-channels.c
@@ -75,22 +75,16 @@ static void sig_channel_destroyed(SILC_CHANNEL_REC *channel)
 static void silc_channels_join(SILC_SERVER_REC *server,
 			       const char *channels, int automatic)
 {
-  char **list, **tmp, *channel;
+  char **list, **tmp;
   SILC_CHANNEL_REC *chanrec;
 
   list = g_strsplit(channels, ",", -1);
   for (tmp = list; *tmp != NULL; tmp++) {
-    channel = **tmp == '#' ? g_strdup(*tmp) :
-      g_strconcat("#", *tmp, NULL);
-
-    chanrec = silc_channel_find(server, channel);
-    if (chanrec) {
-      g_free(channel);
+    chanrec = silc_channel_find(server, *tmp);
+    if (chanrec)
       continue;
-    }
 
-    silc_command_exec(server, "JOIN", channel);
-    g_free(channel);
+    silc_command_exec(server, "JOIN", *tmp);
   }
 
   g_strfreev(list);
@@ -111,9 +105,7 @@ static void sig_server_quit(SILC_SERVER_REC *server, const char *msg)
     silc_command_exec(server, "QUIT", msg);
 }
 
-/*
- * "event join". Joined to a channel.
- */
+/* Find Irssi channel entry by SILC channel entry */
 
 SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
 					  SilcChannelEntry entry)
@@ -132,415 +124,6 @@ SILC_CHANNEL_REC *silc_channel_find_entry(SILC_SERVER_REC *server,
   return NULL;
 }
 
-static void event_join(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  SILC_NICK_REC *nickrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  char userhost[256];
-
-  client = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-
-  if (client == server->conn->local_entry) {
-    /* You joined to channel */
-    chanrec = silc_channel_find(server, channel->channel_name);
-    if (chanrec != NULL && !chanrec->joined)
-      chanrec->entry = channel;
-  } else {
-    chanrec = silc_channel_find_entry(server, channel);
-    if (chanrec != NULL) {
-      SilcChannelUser user;
-
-      silc_list_start(chanrec->entry->clients);
-      while ((user = silc_list_get(chanrec->entry->clients)) != NULL)
-	if (user->client == client) {
-	  nickrec = silc_nicklist_insert(chanrec, user, TRUE);
-	  break;
-	}
-    }
-  }
-
-  memset(userhost, 0, sizeof(userhost));
-  if (client->username)
-    snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	     client->username, client->hostname);
-  signal_emit("message join", 4, server, channel->channel_name,
-	      client->nickname,
-	      client->username == NULL ? "" : userhost);
-}
-
-/*
- * "event leave". Left a channel.
- */
-
-static void event_leave(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  SILC_NICK_REC *nickrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  char userhost[256];
-
-  client = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-
-  memset(userhost, 0, sizeof(userhost));
-  if (client->username)
-    snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	     client->username, client->hostname);
-  signal_emit("message part", 5, server, channel->channel_name,
-	      client->nickname,  client->username ?  userhost : "", 
-	      client->nickname);
-
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    nickrec = silc_nicklist_find(chanrec, client);
-    if (nickrec != NULL)
-      nicklist_remove(CHANNEL(chanrec), NICK(nickrec));
-  }
-}
-
-/*
- * "event signoff". Left the network.
- */
-
-static void event_signoff(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientEntry client;
-  GSList *nicks, *tmp;
-  char *message;
-  char userhost[256];
-
-  client = va_arg(va, SilcClientEntry);
-  message = va_arg(va, char *);
-
-  silc_server_free_ftp(server, client);
-
-  memset(userhost, 0, sizeof(userhost));
-  if (client->username)
-    snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	     client->username, client->hostname);
-  signal_emit("message quit", 4, server, client->nickname,
-	      client->username ? userhost : "", 
-	      message ? message : "");
-
-  nicks = nicklist_get_same_unique(SERVER(server), client);
-  for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
-    CHANNEL_REC *channel = tmp->data;
-    NICK_REC *nickrec = tmp->next->data;
-    
-    nicklist_remove(channel, nickrec);
-  }
-}
-
-/*
- * "event topic". Changed topic.
- */
-
-static void event_topic(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  char *topic;
-  char userhost[256];
-
-  client = va_arg(va, SilcClientEntry);
-  topic = va_arg(va, char *);
-  channel = va_arg(va, SilcChannelEntry);
-
-  silc_server_free_ftp(server, client);
-
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    g_free_not_null(chanrec->topic);
-    chanrec->topic = *topic == '\0' ? NULL : g_strdup(topic);
-    signal_emit("channel topic changed", 1, chanrec);
-  }
-
-  memset(userhost, 0, sizeof(userhost));
-  snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	   client->username, client->hostname);
-  signal_emit("message topic", 5, server, channel->channel_name,
-	      topic, client->nickname, userhost);
-}
-
-/*
- * "event invite". Invited or modified invite list.
- */
-
-static void event_invite(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientEntry client;
-  SilcChannelEntry channel;
-  char *channel_name;
-  char userhost[256];
-  
-  channel = va_arg(va, SilcChannelEntry);
-  channel_name = va_arg(va, char *);
-  client = va_arg(va, SilcClientEntry);
-
-  memset(userhost, 0, sizeof(userhost));
-  snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	   client->username, client->hostname);
-  signal_emit("message invite", 4, server, channel ? channel->channel_name :
-	      channel_name, client->nickname, userhost);
-}
-
-/*
- * "event nick". Changed nickname.
- */
-
-static void event_nick(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientEntry oldclient, newclient;
-  char userhost[256];
-
-  oldclient = va_arg(va, SilcClientEntry);
-  newclient = va_arg(va, SilcClientEntry);
-
-  nicklist_rename_unique(SERVER(server),
-			 oldclient, oldclient->nickname,
-			 newclient, newclient->nickname);
-
-  memset(userhost, 0, sizeof(userhost));
-  snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	   newclient->username, newclient->hostname);
-  signal_emit("message nick", 4, server, newclient->nickname, 
-	      oldclient->nickname, userhost);
-}
-
-/*
- * "event cmode". Changed channel mode.
- */
-
-static void event_cmode(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  void *entry;
-  SilcClientEntry client;
-  SilcServerEntry server_entry;
-  SilcChannelEntry channel;
-  char *mode;
-  uint32 modei;
-  SilcIdType idtype;
-
-  idtype = va_arg(va, int);
-  entry = va_arg(va, void *);
-  modei = va_arg(va, uint32);
-  (void)va_arg(va, char *);
-  (void)va_arg(va, char *);
-  channel = va_arg(va, SilcChannelEntry);
-
-  mode = silc_client_chmode(modei, 
-			    channel->channel_key->cipher->name,
-			    silc_hmac_get_name(channel->hmac));
-  
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    g_free_not_null(chanrec->mode);
-    chanrec->mode = g_strdup(mode == NULL ? "" : mode);
-    signal_emit("channel mode changed", 1, chanrec);
-  }
-  
-  if (idtype == SILC_ID_CLIENT) {
-    client = (SilcClientEntry)entry;
-    printformat_module("fe-common/silc", server, channel->channel_name,
-		       MSGLEVEL_MODES, SILCTXT_CHANNEL_CMODE,
-		       channel->channel_name, mode ? mode : "removed all",
-		       client->nickname);
-  } else {
-    server_entry = (SilcServerEntry)entry;
-    printformat_module("fe-common/silc", server, channel->channel_name,
-		       MSGLEVEL_MODES, SILCTXT_CHANNEL_CMODE,
-		       channel->channel_name, mode ? mode : "removed all",
-		       server_entry->server_name);
-  }
-  
-  g_free(mode);
-}
-
-/*
- * "event cumode". Changed user's mode on channel.
- */
-
-static void event_cumode(SILC_SERVER_REC *server, va_list va)
-{
-  SILC_CHANNEL_REC *chanrec;
-  SilcClientEntry client, destclient;
-  SilcChannelEntry channel;
-  int mode;
-  char *modestr;
-  
-  client = va_arg(va, SilcClientEntry);
-  mode = va_arg(va, uint32);
-  destclient = va_arg(va, SilcClientEntry);
-  channel = va_arg(va, SilcChannelEntry);
-  
-  modestr = silc_client_chumode(mode);
-  chanrec = silc_channel_find_entry(server, channel);
-  if (chanrec != NULL) {
-    SILC_NICK_REC *nick;
-    
-    if (destclient == server->conn->local_entry) {
-      chanrec->chanop =
-	(mode & SILC_CHANNEL_UMODE_CHANOP) != 0;
-    }
-
-    nick = silc_nicklist_find(chanrec, destclient);
-    if (nick != NULL) {
-      nick->op = (mode & SILC_CHANNEL_UMODE_CHANOP) != 0;
-      nick->founder = (mode & SILC_CHANNEL_UMODE_CHANFO) != 0;
-      signal_emit("nick mode changed", 2, chanrec, nick);
-    }
-  }
-  
-  printformat_module("fe-common/silc", server, channel->channel_name,
-		     MSGLEVEL_MODES, SILCTXT_CHANNEL_CUMODE,
-		     channel->channel_name, destclient->nickname, 
-		     modestr ? modestr : "removed all",
-		     client->nickname);
-
-  if (mode & SILC_CHANNEL_UMODE_CHANFO)
-    printformat_module("fe-common/silc", 
-		       server, channel->channel_name, MSGLEVEL_CRAP,
-		       SILCTXT_CHANNEL_FOUNDER,
-		       channel->channel_name, destclient->nickname);
-
-  g_free(modestr);
-}
-
-/*
- * "event motd". Received MOTD.
- */
-
-static void event_motd(SILC_SERVER_REC *server, va_list va)
-{
-  char *text = va_arg(va, char *);
-
-  if (!settings_get_bool("skip_motd"))
-    printtext_multiline(server, NULL, MSGLEVEL_CRAP, "%s", text);
-}
-
-/*
- * "event channel_change". Channel ID has changed.
- */
-
-static void event_channel_change(SILC_SERVER_REC *server, va_list va)
-{
-  /* Nothing interesting to do */
-}
-
-/*
- * "event server_signoff". Server has quit the network.
- */
-
-static void event_server_signoff(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientEntry *clients;
-  uint32 clients_count;
-  int i;
-  char userhost[256];
-  
-  (void)va_arg(va, void *);
-  clients = va_arg(va, SilcClientEntry *);
-  clients_count = va_arg(va, uint32);
-  
-  for (i = 0; i < clients_count; i++) {
-    GSList *nicks, *tmp;
-
-    memset(userhost, 0, sizeof(userhost));
-    if (clients[i]->username)
-      snprintf(userhost, sizeof(userhost) - 1, "%s@%s",
-	       clients[i]->username, clients[i]->hostname);
-    signal_emit("message quit", 4, server, clients[i]->nickname,
-		clients[i]->username ? userhost : "", 
-		"server signoff");
-
-    nicks = nicklist_get_same_unique(SERVER(server), clients[i]);
-    for (tmp = nicks; tmp != NULL; tmp = tmp->next->next) {
-      CHANNEL_REC *channel = tmp->data;
-      NICK_REC *nickrec = tmp->next->data;
-      nicklist_remove(channel, nickrec);
-    }
-  }
-}
-
-/*
- * "event kick". Someone was kicked from channel.
- */
-
-static void event_kick(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientConnection conn = server->conn;
-  SilcClientEntry client_entry;
-  SilcChannelEntry channel_entry;
-  char *tmp;
-  SILC_CHANNEL_REC *chanrec;
-
-  client_entry = va_arg(va, SilcClientEntry);
-  tmp = va_arg(va, char *);
-  channel_entry = va_arg(va, SilcChannelEntry);
-
-  chanrec = silc_channel_find_entry(server, channel_entry);
-  
-  if (client_entry == conn->local_entry) {
-    printformat_module("fe-common/silc", server, channel_entry->channel_name,
-		       MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED_YOU, 
-		       channel_entry->channel_name, tmp ? tmp : "");
-    if (chanrec) {
-      chanrec->kicked = TRUE;
-      channel_destroy((CHANNEL_REC *)chanrec);
-    }
-  } else {
-    printformat_module("fe-common/silc", server, channel_entry->channel_name,
-		       MSGLEVEL_CRAP, SILCTXT_CHANNEL_KICKED, 
-		       client_entry->nickname,
-		       channel_entry->channel_name, tmp ? tmp : "");
-
-    if (chanrec) {
-      SILC_NICK_REC *nickrec = silc_nicklist_find(chanrec, client_entry);
-      if (nickrec != NULL)
-	nicklist_remove(CHANNEL(chanrec), NICK(nickrec));
-    }
-  }
-}
-
-/*
- * "event kill". Someone was killed from the network.
- */
-
-static void event_kill(SILC_SERVER_REC *server, va_list va)
-{
-  SilcClientConnection conn = server->conn;
-  SilcClientEntry client_entry;
-  char *tmp;
-
-  client_entry = va_arg(va, SilcClientEntry);
-  tmp = va_arg(va, char *);
-  
-  if (client_entry == conn->local_entry) {
-    printformat_module("fe-common/silc", server, NULL,
-		       MSGLEVEL_CRAP, SILCTXT_CHANNEL_KILLED_YOU, 
-		       tmp ? tmp : "");
-  } else {
-    GSList *nicks, *tmpn;
-    nicks = nicklist_get_same_unique(SERVER(server), client_entry);
-    for (tmpn = nicks; tmpn != NULL; tmpn = tmpn->next->next) {
-      CHANNEL_REC *channel = tmpn->data;
-      NICK_REC *nickrec = tmpn->next->data;
-      nicklist_remove(channel, nickrec);
-    }
-
-    printformat_module("fe-common/silc", server, NULL,
-		       MSGLEVEL_CRAP, SILCTXT_CHANNEL_KILLED, 
-		       client_entry->nickname,
-		       tmp ? tmp : "");
-  }
-}
-
 /* PART (LEAVE) command. */
 
 static void command_part(const char *data, SILC_SERVER_REC *server,
@@ -582,9 +165,9 @@ static void command_me(const char *data, SILC_SERVER_REC *server,
 {
   SILC_CHANNEL_REC *chanrec;
   char *tmpcmd = "ME", *tmp;
-  uint32 argc = 0;
+  SilcUInt32 argc = 0;
   unsigned char **argv;
-  uint32 *argv_lens, *argv_types;
+  SilcUInt32 *argv_lens, *argv_types;
   int i;
  
   if (!IS_SILC_SERVER(server) || !server->connected)
@@ -630,9 +213,9 @@ static void command_action(const char *data, SILC_SERVER_REC *server,
 {
   SILC_CHANNEL_REC *chanrec;
   char *tmpcmd = "ME", *tmp;
-  uint32 argc = 0;
+  SilcUInt32 argc = 0;
   unsigned char **argv;
-  uint32 *argv_lens, *argv_types;
+  SilcUInt32 *argv_lens, *argv_types;
   int i;
  
   if (!IS_SILC_SERVER(server) || !server->connected)
@@ -677,9 +260,9 @@ static void command_notice(const char *data, SILC_SERVER_REC *server,
 {
   SILC_CHANNEL_REC *chanrec;
   char *tmpcmd = "ME", *tmp;
-  uint32 argc = 0;
+  SilcUInt32 argc = 0;
   unsigned char **argv;
-  uint32 *argv_lens, *argv_types;
+  SilcUInt32 *argv_lens, *argv_types;
   int i;
  
   if (!IS_SILC_SERVER(server) || !server->connected)
@@ -805,6 +388,11 @@ static void keyagr_completion(SilcClient client,
 		       SILCTXT_KEY_AGREEMENT_TIMEOUT, client_entry->nickname);
     break;
     
+  case SILC_KEY_AGREEMENT_ABORTED:
+    printformat_module("fe-common/silc", i->server, NULL, MSGLEVEL_CRAP,
+		       SILCTXT_KEY_AGREEMENT_ABORTED, client_entry->nickname);
+    break;
+    
   default:
     break;
   } 
@@ -834,7 +422,7 @@ typedef struct {
 static void silc_client_command_key_get_clients(SilcClient client,
 						SilcClientConnection conn,
 						SilcClientEntry *clients,
-						uint32 clients_count,
+						SilcUInt32 clients_count,
 						void *context)
 {
   KeyGetClients internal = (KeyGetClients)context;
@@ -861,15 +449,15 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 {
   SilcClientConnection conn;
   SilcClientEntry *entrys, client_entry = NULL;
-  uint32 entry_count;
+  SilcUInt32 entry_count;
   SilcChannelEntry channel_entry = NULL;
   char *nickname = NULL, *tmp;
   int command = 0, port = 0, type = 0;
   char *hostname = NULL;
   KeyInternal internal = NULL;
-  uint32 argc = 0;
+  SilcUInt32 argc = 0;
   unsigned char **argv;
-  uint32 *argv_lens, *argv_types;
+  SilcUInt32 *argv_lens, *argv_types;
   char *bindhost = NULL;
  
   if (!server || !IS_SILC_SERVER(server) || !server->connected)
@@ -1017,7 +605,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
     } else if (type == 2) {
       /* Unset channel key(s) */
       SilcChannelPrivateKey *keys;
-      uint32 keys_count;
+      SilcUInt32 keys_count;
       int number;
 
       if (argc == 4)
@@ -1052,7 +640,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
     if (type == 1) {
       SilcPrivateMessageKeys keys;
-      uint32 keys_count;
+      SilcUInt32 keys_count;
       int k, i, len;
       char buf[1024];
 
@@ -1126,7 +714,7 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
 
     } else if (type == 2) {
       SilcChannelPrivateKey *keys;
-      uint32 keys_count;
+      SilcUInt32 keys_count;
       int k, i, len;
       char buf[1024];
 
@@ -1235,9 +823,11 @@ static void command_key(const char *data, SILC_SERVER_REC *server,
     printformat_module("fe-common/silc", server, NULL, MSGLEVEL_CRAP,
 		       SILCTXT_KEY_AGREEMENT, argv[2]);
     internal->responder = TRUE;
-    silc_client_send_key_agreement(silc_client, conn, client_entry, hostname, 
-    				   bindhost, port, 120, keyagr_completion, 
-    				   internal);
+    silc_client_send_key_agreement(
+			   silc_client, conn, client_entry, hostname, 
+			   bindhost, port, 
+			   settings_get_int("key_exchange_timeout_secs"), 
+			   keyagr_completion, internal);
     if (!hostname)
       silc_free(internal);
     goto out;
@@ -1271,20 +861,6 @@ void silc_channels_init(void)
   signal_add("server connected", (SIGNAL_FUNC) sig_connected);
   signal_add("server quit", (SIGNAL_FUNC) sig_server_quit);
 
-  signal_add("silc event join", (SIGNAL_FUNC) event_join);
-  signal_add("silc event leave", (SIGNAL_FUNC) event_leave);
-  signal_add("silc event signoff", (SIGNAL_FUNC) event_signoff);
-  signal_add("silc event topic", (SIGNAL_FUNC) event_topic);
-  signal_add("silc event invite", (SIGNAL_FUNC) event_invite);
-  signal_add("silc event nick", (SIGNAL_FUNC) event_nick);
-  signal_add("silc event cmode", (SIGNAL_FUNC) event_cmode);
-  signal_add("silc event cumode", (SIGNAL_FUNC) event_cumode);
-  signal_add("silc event motd", (SIGNAL_FUNC) event_motd);
-  signal_add("silc event channel_change", (SIGNAL_FUNC) event_channel_change);
-  signal_add("silc event server_signoff", (SIGNAL_FUNC) event_server_signoff);
-  signal_add("silc event kick", (SIGNAL_FUNC) event_kick);
-  signal_add("silc event kill", (SIGNAL_FUNC) event_kill);
-  
   command_bind("part", MODULE_NAME, (SIGNAL_FUNC) command_part);
   command_bind("me", MODULE_NAME, (SIGNAL_FUNC) command_me);
   command_bind("action", MODULE_NAME, (SIGNAL_FUNC) command_action);
@@ -1302,22 +878,6 @@ void silc_channels_deinit(void)
   signal_remove("server connected", (SIGNAL_FUNC) sig_connected);
   signal_remove("server quit", (SIGNAL_FUNC) sig_server_quit);
 
-  signal_remove("silc event join", (SIGNAL_FUNC) event_join);
-  signal_remove("silc event leave", (SIGNAL_FUNC) event_leave);
-  signal_remove("silc event signoff", (SIGNAL_FUNC) event_signoff);
-  signal_remove("silc event topic", (SIGNAL_FUNC) event_topic);
-  signal_remove("silc event invite", (SIGNAL_FUNC) event_invite);
-  signal_remove("silc event nick", (SIGNAL_FUNC) event_nick);
-  signal_remove("silc event cmode", (SIGNAL_FUNC) event_cmode);
-  signal_remove("silc event cumode", (SIGNAL_FUNC) event_cumode);
-  signal_remove("silc event motd", (SIGNAL_FUNC) event_motd);
-  signal_remove("silc event channel_change", 
-		(SIGNAL_FUNC) event_channel_change);
-  signal_remove("silc event server_signoff", 
-		(SIGNAL_FUNC) event_server_signoff);
-  signal_remove("silc event kick", (SIGNAL_FUNC) event_kick);
-  signal_remove("silc event kill", (SIGNAL_FUNC) event_kill);
-  
   command_unbind("part", (SIGNAL_FUNC) command_part);
   command_unbind("me", (SIGNAL_FUNC) command_me);
   command_unbind("action", (SIGNAL_FUNC) command_action);