9a10,11
> *
> * $FreeBSD: head/contrib/tcp_wrappers/rfc931.c 56977 2000-02-03 10:27:03Z shin $
70a73,76
> #ifdef INET6
> struct sockaddr *rmt_sin;
> struct sockaddr *our_sin;
> #else
72a79
> #endif
76a84,88
> #ifdef INET6
> struct sockaddr_storage rmt_query_sin;
> struct sockaddr_storage our_query_sin;
> int alen;
> #else
78a91
> #endif
84a98,116
> #ifdef INET6
> /* address family must be the same */
> if (rmt_sin->sa_family != our_sin->sa_family) {
> STRN_CPY(dest, result, STRING_LENGTH);
> return;
> }
> switch (our_sin->sa_family) {
> case AF_INET:
> alen = sizeof(struct sockaddr_in);
> break;
> case AF_INET6:
> alen = sizeof(struct sockaddr_in6);
> break;
> default:
> STRN_CPY(dest, result, STRING_LENGTH);
> return;
> }
> #endif
>
94a127,129
> #ifdef INET6
> if ((fp = fsocket(our_sin->sa_family, SOCK_STREAM, 0)) != 0) {
> #else
95a131
> #endif
114a151,169
> #ifdef INET6
> memcpy(&our_query_sin, our_sin, alen);
> memcpy(&rmt_query_sin, rmt_sin, alen);
> switch (our_sin->sa_family) {
> case AF_INET:
> ((struct sockaddr_in *)&our_query_sin)->sin_port = htons(ANY_PORT);
> ((struct sockaddr_in *)&rmt_query_sin)->sin_port = htons(RFC931_PORT);
> break;
> case AF_INET6:
> ((struct sockaddr_in6 *)&our_query_sin)->sin6_port = htons(ANY_PORT);
> ((struct sockaddr_in6 *)&rmt_query_sin)->sin6_port = htons(RFC931_PORT);
> break;
> }
>
> if (bind(fileno(fp), (struct sockaddr *) & our_query_sin,
> alen) >= 0 &&
> connect(fileno(fp), (struct sockaddr *) & rmt_query_sin,
> alen) >= 0) {
> #else
123a179
> #endif
131a188,191
> #ifdef INET6
> ntohs(((struct sockaddr_in *)rmt_sin)->sin_port),
> ntohs(((struct sockaddr_in *)our_sin)->sin_port));
> #else
133a194
> #endif
146a208,211
> #ifdef INET6
> && ntohs(((struct sockaddr_in *)rmt_sin)->sin_port) == rmt_port
> && ntohs(((struct sockaddr_in *)our_sin)->sin_port) == our_port) {
> #else
148a214
> #endif