diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-06-30 21:10:23 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-07-03 20:52:59 +0200 |
| commit | 352f4ff9a268b81ef5d4b2413f582565806e4790 (patch) | |
| tree | fb27056dfdeafe43c021f6127c9544c016e78019 /resolv/res_libc.c | |
| parent | 4e45d83c92dbb5b8dc20654f32395108d18cf739 (diff) | |
| download | glibc-352f4ff9a268b81ef5d4b2413f582565806e4790.tar.gz | |
resolv: Introduce struct resolv_context [BZ #21668]
struct resolv_context objects provide a temporary resolver context
which does not change during a name lookup operation. Only when the
outmost context is created, the stub resolver configuration is
verified to be current (at present, only against previous res_init
calls). Subsequent attempts to obtain the context will reuse the
result of the initial verification operation.
struct resolv_context can also be extended in the future to store
data which needs to be deallocated during thread cancellation.
Diffstat (limited to 'resolv/res_libc.c')
| -rw-r--r-- | resolv/res_libc.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 3d7b4f72d0..5066983ccf 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -98,37 +98,6 @@ res_init (void) return __res_vinit (&_res, 1); } - -/* Initialize *RESP if RES_INIT is not yet set in RESP->options, or if - res_init in some other thread requested re-initializing. */ -int -__res_maybe_init (res_state resp, int preinit) -{ - if (resp->options & RES_INIT) - { - if (__res_initstamp != resp->_u._ext.initstamp) - { - if (resp->nscount > 0) - __res_iclose (resp, true); - return __res_vinit (resp, 1); - } - return 0; - } - else if (preinit) - { - if (!resp->retrans) - resp->retrans = RES_TIMEOUT; - if (!resp->retry) - resp->retry = RES_DFLRETRY; - resp->options = RES_DEFAULT; - if (!resp->id) - resp->id = res_randomid (); - return __res_vinit (resp, 1); - } - else - return __res_ninit (resp); -} -libc_hidden_def (__res_maybe_init) /* This needs to be after the use of _res in res_init, above. */ #undef _res |