projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Depends lines to reflect the dependencies on OpenSSL
[tinc]
/
src
/
connlist.c
diff --git
a/src/connlist.c
b/src/connlist.c
index
12a501f
..
f1b0eba
100644
(file)
--- a/
src/connlist.c
+++ b/
src/connlist.c
@@
-17,13
+17,17
@@
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: connlist.c,v 1.1.2.
1 2000/10/11 10:35:15
guus Exp $
+ $Id: connlist.c,v 1.1.2.
3 2000/10/14 17:04:13
guus Exp $
*/
*/
+#include <syslog.h>
+
+#include "net.h" /* Don't ask. */
#include "config.h"
#include "config.h"
+#include "conf.h"
#include <utils.h>
#include <utils.h>
-#include "
connlist
.h"
+#include "
system
.h"
/* Root of the connection list */
/* Root of the connection list */
@@
-34,7
+38,7
@@
conn_list_t *myself = NULL;
conn_list_t *new_conn_list(void)
{
conn_list_t *new_conn_list(void)
{
- conn_list_t *p = xmalloc(sizeof(*p));
+ conn_list_t *p =
(conn_list_t *)
xmalloc(sizeof(*p));
cp
/* initialise all those stupid pointers at once */
memset(p, '\0', sizeof(*p));
cp
/* initialise all those stupid pointers at once */
memset(p, '\0', sizeof(*p));
@@
-53,8
+57,10
@@
cp
free(p->name);
if(p->hostname)
free(p->hostname);
free(p->name);
if(p->hostname)
free(p->hostname);
- free_key(p->public_key);
- free_key(p->datakey);
+ if(p->public_key)
+ RSA_free(p->public_key);
+ if(p->cipher_pktkey)
+ free(p->cipher_pktkey);
free(p);
cp
}
free(p);
cp
}
@@
-77,7
+83,7
@@
cp
else
conn_list = next;
else
conn_list = next;
- free_conn_
elemen
t(p);
+ free_conn_
lis
t(p);
}
else
prev = p;
}
else
prev = p;
@@
-97,7
+103,7
@@
cp
for(p = conn_list; p != NULL; )
{
next = p->next;
for(p = conn_list; p != NULL; )
{
next = p->next;
- free_conn_
elemen
t(p);
+ free_conn_
lis
t(p);
p = next;
}
p = next;
}
@@
-110,10
+116,10
@@
cp
void conn_list_add(conn_list_t *cl)
{
cp
void conn_list_add(conn_list_t *cl)
{
cp
- cl->next = connlist;
+ cl->next = conn
_
list;
cl->prev = NULL;
cl->next->prev = cl;
cl->prev = NULL;
cl->next->prev = cl;
- connlist = cl;
+ conn
_
list = cl;
cp
}
cp
}
@@
-123,7
+129,7
@@
cp
if(cl->prev)
cl->prev->next = cl->next;
else
if(cl->prev)
cl->prev->next = cl->next;
else
- connlist = cl->next;
+ conn
_
list = cl->next;
cl->next->prev = cl->prev;
free_conn_list(cl);
cl->next->prev = cl->prev;
free_conn_list(cl);
@@
-132,12
+138,23
@@
cp
/* Lookup functions */
/* Lookup functions */
+conn_list_t *lookup_id(char *name)
+{
+ conn_list_t *p;
+cp
+ for(p = conn_list; p != NULL; p = p->next)
+ if(strcmp(name, p->name) == 0)
+ break;
+cp
+ return p;
+}
+
conn_list_t *lookup_conn_list_mac(mac_t address)
{
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
conn_list_t *lookup_conn_list_mac(mac_t address)
{
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(lookup_subnet_mac(p, address))
+ if(lookup_subnet_mac(p
->subnets
, address))
break;
cp
return p;
break;
cp
return p;
@@
-148,7
+165,7
@@
conn_list_t *lookup_conn_list_ipv4(ipv4_t address)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(lookup_subnet_ipv4(p, address))
+ if(lookup_subnet_ipv4(p
->subnets
, address))
break;
cp
return p;
break;
cp
return p;
@@
-159,7
+176,7
@@
conn_list_t *lookup_conn_list_ipv6(ipv6_t address)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(lookup_subnet_ipv6(p, address))
+ if(lookup_subnet_ipv6(p
->subnets
, address))
break;
cp
return p;
break;
cp
return p;
@@
-170,14
+187,36
@@
cp
void dump_conn_list(void)
{
conn_list_t *p;
void dump_conn_list(void)
{
conn_list_t *p;
+ subnet_t *s;
+ char *netstr;
cp
syslog(LOG_DEBUG, _("Connection list:"));
for(p = conn_list; p != NULL; p = p->next)
{
cp
syslog(LOG_DEBUG, _("Connection list:"));
for(p = conn_list; p != NULL; p = p->next)
{
- syslog(LOG_DEBUG, _("%s
netmask %d.%d.%d.%d
at %s port %hd flags %d sockets %d, %d status %04x"),
- p->name,
IP_ADDR_V(p->vpn_mask),
p->hostname, p->port, p->flags,
+ syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"),
+ p->name, p->hostname, p->port, p->flags,
p->socket, p->meta_socket, p->status);
p->socket, p->meta_socket, p->status);
+ for(s = p->subnets; s != NULL; s = s->next)
+ {
+ netstr = net2str(s);
+ syslog(LOG_DEBUG, ": %s", netstr);
+ free(netstr);
+ }
}
}
+
+ syslog(LOG_DEBUG, _("End of connection list."));
+cp
+}
+
+int read_host_config(conn_list_t *cl)
+{
+ char *fname;
+ int x;
+cp
+ asprintf(fname, "%s/hosts/%s", confbase, cl->name);
+ x = read_config_file(&cl->config, fname);
+ free(fname);
cp
cp
+ return x;
}
}