Fix format strings for Windows.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index e20076f..a1dfcd3 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -137,9 +137,9 @@ static bool bind_to_address(connection_t *c) {
        status = getaddrinfo(node, /* service = */ NULL,
                        &ai_hints, &ai_list);
        if(status) {
-               free(node);
                logger(LOG_WARNING, "Error looking up %s port %s: %s",
                                node, "any", gai_strerror(status));
+               free(node);
                return false;
        }
        assert(ai_list != NULL);
@@ -350,7 +350,7 @@ void finish_connecting(connection_t *c) {
        send_id(c);
 }
 
-void do_outgoing_connection(connection_t *c) {
+bool do_outgoing_connection(connection_t *c) {
        char *address, *port, *space;
        int result;
 
@@ -367,7 +367,7 @@ begin:
                        retry_outgoing(c->outgoing);
                        c->outgoing = NULL;
                        connection_del(c);
-                       return;
+                       return false;
                }
 
                get_config_string(c->outgoing->cfg, &address);
@@ -434,7 +434,7 @@ begin:
        if(result == -1) {
                if(sockinprogress(sockerrno)) {
                        c->status.connecting = true;
-                       return;
+                       return true;
                }
 
                closesocket(c->socket);
@@ -446,29 +446,32 @@ begin:
 
        finish_connecting(c);
 
-       return;
-}
-
-void handle_meta_read(struct bufferevent *event, void *data) {
-       logger(LOG_ERR, "handle_meta_read() called");
-       abort();
+       return true;
 }
 
-void handle_meta_write(struct bufferevent *event, void *data) {
+static void handle_meta_write(int sock, short events, 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);
+
+       ssize_t outlen = send(c->socket, c->outbuf.data + c->outbuf.offset, c->outbuf.len - c->outbuf.offset, 0);
+       if(outlen <= 0) {
+               logger(LOG_ERR, "Onoes, outlen = %d (%s)", (int)outlen, strerror(errno));
+               terminate_connection(c, c->status.active);
+               return;
+       }
+
+       buffer_read(&c->outbuf, outlen);
+       if(!c->outbuf.len && event_initialized(&c->outevent))
+               event_del(&c->outevent);
 }
 
 void setup_outgoing_connection(outgoing_t *outgoing) {
        connection_t *c;
        node_t *n;
 
-       event_del(&outgoing->ev);
+       if(event_initialized(&outgoing->ev))
+               event_del(&outgoing->ev);
 
        n = lookup_node(outgoing->name);
 
@@ -503,16 +506,11 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
        connection_add(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();
+       if (do_outgoing_connection(c)) {
+               event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+               event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
+               event_add(&c->inevent, NULL);
        }
-       bufferevent_disable(c->buffer, EV_READ);
 }
 
 /*
@@ -549,13 +547,8 @@ void handle_new_meta_connection(int sock, short events, void *data) {
        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_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, 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);
 
@@ -565,7 +558,7 @@ void handle_new_meta_connection(int sock, short events, void *data) {
        send_id(c);
 }
 
-void free_outgoing(outgoing_t *outgoing) {
+static void free_outgoing(outgoing_t *outgoing) {
        if(outgoing->ai)
                freeaddrinfo(outgoing->ai);