projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- More verbose connection list
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
68ac136
..
e70e5cb
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-1,6
+1,7
@@
/*
protocol.c -- handle the meta-protocol
/*
protocol.c -- handle the meta-protocol
- Copyright (C) 1999 Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
+ 2000 Guus Sliepen <guus@sliepen.warande.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,15
+16,20
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
You should have received a copy of the GNU General Public License
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.6 2000/06/25 16:39:17 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
+#include <sys/types.h>
+
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#include <sys/socket.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#include <sys/socket.h>
#include <unistd.h>
+#include <stdio.h>
#include <utils.h>
#include <xalloc.h>
#include <utils.h>
#include <xalloc.h>
@@
-34,38
+40,47
@@
#include "netutl.h"
#include "protocol.h"
#include "netutl.h"
#include "protocol.h"
+#include "system.h"
+
+char buffer[MAXBUFSIZE+1];
+int buflen;
+
+/* Outgoing request routines */
+
int send_ack(conn_list_t *cl)
{
int send_ack(conn_list_t *cl)
{
- unsigned char tmp = ACK;
cp
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Send ACK to %s", cl->hostname);
+ if(debug_lvl > 1)
+ 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);
- syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
- if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)
+ if((write(cl->meta_socket, buffer, buflen)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %d:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %d:%d: %m")
, __FILE__, __LINE__);
return -1;
}
return -1;
}
+
+ syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cp
return 0;
}
int send_termreq(conn_list_t *cl)
{
cp
return 0;
}
int send_termreq(conn_list_t *cl)
{
- termreq_t tmp;
cp
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = TERMREQ;
-
tmp.vpn_ip = myself->vpn_ip
;
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Sending TERMREQ to " IP_ADDR_S " (%s)"),
+
IP_ADDR_V(cl->vpn_ip), cl->hostname)
;
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Send TERMREQ(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
- IP_ADDR_V(cl->vpn_ip));
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
- if(
(write(cl->meta_socket, &tmp, sizeof(tmp))
) < 0)
+ if(
write(cl->meta_socket, buffer, buflen
) < 0)
{
{
- syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+ if(debug_lvl > 1)
+ syslog(LOG_ERR, _("Send failed: %s:%d: %m"), __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-74,19
+89,16
@@
cp
int send_timeout(conn_list_t *cl)
{
int send_timeout(conn_list_t *cl)
{
- termreq_t tmp;
cp
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = PINGTIMEOUT;
-
tmp.vpn_ip = myself->vpn_ip
;
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Sending TIMEOUT to " IP_ADDR_S " (%s)"),
+
IP_ADDR_V(cl->vpn_ip), cl->hostname)
;
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Send TIMEOUT(" IP_ADDR_S ") to " IP_ADDR_S, IP_ADDR_V(tmp.vpn_ip),
- IP_ADDR_V(cl->vpn_ip));
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", PINGTIMEOUT, myself->vpn_ip);
- if((write(cl->meta_socket,
&tmp, sizeof(tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-95,19
+107,16
@@
cp
int send_del_host(conn_list_t *cl, conn_list_t *new_host)
{
int send_del_host(conn_list_t *cl, conn_list_t *new_host)
{
- del_host_t tmp;
cp
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = DEL_HOST;
-
tmp.vpn_ip = new_host->vpn_ip
;
+ if(debug_lvl > 1)
+ 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)
;
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Sending delete host %lx to " IP_ADDR_S,
- tmp.vpn_ip, IP_ADDR_V(cl->vpn_ip));
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", DEL_HOST, new_host->vpn_ip);
- if((write(cl->meta_socket,
&tmp, sizeof(tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-116,14
+125,16
@@
cp
int send_ping(conn_list_t *cl)
{
int send_ping(conn_list_t *cl)
{
- unsigned char tmp = PING;
cp
cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "pinging " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Sending PING to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
- if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d\n", PING);
+
+ if((write(cl->meta_socket, buffer, buflen)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-132,11
+143,16
@@
cp
int send_pong(conn_list_t *cl)
{
int send_pong(conn_list_t *cl)
{
- unsigned char tmp = PONG;
cp
cp
- if((write(cl->meta_socket, &tmp, sizeof(tmp))) < 0)
+ if(debug_lvl > 1)
+ 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);
+
+ if((write(cl->meta_socket, buffer, buflen)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-145,23
+161,37
@@
cp
int send_add_host(conn_list_t *cl, conn_list_t *new_host)
{
int send_add_host(conn_list_t *cl, conn_list_t *new_host)
{
- add_host_t tmp;
+ ip_t real_ip;
+ int flags;
+ char *hostname;
cp
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = ADD_HOST;
- tmp.real_ip = new_host->real_ip;
- tmp.vpn_ip = new_host->vpn_ip;
- tmp.vpn_mask = new_host->vpn_mask;
- tmp.portnr = new_host->port;
+ 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
+ * it's indirectdata flag, we set the INDIRECTDATA flag and unset the EXPORT...
+ * flag, and set it's real_ip to our vpn_ip, so that net.c send_packet() will
+ * work correctly.
+ */
+
+ if(flags & EXPORTINDIRECTDATA)
+ {
+ flags &= ~EXPORTINDIRECTDATA;
+ flags |= INDIRECTDATA;
+ real_ip = myself->vpn_ip;
+ hostname = "myself";
+ }
+
+ 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);
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Sending add host (%lx/%lx %lx:%hd) to " IP_ADDR_S,
- tmp.vpn_ip, tmp.vpn_mask, tmp.real_ip, tmp.portnr,
- IP_ADDR_V(cl->vpn_ip));
+ 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);
- if((write(cl->meta_socket,
&tmp, sizeof(tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-170,55
+200,44
@@
cp
int send_key_changed(conn_list_t *cl, conn_list_t *src)
{
int send_key_changed(conn_list_t *cl, conn_list_t *src)
{
- key_changed_t tmp;
cp
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = KEY_CHANGED;
-
tmp.from = src->vpn_ip
;
+ 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)
;
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Sending KEY_CHANGED (%lx) to " IP_ADDR_S,
- tmp.from, IP_ADDR_V(cl->vpn_ip));
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", KEY_CHANGED, src->vpn_ip);
- if((write(cl->meta_socket,
&tmp, sizeof(tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return 0;
}
return -1;
}
cp
return 0;
}
-void send_key_changed
2
(void)
+void send_key_changed
_all
(void)
{
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
{
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(p->status.meta && p->
protocol_version > PROT_3
)
+ if(p->status.meta && p->
status.active
)
send_key_changed(p, myself);
cp
}
int send_basic_info(conn_list_t *cl)
{
send_key_changed(p, myself);
cp
}
int send_basic_info(conn_list_t *cl)
{
- basic_info_t tmp;
cp
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = BASIC_INFO;
- tmp.protocol = PROT_CURRENT;
-
- tmp.portnr = myself->port;
- tmp.vpn_ip = myself->vpn_ip;
- tmp.vpn_mask = myself->vpn_mask;
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Sending BASIC_INFO to %s"),
+ cl->hostname);
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Send BASIC_INFO(%d,%hd," IP_ADDR_S "," IP_ADDR_S ") to " IP_ADDR_S,
- tmp.protocol, tmp.portnr, IP_ADDR_V(tmp.vpn_ip), IP_ADDR_V(tmp.vpn_mask),
- IP_ADDR_V(cl->real_ip));
+ 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);
- if((write(cl->meta_socket,
&tmp, sizeof(tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-229,17
+248,17
@@
int send_passphrase(conn_list_t *cl)
{
passphrase_t tmp;
cp
{
passphrase_t tmp;
cp
- memset(&tmp, 0, sizeof(tmp));
- tmp.type = PASSPHRASE;
encrypt_passphrase(&tmp);
encrypt_passphrase(&tmp);
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Send PASSPHRASE(%hd,...) to " IP_ADDR_S, tmp.len,
- IP_ADDR_V(cl->vpn_ip));
+ if(debug_lvl > 1)
+ 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);
- if((write(cl->meta_socket,
&tmp, tmp.len+3
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-248,72
+267,59
@@
cp
int send_public_key(conn_list_t *cl)
{
int send_public_key(conn_list_t *cl)
{
- public_key_t *tmp;
cp
cp
- tmp = (public_key_t*)xmalloc(strlen(my_public_key_base36)+sizeof(*tmp));
- memset(tmp, 0, sizeof(*tmp));
- tmp->type = PUBLIC_KEY;
- tmp->len = strlen(my_public_key_base36);
- strcpy(&tmp->key, my_public_key_base36);
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Sending PUBLIC_KEY to " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Send PUBLIC_KEY(%hd,%s) to " IP_ADDR_S, tmp->len, &tmp->key,
- IP_ADDR_V(cl->vpn_ip));
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", PUBLIC_KEY, my_public_key_base36);
- if((write(cl->meta_socket,
tmp, tmp->len+sizeof(*tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return 0;
}
return -1;
}
cp
return 0;
}
+/* WDN doet deze functie? (GS)
int send_calculate(conn_list_t *cl, char *k)
{
int send_calculate(conn_list_t *cl, char *k)
{
- calculate_t *tmp;
cp
cp
- tmp = xmalloc(strlen(k)+sizeof(*tmp));
- memset(tmp, 0, sizeof(*tmp));
- tmp->type = CALCULATE;
- tmp->len = strlen(k);
- strcpy(&tmp->key, k);
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %s\n", CALCULATE, k);
- if((write(cl->meta_socket,
tmp, tmp->len+sizeof(*tmp)
)) < 0)
+ if((write(cl->meta_socket,
buffer, buflen
)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return 0;
}
return -1;
}
cp
return 0;
}
+*/
int send_key_request(ip_t to)
{
int send_key_request(ip_t to)
{
- key_req_t *tmp;
conn_list_t *fw;
cp
conn_list_t *fw;
cp
- tmp = xmalloc(sizeof(*tmp));
- memset(tmp, 0, sizeof(*tmp));
- tmp->type = REQ_KEY;
- tmp->to = to;
- tmp->from = myself->vpn_ip;
- tmp->len = 0;
-
fw = lookup_conn(to);
if(!fw)
{
fw = lookup_conn(to);
if(!fw)
{
- syslog(LOG_ERR,
"Attempting to send key request to " IP_ADDR_S ", which does not exist?"
,
+ syslog(LOG_ERR,
_("Attempting to send REQ_KEY to " IP_ADDR_S ", which does not exist?")
,
IP_ADDR_V(to));
return -1;
}
IP_ADDR_V(to));
return -1;
}
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Sending out request for public key to " IP_ADDR_S,
- IP_ADDR_V(fw->nexthop->vpn_ip));
- if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)) < 0)
+ 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);
+
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx\n", REQ_KEY, to, myself->vpn_ip);
+
+ if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
fw->status.waitingforkey = 1;
return -1;
}
fw->status.waitingforkey = 1;
@@
-323,33
+329,27
@@
cp
int send_key_answer(conn_list_t *cl, ip_t to)
{
int send_key_answer(conn_list_t *cl, ip_t to)
{
- key_req_t *tmp;
conn_list_t *fw;
cp
conn_list_t *fw;
cp
- tmp = xmalloc(sizeof(*tmp)+strlen(my_public_key_base36));
- memset(tmp, 0, sizeof(*tmp));
- tmp->type = ANS_KEY;
- tmp->to = to;
- tmp->from = myself->vpn_ip;
- tmp->expiry = my_key_expiry;
- tmp->len = strlen(my_public_key_base36);
- strcpy(&tmp->key, my_public_key_base36);
fw = lookup_conn(to);
if(!fw)
fw = lookup_conn(to);
if(!fw)
- {
- syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(to));
- return -1;
- }
-
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
- IP_ADDR_V(fw->nexthop->vpn_ip));
- if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)+tmp->len) < 0)
{
{
- syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+ syslog(LOG_ERR, _("Attempting to send ANS_KEY to " IP_ADDR_S ", 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);
+
+ buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx %lx %d %s\n", ANS_KEY, to, myself->vpn_ip, my_key_expiry, my_public_key_base36);
+
+ if((write(fw->nexthop->meta_socket, buffer, buflen)) < 0)
+ {
+ syslog(LOG_ERR, _("send failed: %s:%d: %m"), __FILE__, __LINE__);
return -1;
}
cp
return -1;
}
cp
@@
-367,7
+367,7
@@
int notify_others(conn_list_t *new, conn_list_t *source,
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(p != new && p != source && p->status.meta && p->
protocol_version > PROT_3
)
+ if(p != new && p != source && p->status.meta && p->
status.active
)
function(p, new);
cp
return 0;
function(p, new);
cp
return 0;
@@
-382,7
+382,7
@@
int notify_one(conn_list_t *new)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(p != new && p->
protocol_version > PROT_3
)
+ if(p != new && p->
status.active
)
send_add_host(new, p);
cp
return 0;
send_add_host(new, p);
cp
return 0;
@@
-392,29
+392,26
@@
cp
The incoming request handlers
*/
The incoming request handlers
*/
-int basic_info_h(conn_list_t *cl
, unsigned char *d, int len
)
+int basic_info_h(conn_list_t *cl)
{
{
- basic_info_t *tmp = (basic_info_t*)d;
cp
cp
- cl->protocol_version = tmp->protocol;
- cl->port = tmp->portnr;
- cl->vpn_ip = tmp->vpn_ip;
- cl->vpn_mask = tmp->vpn_mask;
+ if(debug_lvl > 1)
+ 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),
+ cl->hostname);
+ return -1;
+ }
- if(cl->protocol_version
<
PROT_CURRENT)
+ if(cl->protocol_version
!=
PROT_CURRENT)
{
{
- syslog(LOG_ERR,
"Peer uses protocol version %d which is too old."
,
+ syslog(LOG_ERR,
_("Peer uses incompatible protocol version %d")
,
cl->protocol_version);
return -1;
}
cl->protocol_version);
return -1;
}
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got BASIC_INFO(%hd," IP_ADDR_S "," IP_ADDR_S ")", cl->port,
- IP_ADDR_V(cl->vpn_ip), IP_ADDR_V(cl->vpn_mask));
- if(debug_lvl > 1)
- syslog(LOG_DEBUG, "Peer uses protocol version %d",
- cl->protocol_version);
-
if(cl->status.outgoing)
{
if(setup_vpn_connection(cl) < 0)
if(cl->status.outgoing)
{
if(setup_vpn_connection(cl) < 0)
@@
-427,21
+424,26
@@
cp
return -1;
send_passphrase(cl);
}
return -1;
send_passphrase(cl);
}
-
- cl->status.active = 0;
cp
return 0;
}
cp
return 0;
}
-int passphrase_h(conn_list_t *cl
, unsigned char *d, int len
)
+int passphrase_h(conn_list_t *cl)
{
{
- passphrase_t *tmp = (passphrase_t*)d;
cp
cp
- cl->pp = xmalloc(tmp->len+3);
- memcpy(cl->pp, tmp, tmp->len+3);
+ cl->pp = xmalloc(sizeof(*(cl->pp)));
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got PASSPHRASE(%hd,...)", cl->pp->len);
+ 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);
+ 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);
if(cl->status.outgoing)
send_passphrase(cl);
if(cl->status.outgoing)
send_passphrase(cl);
@@
-451,86
+453,137
@@
cp
return 0;
}
return 0;
}
-int public_key_h(conn_list_t *cl
, unsigned char *d, int len
)
+int public_key_h(conn_list_t *cl)
{
char *g_n;
{
char *g_n;
-
public_key_t *tmp = (public_key_t*)
d;
+
conn_list_t *ol
d;
cp
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got PUBLIC_KEY(%hd,%s)", tmp->len, &tmp->key);
+ 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);
+ return -1;
+ }
- g_n = xmalloc(tmp->len+1);
- strcpy(g_n, &tmp->key);
+ if(debug_lvl > 1)
+ 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))
{
/* intruder! */
if(verify_passphrase(cl, g_n))
{
/* intruder! */
- syslog(LOG_ERR,
"Intruder: passphrase does not match."
);
+ syslog(LOG_ERR,
_("Intruder: passphrase does not match!")
);
return -1;
}
return -1;
}
- if(debug_lvl > 2)
- syslog(LOG_INFO, "Passphrase OK");
-
if(cl->status.outgoing)
send_public_key(cl);
else
if(cl->status.outgoing)
send_public_key(cl);
else
- send_ack(cl);
+ {
+ send_ack(cl);
- cl->status.active = 1;
- notify_others(cl, NULL, send_add_host);
- notify_one(cl);
+ /* Okay, before we active the connection, we check if there is another entry
+ in the connection list with the same vpn_ip. If so, it presumably is an
+ old connection that has timed out but we don't know it yet. Because our
+ conn_list entry is not active, lookup_conn will skip ourself. */
+
+ while(old=lookup_conn(cl->vpn_ip))
+ terminate_connection(old);
+
+ cl->status.active = 1;
+ notify_others(cl, NULL, send_add_host);
+ notify_one(cl);
+ }
cp
return 0;
}
cp
return 0;
}
-int ack_h(conn_list_t *cl
, unsigned char *d, int len
)
+int ack_h(conn_list_t *cl)
{
cp
{
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got ACK");
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Got ACK from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cl->status.active = 1;
cl->status.active = 1;
- syslog(LOG_NOTICE, "Connection with %s activated.", cl->hostname);
+ syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
cp
return 0;
}
cp
return 0;
}
-int termreq_h(conn_list_t *cl
, unsigned char *d, int len
)
+int termreq_h(conn_list_t *cl)
{
cp
{
cp
- syslog(LOG_NOTICE, IP_ADDR_S " wants to quit", IP_ADDR_V(cl->vpn_ip));
+ 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 " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
cl->status.termreq = 1;
cl->status.termreq = 1;
-
terminate_connection(cl)
;
+
cl->status.active = 0
;
- notify_others(cl, NULL, send_del_host);
+ if(cl->status.active)
+ notify_others(cl, NULL, send_del_host);
+
+ terminate_connection(cl);
cp
return 0;
}
cp
return 0;
}
-int timeout_h(conn_list_t *cl
, unsigned char *d, int len
)
+int timeout_h(conn_list_t *cl)
{
cp
{
cp
- syslog(LOG_NOTICE, IP_ADDR_S " says it's gotten a timeout from us", IP_ADDR_V(cl->vpn_ip));
+ 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 " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
cl->status.termreq = 1;
terminate_connection(cl);
cp
return 0;
}
cl->status.termreq = 1;
terminate_connection(cl);
cp
return 0;
}
-int del_host_h(conn_list_t *cl
, unsigned char *d, int len
)
+int del_host_h(conn_list_t *cl)
{
{
-
del_host_t *tmp = (del_host_t*)d
;
+
ip_t vpn_ip
;
conn_list_t *fw;
cp
conn_list_t *fw;
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got DEL_HOST for " IP_ADDR_S,
- IP_ADDR_V(tmp->vpn_ip));
+ 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(
!(fw = lookup_conn(tmp->vpn_ip))
)
+ if(
sscanf(cl->buffer, "%*d %lx", &vpn_ip) != 1
)
{
{
- syslog(LOG_ERR, "Somebody wanted to delete " IP_ADDR_S " which does not exist?",
- IP_ADDR_V(tmp->vpn_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 " (%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 " (%s) which does not exist?"),
+ IP_ADDR_V(vpn_ip), IP_ADDR_V(cl->vpn_ip), cl->hostname);
return 0;
}
return 0;
}
@@
-542,11
+595,20
@@
cp
return 0;
}
return 0;
}
-int ping_h(conn_list_t *cl
, unsigned char *d, int len
)
+int ping_h(conn_list_t *cl)
{
cp
{
cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "responding to ping from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+ 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 " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
cl->status.pinged = 0;
cl->status.got_pong = 1;
cl->status.pinged = 0;
cl->status.got_pong = 1;
@@
-555,42
+617,72
@@
cp
return 0;
}
return 0;
}
-int pong_h(conn_list_t *cl
, unsigned char *d, int len
)
+int pong_h(conn_list_t *cl)
{
cp
{
cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "ok, got pong from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
+ 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 " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
+
cl->status.got_pong = 1;
cp
return 0;
}
cl->status.got_pong = 1;
cp
return 0;
}
-int add_host_h(conn_list_t *cl
, unsigned char *d, int len
)
+int add_host_h(conn_list_t *cl)
{
{
- add_host_t *tmp = (add_host_t*)d;
+ ip_t real_ip;
+ ip_t vpn_ip;
+ ip_t vpn_mask;
+ unsigned short port;
+ int flags;
conn_list_t *ncn, *fw;
cp
conn_list_t *ncn, *fw;
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Add host request from " IP_ADDR_S, IP_ADDR_V(cl->vpn_ip));
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "got ADD_HOST(" IP_ADDR_S "," IP_ADDR_S ",%hd)",
- IP_ADDR_V(tmp->vpn_ip), IP_ADDR_V(tmp->vpn_mask), tmp->portnr);
+ if(!cl->status.active)
+ {
+ 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 " (%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 " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
/*
Suggestion of Hans Bayle
*/
/*
Suggestion of Hans Bayle
*/
- if((fw = lookup_conn(
tmp->
vpn_ip)))
+ if((fw = lookup_conn(vpn_ip)))
{
{
- notify_others(fw, cl, send_add_host);
+ if(fw->nexthop == cl)
+ notify_others(fw, cl, send_add_host);
+ else
+ syslog(LOG_DEBUG, _("Invalid ADD_HOST from " IP_ADDR_S " (%s)"),
+ IP_ADDR_V(cl->vpn_ip), cl->hostname);
return 0;
}
ncn = new_conn_list();
return 0;
}
ncn = new_conn_list();
- ncn->real_ip = tmp->real_ip;
- ncn->vpn_ip = tmp->vpn_ip;
- ncn->vpn_mask = tmp->vpn_mask;
- ncn->port = tmp->portnr;
- ncn->hostname = hostlookup(tmp->real_ip);
+ ncn->real_ip = real_ip;
+ ncn->hostname = hostlookup(real_ip);
+ ncn->vpn_ip = vpn_ip;
+ ncn->vpn_mask = vpn_mask;
+ ncn->port = port;
+ ncn->flags = flags;
ncn->nexthop = cl;
ncn->next = conn_list;
conn_list = ncn;
ncn->nexthop = cl;
ncn->next = conn_list;
conn_list = ncn;
@@
-600,43
+692,61
@@
cp
return 0;
}
return 0;
}
-int req_key_h(conn_list_t *cl
, unsigned char *d, int len
)
+int req_key_h(conn_list_t *cl)
{
{
- key_req_t *tmp = (key_req_t*)d;
+ ip_t to;
+ ip_t from;
conn_list_t *fw;
cp
conn_list_t *fw;
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got REQ_KEY from " IP_ADDR_S " for " IP_ADDR_S,
- IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+ 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((tmp->to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
+ 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);
+ 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);
+
+ if((to & myself->vpn_mask) == (myself->vpn_ip & myself->vpn_mask))
{ /* hey! they want something from ME! :) */
{ /* hey! they want something from ME! :) */
- send_key_answer(cl,
tmp->
from);
+ send_key_answer(cl, from);
return 0;
}
return 0;
}
- fw = lookup_conn(t
mp->t
o);
+ fw = lookup_conn(to);
if(!fw)
{
if(!fw)
{
- syslog(LOG_ERR,
"Attempting to forward key request to " IP_ADDR_S ", which does not exist?"
,
- IP_ADDR_V(t
mp->t
o));
+ syslog(LOG_ERR,
_("Attempting to forward REQ_KEY to " IP_ADDR_S ", which does not exist?")
,
+ IP_ADDR_V(to));
return -1;
}
return -1;
}
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
- IP_ADDR_V(fw->nexthop->vpn_ip));
- if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)) < 0)
+ 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);
+
+ cl->buffer[cl->reqlen-1] = '\n';
+
+ if(write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return 0;
}
return -1;
}
cp
return 0;
}
-void set_keys(conn_list_t *cl,
key_req_t *k
)
+void set_keys(conn_list_t *cl,
int expiry, char *key
)
{
char *ek;
cp
{
char *ek;
cp
@@
-645,108
+755,141
@@
cp
cl->public_key = xmalloc(sizeof(*cl->key));
cl->public_key->key = NULL;
}
cl->public_key = xmalloc(sizeof(*cl->key));
cl->public_key->key = NULL;
}
+
if(cl->public_key->key)
free(cl->public_key->key);
if(cl->public_key->key)
free(cl->public_key->key);
- cl->public_key->length =
k->len
;
- cl->public_key->expiry =
k->
expiry;
- cl->public_key->key = xmalloc(
k->len
+ 1);
- strcpy(cl->public_key->key,
&(k->key)
);
+ cl->public_key->length =
strlen(key)
;
+ cl->public_key->expiry = expiry;
+ cl->public_key->key = xmalloc(
cl->public_key->length
+ 1);
+ strcpy(cl->public_key->key,
key
);
- ek = make_shared_key(&(k->key));
+ ek = make_shared_key(key);
+
if(!cl->key)
{
cl->key = xmalloc(sizeof(*cl->key));
cl->key->key = NULL;
}
if(!cl->key)
{
cl->key = xmalloc(sizeof(*cl->key));
cl->key->key = NULL;
}
+
if(cl->key->key)
free(cl->key->key);
if(cl->key->key)
free(cl->key->key);
+
cl->key->length = strlen(ek);
cl->key->length = strlen(ek);
- cl->key->expiry =
k->
expiry;
- cl->key->key = xmalloc(
strlen(ek)
+ 1);
+ cl->key->expiry = expiry;
+ cl->key->key = xmalloc(
cl->key->length
+ 1);
strcpy(cl->key->key, ek);
cp
}
strcpy(cl->key->key, ek);
cp
}
-int ans_key_h(conn_list_t *cl
, unsigned char *d, int len
)
+int ans_key_h(conn_list_t *cl)
{
{
- key_req_t *tmp = (key_req_t*)d;
+ ip_t to;
+ ip_t from;
+ int expiry;
+ char *key;
conn_list_t *fw, *gk;
cp
conn_list_t *fw, *gk;
cp
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,
- IP_ADDR_V(tmp->from), IP_ADDR_V(tmp->to));
+ 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 " (%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 " (%s)"),
+ IP_ADDR_V(from), IP_ADDR_V(to), IP_ADDR_V(cl->vpn_ip), cl->hostname);
- if(t
mp->t
o == myself->vpn_ip)
+ if(to == myself->vpn_ip)
{ /* hey! that key's for ME! :) */
{ /* hey! that key's for ME! :) */
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");
- gk = lookup_conn(tmp->from);
+ gk = lookup_conn(from);
if(!gk)
{
if(!gk)
{
- syslog(LOG_ERR,
"Receiving key from " IP_ADDR_S ", which does not exist?"
,
- IP_ADDR_V(
tmp->
from));
+ syslog(LOG_ERR,
_("Receiving ANS_KEY from " IP_ADDR_S ", which does not exist?")
,
+ IP_ADDR_V(from));
return -1;
}
return -1;
}
- set_keys(gk,
tmp
);
+ set_keys(gk,
expiry, key
);
gk->status.validkey = 1;
gk->status.waitingforkey = 0;
flush_queues(gk);
return 0;
}
gk->status.validkey = 1;
gk->status.waitingforkey = 0;
flush_queues(gk);
return 0;
}
- fw = lookup_conn(t
mp->t
o);
+ fw = lookup_conn(to);
if(!fw)
if(!fw)
- {
- syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
- IP_ADDR_V(tmp->to));
- return -1;
- }
+ {
+ syslog(LOG_ERR, _("Attempting to forward ANS_KEY to " IP_ADDR_S ", 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);
+
+ cl->buffer[cl->reqlen-1] = '\n';
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
- IP_ADDR_V(fw->nexthop->vpn_ip));
- if(write(fw->nexthop->meta_socket, tmp, sizeof(*tmp)+tmp->len) < 0)
+ if((write(fw->nexthop->meta_socket, cl->buffer, cl->reqlen)) < 0)
{
{
- syslog(LOG_ERR,
"send failed: %s:%d: %m"
, __FILE__, __LINE__);
+ syslog(LOG_ERR,
_("Send failed: %s:%d: %m")
, __FILE__, __LINE__);
return -1;
}
cp
return 0;
}
return -1;
}
cp
return 0;
}
-int key_changed_h(conn_list_t *cl
, unsigned char *d, int len
)
+int key_changed_h(conn_list_t *cl)
{
{
-
key_changed_t *tmp = (key_changed_t*)d
;
+
ip_t from
;
conn_list_t *ik;
cp
conn_list_t *ik;
cp
- if(debug_lvl > 2)
- syslog(LOG_DEBUG, "got KEY_CHANGED from " IP_ADDR_S,
- IP_ADDR_V(tmp->from));
+ 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 " (%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 " (%s)"),
+ IP_ADDR_V(from), IP_ADDR_V(cl->vpn_ip), cl->hostname);
- ik = lookup_conn(
tmp->
from);
+ ik = lookup_conn(from);
if(!ik)
{
if(!ik)
{
- syslog(LOG_ERR,
"Got changed key from " IP_ADDR_S ", which does not exist?"
,
- IP_ADDR_V(
tmp->
from));
+ syslog(LOG_ERR,
_("Got KEY_CHANGED from " IP_ADDR_S ", which does not exist?")
,
+ IP_ADDR_V(from));
return -1;
}
ik->status.validkey = 0;
ik->status.waitingforkey = 0;
return -1;
}
ik->status.validkey = 0;
ik->status.waitingforkey = 0;
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, "Forwarding key invalidation request");
-
notify_others(cl, ik, send_key_changed);
cp
return 0;
}
notify_others(cl, ik, send_key_changed);
cp
return 0;
}
-int (*request_handlers[256])(conn_list_t*
, unsigned char*, int
) = {
+int (*request_handlers[256])(conn_list_t*) = {
0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, ack_h, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,