Rename setup_network_connections() and split out try_outgoing_connections()

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index 487fcae..ef21179 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>
 /*
     net.h -- header for net.c
     Copyright (C) 1998-2005 Ivo Timmermans <zarq@iname.com>

-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -85,17 +85,6 @@ typedef struct vpn_packet_t {
        uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
        uint8_t data[MAXSIZE];
 } vpn_packet_t;
 

-typedef struct queue_element_t {
-       void *packet;
-       struct queue_element_t *prev;
-       struct queue_element_t *next;
-} queue_element_t;
-
-typedef struct packet_queue_t {
-       queue_element_t *head;
-       queue_element_t *tail;
-} packet_queue_t;
-

 typedef struct listen_socket_t {
        int tcp;
        int udp;
 typedef struct listen_socket_t {
        int tcp;
        int udp;


@@ -143,7 +132,7 @@ extern int setup_vpn_in_socket(const sockaddr_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(const struct node_t *, vpn_packet_t *);

-extern bool setup_network_connections(void);
+extern bool setup_network(void);

 extern void setup_outgoing_connection(struct outgoing_t *);
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);
 extern void setup_outgoing_connection(struct outgoing_t *);
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);