-/* IRCParser.c - NeonServ v5.1
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* IRCParser.c - NeonServ v5.4
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* 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
#include "DBHelper.h"
#include "BanNode.h"
#include "ModeNode.h"
+#include "tools.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);
static void parse_line(struct ClientSocket *client, char *line) {
int argc = 0;
char *argv[MAXNUMPARAMS];
- printf("[recv %lu] %s\n", (unsigned long) strlen(line), line);
+ #ifdef HAVE_THREADS
+ putlog(LOGLEVEL_RAW, "[%d recv %lu] %s\n", getCurrentThreadID(), (unsigned long) strlen(line), line);
+ #else
+ putlog(LOGLEVEL_RAW, "[recv %lu] %s\n", (unsigned long) strlen(line), line);
+ #endif
if(line[0] == ':')
line++;
else
event_join(chanuser);
}
-static IRC_CMD(raw_001) {
+static IRC_CMD(raw_002) { //fixed: ZNC fakes a 001 raw even if we're not connected!
+ struct UserNode *user = getUserByNick(argv[0]);
+ if(!user)
+ user = addUser(argv[0]);
+ client->user = user;
+ client->user->flags |= USERFLAG_ISBOT;
client->flags |= SOCKET_FLAG_READY;
event_bot_ready(client);
return 1;
return 0;
}
+static int is_onlyBotSeeUser(struct ClientSocket *client, struct UserNode *user) {
+ struct ClientSocket *bot;
+ struct ChanUser *chanuser;
+ for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+ if(bot == client) continue;
+ for(chanuser = getUserChannels(bot->user, NULL); chanuser; chanuser = getUserChannels(bot->user, chanuser)) {
+ if(isUserOnChan(user, chanuser->chan)) {
+ return 0;
+ }
+ }
+ }
+ return 1;
+}
+
static IRC_CMD(raw_join) {
if(from == NULL || argc < 1) return 0;
+ SYNCHRONIZE(cache_sync);
struct UserNode *user = getUserByMask(from);
struct ChanNode *chan = getChanByName(argv[0]);
- if(!chan && !(user->flags & USERFLAG_ISBOT)) return 0;
- if(chan && chan->chanbot != client->user) return 1; //we ignore it - but it's not a parse error
+ if(!chan && (!user || !(user->flags & USERFLAG_ISBOT))) {
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ }
+ if(chan && (((!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)) && client->user != user))) {
+ DESYNCHRONIZE(cache_sync);
+ return 1; //we ignore it - but it's not a parse error
+ }
+ //let Bots always add themselves! (maybe they join invisible)
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
chan->chanbot = user;
struct ChanUser *chanuser = addChanUser(chan, user); //it must be a bot
- get_userlist(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)) {
+ } else if(!isUserOnChan(user, chan) && ((chan->flags & CHANFLAG_RECEIVED_USERLIST) || isBot(user))) {
struct ChanUser *chanuser = addChanUser(chan, user);
- event_join(chanuser);
+ if(isBot(user) && isModeSet(chan->modes, 'D')) //if the bot joins a channel it could also be invisible
+ chanuser->flags |= CHANUSERFLAG_INVISIBLE;
+ if(!noEvent) {
+ if(wasRegistering)
+ user->flags |= USERFLAG_WAS_REGISTRING;
+ event_join(chanuser);
+ if(wasRegistering)
+ user->flags &= ~USERFLAG_WAS_REGISTRING;
+ }
+ if(!(user->flags & USERFLAG_ISBOT) && (chan->flags & CHANFLAG_REJOINING)) {
+ //ABORT REJOIN (security break)
+ struct ClientSocket **clients = chan->rejoin_array;
+ while(*clients) {
+ putsock(*clients, "JOIN %s", chan->name);
+ clients++;
+ }
+ free(chan->rejoin_array);
+ chan->flags &= ~CHANFLAG_REJOINING;
+ }
+ } else if(chan->usercount == 1 && isUserOnChan(user, chan)) {
+ //first bot rejoined
+ struct ChanUser *chanuser = getChanUser(user, chan);
+ chanuser->flags &= ~CHANUSERFLAG_VOICED;
+ chanuser->flags |= CHANUSERFLAG_OPPED;
}
+ DESYNCHRONIZE(cache_sync);
return 1;
}
+static void check_full_rejoin(struct ChanNode *chan) {
+ struct ChanUser *chanuser;
+ char do_rejoin = 1;
+ int botcount = 0;
+ for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
+ if((chanuser->flags & CHANUSERFLAG_OPPED) || !(chanuser->user->flags & USERFLAG_ISBOT)) {
+ do_rejoin = 0;
+ break;
+ }
+ if((chanuser->user->flags & USERFLAG_ISBOT))
+ botcount++;
+ }
+ if(do_rejoin) {
+ struct ClientSocket **clients = calloc(botcount, sizeof(*clients));
+ struct ClientSocket *bot, *chanbot;
+ int i = 0;
+ for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+ if(bot->user != chan->chanbot && isUserOnChan(bot->user, chan)) {
+ clients[i++] = bot;
+ putsock(bot, "PART %s :rejoining", chan->name);
+ } else if(bot->user == chan->chanbot)
+ chanbot = bot;
+ }
+ chan->flags |= CHANFLAG_REJOINING;
+ chan->rejoin_array = clients;
+ if(botcount == 1) {
+ //we're alone
+ putsock(chanbot, "PART %s :magic hop", chan->name);
+ putsock(chanbot, "JOIN %s", chan->name);
+ }
+ }
+}
+
static IRC_CMD(raw_part) {
if(from == NULL || argc < 1) return 0;
+ SYNCHRONIZE(cache_sync);
struct UserNode *user = getUserByMask(from);
- if(user == NULL) return 0;
+ if(user == NULL) {
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ }
struct ChanNode *chan = getChanByName(argv[0]);
- if(chan == NULL) return 0;
- if(chan->chanbot != client->user) return 1; //we ignore it - but it's not a parse error
- if(isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
+ if(chan == NULL) {
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ }
+ if((!isBot(user) && chan->chanbot != client->user) || (isBot(user) && client->user != user)) {
+ DESYNCHRONIZE(cache_sync);
+ return 1; //we ignore it - but it's not a parse error
+ }
+ int keep_channel = 1;
+ if(chan->chanbot == user && (chan->flags & CHANFLAG_REJOINING)) {
+ struct ClientSocket **clients = chan->rejoin_array;
+ while(*clients) {
+ putsock(*clients, "JOIN %s", chan->name);
+ clients++;
+ }
+ free(chan->rejoin_array);
+ chan->flags &= ~CHANFLAG_REJOINING;
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ } else if(isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
struct ChanUser *chanuser = getChanUser(user, chan);
delChanUser(chanuser, 0); //we need to free the chanuser manually!
event_part(chanuser, (argc > 1 ? argv[1] : NULL));
freeChanUser(chanuser);
if(chan->chanbot == user) {
//check if theres another bot in the channel - otherwise free it
- checkChannelVisibility(chan);
+ keep_channel = checkChannelVisibility(chan);
}
}
if(user->channel == NULL && !(user->flags & USERFLAG_ISBOT)) {
//remove the user
delUser(user, 1);
}
+ if(keep_channel && (chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) {
+ check_full_rejoin(chan);
+ }
+ else if(keep_channel && (chan->flags & CHANFLAG_REJOINING) && chan->usercount == 1) {
+ //bot is alone... rejoin!
+ putsock(client, "PART %s :magic hop", chan->name);
+ putsock(client, "JOIN %s", chan->name);
+ }
+ DESYNCHRONIZE(cache_sync);
return 1;
}
static IRC_CMD(raw_quit) {
if(from == NULL || argc < 1) return 0;
+ SYNCHRONIZE(cache_sync);
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(user == NULL) {
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ }
+ if(!is_firstBotSeeUser(client, user)) {
+ DESYNCHRONIZE(cache_sync);
+ return 1; //we ignore it - but it's not a parse error
+ }
+ int registering = !stricmp(argv[0], "Registered");
+ if((registering && (user->flags & USERFLAG_ISBOT))) {
+ DESYNCHRONIZE(cache_sync);
+ return 1; //bot is registering - just ignore it
+ }
delUser(user, 0); //a little bit crazy, but we want to delete the user on the channel's userlists - but not the users channel list
event_quit(user, argv[0]);
if(user->flags & USERFLAG_ISBOT) {
struct ClientSocket *bot;
for(bot = getBots(0, NULL); bot; bot = getBots(0, bot)) {
if(bot->user == user) {
+ bot->flags &= ~SOCKET_FLAG_READY;
bot->user = NULL;
break;
}
}
+ } else if(!registering) {
+ struct ChanUser *chanuser;
+ struct ChanNode *chan;
+ for(chanuser = user->channel; chanuser; chanuser = chanuser->next_chan) {
+ chan = chanuser->chan;
+ if((chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING))
+ check_full_rejoin(chan);
+ }
}
- delUser(user, 1); //now we fully free the user
+ if(registering && !(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
+ DESYNCHRONIZE(cache_sync);
return 1;
}
struct UserNode *user = client->user;
struct ChanUser *chanuser, *next;
if(user) {
- delUser(user, 0);
- event_quit(user, "disconnected");
- for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = next) {
- next = getUserChannels(user, chanuser);
- if(chanuser->chan->chanbot == user)
- checkChannelVisibility(chanuser->chan);
- freeChanUser(chanuser);
+ if(is_onlyBotSeeUser(client, user)) {
+ //ok the bot-user is not seen by any other bots so we can simply free it.
+ delUser(user, 0);
+ event_quit(user, "disconnected");
+ for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = next) {
+ next = getUserChannels(user, chanuser);
+ if(chanuser->chan->chanbot == user)
+ checkChannelVisibility(chanuser->chan);
+ freeChanUser(chanuser);
+ }
+ user->channel = NULL;
+ delUser(user, 1); //now we fully free the user
+ } else {
+ //we need to transform the bot-user back to a normal user (BNC FIX)
+ user->flags &= ~USERFLAG_ISBOT;
+ for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = next) {
+ next = getUserChannels(user, chanuser);
+ if(chanuser->chan->chanbot == user)
+ checkChannelVisibility(chanuser->chan);
+ }
}
- user->channel = NULL;
- delUser(user, 1); //now we fully free the user
client->user = NULL;
+ client->flags &= ~SOCKET_FLAG_READY;
}
}
static IRC_CMD(raw_kick) {
if(from == NULL || argc < 3) return 0;
+ SYNCHRONIZE(cache_sync);
struct UserNode *user = getUserByMask(from);
struct UserNode *target = getUserByNick(argv[1]);
struct ChanNode *chan = getChanByName(argv[0]);
- if(chan == NULL || target == NULL) return 0;
- if(chan->chanbot != client->user) return 1; //we ignore it - but it's not a parse error
+ if(chan == NULL || target == NULL) {
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ }
+ if(((!isBot(target) && chan->chanbot != client->user) || (isBot(target) && client->user != target))) {
+ DESYNCHRONIZE(cache_sync);
+ return 1; //we ignore it - but it's not a parse error
+ }
+ int keep_channel = 1;
if(isUserOnChan(target, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
if(user == NULL) {
- user = createTempUser(from);
+ user = createTempUserMask(from);
+ if(!user) {
+ DESYNCHRONIZE(cache_sync);
+ return 0;
+ }
user->flags |= USERFLAG_ISTMPUSER;
}
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);
+ keep_channel = checkChannelVisibility(chan);
}
+ freeChanUser(chanuser);
}
if(target->channel == NULL && !(target->flags & USERFLAG_ISBOT)) {
//remove the user
delUser(target, 1);
}
+ if(keep_channel && (chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) {
+ check_full_rejoin(chan);
+ }
+ DESYNCHRONIZE(cache_sync);
return 1;
}
if(chan == NULL) return 0;
if(chan->chanbot != client->user) return 1; //just ignore it to prevent event duplicates
if(user == NULL) {
- user = createTempUser(from);
+ user = createTempUserMask(from);
+ if(!user) return 0;
user->flags |= USERFLAG_ISTMPUSER;
}
event_topic(user, chan, argv[1]);
static IRC_CMD(raw_privmsg) {
if(from == NULL || argc < 2) return 0;
+ if(!stricmplen(from, "*status", 7) || !stricmplen(from, "-sBNC", 5)) {
+ #ifdef HAVE_THREADS
+ unsigned int tid = (unsigned int) pthread_self_tid();
+ while(!clientsocket_parseorder_top(tid)) {
+ usleep(1000); //1ms
+ }
+ #endif
+ if(!match("Disconnected from IRC.*", argv[1])) {
+ //ZNC DISCONNECT
+ bot_disconnect(client);
+ return 1;
+ }
+ if(!match("* disconnected from the server.", argv[1])) {
+ //sBNC DISCONNECT
+ bot_disconnect(client);
+ return 1;
+ }
+ }
struct UserNode *user = getUserByMask(from);
if(user == NULL) {
- user = createTempUser(from);
+ user = createTempUserMask(from);
+ if(!user) return 0;
user->flags |= USERFLAG_ISTMPUSER;
}
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, " ");
if(from == NULL || argc < 2) return 0;
struct UserNode *user = getUserByMask(from);
if(user == NULL) {
- user = createTempUser(from);
+ user = createTempUserMask(from);
+ if(!user) return 0;
user->flags |= USERFLAG_ISTMPUSER;
}
if(argv[0][0] == '#') { //Channel 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;
if(from == NULL || argc < 2) return 0;
struct UserNode *user = getUserByMask(from);
if(user == NULL) {
- user = createTempUser(from);
+ user = createTempUserMask(from);
+ if(!user) return 0;
user->flags |= USERFLAG_ISTMPUSER;
}
event_invite(client, user, argv[1]);
if(from == NULL || argc < 2) return 0;
struct UserNode *user = getUserByMask(from);
if(user == NULL) {
- user = createTempUser(from);
+ user = createTempUserMask(from);
+ if(!user) return 0;
user->flags |= USERFLAG_ISTMPUSER;
}
if(argv[0][0] == '#') {
struct ChanNode *chan = getChanByName(argv[0]);
if(!chan) return 0;
if(chan->chanbot != client->user) return 1;
- event_mode(user, chan, argv[1], argv+2, argc-2);
parseModes(chan->modes, argv[1], argv+2, argc-2);
+ event_mode(user, chan, argv[1], argv+2, argc-2);
} else {
//UserMode
}
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 = 0, 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;
+}
+
+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("001", raw_001);
+ 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);
+ register_irc_function("332", raw_332);
register_irc_function("367", raw_367);
register_irc_function("INVITE", raw_invite);
register_irc_function("NOTICE", raw_notice);
for(i = start; i < end; i++) {
p = argv[i];
while(*p) p++;
- *p = seperator;
+ if(i < end-1) {
+ while(p != argv[i+1]) {
+ *p++ = seperator;
+ }
+ } else
+ *p = seperator;
}
if(p) *p = '\0';
return argv[start];
projects / NeonServV5.git / blobdiff