upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

add a result code for ENOPROTOOPT, EPROTONOSUPPORT

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

(cherry picked from commit 0393b54afb)
This commit is contained in:
Evan Hunt 2023-04-05 14:05:46 -07:00 committed by Ondřej Surý
parent cdff6bb8ba
commit 2a714c25f8
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/isc/include/isc/result.h
View file

@ -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,

12
lib/isc/netmgr/uverr2result.c
View file

@ -90,13 +90,15 @@ isc___nm_uverr2result(int uverr, bool dolog, const char *file,
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);
}

1
lib/isc/result.c
View file

@ -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",