X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=f3809e87f191e0866ec93e6d2b2afb177c9ee0a1;hb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;hp=583835b928ef01425b32be554a3c945e5dfe55e0;hpb=cd773445d9117289614743597840591105f01dab;p=meshlink diff --git a/src/net_packet.c b/src/net_packet.c index 583835b9..f3809e87 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -23,13 +23,12 @@ #include #endif -#include "cipher.h" #include "conf.h" #include "connection.h" #include "crypto.h" -#include "digest.h" #include "graph.h" #include "logger.h" +#include "meshlink_internal.h" #include "net.h" #include "netutl.h" #include "protocol.h" @@ -39,11 +38,9 @@ int keylifetime = 0; -static void send_udppacket(node_t *, vpn_packet_t *); +static void send_udppacket(meshlink_handle_t *mesh, node_t *, vpn_packet_t *); unsigned replaywin = 16; -bool localdiscovery = false; -sockaddr_t localdiscovery_address; #define MAX_SEQNO 1073741824 @@ -63,7 +60,8 @@ sockaddr_t localdiscovery_address; */ -static void send_mtu_probe_handler(void *data) { +static void send_mtu_probe_handler(event_loop_t *loop, void *data) { + meshlink_handle_t *mesh = loop->data; node_t *n = data; int timeout = 1; @@ -78,7 +76,7 @@ static void send_mtu_probe_handler(void *data) { if(n->mtuprobes > 32) { if(!n->minmtu) { n->mtuprobes = 31; - timeout = pinginterval; + timeout = mesh->pinginterval; goto end; } @@ -105,13 +103,13 @@ static void send_mtu_probe_handler(void *data) { } if(n->mtuprobes == 31) { - timeout = pinginterval; + timeout = mesh->pinginterval; goto end; } else if(n->mtuprobes == 32) { - timeout = pingtimeout; + timeout = mesh->pingtimeout; } - for(int i = 0; i < 4 + localdiscovery; i++) { + for(int i = 0; i < 4 + mesh->localdiscovery; i++) { int len; if(i == 0) { @@ -128,15 +126,15 @@ static void send_mtu_probe_handler(void *data) { len = 64; vpn_packet_t packet; + packet.probe = true; memset(packet.data, 0, 14); randomize(packet.data + 14, len - 14); packet.len = len; - packet.priority = 0; n->status.broadcast = i >= 4 && n->mtuprobes <= 10 && n->prevedge; logger(DEBUG_TRAFFIC, LOG_INFO, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname); - send_udppacket(n, &packet); + send_udppacket(mesh, n, &packet); } n->status.broadcast = false; @@ -156,15 +154,15 @@ static void send_mtu_probe_handler(void *data) { n->prev_received = n->received; end: - timeout_set(&n->mtutimeout, &(struct timeval){timeout, rand() % 100000}); + timeout_set(&mesh->loop, &n->mtutimeout, &(struct timeval){timeout, rand() % 100000}); } -void send_mtu_probe(node_t *n) { - timeout_add(&n->mtutimeout, send_mtu_probe_handler, n, &(struct timeval){1, 0}); - send_mtu_probe_handler(n); +void send_mtu_probe(meshlink_handle_t *mesh, node_t *n) { + timeout_add(&mesh->loop, &n->mtutimeout, send_mtu_probe_handler, n, &(struct timeval){1, 0}); + send_mtu_probe_handler(&mesh->loop, n); } -static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) { +static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet, uint16_t len) { logger(DEBUG_TRAFFIC, LOG_INFO, "Got MTU probe length %d from %s (%s)", packet->len, n->name, n->hostname); if(!packet->data[0]) { @@ -177,7 +175,7 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) { bool udp_confirmed = n->status.udp_confirmed; n->status.udp_confirmed = true; - send_udppacket(n, packet); + send_udppacket(mesh, n, packet); n->status.udp_confirmed = udp_confirmed; } else { /* It's a valid reply: now we know bidirectional communication @@ -231,7 +229,7 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) { } } -static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) { +static uint16_t compress_packet(uint8_t *dest, const uint8_t *source, uint16_t len, int level) { if(level == 0) { memcpy(dest, source, len); return len; @@ -252,7 +250,7 @@ static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t l return -1; } -static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) { +static uint16_t uncompress_packet(uint8_t *dest, const uint8_t *source, uint16_t len, int level) { if(level == 0) { memcpy(dest, source, len); return len; @@ -274,74 +272,65 @@ static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t /* VPN packet I/O */ -static void receive_packet(node_t *n, vpn_packet_t *packet) { +static void receive_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) { logger(DEBUG_TRAFFIC, LOG_DEBUG, "Received packet of %d bytes from %s (%s)", packet->len, n->name, n->hostname); n->in_packets++; n->in_bytes += packet->len; - route(n, packet); + route(mesh, n, packet); } -static bool try_mac(node_t *n, const vpn_packet_t *inpkt) { - return sptps_verify_datagram(&n->sptps, (char *)&inpkt->seqno, inpkt->len); +static bool try_mac(meshlink_handle_t *mesh, node_t *n, const vpn_packet_t *inpkt) { + return sptps_verify_datagram(&n->sptps, inpkt->data, inpkt->len); } -static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) { - vpn_packet_t pkt1, pkt2; - vpn_packet_t *pkt[] = { &pkt1, &pkt2, &pkt1, &pkt2 }; - int nextpkt = 0; - vpn_packet_t *outpkt = pkt[0]; - size_t outlen; - +static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *inpkt) { if(!n->sptps.state) { if(!n->status.waitingforkey) { logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got packet from %s (%s) but we haven't exchanged keys yet", n->name, n->hostname); - send_req_key(n); + send_req_key(mesh, n); } else { logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got packet from %s (%s) but he hasn't got our key yet", n->name, n->hostname); } return; } - sptps_receive_data(&n->sptps, (char *)&inpkt->seqno, inpkt->len); + sptps_receive_data(&n->sptps, inpkt->data, inpkt->len); } -void receive_tcppacket(connection_t *c, const char *buffer, int len) { +void receive_tcppacket(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int len) { vpn_packet_t outpkt; if(len > sizeof outpkt.data) return; outpkt.len = len; - if(c->options & OPTION_TCPONLY) - outpkt.priority = 0; - else - outpkt.priority = -1; + outpkt.tcp = true; memcpy(outpkt.data, buffer, len); - receive_packet(c->node, &outpkt); + receive_packet(mesh, c->node, &outpkt); } -static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) { +static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) { if(!n->status.validkey) { logger(DEBUG_TRAFFIC, LOG_INFO, "No valid key known yet for %s (%s)", n->name, n->hostname); if(!n->status.waitingforkey) - send_req_key(n); - else if(n->last_req_key + 10 < now.tv_sec) { + send_req_key(mesh, n); + else if(n->last_req_key + 10 < mesh->loop.now.tv_sec) { logger(DEBUG_ALWAYS, LOG_DEBUG, "No key from %s after 10 seconds, restarting SPTPS", n->name); sptps_stop(&n->sptps); n->status.waitingforkey = false; - send_req_key(n); + send_req_key(mesh, n); } return; } uint8_t type = 0; - // TODO: use a better way to signal that this is a PMTU probe - if(!(origpkt->data[12] | origpkt->data[13])) { - sptps_send_record(&n->sptps, PKT_PROBE, (char *)origpkt->data, origpkt->len); + // If it's a probe, send it immediately without trying to compress it. + if(origpkt->probe) { + sptps_send_record(&n->sptps, PKT_PROBE, origpkt->data, origpkt->len); return; } @@ -358,11 +347,11 @@ static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) { } } - sptps_send_record(&n->sptps, type, (char *)origpkt->data, origpkt->len); + sptps_send_record(&n->sptps, type, origpkt->data, origpkt->len); return; } -static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock) { +static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock) { /* Latest guess */ *sa = &n->address; *sock = n->sock; @@ -397,13 +386,13 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock if(candidate) { *sa = &candidate->address; - *sock = rand() % listen_sockets; + *sock = rand() % mesh->listen_sockets; } /* Make sure we have a suitable socket for the chosen address */ - if(listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) { - for(int i = 0; i < listen_sockets; i++) { - if(listen_socket[i].sa.sa.sa_family == (*sa)->sa.sa_family) { + if(mesh->listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) { + for(int i = 0; i < mesh->listen_sockets; i++) { + if(mesh->listen_socket[i].sa.sa.sa_family == (*sa)->sa.sa_family) { *sock = i; break; } @@ -411,7 +400,7 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock } } -static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int *sock) { +static void choose_broadcast_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock) { static sockaddr_t broadcast_ipv4 = { .in = { .sin_family = AF_INET, @@ -428,21 +417,21 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int } }; - *sock = rand() % listen_sockets; + *sock = rand() % mesh->listen_sockets; - if(listen_socket[*sock].sa.sa.sa_family == AF_INET6) { - if(localdiscovery_address.sa.sa_family == AF_INET6) { - localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port; - *sa = &localdiscovery_address; + if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) { + if(mesh->localdiscovery_address.sa.sa_family == AF_INET6) { + mesh->localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port; + *sa = &mesh->localdiscovery_address; } else { broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port; - broadcast_ipv6.in6.sin6_scope_id = listen_socket[*sock].sa.in6.sin6_scope_id; + broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id; *sa = &broadcast_ipv6; } } else { - if(localdiscovery_address.sa.sa_family == AF_INET) { - localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port; - *sa = &localdiscovery_address; + if(mesh->localdiscovery_address.sa.sa_family == AF_INET) { + mesh->localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port; + *sa = &mesh->localdiscovery_address; } else { broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port; *sa = &broadcast_ipv4; @@ -450,42 +439,31 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int } } -static void send_udppacket(node_t *n, vpn_packet_t *origpkt) { - vpn_packet_t pkt1, pkt2; - vpn_packet_t *pkt[] = { &pkt1, &pkt2, &pkt1, &pkt2 }; - vpn_packet_t *inpkt = origpkt; - int nextpkt = 0; - vpn_packet_t *outpkt; - int origlen = origpkt->len; - size_t outlen; -#if defined(SOL_IP) && defined(IP_TOS) - static int priority = 0; -#endif - int origpriority = origpkt->priority; - +static void send_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) { if(!n->status.reachable) { logger(DEBUG_TRAFFIC, LOG_INFO, "Trying to send UDP packet to unreachable node %s (%s)", n->name, n->hostname); return; } - return send_sptps_packet(n, origpkt); + return send_sptps_packet(mesh, n, origpkt); } -bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) { +bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) { node_t *to = handle; + meshlink_handle_t *mesh = to->mesh; /* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */ - if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) { + if(type >= SPTPS_HANDSHAKE || ((mesh->self->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) { char buf[len * 4 / 3 + 5]; b64encode(data, buf, len); /* If no valid key is known yet, send the packets using ANS_KEY requests, to ensure we get to learn the reflexive UDP address. */ if(!to->status.validkey) { - to->incompression = myself->incompression; - return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, to->incompression); + to->incompression = mesh->self->incompression; + return send_request(mesh, to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, to->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(mesh, to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf); } } @@ -495,11 +473,11 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) { int sock; if(to->status.broadcast) - choose_broadcast_address(to, &sa, &sock); + choose_broadcast_address(mesh, to, &sa, &sock); else - choose_udp_address(to, &sa, &sock); + choose_udp_address(mesh, to, &sa, &sock); - if(sendto(listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) { + if(sendto(mesh->listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) { if(sockmsgsize(sockerrno)) { if(to->maxmtu >= len) to->maxmtu = len - 1; @@ -514,8 +492,9 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) { return true; } -bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len) { +bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) { node_t *from = handle; + meshlink_handle_t *mesh = from->mesh; if(type == SPTPS_HANDSHAKE) { if(!from->status.validkey) { @@ -535,9 +514,12 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t if(type == PKT_PROBE) { inpkt.len = len; + inpkt.probe = true; memcpy(inpkt.data, data, len); - mtu_probe_h(from, &inpkt, len); + mtu_probe_h(mesh, from, &inpkt, len); return true; + } else { + inpkt.probe = false; } if(type & ~(PKT_COMPRESSED)) { @@ -546,7 +528,7 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t } if(type & PKT_COMPRESSED) { - length_t ulen = uncompress_packet(inpkt.data, (const uint8_t *)data, len, from->incompression); + uint16_t ulen = uncompress_packet(inpkt.data, (const uint8_t *)data, len, from->incompression); if(ulen < 0) { return false; } else { @@ -559,17 +541,15 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t inpkt.len = len; } - receive_packet(from, &inpkt); + receive_packet(mesh, from, &inpkt); return true; } /* send a packet to the given vpn ip. */ -void send_packet(node_t *n, vpn_packet_t *packet) { - node_t *via; - - if(n == myself) { +void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) { + if(n == mesh->self) { n->out_packets++; n->out_bytes += packet->len; // TODO: send to application @@ -588,41 +568,41 @@ void send_packet(node_t *n, vpn_packet_t *packet) { n->out_packets++; n->out_bytes += packet->len; - send_sptps_packet(n, packet); + send_sptps_packet(mesh, n, packet); return; } /* Broadcast a packet using the minimum spanning tree */ -void broadcast_packet(const node_t *from, vpn_packet_t *packet) { +void broadcast_packet(meshlink_handle_t *mesh, const node_t *from, vpn_packet_t *packet) { // Always give ourself a copy of the packet. - if(from != myself) - send_packet(myself, packet); + if(from != mesh->self) + send_packet(mesh, mesh->self, packet); logger(DEBUG_TRAFFIC, LOG_INFO, "Broadcasting packet of %d bytes from %s (%s)", packet->len, from->name, from->hostname); - for list_each(connection_t, c, connection_list) + for list_each(connection_t, c, mesh->connections) if(c->status.active && c->status.mst && c != from->nexthop->connection) - send_packet(c->node, packet); + send_packet(mesh, c->node, packet); } -static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) { +static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const vpn_packet_t *pkt) { node_t *n = NULL; bool hard = false; static time_t last_hard_try = 0; - for splay_each(edge_t, e, edge_weight_tree) { - if(!e->to->status.reachable || e->to == myself) + for splay_each(edge_t, e, mesh->edges) { + if(!e->to->status.reachable || e->to == mesh->self) continue; if(sockaddrcmp_noport(from, &e->address)) { - if(last_hard_try == now.tv_sec) + if(last_hard_try == mesh->loop.now.tv_sec) continue; hard = true; } - if(!try_mac(e->to, pkt)) + if(!try_mac(mesh, e->to, pkt)) continue; n = e->to; @@ -630,13 +610,14 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) { } if(hard) - last_hard_try = now.tv_sec; + last_hard_try = mesh->loop.now.tv_sec; - last_hard_try = now.tv_sec; + last_hard_try = mesh->loop.now.tv_sec; return n; } -void handle_incoming_vpn_data(void *data, int flags) { +void handle_incoming_vpn_data(event_loop_t *loop, void *data, int flags) { + meshlink_handle_t *mesh = loop->data; listen_socket_t *ls = data; vpn_packet_t pkt; char *hostname; @@ -645,7 +626,7 @@ void handle_incoming_vpn_data(void *data, int flags) { node_t *n; int len; - len = recvfrom(ls->udp.fd, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen); + len = recvfrom(ls->udp.fd, pkt.data, MAXSIZE, 0, &from.sa, &fromlen); if(len <= 0 || len > MAXSIZE) { if(!sockwouldblock(sockerrno)) @@ -657,13 +638,13 @@ void handle_incoming_vpn_data(void *data, int flags) { sockaddrunmap(&from); /* Some braindead IPv6 implementations do stupid things. */ - n = lookup_node_udp(&from); + n = lookup_node_udp(mesh, &from); if(!n) { - n = try_harder(&from, &pkt); + n = try_harder(mesh, &from, &pkt); if(n) - update_node_udp(n, &from); - else if(debug_level >= DEBUG_PROTOCOL) { + update_node_udp(mesh, n, &from); + else if(mesh->debug_level >= DEBUG_PROTOCOL) { hostname = sockaddr2hostname(&from); logger(DEBUG_PROTOCOL, LOG_WARNING, "Received UDP packet from unknown source %s", hostname); free(hostname); @@ -673,7 +654,7 @@ void handle_incoming_vpn_data(void *data, int flags) { return; } - n->sock = ls - listen_socket; + n->sock = ls - mesh->listen_socket; - receive_udppacket(n, &pkt); + receive_udppacket(mesh, n, &pkt); }