/*
* 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.45 2008/02/24 18:57:38 fw Exp $";
-
#include "imp.h"
#include <assert.h>
#include <stdlib.h>
#include "conn.h"
#include "client.h"
#include "channel.h"
+#include "conn-func.h"
#include "lists.h"
#include "log.h"
#include "match.h"
bool is_invited, is_banned;
const char *channel_modes;
+ /* 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);
}
+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';
+ }
+
+ 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 */
+
+
static void
join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
const char *channame)
{
- char modes[8];
+ 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 */
- IRC_WriteStrServersPrefix(Client, target, "JOIN :%s%s", channame, modes);
+
+ /* 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);
+ }
/* tell users in this channel about the new client */
- IRC_WriteStrChannelPrefix(Client, chan, target, false, "JOIN :%s", channame);
- if (modes[1])
- IRC_WriteStrChannelPrefix(Client, chan, target, false, "MODE %s +%s %s",
- channame, &modes[1], Client_ID(target));
-}
+ IRC_WriteStrChannelPrefix(Client, chan, target, false,
+ "JOIN :%s", 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 */
static bool
GLOBAL bool
IRC_JOIN( CLIENT *Client, REQUEST *Req )
{
- char *channame, *channame_ptr, *key, *key_ptr, *flags;
+ char *channame, *key = NULL, *flags, *lastkey = NULL, *lastchan = NULL;
CLIENT *target;
CHANNEL *chan;
return part_from_all_channels(Client, target);
/* Are channel keys given? */
- if (Req->argc > 1) {
- key = Req->argv[1];
- key_ptr = strchr(key, ',');
- if (key_ptr) *key_ptr = '\0';
- } else {
- key = key_ptr = NULL;
- }
+ if (Req->argc > 1)
+ key = strtok_r(Req->argv[1], ",", &lastkey);
+
channame = Req->argv[0];
- channame_ptr = strchr(channame, ',');
- if (channame_ptr) *channame_ptr = '\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;
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 */
- flags = "o";
- else
+ 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
if (!Channel_Join(target, channame))
break;
- if (!chan) /* channel is new; it has been created above */
+ 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);
join_set_channelmodes(chan, target, flags);
break; /* write error */
/* 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';
- }
- }
+ channame = strtok_r(NULL, ",", &lastchan);
+ if (channame && key)
+ key = strtok_r(NULL, ",", &lastkey);
}
return CONNECTED;
} /* IRC_JOIN */
/* 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, ",");
}
+
+ /* Update idle time, if local client */
+ if (Client_Conn(Client) > NONE)
+ Conn_UpdateIdle(Client_Conn(Client));
+
return CONNECTED;
} /* IRC_PART */
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;
/* 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] );
-
- if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
- else return CONNECTED;
+ 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 */
Req->argv[1] );
}
}
-
+
while( pattern )
{
/* Loop through all the channels */
}
chan = Channel_Next( chan );
}
-
+
/* Get next name ... */
if( Req->argc > 0 )
pattern = strtok( NULL, "," );
else
pattern = NULL;
}
-
+
return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from ));
} /* IRC_LIST */
}
ptr++;
}
-
+
/* Inform members of this channel */
IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add );
}
projects / ngircd-alex.git / blobdiff