diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-07-28 22:55:10 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-07-28 22:55:10 +0000 |
| commit | b7da31a1647e378258174d1d69097a594e31f89b (patch) | |
| tree | a38031232a20545f6c044a94f6823ecfb6090ead /include | |
| parent | 372aece0e4b7497f894f21b36bcc32ec52344ad5 (diff) | |
| download | glibc-b7da31a1647e378258174d1d69097a594e31f89b.zip glibc-b7da31a1647e378258174d1d69097a594e31f89b.tar.gz glibc-b7da31a1647e378258174d1d69097a594e31f89b.tar.bz2 | |
* resolv/res_send.c (__libc_res_nsend): Take additional parameter.cvs/fedora-glibc-20080728T2320
Use it instead of locally defined resplen2 variable.
(res_nsend): Adjust for __libc_res_nsend interface change.
(send_vc): Initialize *resplen2 if necessary. Read length of
package into an appropriately aligned variable. Store converted length
in new variable and use it appropriately.
Add branch prediction help.
* resolv/res_query.c (__libc_res_nquery): Take additional parameter
and pass it on to __libc_res_nsend. Adjust all callers.
(__libc_res_nsearch): Likewise.
(__libc_res_nqeurydomain): Likewise.
* resolv/nss_dns/dns-host.c: Adjust for __libc_res_nsearch interface
change.
(_nss_dns_gethostbyname4): Don't unconditionally allocate tmp array.
Define resplen2 variable and pass it to __libc_res_nsearch and then
to gaih_getanswer.
(getanswer_r): In case of incorrect DNS data don't overread buffer.
Add branch prediction.
(gaih_getanswer_slice): Likewise. Check for invalid data types.
(gaih_getanswer): Don't decode second slice if first one failed due
to a too small buffer. Don't let not found status of second
decoder shadow results of the first.
* resolv/gethnamaddr.c (gethostbyname2): Adjust for __libc_res_nsearch
and __libc_res_nquery interface changes
(gethostbyaddr): Adjust for __libc_res_nquery interface change.
* include/resolv.h: Adjust prototypes for __libc_res_nquery,
__libc_res_nsearch, and __libc_res_nsend.
* resolv/nss_dns/dns-canon.c: Adjust for __libc_res_nquery interface
change.
* resolv/nss_dns/dns-network.c: Adjust for __libc_res_nquery and
__libc_res_nsearch interface changes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/resolv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/resolv.h b/include/resolv.h index 925746f..6dae049 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -58,11 +58,11 @@ libc_hidden_proto (__res_randomid) libc_hidden_proto (__res_state) int __libc_res_nquery (res_state, const char *, int, int, u_char *, int, - u_char **, u_char **, int *); + u_char **, u_char **, int *, int *); int __libc_res_nsearch (res_state, const char *, int, int, u_char *, int, - u_char **, u_char **, int *); + u_char **, u_char **, int *, int *); int __libc_res_nsend (res_state, const u_char *, int, const u_char *, int, - u_char *, int, u_char **, u_char **, int *) + u_char *, int, u_char **, u_char **, int *, int *) attribute_hidden; libresolv_hidden_proto (_sethtent) |