Add changes in 4.2.1.

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index 71ae732e7e60a9e291b532fce0fa4cf2dffc7ea0..f8ff4aeac5b0d770ca4f72a99321e623b062f82d 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.65 2007-09-27 10:29:18 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,7 +48,7 @@ static struct tok ospf_option_values[] = {
        { 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" },
@@ -197,7 +197,7 @@ static int ospf_decode_v2(const struct ospfhdr *, const u_char *);
 static int ospf_decode_lls(const struct ospfhdr *, register u_int);
 
 int
-ospf_print_grace_lsa (u_int8_t *tptr, u_int ls_length) {
+ospf_print_grace_lsa (const u_int8_t *tptr, u_int ls_length) {
 
     u_int tlv_type, tlv_length;
 
@@ -279,7 +279,7 @@ trunc:
 }
 
 int
-ospf_print_te_lsa (u_int8_t *tptr, u_int ls_length) {
+ospf_print_te_lsa (const u_int8_t *tptr, u_int ls_length) {
 
     u_int tlv_type, tlv_length, subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
@@ -531,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;
 
     /*
@@ -545,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--;
     }
 }
@@ -591,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",
@@ -619,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;
 
@@ -833,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;
@@ -982,14 +982,14 @@ ospf_decode_v2(register const struct ospfhdr *op,
                        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;
@@ -1028,7 +1028,7 @@ ospf_decode_v2(register const struct ospfhdr *op,
                 lsap = op->ospf_lsu.lsu_lsa;
                 TCHECK(op->ospf_lsu.lsu_count);
                 lsa_count_max = EXTRACT_32BITS(&op->ospf_lsu.lsu_count);
-                printf(", %d LSA%s",lsa_count_max, lsa_count_max > 1 ? "s" : "");
+                printf(", %d LSA%s",lsa_count_max, PLURAL_SUFFIX(lsa_count_max));
                 for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) {
                     printf("\n\t  LSA #%u",lsa_count);
                         lsap = (const struct lsa *)ospf_print_lsa(lsap);