#include "portab.h"
-static char UNUSED id[] = "$Id: client.c,v 1.77 2005/01/20 00:11:49 alex Exp $";
+static char UNUSED id[] = "$Id: client.c,v 1.78 2005/03/19 18:43:48 fw Exp $";
#include "imp.h"
#include <assert.h>
LOCAL CLIENT *This_Server, *My_Clients;
-LOCAL CHAR GetID_Buffer[GETID_LEN];
+LOCAL char GetID_Buffer[GETID_LEN];
-LOCAL LONG Count PARAMS(( CLIENT_TYPE Type ));
-LOCAL LONG MyCount PARAMS(( CLIENT_TYPE Type ));
+LOCAL long Count PARAMS(( CLIENT_TYPE Type ));
+LOCAL long MyCount PARAMS(( CLIENT_TYPE Type ));
-LOCAL CLIENT *New_Client_Struct PARAMS(( VOID ));
-LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client ));
-LOCAL VOID Adjust_Counters PARAMS(( CLIENT *Client ));
+LOCAL CLIENT *New_Client_Struct PARAMS(( void ));
+LOCAL void Generate_MyToken PARAMS(( CLIENT *Client ));
+LOCAL void Adjust_Counters PARAMS(( CLIENT *Client ));
#ifndef Client_DestroyNow
-GLOBAL VOID Client_DestroyNow PARAMS((CLIENT *Client ));
+GLOBAL void Client_DestroyNow PARAMS((CLIENT *Client ));
#endif
-LONG Max_Users = 0, My_Max_Users = 0;
+long Max_Users = 0, My_Max_Users = 0;
-GLOBAL VOID
-Client_Init( VOID )
+GLOBAL void
+Client_Init( void )
{
struct hostent *h;
} /* Client_Init */
-GLOBAL VOID
-Client_Exit( VOID )
+GLOBAL void
+Client_Exit( void )
{
CLIENT *c, *next;
- INT cnt;
+ int cnt;
- if( NGIRCd_SignalRestart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, FALSE );
- else Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
+ 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;
GLOBAL CLIENT *
-Client_ThisServer( VOID )
+Client_ThisServer( void )
{
return This_Server;
} /* Client_ThisServer */
GLOBAL CLIENT *
-Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented )
+Client_NewLocal( CONN_ID Idx, char *Hostname, int Type, bool Idented )
{
/* Neuen lokalen Client erzeugen: Wrapper-Funktion fuer Client_New(). */
return Client_New( Idx, This_Server, NULL, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL, Idented );
GLOBAL CLIENT *
-Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented )
+Client_NewRemoteServer( CLIENT *Introducer, char *Hostname, CLIENT *TopServer, int Hops, int Token, char *Info, bool Idented )
{
/* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
return Client_New( NONE, Introducer, TopServer, CLIENT_SERVER, Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented );
GLOBAL CLIENT *
-Client_NewRemoteUser( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN Idented )
+Client_NewRemoteUser( CLIENT *Introducer, char *Nick, int Hops, char *User, char *Hostname, int Token, char *Modes, char *Info, bool Idented )
{
/* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
return Client_New( NONE, Introducer, NULL, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, Modes, Idented );
GLOBAL CLIENT *
-Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes, BOOLEAN Idented )
+Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *ID, char *User, char *Hostname, char *Info, int Hops, int Token, char *Modes, bool Idented )
{
CLIENT *client;
} /* Client_New */
-GLOBAL VOID
-Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
+GLOBAL void
+Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
{
/* Client entfernen. */
CLIENT *last, *c;
- CHAR msg[LINE_LEN], *txt;
+ char msg[LINE_LEN], *txt;
assert( Client != NULL );
{
/* der Client, der geloescht wird ist ein Server. Der Client, den wir gerade
* pruefen, ist ein Child von diesem und muss daher auch entfernt werden */
- Client_Destroy( c, NULL, msg, FALSE );
+ Client_Destroy( c, NULL, msg, false );
last = NULL;
c = My_Clients;
continue;
} /* Client_Destroy */
-GLOBAL VOID
+GLOBAL void
Client_DestroyNow( CLIENT *Client )
{
/* Destroy client structure immediately. This function is only
} /* Client_DestroyNow */
-GLOBAL VOID
-Client_SetHostname( CLIENT *Client, CHAR *Hostname )
+GLOBAL void
+Client_SetHostname( CLIENT *Client, char *Hostname )
{
/* Hostname eines Clients setzen */
} /* Client_SetHostname */
-GLOBAL VOID
-Client_SetID( CLIENT *Client, CHAR *ID )
+GLOBAL void
+Client_SetID( CLIENT *Client, char *ID )
{
/* Hostname eines Clients setzen, Hash-Wert berechnen */
} /* Client_SetID */
-GLOBAL VOID
-Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
+GLOBAL void
+Client_SetUser( CLIENT *Client, char *User, bool Idented )
{
/* Username eines Clients setzen */
} /* Client_SetUser */
-GLOBAL VOID
-Client_SetInfo( CLIENT *Client, CHAR *Info )
+GLOBAL void
+Client_SetInfo( CLIENT *Client, char *Info )
{
/* Hostname eines Clients setzen */
} /* Client_SetInfo */
-GLOBAL VOID
-Client_SetModes( CLIENT *Client, CHAR *Modes )
+GLOBAL void
+Client_SetModes( CLIENT *Client, char *Modes )
{
/* Modes eines Clients setzen */
} /* Client_SetModes */
-GLOBAL VOID
-Client_SetFlags( CLIENT *Client, CHAR *Flags )
+GLOBAL void
+Client_SetFlags( CLIENT *Client, char *Flags )
{
/* Flags eines Clients setzen */
} /* Client_SetFlags */
-GLOBAL VOID
-Client_SetPassword( CLIENT *Client, CHAR *Pwd )
+GLOBAL void
+Client_SetPassword( CLIENT *Client, char *Pwd )
{
/* Von einem Client geliefertes Passwort */
} /* Client_SetPassword */
-GLOBAL VOID
-Client_SetAway( CLIENT *Client, CHAR *Txt )
+GLOBAL void
+Client_SetAway( CLIENT *Client, char *Txt )
{
/* Set AWAY reason of client */
} /* Client_SetAway */
-GLOBAL VOID
-Client_SetType( CLIENT *Client, INT Type )
+GLOBAL void
+Client_SetType( CLIENT *Client, int Type )
{
assert( Client != NULL );
Client->type = Type;
} /* Client_SetType */
-GLOBAL VOID
-Client_SetHops( CLIENT *Client, INT Hops )
+GLOBAL void
+Client_SetHops( CLIENT *Client, int Hops )
{
assert( Client != NULL );
Client->hops = Hops;
} /* Client_SetHops */
-GLOBAL VOID
-Client_SetToken( CLIENT *Client, INT Token )
+GLOBAL void
+Client_SetToken( CLIENT *Client, int Token )
{
assert( Client != NULL );
Client->token = Token;
} /* Client_SetToken */
-GLOBAL VOID
+GLOBAL void
Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
{
assert( Client != NULL );
} /* Client_SetIntroducer */
-GLOBAL VOID
-Client_SetOperByMe( CLIENT *Client, BOOLEAN OperByMe )
+GLOBAL void
+Client_SetOperByMe( CLIENT *Client, bool OperByMe )
{
assert( Client != NULL );
Client->oper_by_me = OperByMe;
} /* Client_SetOperByMe */
-GLOBAL BOOLEAN
-Client_ModeAdd( CLIENT *Client, CHAR Mode )
+GLOBAL bool
+Client_ModeAdd( CLIENT *Client, char Mode )
{
- /* Mode soll gesetzt werden. TRUE wird geliefert, wenn der
- * Mode neu gesetzt wurde, FALSE, wenn der Client den Mode
- * bereits hatte. */
+ /* Set Mode.
+ * If Client already alread had Mode, return false.
+ * If the Mode was newly set, return true.
+ */
- CHAR x[2];
+ char x[2];
assert( Client != NULL );
{
/* Client hat den Mode noch nicht -> setzen */
strlcat( Client->modes, x, sizeof( Client->modes ));
- return TRUE;
+ return true;
}
- else return FALSE;
+ else return false;
} /* Client_ModeAdd */
-GLOBAL BOOLEAN
-Client_ModeDel( CLIENT *Client, CHAR Mode )
+GLOBAL bool
+Client_ModeDel( CLIENT *Client, char Mode )
{
- /* Mode soll geloescht werden. TRUE wird geliefert, wenn der
- * Mode entfernt wurde, FALSE, wenn der Client den Mode
- * ueberhaupt nicht hatte. */
+ /* Delete Mode.
+ * If Mode was removed, return true.
+ * If Client did not have Mode, return false.
+ */
- CHAR x[2], *p;
+ char x[2], *p;
assert( Client != NULL );
x[0] = Mode; x[1] = '\0';
p = strchr( Client->modes, x[0] );
- if( ! p ) return FALSE;
+ if( ! p ) return false;
- /* Client hat den Mode -> loeschen */
+ /* Client has Mode -> delete */
while( *p )
{
*p = *(p + 1);
p++;
}
- return TRUE;
+ return true;
} /* Client_ModeDel */
GLOBAL CLIENT *
Client_GetFromConn( CONN_ID Idx )
{
- /* Client-Struktur, die zur lokalen Verbindung Idx gehoert,
- * liefern. Wird keine gefunden, so wird NULL geliefert. */
+ /* return Client-Structure that belongs to the local Connection Idx gehoert.
+ * If none is found, return NULL.
+ */
CLIENT *c;
GLOBAL CLIENT *
-Client_Search( CHAR *Nick )
+Client_Search( char *Nick )
{
- /* Client-Struktur, die den entsprechenden Nick hat, liefern.
- * Wird keine gefunden, so wird NULL geliefert. */
+ /* return Client-Structure that has the corresponding Nick.
+ * If none is found, return NULL.
+ */
- CHAR search_id[CLIENT_ID_LEN], *ptr;
+ char search_id[CLIENT_ID_LEN], *ptr;
CLIENT *c = NULL;
UINT32 search_hash;
assert( Nick != NULL );
- /* Nick kopieren und ggf. Host-Mask abschneiden */
+ /* copy Nick and truncate hostmask if necessary */
strlcpy( search_id, Nick, sizeof( search_id ));
ptr = strchr( search_id, '!' );
if( ptr ) *ptr = '\0';
GLOBAL CLIENT *
-Client_GetFromToken( CLIENT *Client, INT Token )
+Client_GetFromToken( CLIENT *Client, int Token )
{
/* Client-Struktur, die den entsprechenden Introducer (=Client)
* und das gegebene Token hat, liefern. Wird keine gefunden,
} /* Client_GetFromToken */
-GLOBAL INT
+GLOBAL int
Client_Type( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Conn */
-GLOBAL CHAR *
+GLOBAL char *
Client_ID( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_ID */
-GLOBAL CHAR *
+GLOBAL char *
Client_Info( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Info */
-GLOBAL CHAR *
+GLOBAL char *
Client_User( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_User */
-GLOBAL CHAR *
+GLOBAL char *
Client_Hostname( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Hostname */
-GLOBAL CHAR *
+GLOBAL char *
Client_Password( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Password */
-GLOBAL CHAR *
+GLOBAL char *
Client_Modes( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Modes */
-GLOBAL CHAR *
+GLOBAL char *
Client_Flags( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Flags */
-GLOBAL BOOLEAN
+GLOBAL bool
Client_OperByMe( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_OperByMe */
-GLOBAL INT
+GLOBAL int
Client_Hops( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Hops */
-GLOBAL INT
+GLOBAL int
Client_Token( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_Token */
-GLOBAL INT
+GLOBAL int
Client_MyToken( CLIENT *Client )
{
assert( Client != NULL );
} /* Client_NextHop */
-GLOBAL CHAR *
+GLOBAL char *
Client_Mask( CLIENT *Client )
{
/* Client-"ID" liefern, wie sie z.B. fuer
} /* Client_TopServer */
-GLOBAL BOOLEAN
-Client_HasMode( CLIENT *Client, CHAR Mode )
+GLOBAL bool
+Client_HasMode( CLIENT *Client, char Mode )
{
assert( Client != NULL );
return strchr( Client->modes, Mode ) != NULL;
} /* Client_HasMode */
-GLOBAL CHAR *
+GLOBAL char *
Client_Away( CLIENT *Client )
{
/* AWAY-Text liefern */
} /* Client_Away */
-GLOBAL BOOLEAN
-Client_CheckNick( CLIENT *Client, CHAR *Nick )
+GLOBAL bool
+Client_CheckNick( CLIENT *Client, char *Nick )
{
/* Nick ueberpruefen */
if( ! Client_IsValidNick( Nick ))
{
IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
- return FALSE;
+ return false;
}
/* Nick bereits vergeben? */
{
/* den Nick gibt es bereits */
IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
} /* Client_CheckNick */
-GLOBAL BOOLEAN
-Client_CheckID( CLIENT *Client, CHAR *ID )
+GLOBAL bool
+Client_CheckID( CLIENT *Client, char *ID )
{
/* Nick ueberpruefen */
- CHAR str[COMMAND_LEN];
+ char str[COMMAND_LEN];
CLIENT *c;
assert( Client != NULL );
if( strlen( ID ) > CLIENT_ID_LEN )
{
IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), ID );
- return FALSE;
+ return false;
}
/* ID bereits vergeben? */
snprintf( str, sizeof( str ), "ID \"%s\" already registered", ID );
if( Client->conn_id != c->conn_id ) Log( LOG_ERR, "%s (on connection %d)!", str, c->conn_id );
else Log( LOG_ERR, "%s (via network)!", str );
- Conn_Close( Client->conn_id, str, str, TRUE );
- return FALSE;
+ Conn_Close( Client->conn_id, str, str, true);
+ return false;
}
c = (CLIENT *)c->next;
}
- return TRUE;
+ return true;
} /* Client_CheckID */
GLOBAL CLIENT *
-Client_First( VOID )
+Client_First( void )
{
/* Ersten Client liefern. */
} /* Client_Next */
-GLOBAL LONG
-Client_UserCount( VOID )
+GLOBAL long
+Client_UserCount( void )
{
return Count( CLIENT_USER );
} /* Client_UserCount */
-GLOBAL LONG
-Client_ServiceCount( VOID )
+GLOBAL long
+Client_ServiceCount( void )
{
return Count( CLIENT_SERVICE );;
} /* Client_ServiceCount */
-GLOBAL LONG
-Client_ServerCount( VOID )
+GLOBAL long
+Client_ServerCount( void )
{
return Count( CLIENT_SERVER );
} /* Client_ServerCount */
-GLOBAL LONG
-Client_MyUserCount( VOID )
+GLOBAL long
+Client_MyUserCount( void )
{
return MyCount( CLIENT_USER );
} /* Client_MyUserCount */
-GLOBAL LONG
-Client_MyServiceCount( VOID )
+GLOBAL long
+Client_MyServiceCount( void )
{
return MyCount( CLIENT_SERVICE );
} /* Client_MyServiceCount */
-GLOBAL LONG
-Client_MyServerCount( VOID )
+GLOBAL long
+Client_MyServerCount( void )
{
CLIENT *c;
- LONG cnt;
+ long cnt;
cnt = 0;
c = My_Clients;
} /* Client_MyServerCount */
-GLOBAL LONG
-Client_OperCount( VOID )
+GLOBAL long
+Client_OperCount( void )
{
CLIENT *c;
- LONG cnt;
+ long cnt;
cnt = 0;
c = My_Clients;
} /* Client_OperCount */
-GLOBAL LONG
-Client_UnknownCount( VOID )
+GLOBAL long
+Client_UnknownCount( void )
{
CLIENT *c;
- LONG cnt;
+ long cnt;
cnt = 0;
c = My_Clients;
} /* Client_UnknownCount */
-GLOBAL LONG
-Client_MaxUserCount( VOID )
+GLOBAL long
+Client_MaxUserCount( void )
{
return Max_Users;
} /* Client_MaxUserCount */
-GLOBAL LONG
-Client_MyMaxUserCount( VOID )
+GLOBAL long
+Client_MyMaxUserCount( void )
{
return My_Max_Users;
} /* Client_MyMaxUserCount */
-GLOBAL BOOLEAN
-Client_IsValidNick( CHAR *Nick )
+GLOBAL bool
+Client_IsValidNick( char *Nick )
{
/* Ist der Nick gueltig? */
- CHAR *ptr, goodchars[20];
+ char *ptr, goodchars[20];
assert( Nick != NULL );
strcpy( goodchars, ";0123456789-" );
- if( Nick[0] == '#' ) return FALSE;
- if( strchr( goodchars, Nick[0] )) return FALSE;
- if( strlen( Nick ) >= CLIENT_NICK_LEN ) return FALSE;
+ if( Nick[0] == '#' ) return false;
+ if( strchr( goodchars, Nick[0] )) return false;
+ if( strlen( Nick ) >= CLIENT_NICK_LEN ) return false;
ptr = Nick;
while( *ptr )
{
- if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return FALSE;
- if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return FALSE;
+ if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false;
+ if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return false;
ptr++;
}
- return TRUE;
+ return true;
} /* Client_IsValidNick */
-LOCAL LONG
+LOCAL long
Count( CLIENT_TYPE Type )
{
CLIENT *c;
- LONG cnt;
+ long cnt;
cnt = 0;
c = My_Clients;
} /* Count */
-LOCAL LONG
+LOCAL long
MyCount( CLIENT_TYPE Type )
{
CLIENT *c;
- LONG cnt;
+ long cnt;
cnt = 0;
c = My_Clients;
LOCAL CLIENT *
-New_Client_Struct( VOID )
+New_Client_Struct( void )
{
/* Neue CLIENT-Struktur pre-initialisieren */
c->type = CLIENT_UNKNOWN;
c->conn_id = NONE;
- c->oper_by_me = FALSE;
+ c->oper_by_me = false;
c->hops = -1;
c->token = -1;
c->mytoken = -1;
} /* New_Client */
-LOCAL VOID
+LOCAL void
Generate_MyToken( CLIENT *Client )
{
CLIENT *c;
- INT token;
+ int token;
c = My_Clients;
token = 2;
} /* Generate_MyToken */
-LOCAL VOID
+LOCAL void
Adjust_Counters( CLIENT *Client )
{
- LONG count;
+ long count;
assert( Client != NULL );
projects / ngircd-alex.git / blobdiff