Run graph() after edge_del() when updating an edge.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 96a58b0..05485f8 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_socket.c,v 1.1.2.20 2002/09/09 21:24:41 guus Exp $
+    $Id: net_socket.c,v 1.1.2.22 2002/09/15 14:55:53 guus Exp $
 */
 
 #include "config.h"
@@ -26,15 +26,6 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -49,6 +40,15 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
+#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 
 #include <utils.h>
 #include <xalloc.h>
@@ -84,7 +84,7 @@ int listen_sockets;
 
 /* Setup sockets */
 
-int setup_listen_socket(sockaddr_t * sa)
+int setup_listen_socket(sockaddr_t *sa)
 {
        int nfd, flags;
        char *addrstr;
@@ -162,7 +162,7 @@ int setup_listen_socket(sockaddr_t * sa)
        return nfd;
 }
 
-int setup_vpn_in_socket(sockaddr_t * sa)
+int setup_vpn_in_socket(sockaddr_t *sa)
 {
        int nfd, flags;
        char *addrstr;
@@ -219,7 +219,7 @@ int setup_vpn_in_socket(sockaddr_t * sa)
        return nfd;
 }
 
-void retry_outgoing(outgoing_t * outgoing)
+void retry_outgoing(outgoing_t *outgoing)
 {
        event_t *event;
 
@@ -242,7 +242,7 @@ void retry_outgoing(outgoing_t * outgoing)
                           outgoing->timeout);
 }
 
-int setup_outgoing_socket(connection_t * c)
+int setup_outgoing_socket(connection_t *c)
 {
        int option;
 
@@ -288,7 +288,7 @@ int setup_outgoing_socket(connection_t * c)
 }
 
 
-void finish_connecting(connection_t * c)
+void finish_connecting(connection_t *c)
 {
        cp();
 
@@ -300,7 +300,7 @@ 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 option, result, flags;
@@ -403,7 +403,7 @@ begin:
        return;
 }
 
-void setup_outgoing_connection(outgoing_t * outgoing)
+void setup_outgoing_connection(outgoing_t *outgoing)
 {
        connection_t *c;
        node_t *n;