projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove code duplication when checking ADD_EDGE/DEL_EDGE messages.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
8af464b
..
3197036
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-2,6
+2,7
@@
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
2000-2009 Guus Sliepen <guus@tinc-vpn.org>
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2006 Scott Lamb <slamb@slamb.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
@@
-46,16
+47,13
@@
time_t now = 0;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
/* Purge edges and subnets of unreachable nodes. Use carefully. */
-static void purge(void)
-{
+static void purge(void) {
avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
edge_t *e;
subnet_t *s;
avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
edge_t *e;
subnet_t *s;
- cp();
-
- ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
+ ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
/* Remove all edges and subnets owned by unreachable nodes. */
/* Remove all edges and subnets owned by unreachable nodes. */
@@
-64,7
+62,7
@@
static void purge(void)
n = nnode->data;
if(!n->status.reachable) {
n = nnode->data;
if(!n->status.reachable) {
- ifdebug(SCARY_THINGS) logger(LOG_DEBUG,
_("Purging node %s (%s)")
, n->name,
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG,
"Purging node %s (%s)"
, n->name,
n->hostname);
for(snode = n->subnet_tree->head; snode; snode = snext) {
n->hostname);
for(snode = n->subnet_tree->head; snode; snode = snext) {
@@
-110,14
+108,11
@@
static void purge(void)
put all file descriptors in an fd_set array
While we're at it, purge stuff that needs to be removed.
*/
put all file descriptors in an fd_set array
While we're at it, purge stuff that needs to be removed.
*/
-static int build_fdset(fd_set *readset, fd_set *writeset)
-{
+static int build_fdset(fd_set *readset, fd_set *writeset) {
avl_node_t *node, *next;
connection_t *c;
int i, max = 0;
avl_node_t *node, *next;
connection_t *c;
int i, max = 0;
- cp();
-
FD_ZERO(readset);
FD_ZERO(writeset);
FD_ZERO(readset);
FD_ZERO(writeset);
@@
-162,14
+157,11
@@
static int build_fdset(fd_set *readset, fd_set *writeset)
- Check if we need to retry making an outgoing connection
- Deactivate the host
*/
- Check if we need to retry making an outgoing connection
- Deactivate the host
*/
-void terminate_connection(connection_t *c, bool report)
-{
- cp();
-
+void terminate_connection(connection_t *c, bool report) {
if(c->status.remove)
return;
if(c->status.remove)
return;
- ifdebug(CONNECTIONS) logger(LOG_NOTICE,
_("Closing connection with %s (%s)")
,
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE,
"Closing connection with %s (%s)"
,
c->name, c->hostname);
c->status.remove = true;
c->name, c->hostname);
c->status.remove = true;
@@
-226,13
+218,10
@@
void terminate_connection(connection_t *c, bool report)
end does not reply in time, we consider them dead
and close the connection.
*/
end does not reply in time, we consider them dead
and close the connection.
*/
-static void check_dead_connections(void)
-{
+static void check_dead_connections(void) {
avl_node_t *node, *next;
connection_t *c;
avl_node_t *node, *next;
connection_t *c;
- cp();
-
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
@@
-240,7
+229,7
@@
static void check_dead_connections(void)
if(c->last_ping_time + pingtimeout < now) {
if(c->status.active) {
if(c->status.pinged) {
if(c->last_ping_time + pingtimeout < now) {
if(c->status.active) {
if(c->status.pinged) {
- ifdebug(CONNECTIONS) logger(LOG_INFO,
_("%s (%s) didn't respond to PING in %ld seconds")
,
+ ifdebug(CONNECTIONS) logger(LOG_INFO,
"%s (%s) didn't respond to PING in %ld seconds"
,
c->name, c->hostname, now - c->last_ping_time);
c->status.timeout = true;
terminate_connection(c, true);
c->name, c->hostname, now - c->last_ping_time);
c->status.timeout = true;
terminate_connection(c, true);
@@
-249,12
+238,12
@@
static void check_dead_connections(void)
}
} else {
if(c->status.remove) {
}
} else {
if(c->status.remove) {
- logger(LOG_WARNING,
_("Old connection_t for %s (%s) status %04x still lingering, deleting...")
,
+ logger(LOG_WARNING,
"Old connection_t for %s (%s) status %04x still lingering, deleting..."
,
c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
connection_del(c);
continue;
}
c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
connection_del(c);
continue;
}
- ifdebug(CONNECTIONS) logger(LOG_WARNING,
_("Timeout from %s (%s) during authentication")
,
+ ifdebug(CONNECTIONS) logger(LOG_WARNING,
"Timeout from %s (%s) during authentication"
,
c->name, c->hostname);
if(c->status.connecting) {
c->status.connecting = false;
c->name, c->hostname);
if(c->status.connecting) {
c->status.connecting = false;
@@
-269,7
+258,7
@@
static void check_dead_connections(void)
if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
if(c->status.active) {
ifdebug(CONNECTIONS) logger(LOG_INFO,
if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
if(c->status.active) {
ifdebug(CONNECTIONS) logger(LOG_INFO,
-
_("%s (%s) could not flush for %ld seconds (%d bytes remaining)")
,
+
"%s (%s) could not flush for %ld seconds (%d bytes remaining)"
,
c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
c->status.timeout = true;
terminate_connection(c, true);
c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
c->status.timeout = true;
terminate_connection(c, true);
@@
-282,16
+271,13
@@
static void check_dead_connections(void)
check all connections to see if anything
happened on their sockets
*/
check all connections to see if anything
happened on their sockets
*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
-{
+static void check_network_activity(fd_set * readset, fd_set * writeset) {
connection_t *c;
avl_node_t *node;
int result, i;
socklen_t len = sizeof(result);
vpn_packet_t packet;
connection_t *c;
avl_node_t *node;
int result, i;
socklen_t len = sizeof(result);
vpn_packet_t packet;
- cp();
-
/* check input from kernel */
if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
if(read_packet(&packet)) {
/* check input from kernel */
if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
if(read_packet(&packet)) {
@@
-316,7
+302,7
@@
static void check_network_activity(fd_set * readset, fd_set * writeset)
finish_connecting(c);
else {
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
finish_connecting(c);
else {
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-
_("Error while connecting to %s (%s): %s")
,
+
"Error while connecting to %s (%s): %s"
,
c->name, c->hostname, strerror(result));
closesocket(c->socket);
do_outgoing_connection(c);
c->name, c->hostname, strerror(result));
closesocket(c->socket);
do_outgoing_connection(c);
@@
-350,16
+336,13
@@
static void check_network_activity(fd_set * readset, fd_set * writeset)
/*
this is where it all happens...
*/
/*
this is where it all happens...
*/
-int main_loop(void)
-{
+int main_loop(void) {
fd_set readset, writeset;
struct timeval tv;
int r, maxfd;
time_t last_ping_check, last_config_check, last_graph_dump;
event_t *event;
fd_set readset, writeset;
struct timeval tv;
int r, maxfd;
time_t last_ping_check, last_config_check, last_graph_dump;
event_t *event;
- cp();
-
last_ping_check = now;
last_config_check = now;
last_graph_dump = now;
last_ping_check = now;
last_config_check = now;
last_graph_dump = now;
@@
-387,9
+370,8
@@
int main_loop(void)
if(r < 0) {
if(errno != EINTR && errno != EAGAIN) {
if(r < 0) {
if(errno != EINTR && errno != EAGAIN) {
- logger(LOG_ERR,
_("Error while waiting for input: %s")
,
+ logger(LOG_ERR,
"Error while waiting for input: %s"
,
strerror(errno));
strerror(errno));
- cp_trace();
dump_connections();
return 1;
}
dump_connections();
return 1;
}
@@
-421,7
+403,7
@@
int main_loop(void)
avl_node_t *node;
node_t *n;
avl_node_t *node;
node_t *n;
- ifdebug(STATUS) logger(LOG_INFO,
_("Expiring symmetric keys")
);
+ ifdebug(STATUS) logger(LOG_INFO,
"Expiring symmetric keys"
);
for(node = node_tree->head; node; node = node->next) {
n = node->data;
for(node = node_tree->head; node; node = node->next) {
n = node->data;
@@
-437,7
+419,7
@@
int main_loop(void)
}
if(sigalrm) {
}
if(sigalrm) {
- logger(LOG_INFO,
_("Flushing event queue")
);
+ logger(LOG_INFO,
"Flushing event queue"
);
expire_events();
sigalrm = false;
}
expire_events();
sigalrm = false;
}
@@
-461,7
+443,7
@@
int main_loop(void)
init_configuration(&config_tree);
if(!read_server_config()) {
init_configuration(&config_tree);
if(!read_server_config()) {
- logger(LOG_ERR,
_("Unable to reread configuration file, exitting.")
);
+ logger(LOG_ERR,
"Unable to reread configuration file, exitting."
);
return 1;
}
return 1;
}