add a result code for ENOPROTOOPT, EPROTONOSUPPORT

there was no isc_result_t value for invalid protocol errors
that could be returned from libuv.

diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index ac7273ce52149034348b661f40313c2b2210ef18..215c83aba333b4a228b50fe45f5e2bc6d61f79e8 100644 (file)
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -95,6 +95,7 @@ typedef enum isc_result {
        ISC_R_TLSBADPEERCERT, /*%< TLS peer certificate verification failed */
        ISC_R_HTTP2ALPNERROR, /*%< ALPN for HTTP/2 failed */
        ISC_R_DOTALPNERROR,   /*%< ALPN for DoT failed */
+       ISC_R_INVALIDPROTO,   /*%< invalid protocol */
 
        DNS_R_LABELTOOLONG = 1 << 16,
        DNS_R_BADESCAPE,

diff --git a/lib/isc/result.c b/lib/isc/result.c
index b41f760fa453a4c07a1fafe4d09ac13e9c610823..ac55e0bd46f4cfbed3e9539cdfd0c2748ee77bde 100644 (file)
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -94,6 +94,7 @@ static const char *description[ISC_R_NRESULTS] = {
        [ISC_R_TLSBADPEERCERT] = "TLS peer certificate verification failed",
        [ISC_R_HTTP2ALPNERROR] = "ALPN for HTTP/2 failed",
        [ISC_R_DOTALPNERROR] = "ALPN for DoT failed",
+       [ISC_R_INVALIDPROTO] = "invalid protocol",
 
        [DNS_R_LABELTOOLONG] = "label too long",
        [DNS_R_BADESCAPE] = "bad escape",

diff --git a/lib/isc/uv.c b/lib/isc/uv.c
index 79c436247981e7d943a6371f1a630513af0b9052..8b1ef7398e02e2fab8fb55bd060632ac08f62edd 100644 (file)
--- a/lib/isc/uv.c
+++ b/lib/isc/uv.c
@@ -87,13 +87,15 @@ isc__uverr2result(int uverr, bool dolog, const char *file, unsigned int line,
                return (ISC_R_MAXSIZE);
        case UV_ENOTSUP:
                return (ISC_R_FAMILYNOSUPPORT);
+       case UV_ENOPROTOOPT:
+       case UV_EPROTONOSUPPORT:
+               return (ISC_R_INVALIDPROTO);
        default:
                if (dolog) {
-                       UNEXPECTED_ERROR(
-                               file, line,
-                               "unable to convert libuv "
-                               "error code in %s to isc_result: %d: %s",
-                               func, uverr, uv_strerror(uverr));
+                       UNEXPECTED_ERROR("unable to convert libuv error code "
+                                        "in %s (%s:%d) to isc_result: %d: %s",
+                                        func, file, line, uverr,
+                                        uv_strerror(uverr));
                }
                return (ISC_R_UNEXPECTED);
        }