summaryrefslogtreecommitdiffstats
path: root/src/utils/common
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-14 16:17:58 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-14 16:17:58 +0000
commita04a7c41c9327144cc11ffd030c0efc2a4f85534 (patch)
tree812fe9d19c0c90324f80b838b1b1e2976a416999 /src/utils/common
parentAdding upstream version 3.3.5. (diff)
downloadknot-upstream/3.3.6.tar.xz
knot-upstream/3.3.6.zip
Adding upstream version 3.3.6.upstream/3.3.6
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/utils/common')
-rw-r--r--src/utils/common/params.c11
-rw-r--r--src/utils/common/quic.c12
2 files changed, 20 insertions, 3 deletions
diff --git a/src/utils/common/params.c b/src/utils/common/params.c
index 4db4b9e..d16af4c 100644
--- a/src/utils/common/params.c
+++ b/src/utils/common/params.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/* Copyright (C) 2024 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -47,7 +47,12 @@ char *name_from_idn(const char *idn_name) {
return NULL;
}
- return name;
+ if (strcasecmp(idn_name, name) == 0) {
+ free(name);
+ return strdup(idn_name);
+ } else {
+ return name;
+ }
#endif
return strdup(idn_name);
}
@@ -212,7 +217,7 @@ char *get_fqd_name(const char *name)
size_t name_len = strlen(name);
// If the name is FQDN, make a copy.
- if (name[name_len - 1] == '.') {
+ if (name_len > 0 && name[name_len - 1] == '.') {
fqd_name = strdup(name);
// Else make a copy and append a trailing dot.
} else {
diff --git a/src/utils/common/quic.c b/src/utils/common/quic.c
index 55e5408..704f3b1 100644
--- a/src/utils/common/quic.c
+++ b/src/utils/common/quic.c
@@ -564,6 +564,10 @@ int quic_ctx_connect(quic_ctx_t *ctx, int sockfd, struct addrinfo *dst_addr)
ret = poll(&pfd, 1, timeout);
if (ret == 0) {
ret = ngtcp2_conn_handle_expiry(ctx->conn, quic_timestamp());
+ if (ret != 0) {
+ WARN("QUIC, failed to send");
+ return KNOT_ECONNABORTED;
+ }
} else if (ret < 0) {
return knot_map_errno();
}
@@ -658,6 +662,10 @@ int quic_send_dns_query(quic_ctx_t *ctx, int sockfd, struct addrinfo *srv,
return knot_map_errno();
} else if (ret == 0) {
ret = ngtcp2_conn_handle_expiry(ctx->conn, quic_timestamp());
+ if (ret != 0) {
+ WARN("QUIC, failed to send");
+ return KNOT_ECONNABORTED;
+ }
continue;
}
ret = quic_recv(ctx, sockfd);
@@ -701,6 +709,10 @@ int quic_recv_dns_response(quic_ctx_t *ctx, uint8_t *buf, const size_t buf_len,
return knot_map_errno();
} else if (ret == 0) {
ret = ngtcp2_conn_handle_expiry(ctx->conn, quic_timestamp());
+ if (ret != 0) {
+ WARN("QUIC, failed to send");
+ return KNOT_ECONNABORTED;
+ }
WARN("QUIC, peer took too long to respond");
goto send;
}