albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This adds support for sending NOTICEs to a channel. 

[also see Bug #70 in ngircd bugzilla].

Based on a patch by Fabian Schlager <fabian.schlager@gmail.com>.
This commit is contained in:
Florian Westphal 2008-01-15 22:28:14 +00:00
parent 4add9c29ed
commit 59b19ea6a3
4 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -12,8 +12,11 @@
ngIRCd HEAD
ngIRCd 0.11.0-pre2 (2008-01-07)
- allow NOTICEs to be sent to a channel. (Fabian Schlager)
ngIRCd 0.11.0 (2008-01-15)
ngIRCd 0.11.0-pre2 (2008-01-07)
- SECURITY: IRC_PART could reference invalid memory, causing
ngircd to crash [from HEAD].
@ -735,4 +738,4 @@ ngIRCd 0.0.1, 31.12.2001
--
$Id: ChangeLog,v 1.334 2008/01/07 23:08:14 alex Exp $
$Id: ChangeLog,v 1.335 2008/01/15 22:28:15 fw Exp $

72
src/ngircd/channel.c
View File

@ -17,7 +17,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: channel.c,v 1.63 2007/06/11 20:06:46 fw Exp $";
static char UNUSED id[] = "$Id: channel.c,v 1.64 2008/01/15 22:28:14 fw Exp $";
#include "imp.h"
#include <assert.h>
@ -695,38 +695,66 @@ Channel_SetMaxUsers(CHANNEL *Chan, unsigned long Count)
} /* Channel_SetMaxUsers */
GLOBAL bool
Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text )
static bool
Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
{
bool is_member, has_voice, is_op, ok;
bool is_member, has_voice, is_op;
/* Okay, target is a channel */
is_member = has_voice = is_op = false;
if( Channel_IsMemberOf( Chan, From ))
{
if (Channel_IsMemberOf(Chan, From)) {
is_member = true;
if( strchr( Channel_UserModes( Chan, From ), 'v' )) has_voice = true;
if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = true;
if (strchr(Channel_UserModes(Chan, From), 'v'))
has_voice = true;
if (strchr(Channel_UserModes(Chan, From), 'o'))
is_op = true;
}
/* Is the client allowed to write to channel? */
ok = true;
if( strchr( Channel_Modes( Chan ), 'n' ) && ( ! is_member )) ok = false;
if( strchr( Channel_Modes( Chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = false;
/*
* Is the client allowed to write to channel?
*
* If channel mode n set: non-members cannot send to channel.
* If channel mode m set: need voice.
*/
if (strchr(Channel_Modes(Chan), 'n') && !is_member)
return false;
/* Is the client banned? */
if( Lists_Check(&Chan->list_bans, From))
if (is_op || has_voice)
return true;
if (strchr(Channel_Modes(Chan), 'm'))
return false;
return !Lists_Check(&Chan->list_bans, From);
}
GLOBAL bool
Channel_Write(CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text)
{
/* Client is banned, but is he channel operator or has voice? */
if(( ! has_voice ) && ( ! is_op )) ok = false;
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);
}
if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
/* Send text */
if( Client_Conn( From ) > NONE ) Conn_UpdateIdle( Client_Conn( From ));
return IRC_WriteStrChannelPrefix( Client, Chan, From, true, "PRIVMSG %s :%s", Channel_Name( Chan ), Text );
} /* Channel_Write */
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 (Client_Conn(From) > NONE)
Conn_UpdateIdle(Client_Conn(From));
return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
"NOTICE %s :%s", Channel_Name(Chan), Text);
}
GLOBAL CHANNEL *

5
src/ngircd/channel.h
View File

@ -8,7 +8,7 @@
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
*
* $Id: channel.h,v 1.33 2006/12/07 22:23:39 fw Exp $
* $Id: channel.h,v 1.34 2008/01/15 22:28:14 fw Exp $
*
* Channel management (header)
*/
@ -109,7 +109,8 @@ GLOBAL char *Channel_UserModes PARAMS(( CHANNEL *Chan, CLIENT *Client ));
GLOBAL bool Channel_IsMemberOf PARAMS(( CHANNEL *Chan, CLIENT *Client ));
GLOBAL bool Channel_Write PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text ));
GLOBAL bool Channel_Write PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text ));
GLOBAL bool Channel_Notice PARAMS(( CHANNEL *Chan, CLIENT *From, CLIENT *Client, const char *Text));
GLOBAL CHANNEL *Channel_Create PARAMS(( char *Name ));

12
src/ngircd/irc.c
View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: irc.c,v 1.131 2006/07/23 14:55:40 alex Exp $";
static char UNUSED id[] = "$Id: irc.c,v 1.132 2008/01/15 22:28:14 fw Exp $";
#include "imp.h"
#include <assert.h>
@ -170,6 +170,7 @@ GLOBAL bool
IRC_NOTICE( CLIENT *Client, REQUEST *Req )
{
CLIENT *to, *from;
CHANNEL *chan;
assert( Client != NULL );
assert( Req != NULL );
@ -189,7 +190,14 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req )
/* Okay, Ziel ist ein User */
return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
}
else return CONNECTED;
else
{
chan = Channel_Search(Req->argv[0]);
if (chan)
return Channel_Notice(chan, from, Client, Req->argv[1]);
}
return CONNECTED;
} /* IRC_NOTICE */