diff options
| author | Jason Glasgow <jglasgow@chromium.org> | 2011-11-04 16:48:05 -0400 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-12-12 23:12:37 +0100 |
| commit | 6e4835c795996ee92ac1aa78733f23a089f310a5 (patch) | |
| tree | 16c989d04fe8c94f2b03ccf18f587e0f4e2254ca /lib/connect.c | |
| parent | ba057c2e1927bd5b7b026e2391984a899c2b8461 (diff) | |
CURLOPT_INTERFACE: avoid resolving interfaces names
Do not try to resolve interfaces names via DNS by recognizing interface
names in a few ways. If the interface option argument has a prefix of
"if!" then treat the argument as only an interface. Similarly, if the
interface argument is the name of an interface (even if it does not have
an IP address assigned), treat it as an interface name. Finally, if the
interface argument is prefixed by "host!" treat it as a hostname that
must be resolved by /etc/hosts or DNS.
These changes allow a client using the multi interfaces to avoid
blocking on name resolution if the interface loses its IP address or
disappears.
Diffstat (limited to 'lib/connect.c')
| -rw-r--r-- | lib/connect.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/connect.c b/lib/connect.c index af225ab83..906fd9d18 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -240,6 +240,10 @@ static CURLcode bindlocal(struct connectdata *conn, int error; char myhost[256] = ""; int done = 0; /* -1 for error, 1 for address found */ + int is_interface = FALSE; + int is_host = FALSE; + static const char *if_prefix = "if!"; + static const char *host_prefix = "host!"; /************************************************************* * Select device to bind socket to @@ -251,9 +255,20 @@ static CURLcode bindlocal(struct connectdata *conn, memset(&sa, 0, sizeof(struct Curl_sockaddr_storage)); if(dev && (strlen(dev)<255) ) { + if(strncmp(if_prefix, dev, strlen(if_prefix)) == 0) { + dev += strlen(if_prefix); + is_interface = TRUE; + } + else if(strncmp(host_prefix, dev, strlen(host_prefix)) == 0) { + dev += strlen(host_prefix); + is_host = TRUE; + } /* interface */ - if(Curl_if2ip(af, dev, myhost, sizeof(myhost))) { + if(!is_host && (is_interface || Curl_if_is_interface_name(dev))) { + if(Curl_if2ip(af, dev, myhost, sizeof(myhost)) == NULL) + return CURLE_INTERFACE_FAILED; + /* * We now have the numerical IP address in the 'myhost' buffer */ |