]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-channel.c
- LIST kann nun auch an andere Server geforwarded werden.
[ngircd-alex.git] / src / ngircd / irc-channel.c
index 87e352759d2a4f05bae3946530a6c850b0fb09e3..aa41b7de4af527bd3bd774b122867a29c7b00c3c 100644 (file)
@@ -9,7 +9,7 @@
  * 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.3 2002/03/25 17:08:54 alex Exp $
+ * $Id: irc-channel.c,v 1.15 2002/09/16 09:16:17 alex Exp $
  *
  * irc-channel.c: IRC-Channel-Befehle
  */
 #include <string.h>
 
 #include "defines.h"
-#include "irc.h"
-#include "irc-write.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "lists.h"
 #include "log.h"
+#include "match.h"
 #include "messages.h"
+#include "parse.h"
+#include "irc.h"
+#include "irc-write.h"
 
 #include "exp.h"
 #include "irc-channel.h"
 
 
-GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+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;
 
@@ -52,12 +59,13 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
        if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        /* Channel-Namen durchgehen */
+       chan = NULL;
        channame = strtok( Req->argv[0], "," );
        while( channame )
        {
-               /* wird der Channel neu angelegt? */
-               flags = NULL;
+               chan = flags = NULL;
 
+               /* wird der Channel neu angelegt? */
                if( Channel_Search( channame )) is_new_chan = FALSE;
                else is_new_chan = TRUE;
 
@@ -66,14 +74,53 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                {
                        /* Channel-Flags extrahieren */
                        flags = strchr( channame, 0x7 );
-                       if( flags ) *flags++ = '\0';
+                       if( flags )
+                       {
+                               *flags = '\0';
+                               flags++;
+                       }
                }
 
-               /* neuer Channel udn lokaler Client? */
-               if( is_new_chan && ( Client_Type( Client ) == CLIENT_USER ))
+               /* Lokaler Client? */
+               if( Client_Type( Client ) == CLIENT_USER )
                {
-                       /* Dann soll der Client Channel-Operator werden! */
-                       flags = "o";
+                       /* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */
+                       if( is_new_chan )
+                       {
+                               /* Erster User im Channel: Operator-Flag setzen */
+                               flags = "o";
+                       }
+                       else
+                       {
+                               /* Existierenden Channel suchen */
+                               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(( is_banned == TRUE ) &&  ( is_invited == FALSE ))
+                               {
+                                       /* Client ist gebanned (und nicht invited): */
+                                       IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
+
+                                       /* naechsten Namen ermitteln */
+                                       channame = strtok( NULL, "," );
+                                       continue;
+                               }
+
+                               /* Ist der Channel "invite-only"? */
+                               if(( strchr( Channel_Modes( chan ), 'i' ) != NULL ) && ( is_invited == FALSE ))
+                               {
+                                       /* 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;
+                               }
+                       }
                }
 
                /* Channel joinen (und ggf. anlegen) */
@@ -83,7 +130,7 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        channame = strtok( NULL, "," );
                        continue;
                }
-               chan = Channel_Search( channame );
+               if( ! chan ) chan = Channel_Search( channame );
                assert( chan != NULL );
 
                /* Modes setzen (wenn vorhanden) */
@@ -93,6 +140,9 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        flags++;
                }
 
+               /* Wenn persistenter Channel und IRC-Operator: zum Channel-OP machen */
+               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 ));
                if( modes[1] ) modes[0] = 0x7;
@@ -106,7 +156,7 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                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 )
@@ -130,7 +180,8 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
 } /* IRC_JOIN */
 
 
-GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_PART( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target;
        CHAR *chan;
@@ -166,7 +217,8 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
 } /* IRC_PART */
 
 
-GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 {
        CHANNEL *chan;
        CLIENT *from;
@@ -186,7 +238,7 @@ GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 
        /* Welcher Channel? */
        chan = Channel_Search( Req->argv[0] );
-       if( ! chan ) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+       if( ! chan ) return IRC_WriteStrClient( from, ERR_NOSUCHCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
 
        /* Ist der User Mitglied in dem Channel? */
        if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
@@ -218,4 +270,118 @@ GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 } /* IRC_TOPIC */
 
 
+GLOBAL BOOLEAN
+IRC_LIST( CLIENT *Client, REQUEST *Req )
+{
+       CHAR *pattern;
+       CHANNEL *chan;
+       CLIENT *from, *target;
+
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       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 > 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 )
+       {
+               /* alle Channel durchgehen */
+               chan = Channel_First( );
+               while( chan )
+               {
+                       /* Passt die Suchmaske auf diesen Channel? */
+                       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;
+                       }
+                       chan = Channel_Next( chan );
+               }
+               
+               /* naechsten Namen ermitteln */
+               if( Req->argc > 0 ) pattern = strtok( NULL, "," );
+               else pattern = NULL;
+       }
+       
+       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- */