From: Siyuan Miao <i@xswan.net>
Date: Sun, 16 Feb 2020 01:19:22 +0000 (+0800)
Subject: show mpls information in raw output
X-Git-Tag: v0.94~11^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F336%2Fhead;p=thirdparty%2Fmtr.git

show mpls information in raw output
---

diff --git a/FORMATS b/FORMATS
index 3e64e17..d0e05ff 100644
--- a/FORMATS
+++ b/FORMATS
@@ -11,7 +11,7 @@ The split format is:
 
 The "raw" format is:
 
-hostline|xmitline|pingline|dnsline|timestampline
+hostline|xmitline|pingline|dnsline|timestampline|mplsline
 
 hostline:
 h <pos> <host IP>
@@ -28,6 +28,8 @@ d <pos> <hostname>
 timestampline:
 t <pos> <pingtime> <timestamp>
 
+mplsline:
+m <pos> <label> <traffic_class> <bottom_stack> <ttl>
 
 Timestampline is not  yet implemented. Need to find out how to do
 ICMP timestamping first. :-)
diff --git a/ui/display.c b/ui/display.c
index 9a8ac60..e533f97 100644
--- a/ui/display.c
+++ b/ui/display.c
@@ -225,10 +225,11 @@ void display_rawping(
 void display_rawhost(
     struct mtr_ctl *ctl,
     int host,
-    ip_t * ip_addr)
+    ip_t * ip_addr,
+    struct mplslen *mpls)
 {
     if (ctl->DisplayMode == DisplayRaw)
-        raw_rawhost(ctl, host, ip_addr);
+        raw_rawhost(ctl, host, ip_addr, mpls);
 }
 
 
diff --git a/ui/display.h b/ui/display.h
index c577d3f..5b37b56 100644
--- a/ui/display.h
+++ b/ui/display.h
@@ -74,7 +74,8 @@ extern void display_rawping(
 extern void display_rawhost(
     struct mtr_ctl *ctl,
     int hostnum,
-    ip_t * ip_addr);
+    ip_t *ip_addr,
+    struct mplslen *mpls);
 extern int display_keyaction(
     struct mtr_ctl *ctl);
 extern void display_loop(
diff --git a/ui/net.c b/ui/net.c
index fcb5d01..2b6aa85 100644
--- a/ui/net.c
+++ b/ui/net.c
@@ -241,7 +241,7 @@ static void net_process_ping(
         /* should be out of if as addr can change */
         memcpy(&nh->addr, addrcopy, sockaddr_addr_size(sourcesockaddr));
         nh->mpls = *mpls;
-        display_rawhost(ctl, index, (void *) &(nh->addr));
+        display_rawhost(ctl, index, (void *)&(nh->addr), (void *)&(nh->mpls));
 
         /* multi paths */
         memcpy(&nh->addrs[0], addrcopy, sockaddr_addr_size(sourcesockaddr));
@@ -259,7 +259,7 @@ static void net_process_ping(
             memcpy(&nh->addrs[i], addrcopy, sockaddr_addr_size(sourcesockaddr));
 
             nh->mplss[i] = *mpls;
-            display_rawhost(ctl, index, (void *) &(nh->addrs[i]));
+            display_rawhost(ctl, index, (void *)&(nh->addrs[i]), (void *)&(nh->addrs[i]));
         }
     }
 
diff --git a/ui/raw.c b/ui/raw.c
index 429a831..0735131 100644
--- a/ui/raw.c
+++ b/ui/raw.c
@@ -64,12 +64,19 @@ void raw_rawping(
     fflush(stdout);
 }
 
-
 void raw_rawhost(
     struct mtr_ctl *ctl,
     int host,
-    ip_t * ip_addr)
+    ip_t *ip_addr,
+    struct mplslen *mpls)
 {
     printf("h %d %s\n", host, strlongip(ctl, ip_addr));
+    if (ctl->enablempls) {
+        int k;
+        for (k = 0; k < mpls->labels; k++)
+            printf("m %d %lu %u %u %u\n",
+                   host, mpls->label[k], mpls->tc[k], mpls->s[k], mpls->ttl[k]);
+    }
+
     fflush(stdout);
 }
diff --git a/ui/raw.h b/ui/raw.h
index bd1920c..3c9a075 100644
--- a/ui/raw.h
+++ b/ui/raw.h
@@ -30,4 +30,5 @@ extern void raw_rawping(
 extern void raw_rawhost(
     struct mtr_ctl *ctl,
     int host,
-    ip_t * addr);
+    ip_t *addr,
+    struct mplslen *mpls);