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

- Removed all IP_ADDR_S macros, because gettext doesn't like them. Each

Browse source 
connection now has two hostnames: real_hostname (replacing the old),
  and vpn_hostname. In those places where hostnames really aren't usefull
  IP_ADDR_S has been replaced by %d.%d.%d.%d.
This commit is contained in:
Guus Sliepen 2000-06-29 13:04:15 +00:00
parent e0ddb638d1
commit e8e7379311
5 changed files with 530 additions and 462 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

660
po/nl.po
View file

File diff suppressed because it is too large Load diff

94
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.12 2000/06/28 10:11:10 guus Exp $
$Id: net.c,v 1.35.4.13 2000/06/29 13:04:14 guus Exp $
*/
#include "config.h"
@ -104,13 +104,13 @@ cp
rp.len = htons(rp.len);
if(debug_lvl > 3)
syslog(LOG_ERR, _("Sending packet of %d bytes to " IP_ADDR_S " (%s)"),
ntohs(rp.len), IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
ntohs(rp.len), cl->vpn_hostname, cl->real_hostname);
if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to " IP_ADDR_S " (%s): %m"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
@ -130,8 +130,8 @@ cp
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);
syslog(LOG_ERR, _("Receiving packet of %d bytes from %s (%s)"),
((real_packet_t*)packet)->len, cl->vpn_hostname, cl->real_hostname);
if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0)
syslog(LOG_ERR, _("Can't write to tap device: %m"));
@ -252,16 +252,16 @@ cp
if(cl->sq)
{
if(debug_lvl > 3)
syslog(LOG_DEBUG, _("Flushing send queue for " IP_ADDR_S),
IP_ADDR_V(cl->vpn_ip));
syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
flush_queue(cl, &(cl->sq), xsend);
}
if(cl->rq)
{
if(debug_lvl > 3)
syslog(LOG_DEBUG, _("Flushing receive queue for " IP_ADDR_S),
IP_ADDR_V(cl->vpn_ip));
syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
flush_queue(cl, &(cl->rq), xrecv);
}
cp
@ -278,7 +278,7 @@ cp
{
if(debug_lvl > 3)
{
syslog(LOG_NOTICE, _("Trying to look up " IP_ADDR_S " in connection list failed!"),
syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
IP_ADDR_V(to));
}
@ -317,12 +317,12 @@ cp
if(cl->flags & INDIRECTDATA)
{
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));
syslog(LOG_NOTICE, _("Indirect packet to %s via %s"),
cl->vpn_hostname, cl->real_hostname);
if((cl = lookup_conn(cl->real_ip)) == NULL)
{
if(debug_lvl > 3)
syslog(LOG_NOTICE, _("Indirect look up " IP_ADDR_S " in connection list failed!"),
syslog(LOG_NOTICE, _("Indirect look up %d.%d.%d.%d in connection list failed!"),
IP_ADDR_V(to));
/* Gateway tincd dead? Should we kill it? (GS) */
@ -332,7 +332,7 @@ cp
if(cl->flags & INDIRECTDATA) /* This should not happen */
{
if(debug_lvl > 3)
syslog(LOG_NOTICE, _("Double indirection for " IP_ADDR_S),
syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"),
IP_ADDR_V(to));
return -1;
}
@ -344,14 +344,14 @@ cp
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);
syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), cl->vpn_hostname, cl->real_hostname);
return -1;
}
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);
syslog(LOG_INFO, _("%s (%s) has no valid key, queueing packet"), cl->vpn_hostname, cl->real_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 */
@ -361,7 +361,7 @@ cp
if(!cl->status.active)
{
if(debug_lvl > 3)
syslog(LOG_INFO, _(IP_ADDR_S " (%s) is not ready, queueing packet"), IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), cl->vpn_hostname, cl->real_hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
return 0; /* We don't want to mess up, do we? */
}
@ -498,7 +498,7 @@ int setup_outgoing_meta_socket(conn_list_t *cl)
config_t const *cfg;
cp
if(debug_lvl > 0)
syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
syslog(LOG_INFO, _("Trying to connect to %s"), cl->real_hostname);
if((cfg = get_config_val(upstreamport)) == NULL)
cl->port = 655;
@ -518,7 +518,7 @@ cp
if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
syslog(LOG_ERR, _(IP_ADDR_S ":%d: %m"), IP_ADDR_V(cl->real_ip), cl->port);
syslog(LOG_ERR, _("%s port %hd: %m"), cl->real_hostname, cl->port);
return -1;
}
@ -529,8 +529,8 @@ cp
return -1;
}
syslog(LOG_INFO, _("Connected to " IP_ADDR_S ":%hd"),
IP_ADDR_V(cl->real_ip), cl->port);
syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->real_hostname, cl->port);
cp
return 0;
}
@ -548,12 +548,12 @@ int setup_outgoing_connection(ip_t ip)
cp
ncn = new_conn_list();
ncn->real_ip = ip;
ncn->hostname = hostlookup(htonl(ip));
ncn->real_hostname = hostlookup(htonl(ip));
if(setup_outgoing_meta_socket(ncn) < 0)
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
ncn->hostname);
ncn->real_hostname);
free_conn_element(ncn);
return -1;
}
@ -582,7 +582,8 @@ cp
}
myself->vpn_ip = cfg->data.ip->ip;
myself->hostname = hostlookup(htonl(myself->vpn_ip));
myself->vpn_hostname = hostlookup(htonl(myself->vpn_ip));
myself->real_hostname = hostlookup(htonl(myself->vpn_ip));
myself->vpn_mask = cfg->data.ip->mask;
myself->flags = 0;
@ -610,7 +611,7 @@ cp
myself->status.active = 1;
syslog(LOG_NOTICE, _("Ready: listening on port %d"), myself->port);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
return 0;
}
@ -727,7 +728,7 @@ int setup_vpn_connection(conn_list_t *cl)
struct sockaddr_in a;
cp
if(debug_lvl > 0)
syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->real_hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(nfd == -1)
@ -743,7 +744,7 @@ cp
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
cl->hostname, cl->port);
cl->real_hostname, cl->port);
return -1;
}
@ -778,8 +779,9 @@ cp
return NULL;
}
p->vpn_hostname = _("unknown");
p->real_ip = ntohl(ci.sin_addr.s_addr);
p->hostname = hostlookup(ci.sin_addr.s_addr);
p->real_hostname = hostlookup(ci.sin_addr.s_addr);
p->meta_socket = sfd;
p->status.meta = 1;
p->buflen = 0;
@ -788,7 +790,7 @@ cp
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
p->real_hostname, htons(ci.sin_port));
if(send_basic_info(p) < 0)
{
@ -849,7 +851,7 @@ cp
lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL);
if(lenin <= 0)
{
syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->hostname);
syslog(LOG_ERR, _("Receiving packet from %s failed: %m"), cl->real_hostname);
return -1;
}
total_socket_in += lenin;
@ -863,8 +865,8 @@ cp
f = lookup_conn(rp.from);
if(!f)
{
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));
syslog(LOG_ERR, _("Got packet from %s (%s) with unknown origin %d.%d.%d.%d?"),
cl->vpn_hostname, cl->real_hostname, IP_ADDR_V(rp.from));
return -1;
}
@ -897,8 +899,8 @@ cp
return;
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Closing connection with " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
if(cl->status.timeout)
send_timeout(cl);
@ -973,8 +975,8 @@ cp
if(p->status.pinged && !p->status.got_pong)
{
if(debug_lvl > 1)
syslog(LOG_INFO, _(IP_ADDR_S " (%s) didn't respond to ping"),
IP_ADDR_V(p->vpn_ip), p->hostname);
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
p->vpn_hostname, p->real_hostname);
p->status.timeout = 1;
terminate_connection(p);
}
@ -1079,28 +1081,28 @@ cp
if(cl->reqlen)
{
if(debug_lvl > 2)
syslog(LOG_DEBUG, _("Got request from " IP_ADDR_S " (%s): %s"),
IP_ADDR_V(cl->vpn_ip), cl->hostname, cl->buffer);
syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
cl->vpn_hostname, cl->real_hostname, cl->buffer);
if(sscanf(cl->buffer, "%d", &request) == 1)
{
if((request < 0) || (request > 255) || (request_handlers[request] == NULL))
{
syslog(LOG_ERR, _("Unknown request from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Unknown request from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(request_handlers[request](cl)) /* Something went wrong. Probably scriptkiddies. Terminate. */
{
syslog(LOG_ERR, _("Error while processing request from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Error while processing request from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
}
else
{
syslog(LOG_ERR, _("Bogus data received from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Bogus data received from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}

5
src/net.h
View file

@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.4 2000/06/25 16:01:12 guus Exp $
$Id: net.h,v 1.9.4.5 2000/06/29 13:04:15 guus Exp $
*/
#ifndef __TINC_NET_H__
@ -106,7 +106,8 @@ typedef struct conn_list_t {
ip_t vpn_ip; /* his vpn ip */
ip_t vpn_mask; /* his vpn network address */
ip_t real_ip; /* his real (internet) ip */
char *hostname; /* the hostname of its real ip */
char *real_hostname; /* the hostname of its real ip */
char *vpn_hostname; /* the hostname of the vpn ip */
short unsigned int port; /* his portnumber */
int flags; /* his flags */
int socket; /* our udp vpn socket */

14
src/netutl.c
View file

@ -16,7 +16,7 @@
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.4 2000/06/26 19:39:34 guus Exp $
$Id: netutl.c,v 1.12.4.5 2000/06/29 13:04:15 guus Exp $
*/
#include "config.h"
@ -89,6 +89,10 @@ cp
destroy_queue(p->sq);
if(p->rq)
destroy_queue(p->rq);
if(p->vpn_hostname)
free(p->vpn_hostname);
if(p->real_hostname)
free(p->real_hostname);
free_key(p->public_key);
free_key(p->key);
free(p);
@ -188,8 +192,8 @@ cp
}
else
{
name = xmalloc(strlen(host->h_name)+20);
sprintf(name, "%s (%s)", host->h_name, inet_ntoa(in));
name = xmalloc(strlen(host->h_name));
sprintf(name, "%s", host->h_name);
}
cp
return name;
@ -243,8 +247,8 @@ cp
for(p = conn_list; p != NULL; p = p->next)
{
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,
syslog(LOG_DEBUG, _("%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"),
p->vpn_hostname, IP_ADDR_V(p->vpn_mask), p->real_hostname, p->port, p->flags,
p->socket, p->meta_socket, p->status);
}
cp

219
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.14 2000/06/28 13:41:02 guus Exp $
$Id: protocol.c,v 1.28.4.15 2000/06/29 13:04:15 guus Exp $
*/
#include "config.h"
@ -51,8 +51,8 @@ int send_ack(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending ACK to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
@ -69,8 +69,8 @@ int send_termreq(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending TERMREQ to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
@ -88,8 +88,8 @@ int send_timeout(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending TIMEOUT to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
@ -106,8 +106,8 @@ int send_del_host(conn_list_t *cl, conn_list_t *new_host)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
IP_ADDR_V(new_host->vpn_ip), new_host->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending DEL_HOST for %s (%s) to %s (%s)"),
new_host->vpn_hostname, new_host->real_hostname, cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
@ -124,8 +124,8 @@ int send_ping(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending PING to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
@ -142,8 +142,8 @@ int send_pong(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending PONG to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
@ -163,7 +163,7 @@ int send_add_host(conn_list_t *cl, conn_list_t *new_host)
char *hostname;
cp
real_ip = new_host->real_ip;
hostname = new_host->hostname;
hostname = new_host->real_hostname;
flags = new_host->flags;
/* If we need to propagate information about a new host that wants us to export
@ -177,12 +177,12 @@ cp
flags &= ~EXPORTINDIRECTDATA;
flags |= INDIRECTDATA;
real_ip = myself->vpn_ip;
hostname = myself->hostname;
hostname = myself->real_hostname;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending ADD_HOST for " IP_ADDR_S " (%s) to " IP_ADDR_S " (%s)"),
IP_ADDR_V(new_host->vpn_ip), hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending ADD_HOST for %s (%s) to %s (%s)"),
new_host->vpn_hostname, hostname, cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
@ -199,8 +199,8 @@ int send_key_changed(conn_list_t *cl, conn_list_t *src)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
IP_ADDR_V(src->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin %s to %s (%s)"),
src->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
@ -228,7 +228,7 @@ int send_basic_info(conn_list_t *cl)
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
cl->hostname);
cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %d %lx/%lx:%x %d\n", BASIC_INFO, PROT_CURRENT, myself->vpn_ip, myself->vpn_mask, myself->port, myself->flags);
@ -248,8 +248,8 @@ cp
encrypt_passphrase(&tmp);
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending PASSPHRASE to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
@ -266,8 +266,8 @@ int send_public_key(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
@ -303,14 +303,14 @@ cp
fw = lookup_conn(to);
if(!fw)
{
syslog(LOG_ERR, _("Attempting to send REQ_KEY to " IP_ADDR_S ", which does not exist?"),
syslog(LOG_ERR, _("Attempting to send REQ_KEY to %d.%d.%d.%d, which does not exist?"),
IP_ADDR_V(to));
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending REQ_KEY to " IP_ADDR_S " (%s)"),
IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
syslog(LOG_DEBUG, _("Sending REQ_KEY to %s (%s)"),
fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
@ -333,14 +333,14 @@ cp
if(!fw)
{
syslog(LOG_ERR, _("Attempting to send ANS_KEY to " IP_ADDR_S ", which does not exist?"),
syslog(LOG_ERR, _("Attempting to send ANS_KEY to %d.%d.%d.%d, which does not exist?"),
IP_ADDR_V(to));
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (%s)"),
IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
syslog(LOG_DEBUG, _("Sending ANS_KEY to %s (%s)"),
fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
@ -393,14 +393,16 @@ int basic_info_h(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->hostname);
syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->real_hostname);
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 %s"),
cl->hostname);
cl->real_hostname);
return -1;
}
}
cl->vpn_hostname = hostlookup(htonl(cl->vpn_ip));
if(cl->protocol_version != PROT_CURRENT)
{
@ -432,15 +434,15 @@ cp
if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
{
syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad PASSPHRASE from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
cl->pp->len = strlen(cl->pp->phrase);
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got PASSPHRASE from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
if(cl->status.outgoing)
send_passphrase(cl);
@ -457,14 +459,14 @@ int public_key_h(conn_list_t *cl)
cp
if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
{
syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad PUBLIC_KEY from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got PUBLIC_KEY from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
if(verify_passphrase(cl, g_n))
{
@ -490,8 +492,8 @@ cp
cl->status.active = 1;
if(debug_lvl > 0)
syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
cl->vpn_hostname, cl->real_hostname);
notify_others(cl, NULL, send_add_host);
notify_one(cl);
@ -504,13 +506,13 @@ int ack_h(conn_list_t *cl)
{
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got ACK from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
cl->status.active = 1;
syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
cl->vpn_hostname, cl->real_hostname);
notify_others(cl, NULL, send_add_host);
notify_one(cl);
@ -525,14 +527,14 @@ int termreq_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized TERMREQ from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized TERMREQ from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got TERMREQ from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got TERMREQ from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
cl->status.termreq = 1;
@ -551,14 +553,14 @@ int timeout_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized TIMEOUT from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized TIMEOUT from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got TIMEOUT from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got TIMEOUT from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
cl->status.termreq = 1;
terminate_connection(cl);
@ -573,28 +575,28 @@ int del_host_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized DEL_HOST from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized DEL_HOST from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
{
syslog(LOG_ERR, _("Got bad DEL_HOST from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(!(fw = lookup_conn(vpn_ip)))
{
syslog(LOG_ERR, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s) which does not exist?"),
IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got DEL_HOST for %d.%d.%d.%d from %s (%s) which does not exist?"),
IP_ADDR_V(vpn_ip), cl->vpn_hostname, cl->real_hostname);
return 0;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
IP_ADDR_V(fw->vpn_ip), fw->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
notify_others(fw, cl, send_del_host);
@ -611,14 +613,14 @@ int ping_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized PING from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized PING from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got PING from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got PING from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
cl->status.pinged = 0;
cl->status.got_pong = 1;
@ -633,14 +635,14 @@ int pong_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized PONG from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized PONG from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got PONG from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got PONG from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
cl->status.got_pong = 1;
cp
@ -658,15 +660,15 @@ int add_host_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized ADD_HOST from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized ADD_HOST from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx %d", &real_ip, &vpn_ip, &vpn_mask, &port, &flags) != 5)
{
syslog(LOG_ERR, _("Got bad ADD_HOST from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
@ -675,9 +677,10 @@ cp
ncn = new_conn_list();
ncn->real_ip = real_ip;
ncn->hostname = hostlookup(htonl(real_ip));
ncn->real_hostname = hostlookup(htonl(real_ip));
ncn->vpn_ip = vpn_ip;
ncn->vpn_mask = vpn_mask;
ncn->vpn_hostname = hostlookup(htonl(vpn_ip));
ncn->port = port;
ncn->flags = flags;
ncn->nexthop = cl;
@ -686,8 +689,8 @@ cp
ncn->status.active = 1;
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got ADD_HOST for " IP_ADDR_S " (%s) from " IP_ADDR_S " (%s)"),
IP_ADDR_V(ncn->vpn_ip), ncn->hostname, IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got ADD_HOST for %s (%s) from %s (%s)"),
ncn->vpn_hostname, ncn->real_hostname, cl->vpn_hostname, cl->real_hostname);
notify_others(ncn, cl, send_add_host);
cp
@ -702,21 +705,21 @@ int req_key_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized REQ_KEY from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized REQ_KEY from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
{
syslog(LOG_ERR, _("Got bad REQ_KEY from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got REQ_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got REQ_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
{ /* hey! they want something from ME! :) */
@ -728,14 +731,14 @@ cp
if(!fw)
{
syslog(LOG_ERR, _("Attempting to forward REQ_KEY to " IP_ADDR_S ", which does not exist?"),
syslog(LOG_ERR, _("Attempting to forward REQ_KEY to %d.%d.%d.%d, which does not exist?"),
IP_ADDR_V(to));
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Forwarding REQ_KEY to " IP_ADDR_S " (%s)"),
IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
syslog(LOG_DEBUG, _("Forwarding REQ_KEY to %s (%s)"),
fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
cl->buffer[cl->reqlen-1] = '\n';
@ -793,21 +796,21 @@ int ans_key_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized ANS_KEY from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized ANS_KEY from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(sscanf(cl->buffer, "%*d %lx %lx %d %as", &to, &from, &expiry, &key) != 4)
{
syslog(LOG_ERR, _("Got bad ANS_KEY from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got ANS_KEY origin " IP_ADDR_S " destination " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_DEBUG, _("Got ANS_KEY origin %d.%d.%d.%d destination %d.%d.%d.%d from %s (%s)"),
IP_ADDR_V(from), IP_ADDR_V(to), cl->vpn_hostname, cl->real_hostname);
if(to == myself->vpn_ip)
{ /* hey! that key's for ME! :) */
@ -815,8 +818,8 @@ cp
if(!gk)
{
syslog(LOG_ERR, _("Receiving ANS_KEY from " IP_ADDR_S ", which does not exist?"),
IP_ADDR_V(from));
syslog(LOG_ERR, _("Receiving ANS_KEY origin %d.%d.%d.%d from %s (%s), which does not exist?"),
IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
return -1;
}
@ -831,14 +834,14 @@ cp
if(!fw)
{
syslog(LOG_ERR, _("Attempting to forward ANS_KEY to " IP_ADDR_S ", which does not exist?"),
syslog(LOG_ERR, _("Attempting to forward ANS_KEY to %d.%d.%d.%d, which does not exist?"),
IP_ADDR_V(to));
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Forwarding ANS_KEY to " IP_ADDR_S " (%s)"),
IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
syslog(LOG_DEBUG, _("Forwarding ANS_KEY to %s (%s)"),
fw->nexthop->vpn_hostname, fw->nexthop->real_hostname);
cl->buffer[cl->reqlen-1] = '\n';
@ -858,31 +861,31 @@ int key_changed_h(conn_list_t *cl)
cp
if(!cl->status.active)
{
syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
{
syslog(LOG_ERR, _("Got bad KEY_CHANGED from " IP_ADDR_S " (%s)"),
IP_ADDR_V(cl->vpn_ip), cl->hostname);
syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got KEY_CHANGED origin " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), cl->hostname);
ik = lookup_conn(from);
if(!ik)
{
syslog(LOG_ERR, _("Got KEY_CHANGED from " IP_ADDR_S ", which does not exist?"),
IP_ADDR_V(from));
syslog(LOG_ERR, _("Got KEY_CHANGED origin %d.%d.%d.%d from %s (%s), which does not exist?"),
IP_ADDR_V(from), cl->vpn_hostname, cl->real_hostname);
return -1;
}
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got KEY_CHANGED origin %s from %s (%s)"),
ik->vpn_hostname, cl->vpn_hostname, cl->real_hostname);
ik->status.validkey = 0;
ik->status.waitingforkey = 0;