/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 by 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: channel.c,v 1.65 2008/02/05 16:31:35 fw Exp $";
-
#include "imp.h"
#include <assert.h>
#include <stdlib.h>
} /* Channel_Part */
-/* Kick user from Channel */
+/**
+ * Kick user from Channel
+ */
GLOBAL void
-Channel_Kick( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason )
+Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
+ const char *Reason )
{
CHANNEL *chan;
- assert( Client != NULL );
- assert( Origin != NULL );
- assert( Name != NULL );
- assert( Reason != NULL );
+ assert(Peer != NULL);
+ assert(Target != NULL);
+ assert(Origin != NULL);
+ assert(Name != NULL);
+ assert(Reason != NULL);
/* Check that channel exists */
chan = Channel_Search( Name );
return;
}
- /* Check that user is on the specified channel */
- if( ! Channel_IsMemberOf( chan, Origin ))
- {
- IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
- return;
- }
+ if (Client_Type(Peer) != CLIENT_SERVER &&
+ Client_Type(Origin) != CLIENT_SERVICE) {
+ /* Check that user is on the specified channel */
+ if (!Channel_IsMemberOf(chan, Origin)) {
+ IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG,
+ Client_ID(Origin), Name);
+ return;
+ }
- /* Check if user has operator status */
- if( ! strchr( Channel_UserModes( chan, Origin ), 'o' ))
- {
- IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name);
- return;
+ /* Check if user has operator status */
+ if (!strchr(Channel_UserModes(chan, Origin), 'o')) {
+ IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG,
+ Client_ID(Origin), Name);
+ return;
+ }
}
/* Check that the client to be kicked is on the specified channel */
- if( ! Channel_IsMemberOf( chan, Client ))
- {
- IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name );
+ if (!Channel_IsMemberOf(chan, Target)) {
+ IRC_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
+ Client_ID(Origin), Client_ID(Target), Name );
return;
}
/* Kick Client from channel */
- Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, true);
+ Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true);
} /* Channel_Kick */
{
assert( Name != NULL );
+#ifdef STRICT_RFC
+ if (strlen(Name) <= 1)
+ return false;
+#endif
if (strchr("+#", Name[0]) == NULL)
return false;
if (strlen(Name) >= CHANNEL_NAME_LEN)
GLOBAL bool
-Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
+Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Command,
+ bool SendErrors, const char *Text)
{
- if (!Can_Send_To_Channel(Chan, From))
- return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID(From), Channel_Name(Chan));
-
- if (Client_Conn(From) > NONE)
- Conn_UpdateIdle(Client_Conn(From));
-
- return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
- "PRIVMSG %s :%s", Channel_Name(Chan), Text);
-}
-
-
-GLOBAL bool
-Channel_Notice(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
-{
- if (!Can_Send_To_Channel(Chan, From))
- return true; /* no error, see RFC 2812 */
+ if (!Can_Send_To_Channel(Chan, From)) {
+ if (! SendErrors)
+ return CONNECTED; /* no error, see RFC 2812 */
+ return IRC_WriteStrClient(From, ERR_CANNOTSENDTOCHAN_MSG,
+ Client_ID(From), Channel_Name(Chan));
+ }
if (Client_Conn(From) > NONE)
Conn_UpdateIdle(Client_Conn(From));
return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
- "NOTICE %s :%s", Channel_Name(Chan), Text);
+ "%s %s :%s", Command, Channel_Name(Chan), Text);
}