#include "portab.h"
-static char UNUSED id[] = "$Id: channel.c,v 1.38 2002/12/16 23:05:24 alex Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.44 2004/01/17 03:17:49 alex Exp $";
#include "imp.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
-#include "conn.h"
+#include "conn-func.h"
#include "client.h"
#include "exp.h"
if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return FALSE;
ptr = Name;
- strcpy( badchars, " ,:\x07" );
+ strcpy( badchars, " ,:\007" );
while( *ptr )
{
if( strchr( badchars, *ptr )) return FALSE;
if( ! strchr( Chan->modes, x[0] ))
{
/* Client hat den Mode noch nicht -> setzen */
- strcat( Chan->modes, x );
+ strlcat( Chan->modes, x, sizeof( Chan->modes ));
return TRUE;
}
else return FALSE;
if( ! strchr( cl2chan->modes, x[0] ))
{
/* Client hat den Mode noch nicht -> setzen */
- strcat( cl2chan->modes, x );
+ strlcat( cl2chan->modes, x, sizeof( cl2chan->modes ));
return TRUE;
}
else return FALSE;
assert( Chan != NULL );
assert( Topic != NULL );
- strncpy( Chan->topic, Topic, CHANNEL_TOPIC_LEN - 1 );
- Chan->topic[CHANNEL_TOPIC_LEN - 1] = '\0';
+ strlcpy( Chan->topic, Topic, sizeof( Chan->topic ));
} /* Channel_SetTopic */
assert( Chan != NULL );
assert( Modes != NULL );
- strncpy( Chan->modes, Modes, CHANNEL_MODE_LEN - 1 );
- Chan->topic[CHANNEL_MODE_LEN - 1] = '\0';
+ strlcpy( Chan->modes, Modes, sizeof( Chan->modes ));
} /* Channel_SetModes */
assert( Chan != NULL );
assert( Key != NULL );
- strncpy( Chan->key, Key, CLIENT_PASS_LEN - 1 );
- Chan->key[CLIENT_PASS_LEN - 1] = '\0';
+ strlcpy( Chan->key, Key, sizeof( Chan->key ));
Log( LOG_DEBUG, "Channel %s: Key is now \"%s\".", Chan->name, Chan->key );
} /* Channel_SetKey */
{
BOOLEAN is_member, has_voice, is_op, ok;
- /* Okay, Ziel ist ein Channel */
+ /* Okay, target is a channel */
is_member = has_voice = is_op = FALSE;
if( Channel_IsMemberOf( Chan, From ))
{
if( strchr( Channel_UserModes( Chan, From ), 'o' )) is_op = TRUE;
}
- /* pruefen, ob Client in Channel schreiben darf */
+ /* Check weather client is 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 banned? */
+ if( Lists_CheckBanned( From, Chan ))
+ {
+ /* Client is banned, bus is he channel operator or has voice? */
+ if(( ! has_voice ) && ( ! is_op )) ok = FALSE;
+ }
if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
- /* Text senden */
+ /* 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 */
return NULL;
}
c->next = NULL;
- strncpy( c->name, Name, CHANNEL_NAME_LEN - 1 );
+ strlcpy( c->name, Name, sizeof( c->name ));
c->name[CHANNEL_NAME_LEN - 1] = '\0';
strcpy( c->modes, "" );
strcpy( c->topic, "" );