void finish_connecting(connection_t *c) {
logger(DEBUG_CONNECTIONS, LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
- if(proxytype != PROXY_EXEC)
- configure_tcp(c);
-
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now.tv_sec;
c->status.connecting = false;
send_id(c);
}
static void handle_meta_write(connection_t *c) {
+ if(c->outbuf.len <= c->outbuf.offset)
+ return;
+
ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
if(outlen <= 0) {
if(!errno || errno == EPIPE) {
}
static void handle_meta_io(void *data, int flags) {
+ connection_t *c = data;
+
+ if(c->status.connecting) {
+ c->status.connecting = false;
+
+ int result;
+ socklen_t len = sizeof result;
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
+
+ if(!result)
+ finish_connecting(c);
+ else {
+ logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
+ terminate_connection(c, false);
+ return;
+ }
+ }
+
if(flags & IO_WRITE)
- handle_meta_write(data);
+ handle_meta_write(c);
else
- handle_meta_connection_data(data);
+ handle_meta_connection_data(c);
}
bool do_outgoing_connection(outgoing_t *outgoing) {
}
logger(DEBUG_CONNECTIONS, LOG_INFO, "Using proxy at %s port %s", proxyhost, proxyport);
c->socket = socket(proxyai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ configure_tcp(c);
}
if(c->socket == -1) {
c->outdigest = myself->connection->outdigest;
c->outmaclength = myself->connection->outmaclength;
c->outcompression = myself->connection->outcompression;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now.tv_sec;
connection_add(c);
- io_add(&c->io, handle_meta_io, c, c->socket, IO_READ);
+ io_add(&c->io, handle_meta_io, c, c->socket, IO_READ|IO_WRITE);
return true;
}
c->address = sa;
c->hostname = sockaddr2hostname(&sa);
c->socket = fd;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now.tv_sec;
logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname);
c->address = sa;
c->hostname = xstrdup("localhost port unix");
c->socket = fd;
- c->last_ping_time = time(NULL);
+ c->last_ping_time = now.tv_sec;
logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Connection from %s", c->hostname);