Implement account login support

[ngircd-alex.git] / src / ngircd / client.c

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index d70cfb4e3b307bf7b13f2be2e3939aa0f4f5f543..32690288529499097c0b6d88c1127774202f51bd 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -87,7 +87,7 @@ Client_Init( void )
                exit( 1 );
        }
 
-       /* Client-Struktur dieses Servers */
+       /* Client structure for this server */
        This_Server->next = NULL;
        This_Server->type = CLIENT_SERVER;
        This_Server->conn_id = NONE;
@@ -124,6 +124,8 @@ Client_Exit( void )
        {
                cnt++;
                next = (CLIENT *)c->next;
+               if (c->account_name)
+                       free(c->account_name);
                free( c );
                c = next;
        }
@@ -217,7 +219,7 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
        if (Type == CLIENT_SERVER)
                Generate_MyToken(client);
 
-       if (strchr(client->modes, 'a'))
+       if (Client_HasMode(client, 'a'))
                strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away));
 
        client->next = (POINTER *)My_Clients;
@@ -318,6 +320,8 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen
                                }
                        }
 
+                       if (c->account_name)
+                               free(c->account_name);
                        if (c->cloaked)
                                free(c->cloaked);
                        free( c );
@@ -454,6 +458,21 @@ Client_SetFlags( CLIENT *Client, const char *Flags )
 } /* Client_SetFlags */
 
 
+GLOBAL void
+Client_SetAccountName(CLIENT *Client, const char *AccountName)
+{
+       assert(Client != NULL);
+
+       if (Client->account_name)
+               free(Client->account_name);
+
+       if (*AccountName)
+               Client->account_name = strdup(AccountName);
+       else
+               Client->account_name = NULL;
+}
+
+
 GLOBAL void
 Client_SetAway( CLIENT *Client, const char *Txt )
 {
@@ -515,7 +534,7 @@ GLOBAL bool
 Client_ModeAdd( CLIENT *Client, char Mode )
 {
        /* Set Mode.
-        * If Client already alread had Mode, return false.
+        * If Client already had Mode, return false.
         * If the Mode was newly set, return true.
         */
 
@@ -524,7 +543,7 @@ Client_ModeAdd( CLIENT *Client, char Mode )
        assert( Client != NULL );
 
        x[0] = Mode; x[1] = '\0';
-       if (!strchr( Client->modes, x[0])) {
+       if (!Client_HasMode(Client, x[0])) {
                strlcat( Client->modes, x, sizeof( Client->modes ));
                return true;
        }
@@ -591,7 +610,7 @@ Client_Search( const char *Nick )
 
 
 /**
- * Serach first CLIENT structure matching a given mask of a server.
+ * Search first CLIENT structure matching a given mask of a server.
  *
  * The order of servers is arbitrary, but this function makes sure that the
  * local server is always returned if the mask matches it.
@@ -973,6 +992,14 @@ Client_Away( CLIENT *Client )
 } /* Client_Away */
 
 
+GLOBAL char *
+Client_AccountName(CLIENT *Client)
+{
+       assert(Client != NULL);
+       return Client->account_name;
+}
+
+
 /**
  * Make sure that a given nickname is valid.
  *
@@ -991,11 +1018,11 @@ Client_CheckNick(CLIENT *Client, char *Nick)
 
        if (!Client_IsValidNick(Nick)) {
                if (strlen(Nick ) >= Conf_MaxNickLength)
-                       IRC_WriteStrClient(Client, ERR_NICKNAMETOOLONG_MSG,
+                       IRC_WriteErrClient(Client, ERR_NICKNAMETOOLONG_MSG,
                                           Client_ID(Client), Nick,
                                           Conf_MaxNickLength - 1);
                else
-                       IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG,
+                       IRC_WriteErrClient(Client, ERR_ERRONEUSNICKNAME_MSG,
                                           Client_ID(Client), Nick);
                return false;
        }
@@ -1004,7 +1031,7 @@ Client_CheckNick(CLIENT *Client, char *Nick)
            && Client_Type(Client) != CLIENT_SERVICE) {
                /* Make sure that this isn't a restricted/forbidden nickname */
                if (Conf_NickIsBlocked(Nick)) {
-                       IRC_WriteStrClient(Client, ERR_FORBIDDENNICKNAME_MSG,
+                       IRC_WriteErrClient(Client, ERR_FORBIDDENNICKNAME_MSG,
                                           Client_ID(Client), Nick);
                        return false;
                }
@@ -1012,7 +1039,7 @@ Client_CheckNick(CLIENT *Client, char *Nick)
 
        /* Nickname already registered? */
        if (Client_Search(Nick)) {
-               IRC_WriteStrClient(Client, ERR_NICKNAMEINUSE_MSG,
+               IRC_WriteErrClient(Client, ERR_NICKNAMEINUSE_MSG,
                        Client_ID(Client), Nick);
                return false;
        }
@@ -1033,7 +1060,8 @@ Client_CheckID( CLIENT *Client, char *ID )
 
        /* ID too long? */
        if (strlen(ID) > CLIENT_ID_LEN) {
-               IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID(Client), ID);
+               IRC_WriteErrClient(Client, ERR_ERRONEUSNICKNAME_MSG,
+                                  Client_ID(Client), ID);
                return false;
        }
 
@@ -1131,7 +1159,8 @@ Client_OperCount( void )
        c = My_Clients;
        while( c )
        {
-               if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++;
+               if (c && c->type == CLIENT_USER && Client_HasMode(c, 'o' ))
+                       cnt++;
                c = (CLIENT *)c->next;
        }
        return cnt;
@@ -1341,8 +1370,6 @@ MyCount( CLIENT_TYPE Type )
 static CLIENT *
 New_Client_Struct( void )
 {
-       /* Neue CLIENT-Struktur pre-initialisieren */
-
        CLIENT *c;
 
        c = (CLIENT *)malloc( sizeof( CLIENT ));
@@ -1377,7 +1404,7 @@ Generate_MyToken( CLIENT *Client )
        {
                if( c->mytoken == token )
                {
-                       /* Das Token wurde bereits vergeben */
+                       /* The token is already in use */
                        token++;
                        c = My_Clients;
                        continue;
@@ -1582,7 +1609,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User)
        } else {
                /* RFC 2813 mode: one combined NICK or SERVICE command */
                if (Client_Type(User) == CLIENT_SERVICE
-                   && strchr(Client_Flags(Client), 'S')) {
+                   && Client_HasFlag(Client, 'S')) {
                        if (!IRC_WriteStrClientPrefix(Client, Prefix,
                                        "SERVICE %s %d * +%s %d :%s",
                                        Client_Mask(User),
@@ -1601,7 +1628,7 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User)
                }
        }
 
-       if (strchr(Client_Flags(Client), 'M')) {
+       if (Client_HasFlag(Client, 'M')) {
                /* Synchronize metadata */
                if (Client_HostnameCloaked(User)) {
                        if (!IRC_WriteStrClientPrefix(Client, Prefix,
@@ -1611,6 +1638,14 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User)
                                return DISCONNECTED;
                }
 
+               if (Client_AccountName(User)) {
+                       if (!IRC_WriteStrClientPrefix(Client, Prefix,
+                                       "METADATA %s accountname :%s",
+                                       Client_ID(User),
+                                       Client_AccountName(User)))
+                               return DISCONNECTED;
+               }
+
                if (Conn_GetCertFp(Client_Conn(User))) {
                        if (!IRC_WriteStrClientPrefix(Client, Prefix,
                                        "METADATA %s certfp :%s",