OpenBSD patches for net, split from CR #8275005

net/dns/dns_config_service_posix.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/dns/dns_config_service_posix.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 12 matching lines @@
 
 // A SerialWorker that uses ResolverLib to initialize res_state and converts
 // it to DnsConfig.
 class DnsConfigServicePosix::ConfigReader : public SerialWorker {
  public:
   explicit ConfigReader(DnsConfigServicePosix* service)
     : service_(service),
       success_(false) {}
 
   void DoWork() OVERRIDE {
+#if defined(OS_OPENBSD)
+    if ((res_init() == 0) && (_res.options & RES_INIT)) {
+      success_ = ConvertResToConfig(_res, &dns_config_);
+#else
     struct __res_state res;
     if ((res_ninit(&res) == 0) && (res.options & RES_INIT)) {
       success_ = ConvertResToConfig(res, &dns_config_);
+#endif
     } else {
       // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
       success_ = false;
     }
 #if defined(OS_MACOSX)
     res_ndestroy(&res);
-#else
+#elif !defined(OS_OPENBSD)
     res_nclose(&res);
 #endif

[wtc, 2011/10/20 14:01:46]

It may be better to apply #if defined(OS_OPENBSD) to the entire
function, like this:

  void DoWork() OVERRIDE {
#if defined(OS_OPENBSD)
    if ((res_init() == 0) && (_res.options & RES_INIT)) {
      success_ = ConvertResToConfig(_res, &dns_config_);
    } else {
      XXX no comment here.  I assume OpenBSD doesn't use
      XXX glibc.
      success_ = false;
    }
#else  // defined(OS_OPENBSD)
    ... the original code ...
#endif  // defined(OS_OPENBSD)
  }

[Robert Nagy, 2011/10/20 17:44:44]

It is fine like this, but I extended the comment in the else { } block, to
reflect reality.

   }
 
   void OnWorkFinished() OVERRIDE {
     DCHECK(!IsCancelled());
     if (success_)
       service_->OnConfigRead(dns_config_);
   }
 
  private:
   virtual ~ConfigReader() {}
@@ skipping 61 matching lines @@
   }
 
   dns_config->search.clear();
   for (int i = 0; (i < MAXDNSRCH) && res.dnsrch[i]; ++i) {
     dns_config->search.push_back(std::string(res.dnsrch[i]));
   }
 
   dns_config->ndots = res.ndots;
   dns_config->timeout = base::TimeDelta::FromSeconds(res.retrans);
   dns_config->attempts = res.retry;
+#if defined(RES_ROTATE)
   dns_config->rotate = res.options & RES_ROTATE;
+#endif
   dns_config->edns0 = res.options & RES_USE_EDNS0;
 
   return true;
 }
 
 }  // namespace net