* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: irc-channel.c,v 1.10 2002/06/26 15:44:15 alex Exp $
+ * $Id: irc-channel.c,v 1.15 2002/09/16 09:16:17 alex Exp $
*
* irc-channel.c: IRC-Channel-Befehle
*/
IRC_JOIN( CLIENT *Client, REQUEST *Req )
{
CHAR *channame, *flags, *topic, modes[8];
- BOOLEAN is_new_chan;
+ BOOLEAN is_new_chan, is_invited, is_banned;
CLIENT *target;
CHANNEL *chan;
chan = Channel_Search( channame );
assert( chan != NULL );
+ is_banned = Lists_CheckBanned( target, chan );
+ is_invited = Lists_CheckInvited( target, chan );
+
/* Testen, ob Client gebanned ist */
- if( Lists_CheckBanned( target, chan ))
+ if(( is_banned == TRUE ) && ( is_invited == FALSE ))
{
- /* Client ist gebanned: */
+ /* Client ist gebanned (und nicht invited): */
IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
/* naechsten Namen ermitteln */
}
/* Ist der Channel "invite-only"? */
- if( strchr( Channel_Modes( chan ), 'i' ))
+ if(( strchr( Channel_Modes( chan ), 'i' ) != NULL ) && ( is_invited == FALSE ))
{
- /* Wurde der Client invited? */
- if( ! Lists_CheckInvited( target, chan ))
- {
- /* Client wurde nicht invited: */
- IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
-
- /* naechsten Namen ermitteln */
- channame = strtok( NULL, "," );
- continue;
- }
+ /* Channel ist "invite-only" und Client wurde nicht invited: */
+ IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
+
+ /* naechsten Namen ermitteln */
+ channame = strtok( NULL, "," );
+ continue;
}
}
}
if( modes[1] )
{
/* Modes im Channel bekannt machen */
- IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s %s :%s", channame, modes, Client_ID( target ));
+ IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], Client_ID( target ));
}
if( Client_Type( Client ) == CLIENT_USER )
{
CHAR *pattern;
CHANNEL *chan;
+ CLIENT *from, *target;
assert( Client != NULL );
assert( Req != NULL );
- if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
/* Falsche Anzahl Parameter? */
- if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
if( Req->argc > 0 ) pattern = strtok( Req->argv[0], "," );
else pattern = "*";
+
+ /* From aus Prefix ermitteln */
+ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+ else from = Client;
+ if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+
+ if( Req->argc == 2 )
+ {
+ /* an anderen Server forwarden */
+ target = Client_Search( Req->argv[1] );
+ if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+
+ if( target != Client_ThisServer( ))
+ {
+ /* Ok, anderer Server ist das Ziel: forwarden */
+ return IRC_WriteStrClientPrefix( target, from, "LIST %s :%s", from, Req->argv[1] );
+ }
+ }
while( pattern )
{
if( Match( pattern, Channel_Name( chan )))
{
/* Treffer! */
- if( ! IRC_WriteStrClient( Client, RPL_LIST_MSG, Client_ID( Client), Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;
+ if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;
}
chan = Channel_Next( chan );
}
else pattern = NULL;
}
- return IRC_WriteStrClient( Client, RPL_LISTEND_MSG, Client_ID( Client ));
+ return IRC_WriteStrClient( from, RPL_LISTEND_MSG, from );
} /* IRC_LIST */
+GLOBAL BOOLEAN
+IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
+{
+ CLIENT *from;
+ CHANNEL *chan;
+ CHAR *ptr;
+
+ assert( Client != NULL );
+ assert( Req != NULL );
+
+ if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+ /* Falsche Anzahl Parameter? */
+ if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+ /* From-Server suchen */
+ from = Client_Search( Req->prefix );
+ if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+ /* Channel suchen bzw. erzeugen */
+ chan = Channel_Search( Req->argv[0] );
+ if( ! chan ) chan = Channel_Create( Req->argv[0] );
+ if( ! chan ) return CONNECTED;
+
+ if( Req->argv[1][0] == '+' )
+ {
+ ptr = Channel_Modes( chan );
+ if( ! *ptr )
+ {
+ /* OK, es sind noch keine Modes gesetzt */
+ Channel_SetModes( chan, &Req->argv[1][1] );
+ IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] );
+ }
+ }
+ else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" );
+
+ if( Req->argc == 3 )
+ {
+ /* Es wurde auch ein Topic mit uebermittelt */
+ ptr = Channel_Topic( chan );
+ if( ! *ptr )
+ {
+ /* OK, es ist bisher kein Topic gesetzt */
+ Channel_SetTopic( chan, Req->argv[2] );
+ IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[2] );
+ }
+ }
+
+ /* an andere Server forwarden */
+ IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] );
+ return CONNECTED;
+} /* IRC_CHANINFO */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff