moved invite/ban lists to channel structure

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

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 3e497a4afd64d1e5f476bd48beda17e0fc51fea4..1b3011761ceab4e4d0b646057144d75d10b2c9ce 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-oper.c,v 1.23 2005/07/11 14:11:35 fw Exp $";
+static char UNUSED id[] = "$Id: irc-oper.c,v 1.27 2006/07/23 15:43:18 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -23,7 +23,7 @@ static char UNUSED id[] = "$Id: irc-oper.c,v 1.23 2005/07/11 14:11:35 fw Exp $";
 
 #include "ngircd.h"
 #include "resolve.h"
-#include "conn.h"
+#include "conn-func.h"
 #include "conf.h"
 #include "client.h"
 #include "channel.h"
@@ -37,7 +37,7 @@ static char UNUSED id[] = "$Id: irc-oper.c,v 1.23 2005/07/11 14:11:35 fw Exp $";
 #include "irc-oper.h"
 
 
-LOCAL bool
+static bool
 Bad_OperPass(CLIENT *Client, char *errtoken, char *errmsg)
 {
        Log( LOG_WARNING, "Got invalid OPER from \"%s\": \"%s\" -- %s", Client_Mask( Client ),
@@ -90,21 +90,46 @@ IRC_OPER( CLIENT *Client, REQUEST *Req )
 
 
 GLOBAL bool
-IRC_DIE( CLIENT *Client, REQUEST *Req )
+IRC_DIE(CLIENT * Client, REQUEST * Req)
 {
        /* Shut down server */
 
-       assert( Client != NULL );
-       assert( Req != NULL );
+       CONN_ID c;
+       CLIENT *cl;
+
+       assert(Client != NULL);
+       assert(Req != NULL);
 
        /* Not a local IRC operator? */
-       if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
-       
+       if ((!Client_HasMode(Client, 'o')) || (!Client_OperByMe(Client)))
+               return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+                                         Client_ID(Client));
+
        /* Bad number of parameters? */
-       if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#ifdef STRICT_RFC
+       if (Req->argc != 0)
+#else
+       if (Req->argc > 1)
+#endif
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
+
+       /* Is a message given? */
+       if (Req->argc > 0) {
+               c = Conn_First();
+               while (c != NONE) {
+                       cl = Conn_GetClient(c);
+                       if (Client_Type(cl) == CLIENT_USER)
+                               IRC_WriteStrClient(cl, "NOTICE %s :%s",
+                                               Client_ID(cl), Req->argv[0]);
+                       c = Conn_Next(c);
+               }
+       }
 
-       Log( LOG_NOTICE|LOG_snotice, "Got DIE command from \"%s\" ...", Client_Mask( Client ));
+       Log(LOG_NOTICE | LOG_snotice, "Got DIE command from \"%s\" ...",
+           Client_Mask(Client));
        NGIRCd_SignalQuit = true;
+
        return CONNECTED;
 } /* IRC_DIE */
 
@@ -150,35 +175,52 @@ IRC_RESTART( CLIENT *Client, REQUEST *Req )
 } /* IRC_RESTART */
 
 
+/**
+ * Connect configured or new server.
+ */
 GLOBAL bool
-IRC_CONNECT(CLIENT *Client, REQUEST *Req )
+IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 {
-       /* Connect configured or new server */
 
-       assert( Client != NULL );
-       assert( Req != NULL );
+       assert(Client != NULL);
+       assert(Req != NULL);
 
        /* Not a local IRC operator? */
-       if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+       if ((!Client_HasMode(Client, 'o')) || (!Client_OperByMe(Client)))
+               return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+                                         Client_ID(Client));
 
        /* Bad number of parameters? */
-       if(( Req->argc != 2 ) && ( Req->argc != 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       if ((Req->argc != 2) && (Req->argc != 5))
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
 
        /* Invalid port number? */
-       if( atoi( Req->argv[1] ) < 1 )  return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       if (atoi(Req->argv[1]) < 1)
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
 
-       Log( LOG_NOTICE|LOG_snotice, "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask( Client ), Req->argv[0]);
+       Log(LOG_NOTICE | LOG_snotice,
+           "Got CONNECT command from \"%s\" for \"%s\".", Client_Mask(Client),
+           Req->argv[0]);
 
-       if( Req->argc == 2 )
-       {
+       if (Req->argc == 2) {
                /* Connect configured server */
-               if( ! Conf_EnableServer( Req->argv[0], atoi( Req->argv[1] ))) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
-       }
-       else
-       {
+               if (!Conf_EnableServer
+                   (Req->argv[0], (UINT16) atoi(Req->argv[1])))
+                       return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+                                                 Client_ID(Client),
+                                                 Req->argv[0]);
+       } else {
                /* Add server */
-               if( ! Conf_AddServer( Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], Req->argv[4] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+               if (!Conf_AddServer
+                   (Req->argv[0], (UINT16) atoi(Req->argv[1]), Req->argv[2],
+                    Req->argv[3], Req->argv[4]))
+                       return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+                                                 Client_ID(Client),
+                                                 Req->argv[0]);
        }
+
        return CONNECTED;
 } /* IRC_CONNECT */
 
@@ -208,7 +250,7 @@ IRC_DISCONNECT(CLIENT *Client, REQUEST *Req )
        if( ! Conf_DisableServer( Req->argv[0] )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
 
        /* Are we still connected or were we killed, too? */
-       if( Client_GetFromConn( my_conn )) return CONNECTED;
+       if( Conn_GetClient( my_conn )) return CONNECTED;
        else return DISCONNECTED;
 } /* IRC_CONNECT */