X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIRCParser.c;h=ca42770bd8370725feacc467294230b86dd662c1;hb=ee3a72eb4a412a0a504d070db1b41c6907f7604d;hp=91b493822ada4d0e89ed042323a5d954ee7b370f;hpb=d8d2d7509f04822ba3910f8f1acecdff270bfe60;p=NeonServV5.git diff --git a/src/IRCParser.c b/src/IRCParser.c index 91b4938..ca42770 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 @@ -27,6 +27,7 @@ #include "BanNode.h" #include "ModeNode.h" #include "tools.h" +#include "bots.h" struct irc_cmd *irc_commands = NULL; static struct UserNode *registering_users = NULL; @@ -214,12 +215,12 @@ 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))) { struct ChanUser *chanuser = addChanUser(chan, user); - if(isModeSet(chan->modes, 'D')) + 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) @@ -466,38 +467,57 @@ static IRC_CMD(raw_kick) { static IRC_CMD(raw_topic) { if(from == NULL || argc < 2) return 0; + SYNCHRONIZE(cache_sync); struct UserNode *user = getUserByMask(from); struct ChanNode *chan = getChanByName(argv[0]); - if(chan == NULL) return 0; - if(chan->chanbot != client->user) return 1; //just ignore it to prevent event duplicates + if(chan == NULL) { + DESYNCHRONIZE(cache_sync); + return 0; + } + if(chan->chanbot != client->user) { + DESYNCHRONIZE(cache_sync); + return 1; //just ignore it to prevent event duplicates + } if(user == NULL) { user = createTempUserMask(from); - if(!user) return 0; + if(!user) { + DESYNCHRONIZE(cache_sync); + return 0; + } user->flags |= USERFLAG_ISTMPUSER; } event_topic(user, chan, argv[1]); strcpy(chan->topic, argv[1]); + DESYNCHRONIZE(cache_sync); return 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 = createTempUserMask(from); if(!user) return 0; user->flags |= USERFLAG_ISTMPUSER; } - if(!stricmp(user->nick, "*status") && !match("Disconnected from IRC.*", argv[1])) { - //ZNC DISCONNECT - bot_disconnect(client); - return 1; - } - if(!stricmp(user->nick, "-sBNC") && !match("* disconnected from the server.", argv[1])) { - //sBNC DISCONNECT - bot_disconnect(client); - return 1; - } if(argv[0][0] == '#') { //Channel message struct ChanNode *chan = getChanByName(argv[0]); if(chan && chan->chanbot == client->user) { @@ -558,13 +578,30 @@ 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; + 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(isBot(user)) { + if(client->user != user) { + DESYNCHRONIZE(cache_sync); + return 1; + } + client_renamed(client); + } + else if(!is_firstBotSeeUser(client, user)) { + DESYNCHRONIZE(cache_sync); + return 1; //we ignore it - but it's not a parse error + } event_nick(user, argv[0]); renameUser(user, argv[0]); + DESYNCHRONIZE(cache_sync); return 1; } @@ -607,22 +644,38 @@ static IRC_CMD(raw_invite) { static IRC_CMD(raw_mode) { if(from == NULL || argc < 2) return 0; + SYNCHRONIZE(cache_sync); struct UserNode *user = getUserByMask(from); if(user == NULL) { user = createTempUserMask(from); - if(!user) return 0; + if(!user) { + DESYNCHRONIZE(cache_sync); + return 0; + } user->flags |= USERFLAG_ISTMPUSER; } if(argv[0][0] == '#') { //ChannelMode struct ChanNode *chan = getChanByName(argv[0]); - if(!chan) return 0; - if(chan->chanbot != client->user) return 1; + if(!chan) { + DESYNCHRONIZE(cache_sync); + return 0; + } + if(chan->chanbot != client->user) { + DESYNCHRONIZE(cache_sync); + return 1; + } parseModes(chan->modes, argv[1], argv+2, argc-2); event_mode(user, chan, argv[1], argv+2, argc-2); } else { //UserMode + if(stricmp(client->user->nick, argv[0])) { + DESYNCHRONIZE(cache_sync); + return 0; + } + parseUserModes(client->user, argv[1]); } + DESYNCHRONIZE(cache_sync); return 1; } @@ -676,14 +729,99 @@ 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; +} + +static IRC_CMD(raw_nojoin) { + if(from == NULL || argc < 3) return 0; + struct ChanNode *chan = getChanByName(argv[1]); + if(chan == NULL) return 0; + if(client->flags & SOCKET_FLAG_REQUEST_INVITE) + requestInvite(client->user, chan); + 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); register_irc_function("332", raw_332); register_irc_function("367", raw_367); + register_irc_function("471", raw_nojoin); + register_irc_function("473", raw_nojoin); + register_irc_function("474", raw_nojoin); + register_irc_function("475", raw_nojoin); register_irc_function("INVITE", raw_invite); register_irc_function("NOTICE", raw_notice); register_irc_function("TOPIC", raw_topic);