pex: after receiving data update req, notify peer of local address/port

[project/unetd.git] / host.c

diff --git a/host.c b/host.c
index e0c5827b5578638c8a1cc7d25398817b10eacd87..e4e38d33079978b6f4f5c402c601aa1e1d9c15eb 100644 (file)
--- a/host.c
+++ b/host.c
@@ -179,7 +179,7 @@ network_host_create(struct network *net, struct blob_attr *attr, bool dynamic)
                                &ipaddr, ipaddr_len,
                                &subnet, subnet_len,
                                &endpoint_buf, endpoint ? strlen(endpoint) + 1 : 0,
-                               &gateway_buf, gateway ? strlen(endpoint) + 1 : 0);
+                               &gateway_buf, gateway ? strlen(gateway) + 1 : 0);
                host->node.key = strcpy(name_buf, name);
                peer = &host->peer;
        }
@@ -360,6 +360,35 @@ void network_hosts_update_done(struct network *net)
        return __network_hosts_update_done(net, false);
 }
 
+static union network_endpoint *
+network_peer_next_endpoint(struct network_peer *peer)
+{
+       union network_endpoint *ep;
+       int i;
+
+       for (i = 0; i < __ENDPOINT_TYPE_MAX; i++) {
+               int cur = peer->state.next_endpoint_idx;
+
+               if (++peer->state.next_endpoint_idx == __ENDPOINT_TYPE_MAX)
+                       peer->state.next_endpoint_idx = 0;
+
+               ep = &peer->state.next_endpoint[cur];
+               if (cur == ENDPOINT_TYPE_STATIC &&
+                       (!peer->endpoint ||
+                    network_get_endpoint(ep, AF_UNSPEC, peer->endpoint, peer->port,
+                                         peer->state.connect_attempt++)))
+                       continue;
+
+               if (!ep->sa.sa_family)
+                       continue;
+
+               return ep;
+       }
+
+       return NULL;
+}
+
+
 static void
 network_hosts_connect_cb(struct uloop_timeout *t)
 {
@@ -381,16 +410,12 @@ network_hosts_connect_cb(struct uloop_timeout *t)
                if (peer->state.connected)
                        continue;
 
-               ep = &peer->state.next_endpoint;
-               if (peer->endpoint &&
-                   network_get_endpoint(ep, AF_UNSPEC, peer->endpoint, peer->port,
-                                        peer->state.connect_attempt++))
-                       continue;
-
-               if (!ep->sa.sa_family)
+               ep = network_peer_next_endpoint(peer);
+               if (!ep)
                        continue;
 
-               if (memcmp(ep, &peer->state.endpoint, sizeof(*ep)) != 0)
+               if (memcmp(ep, &peer->state.endpoint, sizeof(*ep)) != 0 &&
+                   !network_skip_endpoint_route(net, ep))
                        unetd_ubus_netifd_add_route(net, ep);
 
                wg_peer_connect(net, peer, ep);