moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

add missing header inclusions

Browse Source
This commit is contained in:
Yang Tse 2008-10-25 03:52:21 +00:00
parent 8693afdfea
commit d086fdaf9f
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/if2ip.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -64,6 +64,13 @@
#include "inet_ntop.h" #include "inet_ntop.h"
#include "strequal.h" #include "strequal.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "memory.h"
/* The last #include file should be: */
#include "memdebug.h"
char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size) char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
{ {
struct ifaddrs *iface, *head; struct ifaddrs *iface, *head;
@ -74,19 +81,20 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
if ((iface->ifa_addr->sa_family == af) && if ((iface->ifa_addr->sa_family == af) &&
curl_strequal(iface->ifa_name, interface)) { curl_strequal(iface->ifa_name, interface)) {
void *addr; void *addr;
char scope[12]=""; char scope[12]="";
if (af == AF_INET6) { if (af == AF_INET6) {
unsigned int scopeid; unsigned int scopeid;
addr = &((struct sockaddr_in6 *)iface->ifa_addr)->sin6_addr; addr = &((struct sockaddr_in6 *)iface->ifa_addr)->sin6_addr;
/* Include the scope of this interface as part of the address */ /* Include the scope of this interface as part of the address */
scopeid = ((struct sockaddr_in6 *)iface->ifa_addr)->sin6_scope_id; scopeid = ((struct sockaddr_in6 *)iface->ifa_addr)->sin6_scope_id;
if (scopeid) if (scopeid)
snprintf(scope, sizeof(scope), "%%%u", scopeid); snprintf(scope, sizeof(scope), "%%%u", scopeid);
} else }
else
addr = &((struct sockaddr_in *)iface->ifa_addr)->sin_addr; addr = &((struct sockaddr_in *)iface->ifa_addr)->sin_addr;
ip = (char *) Curl_inet_ntop(af, addr, buf, buf_size); ip = (char *) Curl_inet_ntop(af, addr, buf, buf_size);
strlcat(buf, scope, buf_size); strlcat(buf, scope, buf_size);
break; break;
} }
} }
freeifaddrs(head); freeifaddrs(head);
@ -130,8 +138,11 @@ char *Curl_if2ip(int af, const char *interface, char *buf, int buf_size)
#endif #endif
#include "inet_ntop.h" #include "inet_ntop.h"
#include "memory.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "memory.h"
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"