zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 12:23:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned up code.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@480 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-07-16 20:18:05 +00:00 • committed by cras
commit c2397475c5
24 changed files with 489 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/core/server.c
View file

@ -129,6 +129,7 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
{
SERVER_CONNECT_REC *conn;
RESOLVED_IP_REC iprec;
const char *errormsg;
int handle;
g_source_remove(server->connect_tag);
@ -157,21 +158,33 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
other error in nameserver */
server->connection_lost = TRUE;
}
server_cant_connect(server,
iprec.error == 0 ? g_strerror(errno) : /* connect() failed */
(iprec.errorstr != NULL ? iprec.errorstr : "Host lookup failed")); /* gethostbyname() failed */
if (iprec.error == 0) {
/* connect() failed */
errormsg = g_strerror(errno);
} else {
/* gethostbyname() failed */
errormsg = iprec.errorstr != NULL ? iprec.errorstr :
"Host lookup failed";
}
server_cant_connect(server, rrormsg);
g_free_not_null(iprec.errorstr);
return;
}
server->handle = net_sendbuffer_create(handle, 0);
server->connect_tag = g_input_add(handle, G_INPUT_WRITE|G_INPUT_READ|G_INPUT_EXCEPTION,
(GInputFunction) server_connect_callback_init, server);
server->connect_tag =
g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ |
G_INPUT_EXCEPTION,
(GInputFunction) server_connect_callback_init,
server);
signal_emit("server connecting", 2, server, &iprec.ip);
}
int server_connect(SERVER_REC *server)
{
const char *connect_address;
g_return_val_if_fail(server != NULL, FALSE);
MODULE_DATA_INIT(server);
@ -182,9 +195,11 @@ int server_connect(SERVER_REC *server)
}
server->tag = server_create_tag(server->connrec);
connect_address = server->connrec->proxy != NULL ?
server->connrec->proxy : server->connrec->address;
server->connect_pid =
net_gethostbyname_nonblock(server->connrec->proxy != NULL ?
server->connrec->proxy : server->connrec->address,
net_gethostbyname_nonblock(connect_address,
server->connect_pipe[1]);
server->connect_tag =
g_input_add(server->connect_pipe[0], G_INPUT_READ,