- Fixing little things

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 0e251be..e9d6ecb 100644 (file)
--- a/src/net.c
+++ b/src/net.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.c,v 1.35.4.36 2000/10/15 00:59:34 guus Exp $
+    $Id: net.c,v 1.35.4.39 2000/10/16 16:33:29 guus Exp $
 */
 
 #include "config.h"
@@ -37,9 +37,10 @@
 #include <syslog.h>
 #include <unistd.h>
 
-/* Next two includes are for tun/tap support */
+#ifdef HAVE_TUNTAP
 #include <net/if.h>
-#include "/usr/src/linux/include/linux/if_tun.h"
+#include LINUX_IF_TUN_H
+#endif
 
 #include <utils.h>
 #include <xalloc.h>
@@ -332,12 +333,19 @@ int setup_tap_fd(void)
   int nfd;
   const char *tapfname;
   config_t const *cfg;
+
+#ifdef HAVE_TUNTAP
   struct ifreq ifr;
+#endif
 cp  
   if((cfg = get_config_val(config, tapdevice)))
     tapfname = cfg->data.ptr;
   else
+#ifdef HAVE_TUNTAP
     tapfname = "/dev/misc/net/tun";
+#else
+    tapfname = "/dev/tap0";
+#endif
 cp
   if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
     {
@@ -347,8 +355,8 @@ cp
 cp
   tap_fd = nfd;
 
+#ifdef HAVE_TUNTAP
   /* Ok now check if this is an old ethertap or a new tun/tap thingie */
-  
   memset(&ifr, 0, sizeof(ifr));
 cp
   ifr.ifr_flags = IFF_TAP;
@@ -363,6 +371,7 @@ cp
     else
       /* Setup inetaddr/netmask etc */;
   }
+#endif
   
 cp
   return 0;
@@ -526,6 +535,8 @@ cp
   if(debug_lvl > 0)
     syslog(LOG_INFO, _("Connected to %s port %hd"),
          cl->hostname, cl->port);
+
+  cl->status.meta = 1;
 cp
   return 0;
 }
@@ -537,18 +548,42 @@ cp
   an authentication sequence during which
   we will do just that.
 */
-int setup_outgoing_connection(char *hostname)
+int setup_outgoing_connection(char *name)
 {
   conn_list_t *ncn;
   struct hostent *h;
+  config_t *cfg;
 cp
-  if(!(h = gethostbyname(hostname)))
+  if(check_id(name))
     {
-      syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+      syslog(LOG_ERR, _("Invalid name for outgoing connection"));
       return -1;
     }
 
   ncn = new_conn_list();
+  asprintf(&ncn->name, "%s", name);
+    
+  if(read_host_config(ncn))
+    {
+      syslog(LOG_ERR, _("Error reading host configuration file for %s"));
+      free_conn_list(ncn);
+      return -1;
+    }
+    
+  if(!(cfg = get_config_val(ncn->config, address)))
+    {
+      syslog(LOG_ERR, _("No address specified for %s"));
+      free_conn_list(ncn);
+      return -1;
+    }
+    
+  if(!(h = gethostbyname(cfg->data.ptr)))
+    {
+      syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
+      free_conn_list(ncn);
+      return -1;
+    }
+
   ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
   ncn->hostname = hostlookup(htonl(ncn->address));
   
@@ -560,10 +595,15 @@ cp
       return -1;
     }
 
-  ncn->status.meta = 1;
   ncn->status.outgoing = 1;
-  ncn->next = conn_list;
-  conn_list = ncn;
+  ncn->buffer = xmalloc(MAXBUFSIZE);
+  ncn->buflen = 0;
+  ncn->last_ping_time = time(NULL);
+  ncn->want_ping = 0;
+
+  conn_list_add(ncn);
+
+  send_id(ncn);
 cp
   return 0;
 }
@@ -587,7 +627,7 @@ cp
       return -1;
     }
   else
-    myself->name = (char*)cfg->data.val;
+    asprintf(&myself->name, "%s", (char*)cfg->data.val);
 
   if(check_id(myself->name))
     {
@@ -639,9 +679,12 @@ sigalrm_handler(int a)
 {
   config_t const *cfg;
 cp
-/* FIXME! Use name instead of upstreamip.
-  cfg = get_next_config_val(config, upstreamip, upstreamindex++);
-*/
+  cfg = get_next_config_val(config, connectto, upstreamindex++);
+
+  if(!upstreamindex && !cfg)
+    /* No upstream IP given, we're listen only. */
+    return;
+
   while(cfg)
     {
       if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
@@ -649,7 +692,7 @@ cp
           signal(SIGALRM, SIG_IGN);
           return;
         }
-//      cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+      cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
 
   signal(SIGALRM, sigalrm_handler);
@@ -681,7 +724,7 @@ cp
   if(setup_myself() < 0)
     return -1;
 
-//  if((cfg = get_next_config_val(config, upstreamip, upstreamindex++)) == NULL)
+  if((cfg = get_next_config_val(config, connectto, upstreamindex++)) == NULL)
     /* No upstream IP given, we're listen only. */
     return 0;
 
@@ -689,7 +732,7 @@ cp
     {
       if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         return 0;
-//      cfg = get_next_config_val(config, upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+      cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
     }
     
   signal(SIGALRM, sigalrm_handler);
@@ -813,11 +856,7 @@ cp
     syslog(LOG_NOTICE, _("Connection from %s port %d"),
          p->hostname, htons(ci.sin_port));
 
-  if(send_id(p) < 0)
-    {
-      free_conn_list(p);
-      return NULL;
-    }
+  p->allow_request = ID;
 cp
   return p;
 }