Show public ip and port for each path

Signed-off-by: Adrien Gallouët <[email protected]>
angt · Mar 10, 2018 · 7c50a9d · 7c50a9d
1 parent 6538d30
commit 7c50a9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/mud b/mud
diff --git a/src/path.c b/src/path.c
@@ -28,10 +28,13 @@ gt_path_status(int fd)
             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;
@@ -46,12 +49,14 @@ gt_path_status(int fd)
         }
 
         printf("path %s\n"
-               "  bind:  %s\n"
-               "  peer:  %s port %"PRIu16"\n"
-               "  mtu:   %zu bytes\n"
-               "  rtt:   %.3f ms\n",
-               statestr, bindstr, peerstr,
-               gt_get_port((struct sockaddr *)&res.path_status.addr),
+               "  bind:   %s\n"
+               "  public: %s port %"PRIu16"\n"
+               "  peer:   %s port %"PRIu16"\n"
+               "  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);