projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Removed a single unused bit from status_bits_t.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
a1757c5
..
f136a58
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.1
5 2000/06/29 19:47:03
guus Exp $
+ $Id: net.c,v 1.35.4.1
8 2000/06/30 21:03:51
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-508,7
+508,8
@@
cp
cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if(cl->meta_socket == -1)
{
cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if(cl->meta_socket == -1)
{
- syslog(LOG_ERR, _("Creating socket failed: %m"));
+ syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
+ cl->real_hostname, cl->port);
return -1;
}
return -1;
}
@@
-525,11
+526,13
@@
cp
flags = fcntl(cl->meta_socket, F_GETFL);
if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
flags = fcntl(cl->meta_socket, F_GETFL);
if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, _("fcntl: %m"));
+ syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
+ cl->real_hostname, cl->port);
return -1;
}
return -1;
}
- syslog(LOG_INFO, _("Connected to %s port %hd"),
+ if(debug_lvl > 0)
+ syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->real_hostname, cl->port);
cp
return 0;
cl->real_hostname, cl->port);
cp
return 0;
@@
-636,11
+639,11
@@
cp
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
seconds_till_retry += 5;
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;
- alarm(seconds_till_retry);
+ if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
+ seconds_till_retry = MAXTIMEOUT;
syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
seconds_till_retry);
syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
seconds_till_retry);
+ alarm(seconds_till_retry);
cp
}
cp
}
@@
-675,9
+678,9
@@
cp
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
signal(SIGALRM, sigalrm_handler);
upstreamindex = 0;
- seconds_till_retry = 300;
+ seconds_till_retry = MAXTIMEOUT;
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
alarm(seconds_till_retry);
alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
cp
return 0;
}
cp
return 0;
}
@@
-751,7
+754,8
@@
cp
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, nfd);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
return -1;
}
@@
-779,7
+783,6
@@
cp
return NULL;
}
return NULL;
}
- p->vpn_hostname = _("unknown");
p->real_ip = ntohl(ci.sin_addr.s_addr);
p->real_hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
p->real_ip = ntohl(ci.sin_addr.s_addr);
p->real_hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
@@
-838,12
+841,14
@@
int handle_incoming_vpn_data(conn_list_t *cl)
cp
if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
cp
if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, cl->socket);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->socket,
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(x)
{
return -1;
}
if(x)
{
- syslog(LOG_ERR, _("Incoming data socket error: %s"), sys_errlist[x]);
+ syslog(LOG_ERR, _("Incoming data socket error for %s (%s): %s"),
+ cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
return -1;
}
return -1;
}
@@
-851,7
+856,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->real_hostname);
+ syslog(LOG_ERR, _("Receiving packet from %s
(%s) failed: %m"), cl->vpn_hostname
, cl->real_hostname);
return -1;
}
total_socket_in += lenin;
return -1;
}
total_socket_in += lenin;
@@
-1034,12
+1039,14
@@
int handle_incoming_meta_data(conn_list_t *cl)
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), __FILE__, __LINE__, cl->meta_socket);
+ syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, cl->meta_socket,
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(x)
{
return -1;
}
if(x)
{
- syslog(LOG_ERR, _("Metadata socket error: %s"), sys_errlist[x]);
+ syslog(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
+ cl->vpn_hostname, cl->real_hostname, sys_errlist[x]);
return -1;
}
return -1;
}
@@
-1055,7
+1062,13
@@
cp
{
if(errno==EINTR)
return 0;
{
if(errno==EINTR)
return 0;
- syslog(LOG_ERR, _("Metadata socket read error: %m"));
+ if(errno==0)
+ if(debug_lvl>0)
+ syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
+ cl->vpn_hostname, cl->real_hostname);
+ else
+ syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+ cl->vpn_hostname, cl->real_hostname);
return -1;
}
return -1;
}
@@
-1244,19
+1257,16
@@
cp
if(sighup)
{
if(sighup)
{
+ sighup = 0;
close_network_connections();
clear_config();
if(read_config_file(configfilename))
{
close_network_connections();
clear_config();
if(read_config_file(configfilename))
{
- syslog(LOG_ERR, _("Unable to reread configuration file, exitting"));
- exit(0);
- }
- if(setup_network_connections())
- {
- syslog(LOG_ERR, _("Unable to restart, exitting"));
+ syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
exit(0);
}
- sighup = 0;
+ sleep(5);
+ setup_network_connections();
continue;
}
continue;
}
@@
-1265,14
+1275,16
@@
cp
{
check_dead_connections();
last_ping_check = time(NULL);
{
check_dead_connections();
last_ping_check = time(NULL);
- continue;
}
}
- check_network_activity(&fset);
+ if(r > 0)
+ {
+ check_network_activity(&fset);
- /* local tap data */
- if(FD_ISSET(tap_fd, &fset))
- handle_tap_input();
+ /* local tap data */
+ if(FD_ISSET(tap_fd, &fset))
+ handle_tap_input();
+ }
}
cp
}
}
cp
}