Skip to content

C
cpython
Kaydet (Commit) 44ddbde3 authored tarafından Martin v. Löwis's avatar Martin v. Löwis
Dosyalara gözat
Seçenekler

Remove INET6 define. Use ENABLE_IPV6 instead.

üst 080d5b3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 45 deletions
Modules/getaddrinfo.c
Dosyayı görüntüle @ 44ddbde3
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include "addrinfo.h" #include "addrinfo.h"
#endif #endif
#if defined(__KAME__) && defined(INET6) #if defined(__KAME__) && defined(ENABLE_IPV6)
# define FAITH # define FAITH
#endif #endif
...@@ -94,7 +94,7 @@ static struct gai_afd { ...@@ -94,7 +94,7 @@ static struct gai_afd {
const char *a_addrany; const char *a_addrany;
const char *a_loopback; const char *a_loopback;
} gai_afdl [] = { } gai_afdl [] = {
#ifdef INET6 #ifdef ENABLE_IPV6
#define N_INET6 0 #define N_INET6 0
{PF_INET6, sizeof(struct in6_addr), {PF_INET6, sizeof(struct in6_addr),
sizeof(struct sockaddr_in6), sizeof(struct sockaddr_in6),
...@@ -111,7 +111,7 @@ static struct gai_afd { ...@@ -111,7 +111,7 @@ static struct gai_afd {
{0, 0, 0, 0, NULL, NULL}, {0, 0, 0, 0, NULL, NULL},
}; };
#ifdef INET6 #ifdef ENABLE_IPV6
#define PTON_MAX 16 #define PTON_MAX 16
#else #else
#define PTON_MAX 4 #define PTON_MAX 4
...@@ -288,7 +288,7 @@ getaddrinfo(const char*hostname, const char*servname, ...@@ -288,7 +288,7 @@ getaddrinfo(const char*hostname, const char*servname,
switch (hints->ai_family) { switch (hints->ai_family) {
case PF_UNSPEC: case PF_UNSPEC:
case PF_INET: case PF_INET:
#ifdef INET6 #ifdef ENABLE_IPV6
case PF_INET6: case PF_INET6:
#endif #endif
break; break;
...@@ -417,7 +417,7 @@ getaddrinfo(const char*hostname, const char*servname, ...@@ -417,7 +417,7 @@ getaddrinfo(const char*hostname, const char*servname,
for (i = 0; gai_afdl[i].a_af; i++) { for (i = 0; gai_afdl[i].a_af; i++) {
if (inet_pton(gai_afdl[i].a_af, hostname, pton)) { if (inet_pton(gai_afdl[i].a_af, hostname, pton)) {
u_long v4a; u_long v4a;
#ifdef INET6 #ifdef ENABLE_IPV6
u_char pfx; u_char pfx;
#endif #endif
...@@ -430,7 +430,7 @@ getaddrinfo(const char*hostname, const char*servname, ...@@ -430,7 +430,7 @@ getaddrinfo(const char*hostname, const char*servname,
if (v4a == 0 || v4a == IN_LOOPBACKNET) if (v4a == 0 || v4a == IN_LOOPBACKNET)
pai->ai_flags &= ~AI_CANONNAME; pai->ai_flags &= ~AI_CANONNAME;
break; break;
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
pfx = ((struct in6_addr *)pton)->s6_addr8[0]; pfx = ((struct in6_addr *)pton)->s6_addr8[0];
if (pfx == 0 || pfx == 0xfe || pfx == 0xff) if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
...@@ -495,11 +495,11 @@ get_name(addr, gai_afd, res, numaddr, pai, port0) ...@@ -495,11 +495,11 @@ get_name(addr, gai_afd, res, numaddr, pai, port0)
struct hostent *hp; struct hostent *hp;
struct addrinfo *cur; struct addrinfo *cur;
int error = 0; int error = 0;
#ifdef INET6 #ifdef ENABLE_IPV6
int h_error; int h_error;
#endif #endif
#ifdef INET6 #ifdef ENABLE_IPV6
hp = getipnodebyaddr(addr, gai_afd->a_addrlen, gai_afd->a_af, &h_error); hp = getipnodebyaddr(addr, gai_afd->a_addrlen, gai_afd->a_af, &h_error);
#else #else
hp = gethostbyaddr(addr, gai_afd->a_addrlen, AF_INET); hp = gethostbyaddr(addr, gai_afd->a_addrlen, AF_INET);
...@@ -510,7 +510,7 @@ get_name(addr, gai_afd, res, numaddr, pai, port0) ...@@ -510,7 +510,7 @@ get_name(addr, gai_afd, res, numaddr, pai, port0)
} else } else
GET_AI(cur, gai_afd, numaddr, port); GET_AI(cur, gai_afd, numaddr, port);
#ifdef INET6 #ifdef ENABLE_IPV6
if (hp) if (hp)
freehostent(hp); freehostent(hp);
#endif #endif
...@@ -519,7 +519,7 @@ get_name(addr, gai_afd, res, numaddr, pai, port0) ...@@ -519,7 +519,7 @@ get_name(addr, gai_afd, res, numaddr, pai, port0)
free: free:
if (cur) if (cur)
freeaddrinfo(cur); freeaddrinfo(cur);
#ifdef INET6 #ifdef ENABLE_IPV6
if (hp) if (hp)
freehostent(hp); freehostent(hp);
#endif #endif
...@@ -547,7 +547,7 @@ get_addr(hostname, af, res, pai, port0) ...@@ -547,7 +547,7 @@ get_addr(hostname, af, res, pai, port0)
top = NULL; top = NULL;
sentinel.ai_next = NULL; sentinel.ai_next = NULL;
cur = &sentinel; cur = &sentinel;
#ifdef INET6 #ifdef ENABLE_IPV6
if (af == AF_UNSPEC) { if (af == AF_UNSPEC) {
hp = getipnodebyname(hostname, AF_INET6, hp = getipnodebyname(hostname, AF_INET6,
AI_ADDRCONFIG|AI_ALL|AI_V4MAPPED, &h_error); AI_ADDRCONFIG|AI_ALL|AI_V4MAPPED, &h_error);
...@@ -582,18 +582,18 @@ get_addr(hostname, af, res, pai, port0) ...@@ -582,18 +582,18 @@ get_addr(hostname, af, res, pai, port0)
for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) { for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) {
switch (af) { switch (af) {
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
gai_afd = &gai_afdl[N_INET6]; gai_afd = &gai_afdl[N_INET6];
break; break;
#endif #endif
#ifndef INET6 #ifndef ENABLE_IPV6
default: /* AF_UNSPEC */ default: /* AF_UNSPEC */
#endif #endif
case AF_INET: case AF_INET:
gai_afd = &gai_afdl[N_INET]; gai_afd = &gai_afdl[N_INET];
break; break;
#ifdef INET6 #ifdef ENABLE_IPV6
default: /* AF_UNSPEC */ default: /* AF_UNSPEC */
if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) { if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) {
ap += sizeof(struct in6_addr) - ap += sizeof(struct in6_addr) -
...@@ -622,7 +622,7 @@ get_addr(hostname, af, res, pai, port0) ...@@ -622,7 +622,7 @@ get_addr(hostname, af, res, pai, port0)
} }
cur = cur->ai_next; cur = cur->ai_next;
} }
#ifdef INET6 #ifdef ENABLE_IPV6
freehostent(hp); freehostent(hp);
#endif #endif
*res = top; *res = top;
...@@ -630,7 +630,7 @@ get_addr(hostname, af, res, pai, port0) ...@@ -630,7 +630,7 @@ get_addr(hostname, af, res, pai, port0)
free: free:
if (top) if (top)
freeaddrinfo(top); freeaddrinfo(top);
#ifdef INET6 #ifdef ENABLE_IPV6
if (hp) if (hp)
freehostent(hp); freehostent(hp);
#endif #endif
......
Modules/getnameinfo.c
Dosyayı görüntüle @ 44ddbde3
...@@ -58,7 +58,7 @@ static struct gni_afd { ...@@ -58,7 +58,7 @@ static struct gni_afd {
int a_socklen; int a_socklen;
int a_off; int a_off;
} gni_afdl [] = { } gni_afdl [] = {
#ifdef INET6 #ifdef ENABLE_IPV6
{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6), {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
offsetof(struct sockaddr_in6, sin6_addr)}, offsetof(struct sockaddr_in6, sin6_addr)},
#endif #endif
...@@ -102,7 +102,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) ...@@ -102,7 +102,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
int family, len, i; int family, len, i;
char *addr, *p; char *addr, *p;
u_long v4a; u_long v4a;
#ifdef INET6 #ifdef ENABLE_IPV6
u_char pfx; u_char pfx;
#endif #endif
int h_error; int h_error;
...@@ -159,7 +159,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) ...@@ -159,7 +159,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
if (v4a == 0 || v4a == IN_LOOPBACKNET) if (v4a == 0 || v4a == IN_LOOPBACKNET)
flags |= NI_NUMERICHOST; flags |= NI_NUMERICHOST;
break; break;
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0]; pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0];
if (pfx == 0 || pfx == 0xfe || pfx == 0xff) if (pfx == 0 || pfx == 0xfe || pfx == 0xff)
...@@ -177,7 +177,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) ...@@ -177,7 +177,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
return ENI_MEMORY; return ENI_MEMORY;
strcpy(host, numaddr); strcpy(host, numaddr);
} else { } else {
#ifdef INET6 #ifdef ENABLE_IPV6
hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error); hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error);
#else #else
hp = gethostbyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af); hp = gethostbyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af);
...@@ -190,13 +190,13 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) ...@@ -190,13 +190,13 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
if (p) *p = '\0'; if (p) *p = '\0';
} }
if (strlen(hp->h_name) > hostlen) { if (strlen(hp->h_name) > hostlen) {
#ifdef INET6 #ifdef ENABLE_IPV6
freehostent(hp); freehostent(hp);
#endif #endif
return ENI_MEMORY; return ENI_MEMORY;
} }
strcpy(host, hp->h_name); strcpy(host, hp->h_name);
#ifdef INET6 #ifdef ENABLE_IPV6
freehostent(hp); freehostent(hp);
#endif #endif
} else { } else {
......
Modules/socketmodule.c
Dosyayı görüntüle @ 44ddbde3
...@@ -479,7 +479,7 @@ typedef struct { ...@@ -479,7 +479,7 @@ typedef struct {
#ifdef AF_UNIX #ifdef AF_UNIX
struct sockaddr_un un; struct sockaddr_un un;
#endif #endif
#ifdef INET6 #ifdef ENABLE_IPV6
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
struct sockaddr_storage storage; struct sockaddr_storage storage;
#endif #endif
...@@ -594,7 +594,7 @@ setipaddr(char* name, struct sockaddr * addr_ret, int af) ...@@ -594,7 +594,7 @@ setipaddr(char* name, struct sockaddr * addr_ret, int af)
case AF_INET: case AF_INET:
siz = 4; siz = 4;
break; break;
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
siz = 16; siz = 16;
break; break;
...@@ -651,7 +651,7 @@ setipaddr(char* name, struct sockaddr * addr_ret, int af) ...@@ -651,7 +651,7 @@ setipaddr(char* name, struct sockaddr * addr_ret, int af)
switch (addr_ret->sa_family) { switch (addr_ret->sa_family) {
case AF_INET: case AF_INET:
return 4; return 4;
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
return 16; return 16;
#endif #endif
...@@ -725,7 +725,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen) ...@@ -725,7 +725,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
} }
#endif /* AF_UNIX */ #endif /* AF_UNIX */
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
{ {
struct sockaddr_in6 *a; struct sockaddr_in6 *a;
...@@ -830,7 +830,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, ...@@ -830,7 +830,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
return 1; return 1;
} }
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
{ {
struct sockaddr_in6* addr; struct sockaddr_in6* addr;
...@@ -919,7 +919,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) ...@@ -919,7 +919,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
return 1; return 1;
} }
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
{ {
*len_ret = sizeof (struct sockaddr_in6); *len_ret = sizeof (struct sockaddr_in6);
...@@ -1993,7 +1993,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af) ...@@ -1993,7 +1993,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
if (alen < sizeof(struct sockaddr_in)) if (alen < sizeof(struct sockaddr_in))
return NULL; return NULL;
break; break;
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
if (alen < sizeof(struct sockaddr_in6)) if (alen < sizeof(struct sockaddr_in6))
return NULL; return NULL;
...@@ -2031,7 +2031,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af) ...@@ -2031,7 +2031,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
memcpy((char *) addr, &sin, sizeof(sin)); memcpy((char *) addr, &sin, sizeof(sin));
break; break;
} }
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
{ {
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
...@@ -2138,7 +2138,7 @@ for a host. The host argument is a string giving a host name or IP number."; ...@@ -2138,7 +2138,7 @@ for a host. The host argument is a string giving a host name or IP number.";
static PyObject * static PyObject *
PySocket_gethostbyaddr(PyObject *self, PyObject *args) PySocket_gethostbyaddr(PyObject *self, PyObject *args)
{ {
#ifdef INET6 #ifdef ENABLE_IPV6
struct sockaddr_storage addr; struct sockaddr_storage addr;
#else #else
struct sockaddr_in addr; struct sockaddr_in addr;
...@@ -2177,7 +2177,7 @@ PySocket_gethostbyaddr(PyObject *self, PyObject *args) ...@@ -2177,7 +2177,7 @@ PySocket_gethostbyaddr(PyObject *self, PyObject *args)
ap = (char *)&((struct sockaddr_in *)sa)->sin_addr; ap = (char *)&((struct sockaddr_in *)sa)->sin_addr;
al = sizeof(((struct sockaddr_in *)sa)->sin_addr); al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
break; break;
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr; ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr); al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
...@@ -2588,7 +2588,7 @@ PySocket_getnameinfo(PyObject *self, PyObject *args) ...@@ -2588,7 +2588,7 @@ PySocket_getnameinfo(PyObject *self, PyObject *args)
} }
break; break;
} }
#ifdef INET6 #ifdef ENABLE_IPV6
case AF_INET6: case AF_INET6:
{ {
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;
......
configure
Dosyayı görüntüle @ 44ddbde3
This diff is collapsed.
configure.in
Dosyayı görüntüle @ 44ddbde3
...@@ -1189,8 +1189,7 @@ if test "$ipv6" = "yes"; then ...@@ -1189,8 +1189,7 @@ if test "$ipv6" = "yes"; then
#ifdef IPV6_INRIA_VERSION #ifdef IPV6_INRIA_VERSION
yes yes
#endif], #endif],
[ipv6type=$i; [ipv6type=$i])
OPT="-DINET6 $OPT"])
;; ;;
kame) kame)
dnl http://www.kame.net/ dnl http://www.kame.net/
...@@ -1202,8 +1201,7 @@ yes ...@@ -1202,8 +1201,7 @@ yes
[ipv6type=$i; [ipv6type=$i;
ipv6lib=inet6 ipv6lib=inet6
ipv6libdir=/usr/local/v6/lib ipv6libdir=/usr/local/v6/lib
ipv6trylibc=yes ipv6trylibc=yes])
OPT="-DINET6 $OPT"])
;; ;;
linux-glibc) linux-glibc)
dnl http://www.v6.linux.or.jp/ dnl http://www.v6.linux.or.jp/
...@@ -1213,8 +1211,7 @@ yes ...@@ -1213,8 +1211,7 @@ yes
yes yes
#endif], #endif],
[ipv6type=$i; [ipv6type=$i;
ipv6trylibc=yes ipv6trylibc=yes])
OPT="-DINET6 $OPT"])
;; ;;
linux-inet6) linux-inet6)
dnl http://www.v6.linux.or.jp/ dnl http://www.v6.linux.or.jp/
...@@ -1222,7 +1219,7 @@ yes ...@@ -1222,7 +1219,7 @@ yes
ipv6type=$i ipv6type=$i
ipv6lib=inet6 ipv6lib=inet6
ipv6libdir=/usr/inet6/lib ipv6libdir=/usr/inet6/lib
OPT="-DINET6 -I/usr/inet6/include $OPT" OPT="-I/usr/inet6/include $OPT"
fi fi
;; ;;
solaris) solaris)
...@@ -1230,7 +1227,6 @@ yes ...@@ -1230,7 +1227,6 @@ yes
if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then
ipv6type=$i ipv6type=$i
ipv6trylibc=yes ipv6trylibc=yes
OPT="-DINET6 $OPT"
fi fi
fi fi
;; ;;
...@@ -1242,8 +1238,7 @@ yes ...@@ -1242,8 +1238,7 @@ yes
#endif], #endif],
[ipv6type=$i; [ipv6type=$i;
ipv6lib=inet6; ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib; ipv6libdir=/usr/local/v6/lib])
OPT="-DINET6 $OPT"])
;; ;;
v6d) v6d)
AC_EGREP_CPP(yes, [ AC_EGREP_CPP(yes, [
...@@ -1264,8 +1259,7 @@ yes ...@@ -1264,8 +1259,7 @@ yes
#endif], #endif],
[ipv6type=$i; [ipv6type=$i;
ipv6lib=inet6; ipv6lib=inet6;
ipv6libdir=/usr/local/v6/lib; ipv6libdir=/usr/local/v6/lib])
OPT="-DINET6 $OPT"])
;; ;;
esac esac
if test "$ipv6type" != "unknown"; then if test "$ipv6type" != "unknown"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment