projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use SOL_IP and SOL_IPV6.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
9b752fa
..
38b3ccf
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,6
+1,6
@@
/*
connection.c -- connection list management
/*
connection.c -- connection list management
- Copyright (C) 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-201
6
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2008 Max Rijevski <maksuf@gmail.com>
2000-2005 Ivo Timmermans
2008 Max Rijevski <maksuf@gmail.com>
@@
-28,7
+28,7
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-avl_tree_t *connection_tree; /* Meta connections */
+avl_tree_t *connection_tree;
/* Meta connections */
connection_t *everyone;
static int connection_compare(const connection_t *a, const connection_t *b) {
connection_t *everyone;
static int connection_compare(const connection_t *a, const connection_t *b) {
@@
-52,8
+52,9
@@
connection_t *new_connection(void) {
c = xmalloc_and_zero(sizeof(connection_t));
c = xmalloc_and_zero(sizeof(connection_t));
- if(!c)
+ if(!c)
{
return NULL;
return NULL;
+ }
gettimeofday(&c->start, NULL);
gettimeofday(&c->start, NULL);
@@
-73,6
+74,15
@@
void free_connection_partially(connection_t *c) {
c->hischallenge = NULL;
c->outbuf = NULL;
c->hischallenge = NULL;
c->outbuf = NULL;
+ c->status.pinged = false;
+ c->status.active = false;
+ c->status.connecting = false;
+ c->status.timeout = false;
+ c->status.encryptout = false;
+ c->status.decryptin = false;
+ c->status.mst = false;
+
+ c->options = 0;
c->buflen = 0;
c->reqlen = 0;
c->tcplen = 0;
c->buflen = 0;
c->reqlen = 0;
c->tcplen = 0;
@@
-80,6
+90,10
@@
void free_connection_partially(connection_t *c) {
c->outbuflen = 0;
c->outbufsize = 0;
c->outbufstart = 0;
c->outbuflen = 0;
c->outbufsize = 0;
c->outbufstart = 0;
+ c->last_ping_time = 0;
+ c->last_flushed_time = 0;
+ c->inbudget = 0;
+ c->outbudget = 0;
if(c->inctx) {
EVP_CIPHER_CTX_cleanup(c->inctx);
if(c->inctx) {
EVP_CIPHER_CTX_cleanup(c->inctx);
@@
-105,8
+119,9
@@
void free_connection(connection_t *c) {
free(c->name);
free(c->hostname);
free(c->name);
free(c->hostname);
- if(c->config_tree)
+ if(c->config_tree)
{
exit_configuration(&c->config_tree);
exit_configuration(&c->config_tree);
+ }
free(c);
}
free(c);
}
@@
-128,8
+143,8
@@
void dump_connections(void) {
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d",
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d",
-
c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status
),
-
c->outbufsize, c->outbufstart, c->outbuflen);
+
c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof(c->status)
),
+ c->outbufsize, c->outbufstart, c->outbuflen);
}
logger(LOG_DEBUG, "End of connections.");
}
logger(LOG_DEBUG, "End of connections.");