/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
*
* 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 "portab.h"
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.21 2002/12/16 23:06:46 alex Exp $";
-
#include "imp.h"
#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include "defines.h"
#include "conn.h"
#include "client.h"
#include "channel.h"
+#include "conn-func.h"
#include "lists.h"
#include "log.h"
#include "match.h"
#include "irc-channel.h"
-GLOBAL BOOLEAN
-IRC_JOIN( CLIENT *Client, REQUEST *Req )
+/*
+ * RFC 2812, (3.2.1 Join message Command):
+ * Note that this message
+ * accepts a special argument ("0"), which is a special request to leave all
+ * channels the user is currently a member of. The server will process this
+ * message as if the user had sent a PART command (See Section 3.2.2) for
+ * each channel he is a member of.
+ */
+static bool
+part_from_all_channels(CLIENT* client, CLIENT *target)
{
- CHAR *channame, *key, *flags, *topic, modes[8];
- BOOLEAN is_new_chan, is_invited, is_banned;
- CLIENT *target;
+ CL2CHAN *cl2chan;
CHANNEL *chan;
- assert( Client != NULL );
- assert( Req != NULL );
+ while ((cl2chan = Channel_FirstChannelOf(target))) {
+ chan = Channel_GetChannel(cl2chan);
+ assert( chan != NULL );
+ Channel_Part(target, client, Channel_Name(chan), Client_ID(target));
+ }
+ return CONNECTED;
+}
- /* Bad number of arguments? */
- if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- /* Who is the sender? */
- if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
- else target = Client;
- if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+static bool
+join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan,
+ const char *channame, const char *key)
+{
+ bool is_invited, is_banned;
+ const char *channel_modes;
- /* Are channel keys given? */
- if( Req->argc > 1 ) key = Req->argv[1];
- else key = NULL;
+ /* Allow IRC operators to overwrite channel limits */
+ if (strchr(Client_Modes(Client), 'o'))
+ return true;
+
+ is_banned = Lists_Check(Channel_GetListBans(chan), target);
+ is_invited = Lists_Check(Channel_GetListInvites(chan), target);
+
+ if (is_banned && !is_invited) {
+ IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame);
+ return false;
+ }
+
+ channel_modes = Channel_Modes(chan);
+ if ((strchr(channel_modes, 'i')) && !is_invited) {
+ /* Channel is "invite-only" (and Client wasn't invited) */
+ IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, Client_ID(Client), channame);
+ return false;
+ }
- /* Channel-Namen durchgehen */
- chan = NULL;
- channame = strtok( Req->argv[0], "," );
- while( channame )
+ /* Is the channel protected by a key? */
+ if (strchr(channel_modes, 'k') &&
+ strcmp(Channel_Key(chan), key ? key : ""))
{
- chan = flags = NULL;
+ IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, Client_ID(Client), channame);
+ return false;
+ }
+ /* Are there already too many members? */
+ if ((strchr(channel_modes, 'l')) && (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) {
+ IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, Client_ID(Client), channame);
+ return false;
+ }
+ return true;
+}
- /* wird der Channel neu angelegt? */
- if( Channel_Search( channame )) is_new_chan = FALSE;
- else is_new_chan = TRUE;
- /* Hat ein Server Channel-User-Modes uebergeben? */
- if( Client_Type( Client ) == CLIENT_SERVER )
- {
- /* Channel-Flags extrahieren */
- flags = strchr( channame, 0x7 );
- if( flags )
- {
- *flags = '\0';
- flags++;
- }
+static void
+join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags)
+{
+ if (flags) {
+ while (*flags) {
+ Channel_UserModeAdd(chan, target, *flags);
+ flags++;
}
+ }
- /* Lokaler Client? */
- if( Client_Type( Client ) == CLIENT_USER )
- {
- /* Test if the user has reached his maximum channel count */
- if( Client_Type( Client ) == CLIENT_USER )
- {
- if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
- {
- IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame );
- return CONNECTED;
- }
- }
+ /* If channel persistent and client is ircop: make client chanop */
+ if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o'))
+ Channel_UserModeAdd(chan, target, 'o');
+}
- /* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
- if( is_new_chan )
- {
- /* Erster User im Channel: Operator-Flag setzen */
- flags = "o";
- }
- else
- {
- /* Existierenden Channel suchen */
- chan = Channel_Search( channame );
- assert( chan != NULL );
- is_banned = Lists_CheckBanned( target, chan );
- is_invited = Lists_CheckInvited( target, chan );
+static void
+cb_join_forward(CLIENT *To, CLIENT *Prefix, void *Data)
+{
+ CONN_ID conn;
+ char str[COMMAND_LEN], *ptr = NULL;
+
+ strlcpy(str, (char *)Data, sizeof(str));
+ conn = Client_Conn(To);
+
+ if (Conn_Options(conn) & CONN_RFC1459) {
+ /* RFC 1459 compatibility mode, appended modes are NOT
+ * supported, so strip them off! */
+ ptr = strchr(str, 0x7);
+ if (ptr)
+ *ptr++ = '\0';
+ }
- /* Testen, ob Client gebanned ist */
- if(( is_banned == TRUE ) && ( is_invited == FALSE ))
- {
- /* Client ist gebanned (und nicht invited): */
- IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
+ IRC_WriteStrClientPrefix(To, Prefix, "JOIN %s", str);
+ if (ptr && *ptr)
+ IRC_WriteStrClientPrefix(To, Prefix, "MODE %s +%s %s", str, ptr,
+ Client_ID(Prefix));
+} /* cb_join_forward */
- /* Try next name, if any */
- channame = strtok( NULL, "," );
- continue;
- }
- /* Ist der Channel "invite-only"? */
- if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
- {
- /* Channel ist "invite-only" und Client wurde nicht invited: */
- IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
+static void
+join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
+ const char *channame)
+{
+ char modes[CHANNEL_MODE_LEN], str[COMMAND_LEN];
+
+ strlcpy(&modes[1], Channel_UserModes(chan, target), sizeof(modes) - 1);
+ if (modes[1])
+ modes[0] = 0x7;
+ else
+ modes[0] = '\0';
+
+ /* forward to other servers (if it is not a local channel) */
+ if (!Channel_IsLocal(chan)) {
+ snprintf(str, sizeof(str), "%s%s", channame, modes);
+ IRC_WriteStrServersPrefixFlag_CB(Client, target, '\0',
+ cb_join_forward, str);
+ }
- /* Try next name, if any */
- channame = strtok( NULL, "," );
- continue;
- }
+ /* tell users in this channel about the new client */
+ IRC_WriteStrChannelPrefix(Client, chan, target, false,
+ "JOIN :%s", channame);
- /* Is the channel protected by a key? */
- if(( strchr( Channel_Modes( chan ), 'k' )) && ( strcmp( Channel_Key( chan ), key ? key : "" ) != 0 ))
- {
- /* Bad channel key! */
- IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
+ /* syncronize channel modes */
+ if (modes[1]) {
+ IRC_WriteStrChannelPrefix(Client, chan, target, false,
+ "MODE %s +%s %s", channame,
+ &modes[1], Client_ID(target));
+ }
+} /* join_forward */
- /* Try next name, if any */
- channame = strtok( NULL, "," );
- continue;
- }
- /* Are there already too many members? */
- if(( strchr( Channel_Modes( chan ), 'l' )) && ( Channel_MaxUsers( chan ) <= Channel_MemberCount( chan )))
- {
- /* Bad channel key! */
- IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
+static bool
+join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan,
+ const char *channame)
+{
+ const char *topic;
+
+ if (Client_Type(Client) != CLIENT_USER)
+ return true;
+ /* acknowledge join */
+ if (!IRC_WriteStrClientPrefix(Client, target, "JOIN :%s", channame))
+ return false;
+
+ /* Send topic to client, if any */
+ topic = Channel_Topic(chan);
+ assert(topic != NULL);
+ if (*topic) {
+ if (!IRC_WriteStrClient(Client, RPL_TOPIC_MSG,
+ Client_ID(Client), channame, topic))
+ return false;
+#ifndef STRICT_RFC
+ if (!IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG,
+ Client_ID(Client), channame,
+ Channel_TopicWho(chan),
+ Channel_TopicTime(chan)))
+ return false;
+#endif
+ }
+ /* send list of channel members to client */
+ if (!IRC_Send_NAMES(Client, chan))
+ return false;
+ return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client), Channel_Name(chan));
+}
- /* Try next name, if any */
- channame = strtok( NULL, "," );
- continue;
- }
+
+GLOBAL bool
+IRC_JOIN( CLIENT *Client, REQUEST *Req )
+{
+ char *channame, *key = NULL, *flags, *lastkey = NULL, *lastchan = NULL;
+ CLIENT *target;
+ CHANNEL *chan;
+
+ assert( Client != NULL );
+ assert( Req != NULL );
+
+ /* Bad number of arguments? */
+ if (Req->argc < 1 || Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ /* Who is the sender? */
+ if (Client_Type(Client) == CLIENT_SERVER)
+ target = Client_Search(Req->prefix);
+ else
+ target = Client;
+
+ if (!target)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix);
+
+ /* Is argument "0"? */
+ if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2))
+ return part_from_all_channels(Client, target);
+
+ /* Are channel keys given? */
+ if (Req->argc > 1)
+ key = strtok_r(Req->argv[1], ",", &lastkey);
+
+ channame = Req->argv[0];
+ channame = strtok_r(channame, ",", &lastchan);
+
+ /* Make sure that "channame" is not the empty string ("JOIN :") */
+ if (! channame)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ while (channame) {
+ flags = NULL;
+
+ /* Did the server include channel-user-modes? */
+ if (Client_Type(Client) == CLIENT_SERVER) {
+ flags = strchr(channame, 0x7);
+ if (flags) {
+ *flags = '\0';
+ flags++;
}
}
- /* Channel joinen (und ggf. anlegen) */
- if( ! Channel_Join( target, channame ))
- {
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
- continue;
+ chan = Channel_Search(channame);
+ if (!chan && Conf_PredefChannelsOnly) {
+ /* channel must be created, but server does not allow this */
+ IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame);
+ break;
}
- if( ! chan ) chan = Channel_Search( channame );
- assert( chan != NULL );
- /* Modes setzen (wenn vorhanden) */
- while( flags && *flags )
- {
- Channel_UserModeAdd( chan, target, *flags );
- flags++;
+ /* Local client? */
+ if (Client_Type(Client) == CLIENT_USER) {
+ /* Test if the user has reached his maximum channel count */
+ if ((Conf_MaxJoins > 0) && (Channel_CountForUser(Client) >= Conf_MaxJoins))
+ return IRC_WriteStrClient(Client, ERR_TOOMANYCHANNELS_MSG,
+ Client_ID(Client), channame);
+ if (!chan) {
+ /*
+ * New Channel: first user will be channel operator
+ * unless this is a modeless channel.
+ */
+ if (*channame != '+')
+ flags = "o";
+ } else
+ if (!join_allowed(Client, target, chan, channame, key))
+ break;
+
+ /* Local client: update idle time */
+ Conn_UpdateIdle(Client_Conn(Client));
+ } else {
+ /* Remote server: we don't need to know whether the
+ * client is invited or not, but we have to make sure
+ * that the "one shot" entries (generated by INVITE
+ * commands) in this list become deleted when a user
+ * joins a channel this way. */
+ if (chan) (void)Lists_Check(Channel_GetListInvites(chan), target);
}
- /* Wenn persistenter Channel und IRC-Operator: zum Channel-OP machen */
- if(( strchr( Channel_Modes( chan ), 'P' )) && ( strchr( Client_Modes( target ), 'o' ))) Channel_UserModeAdd( chan, target, 'o' );
-
- /* Muessen Modes an andere Server gemeldet werden? */
- strcpy( &modes[1], Channel_UserModes( chan, target ));
- if( modes[1] ) modes[0] = 0x7;
- else modes[0] = '\0';
+ /* Join channel (and create channel if it doesn't exist) */
+ if (!Channel_Join(target, channame))
+ break;
- /* An andere Server weiterleiten */
- IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes );
-
- /* im Channel bekannt machen */
- IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame );
- if( modes[1] )
- {
- /* Modes im Channel bekannt machen */
- IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], Client_ID( target ));
+ if (!chan) { /* channel is new; it has been created above */
+ chan = Channel_Search(channame);
+ assert(chan != NULL);
+ if (*channame == '+') { /* modeless channel... */
+ Channel_ModeAdd(chan, 't'); /* /TOPIC not allowed */
+ Channel_ModeAdd(chan, 'n'); /* no external msgs */
+ }
}
+ assert(chan != NULL);
- if( Client_Type( Client ) == CLIENT_USER )
- {
- /* an Client bestaetigen */
- IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
+ join_set_channelmodes(chan, target, flags);
- /* Topic an Client schicken */
- topic = Channel_Topic( chan );
- if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+ join_forward(Client, target, chan, channame);
- /* Mitglieder an Client Melden */
- IRC_Send_NAMES( Client, chan );
- IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
- }
+ if (!join_send_topic(Client, target, chan, channame))
+ break; /* write error */
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ /* next channel? */
+ channame = strtok_r(NULL, ",", &lastchan);
+ if (channame && key)
+ key = strtok_r(NULL, ",", &lastkey);
}
return CONNECTED;
} /* IRC_JOIN */
-GLOBAL BOOLEAN
-IRC_PART( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "PART" command.
+ */
+GLOBAL bool
+IRC_PART(CLIENT * Client, REQUEST * Req)
{
CLIENT *target;
- CHAR *chan;
-
- assert( Client != NULL );
- assert( Req != NULL );
-
- /* Falsche Anzahl Parameter? */
- if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ char *chan;
+
+ assert(Client != NULL);
+ assert(Req != NULL);
+
+ if (Req->argc < 1 || Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ /* Get the sender */
+ if (Client_Type(Client) == CLIENT_SERVER)
+ target = Client_Search(Req->prefix);
+ else
+ target = Client;
+ if (!target)
+ return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+ Client_ID(Client), Req->prefix);
+
+ /* Loop over all the given channel names */
+ chan = strtok(Req->argv[0], ",");
+
+ /* Make sure that "chan" is not the empty string ("PART :") */
+ if (! chan)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
+
+ while (chan) {
+ Channel_Part(target, Client, chan,
+ Req->argc > 1 ? Req->argv[1] : Client_ID(target));
+ chan = strtok(NULL, ",");
+ }
- /* Wer ist der Absender? */
- if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
- else target = Client;
- if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+ /* Update idle time, if local client */
+ if (Client_Conn(Client) > NONE)
+ Conn_UpdateIdle(Client_Conn(Client));
- /* Channel-Namen durchgehen */
- chan = strtok( Req->argv[0], "," );
- while( chan )
- {
- if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target )))
- {
- /* naechsten Namen ermitteln */
- chan = strtok( NULL, "," );
- continue;
- }
-
- /* naechsten Namen ermitteln */
- chan = strtok( NULL, "," );
- }
return CONNECTED;
} /* IRC_PART */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_TOPIC( CLIENT *Client, REQUEST *Req )
{
CHANNEL *chan;
CLIENT *from;
- CHAR *topic;
+ char *topic;
+ bool r;
assert( Client != NULL );
assert( Req != NULL );
- /* Falsche Anzahl Parameter? */
- if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if ((Req->argc < 1) || (Req->argc > 2))
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command);
if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
else from = Client;
if( Req->argc == 1 )
{
- /* Topic erfragen */
- topic = Channel_Topic( chan );
- if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
- else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
+ /* Request actual topic */
+ topic = Channel_Topic(chan);
+ if (*topic) {
+ r = IRC_WriteStrClient(from, RPL_TOPIC_MSG,
+ Client_ID(Client), Channel_Name(chan), topic);
+#ifndef STRICT_RFC
+ r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG,
+ Client_ID(Client), Channel_Name(chan),
+ Channel_TopicWho(chan),
+ Channel_TopicTime(chan));
+#endif
+ return r;
+ }
+ else
+ return IRC_WriteStrClient(from, RPL_NOTOPIC_MSG,
+ Client_ID(from), Channel_Name(chan));
}
if( strchr( Channel_Modes( chan ), 't' ))
if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
}
- /* Topic setzen */
- Channel_SetTopic( chan, Req->argv[1] );
- Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
-
- /* im Channel bekannt machen und an Server weiterleiten */
- IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
- IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
-
- if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
- else return CONNECTED;
+ /* Set new topic */
+ Channel_SetTopic(chan, from, Req->argv[1]);
+ LogDebug("%s \"%s\" set topic on \"%s\": %s",
+ Client_TypeText(from), Client_Mask(from), Channel_Name(chan),
+ Req->argv[1][0] ? Req->argv[1] : "<none>");
+
+ /* Update channel and forward new topic to other servers */
+ if (!Channel_IsLocal(chan))
+ IRC_WriteStrServersPrefix(Client, from, "TOPIC %s :%s",
+ Req->argv[0], Req->argv[1]);
+ IRC_WriteStrChannelPrefix(Client, chan, from, false, "TOPIC %s :%s",
+ Req->argv[0], Req->argv[1]);
+
+ if (Client_Type(Client) == CLIENT_USER)
+ return IRC_WriteStrClientPrefix(Client, Client, "TOPIC %s :%s",
+ Req->argv[0], Req->argv[1]);
+ else
+ return CONNECTED;
} /* IRC_TOPIC */
-GLOBAL BOOLEAN
+/**
+ * Handler for the IRC "LIST" command.
+ * This implementation handles the local case as well as the forwarding of the
+ * LIST command to other servers in the IRC network.
+ */
+GLOBAL bool
IRC_LIST( CLIENT *Client, REQUEST *Req )
{
- CHAR *pattern;
+ char *pattern;
CHANNEL *chan;
CLIENT *from, *target;
assert( Client != NULL );
assert( Req != NULL );
- /* Falsche Anzahl Parameter? */
- if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ /* Bad number of prameters? */
+ if( Req->argc > 2 )
+ return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID( Client ), Req->command );
- if( Req->argc > 0 ) pattern = strtok( Req->argv[0], "," );
- else pattern = "*";
+ if( Req->argc > 0 )
+ pattern = strtok( Req->argv[0], "," );
+ else
+ pattern = "*";
- /* From aus Prefix ermitteln */
- if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
- else from = Client;
- if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+ /* Get sender from prefix, if any */
+ if( Client_Type( Client ) == CLIENT_SERVER )
+ from = Client_Search( Req->prefix );
+ else
+ from = Client;
+
+ if( ! from )
+ return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG,
+ Client_ID( Client ), Req->prefix );
if( Req->argc == 2 )
{
- /* an anderen Server forwarden */
+ /* Forward to other server? */
target = Client_Search( Req->argv[1] );
- if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+ if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
+ return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG,
+ Client_ID( Client ), Req->argv[1] );
if( target != Client_ThisServer( ))
{
- /* Ok, anderer Server ist das Ziel: forwarden */
- return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] );
+ /* Target is indeed an other server, forward it! */
+ return IRC_WriteStrClientPrefix( target, from,
+ "LIST %s :%s", Client_ID( from ),
+ Req->argv[1] );
}
}
-
+
while( pattern )
{
- /* alle Channel durchgehen */
+ /* Loop through all the channels */
chan = Channel_First( );
while( chan )
{
- /* Passt die Suchmaske auf diesen Channel? */
+ /* Check search pattern */
if( Match( pattern, Channel_Name( chan )))
{
- /* Treffer! */
- if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+ /* Gotcha! */
+ if( ! strchr( Channel_Modes( chan ), 's' ) ||
+ Channel_IsMemberOf( chan, from ))
+ {
+ if( ! IRC_WriteStrClient( from,
+ RPL_LIST_MSG, Client_ID( from ),
+ Channel_Name( chan ),
+ Channel_MemberCount( chan ),
+ Channel_Topic( chan )))
+ return DISCONNECTED;
+ }
}
chan = Channel_Next( chan );
}
-
- /* naechsten Namen ermitteln */
- if( Req->argc > 0 ) pattern = strtok( NULL, "," );
- else pattern = NULL;
+
+ /* Get next name ... */
+ if( Req->argc > 0 )
+ pattern = strtok( NULL, "," );
+ else
+ pattern = NULL;
}
-
- return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from );
+
+ return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from ));
} /* IRC_LIST */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
{
+ char modes_add[COMMAND_LEN], l[16], *ptr;
CLIENT *from;
CHANNEL *chan;
- CHAR *ptr;
+ int arg_topic;
assert( Client != NULL );
assert( Req != NULL );
- /* Falsche Anzahl Parameter? */
- if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ /* Bad number of parameters? */
+ if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
- /* From-Server suchen */
+ /* Compatibility kludge */
+ if( Req->argc == 5 ) arg_topic = 4;
+ else if( Req->argc == 3 ) arg_topic = 2;
+ else arg_topic = -1;
+
+ /* Search origin */
from = Client_Search( Req->prefix );
if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
- /* Channel suchen bzw. erzeugen */
+ /* Search or create channel */
chan = Channel_Search( Req->argv[0] );
if( ! chan ) chan = Channel_Create( Req->argv[0] );
if( ! chan ) return CONNECTED;
ptr = Channel_Modes( chan );
if( ! *ptr )
{
- /* OK, es sind noch keine Modes gesetzt */
+ /* OK, this channel doesn't have modes jet, set the received ones: */
Channel_SetModes( chan, &Req->argv[1][1] );
- IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] );
+
+ if( Req->argc == 5 )
+ {
+ if( strchr( Channel_Modes( chan ), 'k' )) Channel_SetKey( chan, Req->argv[2] );
+ if( strchr( Channel_Modes( chan ), 'l' )) Channel_SetMaxUsers( chan, atol( Req->argv[3] ));
+ }
+ else
+ {
+ /* Delete modes which we never want to inherit */
+ Channel_ModeDel( chan, 'l' );
+ Channel_ModeDel( chan, 'k' );
+ }
+
+ strcpy( modes_add, "" );
+ ptr = Channel_Modes( chan );
+ while( *ptr )
+ {
+ if( *ptr == 'l' )
+ {
+ snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan ));
+ strlcat( modes_add, l, sizeof( modes_add ));
+ }
+ if( *ptr == 'k' )
+ {
+ strlcat( modes_add, " ", sizeof( modes_add ));
+ strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add ));
+ }
+ ptr++;
+ }
+
+ /* Inform members of this channel */
+ IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
}
}
- else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" );
+ else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" );
- if( Req->argc == 3 )
+ if( arg_topic > 0 )
{
- /* Es wurde auch ein Topic mit uebermittelt */
+ /* We got a topic */
ptr = Channel_Topic( chan );
- if( ! *ptr )
+ if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
{
- /* OK, es ist bisher kein Topic gesetzt */
- Channel_SetTopic( chan, Req->argv[2] );
- IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[2] );
+ /* OK, there is no topic jet */
+ Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
+ IRC_WriteStrChannelPrefix(Client, chan, from, false,
+ "TOPIC %s :%s", Req->argv[0], Channel_Topic(chan));
}
}
- /* an andere Server forwarden */
- IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
+ /* Forward CHANINFO to other serevrs */
+ if( Req->argc == 5 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2], Req->argv[3], Req->argv[4] );
+ else if( Req->argc == 3 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
+ else IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s", Req->argv[0], Req->argv[1] );
+
return CONNECTED;
} /* IRC_CHANINFO */
projects / ngircd-alex.git / blobdiff