From b3aa5332c80cf93d0d98cc82fbc33d7d2ecd25f5 Mon Sep 17 00:00:00 2001 From: Jan Vidar Krey Date: Thu, 10 Dec 2009 23:12:04 +0100 Subject: [PATCH] Work on epoll backend, and removing dependency on libevent. --- src/core/auth.c | 2 +- src/core/hub.c | 2 +- src/core/probe.c | 2 +- src/network/connection-common.c | 54 +++++++ src/network/connection-epoll.c | 0 src/network/connection-libevent.c | 232 +++++++++++++++++++++++++++++ src/network/connection.c | 240 +----------------------------- src/network/connection.h | 21 +-- 8 files changed, 294 insertions(+), 259 deletions(-) create mode 100644 src/network/connection-common.c create mode 100644 src/network/connection-epoll.c create mode 100644 src/network/connection-libevent.c diff --git a/src/core/auth.c b/src/core/auth.c index 2465560..5029653 100644 --- a/src/core/auth.c +++ b/src/core/auth.c @@ -457,7 +457,7 @@ const char* acl_password_generate_challenge(struct acl_handle* acl, struct hub_u static char tiger_buf[MAX_CID_LEN+1]; // FIXME: Generate a better nonce scheme. - snprintf(buf, 64, "%p%d%d", user, (int) user->id.sid, (int) user->connection->sd); + snprintf(buf, 64, "%p%d%d", user, (int) user->id.sid, (int) net_con_get_sd(user->connection)); tiger((uint64_t*) buf, strlen(buf), (uint64_t*) tiger_res); base32_encode((unsigned char*) tiger_res, TIGERSIZE, tiger_buf); diff --git a/src/core/hub.c b/src/core/hub.c index dbf92e6..ccea554 100644 --- a/src/core/hub.c +++ b/src/core/hub.c @@ -1029,7 +1029,7 @@ void hub_disconnect_user(struct hub_info* hub, struct hub_user* user, int reason } /* stop reading from user */ - net_shutdown_r(user->connection->sd); + net_shutdown_r(net_con_get_sd(user->connection)); net_con_close(user->connection); user->connection = 0; diff --git a/src/core/probe.c b/src/core/probe.c index 06b2e39..4c5f122 100644 --- a/src/core/probe.c +++ b/src/core/probe.c @@ -25,7 +25,7 @@ static char probe_recvbuf[PROBE_RECV_SIZE]; static void probe_net_event(struct net_connection* con, int events, void *arg) { - struct hub_probe* probe = (struct hub_probe*) con->ptr; + struct hub_probe* probe = (struct hub_probe*) net_con_get_ptr(con); if (events == NET_EVENT_SOCKERROR || events == NET_EVENT_CLOSED || events == NET_EVENT_TIMEOUT) { diff --git a/src/network/connection-common.c b/src/network/connection-common.c new file mode 100644 index 0000000..3457860 --- /dev/null +++ b/src/network/connection-common.c @@ -0,0 +1,54 @@ + +#define NET_WANT_READ NET_EVENT_READ +#define NET_WANT_WRITE NET_EVENT_WRITE +#define NET_WANT_ACCEPT 0x0008 +#define NET_WANT_SSL_READ 0x0010 +#define NET_WANT_SSL_WRITE 0x0020 +#define NET_WANT_SSL_ACCEPT 0x0040 +#define NET_WANT_SSL_CONNECT 0x0080 +#define NET_WANT_SSL_X509_LOOKUP 0x0100 + +#define NET_PROCESSING_BUSY 0x8000 +#define NET_CLEANUP 0x4000 +#define NET_INITIALIZED 0x2000 +#define NET_TIMER_ENABLED 0x1000 + +/* FIXME: Meant for debugging */ +#define NET_EVENT_SET 0x0800 + +static inline int net_con_flag_get(struct net_connection* con, unsigned int flag) +{ + return con->flags & flag; +} + +static inline void net_con_flag_set(struct net_connection* con, unsigned int flag) +{ + con->flags |= flag; +} + +static inline void net_con_flag_unset(struct net_connection* con, unsigned int flag) +{ + con->flags &= ~flag; +} + +#define NET_CON_STRUCT_BASIC \ + int sd; /** socket descriptor */ \ + unsigned int flags; /** Connection flags */ \ + void* ptr; /** data pointer */ \ + net_connection_cb callback; /** Callback function */ \ + time_t last_recv; /** Timestamp for last recv() */ \ + time_t last_send; /** Timestamp for last send() */ \ + +#define NET_CON_STRUCT_SSL \ + SSL* ssl; /** SSL handle */ \ + size_t write_len; /** Length of last SSL_write(), only used if flags is NET_WANT_SSL_READ. */ \ + +#ifdef USE_SSL +#define NET_CON_STRUCT_COMMON \ + NET_CON_STRUCT_BASIC \ + NET_CON_STRUCT_SSL +#else +#define NET_CON_STRUCT_COMMON \ + NET_CON_STRUCT_BASIC +#endif + diff --git a/src/network/connection-epoll.c b/src/network/connection-epoll.c new file mode 100644 index 0000000..e69de29 diff --git a/src/network/connection-libevent.c b/src/network/connection-libevent.c new file mode 100644 index 0000000..63bc0d7 --- /dev/null +++ b/src/network/connection-libevent.c @@ -0,0 +1,232 @@ +/* + * uhub - A tiny ADC p2p connection hub + * Copyright (C) 2007-2009, Jan Vidar Krey + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#ifdef USE_LIBEVENT + +struct net_connection +{ + NET_CON_STRUCT_COMMON + struct event event; /** libevent struct for read/write events */ + struct event timeout; /** Used for internal timeout handling */ +}; + +static inline int net_con_convert_to_libevent_mask(int ev) +{ + int events = 0; + if (ev & NET_EVENT_READ) events |= EV_READ; + if (ev & NET_EVENT_WRITE) events |= EV_WRITE; + return events; +} + +static inline int net_con_convert_from_libevent_mask(int ev) +{ + int events = 0; + if (ev & EV_TIMEOUT) events |= NET_EVENT_TIMEOUT; + if (ev & EV_READ) events |= NET_EVENT_READ; + if (ev & EV_WRITE) events |= NET_EVENT_WRITE; + return events; +} + +static void net_con_event(int fd, short ev, void *arg); + +static void net_con_set(struct net_connection* con) +{ + uhub_assert(con); + + int ev = 0; + if (net_con_flag_get(con, NET_WANT_READ | NET_WANT_SSL_READ)) ev |= EV_READ; + if (net_con_flag_get(con, NET_WANT_WRITE | NET_WANT_SSL_WRITE)) ev |= EV_WRITE; + + if (net_con_flag_get(con, NET_EVENT_SET) != 0) + { + event_del(&con->event); + } + net_con_flag_set(con, NET_EVENT_SET); + + LOG_MEMORY("SET: set+add: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, ev); + event_set(&con->event, con->sd, ev, net_con_event, con); + event_add(&con->event, 0); + + net_con_flag_set(con, NET_INITIALIZED); +} + +static void net_con_after_close(struct net_connection* con) +{ + if (net_con_flag_get(con, NET_INITIALIZED)) + { + LOG_MEMORY("DEL: close: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, -1); + net_con_flag_unset(con, NET_EVENT_SET); + + event_del(&con->event); + net_con_flag_unset(con, NET_INITIALIZED); + } + + net_con_clear_timeout(con); + net_close(con->sd); + con->sd = -1; + + hub_free(con); +} + +void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int ev) +{ + uhub_assert(con); + + int events = net_con_convert_to_libevent_mask(ev); + if (ev & NET_EVENT_READ) net_con_flag_set(con, NET_WANT_READ); + if (ev & NET_EVENT_WRITE) net_con_flag_set(con, NET_WANT_WRITE); + + con->sd = sd; + con->flags = 0; + con->ptr = (void*) ptr; + con->callback = callback; + con->last_send = time(0); + con->last_recv = con->last_send; + + if (ev) + { + uhub_assert(net_con_flag_get(con, NET_EVENT_SET) == 0); + net_con_flag_set(con, NET_EVENT_SET); + + LOG_MEMORY("SET: init: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, ev); + event_set(&con->event, con->sd, events, net_con_event, con); + event_add(&con->event, 0); + net_con_flag_set(con, NET_INITIALIZED); + } + + net_set_nonblocking(sd, 1); + net_set_nosigpipe(sd, 1); + +#ifdef SSL_SUPPORT + con->ssl = NULL; + con->write_len = 0; +#endif +} + +void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events) +{ + uhub_assert(con); + con->callback = callback; + con->ptr = (void*) ptr; + net_con_update(con, events); +} + +void net_con_update(struct net_connection* con, int ev) +{ + uhub_assert(con); + + if (ev & NET_EVENT_READ) + net_con_flag_set(con, NET_EVENT_READ); + else + net_con_flag_unset(con, NET_EVENT_READ); + + if (ev & NET_EVENT_WRITE) + net_con_flag_set(con, NET_EVENT_WRITE); + else + net_con_flag_unset(con, NET_EVENT_WRITE); + + if (!net_con_flag_get(con, NET_PROCESSING_BUSY)) + { + net_con_set(con); + } +} + +#define CALLBACK(CON, EVENTS) \ + if (CON->callback) \ + CON->callback(con, EVENTS, CON->ptr); + +static void net_con_event(int fd, short ev, void *arg) +{ + struct net_connection* con = (struct net_connection*) arg; + int events = net_con_convert_from_libevent_mask(ev); + + if (!net_con_flag_get(con, NET_INITIALIZED)) + { + return; + } + + if (net_con_flag_get(con, NET_CLEANUP)) + { + net_con_after_close(con); + return; + } + + net_con_flag_set(con, NET_PROCESSING_BUSY); + +// uhub_assert(net_con_flag_get(con, NET_EVENT_SET) != 0); + net_con_flag_unset(con, NET_EVENT_SET); + + LOG_MEMORY("EVT: process: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, (int) ev); + +#ifdef SSL_SUPPORT + if (!con->ssl) + { +#endif + CALLBACK(con, events); +#ifdef SSL_SUPPORT + } + else + { +#ifdef NETWORK_DUMP_DEBUG + LOG_PROTO("net_con_event: events=%d, con=%p", ev, con); +#endif + if (ev & (EV_READ | EV_WRITE)) + { + if (net_con_flag_get(con, NET_WANT_SSL_ACCEPT)) + { + if (net_con_ssl_accept(con) < 0) + CALLBACK(con, NET_EVENT_SOCKERROR); + } + else if (net_con_flag_get(con, NET_WANT_SSL_CONNECT)) + { + if (net_con_ssl_connect(con) < 0) + CALLBACK(con, NET_EVENT_SOCKERROR); + } + else if (ev == EV_READ && net_con_flag_get(con, NET_WANT_SSL_READ)) + { + CALLBACK(con, NET_EVENT_WRITE); + } + else if (ev == EV_WRITE && net_con_flag_get(con, NET_WANT_SSL_WRITE)) + { + CALLBACK(con, events & NET_EVENT_READ); + } + else + { + CALLBACK(con, events); + } + } + else + { + CALLBACK(con, events); + } + } +#endif + net_con_flag_unset(con, NET_PROCESSING_BUSY); + + if (net_con_flag_get(con, NET_CLEANUP)) + { + net_con_after_close(con); + } + else + { + net_con_set(con); + } +} + +#endif /* USE_LIBEVENT */ diff --git a/src/network/connection.c b/src/network/connection.c index 32f267d..9c0d9c8 100644 --- a/src/network/connection.c +++ b/src/network/connection.c @@ -18,246 +18,12 @@ */ #include "uhub.h" - -#define NET_WANT_READ NET_EVENT_READ -#define NET_WANT_WRITE NET_EVENT_WRITE -#define NET_WANT_ACCEPT 0x0008 -#define NET_WANT_SSL_READ 0x0010 -#define NET_WANT_SSL_WRITE 0x0020 -#define NET_WANT_SSL_ACCEPT 0x0040 -#define NET_WANT_SSL_CONNECT 0x0080 -#define NET_WANT_SSL_X509_LOOKUP 0x0100 - -#define NET_PROCESSING_BUSY 0x8000 -#define NET_CLEANUP 0x4000 -#define NET_INITIALIZED 0x2000 -#define NET_TIMER_ENABLED 0x1000 - -/* FIXME: Meant for debugging */ -#define NET_EVENT_SET 0x0800 +#include "network/connection-common.c" +#include "network/connection-libevent.c" +#include "network/connection-epoll.c" extern struct hub_info* g_hub; -static inline int net_con_flag_get(struct net_connection* con, unsigned int flag) -{ - return con->flags & flag; -} - -static inline void net_con_flag_set(struct net_connection* con, unsigned int flag) -{ - con->flags |= flag; -} - -static inline void net_con_flag_unset(struct net_connection* con, unsigned int flag) -{ - con->flags &= ~flag; -} - -#ifdef USE_LIBEVENT -static inline int net_con_convert_to_libevent_mask(int ev) -{ - int events = 0; - if (ev & NET_EVENT_READ) events |= EV_READ; - if (ev & NET_EVENT_WRITE) events |= EV_WRITE; - return events; -} - -static inline int net_con_convert_from_libevent_mask(int ev) -{ - int events = 0; - if (ev & EV_TIMEOUT) events |= NET_EVENT_TIMEOUT; - if (ev & EV_READ) events |= NET_EVENT_READ; - if (ev & EV_WRITE) events |= NET_EVENT_WRITE; - return events; -} -#endif - -static void net_con_event(int fd, short ev, void *arg); - -void net_con_set(struct net_connection* con) -{ - uhub_assert(con); - - int ev = 0; - if (net_con_flag_get(con, NET_WANT_READ | NET_WANT_SSL_READ)) ev |= EV_READ; - if (net_con_flag_get(con, NET_WANT_WRITE | NET_WANT_SSL_WRITE)) ev |= EV_WRITE; - - if (net_con_flag_get(con, NET_EVENT_SET) != 0) - { - event_del(&con->event); - } - net_con_flag_set(con, NET_EVENT_SET); - - LOG_MEMORY("SET: set+add: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, ev); - event_set(&con->event, con->sd, ev, net_con_event, con); - event_add(&con->event, 0); - net_con_flag_set(con, NET_INITIALIZED); -} - -static void net_con_after_close(struct net_connection* con) -{ - if (net_con_flag_get(con, NET_INITIALIZED)) - { - LOG_MEMORY("DEL: close: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, -1); - net_con_flag_unset(con, NET_EVENT_SET); - - event_del(&con->event); - net_con_flag_unset(con, NET_INITIALIZED); - } - - net_con_clear_timeout(con); - net_close(con->sd); - con->sd = -1; - - hub_free(con); -} - -#define CALLBACK(CON, EVENTS) \ - if (CON->callback) \ - CON->callback(con, EVENTS, CON->ptr); - -static void net_con_event(int fd, short ev, void *arg) -{ - struct net_connection* con = (struct net_connection*) arg; - int events = net_con_convert_from_libevent_mask(ev); - - if (!net_con_flag_get(con, NET_INITIALIZED)) - { - return; - } - - if (net_con_flag_get(con, NET_CLEANUP)) - { - net_con_after_close(con); - return; - } - - net_con_flag_set(con, NET_PROCESSING_BUSY); - -// uhub_assert(net_con_flag_get(con, NET_EVENT_SET) != 0); - net_con_flag_unset(con, NET_EVENT_SET); - - LOG_MEMORY("EVT: process: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, (int) ev); - -#ifdef SSL_SUPPORT - if (!con->ssl) - { -#endif - CALLBACK(con, events); -#ifdef SSL_SUPPORT - } - else - { -#ifdef NETWORK_DUMP_DEBUG - LOG_PROTO("net_con_event: events=%d, con=%p", ev, con); -#endif - if (ev & (EV_READ | EV_WRITE)) - { - if (net_con_flag_get(con, NET_WANT_SSL_ACCEPT)) - { - if (net_con_ssl_accept(con) < 0) - CALLBACK(con, NET_EVENT_SOCKERROR); - } - else if (net_con_flag_get(con, NET_WANT_SSL_CONNECT)) - { - if (net_con_ssl_connect(con) < 0) - CALLBACK(con, NET_EVENT_SOCKERROR); - } - else if (ev == EV_READ && net_con_flag_get(con, NET_WANT_SSL_READ)) - { - CALLBACK(con, NET_EVENT_WRITE); - } - else if (ev == EV_WRITE && net_con_flag_get(con, NET_WANT_SSL_WRITE)) - { - CALLBACK(con, events & NET_EVENT_READ); - } - else - { - CALLBACK(con, events); - } - } - else - { - CALLBACK(con, events); - } - } -#endif - net_con_flag_unset(con, NET_PROCESSING_BUSY); - - if (net_con_flag_get(con, NET_CLEANUP)) - { - net_con_after_close(con); - } - else - { - net_con_set(con); - } -} - - -void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int ev) -{ - uhub_assert(con); - - int events = net_con_convert_to_libevent_mask(ev); - if (ev & NET_EVENT_READ) net_con_flag_set(con, NET_WANT_READ); - if (ev & NET_EVENT_WRITE) net_con_flag_set(con, NET_WANT_WRITE); - - con->sd = sd; - con->flags = 0; - con->ptr = (void*) ptr; - con->callback = callback; - con->last_send = time(0); - con->last_recv = con->last_send; - - if (ev) - { - uhub_assert(net_con_flag_get(con, NET_EVENT_SET) == 0); - net_con_flag_set(con, NET_EVENT_SET); - - LOG_MEMORY("SET: init: CON={ %p, %p, %d, %d}", con, &con->event, con->sd, ev); - event_set(&con->event, con->sd, events, net_con_event, con); - event_add(&con->event, 0); - net_con_flag_set(con, NET_INITIALIZED); - } - - net_set_nonblocking(sd, 1); - net_set_nosigpipe(sd, 1); - -#ifdef SSL_SUPPORT - con->ssl = NULL; - con->write_len = 0; -#endif -} - -void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events) -{ - uhub_assert(con); - con->callback = callback; - con->ptr = (void*) ptr; - net_con_update(con, events); -} - -void net_con_update(struct net_connection* con, int ev) -{ - uhub_assert(con); - - if (ev & NET_EVENT_READ) - net_con_flag_set(con, NET_EVENT_READ); - else - net_con_flag_unset(con, NET_EVENT_READ); - - if (ev & NET_EVENT_WRITE) - net_con_flag_set(con, NET_EVENT_WRITE); - else - net_con_flag_unset(con, NET_EVENT_WRITE); - - if (!net_con_flag_get(con, NET_PROCESSING_BUSY)) - { - net_con_set(con); - } -} - int net_con_close(struct net_connection* con) { uhub_assert(con); diff --git a/src/network/connection.h b/src/network/connection.h index 5ef5ca5..508a236 100644 --- a/src/network/connection.h +++ b/src/network/connection.h @@ -46,25 +46,8 @@ extern void net_timer_initialize(struct net_timer* timer, net_timeout_cb callbac extern void net_timer_reset(struct net_timer* timer, int seconds); extern void net_timer_shutdown(struct net_timer* timer); -struct net_connection -{ - int sd; /** socket descriptor */ - unsigned int flags; /** Connection flags */ - void* ptr; /** data pointer */ - net_connection_cb callback; /** Callback function */ -#ifdef USE_LIBEVENT - struct event event; /** libevent struct for read/write events */ - struct event timeout; /** Used for internal timeout handling */ -#else -#warning not implemented -#endif - time_t last_recv; /** Timestamp for last recv() */ - time_t last_send; /** Timestamp for last send() */ -#ifdef SSL_SUPPORT - SSL* ssl; /** SSL handle */ - size_t write_len; /** Length of last SSL_write(), only used if flags is NET_WANT_SSL_READ. */ -#endif /* SSL_SUPPORT */ -}; +extern int net_con_get_sd(struct net_connection* con); +extern void* net_con_get_ptr(struct net_connection* con); extern void net_con_initialize(struct net_connection* con, int sd, net_connection_cb callback, const void* ptr, int events); extern void net_con_reinitialize(struct net_connection* con, net_connection_cb callback, const void* ptr, int events);