X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=67c0260423ac8a3e2ca9a099397691eeae40711a;hp=09bd6fdeaee8400ae3e5c75ee539fb230a607a09;hb=HEAD;hpb=139f5961a078dfd23a469d98c3942f42595854aa

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 09bd6fde..70ac28f0 100644
--- 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-2014 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
@@ -18,22 +18,16 @@
  * Client management.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <time.h>
 #include <netdb.h>
 
-#include "defines.h"
 #include "conn.h"
-
-#include "exp.h"
-#include "client.h"
-
-#include <imp.h>
 #include "ngircd.h"
 #include "channel.h"
 #include "conf.h"
@@ -44,8 +38,6 @@
 #include "match.h"
 #include "messages.h"
 
-#include <exp.h>
-
 #define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1
 
 static CLIENT *This_Server, *My_Clients;
@@ -62,6 +54,8 @@ static CLIENT *New_Client_Struct PARAMS(( void ));
 static void Generate_MyToken PARAMS(( CLIENT *Client ));
 static void Adjust_Counters PARAMS(( CLIENT *Client ));
 
+static void Free_Client PARAMS(( CLIENT **Client ));
+
 static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer,
 				       CLIENT *TopServer, int Type, const char *ID,
 				       const char *User, const char *Hostname, const char *Info,
@@ -78,7 +72,7 @@ GLOBAL void
 Client_Init( void )
 {
 	struct hostent *h;
-	
+
 	This_Server = New_Client_Struct( );
 	if( ! This_Server )
 	{
@@ -104,7 +98,7 @@ Client_Init( void )
 	Client_SetInfo( This_Server, Conf_ServerInfo );
 
 	My_Clients = This_Server;
-	
+
 	memset( &My_Whowas, 0, sizeof( My_Whowas ));
 } /* Client_Init */
 
@@ -117,17 +111,18 @@ Client_Exit( void )
 
 	if( NGIRCd_SignalRestart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, false );
 	else Client_Destroy( This_Server, "Server going down.", NULL, false );
-	
+
 	cnt = 0;
 	c = My_Clients;
-	while( c )
-	{
+	while(c) {
 		cnt++;
 		next = (CLIENT *)c->next;
-		free( c );
+		Free_Client(&c);
 		c = next;
 	}
-	if( cnt ) Log( LOG_INFO, "Freed %d client structure%s.", cnt, cnt == 1 ? "" : "s" );
+	if (cnt)
+		Log(LOG_INFO, "Freed %d client structure%s.",
+		    cnt, cnt == 1 ? "" : "s");
 } /* Client_Exit */
 
 
@@ -217,8 +212,8 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
 	if (Type == CLIENT_SERVER)
 		Generate_MyToken(client);
 
-	if (strchr(client->modes, 'a'))
-		strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away));
+	if (Client_HasMode(client, 'a'))
+		client->away = strdup(DEFAULT_AWAY_MSG);
 
 	client->next = (POINTER *)My_Clients;
 	My_Clients = client;
@@ -233,9 +228,9 @@ GLOBAL void
 Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool SendQuit )
 {
 	/* remove a client */
-	
+
 	CLIENT *last, *c;
-	char msg[LINE_LEN];
+	char msg[COMMAND_LEN];
 	const char *txt;
 
 	assert( Client != NULL );
@@ -318,9 +313,7 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen
 				}
 			}
 
-			if (c->cloaked)
-				free(c->cloaked);
-			free( c );
+			Free_Client(&c);
 			break;
 		}
 		last = c;
@@ -344,7 +337,11 @@ Client_SetHostname( CLIENT *Client, const char *Hostname )
 	assert(Client != NULL);
 	assert(Hostname != NULL);
 
