Remove checkpoint tracing.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 312030b..8c80549 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -54,8 +54,7 @@ list_t *outgoing_list = NULL;
 
 /* Setup sockets */
 
-static void configure_tcp(connection_t *c)
-{
+static void configure_tcp(connection_t *c) {
        int option;
 
 #ifdef O_NONBLOCK
@@ -83,7 +82,7 @@ static void configure_tcp(connection_t *c)
 #endif
 }
 
-static bool bind_to_interface(int sd) { /* {{{ */
+static bool bind_to_interface(int sd) {
        char *iface;
 
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
@@ -110,9 +109,9 @@ static bool bind_to_interface(int sd) { /* {{{ */
 #endif
 
        return true;
-} /* }}} bool bind_to_interface */
+}
 
-static bool bind_to_address(connection_t *c) { /* {{{ */
+static bool bind_to_address(connection_t *c) {
        char *node;
        struct addrinfo *ai_list;
        struct addrinfo *ai_ptr;
@@ -168,17 +167,14 @@ static bool bind_to_address(connection_t *c) { /* {{{ */
        freeaddrinfo(ai_list);
 
        return status ? false : true;
-} /* }}} bool bind_to_address */
+}
 
-int setup_listen_socket(const sockaddr_t *sa)
-{
+int setup_listen_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
        int option;
        char *iface;
 
-       cp();
-
        nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
        if(nfd < 0) {
@@ -234,14 +230,11 @@ int setup_listen_socket(const sockaddr_t *sa)
        return nfd;
 }
 
-int setup_vpn_in_socket(const sockaddr_t *sa)
-{
+int setup_vpn_in_socket(const sockaddr_t *sa) {
        int nfd;
        char *addrstr;
        int option;
 
-       cp();
-
        nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
 
        if(nfd < 0) {
@@ -311,12 +304,9 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
        return nfd;
 } /* int setup_vpn_in_socket */
 
-void retry_outgoing(outgoing_t *outgoing)
-{
+void retry_outgoing(outgoing_t *outgoing) {
        event_t *event;
 
-       cp();
-
        outgoing->timeout += 5;
 
        if(outgoing->timeout > maxtimeout)
@@ -333,10 +323,7 @@ void retry_outgoing(outgoing_t *outgoing)
                           outgoing->timeout);
 }
 
-void finish_connecting(connection_t *c)
-{
-       cp();
-
+void finish_connecting(connection_t *c) {
        ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
        configure_tcp(c);
@@ -346,13 +333,10 @@ void finish_connecting(connection_t *c)
        send_id(c);
 }
 
-void do_outgoing_connection(connection_t *c)
-{
+void do_outgoing_connection(connection_t *c) {
        char *address, *port;
        int result;
 
-       cp();
-
 begin:
        if(!c->outgoing->ai) {
                if(!c->outgoing->cfg) {
@@ -442,13 +426,10 @@ begin:
        return;
 }
 
-void setup_outgoing_connection(outgoing_t *outgoing)
-{
+void setup_outgoing_connection(outgoing_t *outgoing) {
        connection_t *c;
        node_t *n;
 
-       cp();
-
        n = lookup_node(outgoing->name);
 
        if(n)
@@ -489,15 +470,12 @@ void setup_outgoing_connection(outgoing_t *outgoing)
   accept a new tcp connect and create a
   new connection
 */
-bool handle_new_meta_connection(int sock)
-{
+bool handle_new_meta_connection(int sock) {
        connection_t *c;
        sockaddr_t sa;
        int fd;
        socklen_t len = sizeof(sa);
 
-       cp();
-
        fd = accept(sock, &sa.sa, &len);
 
        if(fd < 0) {
@@ -542,16 +520,13 @@ void free_outgoing(outgoing_t *outgoing) {
        free(outgoing);
 }
 
-void try_outgoing_connections(void)
-{
+void try_outgoing_connections(void) {
        static config_t *cfg = NULL;
        char *name;
        outgoing_t *outgoing;
        connection_t *c;
        avl_node_t *node;
        
-       cp();
-
        if(outgoing_list) {
                for(node = connection_tree->head; node; node = node->next) {
                        c = node->data;