add (cheap) support for NSSA LSAs

diff --git a/ospf.h b/ospf.h
index 67ea363bd38fb4a79d0f797e45918c9b2d8db40d..ba7eb2afa788583c138b35b88a57ecace732ebde 100644 (file)
--- a/ospf.h
+++ b/ospf.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.13 2004-01-27 13:33:24 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/ospf.h,v 1.14 2004-09-09 16:17:38 hannes Exp $ (LBL) */

 /*
  * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
  *     The Regents of the University of California.  All rights reserved.
 /*
  * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
  *     The Regents of the University of California.  All rights reserved.


@@ -63,7 +63,7 @@
 #define        LS_TYPE_ASE             5   /* ASE  */
 #define        LS_TYPE_GROUP           6   /* Group membership (multicast */
                                    /* extensions 23 July 1991) */
 #define        LS_TYPE_ASE             5   /* ASE  */
 #define        LS_TYPE_GROUP           6   /* Group membership (multicast */
                                    /* extensions 23 July 1991) */

-#define        LS_TYPE_NSSA            7   /* rfc1587 - Not so Stubby Areas */
+#define        LS_TYPE_NSSA            7   /* rfc3101 - Not so Stubby Areas */

 #define        LS_TYPE_OPAQUE_LL       9   /* rfc2370 - Opaque Link Local */
 #define        LS_TYPE_OPAQUE_AL      10   /* rfc2370 - Opaque Link Local */
 #define        LS_TYPE_OPAQUE_DW      11   /* rfc2370 - Opaque Domain Wide */
 #define        LS_TYPE_OPAQUE_LL       9   /* rfc2370 - Opaque Link Local */
 #define        LS_TYPE_OPAQUE_AL      10   /* rfc2370 - Opaque Link Local */
 #define        LS_TYPE_OPAQUE_DW      11   /* rfc2370 - Opaque Domain Wide */

diff --git a/print-ospf.c b/print-ospf.c
index 169651bef37dd482411dc698c70f271372a885f9..8d9045f6aab7e9995f0b26c6d5a4ffa49c918223 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.51 2004-03-24 02:32:27 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.52 2004-09-09 16:17:38 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -361,6 +361,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                break;
 
        case LS_TYPE_ASE:
                break;
 
        case LS_TYPE_ASE:

+        case LS_TYPE_NSSA: /* fall through - those LSAs share the same format */

                TCHECK(lsap->lsa_un.un_nla.nla_mask);
                printf("\n\t    Mask %s",
                    ipaddr_string(&lsap->lsa_un.un_asla.asla_mask));
                TCHECK(lsap->lsa_un.un_nla.nla_mask);
                printf("\n\t    Mask %s",
                    ipaddr_string(&lsap->lsa_un.un_asla.asla_mask));