From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 10 Nov 2025 13:09:19 +0000 (+0100)
Subject: redis: improve error processing in knot_redis_tls_read() and knot_redis_tls_write()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4edfe2d458faab5483c9c5d537aa3399ffe4e5da;p=thirdparty%2Fknot-dns.git

redis: improve error processing in knot_redis_tls_read() and knot_redis_tls_write()
---

diff --git a/src/knot/common/hiredis.c b/src/knot/common/hiredis.c
index 4f1ea01f00..37cfcd3290 100644
--- a/src/knot/common/hiredis.c
+++ b/src/knot/common/hiredis.c
@@ -71,15 +71,11 @@ static ssize_t knot_redis_tls_read(struct redisContext *ctx, char *buff, size_t
 	int ret = knot_tls_recv(tls_ctx->conn, buff, size);
 	if (ret >= 0) {
 		return ret;
-	} else if (ret == KNOT_EBADCERT ||
-	           ret == KNOT_NET_ERECV ||
-	           ret == KNOT_NET_ECONNECT ||
-	           ret == KNOT_NET_EHSHAKE ||
-	           ret == KNOT_ETIMEOUT
-	) {
+	} else if (ret == KNOT_NET_EAGAIN) {
+		return 0;
+	} else {
 		return -1;
 	}
-	return 0;
 }
 
 static ssize_t knot_redis_tls_write(struct redisContext *ctx)
@@ -89,15 +85,11 @@ static ssize_t knot_redis_tls_write(struct redisContext *ctx)
 	int ret = knot_tls_send(tls_ctx->conn, ctx->obuf, sdslen(ctx->obuf));
 	if (ret >= 0) {
 		return ret;
-	} else if (ret == KNOT_EBADCERT ||
-	           ret == KNOT_NET_ESEND ||
-	           ret == KNOT_NET_ECONNECT ||
-	           ret == KNOT_NET_EHSHAKE ||
-	           ret == KNOT_ETIMEOUT
-	) {
+	} else if (ret == KNOT_NET_EAGAIN) {
+		return 0;
+	} else {
 		return -1;
 	}
-	return 0;
 }
 
 static int hiredis_attach_gnutls(redisContext *ctx, struct knot_creds *local_creds,