unet-cli: strip initial newline in usage message

[project/unetd.git] / pex.c

diff --git a/pex.c b/pex.c
index 65cb1e55647d3a6e8929ba3d3ab7fb0187ccc172..854837c8285d91f92c57b4a45734764810a54fc1 100644 (file)
--- a/pex.c
+++ b/pex.c
@@ -39,7 +39,7 @@ pex_msg_init_ext(struct network *net, uint8_t opcode, bool ext)
 }
 
 static struct network_peer *
-pex_msg_peer(struct network *net, const uint8_t *id)
+pex_msg_peer(struct network *net, const uint8_t *id, bool allow_indirect)
 {
        struct network_peer *peer;
        uint8_t key[WG_KEY_LEN] = {};
@@ -50,6 +50,8 @@ pex_msg_peer(struct network *net, const uint8_t *id)
                D_NET(net, "can't find peer %s", pex_peer_id_str(id));
                return NULL;
        }
+       if (peer->indirect && !allow_indirect)
+               return NULL;
 
        return peer;
 }
@@ -154,7 +156,7 @@ network_pex_handle_endpoint_change(struct network *net, struct network_peer *pee
        struct network_peer *cur;
 
        vlist_for_each_element(&net->peers, cur, node) {
-               if (cur == peer || !cur->state.connected)
+               if (cur == peer || !cur->state.connected || cur->indirect)
                        continue;
 
                pex_msg_init(net, PEX_MSG_NOTIFY_PEERS);
@@ -330,6 +332,7 @@ static void
 network_pex_query_hosts(struct network *net)
 {
        struct network_host *host;
+       uint64_t now;
        int rv = rand();
        int hosts = 0;
        int i;
@@ -341,7 +344,7 @@ network_pex_query_hosts(struct network *net)
                void *id;
 
                if ((net->stun.port_ext && host == net->net_config.local_host) ||
-                   peer->state.connected || peer->endpoint)
+                   peer->state.connected || peer->endpoint || host->gateway)
                        continue;
 
                id = pex_msg_append(PEX_ID_LEN);
@@ -355,6 +358,7 @@ network_pex_query_hosts(struct network *net)
        if (!hosts)
                return;
 
+       now = unet_gettime();
        rv %= net->hosts.count;
        for (i = 0; i < 2; i++) {
                avl_for_each_element(&net->hosts, host, node) {
@@ -368,11 +372,13 @@ network_pex_query_hosts(struct network *net)
                        if (host == net->net_config.local_host)
                                continue;
 
-                       if (!peer->state.connected)
+                       if (!peer->state.connected ||
+                           peer->state.last_query_sent + 15 >= now)
                                continue;
 
                        D_PEER(net, peer, "send query for %d hosts", hosts);
                        pex_msg_send(net, peer);
+                       peer->state.last_query_sent = now;
                        return;
                }
        }
@@ -421,6 +427,7 @@ void network_pex_event(struct network *net, struct network_peer *peer,
 
        switch (ev) {
        case PEX_EV_HANDSHAKE:
+               peer->state.last_query_sent = 0;
                pex_send_hello(net, peer);
                if (net->config.type == NETWORK_TYPE_DYNAMIC)
                        network_pex_send_update_request(net, peer, NULL);
@@ -478,14 +485,14 @@ network_pex_recv_peers(struct network *net, struct network_peer *peer,
                        continue;
                }
 
-               cur = pex_msg_peer(net, data->peer_id);
+               cur = pex_msg_peer(net, data->peer_id, false);
                if (!cur || cur == peer)
                        continue;
 
                D_PEER(net, peer, "received peer address for %s",
                       network_peer_name(cur));
                flags = ntohs(data->flags);
-               ep = &cur->state.next_endpoint;
+               ep = &cur->state.next_endpoint[ENDPOINT_TYPE_PEX];
                ep->sa.sa_family = (flags & PEER_EP_F_IPV6) ? AF_INET6 : AF_INET;
                addr = network_endpoint_addr(ep, &len);
                memcpy(addr, data->addr, len);
@@ -502,10 +509,16 @@ network_pex_recv_query(struct network *net, struct network_peer *peer,
 
        pex_msg_init(net, PEX_MSG_NOTIFY_PEERS);
        for (; len >= 8; data += 8, len -= 8) {
-               cur = pex_msg_peer(net, data);
+               struct network_host *host;
+
+               cur = pex_msg_peer(net, data, false);
                if (!cur || !cur->state.connected)
                        continue;
 
+               host = container_of(peer, struct network_host, peer);
+               if (host->gateway)
+                       continue;
+
                if (!pex_msg_add_peer_endpoint(net, cur, peer))
                        resp++;
        }
@@ -536,6 +549,7 @@ network_pex_recv_update_request(struct network *net, struct network_peer *peer,
                                struct sockaddr_in6 *addr)
 {
        struct pex_update_request *req = (struct pex_update_request *)data;
+       struct pex_endpoint_port_notify *port_data;
        struct pex_msg_update_send_ctx ctx = {};
        uint64_t req_version = be64_to_cpu(req->cur_version);
        int *query_count;
@@ -574,7 +588,7 @@ network_pex_recv_update_request(struct network *net, struct network_peer *peer,
                return;
 
        if (req_version >= net->net_data_version)
-               return;
+               goto out;
 
        pex_msg_update_response_init(&ctx, net->config.pubkey, net->config.auth_key,
                                     peer->key, !!addr, (void *)data,
@@ -583,6 +597,20 @@ network_pex_recv_update_request(struct network *net, struct network_peer *peer,
                pex_msg_send_ext(net, peer, addr);
                done = !pex_msg_update_response_continue(&ctx);
        }
+
+out:
+       if (peer->state.connected || !net->net_config.local_host)
+               return;
+
+       pex_msg_init_ext(net, PEX_MSG_ENDPOINT_PORT_NOTIFY, !!addr);
+
+       port_data = pex_msg_append(sizeof(*port_data));
+       if (net->stun.port_ext)
+               port_data->port = htons(net->stun.port_ext);
+       else
+               port_data->port = htons(net->net_config.local_host->peer.port);
+
+       pex_msg_send_ext(net, peer, addr);
 }
 
 static void
@@ -697,7 +725,7 @@ network_pex_fd_cb(struct uloop_fd *fd, unsigned int events)
                if (!hdr)
                        continue;
 
-               peer = pex_msg_peer(net, hdr->id);
+               peer = pex_msg_peer(net, hdr->id, false);
                if (!peer)
                        continue;
 
@@ -904,6 +932,7 @@ global_pex_recv(void *msg, size_t msg_len, struct sockaddr_in6 *addr)
        char buf[INET6_ADDRSTRLEN];
        void *data;
        int addr_len;
+       int ep_idx = ENDPOINT_TYPE_ENDPOINT_NOTIFY;
 
        if (stun_msg_is_valid(msg, msg_len)) {
                avl_for_each_element(&networks, net, node)
@@ -937,7 +966,7 @@ global_pex_recv(void *msg, size_t msg_len, struct sockaddr_in6 *addr)
        case PEX_MSG_PONG:
                break;
        case PEX_MSG_UPDATE_REQUEST:
-               peer = pex_msg_peer(net, hdr->id);
+               peer = pex_msg_peer(net, hdr->id, true);
                network_pex_recv_update_request(net, peer, data, hdr->len,
                                                addr);
                break;
@@ -949,8 +978,11 @@ global_pex_recv(void *msg, size_t msg_len, struct sockaddr_in6 *addr)
        case PEX_MSG_ENDPOINT_PORT_NOTIFY:
                if (hdr->len < sizeof(struct pex_endpoint_port_notify))
                        break;
+
+               ep_idx = ENDPOINT_TYPE_ENDPOINT_PORT_NOTIFY;
+               fallthrough;
        case PEX_MSG_ENDPOINT_NOTIFY:
-               peer = pex_msg_peer(net, hdr->id);
+               peer = pex_msg_peer(net, hdr->id, true);
                if (!peer)
                        break;
 
@@ -958,14 +990,14 @@ global_pex_recv(void *msg, size_t msg_len, struct sockaddr_in6 *addr)
                  inet_ntop(addr->sin6_family, network_endpoint_addr((void *)addr, &addr_len),
                            buf, sizeof(buf)));
 
-               memcpy(&peer->state.next_endpoint, addr, sizeof(*addr));
+               memcpy(&peer->state.next_endpoint[ep_idx], addr, sizeof(*addr));
                if (hdr->opcode == PEX_MSG_ENDPOINT_PORT_NOTIFY) {
                        struct pex_endpoint_port_notify *port = data;
                        union network_endpoint host_ep = {
                                .in6 = *addr
                        };
 
-                       peer->state.next_endpoint.in.sin_port = port->port;
+                       peer->state.next_endpoint[ep_idx].in.sin_port = port->port;
                        if (net->pex.num_hosts < NETWORK_PEX_HOSTS_LIMIT)
                                network_pex_create_host(net, &host_ep, 120);
                }