projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More missing IPv6 definitions and autoconf checks to make sure it compiles
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
a20de41
..
fa798f8
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-17,7
+17,7
@@
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: net.c,v 1.35.4.18
5 2003/04/19 11:12:45
guus Exp $
+ $Id: net.c,v 1.35.4.18
9 2003/07/06 23:16:28
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-31,7
+31,7
@@
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <sys
log
.h>
+#include <sys
/stat
.h>
#include <unistd.h>
#include <sys/ioctl.h>
/* SunOS really wants sys/socket.h BEFORE net/if.h,
#include <unistd.h>
#include <sys/ioctl.h>
/* SunOS really wants sys/socket.h BEFORE net/if.h,
@@
-70,13
+70,10
@@
#include "route.h"
#include "device.h"
#include "event.h"
#include "route.h"
#include "device.h"
#include "event.h"
+#include "logger.h"
#include "system.h"
#include "system.h"
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
-
int do_purge = 0;
int sighup = 0;
int sigalrm = 0;
int do_purge = 0;
int sighup = 0;
int sigalrm = 0;
@@
-85,7
+82,7
@@
time_t now = 0;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
/* Purge edges and subnets of unreachable nodes. Use carefully. */
-void purge(void)
+
static
void purge(void)
{
avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
{
avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
@@
-94,16
+91,14
@@
void purge(void)
cp();
cp();
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_DEBUG, _("Purging unreachable nodes"));
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, _("Purging unreachable nodes"));
for(nnode = node_tree->head; nnode; nnode = nnext) {
nnext = nnode->next;
n = (node_t *) nnode->data;
if(!n->status.reachable) {
for(nnode = node_tree->head; nnode; nnode = nnext) {
nnext = nnode->next;
n = (node_t *) nnode->data;
if(!n->status.reachable) {
- if(debug_lvl >= DEBUG_SCARY_THINGS)
- syslog(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
+ logger(DEBUG_SCARY_THINGS, 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) {
@@
-129,7
+124,7
@@
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.
*/
-int build_fdset(fd_set * fs)
+
static
int build_fdset(fd_set * fs)
{
avl_node_t *node, *next;
connection_t *c;
{
avl_node_t *node, *next;
connection_t *c;
@@
-184,8
+179,7
@@
void terminate_connection(connection_t *c, int report)
if(c->status.remove)
return;
if(c->status.remove)
return;
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ logger(DEBUG_CONNECTIONS, LOG_NOTICE, _("Closing connection with %s (%s)"),
c->name, c->hostname);
c->status.remove = 1;
c->name, c->hostname);
c->status.remove = 1;
@@
-224,7
+218,7
@@
void terminate_connection(connection_t *c, int 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.
*/
-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;
@@
-238,8
+232,7
@@
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) {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
+ logger(DEBUG_CONNECTIONS, LOG_INFO, _("%s (%s) didn't respond to PING"),
c->name, c->hostname);
c->status.timeout = 1;
terminate_connection(c, 1);
c->name, c->hostname);
c->status.timeout = 1;
terminate_connection(c, 1);
@@
-248,13
+241,12
@@
void check_dead_connections(void)
}
} else {
if(c->status.remove) {
}
} else {
if(c->status.remove) {
-
syslog(
LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
+
logger(DEBUG_ALWAYS,
LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
c->name, c->hostname, c->status);
connection_del(c);
continue;
}
c->name, c->hostname, c->status);
connection_del(c);
continue;
}
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+ logger(DEBUG_CONNECTIONS, LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
terminate_connection(c, 0);
}
c->name, c->hostname);
terminate_connection(c, 0);
}
@@
-266,7
+258,7
@@
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
*/
-void check_network_activity(fd_set * f)
+
static
void check_network_activity(fd_set * f)
{
connection_t *c;
avl_node_t *node;
{
connection_t *c;
avl_node_t *node;
@@
-295,8
+287,7
@@
void check_network_activity(fd_set * f)
if(!result)
finish_connecting(c);
else {
if(!result)
finish_connecting(c);
else {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_DEBUG,
+ logger(DEBUG_CONNECTIONS, LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
close(c->socket);
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
close(c->socket);
@@
-350,7
+341,7
@@
void main_loop(void)
if(r < 0) {
if(errno != EINTR && errno != EAGAIN) {
if(r < 0) {
if(errno != EINTR && errno != EAGAIN) {
-
syslog(
LOG_ERR, _("Error while waiting for input: %s"),
+
logger(DEBUG_ALWAYS,
LOG_ERR, _("Error while waiting for input: %s"),
strerror(errno));
cp_trace();
dump_connections();
strerror(errno));
cp_trace();
dump_connections();
@@
-381,10
+372,10
@@
void main_loop(void)
/* Should we regenerate our key? */
if(keyexpires < now) {
/* Should we regenerate our key? */
if(keyexpires < now) {
- if(debug_lvl >= DEBUG_STATUS)
- syslog(LOG_INFO, _("Regenerating symmetric key"));
+ logger(DEBUG_STATUS, LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes(myself->key, myself->keylength);
RAND_pseudo_bytes(myself->key, myself->keylength);
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
@@
-397,7
+388,7
@@
void main_loop(void)
}
if(sigalrm) {
}
if(sigalrm) {
-
syslog(
LOG_INFO, _("Flushing event queue"));
+
logger(DEBUG_ALWAYS,
LOG_INFO, _("Flushing event queue"));
while(event_tree->head) {
event = (event_t *) event_tree->head->data;
while(event_tree->head) {
event = (event_t *) event_tree->head->data;
@@
-421,7
+412,7
@@
void main_loop(void)
init_configuration(&config_tree);
if(read_server_config()) {
init_configuration(&config_tree);
if(read_server_config()) {
-
syslog(
LOG_ERR, _("Unable to reread configuration file, exitting."));
+
logger(DEBUG_ALWAYS,
LOG_ERR, _("Unable to reread configuration file, exitting."));
exit(1);
}
exit(1);
}