- Updated subnet list handling. Subnets are added to two lists now, the

[tinc] / src / connlist.c

diff --git a/src/connlist.c b/src/connlist.c
index 9da2d6d..ebb276e 100644 (file)
--- a/src/connlist.c
+++ b/src/connlist.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: connlist.c,v 1.1.2.7 2000/10/20 15:34:34 guus Exp $
+    $Id: connlist.c,v 1.1.2.9 2000/10/28 16:41:37 guus Exp $
 */
 
 #include <syslog.h>
@@ -153,39 +153,6 @@ cp
   return p;
 }
 
-conn_list_t *lookup_conn_list_mac(mac_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_mac(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_ipv4(ipv4_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_ipv4(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_ipv6(ipv6_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_ipv6(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
 /* Debugging */
 
 void dump_conn_list(void)
@@ -196,11 +163,23 @@ void dump_conn_list(void)
 cp
   syslog(LOG_DEBUG, _("Connection list:"));
 
+  syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"),
+        myself->name, myself->hostname, myself->port, myself->flags,
+        myself->socket, myself->meta_socket, myself->status);
+
+  for(s = myself->subnets; s != NULL; s = s->next)
+    {
+      netstr = net2str(s);
+      syslog(LOG_DEBUG, ": %s", netstr);
+      free(netstr);
+    }
+
   for(p = conn_list; p != NULL; p = p->next)
     {
       syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"),
             p->name, p->hostname, p->port, p->flags,
             p->socket, p->meta_socket, p->status);
+
       for(s = p->subnets; s != NULL; s = s->next)
         {
           netstr = net2str(s);