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.4 2000/10/15 00:59:34 guus Exp $
+ $Id: connlist.c,v 1.1.2.15 2000/11/04 22:57:30 guus Exp $
*/
+#include "config.h"
+
+#include <stdio.h>
#include <syslog.h>
#include "net.h" /* Don't ask. */
+#include "netutl.h"
#include "config.h"
#include "conf.h"
#include <utils.h>
+#include "xalloc.h"
#include "system.h"
/* Root of the connection list */
free(p->name);
if(p->hostname)
free(p->hostname);
- if(p->public_key)
- RSA_free(p->public_key);
+ if(p->rsa_key)
+ RSA_free(p->rsa_key);
if(p->cipher_pktkey)
free(p->cipher_pktkey);
if(p->buffer)
free(p->buffer);
+ if(p->config)
+ clear_config(&p->config);
free(p);
cp
}
next = p->next;
if(p->status.remove)
- {
- if(prev)
- prev->next = next;
- else
- conn_list = next;
-
- free_conn_list(p);
- }
+ conn_list_del(p);
else
prev = p;
cp
cl->next = conn_list;
cl->prev = NULL;
- cl->next->prev = cl;
+
+ if(cl->next)
+ cl->next->prev = cl;
+
conn_list = cl;
cp
}
else
conn_list = cl->next;
- cl->next->prev = cl->prev;
+ if(cl->next)
+ cl->next->prev = cl->prev;
+
free_conn_list(cl);
cp
}
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(strcmp(name, p->name) == 0)
- break;
-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;
+ if(p->status.active)
+ if(strcmp(name, p->name) == 0)
+ break;
cp
return p;
}
void dump_conn_list(void)
{
conn_list_t *p;
- subnet_t *s;
- char *netstr;
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(p = conn_list; p != NULL; p = p->next)
{
- syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"),
+ 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);
- syslog(LOG_DEBUG, ": %s", netstr);
- free(netstr);
- }
}
syslog(LOG_DEBUG, _("End of connection list."));