- More precise debug messages
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.6 2000/06/26 17:20:58 guus Exp $
+ $Id: net.c,v 1.35.4.7 2000/06/26 19:39:34 guus Exp $
rp.len = htons(rp.len);
if(debug_lvl > 3)
rp.len = htons(rp.len);
if(debug_lvl > 3)
- syslog(LOG_ERR, _("Sent %d bytes to %lx"), ntohs(rp.len), cl->vpn_ip);
+ syslog(LOG_ERR, _("Sending packet of %d bytes to " IP_ADDR_S " (%s)"),
+ ntohs(rp.len), IP_ADDR_V(cl->vpn_ip), cl->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 data: %m"));
+ syslog(LOG_ERR, _("Error sending packet to " IP_ADDR_S " (%s): %m"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
do_decrypt((real_packet_t*)packet, &vp, cl->key);
add_mac_addresses(&vp);
do_decrypt((real_packet_t*)packet, &vp, cl->key);
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);
+
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m"));
else
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m"));
else
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("packet to queue: %d"), s);
-
e = xmalloc(sizeof(*e));
e->packet = xmalloc(s);
memcpy(e->packet, packet, s);
e = xmalloc(sizeof(*e));
e->packet = xmalloc(s);
memcpy(e->packet, packet, s);
- syslog(LOG_DEBUG, _("queue flushed"));
+ syslog(LOG_DEBUG, _("Queue flushed"));
/* If we ourselves have indirectdata flag set, we should send only to our uplink! */
if(myself->flags & EXPORTINDIRECTDATA)
/* If we ourselves have indirectdata flag set, we should send only to our uplink! */
if(myself->flags & EXPORTINDIRECTDATA)
if(cl->flags & INDIRECTDATA)
{
if(cl->flags & INDIRECTDATA)
{
- if((cl = lookup_conn(cl->vpn_ip)) == NULL)
+ 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));
+ if((cl = lookup_conn(cl->real_ip)) == NULL)
syslog(LOG_NOTICE, _("Indirect look up " IP_ADDR_S " in connection list failed!"),
IP_ADDR_V(to));
syslog(LOG_NOTICE, _("Indirect look up " IP_ADDR_S " in connection list failed!"),
IP_ADDR_V(to));
/* Gateway tincd dead? Should we kill it? (GS) */
return -1;
}
if(cl->flags & INDIRECTDATA) /* This should not happen */
/* Gateway tincd dead? Should we kill it? (GS) */
return -1;
}
if(cl->flags & INDIRECTDATA) /* This should not happen */
- if(debug_lvl > 3)
- {
- syslog(LOG_NOTICE, _("double indirection for " IP_ADDR_S),
- IP_ADDR_V(to));
- }
- return -1;
+ {
+ if(debug_lvl > 3)
+ syslog(LOG_NOTICE, _("Double indirection for " IP_ADDR_S),
+ IP_ADDR_V(to));
+ return -1;
+ }
}
if(my_key_expiry <= time(NULL))
}
if(my_key_expiry <= time(NULL))
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);
+ return -1;
+ }
+
if(!cl->status.validkey)
{
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);
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 */
- add_queue(&(cl->sq), packet, packet->len + 2);
- syslog(LOG_INFO, _(IP_ADDR_S " is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip));
+ syslog(LOG_INFO, _(IP_ADDR_S " (%s) is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ add_queue(&(cl->sq), packet, packet->len + 2);
return 0; /* We don't want to mess up, do we? */
}
return 0; /* We don't want to mess up, do we? */
}
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 " IP_ADDR_S), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
{
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
{
- syslog(LOG_ERR, _("Creating data socket failed: %m"));
+ syslog(LOG_ERR, _("Creating UDP socket failed: %m"));
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
- syslog(LOG_ERR, _("Connecting to " IP_ADDR_S ":%d failed: %m"),
- IP_ADDR_V(cl->real_ip), cl->port);
+ syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
+ cl->hostname, cl->port);
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 data failed: %m"));
+ syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->hostname);
return -1;
}
total_socket_in += lenin;
return -1;
}
total_socket_in += lenin;
if(rp.len >= 0)
{
f = lookup_conn(rp.from);
if(rp.len >= 0)
{
f = lookup_conn(rp.from);
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("packet from " IP_ADDR_S " (len %d)"),
- IP_ADDR_V(rp.from), rp.len);
- syslog(LOG_ERR, _("Got packet from unknown source " IP_ADDR_S),
- IP_ADDR_V(rp.from));
+ 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));
from = ntohl(*((unsigned long*)(&vp.data[26])));
to = ntohl(*((unsigned long*)(&vp.data[30])));
from = ntohl(*((unsigned long*)(&vp.data[26])));
to = ntohl(*((unsigned long*)(&vp.data[30])));
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("An IP packet (%04x) for " IP_ADDR_S " from " IP_ADDR_S),
- ether_type, IP_ADDR_V(to), IP_ADDR_V(from));
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _(MAC_ADDR_S " to " MAC_ADDR_S),
- MAC_ADDR_V(vp.data[0]), MAC_ADDR_V(vp.data[6]));
-
vp.len = (length_t)lenin - 2;
strip_mac_addresses(&vp);
vp.len = (length_t)lenin - 2;
strip_mac_addresses(&vp);
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: netutl.c,v 1.12.4.3 2000/06/25 16:39:16 guus Exp $
+ $Id: netutl.c,v 1.12.4.4 2000/06/26 19:39:34 guus Exp $
for(p = conn_list; p != NULL; p = p->next)
{
for(p = conn_list; p != NULL; p = p->next)
{
- syslog(LOG_DEBUG, " " IP_ADDR_S "/" IP_ADDR_S " at %s status %04x flags %04x sockets %d, %d",
- IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->hostname, p->status, p->flags,
- p->socket, p->meta_socket);
+ syslog(LOG_DEBUG, _(" " IP_ADDR_S "/" IP_ADDR_S " at %s flags %d sockets %d, %d status %04x"),
+ IP_ADDR_V(p->vpn_ip), IP_ADDR_V(p->vpn_mask), p->hostname, p->flags,
+ p->socket, p->meta_socket, p->status);
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: protocol.c,v 1.28.4.7 2000/06/26 17:20:58 guus Exp $
+ $Id: protocol.c,v 1.28.4.8 2000/06/26 19:39:34 guus Exp $
if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
{
if(sscanf(cl->buffer, "%*d %d %lx/%lx:%hx %d", &cl->protocol_version, &cl->vpn_ip, &cl->vpn_mask, &cl->port, &cl->flags) != 5)
{
- syslog(LOG_ERR, _("Got bad BASIC_INFO from " IP_ADDR_S),
+ syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
cl->hostname);
return -1;
}
cl->hostname);
return -1;
}