diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
| commit | 27df3f5dddcc52e19be97c5e876161208987d4f1 (patch) | |
| tree | df5e0d876c3ec2ff0e3d9c6795cb5c1e20b7d5c4 /contrib/tcpdump/print-fr.c | |
| parent | ba2a27351bcd9e7c4ba485cf914d9071eebc2c60 (diff) | |
| parent | 6d59e2f382406def185ce5261b8723a174cd28a3 (diff) | |
| download | src-27df3f5dddcc52e19be97c5e876161208987d4f1.tar.gz src-27df3f5dddcc52e19be97c5e876161208987d4f1.zip | |
Merge tcpdump-4.1.1.
Notes
Notes:
svn path=/head/; revision=214478
Diffstat (limited to 'contrib/tcpdump/print-fr.c')
| -rw-r--r-- | contrib/tcpdump/print-fr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c index d0956f6c0716..67961ae34ba2 100644 --- a/contrib/tcpdump/print-fr.c +++ b/contrib/tcpdump/print-fr.c @@ -258,11 +258,10 @@ fr_print(register const u_char *p, u_int length) if (eflag) fr_hdr_print(length, addr_len, dlci, flags, extracted_ethertype); - if (ether_encap_print(extracted_ethertype, + if (ethertype_print(extracted_ethertype, p+addr_len+ETHERTYPE_LEN, length-addr_len-ETHERTYPE_LEN, - length-addr_len-ETHERTYPE_LEN, - &extracted_ethertype) == 0) + length-addr_len-ETHERTYPE_LEN) == 0) /* ether_type not known, probably it wasn't one */ printf("UI %02x! ", p[addr_len]); else @@ -299,7 +298,7 @@ fr_print(register const u_char *p, u_int length) break; case NLPID_SNAP: - if (snap_print(p, length, length, &extracted_ethertype, 0) == 0) { + if (snap_print(p, length, length, 0) == 0) { /* ether_type not known, print raw packet */ if (!eflag) fr_hdr_print(length + hdr_len, hdr_len, |