projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Removed all IP_ADDR_S macros, because gettext doesn't like them. Each
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
cdb593e
..
af9077c
100644
(file)
--- a/
src/net.c
+++ b/
src/net.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: net.c,v 1.35.4.
9 2000/06/27 15:08:58
guus Exp $
+ $Id: net.c,v 1.35.4.
13 2000/06/29 13:04:14
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-56,6
+56,7
@@
int total_tap_out = 0;
int total_socket_in = 0;
int total_socket_out = 0;
int total_socket_in = 0;
int total_socket_out = 0;
+int upstreamindex = 0;
static int seconds_till_retry;
/* The global list of existing connections */
static int seconds_till_retry;
/* The global list of existing connections */
@@
-103,13
+104,13
@@
cp
rp.len = htons(rp.len);
if(debug_lvl > 3)
rp.len = htons(rp.len);
if(debug_lvl > 3)
- syslog(LOG_ERR, _("Sending packet of %d bytes to
" IP_ADDR_S "
(%s)"),
- ntohs(rp.len),
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Sending packet of %d bytes to
%s
(%s)"),
+ ntohs(rp.len),
cl->vpn_hostname, cl->real_
hostname);
if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
- syslog(LOG_ERR, _("Error sending packet to
" IP_ADDR_S "
(%s): %m"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Error sending packet to
%s
(%s): %m"),
+
cl->vpn_hostname, cl->real_
hostname);
return -1;
}
return -1;
}
@@
-129,8
+130,8
@@
cp
add_mac_addresses(&vp);
if(debug_lvl > 3)
add_mac_addresses(&vp);
if(debug_lvl > 3)
- syslog(LOG_ERR, _("Receiving packet of %d bytes from
" IP_ADDR_S "
(%s)"),
- ((real_packet_t*)packet)->len,
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Receiving packet of %d bytes from
%s
(%s)"),
+ ((real_packet_t*)packet)->len,
cl->vpn_hostname, cl->real_
hostname);
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m"));
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m"));
@@
-251,16
+252,16
@@
cp
if(cl->sq)
{
if(debug_lvl > 3)
if(cl->sq)
{
if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Flushing send queue for
" IP_ADDR_S
),
-
IP_ADDR_V(cl->vpn_ip)
);
+ syslog(LOG_DEBUG, _("Flushing send queue for
%s (%s)"
),
+
cl->vpn_hostname, cl->real_hostname
);
flush_queue(cl, &(cl->sq), xsend);
}
if(cl->rq)
{
if(debug_lvl > 3)
flush_queue(cl, &(cl->sq), xsend);
}
if(cl->rq)
{
if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Flushing receive queue for
" IP_ADDR_S
),
-
IP_ADDR_V(cl->vpn_ip)
);
+ syslog(LOG_DEBUG, _("Flushing receive queue for
%s (%s)"
),
+
cl->vpn_hostname, cl->real_hostname
);
flush_queue(cl, &(cl->rq), xrecv);
}
cp
flush_queue(cl, &(cl->rq), xrecv);
}
cp
@@
-277,7
+278,7
@@
cp
{
if(debug_lvl > 3)
{
{
if(debug_lvl > 3)
{
- syslog(LOG_NOTICE, _("Trying to look up
" IP_ADDR_S "
in connection list failed!"),
+ syslog(LOG_NOTICE, _("Trying to look up
%d.%d.%d.%d
in connection list failed!"),
IP_ADDR_V(to));
}
IP_ADDR_V(to));
}
@@
-316,12
+317,12
@@
cp
if(cl->flags & INDIRECTDATA)
{
if(debug_lvl > 3)
if(cl->flags & INDIRECTDATA)
{
if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect packet to
" IP_ADDR_S " via " IP_ADDR_S
),
-
IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip)
);
+ syslog(LOG_NOTICE, _("Indirect packet to
%s via %s"
),
+
cl->vpn_hostname, cl->real_hostname
);
if((cl = lookup_conn(cl->real_ip)) == NULL)
{
if(debug_lvl > 3)
if((cl = lookup_conn(cl->real_ip)) == NULL)
{
if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect look up
" IP_ADDR_S "
in connection list failed!"),
+ syslog(LOG_NOTICE, _("Indirect look up
%d.%d.%d.%d
in connection list failed!"),
IP_ADDR_V(to));
/* Gateway tincd dead? Should we kill it? (GS) */
IP_ADDR_V(to));
/* Gateway tincd dead? Should we kill it? (GS) */
@@
-331,7
+332,7
@@
cp
if(cl->flags & INDIRECTDATA) /* This should not happen */
{
if(debug_lvl > 3)
if(cl->flags & INDIRECTDATA) /* This should not happen */
{
if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Double indirection for
" IP_ADDR_S
),
+ syslog(LOG_NOTICE, _("Double indirection for
%d.%d.%d.%d"
),
IP_ADDR_V(to));
return -1;
}
IP_ADDR_V(to));
return -1;
}
@@
-343,14
+344,14
@@
cp
if(!cl->status.dataopen)
if(setup_vpn_connection(cl) < 0)
{
if(!cl->status.dataopen)
if(setup_vpn_connection(cl) < 0)
{
- syslog(LOG_ERR, _("Could not open UDP connection to
" IP_ADDR_S " (%s)"), IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Could not open UDP connection to
%s (%s)"), cl->vpn_hostname, cl->real_
hostname);
return -1;
}
if(!cl->status.validkey)
{
if(debug_lvl > 3)
return -1;
}
if(!cl->status.validkey)
{
if(debug_lvl > 3)
- syslog(LOG_INFO, _(
IP_ADDR_S " (%s) has no valid key, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_INFO, _(
"%s (%s) has no valid key, queueing packet"), cl->vpn_hostname, cl->real_
hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
if(!cl->status.waitingforkey)
send_key_request(cl->vpn_ip); /* Keys should be sent to the host running the tincd */
add_queue(&(cl->sq), packet, packet->len + 2);
if(!cl->status.waitingforkey)
send_key_request(cl->vpn_ip); /* Keys should be sent to the host running the tincd */
@@
-360,7
+361,7
@@
cp
if(!cl->status.active)
{
if(debug_lvl > 3)
if(!cl->status.active)
{
if(debug_lvl > 3)
- syslog(LOG_INFO, _(
IP_ADDR_S " (%s) is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_INFO, _(
"%s (%s) is not ready, queueing packet"), cl->vpn_hostname, cl->real_
hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
return 0; /* We don't want to mess up, do we? */
}
add_queue(&(cl->sq), packet, packet->len + 2);
return 0; /* We don't want to mess up, do we? */
}
@@
-496,6
+497,9
@@
int setup_outgoing_meta_socket(conn_list_t *cl)
struct sockaddr_in a;
config_t const *cfg;
cp
struct sockaddr_in a;
config_t const *cfg;
cp
+ if(debug_lvl > 0)
+ syslog(LOG_INFO, _("Trying to connect to %s"), cl->real_hostname);
+
if((cfg = get_config_val(upstreamport)) == NULL)
cl->port = 655;
else
if((cfg = get_config_val(upstreamport)) == NULL)
cl->port = 655;
else
@@
-514,7
+518,7
@@
cp
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
- syslog(LOG_ERR, _(
IP_ADDR_S ":%d: %m"), IP_ADDR_V(cl->real_ip)
, cl->port);
+ syslog(LOG_ERR, _(
"%s port %hd: %m"), cl->real_hostname
, cl->port);
return -1;
}
return -1;
}
@@
-525,8
+529,8
@@
cp
return -1;
}
return -1;
}
- syslog(LOG_INFO, _("Connected to
" IP_ADDR_S ":
%hd"),
-
IP_ADDR_V(cl->real_ip)
, cl->port);
+ syslog(LOG_INFO, _("Connected to
%s port
%hd"),
+
cl->real_hostname
, cl->port);
cp
return 0;
}
cp
return 0;
}
@@
-544,12
+548,12
@@
int setup_outgoing_connection(ip_t ip)
cp
ncn = new_conn_list();
ncn->real_ip = ip;
cp
ncn = new_conn_list();
ncn->real_ip = ip;
- ncn->hostname = hostlookup(htonl(ip));
+ ncn->
real_
hostname = hostlookup(htonl(ip));
if(setup_outgoing_meta_socket(ncn) < 0)
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
if(setup_outgoing_meta_socket(ncn) < 0)
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
- ncn->hostname);
+ ncn->
real_
hostname);
free_conn_element(ncn);
return -1;
}
free_conn_element(ncn);
return -1;
}
@@
-578,7
+582,8
@@
cp
}
myself->vpn_ip = cfg->data.ip->ip;
}
myself->vpn_ip = cfg->data.ip->ip;
- myself->hostname = hostlookup(htonl(myself->vpn_ip));
+ myself->vpn_hostname = hostlookup(htonl(myself->vpn_ip));
+ myself->real_hostname = hostlookup(htonl(myself->vpn_ip));
myself->vpn_mask = cfg->data.ip->mask;
myself->flags = 0;
myself->vpn_mask = cfg->data.ip->mask;
myself->flags = 0;
@@
-606,7
+611,7
@@
cp
myself->status.active = 1;
myself->status.active = 1;
- syslog(LOG_NOTICE, _("Ready: listening on port %d"), myself->port);
+ syslog(LOG_NOTICE, _("Ready: listening on port %
h
d"), myself->port);
cp
return 0;
}
cp
return 0;
}
@@
-615,9
+620,8
@@
RETSIGTYPE
sigalrm_handler(int a)
{
config_t const *cfg;
sigalrm_handler(int a)
{
config_t const *cfg;
- int index = 1;
cp
cp
- cfg = get_
config_val(upstreamip
);
+ cfg = get_
next_config_val(upstreamip, upstreamindex++
);
while(cfg)
{
while(cfg)
{
@@
-626,10
+630,11
@@
cp
signal(SIGALRM, SIG_IGN);
return;
}
signal(SIGALRM, SIG_IGN);
return;
}
- cfg = get_next_config_val(upstreamip, index++); /* Or else we try the next ConnectTo line */
+ cfg = get_next_config_val(upstreamip,
upstream
index++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
}
signal(SIGALRM, sigalrm_handler);
+ upstreamindex = 0;
seconds_till_retry += 5;
if(seconds_till_retry>300) /* Don't wait more than 5 minutes. */
seconds_till_retry = 300;
seconds_till_retry += 5;
if(seconds_till_retry>300) /* Don't wait more than 5 minutes. */
seconds_till_retry = 300;
@@
-645,7
+650,6
@@
cp
int setup_network_connections(void)
{
config_t const *cfg;
int setup_network_connections(void)
{
config_t const *cfg;
- int index = 1;
cp
if((cfg = get_config_val(pingtimeout)) == NULL)
timeout = 5;
cp
if((cfg = get_config_val(pingtimeout)) == NULL)
timeout = 5;
@@
-658,7
+662,7
@@
cp
if(setup_myself() < 0)
return -1;
if(setup_myself() < 0)
return -1;
- if((cfg = get_
config_val(upstreamip
)) == NULL)
+ if((cfg = get_
next_config_val(upstreamip, upstreamindex++
)) == NULL)
/* No upstream IP given, we're listen only. */
return 0;
/* No upstream IP given, we're listen only. */
return 0;
@@
-666,10
+670,11
@@
cp
{
if(!setup_outgoing_connection(cfg->data.ip->ip)) /* function returns 0 when there are no problems */
return 0;
{
if(!setup_outgoing_connection(cfg->data.ip->ip)) /* function returns 0 when there are no problems */
return 0;
- cfg = get_next_config_val(upstreamip, index++); /* Or else we try the next ConnectTo line */
+ cfg = get_next_config_val(upstreamip,
upstream
index++); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
}
signal(SIGALRM, sigalrm_handler);
+ upstreamindex = 0;
seconds_till_retry = 300;
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
seconds_till_retry = 300;
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
@@
-723,7
+728,7
@@
int setup_vpn_connection(conn_list_t *cl)
struct sockaddr_in a;
cp
if(debug_lvl > 0)
struct sockaddr_in a;
cp
if(debug_lvl > 0)
- syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
+ syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->
real_
hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
@@
-739,7
+744,7
@@
cp
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
- cl->hostname, cl->port);
+ cl->
real_
hostname, cl->port);
return -1;
}
return -1;
}
@@
-774,8
+779,9
@@
cp
return NULL;
}
return NULL;
}
+ p->vpn_hostname = _("unknown");
p->real_ip = ntohl(ci.sin_addr.s_addr);
p->real_ip = ntohl(ci.sin_addr.s_addr);
- p->hostname = hostlookup(ci.sin_addr.s_addr);
+ p->
real_
hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
p->status.meta = 1;
p->buflen = 0;
p->meta_socket = sfd;
p->status.meta = 1;
p->buflen = 0;
@@
-784,7
+790,7
@@
cp
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
- p->hostname, htons(ci.sin_port));
+ p->
real_
hostname, htons(ci.sin_port));
if(send_basic_info(p) < 0)
{
if(send_basic_info(p) < 0)
{
@@
-845,7
+851,7
@@
cp
lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
if(lenin <= 0)
{
lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
if(lenin <= 0)
{
- syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->hostname);
+ syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->
real_
hostname);
return -1;
}
total_socket_in += lenin;
return -1;
}
total_socket_in += lenin;
@@
-859,8
+865,8
@@
cp
f = lookup_conn(rp.from);
if(!f)
{
f = lookup_conn(rp.from);
if(!f)
{
- syslog(LOG_ERR, _("Got packet from
" IP_ADDR_S " (%s) with unknown origin " IP_ADDR_S "
?"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname, IP_ADDR_V(rp.from));
+ syslog(LOG_ERR, _("Got packet from
%s (%s) with unknown origin %d.%d.%d.%d
?"),
+
cl->vpn_hostname, cl->real_
hostname, IP_ADDR_V(rp.from));
return -1;
}
return -1;
}
@@
-893,8
+899,8
@@
cp
return;
if(debug_lvl > 0)
return;
if(debug_lvl > 0)
- syslog(LOG_NOTICE, _("Closing connection with
" IP_ADDR_S "
(%s)"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_NOTICE, _("Closing connection with
%s
(%s)"),
+
cl->vpn_hostname, cl->real_
hostname);
if(cl->status.timeout)
send_timeout(cl);
if(cl->status.timeout)
send_timeout(cl);
@@
-936,7
+942,7
@@
cp
/* Then send a notification about all these connections to all hosts
that are still connected to us. */
for(p = conn_list; p != NULL; p = p->next)
/* Then send a notification about all these connections to all hosts
that are still connected to us. */
for(p = conn_list; p != NULL; p = p->next)
- if(
!p->status.remo
ve && p->status.meta)
+ if(
p->status.acti
ve && p->status.meta)
for(q = conn_list; q != NULL; q = q->next)
if(q->status.remove)
send_del_host(p, q);
for(q = conn_list; q != NULL; q = q->next)
if(q->status.remove)
send_del_host(p, q);
@@
-969,8
+975,8
@@
cp
if(p->status.pinged && !p->status.got_pong)
{
if(debug_lvl > 1)
if(p->status.pinged && !p->status.got_pong)
{
if(debug_lvl > 1)
- syslog(LOG_INFO, _(
IP_ADDR_S " (%s) didn't respond to ping
"),
-
IP_ADDR_V(p->vpn_ip), p->
hostname);
+ syslog(LOG_INFO, _(
"%s (%s) didn't respond to PING
"),
+
p->vpn_hostname, p->real_
hostname);
p->status.timeout = 1;
terminate_connection(p);
}
p->status.timeout = 1;
terminate_connection(p);
}
@@
-1049,6
+1055,8
@@
cp
if(lenin<=0)
{
if(lenin<=0)
{
+ if(errno==EINTR)
+ return 0;
syslog(LOG_ERR, _("Metadata socket read error: %m"));
return -1;
}
syslog(LOG_ERR, _("Metadata socket read error: %m"));
return -1;
}
@@
-1073,28
+1081,28
@@
cp
if(cl->reqlen)
{
if(debug_lvl > 2)
if(cl->reqlen)
{
if(debug_lvl > 2)
- syslog(LOG_DEBUG, _("Got request from
" IP_ADDR_S "
(%s): %s"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname, cl->buffer);
+ syslog(LOG_DEBUG, _("Got request from
%s
(%s): %s"),
+
cl->vpn_hostname, cl->real_
hostname, cl->buffer);
if(sscanf(cl->buffer, "%d", &request) == 1)
{
if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
{
if(sscanf(cl->buffer, "%d", &request) == 1)
{
if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
{
- syslog(LOG_ERR, _("Unknown request from
" IP_ADDR_S "
(%s)"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Unknown request from
%s
(%s)"),
+
cl->vpn_hostname, cl->real_
hostname);
return -1;
}
if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */
{
return -1;
}
if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */
{
- syslog(LOG_ERR, _("Error while processing request from
" IP_ADDR_S "
(%s)"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Error while processing request from
%s
(%s)"),
+
cl->vpn_hostname, cl->real_
hostname);
return -1;
}
}
else
{
return -1;
}
}
else
{
- syslog(LOG_ERR, _("Bogus data received from
" IP_ADDR_S "
(%s)"),
-
IP_ADDR_V(cl->vpn_ip), cl->
hostname);
+ syslog(LOG_ERR, _("Bogus data received from
%s
(%s)"),
+
cl->vpn_hostname, cl->real_
hostname);
return -1;
}
return -1;
}