X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIRCParser.c;h=da4f434e4cf19f8b2f1e41147e25d87ff1ae720e;hb=689da1db7e2517c187ce76c6c553e20d630a7f36;hp=6e6c61318a7a2104920bc1b331a4c35f766559b9;hpb=1441daa675488be93e8b9a82d105aed5dc273f47;p=NeonServV5.git diff --git a/src/IRCParser.c b/src/IRCParser.c index 6e6c613..da4f434 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 @@ -57,7 +57,11 @@ int parse_lines(struct ClientSocket *client, char *lines, int len) { 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 @@ -169,10 +173,17 @@ static int is_onlyBotSeeUser(struct ClientSocket *client, struct UserNode *user) 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 || !(user->flags & USERFLAG_ISBOT))) return 0; - if(chan && (((!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)) && client->user != 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); @@ -203,12 +214,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) @@ -233,6 +244,7 @@ static IRC_CMD(raw_join) { chanuser->flags &= ~CHANUSERFLAG_VOICED; chanuser->flags |= CHANUSERFLAG_OPPED; } + DESYNCHRONIZE(cache_sync); return 1; } @@ -271,11 +283,21 @@ static void check_full_rejoin(struct ChanNode *chan) { 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((!isBot(user) && chan->chanbot != client->user) || (isBot(user) && client->user != user)) return 1; //we ignore it - but it's not a parse error + 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; @@ -285,6 +307,7 @@ static IRC_CMD(raw_part) { } 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); @@ -308,16 +331,27 @@ static IRC_CMD(raw_part) { 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))) return 1; //bot is registering - just ignore it + 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) { @@ -352,6 +386,7 @@ static IRC_CMD(raw_quit) { registering_users = user; } else delUser(user, 1); //now we fully free the user + DESYNCHRONIZE(cache_sync); return 1; } @@ -387,16 +422,26 @@ void bot_disconnect(struct ClientSocket *client) { 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(((!isBot(target) && chan->chanbot != client->user) || (isBot(target) && client->user != target))) 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); - if(!user) return 0; + user = createTempUserMask(from); + if(!user) { + DESYNCHRONIZE(cache_sync); + return 0; + } user->flags |= USERFLAG_ISTMPUSER; } struct ChanUser *chanuser = getChanUser(target, chan); @@ -415,6 +460,7 @@ static IRC_CMD(raw_kick) { if(keep_channel && (chan->flags & CHANFLAG_RECEIVED_USERLIST) && !(chan->flags & CHANFLAG_REJOINING)) { check_full_rejoin(chan); } + DESYNCHRONIZE(cache_sync); return 1; } @@ -425,7 +471,7 @@ static IRC_CMD(raw_topic) { 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; } @@ -436,22 +482,30 @@ static IRC_CMD(raw_topic) { 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(!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) { @@ -496,7 +550,7 @@ static IRC_CMD(raw_notice) { 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; } @@ -512,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; @@ -551,7 +611,7 @@ static IRC_CMD(raw_invite) { 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; } @@ -563,7 +623,7 @@ static IRC_CMD(raw_mode) { 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; } @@ -596,7 +656,7 @@ 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; + int i = 0, total_visible_pos = 0, total_invisible_pos = 0; while(*total_user_str) { if(*total_user_str == ' ') { i++; @@ -630,8 +690,40 @@ 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; + } +} + void init_parser() { //all the raws we receive... + register_irc_function("437", raw_437); register_irc_function("002", raw_002); register_irc_function("251", raw_251); register_irc_function("254", raw_254);