- 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 551c74bd5aa2ca6bd49003de3509bbd521d003dc..67e72bfb9ef5a12cb1b37a1d1864751607e6f49b 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -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.
  *
  * 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.5 2002/05/21 00:10:16 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
  */


@@ -22,16 +22,22 @@
 #include <string.h>
 
 #include "defines.h"
 #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 "messages.h"
 #include "log.h"
 #include "messages.h"

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

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


@@ -52,12 +58,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 */
        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;
 


@@ -69,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) */


@@ -83,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) */


@@ -133,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;


@@ -169,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;


@@ -189,7 +234,7 @@ GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 
        /* Welcher Channel? */
        chan = Channel_Search( Req->argv[0] );
 
        /* 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] );


@@ -221,7 +266,8 @@ GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 } /* IRC_TOPIC */
 
 
 } /* IRC_TOPIC */
 
 

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

 {
        CHAR *pattern;
        CHANNEL *chan;
 {
        CHAR *pattern;
        CHANNEL *chan;