X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=cbe9e6884684b9b6bff0c15d9966a917a09cec49;hp=74841875d5a827112b1f2150f5dc04e6301e015e;hb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503;hpb=116ba3b3da73fb857cf75b5c92c6aacd70d94dd9

diff --git a/src/net_socket.c b/src/net_socket.c
index 74841875..cbe9e688 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
-    Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.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
@@ -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.13 2002/06/08 12:57:10 guus Exp $
+    $Id: net_socket.c,v 1.1.2.19 2002/09/09 19:39:59 guus Exp $
 */
 
 #include "config.h"
@@ -26,6 +26,9 @@
 #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
@@ -77,7 +80,7 @@ int maxtimeout = 900;
 int seconds_till_retry = 5;
 
 listen_socket_t listen_socket[MAXSOCKETS];
-int listen_sockets = 0;
+int listen_sockets;
 
 /* Setup sockets */
 
@@ -90,8 +93,10 @@ int setup_listen_socket(sockaddr_t *sa)
   char *interface;
   struct ifreq ifr;
 #endif
-cp
-  if((nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP)) < 0)
+  cp();
+  nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+  if(nfd < 0)
     {
       syslog(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
       return -1;
@@ -150,7 +155,7 @@ cp
       syslog(LOG_ERR, _("System call `%s' failed: %s"), "listen", strerror(errno));
       return -1;
     }
-cp
+  cp();
   return nfd;
 }
 
@@ -163,8 +168,10 @@ int setup_vpn_in_socket(sockaddr_t *sa)
   char *interface;
   struct ifreq ifr;
 #endif
-cp
-  if((nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+  cp();
+  nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
+
+  if(nfd < 0)
     {
       syslog(LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno));
       return -1;
@@ -203,14 +210,14 @@ cp
       free(addrstr);
       return -1;
     }
-cp
+  cp();
   return nfd;
 }
 
 void retry_outgoing(outgoing_t *outgoing)
 {
   event_t *event;
-cp
+  cp();
   outgoing->timeout += 5;
   if(outgoing->timeout > maxtimeout)
     outgoing->timeout = maxtimeout;
@@ -223,13 +230,13 @@ cp
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), outgoing->timeout);
-cp
+  cp();
 }
 
 int setup_outgoing_socket(connection_t *c)
 {
   int option;
-cp
+  cp();
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
 
@@ -264,28 +271,28 @@ cp
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
-cp
+  cp();
   return 0;
 }
 
 
 void finish_connecting(connection_t *c)
 {
-cp
+  cp();
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
 
   c->last_ping_time = now;
 
   send_id(c);
-cp
+  cp();
 }
 
 void do_outgoing_connection(connection_t *c)
 {
   char *address, *port;
   int option, result, flags;
-cp
+  cp();
 begin:
   if(!c->outgoing->ai)
     {
@@ -382,14 +389,14 @@ begin:
 
   finish_connecting(c);
   return;
-cp
+  cp();
 }
 
 void setup_outgoing_connection(outgoing_t *outgoing)
 {
   connection_t *c;
   node_t *n;
-cp
+  cp();
   n = lookup_node(outgoing->name);
   
   if(n)
@@ -439,8 +446,10 @@ int handle_new_meta_connection(int sock)
   connection_t *c;
   sockaddr_t sa;
   int fd, len = sizeof(sa);
-cp
-  if((fd = accept(sock, &sa.sa, &len)) < 0)
+  cp();
+  fd = accept(sock, &sa.sa, &len);
+
+  if(fd < 0)
     {
       syslog(LOG_ERR, _("Accepting a new connection failed: %s"), strerror(errno));
       return -1;
@@ -466,7 +475,7 @@ cp
 
   c->allow_request = ID;
   send_id(c);
-cp
+  cp();
   return 0;
 }
 
@@ -475,7 +484,7 @@ void try_outgoing_connections(void)
   static config_t *cfg = NULL;
   char *name;
   outgoing_t *outgoing;
-cp
+  cp();
   for(cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg))
     {
       get_config_string(cfg, &name);