gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / print-olsr.c

diff --git a/print-olsr.c b/print-olsr.c
index dca323f672d6e659bfb218fc3d980991812520ec..75acc8363a18371144b8060c669bdabce8e27832 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -351,8 +351,7 @@ olsr_print(netdissect_options *ndo,
         } msgptr;
         int msg_len_valid = 0;
 
         } msgptr;
         int msg_len_valid = 0;
 

-        if (is_ipv6)
-        {
+        if (is_ipv6) {

             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6));
             msgptr.v6 = (const struct olsr_msg6 *) tptr;
             msg_type = GET_U_1(msgptr.v6->msg_type);
             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6));
             msgptr.v6 = (const struct olsr_msg6 *) tptr;
             msg_type = GET_U_1(msgptr.v6->msg_type);


@@ -381,9 +380,7 @@ olsr_print(netdissect_options *ndo,
 
             msg_tlen = msg_len - sizeof(struct olsr_msg6);
             msg_data = tptr + sizeof(struct olsr_msg6);
 
             msg_tlen = msg_len - sizeof(struct olsr_msg6);
             msg_data = tptr + sizeof(struct olsr_msg6);

-        }
-        else /* (!is_ipv6) */
-        {
+        } else {       /* (!is_ipv6) */

             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg4));
             msgptr.v4 = (const struct olsr_msg4 *) tptr;
             msg_type = GET_U_1(msgptr.v4->msg_type);
             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg4));
             msgptr.v4 = (const struct olsr_msg4 *) tptr;
             msg_type = GET_U_1(msgptr.v4->msg_type);


@@ -517,8 +514,7 @@ olsr_print(netdissect_options *ndo,
         }
 
         case OLSR_HNA_MSG:
         }
 
         case OLSR_HNA_MSG:

-            if (is_ipv6)
-            {
+            if (is_ipv6) {

                 int i = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",
                 int i = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",


@@ -538,9 +534,7 @@ olsr_print(netdissect_options *ndo,
                     msg_data += sizeof(struct olsr_hna6);
                     msg_tlen -= sizeof(struct olsr_hna6);
                 }
                     msg_data += sizeof(struct olsr_hna6);
                     msg_tlen -= sizeof(struct olsr_hna6);
                 }

-            }
-            else
-            {
+            } else {

                 int col = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",
                 int col = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",