From Victor Oppleman: add support for RFC 1393 traceroute.

diff --git a/CREDITS b/CREDITS
index 06820b0391f635132d8c7e9d4a174164a0926f99..d327880c083db1696620e00f4420797250eda46f 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -139,6 +139,7 @@ Additional people who have contributed patches:
        Timo Koskiahde
        Tony Li                         <[email protected]>
        Uns Lider                       <[email protected]>
+       Victor Oppleman                 <[email protected]>
        Wesley Griffin                  <[email protected]>
        Wilbert de Graaf                <[email protected]>
        Yen Yen Lim

diff --git a/ip.h b/ip.h
index 3a496da2034844acaed4b2936d72688326f8aa0b..ae4888047fa8887780297e07c08e26590611eb16 100644 (file)
--- a/ip.h
+++ b/ip.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ip.h,v 1.11 2004-09-27 21:13:10 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/ip.h,v 1.11.2.1 2007-09-14 01:30:02 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -102,6 +102,7 @@ struct ip {
 
 #define        IPOPT_RR                7               /* record packet route */
 #define        IPOPT_TS                68              /* timestamp */
+#define        IPOPT_RFC1393           82              /* traceroute RFC 1393 */
 #define        IPOPT_SECURITY          130             /* provide s,c,h,tcc */
 #define        IPOPT_LSRR              131             /* loose source route */
 #define        IPOPT_SATID             136             /* satnet id */

diff --git a/print-ip.c b/print-ip.c
index 3b967ec9df15d976d885d20dd3c2a01edb6d97e7..196489591c131e1b79878196ebd77a901ed6b91f 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.149.2.8 2007-01-29 20:57:47 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.149.2.9 2007-09-14 01:30:02 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -50,6 +50,7 @@ struct tok ip_option_values[] = {
     { IPOPT_SSRR, "SSRR" },
     { IPOPT_LSRR, "LSRR" },
     { IPOPT_RA, "RA" },
+    { IPOPT_RFC1393, "traceroute" },
     { 0, NULL }
 };