This is a minimal conversion which does not yet get rid of bufferevents and
evbuffers in connection_ts.
if(c->buffer)
bufferevent_free(c->buffer);
if(c->buffer)
bufferevent_free(c->buffer);
- if(event_initialized(&c->inevent))
- event_del(&c->inevent);
+ if(c->thread)
+ thread_destroy(&c->thread);
char *hischallenge; /* The challenge we sent to him */
struct bufferevent *buffer; /* buffer events on this metadata connection */
char *hischallenge; /* The challenge we sent to him */
struct bufferevent *buffer; /* buffer events on this metadata connection */
- struct event inevent; /* input event on this metadata connection */
int tcplen; /* length of incoming TCPpacket */
int allow_request; /* defined if there's only one request possible */
int tcplen; /* length of incoming TCPpacket */
int allow_request; /* defined if there's only one request possible */
}
ifdebug(META) logger(LOG_DEBUG, "Encrypted write %p %p %p %d", c, c->buffer, outbuf, length);
}
ifdebug(META) logger(LOG_DEBUG, "Encrypted write %p %p %p %d", c, c->buffer, outbuf, length);
- bufferevent_write(c->buffer, (void *)outbuf, length);
+ write(c->socket, outbuf, length);
ifdebug(META) logger(LOG_DEBUG, "Done.");
} else {
ifdebug(META) logger(LOG_DEBUG, "Unencrypted write %p %p %p %d", c, c->buffer, buffer, length);
ifdebug(META) logger(LOG_DEBUG, "Done.");
} else {
ifdebug(META) logger(LOG_DEBUG, "Unencrypted write %p %p %p %d", c, c->buffer, buffer, length);
- bufferevent_write(c->buffer, (void *)buffer, length);
+ write(c->socket, buffer, length);
ifdebug(META) logger(LOG_DEBUG, "Done.");
}
ifdebug(META) logger(LOG_DEBUG, "Done.");
}
event_add(event, &(struct timeval){pingtimeout, 0});
}
event_add(event, &(struct timeval){pingtimeout, 0});
}
-void handle_meta_connection_data(int fd, short events, void *data) {
+void handle_meta_connection_data(void *data) {
connection_t *c = data;
int result;
socklen_t len = sizeof result;
connection_t *c = data;
int result;
socklen_t len = sizeof result;
- if (!receive_meta(c)) {
- terminate_connection(c, c->status.active);
- return;
+ while(true) {
+ if (!receive_meta(c)) {
+ terminate_connection(c, c->status.active);
+ return;
+ }
extern bool read_rsa_public_key(struct connection_t *);
extern void send_mtu_probe(struct node_t *);
extern void handle_device_data(int, short, void *);
extern bool read_rsa_public_key(struct connection_t *);
extern void send_mtu_probe(struct node_t *);
extern void handle_device_data(int, short, void *);
-extern void handle_meta_connection_data(int, short, void *);
+extern void handle_meta_connection_data(void *);
extern void regenerate_key();
extern void purge(void);
extern void retry(void);
extern void regenerate_key();
extern void purge(void);
extern void retry(void);
static void configure_tcp(connection_t *c) {
int option;
static void configure_tcp(connection_t *c) {
int option;
-#ifdef O_NONBLOCK
- int flags = fcntl(c->socket, F_GETFL);
-
- if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
- logger(LOG_ERR, "fcntl for %s: %s", c->hostname, strerror(errno));
- }
-#elif defined(WIN32)
- unsigned long arg = 1;
-
- if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
- logger(LOG_ERR, "ioctlsocket for %s: %d", c->hostname, sockstrerror(sockerrno));
- }
-#endif
-
#if defined(SOL_TCP) && defined(TCP_NODELAY)
option = 1;
setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
#if defined(SOL_TCP) && defined(TCP_NODELAY)
option = 1;
setsockopt(c->socket, SOL_TCP, TCP_NODELAY, (void *)&option, sizeof option);
do_outgoing_connection(c);
do_outgoing_connection(c);
- event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
- event_add(&c->inevent, NULL);
c->buffer = bufferevent_new(c->socket, handle_meta_read, handle_meta_write, handle_meta_connection_error, c);
if(!c->buffer) {
logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
abort();
}
bufferevent_disable(c->buffer, EV_READ);
c->buffer = bufferevent_new(c->socket, handle_meta_read, handle_meta_write, handle_meta_connection_error, c);
if(!c->buffer) {
logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
abort();
}
bufferevent_disable(c->buffer, EV_READ);
+
+ if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+ logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
+ abort();
+ }
ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection from %s", c->hostname);
- event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
- event_add(&c->inevent, NULL);
c->buffer = bufferevent_new(c->socket, NULL, handle_meta_write, handle_meta_connection_error, c);
if(!c->buffer) {
logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
c->buffer = bufferevent_new(c->socket, NULL, handle_meta_write, handle_meta_connection_error, c);
if(!c->buffer) {
logger(LOG_ERR, "bufferevent_new() failed: %s", strerror(errno));
c->allow_request = ID;
send_id(c);
c->allow_request = ID;
send_id(c);
+
+ if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+ logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
+ abort();
+ }
}
void free_outgoing(outgoing_t *outgoing) {
}
void free_outgoing(outgoing_t *outgoing) {