tests: Fix some tests with invalid microsecond packet timestamps

[tcpdump] / print-ospf.c

diff --git a/print-ospf.c b/print-ospf.c
index fe06d21bf6513006d4dff7f677fc1a5b56c7998f..38f44745d770b6e731cd423e444ecf8265b4b5e6 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -23,9 +23,7 @@
 
 /* \summary: Open Shortest Path First (OSPF) printer */
 
 
 /* \summary: Open Shortest Path First (OSPF) printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -327,7 +325,6 @@ ospf_te_tlv_link_print(netdissect_options *ndo,
 {
     u_int subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;
 {
     u_int subtlv_type, subtlv_length;
     u_int priority_level, te_class, count_srlg;

-    float bw;

 
     while (tlv_length != 0) {
         if (tlv_length < 4) {
 
     while (tlv_length != 0) {
         if (tlv_length < 4) {


@@ -391,8 +388,7 @@ ospf_te_tlv_link_print(netdissect_options *ndo,
                 ND_PRINT(" != 4");
                 goto invalid;
             }
                 ND_PRINT(" != 4");
                 goto invalid;
             }

-            bw = GET_BE_F_4(tptr);
-            ND_PRINT(", %.3f Mbps", bw * 8 / 1000000);
+            ND_PRINT(", %.3f Mbps", GET_BE_F_4(tptr) * 8 / 1000000);

             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
             if (subtlv_length != 32) {
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW:
             if (subtlv_length != 32) {


@@ -400,10 +396,9 @@ ospf_te_tlv_link_print(netdissect_options *ndo,
                 goto invalid;
             }
             for (te_class = 0; te_class < 8; te_class++) {
                 goto invalid;
             }
             for (te_class = 0; te_class < 8; te_class++) {

-                bw = GET_BE_F_4(tptr + te_class * 4);

                 ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
                        te_class,
                 ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps",
                        te_class,

-                       bw * 8 / 1000000);
+                       GET_BE_F_4(tptr + te_class * 4) * 8 / 1000000);

             }
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:
             }
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS:


@@ -425,10 +420,9 @@ ospf_te_tlv_link_print(netdissect_options *ndo,
             }
             /* decode BCs until the subTLV ends */
             for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {
             }
             /* decode BCs until the subTLV ends */
             for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) {

-                bw = GET_BE_F_4(tptr + 4 + te_class * 4);

                 ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                        te_class,
                 ND_PRINT("\n\t\t  Bandwidth constraint CT%u: %.3f Mbps",
                        te_class,

-                       bw * 8 / 1000000);
+                       GET_BE_F_4(tptr + 4 + te_class * 4) * 8 / 1000000);

             }
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:
             }
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC:


@@ -458,10 +452,9 @@ ospf_te_tlv_link_print(netdissect_options *ndo,
             ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
                    tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));
             for (priority_level = 0; priority_level < 8; priority_level++) {
             ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
                    tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));
             for (priority_level = 0; priority_level < 8; priority_level++) {

-                bw = GET_BE_F_4(tptr + 4 + (priority_level * 4));

                 ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
                        priority_level,
                 ND_PRINT("\n\t\t  priority level %u: %.3f Mbps",
                        priority_level,

-                       bw * 8 / 1000000);
+                       GET_BE_F_4(tptr + 4 + (priority_level * 4)) * 8 / 1000000);

             }
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE:
             }
             break;
         case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE: