aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Do not send hostname to server, rather use username as the second

Browse Source 
argument to USER, patch by Alex Tarkovsky (bug #488).


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4468 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-04-28 14:11:02 +00:00 committed by exg
parent 83c178c169
commit aa172e0afb
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/irc/core/irc-servers.c
View File

@ -102,7 +102,7 @@ static void send_message(SERVER_REC *server, const char *target,
static void server_init(IRC_SERVER_REC *server) static void server_init(IRC_SERVER_REC *server)
{ {
IRC_SERVER_CONNECT_REC *conn; IRC_SERVER_CONNECT_REC *conn;
char hostname[100], *address, *ptr, *username, *cmd; char *address, *ptr, *username, *cmd;
GTimeVal now; GTimeVal now;
g_return_if_fail(server != NULL); g_return_if_fail(server != NULL);
@ -135,9 +135,6 @@ static void server_init(IRC_SERVER_REC *server)
g_free(cmd); g_free(cmd);
/* send user/realname */ /* send user/realname */
if (gethostname(hostname, sizeof(hostname)) != 0 || *hostname == '\0')
strcpy(hostname, "xx");
address = server->connrec->address; address = server->connrec->address;
ptr = strrchr(address, ':'); ptr = strrchr(address, ':');
if (ptr != NULL) { if (ptr != NULL) {
@ -148,29 +145,11 @@ static void server_init(IRC_SERVER_REC *server)
address = "x"; address = "x";
} }
/* Replace ':' with '_' in our own hostname (the same IPv6 problem) */
/* Replace '\n' and '\r' with '\0' in our own hostname to fix multiple PTR addreses */
for (ptr = hostname; *ptr != '\0'; ptr++) {
if (*ptr == ':') *ptr = '_';
if (*ptr == '\n') *ptr = '\0';
if (*ptr == '\r') *ptr = '\0';
}
/* don't allow hostname to begin with number or '+', '-'. those
can be interpreted as ircnet ircd's mode parameter.
username/hostname parameters should probably be configurable since
they're only needed with some old servers which uses them to count
unique users. */
if ((hostname[0] >= '0' && hostname[0] <= '9') ||
hostname[0] == '+' || hostname[0] == '-')
hostname[0] = '_';
username = g_strdup(conn->username); username = g_strdup(conn->username);
ptr = strchr(username, ' '); ptr = strchr(username, ' ');
if (ptr != NULL) *ptr = '\0'; if (ptr != NULL) *ptr = '\0';
cmd = g_strdup_printf("USER %s %s %s :%s", username, hostname, address, conn->realname); cmd = g_strdup_printf("USER %s %s %s :%s", username, username, address, conn->realname);
irc_send_cmd_now(server, cmd); irc_send_cmd_now(server, cmd);
g_free(cmd); g_free(cmd);
g_free(username); g_free(username);