#include "system.h"
-#include "splay_tree.h"
#include "cipher.h"
#include "connection.h"
#include "crypto.h"
static bool mykeyused = false;
void send_key_changed(void) {
- splay_node_t *node;
- connection_t *c;
-
send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name);
/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
- if(c->status.active && c->node && c->node->status.reachable) {
- if(!c->node->status.sptps)
- send_ans_key(c->node);
- }
- }
+ for list_each(connection_t, c, connection_list)
+ if(c->status.active && c->node && c->node->status.reachable && !c->node->status.sptps)
+ send_ans_key(c->node);
/* Force key exchange for connections using SPTPS */
if(experimental) {
- for(node = node_tree->head; node; node = node->next) {
- node_t *n = node->data;
+ for splay_each(node_t, n, node_tree)
if(n->status.reachable && n->status.validkey && n->status.sptps)
sptps_force_kex(&n->sptps);
- }
}
}
return true;
}
+ case REQ_PACKET: {
+ if(!from->status.validkey) {
+ logger(DEBUG_PROTOCOL, LOG_ERR, "Got REQ_PACKET from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
+ return true;
+ }
+
+ char buf[MAX_STRING_SIZE];
+ if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", from->name, from->hostname, "invalid SPTPS data");
+ return true;
+ }
+ int len = b64decode(buf, buf, strlen(buf));
+ sptps_receive_data(&from->sptps, buf, len);
+ return true;
+ }
+
default:
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown extended REQ_KEY request from %s (%s): %s", from->name, from->hostname, request);
return true;