#include "portab.h"
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.26 2004/03/11 22:16:31 alex Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.43 2008/02/05 19:00:52 fw Exp $";
#include "imp.h"
#include <assert.h>
#include "irc-channel.h"
-GLOBAL BOOLEAN
+/*
+ * 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)
+{
+ CL2CHAN *cl2chan;
+ CHANNEL *chan;
+
+ while ((cl2chan = Channel_FirstChannelOf(target))) {
+ chan = Channel_GetChannel(cl2chan);
+ assert( chan != NULL );
+ Channel_Part(target, client, Channel_Name(chan), Client_ID(target));
+ }
+ return CONNECTED;
+}
+
+
+GLOBAL bool
IRC_JOIN( CLIENT *Client, REQUEST *Req )
{
- CHAR *channame, *key, *flags, *topic, modes[8];
- BOOLEAN is_new_chan, is_invited, is_banned;
+ char *channame, *channame_ptr, *key, *key_ptr, *flags, *topic, modes[8];
+ bool is_new_chan, is_invited, is_banned;
CLIENT *target;
CHANNEL *chan;
assert( Req != NULL );
/* Bad number of arguments? */
- if(( 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);
/* 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 = Req->argv[1];
- else key = NULL;
+ if (Req->argc > 1) {
+ key = Req->argv[1];
+ key_ptr = strchr(key, ',');
+ if (key_ptr) *key_ptr = '\0';
+ }
+ else
+ key = key_ptr = NULL;
+
+ channame = Req->argv[0];
+ channame_ptr = strchr(channame, ',');
+ if (channame_ptr) *channame_ptr = '\0';
/* Channel-Namen durchgehen */
- chan = NULL;
- channame = strtok( Req->argv[0], "," );
- while( channame )
+ while (channame)
{
chan = NULL; flags = NULL;
/* wird der Channel neu angelegt? */
- if( Channel_Search( channame )) is_new_chan = FALSE;
- else is_new_chan = TRUE;
+ if( Channel_Search( channame )) {
+ is_new_chan = false;
+ } else {
+ if (Conf_PredefChannelsOnly) { /* this server does not allow creation of channels */
+ IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
+ /* Try next name, if any */
+ channame = strchr(channame, ',');
+ continue;
+ }
+ is_new_chan = true;
+ }
/* Hat ein Server Channel-User-Modes uebergeben? */
if( Client_Type( Client ) == CLIENT_SERVER )
}
}
- /* Lokaler Client? */
+ /* Local 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(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins ))
+ return IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG,
+ Client_ID( Client ), channame );
/* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
if( is_new_chan )
chan = Channel_Search( channame );
assert( chan != NULL );
- is_banned = Lists_CheckBanned( target, chan );
- is_invited = Lists_CheckInvited( target, chan );
+ is_banned = Lists_Check(Channel_GetListBans(chan), target );
+ is_invited = Lists_Check(Channel_GetListInvites(chan), target );
/* Testen, ob Client gebanned ist */
- if(( is_banned == TRUE ) && ( is_invited == FALSE ))
+ if(( is_banned == true) && ( is_invited == false ))
{
/* Client ist gebanned (und nicht invited): */
IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
/* Ist der Channel "invite-only"? */
- if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE ))
+ 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 );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame );
/* Try next name, if any */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
}
}
+ 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. */
+ chan = Channel_Search( channame );
+ if( chan != NULL ) (void)Lists_Check(Channel_GetListInvites(chan), target);
+ }
/* Channel joinen (und ggf. anlegen) */
if( ! Channel_Join( target, channame ))
{
/* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ channame = strchr(channame, ',');
continue;
}
if( ! chan ) chan = Channel_Search( channame );
IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes );
/* im Channel bekannt machen */
- IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame );
+ 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 ));
+ IRC_WriteStrChannelPrefix( Client, chan, target, false, "MODE %s +%s %s", channame, &modes[1], Client_ID( target ));
}
if( Client_Type( Client ) == CLIENT_USER )
/* an Client bestaetigen */
IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
- /* Topic an Client schicken */
- topic = Channel_Topic( chan );
- if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
+ /* Send topic to client, if any */
+ topic = Channel_Topic(chan);
+ if (*topic) {
+ IRC_WriteStrClient(Client, RPL_TOPIC_MSG,
+ Client_ID(Client), channame, topic);
+#ifndef STRICT_RFC
+ IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG,
+ Client_ID(Client), channame,
+ Channel_TopicWho(chan),
+ Channel_TopicTime(chan));
+#endif
+ }
/* Mitglieder an Client Melden */
IRC_Send_NAMES( Client, chan );
IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan ));
}
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
+ /* next channel? */
+ channame = channame_ptr;
+ if (channame) {
+ channame++;
+ channame_ptr = strchr(channame, ',');
+ if (channame_ptr) *channame_ptr = '\0';
+
+ if (key_ptr) {
+ key = ++key_ptr;
+ key_ptr = strchr(key, ',');
+ if (key_ptr) *key_ptr = '\0';
+ }
+ }
}
return CONNECTED;
} /* IRC_JOIN */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_PART( CLIENT *Client, REQUEST *Req )
{
CLIENT *target;
- CHAR *chan;
+ 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 );
+ if (Req->argc < 1 || Req->argc > 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
/* Wer ist der Absender? */
if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
/* 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;
- }
+ chan = strtok(Req->argv[0], ",");
+ while (chan) {
+ Channel_Part(target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID(target));
- /* naechsten Namen ermitteln */
- chan = strtok( NULL, "," );
+ 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 );
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>" );
+ /* Set new topic */
+ Channel_SetTopic(chan, from, 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] );
+ 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 ) || ( Client_Type( target ) != CLIENT_SERVER )) 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;
+ char modes_add[COMMAND_LEN], l[16], *ptr;
CLIENT *from;
CHANNEL *chan;
- INT arg_topic;
+ int arg_topic;
assert( Client != NULL );
assert( Req != NULL );
{
if( *ptr == 'l' )
{
- snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan ));
+ snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan ));
strlcat( modes_add, l, sizeof( modes_add ));
}
if( *ptr == 'k' )
}
/* Inform members of this channel */
- IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
+ IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
}
}
else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" );
if(( ! *ptr ) && ( Req->argv[arg_topic][0] ))
{
/* OK, there is no topic jet */
- Channel_SetTopic( chan, Req->argv[arg_topic] );
- IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan ));
+ Channel_SetTopic(chan, Client, Req->argv[arg_topic]);
+ IRC_WriteStrChannelPrefix(Client, chan, from, false,
+ "TOPIC %s :%s", Req->argv[0], Channel_Topic(chan));
}
}
projects / ngircd-alex.git / blobdiff