projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose the raw SPTPS send interface from net_packet.
[tinc]
/
src
/
net_packet.c
diff --git
a/src/net_packet.c
b/src/net_packet.c
index
245ce62
..
19ad29c
100644
(file)
--- a/
src/net_packet.c
+++ b/
src/net_packet.c
@@
-64,7
+64,7
@@
static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999
static void send_udppacket(node_t *, vpn_packet_t *);
static void send_udppacket(node_t *, vpn_packet_t *);
-unsigned replaywin =
16
;
+unsigned replaywin =
32
;
bool localdiscovery = true;
bool udp_discovery = true;
int udp_discovery_keepalive_interval = 10;
bool localdiscovery = true;
bool udp_discovery = true;
int udp_discovery_keepalive_interval = 10;
@@
-681,7
+681,7
@@
end:
#endif
}
#endif
}
-
static bool send_sptps_data_priv
(node_t *to, node_t *from, int type, const void *data, size_t len) {
+
bool send_sptps_data
(node_t *to, node_t *from, int type, const void *data, size_t len) {
node_t *relay = (to->via != myself && (type == PKT_PROBE || (len - SPTPS_DATAGRAM_OVERHEAD) <= to->via->minmtu)) ? to->via : to->nexthop;
bool direct = from == myself && to == relay;
bool relay_supported = (relay->options >> 24) >= 4;
node_t *relay = (to->via != myself && (type == PKT_PROBE || (len - SPTPS_DATAGRAM_OVERHEAD) <= to->via->minmtu)) ? to->via : to->nexthop;
bool direct = from == myself && to == relay;
bool relay_supported = (relay->options >> 24) >= 4;
@@
-744,10
+744,6
@@
static bool send_sptps_data_priv(node_t *to, node_t *from, int type, const void
return true;
}
return true;
}
-bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
- return send_sptps_data_priv(handle, myself, type, data, len);
-}
-
bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) {
node_t *from = handle;
bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) {
node_t *from = handle;
@@
-1404,8
+1400,8
@@
skip_harder:
/* If we're not the final recipient, relay the packet. */
if(to != myself) {
/* If we're not the final recipient, relay the packet. */
if(to != myself) {
- send_sptps_data
_priv(to, n
, 0, DATA(&pkt), pkt.len - 2 * sizeof(node_id_t));
- try_tx_sptps(
n
, true);
+ send_sptps_data
(to, from
, 0, DATA(&pkt), pkt.len - 2 * sizeof(node_id_t));
+ try_tx_sptps(
to
, true);
return;
}
} else {
return;
}
} else {