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);
return;
}
-void handle_meta_read(struct bufferevent *event, void *data) {
- logger(LOG_ERR, "handle_meta_read() called");
- abort();
-}
-
-void handle_meta_write(struct bufferevent *event, void *data) {
- ifdebug(META) logger(LOG_DEBUG, "handle_meta_write() called");
-}
-
-void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
- connection_t *c = data;
- logger(LOG_ERR, "handle_meta_connection_error() called: %d: %s", what, strerror(errno));
- terminate_connection(c, c->status.active);
-}
-
void setup_outgoing_connection(outgoing_t *outgoing) {
connection_t *c;
node_t *n;
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));
+ if(!thread_create(&c->thread, handle_meta_connection_data, c)) {
+ logger(LOG_ERR, "create_thread() failed: %s", strerror(errno));
abort();
}
- bufferevent_disable(c->buffer, EV_READ);
}
/*
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));
- abort();
- }
- bufferevent_disable(c->buffer, EV_READ);
-
configure_tcp(c);
connection_add(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) {