fixed IRCParser bug (we shouldn't check chanuser after freeing it ;))

[NeonServV5.git] / src / IRCParser.c

diff --git a/src/IRCParser.c b/src/IRCParser.c
index b96acea7c0eb1bbcef943e8592c132e089e69377..b3fa2506a9455e925026d6ba964d341d1b300204 100644 (file)
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -1,4 +1,4 @@
-/* IRCParser.c - NeonServ v5.1
+/* IRCParser.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -28,6 +28,10 @@
 #include "ModeNode.h"
 
 struct irc_cmd *irc_commands = NULL;
+static struct UserNode *registering_users = NULL;
+int statistics_privmsg = 0;
+int statistics_network_users = 0;
+int statistics_network_channels = 0;
 
 static void parse_line(struct ClientSocket *client, char *line);
 static void register_irc_function(char *command, irc_cmd_t *func);
@@ -112,6 +116,8 @@ static USERLIST_CALLBACK(got_channel_userlist) {
 }
 
 static IRC_CMD(raw_001) {
+    client->user = addUser(argv[0]);
+    client->user->flags |= USERFLAG_ISBOT;
     client->flags |= SOCKET_FLAG_READY;
     event_bot_ready(client);
     return 1;
@@ -152,6 +158,27 @@ static IRC_CMD(raw_join) {
     if(user == NULL) {
         user = addUserMask(from);
     }
+    struct UserNode *registering, *last_registering = NULL, *next_registering;
+    int noEvent = 0, wasRegistering = 0;
+    for(registering = registering_users; registering; registering = next_registering) {
+        next_registering = registering->next;
+        if(!strcmp(registering->nick, user->nick)) {
+            noEvent = event_registered(registering, user);
+            wasRegistering = 1;
+            if(last_registering)
+                last_registering->next = registering->next;
+            else
+                registering_users = registering->next;
+            delUser(registering, 1);
+        } else if(time(0) - registering->created > 2) {
+            if(last_registering)
+                last_registering->next = registering->next;
+            else
+                registering_users = registering->next;
+            delUser(registering, 1);
+        } else
+            last_registering = registering;
+    }
     if(chan == NULL) {
         chan = addChannel(argv[0]);
         //request member list
@@ -162,7 +189,13 @@ static IRC_CMD(raw_join) {
         putsock(client, "MODE %s +b", chan->name);
     } else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         struct ChanUser *chanuser = addChanUser(chan, user);
-        event_join(chanuser);
+        if(!noEvent) {
+            if(wasRegistering)
+                user->flags |= USERFLAG_WAS_REGISTRING;
+            event_join(chanuser);
+            if(wasRegistering)
+                user->flags &= ~USERFLAG_WAS_REGISTRING;
+        }
     }
     return 1;
 }
@@ -215,7 +248,12 @@ static IRC_CMD(raw_quit) {
             }
         }
     }
-    delUser(user, 1); //now we fully free the user
+    if(!stricmp(argv[0], "Registered") && !(user->flags & USERFLAG_ISBOT)) {
+        user->next = registering_users;
+        user->created = time(0);
+        registering_users = user;
+    } else
+        delUser(user, 1); //now we fully free the user
     return 1;
 }
 
@@ -252,11 +290,11 @@ static IRC_CMD(raw_kick) {
         struct ChanUser *chanuser = getChanUser(target, chan);
         delChanUser(chanuser, 0); //we need to free the chanuser manually!
         event_kick(user, chanuser, argv[1]);
-        freeChanUser(chanuser);
         if(chanuser->chan->chanbot == user) {
             //check if theres another bot in the channel - otherwise free it
             checkChannelVisibility(chan);
         }
+        freeChanUser(chanuser);
     }
     if(target->channel == NULL && !(target->flags & USERFLAG_ISBOT)) {
         //remove the user
@@ -290,6 +328,8 @@ static IRC_CMD(raw_privmsg) {
     if(argv[0][0] == '#') { //Channel message
         struct ChanNode *chan = getChanByName(argv[0]);
         if(chan && chan->chanbot == client->user) {
+            if(statistics_enabled)
+                statistics_privmsg++;
             if(argv[1][0] == '\001') {
                 char *cmd = &argv[1][1];
                 char *text = strstr(cmd, " ");
@@ -422,10 +462,51 @@ static IRC_CMD(raw_367) {
     return 1;
 }
 
+static IRC_CMD(raw_251) {
+    if(argc < 2) return 0;
+    char *total_user_str = argv[1];
+    char total_visible[20], total_invisible[20];
+    int i, total_visible_pos = 0, total_invisible_pos = 0;
+    while(*total_user_str) {
+        if(*total_user_str == ' ') {
+            i++;
+        } else if(i == 2) {
+            if(total_visible_pos < 20)
+                total_visible[total_visible_pos++] = *total_user_str;
+        } else if(i == 5) {
+            if(total_invisible_pos < 20)
+                total_invisible[total_invisible_pos++] = *total_user_str;
+        }
+        total_user_str++;
+    }
+    total_visible[total_visible_pos] = '\0';
+    total_invisible[total_invisible_pos] = '\0';
+    statistics_network_users = atoi(total_visible) + atoi(total_invisible);
+    return 1;
+}
+
+static IRC_CMD(raw_254) {
+    if(argc < 3) return 0;
+    statistics_network_channels = atoi(argv[1]);
+    statistics_update();
+    return 1;
+}
+
+static IRC_CMD(raw_332) {
+    //Skynet #neonserv :topic
+    struct ChanNode *chan = getChanByName(argv[1]);
+    if(!chan) return 0;
+    strcpy(chan->topic, argv[2]);
+    return 1;
+}
+
 void init_parser() {
     //all the raws we receive...
     register_irc_function("001", raw_001);
+    register_irc_function("251", raw_251);
+    register_irc_function("254", raw_254);
     register_irc_function("324", raw_324);
+    register_irc_function("332", raw_332);
     register_irc_function("367", raw_367);
     register_irc_function("INVITE", raw_invite);
     register_irc_function("NOTICE", raw_notice);