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

Client_HostnameCloaked() -> Client_HostnameDisplayed()

This commit is contained in:
Alexander Barton 2012-11-24 13:37:56 +01:00
parent cd48b8128e
commit 4a2d74c9ab
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ngircd/client.c
View File

@ -686,7 +686,7 @@ Client_Hostname(CLIENT *Client)
/** /**
* Get potentially cloaked hostname of a client. * Get (potentially cloaked) hostname of a client to display it to other users.
* *
* If the client has not enabled cloaking, the real hostname is used. * If the client has not enabled cloaking, the real hostname is used.
* Please note that this function uses a global static buffer, so you can't * Please note that this function uses a global static buffer, so you can't
@ -696,7 +696,7 @@ Client_Hostname(CLIENT *Client)
* @return Pointer to client hostname * @return Pointer to client hostname
*/ */
GLOBAL char * GLOBAL char *
Client_HostnameCloaked(CLIENT *Client) Client_HostnameDisplayed(CLIENT *Client)
{ {
static char Cloak_Buffer[CLIENT_HOST_LEN]; static char Cloak_Buffer[CLIENT_HOST_LEN];
@ -837,7 +837,7 @@ Client_MaskCloaked(CLIENT *Client)
return Client_Mask(Client); return Client_Mask(Client);
snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user,
Client_HostnameCloaked(Client)); Client_HostnameDisplayed(Client));
return Mask_Buffer; return Mask_Buffer;
} /* Client_MaskCloaked */ } /* Client_MaskCloaked */
@ -1346,7 +1346,7 @@ Client_RegisterWhowas( CLIENT *Client )
sizeof( My_Whowas[slot].id )); sizeof( My_Whowas[slot].id ));
strlcpy( My_Whowas[slot].user, Client_User( Client ), strlcpy( My_Whowas[slot].user, Client_User( Client ),
sizeof( My_Whowas[slot].user )); sizeof( My_Whowas[slot].user ));
strlcpy( My_Whowas[slot].host, Client_HostnameCloaked( Client ), strlcpy( My_Whowas[slot].host, Client_HostnameDisplayed( Client ),
sizeof( My_Whowas[slot].host )); sizeof( My_Whowas[slot].host ));
strlcpy( My_Whowas[slot].info, Client_Info( Client ), strlcpy( My_Whowas[slot].info, Client_Info( Client ),
sizeof( My_Whowas[slot].info )); sizeof( My_Whowas[slot].info ));

2
src/ngircd/client.h
View File

@ -107,7 +107,7 @@ GLOBAL char *Client_User PARAMS(( CLIENT *Client ));
GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client ));
#endif #endif
GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client ));
GLOBAL char *Client_HostnameCloaked PARAMS(( CLIENT *Client )); GLOBAL char *Client_HostnameDisplayed PARAMS(( CLIENT *Client ));
GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client ));
GLOBAL char *Client_Flags PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client ));
GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client )); GLOBAL CLIENT *Client_Introducer PARAMS(( CLIENT *Client ));

6
src/ngircd/irc-info.c
View File

@ -727,7 +727,7 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
strlcat(rpl, "+", sizeof(rpl)); strlcat(rpl, "+", sizeof(rpl));
strlcat(rpl, Client_User(c), sizeof(rpl)); strlcat(rpl, Client_User(c), sizeof(rpl));
strlcat(rpl, "@", sizeof(rpl)); strlcat(rpl, "@", sizeof(rpl));
strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl)); strlcat(rpl, Client_HostnameDisplayed(c), sizeof(rpl));
strlcat(rpl, " ", sizeof(rpl)); strlcat(rpl, " ", sizeof(rpl));
} }
} }
@ -792,7 +792,7 @@ write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *f
{ {
return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client),
channelname, Client_User(c), channelname, Client_User(c),
Client_HostnameCloaked(c), Client_HostnameDisplayed(c),
Client_ID(Client_Introducer(c)), Client_ID(c), Client_ID(Client_Introducer(c)), Client_ID(c),
flags, Client_Hops(c), Client_Info(c)); flags, Client_Hops(c), Client_Info(c));
} }
@ -1080,7 +1080,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
/* Nick, user, hostname and client info */ /* Nick, user, hostname and client info */
if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from), if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from),
Client_ID(c), Client_User(c), Client_ID(c), Client_User(c),
Client_HostnameCloaked(c), Client_Info(c))) Client_HostnameDisplayed(c), Client_Info(c)))
return DISCONNECTED; return DISCONNECTED;
/* Server */ /* Server */

4
src/ngircd/irc-mode.c
View File

@ -393,12 +393,12 @@ Announce_Client_Hostname(CLIENT *Origin, CLIENT *Client)
/* Inform the client itself */ /* Inform the client itself */
IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, Client_ID(Client), IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG, Client_ID(Client),
Client_HostnameCloaked(Client)); Client_HostnameDisplayed(Client));
/* Inform other servers in the network */ /* Inform other servers in the network */
IRC_WriteStrServersPrefixFlag(Origin, Client_ThisServer(), 'M', IRC_WriteStrServersPrefixFlag(Origin, Client_ThisServer(), 'M',
"METADATA %s host :%s", Client_ID(Client), "METADATA %s host :%s", Client_ID(Client),
Client_HostnameCloaked(Client)); Client_HostnameDisplayed(Client));
} }

4
src/ngircd/irc.c
View File

@ -457,7 +457,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
if (nick != NULL && host != NULL) { if (nick != NULL && host != NULL) {
if (strcasecmp(nick, Client_ID(cl)) == 0 && if (strcasecmp(nick, Client_ID(cl)) == 0 &&
strcasecmp(user, Client_User(cl)) == 0 && strcasecmp(user, Client_User(cl)) == 0 &&
strcasecmp(host, Client_HostnameCloaked(cl)) == 0) strcasecmp(host, Client_HostnameDisplayed(cl)) == 0)
break; break;
else else
continue; continue;
@ -465,7 +465,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
if (strcasecmp(user, Client_User(cl)) != 0) if (strcasecmp(user, Client_User(cl)) != 0)
continue; continue;
if (host != NULL && strcasecmp(host, if (host != NULL && strcasecmp(host,
Client_HostnameCloaked(cl)) != 0) Client_HostnameDisplayed(cl)) != 0)
continue; continue;
if (server != NULL && strcasecmp(server, if (server != NULL && strcasecmp(server,
Client_ID(Client_Introducer(cl))) != 0) Client_ID(Client_Introducer(cl))) != 0)