diff options
author | Kim Vandry <vandry@TZoNE.ORG> | 2013-04-03 16:06:51 -0400 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2013-04-06 16:51:58 +0200 |
commit | 090b55c100be4364ac035b5a1b7440cf94e71904 (patch) | |
tree | 7e10851446a7888b82c1f54ca5b60088ff9847ae /lib/if2ip.h | |
parent | a181e7b084b67112084d6cbce166a1ac1ffaecd4 (diff) | |
download | curl-090b55c100be4364ac035b5a1b7440cf94e71904.tar.gz |
connect: treat an interface bindlocal() problem as a non-fatal error
I am using curl_easy_setopt(CURLOPT_INTERFACE, "if!something") to force
transfers to use a particular interface but the transfer fails with
CURLE_INTERFACE_FAILED, "Failed binding local connection end" if the
interface I specify has no IPv6 address. The cause is as follows:
The remote hostname resolves successfully and has an IPv6 address and an
IPv4 address.
cURL attempts to connect to the IPv6 address first.
bindlocal (in lib/connect.c) fails because Curl_if2ip cannot find an
IPv6 address on the interface.
This is a fatal error in singleipconnect()
This change will make cURL try the next IP address in the list.
Also included are two changes related to IPv6 address scope:
- Filter the choice of address in Curl_if2ip to only consider addresses
with the same scope ID as the connection address (mismatched scope for
local and remote address does not result in a working connection).
- bindlocal was ignoring the scope ID of addresses returned by
Curl_if2ip . Now it uses them.
Bug: http://curl.haxx.se/bug/view.cgi?id=1189
Diffstat (limited to 'lib/if2ip.h')
-rw-r--r-- | lib/if2ip.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/if2ip.h b/lib/if2ip.h index 858ec2f5b..ac5875237 100644 --- a/lib/if2ip.h +++ b/lib/if2ip.h @@ -24,7 +24,15 @@ #include "curl_setup.h" bool Curl_if_is_interface_name(const char *interf); -char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size); + +typedef enum { + IF2IP_NOT_FOUND = 0, /* Interface not found */ + IF2IP_AF_NOT_SUPPORTED = 1, /* Int. exists but has no address for this af */ + IF2IP_FOUND = 2 /* The address has been stored in "buf" */ +} if2ip_result_t; + +if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, + const char *interf, char *buf, int buf_size); #ifdef __INTERIX |