diff options
| author | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-05-17 05:11:57 +0000 |
| commit | 661b9d94414ea6d11d5b7960aef1f172975ce52b (patch) | |
| tree | 1720d207a135a239a304163c4635810a1094209a /contrib/tcpdump/print-lane.c | |
| parent | 63ab347efe2621fc79f689a92c4bbda531593626 (diff) | |
| parent | d36dcecdb3228d24b199eb51cfd7ac666f5b8eb8 (diff) | |
| download | FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.zip FreeBSD-src-661b9d94414ea6d11d5b7960aef1f172975ce52b.tar.gz | |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
Diffstat (limited to 'contrib/tcpdump/print-lane.c')
| -rw-r--r-- | contrib/tcpdump/print-lane.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-lane.c b/contrib/tcpdump/print-lane.c index 54c68c8..aa79311 100644 --- a/contrib/tcpdump/print-lane.c +++ b/contrib/tcpdump/print-lane.c @@ -61,9 +61,9 @@ static const struct tok lecop2str[] = { }; static void -lane_hdr_print(const u_char *bp) +lane_hdr_print(netdissect_options *ndo, const u_char *bp) { - (void)printf("lecid:%x ", EXTRACT_16BITS(bp)); + (void)ND_PRINT((ndo, "lecid:%x ", EXTRACT_16BITS(bp))); } /* @@ -106,7 +106,7 @@ lane_print(const u_char *p, u_int length, u_int caplen) * Now print the encapsulated frame, under the assumption * that it's an Ethernet frame. */ - ether_print(p, length, caplen, lane_hdr_print, p - 2); + ether_print(gndo, p, length, caplen, lane_hdr_print, p - 2); } u_int |
