#include "portab.h"
-static char UNUSED id[] = "$Id: channel.c,v 1.61 2006/12/07 22:23:39 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.65 2008/02/05 16:31:35 fw Exp $";
#include "imp.h"
#include <assert.h>
static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
-static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
+static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer ));
static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
while (*c)
Channel_ModeAdd(chan, *c++);
+ Channel_SetKey(chan, Conf_Channel[i].key);
+ Channel_SetMaxUsers(chan, Conf_Channel[i].maxusers);
+
Log(LOG_INFO, "Created pre-defined channel \"%s\".",
Conf_Channel[i].name );
}
{
CHANNEL *c, *c_next;
CL2CHAN *cl2chan, *cl2chan_next;
-
+
/* Channel-Strukturen freigeben */
c = My_Channels;
while( c )
} /* Channel_Join */
+/**
+ * Remove client from channel.
+ * This function lets a client lead a channel. First, the function checks
+ * if the channel exists and the client is a member of it and sends out
+ * appropriate error messages if not. The real work is done by the function
+ * Remove_Client().
+ */
GLOBAL bool
-Channel_Part( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
+Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Reason)
{
CHANNEL *chan;
- assert( Client != NULL );
- assert( Name != NULL );
- assert( Reason != NULL );
+ assert(Client != NULL);
+ assert(Name != NULL);
+ assert(Reason != NULL);
- chan = Channel_Search( Name );
- if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client )))
- {
- IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
+ chan = Channel_Search(Name);
+ if (!chan) {
+ IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
+ Client_ID(Client), Name);
+ return false;
+ }
+ if (!Get_Cl2Chan(chan, Client)) {
+ IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG,
+ Client_ID(Client), Name);
return false;
}
- /* User aus Channel entfernen */
- if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, true)) return false;
- else return true;
+ if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true))
+ return false;
+ else
+ return true;
} /* Channel_Part */
GLOBAL CHANNEL *
-Channel_Search( char *Name )
+Channel_Search( const char *Name )
{
/* Channel-Struktur suchen */
{
assert( Name != NULL );
- if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false;
+ if (strchr("+#", Name[0]) == NULL)
+ return false;
+ if (strlen(Name) >= CHANNEL_NAME_LEN)
+ return false;
return Name[strcspn(Name, " ,:\007")] == 0;
} /* Channel_IsValidName */
assert( Chan != NULL );
assert( Client != NULL );
- return Get_Cl2Chan(Chan, Client);
+ return Get_Cl2Chan(Chan, Client) != NULL;
} /* Channel_IsMemberOf */
} /* 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))
- {
- /* Client is banned, but is he channel operator or has voice? */
- if(( ! has_voice ) && ( ! is_op )) ok = false;
- }
+ 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)
+{
+ 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));
- if( ! ok ) return IRC_WriteStrClient( From, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( From ), Channel_Name( Chan ));
+ return IRC_WriteStrChannelPrefix(Client, Chan, From, true,
+ "PRIVMSG %s :%s", Channel_Name(Chan), Text);
+}
- /* 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 *
static bool
-Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer )
+Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer )
{
CL2CHAN *cl2chan, *last_cl2chan;
CHANNEL *c;
IRC_WriteStrClientPrefix(Client, Origin, "KICK %s %s :%s",
c->name, Client_ID( Client ), Reason);
}
- LogDebug("User \"%s\" has been kicked of \"%s\" by \"%s\": %s.",
+ LogDebug("User \"%s\" has been kicked off \"%s\" by \"%s\": %s.",
Client_Mask( Client ), c->name, Client_ID(Origin), Reason);
break;
default: /* PART */
{
if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
}
-
+
return true;
} /* Remove_Client */
projects / ngircd.git / blobdiff