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.13 2000/06/29 13:04:14 guus Exp $
+ $Id: net.c,v 1.35.4.18 2000/06/30 21:03:51 guus Exp $
*/
#include "config.h"
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;
}
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;
}
- 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;
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);
+ alarm(seconds_till_retry);
cp
}
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);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 minutes"));
cp
return 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 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;
if(send_basic_info(p) < 0)
{
- free(p);
+ free_conn_element(p);
return NULL;
}
cp
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;
}
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;
if(cl->status.timeout)
send_timeout(cl);
- else if(!cl->status.termreq)
+/* else if(!cl->status.termreq)
send_termreq(cl);
-
- close(cl->socket);
+ */
+
+ if(cl->socket)
+ close(cl->socket);
if(cl->status.meta)
close(cl->meta_socket);
- if(cl->status.outgoing)
- {
- signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 5;
- alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
- }
-
cl->status.remove = 1;
- /* If this cl isn't active, don't send any DEL_HOSTs and don't bother
- checking for other lost connections. */
- if(!cl->status.active)
- return;
+ /* If this cl isn't active, don't send any DEL_HOSTs. */
+ if(cl->status.active)
+ notify_others(cl,NULL,send_del_host);
- cl->status.active = 0;
-
cp
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
- for(p = conn_list; p != NULL; p = p->next)
- if(p->nexthop == cl)
+ if(cl->status.meta)
+ for(p = conn_list; p != NULL; p = p->next)
{
- p->status.active = 0;
- p->status.remove = 1;
+ if((p->nexthop == cl) && (p != cl))
+ {
+ if(cl->status.active && p->status.active)
+ notify_others(p,cl,send_del_host);
+ if(cl->socket)
+ close(cl->socket);
+ p->status.active = 0;
+ p->status.remove = 1;
+ }
}
-
-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)
- if(p->status.active && p->status.meta)
- for(q = conn_list; q != NULL; q = q->next)
- if(q->status.remove)
- send_del_host(p, q);
-
+
+ cl->status.active = 0;
+
+ if(cl->status.outgoing)
+ {
+ signal(SIGALRM, sigalrm_handler);
+ seconds_till_retry = 5;
+ alarm(seconds_till_retry);
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+ }
cp
}
return -1;
}
- if((ncn = create_new_connection(nfd)) == NULL)
+ if(!(ncn = create_new_connection(nfd)))
{
shutdown(nfd, 2);
close(nfd);
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;
}
{
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;
}
I've once got here when it said `No route to host'.
*/
getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
- syslog(LOG_ERR, _("Outgoing data socket error: %s"), sys_errlist[x]);
+ syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
+ p->vpn_hostname, p->real_hostname, sys_errlist[x]);
terminate_connection(p);
return;
}
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
{
- if(errno == EINTR) /* because of alarm */
- continue;
- syslog(LOG_ERR, _("Error while waiting for input: %m"));
- return;
+ if(errno != EINTR) /* because of alarm */
+ {
+ syslog(LOG_ERR, _("Error while waiting for input: %m"));
+ return;
+ }
+ }
+
+ if(sighup)
+ {
+ sighup = 0;
+ close_network_connections();
+ clear_config();
+ if(read_config_file(configfilename))
+ {
+ syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+ exit(0);
+ }
+ sleep(5);
+ setup_network_connections();
+ continue;
}
if(last_ping_check + timeout < 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
}