diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_data.c | 16 | ||||
| -rw-r--r-- | resolv/res_send.c | 15 |
3 files changed, 20 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index dca3cb2899..5b5b0d1239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2017-06-30 Florian Weimer <fweimer@redhat.com> + * resolv/res_data.c (res_isourserver, res_send): Move to ... + * resolv/res_send.c (res_isourserver, res_send): here. + +2017-06-30 Florian Weimer <fweimer@redhat.com> + * resolv/res_debug.c (_res_opcodes): Rename ... (res_opcodes): ... as compatibility symbol. (fp_nquery): Use res_opcodes. diff --git a/resolv/res_data.c b/resolv/res_data.c index d05389e134..b790b4b725 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -45,22 +45,6 @@ res_query(const char *name, /* domain name */ return (res_nquery(&_res, name, class, type, answer, anslen)); } -int -res_isourserver(const struct sockaddr_in *inp) { - return (res_ourserver_p(&_res, (const struct sockaddr_in6 *) inp)); -} - -int -res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) { - if (__res_maybe_init (&_res, 1) == -1) { - /* errno should have been set by res_init() in this case. */ - return (-1); - } - - return (res_nsend(&_res, buf, buflen, ans, anssiz)); -} - - void res_close(void) { /* diff --git a/resolv/res_send.c b/resolv/res_send.c index 01b9b0e16a..a7daae8a06 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -243,6 +243,12 @@ res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp) return (0); } +int +res_isourserver (const struct sockaddr_in *inp) +{ + return res_ourserver_p (&_res, (const struct sockaddr_in6 *) inp); +} + /* int * res_nameinquery(name, type, class, buf, eom) * look for (name,type,class) in the query section of packet (buf,eom) @@ -544,6 +550,15 @@ res_nsend(res_state statp, } libresolv_hidden_def (res_nsend) +int +res_send (const unsigned char *buf, int buflen, unsigned char *ans, int anssiz) +{ + if (__res_maybe_init (&_res, 1) == -1) + /* errno should have been set by res_init in this case. */ + return -1; + return res_nsend (&_res, buf, buflen, ans, anssiz); +} + /* Private */ static struct sockaddr * |