-	if (strlen(Conf_CloakHost)) {
+	/* Only cloak the hostmask if it has not yet been cloaked.
+	 * The period or colon indicates it's still an IP address.
+	 * An empty string means a rDNS lookup did not happen (yet). */
+	if (Conf_CloakHost[0] && (!Client->host[0] || strchr(Client->host, '.')
+				  || strchr(Client->host, ':'))) {
 		char cloak[GETID_LEN];
 
 		strlcpy(cloak, Hostname, GETID_LEN);
@@ -362,12 +359,33 @@ Client_SetHostname( CLIENT *Client, const char *Hostname )
 } /* Client_SetHostname */
 
 
+/**
+ * Set IP address to display for a client.
+ *
+ * @param Client The client.
+ * @param IPAText Textual representation of the IP address or NULL to unset.
+ */
+GLOBAL void
+Client_SetIPAText(CLIENT *Client, const char *IPAText)
+{
+	assert(Client != NULL);
+
+	if (Client->ipa_text)
+		free(Client->ipa_text);
+
+	if (*IPAText)
+		Client->ipa_text = strndup(IPAText, CLIENT_HOST_LEN - 1);
+	else
+		Client->ipa_text = NULL;
+}
+
+
 GLOBAL void
 Client_SetID( CLIENT *Client, const char *ID )
 {
 	assert( Client != NULL );
 	assert( ID != NULL );
-	
+
 	strlcpy( Client->id, ID, sizeof( Client->id ));
 
 	if (Conf_CloakUserToNick) {
@@ -413,7 +431,7 @@ Client_SetOrigUser(CLIENT UNUSED *Client, const char UNUSED *User)
 	assert(Client != NULL);
 	assert(User != NULL);
 
-#if defined(PAM) && defined(IDENTAUTH)
+#if defined(PAM)
 	strlcpy(Client->orig_user, User, sizeof(Client->orig_user));
 #endif
 } /* Client_SetOrigUser */
@@ -454,6 +472,22 @@ 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 = strndup(AccountName,
+					       CLIENT_NICK_LEN - 1);
+	else
+		Client->account_name = NULL;
+}
+
+
 GLOBAL void
 Client_SetAway( CLIENT *Client, const char *Txt )
 {
@@ -462,7 +496,11 @@ Client_SetAway( CLIENT *Client, const char *Txt )
 	assert( Client != NULL );
 	assert( Txt != NULL );
 
-	strlcpy( Client->away, Txt, sizeof( Client->away ));
+	if (Client->away)
+		free(Client->away);
+
+	Client->away = strndup(Txt, CLIENT_AWAY_LEN - 1);
+
 	LogDebug("%s \"%s\" is away: %s", Client_TypeText(Client),
 		 Client_Mask(Client), Txt);
 } /* Client_SetAway */
@@ -503,14 +541,6 @@ Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
 } /* Client_SetIntroducer */
 
 
-GLOBAL void
-Client_SetOperByMe( CLIENT *Client, bool OperByMe )
-{
-	assert( Client != NULL );
-	Client->oper_by_me = OperByMe;
-} /* Client_SetOperByMe */
-
-
 GLOBAL bool
 Client_ModeAdd( CLIENT *Client, char Mode )
 {
@@ -524,7 +554,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;
 	}
@@ -623,7 +653,7 @@ Client_SearchServer(const char *Mask)
 
 
 /**
- * Get client structure ("introducer") identfied by a server token.
+ * Get client structure ("introducer") identified by a server token.
  * @return CLIENT structure or NULL if none could be found.
  */
 GLOBAL CLIENT *
@@ -668,11 +698,9 @@ Client_ID( CLIENT *Client )
 {
 	assert( Client != NULL );
 
-#ifdef DEBUG
 	if(Client->type == CLIENT_USER)
 		assert(strlen(Client->id) < Conf_MaxNickLength);
-#endif
-						   
+
 	if( Client->id[0] ) return Client->id;
 	else return "*";
 } /* Client_ID */
@@ -705,15 +733,7 @@ Client_User( CLIENT *Client )
  */
 GLOBAL char *
 Client_OrigUser(CLIENT *Client) {
-#ifndef IDENTAUTH
-	char *user = Client->user;
-
-	if (user[0] == '~')
-		user++;
-	return user;
-#else
 	return Client->orig_user;
-#endif
 } /* Client_OrigUser */
 
 #endif
@@ -767,6 +787,21 @@ Client_HostnameDisplayed(CLIENT *Client)
 	return Client->cloaked;
 }
 
+GLOBAL const char *
+Client_IPAText(CLIENT *Client)
+{
+	assert(Client != NULL);
+
+	/* Not a local client? */
+	if (Client_Conn(Client) <= NONE)
+		return "0.0.0.0";
+
+	if (!Client->ipa_text)
+		return Conn_GetIPAInfo(Client_Conn(Client));
+	else
+		return Client->ipa_text;
+}
+
 /**
  * Update (and generate, if necessary) the cloaked hostname of a client.
  *
@@ -832,14 +867,6 @@ Client_Flags( CLIENT *Client )
 } /* Client_Flags */
 
 
