summaryrefslogtreecommitdiff
path: root/lib/if2ip.c
diff options
context:
space:
mode:
authorJason Glasgow <jglasgow@chromium.org>2011-11-04 16:48:05 -0400
committerDaniel Stenberg <daniel@haxx.se>2011-12-12 23:12:37 +0100
commit6e4835c795996ee92ac1aa78733f23a089f310a5 (patch)
tree16c989d04fe8c94f2b03ccf18f587e0f4e2254ca /lib/if2ip.c
parentba057c2e1927bd5b7b026e2391984a899c2b8461 (diff)
downloadcurl-6e4835c795996ee92ac1aa78733f23a089f310a5.tar.gz
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/if2ip.c')
-rw-r--r--lib/if2ip.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 4924f7301..0ae375b15 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -71,6 +71,24 @@
#if defined(HAVE_GETIFADDRS)
+bool Curl_if_is_interface_name(const char *interface)
+{
+ bool result = FALSE;
+
+ struct ifaddrs *iface, *head;
+
+ if(getifaddrs(&head) >= 0) {
+ for(iface=head; iface != NULL; iface=iface->ifa_next) {
+ if(curl_strequal(iface->ifa_name, interface)) {
+ result = TRUE;
+ break;
+ }
+ }
+ freeifaddrs(head);
+ }
+ return result;
+}
+
char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
{
struct ifaddrs *iface, *head;
@@ -109,6 +127,14 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
#elif defined(HAVE_IOCTL_SIOCGIFADDR)
+bool Curl_if_is_interface_name(const char *interface)
+{
+ /* This is here just to support the old interfaces */
+ char buf[256];
+
+ return (Curl_if2ip(AF_INET, interface, buf, sizeof(buf)) != NULL);
+}
+
char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
{
struct ifreq req;
@@ -148,6 +174,11 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
#else
+bool Curl_if_is_interface_name(const char *interface)
+{
+ return FALSE;
+}
+
char *Curl_if2ip(int af, const char *interf, char *buf, int buf_size)
{
(void) af;