projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixed typo.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
efd30e6
..
dce4ae4
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.
16 2000/06/30 11:45:14
guus Exp $
+ $Id: net.c,v 1.35.4.
20 2000/07/02 13:40:57
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;
@@
-542,13
+545,20
@@
cp
an authentication sequence during which
we will do just that.
*/
an authentication sequence during which
we will do just that.
*/
-int setup_outgoing_connection(
ip_t ip
)
+int setup_outgoing_connection(
char *hostname
)
{
conn_list_t *ncn;
{
conn_list_t *ncn;
+ struct hostent *h;
cp
cp
+ if(!(h = gethostbyname(hostname)))
+ {
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+ return -1;
+ }
+
ncn = new_conn_list();
ncn = new_conn_list();
- ncn->real_ip =
ip
;
- ncn->real_hostname = hostlookup(htonl(ip));
+ ncn->real_ip =
ntohl(*((ip_t*)(h->h_addr_list[0])))
;
+ ncn->real_hostname = hostlookup(htonl(
ncn->real_
ip));
if(setup_outgoing_meta_socket(ncn) < 0)
{
if(setup_outgoing_meta_socket(ncn) < 0)
{
@@
-625,7
+635,7
@@
cp
while(cfg)
{
while(cfg)
{
- if(!setup_outgoing_connection(cfg->data.
ip->ip
)) /* function returns 0 when there are no problems */
+ if(!setup_outgoing_connection(cfg->data.
ptr
)) /* function returns 0 when there are no problems */
{
signal(SIGALRM, SIG_IGN);
return;
{
signal(SIGALRM, SIG_IGN);
return;
@@
-668,7
+678,7
@@
cp
while(cfg)
{
while(cfg)
{
- if(!setup_outgoing_connection(cfg->data.
ip->ip
)) /* function returns 0 when there are no problems */
+ if(!setup_outgoing_connection(cfg->data.
ptr
)) /* function returns 0 when there are no problems */
return 0;
cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
return 0;
cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
@@
-751,7
+761,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;
}
@@
-837,12
+848,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;
}
@@
-850,7
+863,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;
@@
-1033,12
+1046,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;
}
@@
-1054,7
+1069,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;
}
@@
-1251,6
+1272,7
@@
cp
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
+ sleep(5);
setup_network_connections();
continue;
}
setup_network_connections();
continue;
}