aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

If -4 or -6 option is used with /SERVER, force the correct protocol match.

Browse Source 
eg. /SERVER -6 host either connects to IPv6 host or fails.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2564 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2002-03-10 19:14:04 +00:00 committed by cras
parent b18af319cf
commit 9d423576aa
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/servers.c
View File

@ -186,12 +186,22 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
server->connect_pipe[1] = NULL; server->connect_pipe[1] = NULL;
/* figure out if we should use IPv4 or v6 address */ /* figure out if we should use IPv4 or v6 address */
ip = iprec.error != 0 ? NULL : iprec.ip6.family == 0 || if (iprec.error != 0) {
(server->connrec->family == AF_INET && iprec.ip4.family != 0) ? /* error */
&iprec.ip4 : &iprec.ip6; ip = NULL;
if (iprec.ip4.family != 0 && server->connrec->family == 0 && } else if (server->connrec->family == AF_INET) {
!settings_get_bool("resolve_prefer_ipv6")) /* force IPv4 connection */
ip = &iprec.ip4; ip = iprec.ip4.family == 0 ? NULL : &iprec.ip4;
} else if (server->connrec->family == AF_INET6) {
/* force IPv6 connection */
ip = iprec.ip6.family == 0 ? NULL : &iprec.ip6;
} else {
/* pick the one that was found, or if both do it like
/SET resolve_prefer_ipv6 says. */
ip = iprec.ip6.family != 0 &&
settings_get_bool("resolve_prefer_ipv6") ?
&iprec.ip6 : &iprec.ip4;
}
conn = server->connrec; conn = server->connrec;
port = conn->proxy != NULL ? conn->proxy_port : conn->port; port = conn->proxy != NULL ? conn->proxy_port : conn->port;
@ -209,15 +219,21 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
if (handle == NULL) { if (handle == NULL) {
/* failed */ /* failed */
if (iprec.error != 0 && net_hosterror_notfound(iprec.error)) { if (ip == NULL && (iprec.error == 0 ||
net_hosterror_notfound(iprec.error))) {
/* IP wasn't found for the host, don't try to reconnect /* IP wasn't found for the host, don't try to reconnect
back to this server */ back to this server */
server->dns_error = TRUE; server->dns_error = TRUE;
} }
if (iprec.error == 0) { if (ip != NULL) {
/* connect() failed */ /* connect() failed */
errormsg = g_strerror(errno); errormsg = g_strerror(errno);
} else if (iprec.error == 0) {
/* forced IPv4 or IPv6 address but it wasn't found */
errormsg = server->connrec->family == AF_INET ?
"IPv4 address not found for host" :
"IPv6 address not found for host";
} else { } else {
/* gethostbyname() failed */ /* gethostbyname() failed */
errormsg = iprec.errorstr != NULL ? iprec.errorstr : errormsg = iprec.errorstr != NULL ? iprec.errorstr :