Merge "[MIPS] Fixed LTP Tests 9 and 20 of getaddrinfo_01."
This commit is contained in:
Andrew Hsieh
@@ -63,7 +63,7 @@ int clone_portable(int (*fn)(void *), void *child_stack, int port_flags, void *a
|
||||
ALOGV("%s(fn:%p, child_stack:%p, port_flags:0x%x, arg:%p, ...) {", __func__,
|
||||
fn, child_stack, port_flags, arg);
|
||||
|
||||
/* Extract optional parameters - they are cumulative */
|
||||
/* Extract optional parameters - they are cumulative. */
|
||||
va_start(args, arg);
|
||||
if (port_flags & (CLONE_PARENT_SETTID|CLONE_SETTLS|CLONE_CHILD_SETTID)) {
|
||||
parent_tidptr = va_arg(args, int*);
|
||||
|
||||
@@ -17,9 +17,11 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/socket.h>
|
||||
#include <fcntl.h>
|
||||
#include <netdb.h>
|
||||
|
||||
#include <socket_portable.h>
|
||||
#include <fcntl_portable.h>
|
||||
#include <netdb_portable.h>
|
||||
#include <portability.h>
|
||||
|
||||
#define PORTABLE_TAG "socket_portable"
|
||||
@@ -159,3 +161,100 @@ int socketpair_portable(int domain, int type, int protocol, int sv[2]) {
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
#define PRINT_ADDRINFO(p) { \
|
||||
ALOGV("%s: p:%p->{ai_flags:%d, ai_family:%d, ai_socktype:%d, ai_protocol:%d, ...", __func__, \
|
||||
p, p->ai_flags, p->ai_family, p->ai_socktype, p->ai_protocol); \
|
||||
\
|
||||
ALOGV("%s: p:%p->{... ai_addrlen:%d, ai_addr:%p, ai_canonname:%p, p->ai_next:%p);", __func__,\
|
||||
p, p->ai_addrlen, p->ai_addr, p->ai_canonname, p->ai_next); \
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns a list of portable addrinfo structures that are
|
||||
* later made free with a call to the portable version of
|
||||
* freeaddrinfo(); which is written below this function.
|
||||
*/
|
||||
int getaddrinfo_portable(const char *node, const char *service,
|
||||
struct addrinfo_portable *portable_hints,
|
||||
struct addrinfo_portable **portable_results)
|
||||
{
|
||||
int rv;
|
||||
struct addrinfo *native_hints;
|
||||
struct addrinfo **native_results, *rp;
|
||||
int saved_portable_socktype;
|
||||
|
||||
ALOGV(" ");
|
||||
ALOGV("%s(node:%p, service:%p, portable_hints:%p, portable_results:%p) {", __func__,
|
||||
node, service, portable_hints, portable_results);
|
||||
|
||||
PRINT_ADDRINFO(portable_hints);
|
||||
|
||||
/*
|
||||
* The only part of the addrinfo structure that needs to be modified
|
||||
* between ARM and MIPS is the socktype;
|
||||
*/
|
||||
ASSERT(sizeof(struct addrinfo_portable) == sizeof(struct addrinfo));
|
||||
native_hints = ((struct addrinfo *) portable_hints);
|
||||
if (native_hints != NULL) {
|
||||
saved_portable_socktype = portable_hints->ai_socktype;
|
||||
native_hints->ai_socktype = socktype_pton(saved_portable_socktype);
|
||||
}
|
||||
ASSERT(portable_results != NULL);
|
||||
native_results = (struct addrinfo **) portable_results;
|
||||
|
||||
rv = getaddrinfo(node, service, native_hints, native_results);
|
||||
|
||||
if (native_hints != NULL) {
|
||||
portable_hints->ai_socktype = saved_portable_socktype;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Map socktypes in the return list of addrinfo structures from native to portable.
|
||||
* Assuming getaddrinfo() has left structure writeable and the list is generated
|
||||
* on each call. This seems to be true when looking at the man page and the code
|
||||
* at:
|
||||
* ./bionic/libc/netbsd/net/getaddrinfo.c
|
||||
*/
|
||||
for (rp = *native_results; rp != NULL; rp = rp->ai_next) {
|
||||
PRINT_ADDRINFO(rp);
|
||||
rp->ai_socktype = socktype_ntop(rp->ai_socktype);
|
||||
}
|
||||
ALOGV("%s: return(rv:%d); }", __func__, rv);
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Free the results list returned from a previous call
|
||||
* to the portable version of getaddrinfo().
|
||||
*/
|
||||
void freeaddrinfo_portable(struct addrinfo_portable *portable_results)
|
||||
{
|
||||
struct addrinfo *native_results, *rp;
|
||||
|
||||
ALOGV(" ");
|
||||
ALOGV("%s(portable_results:%p) {", __func__, portable_results);
|
||||
|
||||
PRINT_ADDRINFO(portable_results);
|
||||
|
||||
/*
|
||||
* The only part of each addrinfo structure that needs to be modified
|
||||
* between ARM and MIPS is the socktype;
|
||||
*
|
||||
* Map socktypes in the return list of iportable addrinfo structures back to native.
|
||||
* Again, assuming getaddrinfo() has left structure writeable and the list is generated
|
||||
* on each call. This seems to be true when looking at the man page and the code.
|
||||
*/
|
||||
ASSERT(sizeof(struct addrinfo_portable) == sizeof(struct addrinfo));
|
||||
native_results = ((struct addrinfo *) portable_results);
|
||||
for (rp = native_results; rp != NULL; rp = rp->ai_next) {
|
||||
PRINT_ADDRINFO(rp);
|
||||
rp->ai_socktype = socktype_pton(rp->ai_socktype); /* Likely not really necessary */
|
||||
}
|
||||
freeaddrinfo(native_results);
|
||||
|
||||
ALOGV("%s: return; }", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
281
ndk/sources/android/libportable/common/include/netdb_portable.h
Normal file
281
ndk/sources/android/libportable/common/include/netdb_portable.h
Normal file
@@ -0,0 +1,281 @@
|
||||
/*
|
||||
* Derived from android-14/arch-arm/usr/include/netdb.h
|
||||
*-
|
||||
* Copyright (c) 1980, 1983, 1988, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* -
|
||||
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies, and that
|
||||
* the name of Digital Equipment Corporation not be used in advertising or
|
||||
* publicity pertaining to distribution of the document or software without
|
||||
* specific, written prior permission.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
|
||||
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
|
||||
* CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||||
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
* -
|
||||
* --Copyright--
|
||||
*/
|
||||
|
||||
/*
|
||||
* @(#)netdb.h 8.1 (Berkeley) 6/2/93
|
||||
* From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
|
||||
* $FreeBSD: /repoman/r/ncvs/src/include/netdb.h,v 1.41 2006/04/15 16:20:26 ume Exp $
|
||||
*/
|
||||
|
||||
#ifndef _NETDB_PORTABLE_H_
|
||||
#define _NETDB_PORTABLE_H_
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Most of the declararitions are not needed for addrinfo mapping.
|
||||
* Diff of mips and arm code running through cpp show only the
|
||||
* values of ai_socktype being different.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#ifndef _PATH_HEQUIV
|
||||
# define _PATH_HEQUIV "/system/etc/hosts.equiv"
|
||||
#endif
|
||||
|
||||
#define _PATH_HOSTS "/system/etc/hosts"
|
||||
#define _PATH_NETWORKS "/system/etc/networks"
|
||||
#define _PATH_PROTOCOLS "/system/etc/protocols"
|
||||
#define _PATH_SERVICES "/system/etc/services"
|
||||
|
||||
#define MAXHOSTNAMELEN 256
|
||||
|
||||
|
||||
/*
|
||||
* Structures returned by network data base library. All addresses are
|
||||
* supplied in host order, and returned in network order (suitable for
|
||||
* use in system calls).
|
||||
*/
|
||||
struct hostent {
|
||||
char *h_name; /* official name of host */
|
||||
char **h_aliases; /* alias list */
|
||||
int h_addrtype; /* host address type */
|
||||
int h_length; /* length of address */
|
||||
char **h_addr_list; /* list of addresses from name server */
|
||||
#define h_addr h_addr_list[0] /* address, for backward compatibility */
|
||||
};
|
||||
|
||||
struct netent {
|
||||
char *n_name; /* official name of net */
|
||||
char **n_aliases; /* alias list */
|
||||
int n_addrtype; /* net address type */
|
||||
uint32_t n_net; /* network # */
|
||||
};
|
||||
|
||||
struct servent {
|
||||
char *s_name; /* official service name */
|
||||
char **s_aliases; /* alias list */
|
||||
int s_port; /* port # */
|
||||
char *s_proto; /* protocol to use */
|
||||
};
|
||||
|
||||
struct protoent {
|
||||
char *p_name; /* official protocol name */
|
||||
char **p_aliases; /* alias list */
|
||||
int p_proto; /* protocol # */
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
* For mapping MIPS and ARM these structures differ only in the
|
||||
* ai_socktype values.
|
||||
*/
|
||||
struct addrinfo_portable {
|
||||
int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
|
||||
int ai_family; /* PF_xxx */
|
||||
int ai_socktype; /* SOCK_xxx */
|
||||
int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
|
||||
socklen_t ai_addrlen; /* length of ai_addr */
|
||||
char *ai_canonname; /* canonical name for hostname */
|
||||
struct sockaddr *ai_addr; /* binary address */
|
||||
struct addrinfo *ai_next; /* next structure in linked list */
|
||||
};
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* Error return codes from gethostbyname() and gethostbyaddr()
|
||||
* (left in h_errno).
|
||||
*/
|
||||
|
||||
#define NETDB_INTERNAL -1 /* see errno */
|
||||
#define NETDB_SUCCESS 0 /* no problem */
|
||||
#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */
|
||||
#define TRY_AGAIN 2 /* Non-Authoritative Host not found, or SERVERFAIL */
|
||||
#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
|
||||
#define NO_DATA 4 /* Valid name, no data record of requested type */
|
||||
#define NO_ADDRESS NO_DATA /* no address, look for MX record */
|
||||
|
||||
/*
|
||||
* Error return codes from getaddrinfo()
|
||||
*/
|
||||
#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */
|
||||
#define EAI_AGAIN 2 /* temporary failure in name resolution */
|
||||
#define EAI_BADFLAGS 3 /* invalid value for ai_flags */
|
||||
#define EAI_FAIL 4 /* non-recoverable failure in name resolution */
|
||||
#define EAI_FAMILY 5 /* ai_family not supported */
|
||||
#define EAI_MEMORY 6 /* memory allocation failure */
|
||||
#define EAI_NODATA 7 /* no address associated with hostname */
|
||||
#define EAI_NONAME 8 /* hostname nor servname provided, or not known */
|
||||
#define EAI_SERVICE 9 /* servname not supported for ai_socktype */
|
||||
#define EAI_SOCKTYPE 10 /* ai_socktype not supported */
|
||||
#define EAI_SYSTEM 11 /* system error returned in errno */
|
||||
#define EAI_BADHINTS 12 /* invalid value for hints */
|
||||
#define EAI_PROTOCOL 13 /* resolved protocol is unknown */
|
||||
#define EAI_OVERFLOW 14 /* argument buffer overflow */
|
||||
#define EAI_MAX 15
|
||||
|
||||
/*
|
||||
* Flag values for getaddrinfo()
|
||||
*/
|
||||
#define AI_PASSIVE 0x00000001 /* get address to use bind() */
|
||||
#define AI_CANONNAME 0x00000002 /* fill ai_canonname */
|
||||
#define AI_NUMERICHOST 0x00000004 /* prevent host name resolution */
|
||||
#define AI_NUMERICSERV 0x00000008 /* prevent service name resolution */
|
||||
/* valid flags for addrinfo (not a standard def, apps should not use it) */
|
||||
#define AI_MASK \
|
||||
(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \
|
||||
AI_ADDRCONFIG)
|
||||
|
||||
#define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
|
||||
#define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */
|
||||
#define AI_ADDRCONFIG 0x00000400 /* only if any address is assigned */
|
||||
#define AI_V4MAPPED 0x00000800 /* accept IPv4-mapped IPv6 address */
|
||||
/* special recommended flags for getipnodebyname */
|
||||
#define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG)
|
||||
|
||||
/*
|
||||
* Constants for getnameinfo()
|
||||
*/
|
||||
#define NI_MAXHOST 1025
|
||||
#define NI_MAXSERV 32
|
||||
|
||||
/*
|
||||
* Flag values for getnameinfo()
|
||||
*/
|
||||
#define NI_NOFQDN 0x00000001
|
||||
#define NI_NUMERICHOST 0x00000002
|
||||
#define NI_NAMEREQD 0x00000004
|
||||
#define NI_NUMERICSERV 0x00000008
|
||||
#define NI_DGRAM 0x00000010
|
||||
#if 0 /* obsolete */
|
||||
#define NI_WITHSCOPEID 0x00000020
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Scope delimit character
|
||||
*/
|
||||
#define SCOPE_DELIMITER '%'
|
||||
|
||||
__BEGIN_DECLS
|
||||
/* BIONIC-BEGIN */
|
||||
#define h_errno (*__get_h_errno())
|
||||
int* __get_h_errno(void);
|
||||
/* BIONIC-END */
|
||||
void endservent(void);
|
||||
struct hostent *gethostbyaddr(const char *, int, int);
|
||||
struct hostent *gethostbyname(const char *);
|
||||
int gethostbyname_r(const char *, struct hostent *, char *, size_t, struct hostent **, int *);
|
||||
struct hostent *gethostbyname2(const char *, int);
|
||||
struct hostent *gethostent(void);
|
||||
struct netent *getnetbyaddr(uint32_t, int);
|
||||
struct netent *getnetbyname(const char *);
|
||||
struct protoent *getprotobyname(const char *);
|
||||
struct protoent *getprotobynumber(int);
|
||||
struct servent *getservbyname(const char *, const char *);
|
||||
struct servent *getservbyport(int, const char *);
|
||||
struct servent *getservent(void);
|
||||
void herror(const char *);
|
||||
const char *hstrerror(int);
|
||||
#endif
|
||||
|
||||
int getaddrinfo_portable(const char *, const char *, struct addrinfo_portable *,
|
||||
struct addrinfo_portable **);
|
||||
|
||||
void freeaddrinfo_portable(struct addrinfo_portable *);
|
||||
|
||||
#if 0 /* Not needed for addrinfo mapping */
|
||||
int getnameinfo(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t, int);
|
||||
const char *gai_strerror(int);
|
||||
void setservent(int);
|
||||
|
||||
#if 0 /* MISSING FROM BIONIC */
|
||||
void endhostent(void);
|
||||
void endnetent(void);
|
||||
void endnetgrent(void);
|
||||
void endprotoent(void);
|
||||
void freehostent(struct hostent *);
|
||||
|
||||
int gethostbyaddr_r(const char *, int, int, struct hostent *, char *, size_t,
|
||||
struct hostent **, int *);
|
||||
|
||||
int gethostbyname2_r(const char *, int, struct hostent *, char *, size_t,
|
||||
struct hostent **, int *);
|
||||
|
||||
int gethostent_r(struct hostent *, char *, size_t, struct hostent **, int *);
|
||||
struct hostent *getipnodebyaddr(const void *, size_t, int, int *);
|
||||
struct hostent *getipnodebyname(const char *, int, int, int *);
|
||||
int getnetbyaddr_r(uint32_t, int, struct netent *, char *, size_t, struct netent**, int *);
|
||||
int getnetbyname_r(const char *, struct netent *, char *, size_t, struct netent **, int *);
|
||||
int getnetent_r(struct netent *, char *, size_t, struct netent **, int *);
|
||||
int getnetgrent(char **, char **, char **);
|
||||
int getprotobyname_r(const char *, struct protoent *, char *, size_t, struct protoent **);
|
||||
int getprotobynumber_r(int, struct protoent *, char *, size_t, struct protoent **);
|
||||
struct protoent *getprotoent(void);
|
||||
int getprotoent_r(struct protoent *, char *, size_t, struct protoent **);
|
||||
int innetgr(const char *, const char *, const char *, const char *);
|
||||
void sethostent(int);
|
||||
void setnetent(int);
|
||||
void setprotoent(int);
|
||||
struct netent *getnetent(void);
|
||||
void setnetgrent(const char *);
|
||||
#endif /* MISSING FROM BIONIC */
|
||||
#endif /* Not needed for addrinfo mapping */
|
||||
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* !_NETDB_H_ */
|
||||
Reference in New Issue
Block a user