- JOIN: Invite- und Ban-Lists werden nun beachtet.

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 1a1fd931a49693708365f1693ffcf92baed8e88f..67e72bfb9ef5a12cb1b37a1d1864751607e6f49b 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -9,34 +9,35 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
  * 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.1 2002/03/03 17:15:11 alex Exp $
+ * $Id: irc-channel.c,v 1.8 2002/06/02 14:51:14 alex Exp $

  *
  * irc-channel.c: IRC-Channel-Befehle
  *
  * irc-channel.c: IRC-Channel-Befehle

- *
- * $Log: irc-channel.c,v $
- * Revision 1.1  2002/03/03 17:15:11  alex
- * - Source in weitere Module fuer IRC-Befehle aufgesplitted.
- *

  */
 
 
  */
 
 

-#include <portab.h>
-#include "global.h"
+#include "portab.h"

 
 

-#include <imp.h>
+#include "imp.h"

 #include <assert.h>
 #include <string.h>
 
 #include <assert.h>
 #include <string.h>
 

-#include "irc.h"
-#include "irc-write.h"
+#include "defines.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
+#include "lists.h"

 #include "log.h"
 #include "messages.h"
 #include "log.h"
 #include "messages.h"

+#include "parse.h"
+#include "irc.h"
+#include "irc-write.h"

 
 

-#include <exp.h>
+#include "exp.h"

 #include "irc-channel.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;
 {
        CHAR *channame, *flags, *topic, modes[8];
        BOOLEAN is_new_chan;


@@ -52,17 +53,18 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
        if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Wer ist der Absender? */
        if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Wer ist der Absender? */

-       if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix );
+       if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );

        else target = Client;
        if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        /* Channel-Namen durchgehen */
        else target = Client;
        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 )
        {
        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;
 
                if( Channel_Search( channame )) is_new_chan = FALSE;
                else is_new_chan = TRUE;
 


@@ -74,11 +76,47 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        if( flags ) *flags++ = '\0';
                }
 
                        if( flags ) *flags++ = '\0';
                }
 

-               /* 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 );
+
+                               /* Testen, ob Client gebanned ist */
+                               if( Lists_CheckBanned( target, chan ))
+                               {
+                                       /* Client ist gebanned: */
+                                       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' ))
+                               {
+                                       /* 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 joinen (und ggf. anlegen) */
                }
 
                /* Channel joinen (und ggf. anlegen) */


@@ -88,7 +126,7 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        channame = strtok( NULL, "," );
                        continue;
                }
                        channame = strtok( NULL, "," );
                        continue;
                }

-               chan = Channel_Search( channame );
+               if( ! chan ) chan = Channel_Search( channame );

                assert( chan != NULL );
 
                /* Modes setzen (wenn vorhanden) */
                assert( chan != NULL );
 
                /* Modes setzen (wenn vorhanden) */


@@ -98,6 +136,9 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        flags++;
                }
 
                        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;
                /* Muessen Modes an andere Server gemeldet werden? */
                strcpy( &modes[1], Channel_UserModes( chan, target ));
                if( modes[1] ) modes[0] = 0x7;


@@ -135,7 +176,8 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
 } /* IRC_JOIN */
 
 
 } /* IRC_JOIN */
 
 

-GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_PART( CLIENT *Client, REQUEST *Req )

 {
        CLIENT *target;
        CHAR *chan;
 {
        CLIENT *target;
        CHAR *chan;


@@ -149,7 +191,7 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Wer ist der Absender? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Wer ist der Absender? */

-       if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix );
+       if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );

        else target = Client;
        if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        else target = Client;
        if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 


@@ -171,7 +213,8 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
 } /* IRC_PART */
 
 
 } /* IRC_PART */
 
 

-GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_TOPIC( CLIENT *Client, REQUEST *Req )

 {
        CHANNEL *chan;
        CLIENT *from;
 {
        CHANNEL *chan;
        CLIENT *from;


@@ -185,13 +228,13 @@ GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
        /* Falsche Anzahl Parameter? */
        if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Falsche Anzahl Parameter? */
        if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 

-       if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+       if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );

        else from = Client;
        if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        /* Welcher Channel? */
        chan = Channel_Search( Req->argv[0] );
        else from = Client;
        if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        /* 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] );
 
        /* 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] );


@@ -223,4 +266,46 @@ GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 } /* IRC_TOPIC */
 
 
 } /* IRC_TOPIC */
 
 

+GLOBAL BOOLEAN
+IRC_LIST( CLIENT *Client, REQUEST *Req )
+{
+       CHAR *pattern;
+       CHANNEL *chan;
+
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       if( Client_Type( Client ) != CLIENT_USER ) 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 > 0 ) pattern = strtok( Req->argv[0], "," );
+       else pattern = "*";
+       
+       while( pattern )
+       {
+               /* alle Channel durchgehen */
+               chan = Channel_First( );
+               while( chan )
+               {
+                       /* Passt die Suchmaske auf diesen Channel? Bisher werden hier
+                        * "regular expressions" aber noch nicht unterstuetzt ... */
+                       if(( strcasecmp( pattern, Channel_Name( chan )) == 0 ) || ( strcmp( pattern, "*" ) == 0 ))
+                       {
+                               /* Treffer! */
+                               if( ! IRC_WriteStrClient( Client, RPL_LIST_MSG, Client_ID( Client), 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( Client, RPL_LISTEND_MSG, Client_ID( Client ));
+} /* IRC_LIST */
+
+

 /* -eof- */
 /* -eof- */