projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Option to specify pidfile location.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
089ff0d
..
9890f51
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,7
+1,7
@@
/*
connection.c -- connection list management
/*
connection.c -- connection list management
- Copyright (C) 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>,
- 2000-200
2
Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2000-200
3
Guus Sliepen <guus@sliepen.eu.org>,
+ 2000-200
3
Ivo Timmermans <ivo@o2w.nl>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,35
+17,27
@@
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: connection.c,v 1.1.2.
33 2002/09/09 21:24:31
guus Exp $
+ $Id: connection.c,v 1.1.2.
40 2003/07/17 15:06:26
guus Exp $
*/
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
+#include "avl_tree.h"
+#include "conf.h"
+#include "list.h"
+#include "logger.h"
#include "net.h" /* Don't ask. */
#include "netutl.h"
#include "net.h" /* Don't ask. */
#include "netutl.h"
-#include "config.h"
-#include "conf.h"
-#include <utils.h>
#include "subnet.h"
#include "subnet.h"
-
+#include "utils.h"
#include "xalloc.h"
#include "xalloc.h"
-#include "system.h"
avl_tree_t *connection_tree; /* Meta connections */
connection_t *broadcast;
avl_tree_t *connection_tree; /* Meta connections */
connection_t *broadcast;
-
int connection_compare(connection_t * a, connection_t *
b)
+
static int connection_compare(connection_t *a, connection_t *
b)
{
{
- return
a -
b;
+ return
(void *)a - (void *)
b;
}
void init_connections(void)
}
void init_connections(void)
@@
-82,7
+74,7
@@
connection_t *new_connection(void)
return c;
}
return c;
}
-void free_connection(connection_t *
c)
+void free_connection(connection_t *c)
{
cp();
{
cp();
@@
-104,14
+96,14
@@
void free_connection(connection_t * c)
free(c);
}
free(c);
}
-void connection_add(connection_t *
c)
+void connection_add(connection_t *c)
{
cp();
avl_insert(connection_tree, c);
}
{
cp();
avl_insert(connection_tree, c);
}
-void connection_del(connection_t *
c)
+void connection_del(connection_t *c)
{
cp();
{
cp();
@@
-125,18
+117,18
@@
void dump_connections(void)
cp();
cp();
-
syslog
(LOG_DEBUG, _("Connections:"));
+
logger
(LOG_DEBUG, _("Connections:"));
for(node = connection_tree->head; node; node = node->next) {
c = (connection_t *) node->data;
for(node = connection_tree->head; node; node = node->next) {
c = (connection_t *) node->data;
-
syslog
(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
+
logger
(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
c->name, c->hostname, c->options, c->socket, c->status);
}
c->name, c->hostname, c->options, c->socket, c->status);
}
-
syslog
(LOG_DEBUG, _("End of connections."));
+
logger
(LOG_DEBUG, _("End of connections."));
}
}
-int read_connection_config(connection_t *
c)
+int read_connection_config(connection_t *c)
{
char *fname;
int x;
{
char *fname;
int x;