Show public ip and port for each path

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>

src/bind.c

@@ -257,10 +257,10 @@ gt_bind(int argc, char **argv)
                         res.ret = EAGAIN;
 
                         for (unsigned i = 0; i < count; i++) {
-                            if (i && sendto(ctl_fd, &res, sizeof(res), 0,
+                            memcpy(&res.path_status, &paths[i], sizeof(struct mud_path));
+                            if (sendto(ctl_fd, &res, sizeof(res), 0,
                                        (const struct sockaddr *)&ss, sl) == -1)
                                 perror("sendto(ctl)");
-                            memcpy(&res.path_status, &paths[i], sizeof(struct mud_path));
                         }
 
                         res.ret = 0;

src/common.c

@@ -108,5 +108,6 @@ gt_toaddr(char *str, size_t size, struct sockaddr *sa)
                            &((struct sockaddr_in6 *)sa)->sin6_addr, str, size);
     }
 
+    errno = EAFNOSUPPORT;
     return -1;
 }

src/path.c

@@ -21,11 +21,20 @@ gt_path_status(int fd)
         if (recv(fd, &res, sizeof(struct ctl_msg), 0) == -1)
             return -1;
 
+        if (res.type != req.type)
+            return -2;
+
+        if (!res.ret)
+            return 0;
+
         char bindstr[INET6_ADDRSTRLEN] = {0};
+        char publstr[INET6_ADDRSTRLEN] = {0};
         char peerstr[INET6_ADDRSTRLEN] = {0};
 
         if (gt_toaddr(bindstr, sizeof(bindstr),
                       (struct sockaddr *)&res.path_status.local_addr) ||
+            gt_toaddr(publstr, sizeof(publstr),
+                      (struct sockaddr *)&res.path_status.r_addr) ||
             gt_toaddr(peerstr, sizeof(peerstr),
                       (struct sockaddr *)&res.path_status.addr))
             return -2;
@@ -41,10 +50,14 @@ gt_path_status(int fd)
 
         printf("path %s\n"
                "  bind:   %s\n"
+               "  public: %s port %"PRIu16"\n"
                "  peer:   %s port %"PRIu16"\n"
-               "  rtt:   %.3f\n",
-               statestr, bindstr, peerstr,
-               gt_get_port((struct sockaddr *)&res.path_status.addr),
+               "  mtu:    %zu bytes\n"
+               "  rtt:    %.3f ms\n",
+               statestr, bindstr,
+               publstr, gt_get_port((struct sockaddr *)&res.path_status.r_addr),
+               peerstr, gt_get_port((struct sockaddr *)&res.path_status.addr),
+               res.path_status.mtu.ok + 28U,     /* ip+udp hdr */
                res.path_status.rtt/(double)1e3);
 
     } while (res.ret == EAGAIN);