Report ERR_NOTONCHANNEL when trying to part a channel one is not member of.

[ngircd.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 84bf685cef7aa1971630ba66069d746c41b06e8b..32f911a200f6269eed0f51420a8523ea980c0b78 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.64 2008/01/15 22:28:14 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.65 2008/02/05 16:31:35 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -56,7 +56,7 @@ static CL2CHAN *My_Cl2Chan;
 
 static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
 static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
-static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
+static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer ));
 static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
 static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
 static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
@@ -201,25 +201,38 @@ Channel_Join( CLIENT *Client, char *Name )
 } /* Channel_Join */
 
 
+/**
+ * Remove client from channel.
+ * This function lets a client lead a channel. First, the function checks
+ * if the channel exists and the client is a member of it and sends out
+ * appropriate error messages if not. The real work is done by the function
+ * Remove_Client().
+ */
 GLOBAL bool
-Channel_Part( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
+Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Reason)
 {
        CHANNEL *chan;
 
-       assert( Client != NULL );
-       assert( Name != NULL );
-       assert( Reason != NULL );
+       assert(Client != NULL);
+       assert(Name != NULL);
+       assert(Reason != NULL);
 
-       chan = Channel_Search( Name );
-       if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client )))
-       {
-               IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
+       chan = Channel_Search(Name);
+       if (!chan) {
+               IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG,
+                                  Client_ID(Client), Name);
+               return false;
+       }
+       if (!Get_Cl2Chan(chan, Client)) {
+               IRC_WriteStrClient(Client, ERR_NOTONCHANNEL_MSG,
+                                  Client_ID(Client), Name);
                return false;
        }
 
-       /* User aus Channel entfernen */
-       if( ! Remove_Client( REMOVE_PART, chan, Client, Origin, Reason, true)) return false;
-       else return true;
+       if (!Remove_Client(REMOVE_PART, chan, Client, Origin, Reason, true))
+               return false;
+       else
+               return true;
 } /* Channel_Part */
 
 
@@ -388,7 +401,7 @@ Channel_Next( CHANNEL *Chan )
 
 
 GLOBAL CHANNEL *
-Channel_Search( char *Name )
+Channel_Search( const char *Name )
 {
        /* Channel-Struktur suchen */
        
@@ -829,7 +842,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
 
 
 static bool
-Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer )
+Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer )
 {
        CL2CHAN *cl2chan, *last_cl2chan;
        CHANNEL *c;
@@ -903,7 +916,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
        {
                if( ! Get_First_Cl2Chan( NULL, Chan )) Delete_Channel( Chan );
        }
-               
+
        return true;
 } /* Remove_Client */