lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

resolv/res_libc.c: Reformat to GNU style

Browse Source
This commit is contained in:
Florian Weimer
2017-06-23 18:10:41 +02:00
parent b1e7c13cc5
commit b87d47396f
2 changed files with 87 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2017-06-23 Florian Weimer <fweimer@redhat.com>
* resolv/res_libc.c: Reformat to GNU style.
2017-06-23 Florian Weimer <fweimer@redhat.com> 2017-06-23 Florian Weimer <fweimer@redhat.com>
* resolv/resolv-internal.h (__res_initstamp): Declare. * resolv/resolv-internal.h (__res_initstamp): Declare.

147
resolv/res_libc.c
View File

@ -1,3 +1,21 @@
/* Definitions related to res_init linked into libc instead of libresolv.
Copyright (C) 1995-2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
/* /*
* Copyright (c) 1995-1999 by Internet Software Consortium. * Copyright (c) 1995-1999 by Internet Software Consortium.
* *
@ -15,9 +33,6 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* This file contains the definitions related to res_init which are
linked into libc instead of libresolv. */
#include <atomic.h> #include <atomic.h>
#include <limits.h> #include <limits.h>
#include <sys/types.h> #include <sys/types.h>
@ -40,74 +55,78 @@ __libc_lock_define_initialized (static, lock);
#endif #endif
int int
res_init(void) { res_init (void)
/* {
* These three fields used to be statically initialized. This made /* These three fields used to be statically initialized. This made
* it hard to use this code in a shared library. It is necessary, it hard to use this code in a shared library. It is necessary,
* now that we're doing dynamic initialization here, that we preserve now that we're doing dynamic initialization here, that we
* the old semantics: if an application modifies one of these three preserve the old semantics: if an application modifies one of
* fields of _res before res_init() is called, res_init() will not these three fields of _res before res_init is called,
* alter them. Of course, if an application is setting them to res_init will not alter them. Of course, if an application is
* _zero_ before calling res_init(), hoping to override what used setting them to _zero_ before calling res_init, hoping to
* to be the static default, we can't detect it and unexpected results override what used to be the static default, we can't detect it
* will follow. Zero for any of these fields would make no sense, and unexpected results will follow. Zero for any of these fields
* so one can safely assume that the applications were already getting would make no sense, so one can safely assume that the
* unexpected results. applications were already getting unexpected results.
*
* _res.options is tricky since some apps were known to diddle the bits
* before res_init() was first called. We can't replicate that semantic
* with dynamic initialization (they may have turned bits off that are
* set in RES_DEFAULT). Our solution is to declare such applications
* "broken". They could fool us by setting RES_INIT but none do (yet).
*/
if (!_res.retrans)
_res.retrans = RES_TIMEOUT;
if (!_res.retry)
_res.retry = RES_DFLRETRY;
if (!(_res.options & RES_INIT))
_res.options = RES_DEFAULT;
else if (_res.nscount > 0)
__res_iclose (&_res, true); /* Close any VC sockets. */
/* _res.options is tricky since some apps were known to diddle the
* This one used to initialize implicitly to zero, so unless the app bits before res_init was first called. We can't replicate that
* has set it to something in particular, we can randomize it now. semantic with dynamic initialization (they may have turned bits
*/ off that are set in RES_DEFAULT). Our solution is to declare
if (!_res.id) such applications "broken". They could fool us by setting
_res.id = res_randomid(); RES_INIT but none do (yet). */
if (!_res.retrans)
_res.retrans = RES_TIMEOUT;
if (!_res.retry)
_res.retry = RES_DFLRETRY;
if (!(_res.options & RES_INIT))
_res.options = RES_DEFAULT;
else if (_res.nscount > 0)
__res_iclose (&_res, true); /* Close any VC sockets. */
atomicinclock (lock); /* This one used to initialize implicitly to zero, so unless the app
/* Request all threads to re-initialize their resolver states, has set it to something in particular, we can randomize it *
resolv.conf might have changed. */ now. */
atomicinc (__res_initstamp); if (!_res.id)
atomicincunlock (lock); _res.id = res_randomid ();
return (__res_vinit(&_res, 1)); atomicinclock (lock);
/* Request all threads to re-initialize their resolver states,
resolv.conf might have changed. */
atomicinc (__res_initstamp);
atomicincunlock (lock);
return __res_vinit (&_res, 1);
} }
/* Initialize resp if RES_INIT is not yet set or if res_init in some other /* Initialize *RESP if RES_INIT is not yet set in RESP->options, or if
thread requested re-initializing. */ res_init in some other thread requested re-initializing. */
int int
__res_maybe_init (res_state resp, int preinit) __res_maybe_init (res_state resp, int preinit)
{ {
if (resp->options & RES_INIT) { if (resp->options & RES_INIT)
if (__res_initstamp != resp->_u._ext.initstamp) { {
if (resp->nscount > 0) if (__res_initstamp != resp->_u._ext.initstamp)
__res_iclose (resp, true); {
return __res_vinit (resp, 1); if (resp->nscount > 0)
} __res_iclose (resp, true);
return 0; return __res_vinit (resp, 1);
} else if (preinit) { }
if (!resp->retrans) return 0;
resp->retrans = RES_TIMEOUT; }
if (!resp->retry) else if (preinit)
resp->retry = RES_DFLRETRY; {
resp->options = RES_DEFAULT; if (!resp->retrans)
if (!resp->id) resp->retrans = RES_TIMEOUT;
resp->id = res_randomid (); if (!resp->retry)
return __res_vinit (resp, 1); resp->retry = RES_DFLRETRY;
} else resp->options = RES_DEFAULT;
return __res_ninit (resp); if (!resp->id)
resp->id = res_randomid ();
return __res_vinit (resp, 1);
}
else
return __res_ninit (resp);
} }
libc_hidden_def (__res_maybe_init) libc_hidden_def (__res_maybe_init)
@ -133,7 +152,7 @@ extern __thread struct __res_state *__libc_resp
compat_symbol (libc, _res, _res, GLIBC_2_0); compat_symbol (libc, _res, _res, GLIBC_2_0);
#endif #endif
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
# undef res_init # undef res_init
extern int __res_init_weak (void); extern int __res_init_weak (void);
weak_extern (__res_init_weak); weak_extern (__res_init_weak);