From 6b938e676baf3d79a05ae1dc9173181bb76a7494 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 26 Mar 2020 08:50:17 +0100
Subject: [PATCH] Include error code in getaddrinfo() exceptions

---
 common/rdr/Exception.cxx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/common/rdr/Exception.cxx b/common/rdr/Exception.cxx
index f4e23836..382fea3d 100644
--- a/common/rdr/Exception.cxx
+++ b/common/rdr/Exception.cxx
@@ -63,9 +63,18 @@ GAIException::GAIException(const char* s, int err)
                       len-1-strlen(str_), 0, 0);
   delete [] currStr;
 #else
-  //FIXME: perhaps print the error number (NNNN)
   strncat(str_, gai_strerror(err), len-1-strlen(str_));
 #endif
+  strncat(str_, " (", len-1-strlen(str_));
+  char buf[20];
+#ifdef WIN32
+  if (err < 0)
+    sprintf(buf, "%x", err);
+  else
+#endif
+    sprintf(buf,"%d",err);
+  strncat(str_, buf, len-1-strlen(str_));
+  strncat(str_, ")", len-1-strlen(str_));
 }
 
 SystemException::SystemException(const char* s, int err_)
-- 
2.39.5