-GLOBAL bool
-Client_OperByMe( CLIENT *Client )
-{
-	assert( Client != NULL );
-	return Client->oper_by_me;
-} /* Client_OperByMe */
-
-
 GLOBAL int
 Client_Hops( CLIENT *Client )
 {
@@ -973,6 +1000,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 +1026,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 +1039,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 +1047,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 +1068,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 +1167,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;
@@ -1276,12 +1313,14 @@ Client_Reject(CLIENT *Client, const char *Reason, bool InformClient)
 GLOBAL void
 Client_Introduce(CLIENT *From, CLIENT *Client, int Type)
 {
+	int server;
+
 	/* Set client type (user or service) */
 	Client_SetType(Client, Type);
 
 	if (From) {
-		if (Conf_NickIsService(Conf_GetServer(Client_Conn(From)),
-				   Client_ID(Client)))
+		server = Conf_GetServer(Client_Conn(From));
+		if (server > NONE && Conf_NickIsService(server, Client_ID(Client)))
 			Client_SetType(Client, CLIENT_SERVICE);
 		LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).",
 			 Client_TypeText(Client), Client_Mask(Client),
@@ -1338,6 +1377,11 @@ MyCount( CLIENT_TYPE Type )
 } /* MyCount */
 
 
+/**
+ * Allocate and initialize new CLIENT structure.
+ *
+ * @return Pointer to CLIENT structure or NULL on error.
+ */
 static CLIENT *
 New_Client_Struct( void )
 {
@@ -1354,14 +1398,34 @@ New_Client_Struct( void )
 
 	c->type = CLIENT_UNKNOWN;
 	c->conn_id = NONE;
-	c->oper_by_me = false;
 	c->hops = -1;
 	c->token = -1;
 	c->mytoken = -1;
 
 	return c;
-} /* New_Client */
+}
 
+/**
+ * Free a CLIENT structure and its member variables.
+ */
+static void
+Free_Client(CLIENT **Client)
+{
+	assert(Client != NULL);
+	assert(*Client != NULL);
+
+	if ((*Client)->account_name)
+		free((*Client)->account_name);
+	if ((*Client)->away)
+		free((*Client)->away);
+	if ((*Client)->cloaked)
+		free((*Client)->cloaked);
+	if ((*Client)->ipa_text)
+		free((*Client)->ipa_text);
+
+	free(*Client);
+	*Client = NULL;
+}
 
 static void
 Generate_MyToken( CLIENT *Client )
@@ -1433,9 +1497,7 @@ Client_RegisterWhowas( CLIENT *Client )
 	slot = Last_Whowas + 1;
 	if( slot >= MAX_WHOWAS || slot < 0 ) slot = 0;
 
-#ifdef DEBUG
-	Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot );
-#endif
+	LogDebug( "Saving WHOWAS information to slot %d ...", slot );
 
 	My_Whowas[slot].time = now;
 	strlcpy( My_Whowas[slot].id, Client_ID( Client ),
@@ -1580,7 +1642,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),
@@ -1599,7 +1661,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,
@@ -1609,6 +1671,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",
@@ -1622,17 +1692,16 @@ Client_Announce(CLIENT * Client, CLIENT * Prefix, CLIENT * User)
 } /* Client_Announce */
 
 
-#ifdef DEBUG
 
 GLOBAL void
 Client_DebugDump(void)
 {
 	CLIENT *c;
 
-	Log(LOG_DEBUG, "Client status:");
+	LogDebug("Client status:");
 	c = My_Clients;
 	while (c) {
-		Log(LOG_DEBUG,
+		LogDebug(
 		    " - %s: type=%d, host=%s, user=%s, conn=%d, start=%ld, flags=%s",
                    Client_ID(c), Client_Type(c), Client_Hostname(c),
                    Client_User(c), Client_Conn(c), Client_StartTime(c),
@@ -1641,7 +1710,6 @@ Client_DebugDump(void)
 	}
 } /* Client_DumpClients */
 
-#endif
 
 
 /* -eof- */