projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update acconfig.h to include values for gettext inclusion.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
df6401f
..
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,20
+35,23
@@
#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 *p = conn_list;
*/
conn_list_t *lookup_conn(ip_t ip)
{
conn_list_t *p = conn_list;
-
+cp
/* Exact match suggested by James B. MacLean */
for(p = conn_list; p != NULL; p = p->next)
/* 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;
@@
-202,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;
}
@@
-226,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)
{