[Python-checkins] CVS: python/dist/src/Modules getaddrinfo.c,1.9,1.10 getnameinfo.c,1.4,1.5 socketmodule.c,1.199,1.200
Martin v. L?wis
loewis@users.sourceforge.net
2001年12月02日 02:15:39 -0800
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv13970/Modules
Modified Files:
getaddrinfo.c getnameinfo.c socketmodule.c
Log Message:
Remove INET6 define. Use ENABLE_IPV6 instead.
Index: getaddrinfo.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getaddrinfo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** getaddrinfo.c 2001年11月07日 08:31:03 1.9
--- getaddrinfo.c 2001年12月02日 10:15:37 1.10
***************
*** 58,62 ****
#endif
! #if defined(__KAME__) && defined(INET6)
# define FAITH
#endif
--- 58,62 ----
#endif
! #if defined(__KAME__) && defined(ENABLE_IPV6)
# define FAITH
#endif
***************
*** 95,99 ****
const char *a_loopback;
} gai_afdl [] = {
! #ifdef INET6
#define N_INET6 0
{PF_INET6, sizeof(struct in6_addr),
--- 95,99 ----
const char *a_loopback;
} gai_afdl [] = {
! #ifdef ENABLE_IPV6
#define N_INET6 0
{PF_INET6, sizeof(struct in6_addr),
***************
*** 112,116 ****
};
! #ifdef INET6
#define PTON_MAX 16
#else
--- 112,116 ----
};
! #ifdef ENABLE_IPV6
#define PTON_MAX 16
#else
***************
*** 289,293 ****
case PF_UNSPEC:
case PF_INET:
! #ifdef INET6
case PF_INET6:
#endif
--- 289,293 ----
case PF_UNSPEC:
case PF_INET:
! #ifdef ENABLE_IPV6
case PF_INET6:
#endif
***************
*** 418,422 ****
if (inet_pton(gai_afdl[i].a_af, hostname, pton)) {
u_long v4a;
! #ifdef INET6
u_char pfx;
#endif
--- 418,422 ----
if (inet_pton(gai_afdl[i].a_af, hostname, pton)) {
u_long v4a;
! #ifdef ENABLE_IPV6
u_char pfx;
#endif
***************
*** 431,435 ****
pai->ai_flags &= ~AI_CANONNAME;
break;
! #ifdef INET6
case AF_INET6:
pfx = ((struct in6_addr *)pton)->s6_addr8[0];
--- 431,435 ----
pai->ai_flags &= ~AI_CANONNAME;
break;
! #ifdef ENABLE_IPV6
case AF_INET6:
pfx = ((struct in6_addr *)pton)->s6_addr8[0];
***************
*** 496,504 ****
struct addrinfo *cur;
int error = 0;
! #ifdef INET6
int h_error;
#endif
! #ifdef INET6
hp = getipnodebyaddr(addr, gai_afd->a_addrlen, gai_afd->a_af, &h_error);
#else
--- 496,504 ----
struct addrinfo *cur;
int error = 0;
! #ifdef ENABLE_IPV6
int h_error;
#endif
! #ifdef ENABLE_IPV6
hp = getipnodebyaddr(addr, gai_afd->a_addrlen, gai_afd->a_af, &h_error);
#else
***************
*** 511,515 ****
GET_AI(cur, gai_afd, numaddr, port);
! #ifdef INET6
if (hp)
freehostent(hp);
--- 511,515 ----
GET_AI(cur, gai_afd, numaddr, port);
! #ifdef ENABLE_IPV6
if (hp)
freehostent(hp);
***************
*** 520,524 ****
if (cur)
freeaddrinfo(cur);
! #ifdef INET6
if (hp)
freehostent(hp);
--- 520,524 ----
if (cur)
freeaddrinfo(cur);
! #ifdef ENABLE_IPV6
if (hp)
freehostent(hp);
***************
*** 548,552 ****
sentinel.ai_next = NULL;
cur = &sentinel;
! #ifdef INET6
if (af == AF_UNSPEC) {
hp = getipnodebyname(hostname, AF_INET6,
--- 548,552 ----
sentinel.ai_next = NULL;
cur = &sentinel;
! #ifdef ENABLE_IPV6
if (af == AF_UNSPEC) {
hp = getipnodebyname(hostname, AF_INET6,
***************
*** 583,592 ****
for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) {
switch (af) {
! #ifdef INET6
case AF_INET6:
gai_afd = &gai_afdl[N_INET6];
break;
#endif
! #ifndef INET6
default: /* AF_UNSPEC */
#endif
--- 583,592 ----
for (i = 0; (ap = hp->h_addr_list[i]) != NULL; i++) {
switch (af) {
! #ifdef ENABLE_IPV6
case AF_INET6:
gai_afd = &gai_afdl[N_INET6];
break;
#endif
! #ifndef ENABLE_IPV6
default: /* AF_UNSPEC */
#endif
***************
*** 594,598 ****
gai_afd = &gai_afdl[N_INET];
break;
! #ifdef INET6
default: /* AF_UNSPEC */
if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) {
--- 594,598 ----
gai_afd = &gai_afdl[N_INET];
break;
! #ifdef ENABLE_IPV6
default: /* AF_UNSPEC */
if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) {
***************
*** 623,627 ****
cur = cur->ai_next;
}
! #ifdef INET6
freehostent(hp);
#endif
--- 623,627 ----
cur = cur->ai_next;
}
! #ifdef ENABLE_IPV6
freehostent(hp);
#endif
***************
*** 631,635 ****
if (top)
freeaddrinfo(top);
! #ifdef INET6
if (hp)
freehostent(hp);
--- 631,635 ----
if (top)
freeaddrinfo(top);
! #ifdef ENABLE_IPV6
if (hp)
freehostent(hp);
Index: getnameinfo.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getnameinfo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** getnameinfo.c 2001年08月15日 17:14:33 1.4
--- getnameinfo.c 2001年12月02日 10:15:37 1.5
***************
*** 59,63 ****
int a_off;
} gni_afdl [] = {
! #ifdef INET6
{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
offsetof(struct sockaddr_in6, sin6_addr)},
--- 59,63 ----
int a_off;
} gni_afdl [] = {
! #ifdef ENABLE_IPV6
{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
offsetof(struct sockaddr_in6, sin6_addr)},
***************
*** 103,107 ****
char *addr, *p;
u_long v4a;
! #ifdef INET6
u_char pfx;
#endif
--- 103,107 ----
char *addr, *p;
u_long v4a;
! #ifdef ENABLE_IPV6
u_char pfx;
#endif
***************
*** 160,164 ****
flags |= NI_NUMERICHOST;
break;
! #ifdef INET6
case AF_INET6:
pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0];
--- 160,164 ----
flags |= NI_NUMERICHOST;
break;
! #ifdef ENABLE_IPV6
case AF_INET6:
pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr8[0];
***************
*** 178,182 ****
strcpy(host, numaddr);
} else {
! #ifdef INET6
hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error);
#else
--- 178,182 ----
strcpy(host, numaddr);
} else {
! #ifdef ENABLE_IPV6
hp = getipnodebyaddr(addr, gni_afd->a_addrlen, gni_afd->a_af, &h_error);
#else
***************
*** 191,195 ****
}
if (strlen(hp->h_name) > hostlen) {
! #ifdef INET6
freehostent(hp);
#endif
--- 191,195 ----
}
if (strlen(hp->h_name) > hostlen) {
! #ifdef ENABLE_IPV6
freehostent(hp);
#endif
***************
*** 197,201 ****
}
strcpy(host, hp->h_name);
! #ifdef INET6
freehostent(hp);
#endif
--- 197,201 ----
}
strcpy(host, hp->h_name);
! #ifdef ENABLE_IPV6
freehostent(hp);
#endif
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** socketmodule.c 2001年11月28日 22:07:30 1.199
--- socketmodule.c 2001年12月02日 10:15:37 1.200
***************
*** 480,484 ****
struct sockaddr_un un;
#endif
! #ifdef INET6
struct sockaddr_in6 in6;
struct sockaddr_storage storage;
--- 480,484 ----
struct sockaddr_un un;
#endif
! #ifdef ENABLE_IPV6
struct sockaddr_in6 in6;
struct sockaddr_storage storage;
***************
*** 595,599 ****
siz = 4;
break;
! #ifdef INET6
case AF_INET6:
siz = 16;
--- 595,599 ----
siz = 4;
break;
! #ifdef ENABLE_IPV6
case AF_INET6:
siz = 16;
***************
*** 652,656 ****
case AF_INET:
return 4;
! #ifdef INET6
case AF_INET6:
return 16;
--- 652,656 ----
case AF_INET:
return 4;
! #ifdef ENABLE_IPV6
case AF_INET6:
return 16;
***************
*** 726,730 ****
#endif /* AF_UNIX */
! #ifdef INET6
case AF_INET6:
{
--- 726,730 ----
#endif /* AF_UNIX */
! #ifdef ENABLE_IPV6
case AF_INET6:
{
***************
*** 831,835 ****
}
! #ifdef INET6
case AF_INET6:
{
--- 831,835 ----
}
! #ifdef ENABLE_IPV6
case AF_INET6:
{
***************
*** 920,924 ****
}
! #ifdef INET6
case AF_INET6:
{
--- 920,924 ----
}
! #ifdef ENABLE_IPV6
case AF_INET6:
{
***************
*** 1994,1998 ****
return NULL;
break;
! #ifdef INET6
case AF_INET6:
if (alen < sizeof(struct sockaddr_in6))
--- 1994,1998 ----
return NULL;
break;
! #ifdef ENABLE_IPV6
case AF_INET6:
if (alen < sizeof(struct sockaddr_in6))
***************
*** 2032,2036 ****
break;
}
! #ifdef INET6
case AF_INET6:
{
--- 2032,2036 ----
break;
}
! #ifdef ENABLE_IPV6
case AF_INET6:
{
***************
*** 2139,2143 ****
PySocket_gethostbyaddr(PyObject *self, PyObject *args)
{
! #ifdef INET6
struct sockaddr_storage addr;
#else
--- 2139,2143 ----
PySocket_gethostbyaddr(PyObject *self, PyObject *args)
{
! #ifdef ENABLE_IPV6
struct sockaddr_storage addr;
#else
***************
*** 2178,2182 ****
al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
break;
! #ifdef INET6
case AF_INET6:
ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
--- 2178,2182 ----
al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
break;
! #ifdef ENABLE_IPV6
case AF_INET6:
ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
***************
*** 2589,2593 ****
break;
}
! #ifdef INET6
case AF_INET6:
{
--- 2589,2593 ----
break;
}
! #ifdef ENABLE_IPV6
case AF_INET6:
{