X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIRCParser.c;h=220283e1408025789d54c1269c3900bbf8532e46;hb=406c308308e4d131475a692cd425cb156e0776f1;hp=b6fc71e8bffbf930c67f872dd691c7ffb256692e;hpb=a9e59c11deabf293b01fae73f4f3f2ca79800c5a;p=NeonServV5.git

diff --git a/src/IRCParser.c b/src/IRCParser.c
index b6fc71e..220283e 100644
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -1,4 +1,4 @@
-/* IRCParser.c - NeonServ v5.3
+/* IRCParser.c - NeonServ v5.4
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -214,7 +214,7 @@ static IRC_CMD(raw_join) {
         //request member list
         chan->chanbot = user;
         struct ChanUser *chanuser = addChanUser(chan, user); //it must be a bot
-        get_userlist_with_invisible(chan, got_channel_userlist, chanuser);
+        get_userlist_with_invisible(chan, 0, got_channel_userlist, chanuser);
         putsock(client, "MODE %s", chan->name);
         putsock(client, "MODE %s +b", chan->name);
     } else if(!isUserOnChan(user, chan) && ((chan->flags & CHANFLAG_RECEIVED_USERLIST) || isBot(user))) {
@@ -566,11 +566,17 @@ static IRC_CMD(raw_notice) {
     return 1;
 }
 
+static void client_renamed(struct ClientSocket *client);
+
 static IRC_CMD(raw_nick) {
     if(from == NULL || argc == 0) return 0;
     struct UserNode *user = getUserByMask(from);
     if(user == NULL) return 0;
-    if(!is_firstBotSeeUser(client, user)) return 1; //we ignore it - but it's not a parse error
+    if(isBot(user)) {
+        if(client->user != user) return 1;
+        client_renamed(client);
+    }
+    else if(!is_firstBotSeeUser(client, user)) return 1; //we ignore it - but it's not a parse error
     event_nick(user, argv[0]);
     renameUser(user, argv[0]);
     return 1;
@@ -684,9 +690,81 @@ static IRC_CMD(raw_332) {
     return 1;
 }
 
+struct ClientRenamePartedChannel {
+    char channel[CHANNELLEN+1];
+    struct ClientRenamePartedChannel *next;
+};
+
+static IRC_CMD(raw_437) { //can NOT change nick
+    struct ClientRenamePartedChannel *partedchan = malloc(sizeof(*partedchan));
+    strcpy(partedchan->channel, argv[1]);
+    if((client->flags & SOCKET_FLAG_CHANGENICK))
+        partedchan->next = client->changenick_channels;
+    else
+        partedchan->next = NULL;
+    client->changenick_channels = partedchan;
+    client->flags |= SOCKET_FLAG_CHANGENICK;
+    putsock(client, "PART %s", argv[1]);
+    putsock(client, "NICK %s", client->nick);
+    return 1;
+}
+
+static void client_renamed(struct ClientSocket *client) {
+    if((client->flags & SOCKET_FLAG_CHANGENICK)) {
+        struct ClientRenamePartedChannel *partedchan, *nextchan;
+        for(partedchan = client->changenick_channels; partedchan; partedchan = nextchan) {
+            nextchan = partedchan->next;
+            putsock(client, "JOIN %s", partedchan->channel);
+            free(partedchan);
+        }
+        client->flags &= ~SOCKET_FLAG_CHANGENICK;
+    }
+}
+
+static void raw_005_network(struct ClientSocket *client, char *value) {
+    if(!value) return;
+    //check all other networknames
+    //if they are NOT simular to value throw a warning
+    SYNCHRONIZE(cache_sync); //all bots connect to the same time so there is a higher chance that this code is running on multiple threads at the same time
+    if(client->network_name)
+        free(client->network_name);
+    client->network_name = strdup(value);
+    struct ClientSocket *bot;
+    for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+        if(bot == client) continue;
+        if(!bot->network_name) continue;
+        if(stricmp(bot->network_name, value)) {
+            putlog(LOGLEVEL_ERROR, "WARNING: Network name '%s' (%s) differs from '%s' (%s)! Connecting to multiple IRC-Networks with one instance is NOT supported!\n", client->network_name, client->nick, bot->network_name, bot->nick);
+            break;
+        }
+    }
+    DESYNCHRONIZE(cache_sync);
+}
+
+static IRC_CMD(raw_005) {
+    char *ptr1 = merge_argv(argv, 1, argc);
+    char *ptr2, *name, *value;
+    do {
+        ptr2 = strchr(ptr1, ' ');
+        if(ptr2)
+            *ptr2 = '\0';
+        name = ptr1;
+        if((value = strchr(ptr1, '='))) {
+            *value = '\0';
+            value++;
+        }
+        if(!stricmp(name, "NETWORK")) raw_005_network(client, value);
+        if(ptr2)
+            ptr1 = ptr2 + 1;
+    } while(ptr2);
+    return 1;
+}
+
 void init_parser() {
     //all the raws we receive...
+    register_irc_function("437", raw_437);
     register_irc_function("002", raw_002);
+    register_irc_function("005", raw_005);
     register_irc_function("251", raw_251);
     register_irc_function("254", raw_254);
     register_irc_function("324", raw_324);