From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 6 Mar 2024 14:19:22 +0000 (+0100)
Subject: auth: on OpenBSD, try harder to send on a non-blocking socket
X-Git-Tag: dnsdist-1.10.0-alpha0~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24aba96710c666bac69298422106821d51a24ecb;p=thirdparty%2Fpdns.git

auth: on OpenBSD, try harder to send on a non-blocking socket

Should fix #13857 in many cases, though you can still argue this
is a OpenBSD bug (or at least an undesirable difference between other
systems and OpenBSD).
---

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index db66bc9e62..74ea7105cd 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -233,8 +233,10 @@ void UDPNameserver::send(DNSPacket& p)
   if(buffer.length() > p.getMaxReplyLen()) {
     g_log<<Logger::Error<<"Weird, trying to send a message that needs truncation, "<< buffer.length()<<" > "<<p.getMaxReplyLen()<<". Question was for "<<p.qdomain<<"|"<<p.qtype.toString()<<endl;
   }
-  if(sendmsg(p.getSocket(), &msgh, 0) < 0)
-    g_log<<Logger::Error<<"Error sending reply with sendmsg (socket="<<p.getSocket()<<", dest="<<p.d_remote.toStringWithPort()<<"): "<<stringerror()<<endl;
+  if (sendOnNBSocket(p.getSocket(), &msgh) < 0) {
+    int err = errno;
+    g_log<<Logger::Error<<"Error sending reply with sendmsg (socket="<<p.getSocket()<<", dest="<<p.d_remote.toStringWithPort()<<"): "<<stringerror(err)<<endl;
+  }
 }
 
 bool UDPNameserver::receive(DNSPacket& packet, std::string& buffer)