j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

- Instead of logging an error when remote end closes the connection,

Browse source 
we print a nice message if appropiate debug level is set.
- If we get ADD_HOSTs or DEL_HOSTs for ourself, then connection lists
  are really messed up. We restart, and hope our problems go away.
This commit is contained in:
Guus Sliepen 2000-06-30 12:41:06 +00:00
parent 24874d0806
commit c5737583c8
3 changed files with 147 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/net.c
View file

@ -17,7 +17,7 @@
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.16 2000/06/30 11:45:14 guus Exp $
$Id: net.c,v 1.35.4.17 2000/06/30 12:41:05 guus Exp $
*/
#include "config.h"
@ -508,7 +508,8 @@ cp
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;
}
@ -525,7 +526,8 @@ cp
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;
}
@ -751,7 +753,8 @@ cp
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;
}
@ -837,12 +840,14 @@ int handle_incoming_vpn_data(conn_list_t *cl)
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)
{
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;
}
@ -850,7 +855,7 @@ cp
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;
@ -1033,12 +1038,14 @@ int handle_incoming_meta_data(conn_list_t *cl)
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)
{
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;
}
@ -1054,7 +1061,13 @@ cp
{
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;
}
@ -1251,6 +1264,7 @@ cp
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
sleep(5);
setup_network_connections();
continue;
}

20
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.c,v 1.28.4.17 2000/06/29 19:47:03 guus Exp $
$Id: protocol.c,v 1.28.4.18 2000/06/30 12:41:06 guus Exp $
*/
#include "config.h"
@ -613,6 +613,15 @@ cp
return 0;
}
/* Connections lists are really messed up if this happens */
if(vpn_ip == myself->vpn_ip)
{
syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
cl->vpn_hostname, cl->real_hostname);
sighup = 1;
return 0;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
@ -709,6 +718,15 @@ cp
terminate_connection(old);
}
}
/* Connections lists are really messed up if this happens */
if(vpn_ip == myself->vpn_ip)
{
syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"),
cl->vpn_hostname, cl->real_hostname);
sighup = 1;
return 0;
}
ncn = new_conn_list();
ncn->real_ip = real_ip;