generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.

Browse Source 
DO NOT MERGE: pulled in from master for iptables v1.4.11 update

Make netinet/ip.h have IPTOS_MINCOST which matches what
  kernel/common/linux/ip.h has to say.
Fixup gethostbyaddr() 1st arg to match what man has to say.

Change-Id: Iff9647d4a46ea88b1fc32163eb69bb9b27cdf370
This commit is contained in:
JP Abgrall 2011-05-18 16:53:23 -07:00
parent 5e9da71a09
commit 4f7c1aab10
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/include/netdb.h
View File

@ -209,8 +209,8 @@ void endnetgrent(void);
void endprotoent(void);
void endservent(void);
void freehostent(struct hostent *);
struct hostent *gethostbyaddr(const char *, int, int);
int gethostbyaddr_r(const char *, int, int, struct hostent *, char *, size_t, struct hostent **, int *);
struct hostent *gethostbyaddr(const void *, int, int);
int gethostbyaddr_r(const void *, int, int, struct hostent *, char *, size_t, struct hostent **, 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);

2
libc/include/netinet/ip.h
View File

@ -83,7 +83,7 @@ struct ip {
#define IPTOS_LOWDELAY 0x10
#define IPTOS_THROUGHPUT 0x08
#define IPTOS_RELIABILITY 0x04
/* IPTOS_LOWCOST 0x02 XXX */
#define IPTOS_MINCOST 0x02
#if 1
/* ECN RFC3168 obsoletes RFC2481, and these will be deprecated soon. */
#define IPTOS_CE 0x01 /* congestion experienced */

2
libc/netbsd/gethnamaddr.c
View File

@ -637,7 +637,7 @@ gethostbyname_internal(const char *name, int af, res_state res)
}
struct hostent *
gethostbyaddr(const char *addr, /* XXX should have been def'd as u_char! */
gethostbyaddr(const void *addr,
socklen_t len, int af)
{
const u_char *uaddr = (const u_char *)addr;