projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dutch translation of tinc.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
417092e
..
f49178b
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-1,6
+1,6
@@
/*
netutl.c -- some supporting network utility code
/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998,
99
Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,
1999,2000
Ivo Timmermans <zarq@iname.com>
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
@@
-35,9
+35,12
@@
#include "net.h"
#include "netutl.h"
#include "net.h"
#include "netutl.h"
+#include "system.h"
+
/*
look for a connection associated with the given vpn ip,
/*
look for a connection associated with the given vpn ip,
- return its connection structure
+ return its connection structure.
+ Skips connections that are not activated!
*/
conn_list_t *lookup_conn(ip_t ip)
{
*/
conn_list_t *lookup_conn(ip_t ip)
{
@@
-45,10
+48,10
@@
conn_list_t *lookup_conn(ip_t ip)
cp
/* Exact match suggested by James B. MacLean */
for(p = conn_list; p != NULL; p = p->next)
cp
/* Exact match suggested by James B. MacLean */
for(p = conn_list; p != NULL; p = p->next)
- if(
ip == p->vpn_ip
)
+ if(
(ip == p->vpn_ip) && p->status.active
)
return p;
for(p = conn_list; p != NULL; p = p->next)
return p;
for(p = conn_list; p != NULL; p = p->next)
- if((
ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)
)
+ if((
(ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)) && p->status.active
)
return p;
cp
return NULL;
return p;
cp
return NULL;
@@
-81,8
+84,6
@@
void free_conn_element(conn_list_t *p)
cp
if(p->hostname)
free(p->hostname);
cp
if(p->hostname)
free(p->hostname);
- if(p->pp)
- free(p->pp);
if(p->sq)
destroy_queue(p->sq);
if(p->rq)
if(p->sq)
destroy_queue(p->sq);
if(p->rq)
@@
-126,10
+127,13
@@
cp
*/
conn_list_t *new_conn_list(void)
{
*/
conn_list_t *new_conn_list(void)
{
- conn_list_t *p = xmalloc(sizeof(
conn_list_t
));
+ conn_list_t *p = xmalloc(sizeof(
*p
));
cp
/* initialise all those stupid pointers at once */
cp
/* initialise all those stupid pointers at once */
- memset(p, '\0', sizeof(conn_list_t));
+ memset(p, '\0', sizeof(*p));
+ p->vpn_mask = (ip_t)(~0L); /* If this isn't done, it would be a
+ wastebucket for all packets with
+ unknown destination. */
p->nexthop = p;
cp
return p;
p->nexthop = p;
cp
return p;
@@
-201,7
+205,7
@@
cp
if(!(h = gethostbyname(p)))
{
if(!(h = gethostbyname(p)))
{
- fprintf(stderr,
"Error looking up `%s': %s\n"
, p, sys_errlist[h_errno]);
+ fprintf(stderr,
_("Error looking up `%s': %s\n")
, p, sys_errlist[h_errno]);
return NULL;
}
return NULL;
}
@@
-213,7
+217,7
@@
cp
return NULL;
}
return NULL;
}
- ip = xmalloc(sizeof(
ip_mask_t
));
+ ip = xmalloc(sizeof(
*ip
));
ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
@@
-225,7
+229,7
@@
void dump_conn_list(void)
{
conn_list_t *p;
cp
{
conn_list_t *p;
cp
- syslog(LOG_DEBUG,
"Connection list:"
);
+ syslog(LOG_DEBUG,
_("Connection list:")
);
for(p = conn_list; p != NULL; p = p->next)
{
for(p = conn_list; p != NULL; p = p->next)
{