Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index 6a517918a8f63433f665bea44ea59607dff2bb6a..983c14f40e12d763dbf95d08ee439fb0b1556a7d 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.64 2007-09-27 10:20:26 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ospf.c,v 1.66 2007-10-08 07:53:21 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -48,19 +48,7 @@ static struct tok ospf_option_values[] = {
        { OSPF_OPTION_E,        "External" },
        { OSPF_OPTION_MC,       "Multicast" },
        { OSPF_OPTION_NP,       "NSSA" },
-       { OSPF_OPTION_EA,       "Advertise External" },
-       { OSPF_OPTION_DC,       "Demand Circuit" },
-       { OSPF_OPTION_O,        "Opaque" },
-       { OSPF_OPTION_DN,       "Up/Down" },
-       { 0,                    NULL }
-};
-
-static struct tok ospf_option_values2[] = {
-       { OSPF_OPTION_T,        "TOS" },
-       { OSPF_OPTION_E,        "External" },
-       { OSPF_OPTION_MC,       "Multicast" },
-       { OSPF_OPTION_NP,       "NSSA" },
-       { OSPF_OPTION_L,        "LLS" },
+        { OSPF_OPTION_L,        "LLS" },
        { OSPF_OPTION_DC,       "Demand Circuit" },
        { OSPF_OPTION_O,        "Opaque" },
        { OSPF_OPTION_DN,       "Up/Down" },
@@ -543,12 +531,12 @@ static struct tok ospf_topology_values[] = {
  * Print all the per-topology metrics.
  */
 static void
-ospf_print_tos_metrics(const struct tos_metric *metrics)
+ospf_print_tos_metrics(const union un_tos *tos)
 {
     int metric_count;
     int toscount;
 
-    toscount = metrics->tos_count+1;
+    toscount = tos->link.link_tos_count+1;
     metric_count = 0;
 
     /*
@@ -557,11 +545,11 @@ ospf_print_tos_metrics(const struct tos_metric *metrics)
     while (toscount) { 
         printf("\n\t\ttopology %s(%u), metric %u",
                tok2str(ospf_topology_values, "",
-                       metric_count ? metrics->tos_type : 0),
-               metric_count ? metrics->tos_type : 0,
-               EXTRACT_16BITS(&metrics->tos_metric));
+                       metric_count ? tos->metrics.tos_type : 0),
+               metric_count ? tos->metrics.tos_type : 0,
+               EXTRACT_16BITS(&tos->metrics.tos_metric));
         metric_count++;
-        metrics++;
+        tos++;
         toscount--;
     }
 }
@@ -603,7 +591,7 @@ ospf_print_lsa(register const struct lsa *lsap)
                rlp = lsap->lsa_un.un_rla.rla_link;
                while (j--) {
                        TCHECK(*rlp);
-                       switch (rlp->metrics.tos_type) {
+                       switch (rlp->un_tos.link.link_type) {
 
                        case RLA_TYPE_VIRTUAL:
                                printf("\n\t      Virtual Link: Neighbor Router-ID: %s, Interface Address: %s",
@@ -631,14 +619,14 @@ ospf_print_lsa(register const struct lsa *lsap)
 
                        default:
                                printf("\n\t      Unknown Router Link Type (%u)",
-                                   rlp->metrics.tos_type);
+                                   rlp->un_tos.link.link_type);
                                return (ls_end);
                        }
 
-                        ospf_print_tos_metrics(&rlp->metrics);
+                        ospf_print_tos_metrics(&rlp->un_tos);
 
                        rlp = (struct rlalink *)((u_char *)(rlp + 1) +
-                           ((rlp->metrics.tos_count) * sizeof(struct tos_metric)));
+                           ((rlp->un_tos.link.link_tos_count) * sizeof(union un_tos)));
                }
                break;
 
@@ -845,7 +833,7 @@ trunc:
 
 static int
 ospf_decode_lls(register const struct ospfhdr *op,
-    register u_int length)
+               register u_int length)
 {
     register const u_char *dptr;
     register const u_char *dataend;
@@ -956,7 +944,7 @@ ospf_decode_v2(register const struct ospfhdr *op,
 
        case OSPF_TYPE_HELLO:
                 printf("\n\tOptions [%s]",
-                       bittok2str(ospf_option_values2,"none",op->ospf_hello.hello_options));
+                       bittok2str(ospf_option_values,"none",op->ospf_hello.hello_options));
 
                 TCHECK(op->ospf_hello.hello_deadint);
                 printf("\n\t  Hello Timer %us, Dead Timer %us, Mask %s, Priority %u",
@@ -988,20 +976,20 @@ ospf_decode_v2(register const struct ospfhdr *op,
        case OSPF_TYPE_DD:
                TCHECK(op->ospf_db.db_options);
                 printf("\n\tOptions [%s]",
-                       bittok2str(ospf_option_values2,"none",op->ospf_db.db_options));
+                       bittok2str(ospf_option_values,"none",op->ospf_db.db_options));
                TCHECK(op->ospf_db.db_flags);
                 printf(", DD Flags [%s]",
                        bittok2str(ospf_dd_flag_values,"none",op->ospf_db.db_flags));
                 TCHECK(op->ospf_db.db_ifmtu);
                 if (op->ospf_db.db_ifmtu) {
-                        printf(", MTU: %u", ntohs(op->ospf_db.db_ifmtu));
+                        printf(", MTU: %u", EXTRACT_16BITS(&op->ospf_db.db_ifmtu));
                 }
                 TCHECK(op->ospf_db.db_seq);
                 printf(", Sequence: 0x%08x", EXTRACT_32BITS(&op->ospf_db.db_seq));
 
                 /* Print all the LS adv's */
                 lshp = op->ospf_db.db_lshdr;
-                while ((u_char *)lshp < dataend && ospf_print_lshdr(lshp) != -1) {
+                while (((u_char *)lshp < dataend) && ospf_print_lshdr(lshp) != -1) {
                     ++lshp;
                 }
                break;