albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-format Init_New_Client() function

This commit is contained in:
Alexander Barton 2010-02-10 23:40:03 +01:00
parent f1bbc92b39
commit 9b3e143a26
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ngircd/client.c
View File

@ -1,6 +1,6 @@
/* /*
* ngIRCd -- The Next Generation IRC Daemon * ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -181,8 +181,8 @@ Client_NewRemoteUser(CLIENT *Introducer, const char *Nick, int Hops, const char
*/ */
static CLIENT * static CLIENT *
Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
int Type, const char *ID, const char *User, const char *Hostname, const char *Info, int Hops, int Type, const char *ID, const char *User, const char *Hostname,
int Token, const char *Modes, bool Idented) const char *Info, int Hops, int Token, const char *Modes, bool Idented)
{ {
CLIENT *client; CLIENT *client;
@ -191,21 +191,28 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
assert(Hostname != NULL); assert(Hostname != NULL);
client = New_Client_Struct(); client = New_Client_Struct();
if( ! client ) return NULL; if (!client)
return NULL;
client->starttime = time(NULL); client->starttime = time(NULL);
client->conn_id = Idx; client->conn_id = Idx;
client->introducer = Introducer; client->introducer = Introducer;
client->topserver = TopServer; client->topserver = TopServer;
client->type = Type; client->type = Type;
if( ID ) Client_SetID( client, ID ); if (ID)
if( User ) Client_SetUser( client, User, Idented ); Client_SetID(client, ID);
if( Hostname ) Client_SetHostname( client, Hostname ); if (User)
if( Info ) Client_SetInfo( client, Info ); Client_SetUser(client, User, Idented);
if (Hostname)
Client_SetHostname(client, Hostname);
if (Info)
Client_SetInfo(client, Info);
client->hops = Hops; client->hops = Hops;
client->token = Token; client->token = Token;
if( Modes ) Client_SetModes( client, Modes ); if (Modes)
if( Type == CLIENT_SERVER ) Generate_MyToken( client ); Client_SetModes(client, Modes);
if (Type == CLIENT_SERVER)
Generate_MyToken(client);
if (strchr(client->modes, 'a')) if (strchr(client->modes, 'a'))
strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away)); strlcpy(client->away, DEFAULT_AWAY_MSG, sizeof(client->away));