X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=1bf9d16afe03588c079af6aad0c9a1946f202369;hb=19e42b76f546dc3baee4a5d6a4f161155d279c74;hp=3b6399bfc0cb9727a6e236700d2c24760ac18e33;hpb=e57daac63b6f703af8e7c8209ef61a4d3b2180c3;p=tinc diff --git a/src/net_socket.c b/src/net_socket.c index 3b6399bf..1bf9d16a 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -388,7 +388,7 @@ static void handle_meta_write(connection_t *c) { logger(DEBUG_CONNECTIONS, LOG_ERR, "Could not send %d bytes of data to %s (%s): %s", c->outbuf.len - c->outbuf.offset, c->name, c->hostname, sockstrerror(sockerrno)); } - terminate_connection(c, c->status.active); + terminate_connection(c, c->edge); return; } @@ -421,7 +421,7 @@ static void handle_meta_io(void *data, int flags) { if (!socknotconn(sockerrno)) socket_error = sockerrno; else { - int len = sizeof socket_error; + socklen_t len = sizeof socket_error; getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&socket_error, &len); } if (socket_error) { @@ -820,7 +820,7 @@ void try_outgoing_connections(void) { if(c->outgoing && c->outgoing->timeout == -1) { c->outgoing = NULL; logger(DEBUG_CONNECTIONS, LOG_INFO, "No more outgoing connection to %s", c->name); - terminate_connection(c, c->status.active); + terminate_connection(c, c->edge); } }