projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't include netutl.h.
[tinc]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
d606e9c
..
f7f6500
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.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: connection.c,v 1.1.2.
19 2001/10/10 20:35:10 guus
Exp $
+ $Id: connection.c,v 1.1.2.
26 2001/11/16 12:20:44 zarq
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-25,12
+25,12
@@
#include <stdio.h>
#include <syslog.h>
#include <string.h>
#include <stdio.h>
#include <syslog.h>
#include <string.h>
+#include <sys/time.h>
#include <avl_tree.h>
#include <list.h>
#include "net.h" /* Don't ask. */
#include <avl_tree.h>
#include <list.h>
#include "net.h" /* Don't ask. */
-#include "netutl.h"
#include "config.h"
#include "conf.h"
#include <utils.h>
#include "config.h"
#include "conf.h"
#include <utils.h>
@@
-53,7
+53,7
@@
cp
cp
}
cp
}
-void exit_connection(void)
+void exit_connection
s
(void)
{
cp
avl_delete_tree(connection_tree);
{
cp
avl_delete_tree(connection_tree);
@@
-62,8
+62,16
@@
cp
connection_t *new_connection(void)
{
connection_t *new_connection(void)
{
+ connection_t *c;
cp
cp
- return (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+ c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+
+ if(!c)
+ return NULL;
+
+ gettimeofday(&c->start, NULL);
+cp
+ return c;
}
void free_connection(connection_t *c)
}
void free_connection(connection_t *c)
@@
-71,8
+79,6
@@
void free_connection(connection_t *c)
cp
if(c->hostname)
free(c->hostname);
cp
if(c->hostname)
free(c->hostname);
- if(c->rsa_key)
- RSA_free(c->rsa_key);
if(c->inkey)
free(c->inkey);
if(c->outkey)
if(c->inkey)
free(c->inkey);
if(c->outkey)
@@
-99,12
+105,11
@@
cp
cp
}
cp
}
-connection_t *lookup_connection(
ipv4_t address, short unsigned int port
)
+connection_t *lookup_connection(
struct addrinfo *address
)
{
connection_t c;
cp
c.address = address;
{
connection_t c;
cp
c.address = address;
- c.port = port;
return avl_search(connection_tree, &c);
}
return avl_search(connection_tree, &c);
}
@@
-120,10
+125,22
@@
cp
{
c = (connection_t *)node->data;
syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
{
c = (connection_t *)node->data;
syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
- c->n
ode->n
ame, c->hostname, c->port, c->options,
+ c->name, c->hostname, c->port, c->options,
c->socket, c->status);
}
syslog(LOG_DEBUG, _("End of connections."));
cp
}
c->socket, c->status);
}
syslog(LOG_DEBUG, _("End of connections."));
cp
}
+
+int read_connection_config(connection_t *c)
+{
+ char *fname;
+ int x;
+cp
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ x = read_config_file(c->config_tree, fname);
+ free(fname);
+cp
+ return x;
+}