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.2 2000/06/25 15:16:12 guus Exp $
+ $Id: protocol.c,v 1.28.4.10 2000/06/27 12:58:04 guus Exp $
*/
#include "config.h"
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending ACK to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", ACK);
return -1;
}
- syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (" IP_ADDR_S ") activated"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ if(debug_lvl > 0)
+ syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cp
return 0;
}
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending DEL_HOST for " IP_ADDR_S " to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending PONG to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PONG);
{
ip_t real_ip;
int flags;
+ char *hostname;
cp
real_ip = new_host->real_ip;
+ hostname = new_host->hostname;
flags = new_host->flags;
/* If we need to propagate information about a new host that wants us to export
flags &= ~EXPORTINDIRECTDATA;
flags |= INDIRECTDATA;
real_ip = myself->vpn_ip;
+ hostname = myself->hostname;
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ADD_HOST for " IP_ADDR_S " (" IP_ADDR_S ") to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(new_host->vpn_ip), IP_ADDR_V(real_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ 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);
- buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx/%lx:%x %d\n", ADD_HOST, new_host->real_ip, new_host->vpn_ip, new_host->vpn_mask, new_host->port, flags);
+ 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);
if((write(cl->meta_socket, buffer, buflen)) < 0)
{
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending KEY_CHANGED origin " IP_ADDR_S " to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(src->vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ 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);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending BASIC_INFO to " IP_ADDR_S),
- IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
+ cl->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);
encrypt_passphrase(&tmp);
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending PASSPHRASE to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PASSPHRASE, tmp.phrase);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending REQ_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
+ syslog(LOG_DEBUG, _("Sending REQ_KEY to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
+ syslog(LOG_DEBUG, _("Sending ANS_KEY to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got BASIC_INFO from " IP_ADDR_S), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->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 " IP_ADDR_S),
- IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
+ cl->hostname);
+ if(cl->status.outgoing)
+ {
+ /* If we get here, it means that our uplink uses the wrong protocol.
+ If we don't do anything, we will reconnect every 5 seconds. Pretty dumb.
+ So we disable the outgoing flag, so that we won't reconnect anymore.
+ This still allows other tinc daemons to connect to us.
+ */
+ syslog(LOG_ERR, _("Warning: disabling uplink!"));
+ cl->status.outgoing = 0;
+ }
return -1;
}
if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
{
- syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad PASSPHRASE from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
return -1;
}
cl->pp->len = strlen(cl->pp->phrase);
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got PASSPHRASE from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
if(cl->status.outgoing)
send_passphrase(cl);
cp
if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
{
- syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad PUBLIC_KEY from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
return -1;
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got PUBLIC_KEY from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
if(verify_passphrase(cl, g_n))
{
{
cp
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.active = 1;
- syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (" IP_ADDR_S ") activated"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cp
return 0;
}
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);
+ return -1;
+ }
+
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got TERMREQ from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got TERMREQ from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.termreq = 1;
- terminate_connection(cl);
- notify_others(cl, NULL, send_del_host);
+ if(cl->status.active)
+ notify_others(cl, NULL, send_del_host);
+
+ cl->status.active = 0;
+
+ terminate_connection(cl);
cp
return 0;
}
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);
+ return -1;
+ }
+
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got TIMEOUT from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got TIMEOUT from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.termreq = 1;
terminate_connection(cl);
ip_t vpn_ip;
conn_list_t *fw;
cp
- if(!cl->status.active) return -1;
+ if(!cl->status.active)
+ {
+ syslog(LOG_ERR, _("Got unauthorized DEL_HOST from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ return -1;
+ }
if(sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1)
{
- syslog(LOG_ERR, _("Got bad DEL_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad DEL_HOST from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
return -1;
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
if(!(fw = lookup_conn(vpn_ip)))
{
- syslog(LOG_ERR, _("Got DEL_HOST for " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ") which does not exist?"),
- IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_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);
return 0;
}
- notify_others(cl, fw, send_del_host);
+ notify_others(fw, cl, send_del_host);
fw->status.termreq = 1;
+ fw->status.active = 0;
+
terminate_connection(fw);
cp
return 0;
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);
+ return -1;
+ }
+
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PING from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got PING from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.pinged = 0;
cl->status.got_pong = 1;
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);
+ return -1;
+ }
+
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got PONG from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_DEBUG, _("Got PONG from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.got_pong = 1;
cp
conn_list_t *ncn, *fw;
cp
if(!cl->status.active)
- return -1;
+ {
+ syslog(LOG_ERR, _("Got unauthorized ADD_HOST from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->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 " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad ADD_HOST from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
return -1;
}
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got ADD_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
-
/*
Suggestion of Hans Bayle
*/
if(fw->nexthop == cl)
notify_others(fw, cl, send_add_host);
else
- syslog(LOG_DEBUG, _("Invalid ADD_HOST from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
- return 0;
+ syslog(LOG_DEBUG, _("Invalid ADD_HOST from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ return -1;
}
ncn = new_conn_list();
ncn->real_ip = real_ip;
+ ncn->hostname = hostlookup(htonl(real_ip));
ncn->vpn_ip = vpn_ip;
ncn->vpn_mask = vpn_mask;
ncn->port = port;
ncn->next = conn_list;
conn_list = ncn;
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);
+
notify_others(ncn, cl, send_add_host);
cp
return 0;
ip_t from;
conn_list_t *fw;
cp
- if(!cl->status.active) return -1;
+ if(!cl->status.active)
+ {
+ syslog(LOG_ERR, _("Got unauthorized REQ_KEY from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ return -1;
+ }
+
if(sscanf(cl->buffer, "%*d %lx %lx", &to, &from) != 2)
{
- syslog(LOG_ERR, _("Got bad REQ_KEY from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad REQ_KEY from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->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 " (" IP_ADDR_S ")"),
- IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ 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);
if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
{ /* hey! they want something from ME! :) */
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Forwarding REQ_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
+ syslog(LOG_DEBUG, _("Forwarding REQ_KEY to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
cl->buffer[cl->reqlen-1] = '\n';
char *key;
conn_list_t *fw, *gk;
cp
- if(!cl->status.active) return -1;
+ if(!cl->status.active)
+ {
+ syslog(LOG_ERR, _("Got unauthorized ANS_KEY from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->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 " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad ANS_KEY from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->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 " (" IP_ADDR_S ")"),
- IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ 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);
if(to == myself->vpn_ip)
{ /* hey! that key's for ME! :) */
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Forwarding ANS_KEY to " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(fw->nexthop->vpn_ip), IP_ADDR_V(fw->nexthop->real_ip));
+ syslog(LOG_DEBUG, _("Forwarding ANS_KEY to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(fw->nexthop->vpn_ip), fw->nexthop->hostname);
cl->buffer[cl->reqlen-1] = '\n';
ip_t from;
conn_list_t *ik;
cp
- if(!cl->status.active) return -1;
+ if(!cl->status.active)
+ {
+ syslog(LOG_ERR, _("Got unauthorized KEY_CHANGED from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+ return -1;
+ }
+
if(sscanf(cl->buffer, "%*d %lx", &from) != 1)
{
- syslog(LOG_ERR, _("Got bad KEY_CHANGED from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ syslog(LOG_ERR, _("Got bad KEY_CHANGED from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
return -1;
}
if(debug_lvl > 1)
- syslog(LOG_DEBUG, _("Got KEY_CHANGED origin " IP_ADDR_S " from " IP_ADDR_S " (" IP_ADDR_S ")"),
- IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->real_ip));
+ 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);
ik->status.validkey = 0;
ik->status.waitingforkey = 0;
- notify_others(cl, ik, send_key_changed);
+ notify_others(ik, cl, send_key_changed);
cp
return 0;
}