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

[tcpdump] / print-icmp6.c

diff --git a/print-icmp6.c b/print-icmp6.c
index a45974da87ce9704147e4a314edbf67f37624e2c..ae2596aca37fd0d6a9acd517a2cabd88c8e57dd3 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -1328,8 +1328,7 @@ get_upperlayer(netdissect_options *ndo, const u_char *bp, u_int *prot)
                        if (ND_TTEST_2(uh->uh_dport)) {
                                *prot = nh;
                                return(uh);
                        if (ND_TTEST_2(uh->uh_dport)) {
                                *prot = nh;
                                return(uh);

-                       }
-                       else
+                       } else

                                return(NULL);
                        /* NOTREACHED */
 
                                return(NULL);
                        /* NOTREACHED */
 


@@ -1457,8 +1456,7 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        ND_PRINT(" lifetime %us, domain(s):",
                                   GET_BE_U_4(opds->nd_opt_dnssl_lifetime));
                        domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */
                        ND_PRINT(" lifetime %us, domain(s):",
                                   GET_BE_U_4(opds->nd_opt_dnssl_lifetime));
                        domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */

-                       while (domp < cp + (opt_len << 3) && GET_U_1(domp) != '\0')
-                       {
+                       while (domp < cp + (opt_len << 3) && GET_U_1(domp) != '\0') {

                                ND_PRINT(" ");
                                if ((domp = fqdn_print(ndo, domp, bp)) == NULL)
                                        goto trunc;
                                ND_PRINT(" ");
                                if ((domp = fqdn_print(ndo, domp, bp)) == NULL)
                                        goto trunc;