OpenBSD patches for net, split from CR #8275005

net/base/dnsrr_resolver.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/base/dnsrr_resolver.h"
 
 #if defined(OS_POSIX)
+#include <netinet/in.h>
 #include <resolv.h>
 #endif
 
 #if defined(OS_WIN)
 #include <windns.h>
 #endif
 
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 162 matching lines @@
     // Runs on a worker thread.
 
     if (HandleTestCases()) {
       Finish();
       return;
     }
 
     bool r = true;
 #if defined(OS_MACOSX) || defined(OS_OPENBSD)
     if ((_res.options & RES_INIT) == 0) {
+#if defined(OS_OPENBSD)
+      if (res_init() != 0)
+#else
       if (res_ninit(&_res) != 0)

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

Hmm... If res_ninit(&_res) is equivalent to res_init(),
perhaps we should just use res_init() for OS_MACOSX as well.

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

THere might be differences so I would rather stay on the safe side at this
point.

+#endif
         r = false;
     }
 #else
     DnsReloaderMaybeReload();
 #endif
 
     if (r) {
       unsigned long saved_options = _res.options;
       r = Do();
       _res.options = saved_options;
@@ skipping 466 matching lines @@
   inflight_.erase(j);
 
   job->HandleResult(result, response);
   delete job;
 }
 
 }  // namespace net
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(net::RRResolverHandle);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(net::RRResolverWorker);