projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct size argument for strncat().
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
dbfe6d6
..
9e5d145
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
3 Guus Sliepen <guus@sliepen.eu
.org>,
- 2000-200
3 Ivo Timmermans <ivo@o2w.nl
>
+ Copyright (C) 2000-200
4 Guus Sliepen <guus@tinc-vpn
.org>,
+ 2000-200
4 Ivo Timmermans <ivo@tinc-vpn.org
>
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,32
+17,25
@@
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.39 2003/07/12 17:41:45 guus Exp
$
+ $Id$
*/
*/
-#include "config.h"
-
-#include <stdio.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 "conf.h"
-#include <utils.h>
#include "subnet.h"
#include "subnet.h"
-#include "logger.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;
-static int connection_compare(con
nection_t *a,
connection_t *b)
+static int connection_compare(con
st connection_t *a, const
connection_t *b)
{
return (void *)a - (void *)b;
}
{
return (void *)a - (void *)b;
}
@@
-51,7
+44,7
@@
void init_connections(void)
{
cp();
{
cp();
- connection_tree = avl_alloc_tree((avl_compare_t) connection_compare,
NULL
);
+ connection_tree = avl_alloc_tree((avl_compare_t) connection_compare,
(avl_action_t) free_connection
);
broadcast = new_connection();
broadcast->name = xstrdup(_("everyone"));
broadcast->hostname = xstrdup(_("BROADCAST"));
broadcast = new_connection();
broadcast->name = xstrdup(_("everyone"));
broadcast->hostname = xstrdup(_("BROADCAST"));
@@
-71,7
+64,7
@@
connection_t *new_connection(void)
cp();
cp();
- c =
(connection_t *)
xmalloc_and_zero(sizeof(connection_t));
+ c = xmalloc_and_zero(sizeof(connection_t));
if(!c)
return NULL;
if(!c)
return NULL;
@@
-127,15
+120,15
@@
void dump_connections(void)
logger(LOG_DEBUG, _("Connections:"));
for(node = connection_tree->head; node; node = node->next) {
logger(LOG_DEBUG, _("Connections:"));
for(node = connection_tree->head; node; node = node->next) {
- c =
(connection_t *)
node->data;
+ c = node->data;
logger(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,
*(uint32_t *)&
c->status);
}
logger(LOG_DEBUG, _("End of connections."));
}
}
logger(LOG_DEBUG, _("End of connections."));
}
-
int
read_connection_config(connection_t *c)
+
bool
read_connection_config(connection_t *c)
{
char *fname;
int x;
{
char *fname;
int x;
@@
-146,5
+139,5
@@
int read_connection_config(connection_t *c)
x = read_config_file(c->config_tree, fname);
free(fname);
x = read_config_file(c->config_tree, fname);
free(fname);
- return x;
+ return x
== 0
;
}
}