From e1a92729d28a2b7a4b76bbfa8bd7e53198413b00 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Fri, 26 Sep 2025 15:11:38 +0200
Subject: [PATCH] async: Fix ASYNC_ERR overwrite

---
 src/async.c | 11 +++++------
 src/async.h |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/async.c b/src/async.c
index c7756f9..0127d2d 100644
--- a/src/async.c
+++ b/src/async.c
@@ -6,6 +6,7 @@
  * @date 2022-12-28
  */
 
+#include "async.h"
 #include "logger.h"
 #include "lib/list.h"
 #include "lib/utils.h"
@@ -20,8 +21,6 @@
 #include <unistd.h>
 #include <openssl/ssl.h>
 
-#include "async.h"
-
 #define ASYNC_MAX_EVENTS 16
 
 typedef struct {
@@ -51,7 +50,7 @@ static short async_a2p(async_evt_t events) {
     if (events & ASYNC_IN)  ret |= POLLIN;
     if (events & ASYNC_PRI) ret |= POLLPRI;
     if (events & ASYNC_OUT) ret |= POLLOUT;
-    if (events & ASYNC_ERR) ret |= POLLERR;
+    if (events & ASYNC_ERR_) ret |= POLLERR;
     if (events & ASYNC_HUP) ret |= POLLHUP;
     if (events & ASYNC_RDNORM) ret |= POLLRDNORM;
     if (events & ASYNC_RDBAND) ret |= POLLRDBAND;
@@ -66,7 +65,7 @@ static unsigned int async_a2e(async_evt_t events) {
     if (events & ASYNC_IN)  ret |= EPOLLIN;
     if (events & ASYNC_PRI) ret |= EPOLLPRI;
     if (events & ASYNC_OUT) ret |= EPOLLOUT;
-    if (events & ASYNC_ERR) ret |= EPOLLERR;
+    if (events & ASYNC_ERR_) ret |= EPOLLERR;
     if (events & ASYNC_HUP) ret |= EPOLLHUP;
     if (events & ASYNC_RDNORM) ret |= EPOLLRDNORM;
     if (events & ASYNC_RDBAND) ret |= EPOLLRDBAND;
@@ -81,7 +80,7 @@ static async_evt_t async_p2a(short events) {
     if (events & POLLIN)   ret |= ASYNC_IN;
     if (events & POLLPRI)  ret |= ASYNC_PRI;
     if (events & POLLOUT)  ret |= ASYNC_OUT;
-    if (events & POLLERR)  ret |= ASYNC_ERR;
+    if (events & POLLERR)  ret |= ASYNC_ERR_;
     if (events & POLLHUP)  ret |= ASYNC_HUP;
     if (events & POLLRDNORM) ret |= ASYNC_RDNORM;
     if (events & POLLRDBAND) ret |= ASYNC_RDBAND;
@@ -96,7 +95,7 @@ static async_evt_t async_e2a(unsigned int events) {
     if (events & EPOLLIN)   ret |= ASYNC_IN;
     if (events & EPOLLPRI)  ret |= ASYNC_PRI;
     if (events & EPOLLOUT)  ret |= ASYNC_OUT;
-    if (events & EPOLLERR)  ret |= ASYNC_ERR;
+    if (events & EPOLLERR)  ret |= ASYNC_ERR_;
     if (events & EPOLLHUP)  ret |= ASYNC_HUP;
     if (events & EPOLLRDNORM) ret |= ASYNC_RDNORM;
     if (events & EPOLLRDBAND) ret |= ASYNC_RDBAND;
diff --git a/src/async.h b/src/async.h
index beedaac..66168dc 100644
--- a/src/async.h
+++ b/src/async.h
@@ -17,7 +17,7 @@
 #define ASYNC_IN     0x001
 #define ASYNC_PRI    0x002
 #define ASYNC_OUT    0x004
-#define ASYNC_ERR    0x008
+#define ASYNC_ERR_   0x008
 #define ASYNC_HUP    0x010
 #define ASYNC_RDNORM 0x040
 #define ASYNC_RDBAND 0x080