Michal Sekletar 6960a3
diff -up mtr-0.85/mtr.8.docs mtr-0.85/mtr.8
Michal Sekletar 6960a3
--- mtr-0.85/mtr.8.docs	2013-04-29 20:22:05.000000000 +0200
Michal Sekletar 6960a3
+++ mtr-0.85/mtr.8	2013-10-04 15:26:58.852865628 +0200
Michal Sekletar 6960a3
@@ -8,7 +8,7 @@ mtr \- a network diagnostic tool
Michal Sekletar 6960a3
 .SH SYNOPSIS
Michal Sekletar 6960a3
 .B mtr 
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
-.B \-hvrctglspeniuTP46\c
Michal Sekletar 6960a3
+.B \-BfhvrctglxspQemniuTP46\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
 .B \-\-help\c
Michal Sekletar 6960a3
@@ -34,6 +34,9 @@ mtr \- a network diagnostic tool
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
 .B \-\-raw\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
+[
Michal Sekletar 6960a3
+.B \-\-xml\c
Michal Sekletar 6960a3
+]
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
 .B \-\-mpls\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
@@ -53,12 +56,27 @@ mtr \- a network diagnostic tool
Michal Sekletar 6960a3
 .B \-\-interval\ SECONDS\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
+.B \-\-max-ttl\ NUM\c
Michal Sekletar 6960a3
+]
Michal Sekletar 6960a3
+[\c
Michal Sekletar 6960a3
+.B \-\-first-ttl\ NUM\c
Michal Sekletar 6960a3
+]
Michal Sekletar 6960a3
+[\c
Michal Sekletar 6960a3
+.B \-\-bitpattern\ NUM\c
Michal Sekletar 6960a3
+]
Michal Sekletar 6960a3
+[\c
Michal Sekletar 6960a3
+.B \-\-tos\ NUM\c
Michal Sekletar 6960a3
+]
Michal Sekletar 6960a3
+[\c
Michal Sekletar 6960a3
 .B \-\-psize\ BYTES | -s BYTES\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
 .B \-\-tcp\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
+.B \-\-udp\c
Michal Sekletar 6960a3
+]
Michal Sekletar 6960a3
+[\c
Michal Sekletar 6960a3
 .B \-\-port\ PORT\c
Michal Sekletar 6960a3
 ]
Michal Sekletar 6960a3
 [\c
Michal Sekletar 6960a3
@@ -270,13 +288,23 @@ to spit out a format that is suitable fo
Michal Sekletar 6960a3
 .TP
Michal Sekletar 6960a3
 .B \-\-raw
Michal Sekletar 6960a3
 .br
Michal Sekletar 6960a3
-Use this option to tell 
Michal Sekletar 6960a3
-.B mtr 
Michal Sekletar 6960a3
+Use this option to tell
Michal Sekletar 6960a3
+.B mtr
Michal Sekletar 6960a3
 to use the raw output format. This format is better suited for
Michal Sekletar 6960a3
 archival of the measurement results. It could be parsed to 
Michal Sekletar 6960a3
 be presented into any of the other display methods. 
Michal Sekletar 6960a3
 
Michal Sekletar 6960a3
 .TP
Michal Sekletar 6960a3
+.B \-x
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-\-xml
Michal Sekletar 6960a3
+.br
Michal Sekletar 6960a3
+Use this option to tell
Michal Sekletar 6960a3
+.B mtr
Michal Sekletar 6960a3
+to use the xml output format. This format is better suited for
Michal Sekletar 6960a3
+automated processing of the measurement results.
Michal Sekletar 6960a3
+
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
 .B \-a\ IP.ADD.RE.SS
Michal Sekletar 6960a3
 .TP
Michal Sekletar 6960a3
 .B \-\-address\ IP.ADD.RE.SS
Michal Sekletar 6960a3
@@ -295,7 +323,39 @@ Use this option to specify the positive
Michal Sekletar 6960a3
 ECHO requests.  The default value for this parameter is one second.
Michal Sekletar 6960a3
 
Michal Sekletar 6960a3
 .TP
Michal Sekletar 6960a3
+.B \-m\ NUM
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-\-max-ttl\ NUM
Michal Sekletar 6960a3
+.br
Michal Sekletar 6960a3
+Specifies the maximum number of hops (max time-to-live value) traceroute will
Michal Sekletar 6960a3
+probe. Default is 30.
Michal Sekletar 6960a3
+
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-f\ NUM
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-\-first-ttl\ NUM
Michal Sekletar 6960a3
+.br
Michal Sekletar 6960a3
+Specifies with what TTL to start. Defaults to 1.
Michal Sekletar 6960a3
+
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-B\ NUM
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-\-bitpattern\ NUM
Michal Sekletar 6960a3
+.br
Michal Sekletar 6960a3
+Specifies bit pattern to use in payload. Should be within range 0 - 255.
Michal Sekletar 6960a3
+
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-Q\ NUM
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-\-tos\ NUM
Michal Sekletar 6960a3
+.br
Michal Sekletar 6960a3
+Specifies value for type of service field in IP header. Should be within range 0
Michal Sekletar 6960a3
+- 255.
Michal Sekletar 6960a3
+
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
 .B \-u
Michal Sekletar 6960a3
+.TP
Michal Sekletar 6960a3
+.B \-\-udp
Michal Sekletar 6960a3
 .br
Michal Sekletar 6960a3
 Use UDP datagrams instead of ICMP ECHO.
Michal Sekletar 6960a3
 
Michal Sekletar 6960a3
diff -up mtr-0.85/mtr.c.docs mtr-0.85/mtr.c
Michal Sekletar 6960a3
--- mtr-0.85/mtr.c.docs	2013-10-04 15:26:58.852865628 +0200
Michal Sekletar 6960a3
+++ mtr-0.85/mtr.c	2013-10-04 15:30:42.934859098 +0200
Michal Sekletar 6960a3
@@ -567,16 +567,17 @@ int main(int argc, char **argv)
Michal Sekletar 6960a3
   }
