#include LZO1X_H
#endif
-#include "splay_tree.h"
#include "cipher.h"
#include "conf.h"
#include "connection.h"
static void send_mtu_probe_handler(int fd, short events, void *data) {
node_t *n = data;
- vpn_packet_t packet;
- int len, i;
int timeout = 1;
n->mtuprobes++;
timeout = pingtimeout;
}
- for(i = 0; i < 3 + localdiscovery; i++) {
+ for(int i = 0; i < 3 + localdiscovery; i++) {
+ int len;
+
if(n->maxmtu <= n->minmtu)
len = n->maxmtu;
else
if(len < 64)
len = 64;
+ vpn_packet_t packet;
memset(packet.data, 0, 14);
randomize(packet.data + 14, len - 14);
packet.len = len;
n->status.waitingforkey = false;
send_req_key(n);
}
+ return;
}
uint8_t type = 0;
bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
node_t *to = handle;
- if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY)) {
+ if(type >= SPTPS_HANDSHAKE
+ || ((myself->options | to->options) & OPTION_TCPONLY)
+ || (type != PKT_PROBE && len > to->minmtu)) {
char buf[len * 4 / 3 + 5];
b64encode(data, buf, len);
if(!to->status.validkey)
return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, myself->incompression);
else
- return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
+ return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, type >= SPTPS_HANDSHAKE ? REQ_SPTPS : REQ_PACKET, buf);
}
/* Send the packet */
/* Broadcast a packet using the minimum spanning tree */
void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
- splay_node_t *node;
- connection_t *c;
- node_t *n;
-
// Always give ourself a copy of the packet.
if(from != myself)
send_packet(myself, packet);
// This guarantees all nodes receive the broadcast packet, and
// usually distributes the sending of broadcast packets over all nodes.
case BMODE_MST:
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
-
+ for list_each(connection_t, c, connection_list)
if(c->status.active && c->status.mst && c != from->nexthop->connection)
send_packet(c->node, packet);
- }
break;
// In direct mode, we send copies to each node we know of.
if(from != myself)
break;
- for(node = node_tree->head; node; node = node->next) {
- n = node->data;
-
+ for splay_each(node_t, n, node_tree)
if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
send_packet(n, packet);
- }
break;
default:
static time_t last_hard_try = 0;
time_t now = time(NULL);
- for(node = edge_weight_tree->head; node; node = node->next) {
- e = node->data;
-
+ for splay_each(edge_t, e, edge_weight_tree) {
if(!e->to->status.reachable || e->to == myself)
continue;