lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

(res_ourserver_p): Cleanup the type mess to avoid problems with now restrict parameter types. (convaddr4to6): Likewise.

Browse Source
This commit is contained in:
Ulrich Drepper
2000-08-24 10:00:43 +00:00
parent 0067c4cffb
commit e62b210510
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resolv/res_send.c
View File

@@ -238,21 +238,22 @@ res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp)
res_ourserver_p(const res_state statp, const struct sockaddr_in *inp) res_ourserver_p(const res_state statp, const struct sockaddr_in *inp)
#endif #endif
{ {
struct sockaddr_in ina;
int ns; int ns;
#ifdef _LIBC #ifdef _LIBC
if (inp->sin6_family == AF_INET) { if (inp->sin6_family == AF_INET) {
ina = *(struct sockaddr_in *)inp; struct sockaddr_in *in4p = (struct sockaddr_in *) inp;
in_port_t port = in4p->sin_port;
in_addr_t addr = in4p->sin_addr.s_addr;
for (ns = 0; ns < MAXNS; ns++) { for (ns = 0; ns < MAXNS; ns++) {
const struct sockaddr_in *srv = const struct sockaddr_in *srv =
(struct sockaddr_in *)EXT(statp).nsaddrs[ns]; (struct sockaddr_in *)EXT(statp).nsaddrs[ns];
if ((srv != NULL) && (srv->sin_family == AF_INET) && if ((srv != NULL) && (srv->sin_family == AF_INET) &&
(srv->sin_port == ina.sin_port) && (srv->sin_port == port) &&
(srv->sin_addr.s_addr == INADDR_ANY || (srv->sin_addr.s_addr == INADDR_ANY ||
srv->sin_addr.s_addr == ina.sin_addr.s_addr)) srv->sin_addr.s_addr == addr))
return (1); return (1);
} }
} else if (inp->sin6_family == AF_INET6) { } else if (inp->sin6_family == AF_INET6) {
@@ -268,7 +269,7 @@ res_ourserver_p(const res_state statp, const struct sockaddr_in *inp)
} }
} }
#else #else
ina = *inp; struct sockaddr_in ina = *inp;
for (ns = 0; ns < statp->nscount; ns++) { for (ns = 0; ns < statp->nscount; ns++) {
const struct sockaddr_in *srv = &statp->nsaddr_list[ns]; const struct sockaddr_in *srv = &statp->nsaddr_list[ns];
@@ -1127,14 +1128,16 @@ sock_eq(struct sockaddr_in *a1, struct sockaddr_in *a2) {
static void static void
convaddr4to6(struct sockaddr_in6 *sa) convaddr4to6(struct sockaddr_in6 *sa)
{ {
const struct sockaddr_in sa4 = *(struct sockaddr_in *)sa; struct sockaddr_in *sa4p = (struct sockaddr_in *) sa;
in_port_t port = sa4p->sin_port;
in_addr_t addr = sa4p->sin_addr.s_addr;
sa->sin6_family = AF_INET6; sa->sin6_family = AF_INET6;
sa->sin6_port = sa4.sin_port; sa->sin6_port = port;
sa->sin6_addr.s6_addr32[0] = 0; sa->sin6_addr.s6_addr32[0] = 0;
sa->sin6_addr.s6_addr32[1] = 0; sa->sin6_addr.s6_addr32[1] = 0;
sa->sin6_addr.s6_addr32[2] = htonl(0xFFFF); sa->sin6_addr.s6_addr32[2] = htonl(0xFFFF);
sa->sin6_addr.s6_addr32[3] = sa4.sin_addr.s_addr; sa->sin6_addr.s6_addr32[3] = addr;
} }
#endif #endif