X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=e255cdde3dcede9f386a6f3f74184640e069c2c5;hp=b0d3cd1ebd94ff4b4050be338b1591ed89b33a0e;hb=9cd9b0392388e24ade19a43206221081b61806e7;hpb=65247c063b36a76dd68156fe17b017c7460d982f

diff --git a/src/net.c b/src/net.c
index b0d3cd1e..e255cdde 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.109 2001/05/28 08:21:43 guus Exp $
+    $Id: net.c,v 1.35.4.113 2001/06/05 19:45:47 guus Exp $
 */
 
 #include "config.h"
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifndef HAVE_FREEBSD
+#ifdef HAVE_LINUX
  #include <netinet/ip.h>
  #include <netinet/tcp.h>
 #endif
@@ -104,8 +104,6 @@ static int seconds_till_retry;
 int keylifetime = 0;
 int keyexpires = 0;
 
-char *unknown = NULL;
-
 void send_udppacket(connection_t *cl, vpn_packet_t *inpkt)
 {
   vpn_packet_t outpkt;
@@ -182,6 +180,8 @@ cp
   outlen += outpad;
   outpkt.len = outlen - sizeof(outpkt.salt);
 
+  total_socket_in += outlen;
+
   receive_packet(cl, &outpkt);
 cp
 }
@@ -261,6 +261,26 @@ cp
     send_udppacket(cl, packet);
 }
 
+/* Broadcast a packet to all active connections */
+
+void broadcast_packet(connection_t *from, vpn_packet_t *packet)
+{
+  avl_node_t *node;
+  connection_t *cl;
+cp
+  if(debug_lvl >= DEBUG_TRAFFIC)
+    syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+	   packet->len, from->name, from->hostname);
+
+  for(node = connection_tree->head; node; node = node->next)
+    {
+      cl = (connection_t *)node->data;
+      if(cl->status.meta && cl != from)
+        send_packet(cl, packet);
+    }
+cp
+}
+
 void flush_queue(connection_t *cl)
 {
   list_node_t *node, *next;
@@ -385,7 +405,7 @@ cp
   option = 1;
   setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
   setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
-#ifndef HAVE_FREEBSD
+#ifdef HAVE_LINUX
   setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
 
   option = IPTOS_LOWDELAY;
@@ -515,7 +535,7 @@ cp
 
   option = 1;
   setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
-#ifndef HAVE_FREEBSD
+#ifdef HAVE_LINUX
   setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
 
   option = IPTOS_LOWDELAY;
@@ -731,7 +751,7 @@ int setup_myself(void)
 cp
   myself = new_connection();
 
-  asprintf(&myself->hostname, "MYSELF");
+  asprintf(&myself->hostname, _("MYSELF"));
   myself->options = 0;
   myself->protocol_version = PROT_CURRENT;
 
@@ -774,14 +794,6 @@ cp
   else
     myself->port = cfg->data.val;
 
-  if((cfg = get_config_val(myself->config, config_indirectdata)))
-    if(cfg->data.val == stupid_true)
-      myself->options |= OPTION_INDIRECT;
-
-  if((cfg = get_config_val(myself->config, config_tcponly)))
-    if(cfg->data.val == stupid_true)
-      myself->options |= OPTION_TCPONLY;
-
 /* Read in all the subnets specified in the host configuration file */
 
   for(next = myself->config; (cfg = get_config_val(next, config_subnet)); next = cfg->next)
@@ -802,6 +814,48 @@ cp
       subnet_add(myself, net);
     }
 
+cp
+  /* Check some options */
+
+  if((cfg = get_config_val(config, config_indirectdata)))
+    if(cfg->data.val == stupid_true)
+      myself->options |= OPTION_INDIRECT;
+
+  if((cfg = get_config_val(config, config_tcponly)))
+    if(cfg->data.val == stupid_true)
+      myself->options |= OPTION_TCPONLY;
+
+  if((cfg = get_config_val(myself->config, config_indirectdata)))
+    if(cfg->data.val == stupid_true)
+      myself->options |= OPTION_INDIRECT;
+
+  if((cfg = get_config_val(myself->config, config_tcponly)))
+    if(cfg->data.val == stupid_true)
+      myself->options |= OPTION_TCPONLY;
+
+  if(myself->options & OPTION_TCPONLY)
+    myself->options |= OPTION_INDIRECT;
+
+  if((cfg = get_config_val(config, config_mode)))
+    {
+      if(!strcasecmp(cfg->data.ptr, "router"))
+        routing_mode = RMODE_ROUTER;
+      else if (!strcasecmp(cfg->data.ptr, "switch"))
+        routing_mode = RMODE_SWITCH;
+      else if (!strcasecmp(cfg->data.ptr, "hub"))
+        routing_mode = RMODE_HUB;
+      else
+        {
+          syslog(LOG_ERR, _("Invalid routing mode!"));
+          return -1;
+        }
+    }
+  else
+    routing_mode = RMODE_ROUTER;
+
+cp
+  /* Open sockets */
+  
   if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
     {
       syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
@@ -830,22 +884,6 @@ cp
 
   keyexpires = time(NULL) + keylifetime;
 cp
-  /* Check some options */
-
-  if((cfg = get_config_val(config, config_indirectdata)))
-    {
-      if(cfg->data.val == stupid_true)
-        myself->options |= OPTION_INDIRECT;
-    }
-
-  if((cfg = get_config_val(config, config_tcponly)))
-    {
-      if(cfg->data.val == stupid_true)
-        myself->options |= OPTION_TCPONLY;
-    }
-
-  if(myself->options & OPTION_TCPONLY)
-    myself->options |= OPTION_INDIRECT;
 
   /* Activate ourselves */
 
@@ -1011,7 +1049,7 @@ cp
       return NULL;
     }
 
-  p->name = unknown;
+  asprintf(&p->name, _("UNKNOWN"));
   p->address = ntohl(ci.sin_addr.s_addr);
   p->hostname = hostlookup(ci.sin_addr.s_addr);
   p->port = htons(ci.sin_port);				/* This one will be overwritten later */