Commit 7abdc4b2 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed the getifaddrs version of Curl_if2ip to work on systems without IPv6 

support (e.g. Minix)
parent 479ddb1f

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 


                                  Changelog



Daniel Fandrich (3 Dec 2008)

- Fixed the getifaddrs version of Curl_if2ip to work on systems without IPv6

  support (e.g. Minix)



Daniel Stenberg (3 Dec 2008)

- Igor Novoseltsev filed bug #2351645

  (http://curl.haxx.se/bug/view.cgi?id=2351645) that identified a problem with

lib/if2ip.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) 
          curl_strequal(iface->ifa_name, interface)) {

        void *addr;

        char scope[12]="";

#ifdef ENABLE_IPV6

        if (af == AF_INET6) {

          unsigned int scopeid;

          addr = &((struct sockaddr_in6 *)iface->ifa_addr)->sin6_addr;
@@ -93,6 +94,7 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) 
            snprintf(scope, sizeof(scope), "%%%u", scopeid);

        }

        else

#endif

          addr = &((struct sockaddr_in *)iface->ifa_addr)->sin_addr;

        ip = (char *) Curl_inet_ntop(af, addr, buf, buf_size);

        strlcat(buf, scope, buf_size);