mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-28 00:06:09 +03:00
Code Issues Projects Releases Wiki Activity

musl: net: Fix DNS res_init

Browse Source
This commit is contained in:
klzgrad 2019-11-30 22:21:18 +08:00
parent 05c7376362
commit 2b7659f365
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/dns/dns_reloader.cc
View File

@ -88,20 +88,32 @@ class DnsReloader : public NetworkChangeNotifier::DNSObserver {
if (!reload_state) {
auto new_reload_state = std::make_unique<ReloadState>();
new_reload_state->resolver_generation = resolver_generation_;
#ifdef __MUSL__
res_init();
#else
res_ninit(&_res);
#endif
tls_reload_state_.Set(std::move(new_reload_state));
} else if (reload_state->resolver_generation != resolver_generation_) {
reload_state->resolver_generation = resolver_generation_;
// It is safe to call res_nclose here since we know res_ninit will have
// been called above.
#ifdef __MUSL__
res_init();
#else
res_nclose(&_res);
res_ninit(&_res);
#endif
}
}
private:
struct ReloadState {
~ReloadState() { res_nclose(&_res); }
~ReloadState() {
#ifndef __MUSL__
res_nclose(&_res);
#endif
}
int resolver_generation;
};

6
src/net/dns/public/scoped_res_state.cc
View File

@ -13,7 +13,7 @@
namespace net {
ScopedResState::ScopedResState() {
#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(__MUSL__)
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
// res_init behaves the same way.
memset(&_res, 0, sizeof(_res));
@ -25,7 +25,7 @@ ScopedResState::ScopedResState() {
}
ScopedResState::~ScopedResState() {
#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !defined(__MUSL__)
// Prefer res_ndestroy where available.
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FREEBSD)
@ -43,7 +43,7 @@ bool ScopedResState::IsValid() const {
const struct __res_state& ScopedResState::state() const {
DCHECK(IsValid());
#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(__MUSL__)
return _res;
#else
return res_;

2
src/net/dns/public/scoped_res_state.h
View File

@ -32,7 +32,7 @@ class NET_EXPORT ScopedResState {
virtual const struct __res_state& state() const;
private:
#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)
#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !defined(__MUSL__)
struct __res_state res_;
#endif // !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA)