]> The Tcpdump Group git mirrors - tcpdump/commitdiff
PPP: reuse etheraddr_string()
authorDenis Ovsienko <[email protected]>
Sat, 7 Jun 2014 18:26:01 +0000 (22:26 +0400)
committerDenis Ovsienko <[email protected]>
Sat, 7 Jun 2014 18:30:03 +0000 (22:30 +0400)
Also rewrite a check in the same form as in the preceding switch case.

print-ppp.c

index b92abf2751e44a879eed3a9ac1c0e965c8d8306c..b858b73ca824ed7a3e6733e6d042f25e13dc0af6 100644 (file)
@@ -738,9 +738,8 @@ print_lcp_config_options(netdissect_options *ndo,
                                ND_PRINT((ndo, " (length bogus, should be = 9)"));
                                return 0;
                        }
-                       ND_TCHECK(p[8]);
-                       ND_PRINT((ndo, ": MAC %02x:%02x:%02x:%02x:%02x:%02x",
-                              p[3], p[4], p[5], p[6], p[7], p[8]));
+                       ND_TCHECK2(*(p + 3), 6);
+                       ND_PRINT((ndo, ": MAC %s", etheraddr_string(ndo, p + 3)));
                        break;
                case MEDCLASS_MNB:
                        ND_PRINT((ndo, ": Magic-Num-Block")); /* XXX */