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