lorenz.stechauner/sesimos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Activity

async: Fix ASYNC_ERR overwrite

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-09-26 15:11:38 +02:00
parent 72904c3ba9
commit e1a92729d2
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/async.c
View File

@@ -6,6 +6,7 @@
* @date 2022-12-28 * @date 2022-12-28
*/ */
#include "async.h"
#include "logger.h" #include "logger.h"
#include "lib/list.h" #include "lib/list.h"
#include "lib/utils.h" #include "lib/utils.h"
@@ -20,8 +21,6 @@
#include <unistd.h> #include <unistd.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include "async.h"
#define ASYNC_MAX_EVENTS 16 #define ASYNC_MAX_EVENTS 16
typedef struct { typedef struct {
@@ -51,7 +50,7 @@ static short async_a2p(async_evt_t events) {
if (events & ASYNC_IN) ret |= POLLIN; if (events & ASYNC_IN) ret |= POLLIN;
if (events & ASYNC_PRI) ret |= POLLPRI; if (events & ASYNC_PRI) ret |= POLLPRI;
if (events & ASYNC_OUT) ret |= POLLOUT; 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_HUP) ret |= POLLHUP;
if (events & ASYNC_RDNORM) ret |= POLLRDNORM; if (events & ASYNC_RDNORM) ret |= POLLRDNORM;
if (events & ASYNC_RDBAND) ret |= POLLRDBAND; 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_IN) ret |= EPOLLIN;
if (events & ASYNC_PRI) ret |= EPOLLPRI; if (events & ASYNC_PRI) ret |= EPOLLPRI;
if (events & ASYNC_OUT) ret |= EPOLLOUT; 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_HUP) ret |= EPOLLHUP;
if (events & ASYNC_RDNORM) ret |= EPOLLRDNORM; if (events & ASYNC_RDNORM) ret |= EPOLLRDNORM;
if (events & ASYNC_RDBAND) ret |= EPOLLRDBAND; 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 & POLLIN) ret |= ASYNC_IN;
if (events & POLLPRI) ret |= ASYNC_PRI; if (events & POLLPRI) ret |= ASYNC_PRI;
if (events & POLLOUT) ret |= ASYNC_OUT; 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 & POLLHUP) ret |= ASYNC_HUP;
if (events & POLLRDNORM) ret |= ASYNC_RDNORM; if (events & POLLRDNORM) ret |= ASYNC_RDNORM;
if (events & POLLRDBAND) ret |= ASYNC_RDBAND; 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 & EPOLLIN) ret |= ASYNC_IN;
if (events & EPOLLPRI) ret |= ASYNC_PRI; if (events & EPOLLPRI) ret |= ASYNC_PRI;
if (events & EPOLLOUT) ret |= ASYNC_OUT; 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 & EPOLLHUP) ret |= ASYNC_HUP;
if (events & EPOLLRDNORM) ret |= ASYNC_RDNORM; if (events & EPOLLRDNORM) ret |= ASYNC_RDNORM;
if (events & EPOLLRDBAND) ret |= ASYNC_RDBAND; if (events & EPOLLRDBAND) ret |= ASYNC_RDBAND;

2
src/async.h
View File

@@ -17,7 +17,7 @@
#define ASYNC_IN 0x001 #define ASYNC_IN 0x001
#define ASYNC_PRI 0x002 #define ASYNC_PRI 0x002
#define ASYNC_OUT 0x004 #define ASYNC_OUT 0x004
#define ASYNC_ERR 0x008 #define ASYNC_ERR_ 0x008
#define ASYNC_HUP 0x010 #define ASYNC_HUP 0x010
#define ASYNC_RDNORM 0x040 #define ASYNC_RDNORM 0x040
#define ASYNC_RDBAND 0x080 #define ASYNC_RDBAND 0x080