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

connect_socket(): cache options values.

Browse Source
This commit is contained in:
Laurent MONIN 2006-01-05 18:28:16 +01:00 committed by Laurent MONIN
parent ab8a4b2847
commit 9e55cb0d2a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/socket.c
View File

@ -484,6 +484,10 @@ connect_socket(struct socket *csocket, enum connection_state state)
int only_local = get_cmd_opt_bool("localhost"); int only_local = get_cmd_opt_bool("localhost");
int saved_errno = 0; int saved_errno = 0;
int at_least_one_remote_ip = 0; int at_least_one_remote_ip = 0;
#ifdef CONFIG_IPV6
int try_ipv6 = get_opt_bool("connection.try_ipv6");
#endif
int try_ipv4 = get_opt_bool("connection.try_ipv4");
/* We tried something but we failed in such a way that we would rather /* We tried something but we failed in such a way that we would rather
* prefer the connection to retain the information about previous * prefer the connection to retain the information about previous
* failures. That is, we i.e. decided we are forbidden to even think * failures. That is, we i.e. decided we are forbidden to even think
@ -535,18 +539,17 @@ connect_socket(struct socket *csocket, enum connection_state state)
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
if (family == AF_INET6) { if (family == AF_INET6) {
pf = PF_INET6; pf = PF_INET6;
if (!get_opt_bool("connection.try_ipv6") if (!try_ipv6 || (force_family && force_family != 6)) {
|| (force_family && force_family != 6)) {
silent_fail = 1; silent_fail = 1;
continue; continue;
} }
pf = PF_INET6;
} else } else
#endif #endif
if (family == AF_INET) { if (family == AF_INET) {
pf = PF_INET; pf = PF_INET;
if (!get_opt_bool("connection.try_ipv4") if (!try_ipv4 || (force_family && force_family != 4)) {
|| (force_family && force_family != 4)) {
silent_fail = 1; silent_fail = 1;
continue; continue;
} }