X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=93be1cbc418aa418755b94bb7e4ab845a0e8d12e;hp=c7e8b8573cab6dcbb9eef3d03e79bfe92cc80f84;hb=fdc6a2f106315cd9ed22943d8c0bd279631e66b4;hpb=c5737583c8a5d099a71174e1eb997e0972ae03e9

diff --git a/src/net.c b/src/net.c
index c7e8b857..93be1cbc 100644
--- 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.17 2000/06/30 12:41:05 guus Exp $
+    $Id: net.c,v 1.35.4.21 2000/08/07 14:52:15 guus Exp $
 */
 
 #include "config.h"
@@ -107,16 +107,19 @@ cp
     syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
            ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
 
+  total_socket_out += r;
+
+  cl->want_ping = 1;
+
+  if((cl->flags | myself->flags) & TCPONLY)
+      return send_tcppacket(cl, packet, ntohs(rp.len));
+
   if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
              cl->vpn_hostname, cl->real_hostname);
       return -1;
     }
-
-  total_socket_out += r;
-
-  cl->want_ping = 1;
 cp
   return 0;
 }
@@ -531,7 +534,8 @@ cp
       return -1;
     }
 
-  syslog(LOG_INFO, _("Connected to %s port %hd"),
+  if(debug_lvl > 0)
+    syslog(LOG_INFO, _("Connected to %s port %hd"),
          cl->real_hostname, cl->port);
 cp
   return 0;
@@ -544,13 +548,20 @@ cp
   an authentication sequence during which
   we will do just that.
 */
-int setup_outgoing_connection(ip_t ip)
+int setup_outgoing_connection(char *hostname)
 {
   conn_list_t *ncn;
+  struct hostent *h;
 cp
+  if(!(h = gethostbyname(hostname)))
+    {
+      syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+      return -1;
+    }
+
   ncn = new_conn_list();
-  ncn->real_ip = ip;
-  ncn->real_hostname = hostlookup(htonl(ip));
+  ncn->real_ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
+  ncn->real_hostname = hostlookup(htonl(ncn->real_ip));
   
   if(setup_outgoing_meta_socket(ncn) < 0)
     {
@@ -598,6 +609,10 @@ cp
     if(cfg->data.val == stupid_true)
       myself->flags |= EXPORTINDIRECTDATA;
 
+  if(cfg = get_config_val(tcponly))
+    if(cfg->data.val == stupid_true)
+      myself->flags |= TCPONLY;
+
   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening socket"));
@@ -627,7 +642,7 @@ cp
 
   while(cfg)
     {
-      if(!setup_outgoing_connection(cfg->data.ip->ip))   /* function returns 0 when there are no problems */
+      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         {
           signal(SIGALRM, SIG_IGN);
           return;
@@ -670,7 +685,7 @@ cp
 
   while(cfg)
     {
-      if(!setup_outgoing_connection(cfg->data.ip->ip))   /* function returns 0 when there are no problems */
+      if(!setup_outgoing_connection(cfg->data.ptr))   /* function returns 0 when there are no problems */
         return 0;
       cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
     }