X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=90b0c0974514a169dc1833a349f6f2689bccfac3;hp=926d345e9dbf5267302e6a59a0699afb33e01f21;hb=8adff5922376676c2eeb49de1cbab86cc345b887;hpb=69ad0e386e064bf95fc77d179f88d3ae04405d30 diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 926d345e..90b0c097 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -14,10 +14,12 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-channel.c,v 1.21 2002/12/16 23:06:46 alex Exp $"; +static char UNUSED id[] = "$Id: irc-channel.c,v 1.29 2005/03/19 18:43:48 fw Exp $"; #include "imp.h" #include +#include +#include #include #include "defines.h" @@ -38,11 +40,11 @@ static char UNUSED id[] = "$Id: irc-channel.c,v 1.21 2002/12/16 23:06:46 alex Ex #include "irc-channel.h" -GLOBAL BOOLEAN +GLOBAL bool IRC_JOIN( CLIENT *Client, REQUEST *Req ) { - CHAR *channame, *key, *flags, *topic, modes[8]; - BOOLEAN is_new_chan, is_invited, is_banned; + char *channame, *key, *flags, *topic, modes[8]; + bool is_new_chan, is_invited, is_banned; CLIENT *target; CHANNEL *chan; @@ -66,11 +68,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) channame = strtok( Req->argv[0], "," ); while( channame ) { - chan = flags = NULL; + chan = NULL; flags = NULL; /* wird der Channel neu angelegt? */ - if( Channel_Search( channame )) is_new_chan = FALSE; - else is_new_chan = TRUE; + if( Channel_Search( channame )) is_new_chan = false; + else is_new_chan = true; /* Hat ein Server Channel-User-Modes uebergeben? */ if( Client_Type( Client ) == CLIENT_SERVER ) @@ -84,7 +86,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } } - /* Lokaler Client? */ + /* Local client? */ if( Client_Type( Client ) == CLIENT_USER ) { /* Test if the user has reached his maximum channel count */ @@ -113,7 +115,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) is_invited = Lists_CheckInvited( target, chan ); /* Testen, ob Client gebanned ist */ - if(( is_banned == TRUE ) && ( is_invited == FALSE )) + if(( is_banned == true) && ( is_invited == false )) { /* Client ist gebanned (und nicht invited): */ IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame ); @@ -124,7 +126,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } /* Ist der Channel "invite-only"? */ - if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == FALSE )) + if(( strchr( Channel_Modes( chan ), 'i' )) && ( is_invited == false )) { /* Channel ist "invite-only" und Client wurde nicht invited: */ IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame ); @@ -157,6 +159,16 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } } } + else + { + /* Remote server: we don't need to know whether the + * client is invited or not, but we have to make sure + * that the "one shot" entries (generated by INVITE + * commands) in this list become deleted when a user + * joins a channel this way. */ + chan = Channel_Search( channame ); + if( chan != NULL ) (void)Lists_CheckInvited( target, chan ); + } /* Channel joinen (und ggf. anlegen) */ if( ! Channel_Join( target, channame )) @@ -179,7 +191,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if(( strchr( Channel_Modes( chan ), 'P' )) && ( strchr( Client_Modes( target ), 'o' ))) Channel_UserModeAdd( chan, target, 'o' ); /* Muessen Modes an andere Server gemeldet werden? */ - strcpy( &modes[1], Channel_UserModes( chan, target )); + strlcpy( &modes[1], Channel_UserModes( chan, target ), sizeof( modes ) - 1 ); if( modes[1] ) modes[0] = 0x7; else modes[0] = '\0'; @@ -187,11 +199,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes ); /* im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame ); + IRC_WriteStrChannelPrefix( Client, chan, target, false, "JOIN :%s", channame ); if( modes[1] ) { /* Modes im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s +%s %s", channame, &modes[1], 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 ) @@ -215,11 +227,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } /* IRC_JOIN */ -GLOBAL BOOLEAN +GLOBAL bool IRC_PART( CLIENT *Client, REQUEST *Req ) { CLIENT *target; - CHAR *chan; + char *chan; assert( Client != NULL ); assert( Req != NULL ); @@ -250,12 +262,12 @@ IRC_PART( CLIENT *Client, REQUEST *Req ) } /* IRC_PART */ -GLOBAL BOOLEAN +GLOBAL bool IRC_TOPIC( CLIENT *Client, REQUEST *Req ) { CHANNEL *chan; CLIENT *from; - CHAR *topic; + char *topic; assert( Client != NULL ); assert( Req != NULL ); @@ -294,17 +306,17 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) /* im Channel bekannt machen und an Server weiterleiten */ IRC_WriteStrServersPrefix( Client, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); + IRC_WriteStrChannelPrefix( Client, chan, from, false, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); if( Client_Type( Client ) == CLIENT_USER ) return IRC_WriteStrClientPrefix( Client, Client, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); else return CONNECTED; } /* IRC_TOPIC */ -GLOBAL BOOLEAN +GLOBAL bool IRC_LIST( CLIENT *Client, REQUEST *Req ) { - CHAR *pattern; + char *pattern; CHANNEL *chan; CLIENT *from, *target; @@ -326,7 +338,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) { /* 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_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); if( target != Client_ThisServer( )) { @@ -337,15 +349,19 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) while( pattern ) { - /* alle Channel durchgehen */ + /* Loop through all the channels */ chan = Channel_First( ); while( chan ) { - /* Passt die Suchmaske auf diesen Channel? */ + /* Check search pattern */ if( Match( pattern, Channel_Name( chan ))) { - /* Treffer! */ - if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED; + /* Gotcha! */ + if( ! strchr( Channel_Modes( chan ), 's' ) || + Channel_IsMemberOf( chan, from )) + { + if( ! IRC_WriteStrClient( from, RPL_LIST_MSG, from, Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED; + } } chan = Channel_Next( chan ); } @@ -359,24 +375,30 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) } /* IRC_LIST */ -GLOBAL BOOLEAN +GLOBAL bool IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) { + char modes_add[COMMAND_LEN], l[16], *ptr; CLIENT *from; CHANNEL *chan; - CHAR *ptr; + int arg_topic; assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Bad number of parameters? */ + if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + /* Compatibility kludge */ + if( Req->argc == 5 ) arg_topic = 4; + else if( Req->argc == 3 ) arg_topic = 2; + else arg_topic = -1; - /* From-Server suchen */ + /* Search origin */ from = Client_Search( Req->prefix ); if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - /* Channel suchen bzw. erzeugen */ + /* Search or create channel */ chan = Channel_Search( Req->argv[0] ); if( ! chan ) chan = Channel_Create( Req->argv[0] ); if( ! chan ) return CONNECTED; @@ -386,27 +408,61 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) ptr = Channel_Modes( chan ); if( ! *ptr ) { - /* OK, es sind noch keine Modes gesetzt */ + /* OK, this channel doesn't have modes jet, set the received ones: */ Channel_SetModes( chan, &Req->argv[1][1] ); - IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] ); + + if( Req->argc == 5 ) + { + if( strchr( Channel_Modes( chan ), 'k' )) Channel_SetKey( chan, Req->argv[2] ); + if( strchr( Channel_Modes( chan ), 'l' )) Channel_SetMaxUsers( chan, atol( Req->argv[3] )); + } + else + { + /* Delete modes which we never want to inherit */ + Channel_ModeDel( chan, 'l' ); + Channel_ModeDel( chan, 'k' ); + } + + strcpy( modes_add, "" ); + ptr = Channel_Modes( chan ); + while( *ptr ) + { + if( *ptr == 'l' ) + { + snprintf( l, sizeof( l ), " %ld", Channel_MaxUsers( chan )); + strlcat( modes_add, l, sizeof( modes_add )); + } + if( *ptr == 'k' ) + { + strlcat( modes_add, " ", sizeof( modes_add )); + strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add )); + } + ptr++; + } + + /* Inform members of this channel */ + IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add ); } } - else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" ); + else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" ); - if( Req->argc == 3 ) + if( arg_topic > 0 ) { - /* Es wurde auch ein Topic mit uebermittelt */ + /* We got a topic */ ptr = Channel_Topic( chan ); - if( ! *ptr ) + if(( ! *ptr ) && ( Req->argv[arg_topic][0] )) { - /* 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] ); + /* OK, there is no topic jet */ + Channel_SetTopic( chan, Req->argv[arg_topic] ); + IRC_WriteStrChannelPrefix( Client, chan, from, false, "TOPIC %s :%s", Req->argv[0], Channel_Topic( chan )); } } - /* an andere Server forwarden */ - IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] ); + /* Forward CHANINFO to other serevrs */ + if( Req->argc == 5 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2], Req->argv[3], Req->argv[4] ); + else if( Req->argc == 3 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] ); + else IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s", Req->argv[0], Req->argv[1] ); + return CONNECTED; } /* IRC_CHANINFO */