Michal Sekletar 6960a3
 
Michal Sekletar 6960a3
   if (PrintHelp) {
Michal Sekletar 6960a3
-    printf("usage: %s [-hvrwctglspniuT46] [--help] [--version] [--report]\n"
Michal Sekletar 6960a3
+    printf("usage: %s [-BfhvrwctglxspQomniuT46] [--help] [--version] [--report]\n"
Michal Sekletar 6960a3
 	   "\t\t[--report-wide] [--report-cycles=COUNT] [--curses] [--gtk]\n"
Michal Sekletar 6960a3
-           "\t\t[--csv|-C] [--raw] [--split] [--mpls] [--no-dns] [--show-ips]\n"
Michal Sekletar 6960a3
+           "\t\t[--csv|-C] [--raw] [--xml] [--split] [--mpls] [--no-dns] [--show-ips]\n"
Michal Sekletar 6960a3
            "\t\t[--address interface] [--filename=FILE|-F]\n" /* BL */
Michal Sekletar 6960a3
 #ifndef NO_IPINFO
Michal Sekletar 6960a3
            "\t\t[--ipinfo=item_no|-y item_no]\n"
Michal Sekletar 6960a3
            "\t\t[--aslookup|-z]\n"
Michal Sekletar 6960a3
 #endif
Michal Sekletar 6960a3
-           "\t\t[--psize=bytes/-s bytes]\n"            /* ok */
Michal Sekletar 6960a3
-           "\t\t[--report-wide|-w] [-u|-T] [--port=PORT] [--timeout=SECONDS]\n"            /* rew */
Michal Sekletar 6960a3
+           "\t\t[--psize=bytes/-s bytes] [--order fields]\n"            /* ok */
Michal Sekletar 6960a3
+           "\t\t[--report-wide|-w] [--inet] [--inet6] [--max-ttl=NUM] [--first-ttl=NUM]\n"
Michal Sekletar 6960a3
+           "\t\t[--bitpattern=NUM] [--tos=NUM] [--udp] [--tcp] [--port=PORT] [--timeout=SECONDS]\n"   /* rew */
Michal Sekletar 6960a3
 	   "\t\t[--interval=SECONDS] HOSTNAME\n", argv[0]);
Michal Sekletar 6960a3
     exit(0);
Michal Sekletar 6960a3
   }