projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Added balanced tree management stuff as well. (It is not finished yet.)
[tinc]
/
src
/
connlist.c
diff --git
a/src/connlist.c
b/src/connlist.c
index
ebb276e
..
5d41dcb
100644
(file)
--- a/
src/connlist.c
+++ b/
src/connlist.c
@@
-17,16
+17,21
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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.
9 2000/10/28 16:41:37
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 <syslog.h>
#include "net.h" /* Don't ask. */
+#include "netutl.h"
#include "config.h"
#include "conf.h"
#include <utils.h>
#include "config.h"
#include "conf.h"
#include <utils.h>
+#include "xalloc.h"
#include "system.h"
/* Root of the connection list */
#include "system.h"
/* Root of the connection list */
@@
-63,6
+68,8
@@
cp
free(p->cipher_pktkey);
if(p->buffer)
free(p->buffer);
free(p->cipher_pktkey);
if(p->buffer)
free(p->buffer);
+ if(p->config)
+ clear_config(&p->config);
free(p);
cp
}
free(p);
cp
}
@@
-79,14
+86,7
@@
cp
next = p->next;
if(p->status.remove)
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;
else
prev = p;
@@
-120,8
+120,10
@@
void conn_list_add(conn_list_t *cl)
cp
cl->next = conn_list;
cl->prev = NULL;
cp
cl->next = conn_list;
cl->prev = NULL;
+
if(cl->next)
cl->next->prev = cl;
if(cl->next)
cl->next->prev = cl;
+
conn_list = cl;
cp
}
conn_list = cl;
cp
}
@@
-134,7
+136,9
@@
cp
else
conn_list = cl->next;
else
conn_list = cl->next;
- cl->next->prev = cl->prev;
+ if(cl->next)
+ cl->next->prev = cl->prev;
+
free_conn_list(cl);
cp
}
free_conn_list(cl);
cp
}
@@
-158,34
+162,18
@@
cp
void dump_conn_list(void)
{
conn_list_t *p;
void dump_conn_list(void)
{
conn_list_t *p;
- subnet_t *s;
- char *netstr;
cp
syslog(LOG_DEBUG, _("Connection list:"));
cp
syslog(LOG_DEBUG, _("Connection list:"));
- 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"),
myself->name, myself->hostname, myself->port, myself->flags,
myself->socket, myself->meta_socket, myself->status);
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)
{
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);
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."));
}
syslog(LOG_DEBUG, _("End of connection list."));