diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-23 06:57:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-23 06:57:37 +0000 |
| commit | 498c94b10a401116c00113c1633e0584824048f7 (patch) | |
| tree | dd2aef45aa16ee7a7972e8bf94b114d0563d4091 /capture.c | |
| parent | 8e6518ea607984b4fb76d0e04c28fed8631b368c (diff) | |
Add a "capture_arcnet()" routine and use it when capturing.
In "dissect_arcnet_common()", fetch the protocol ID using the correct
offset rather than a hardwired 4.
svn path=/trunk/; revision=6982
Diffstat (limited to 'capture.c')
| -rw-r--r-- | capture.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.203 2003/01/03 06:45:42 guy Exp $ + * $Id: capture.c,v 1.204 2003/01/23 06:57:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -161,6 +161,7 @@ #include "packet-chdlc.h" #include "packet-prism.h" #include "packet-ipfc.h" +#include "packet-arcnet.h" #ifdef _WIN32 #include "capture-wpcap.h" @@ -2251,6 +2252,12 @@ capture_pcap_cb(guchar *user, const struct pcap_pkthdr *phdr, case WTAP_ENCAP_IP_OVER_FC: capture_ipfc(pd, whdr.caplen, &ld->counts); break; + case WTAP_ENCAP_ARCNET: + capture_arcnet(pd, whdr.caplen, &ld->counts, FALSE); + break; + case WTAP_ENCAP_ARCNET_LINUX: + capture_arcnet(pd, whdr.caplen, &ld->counts, TRUE); + break; /* XXX - some ATM drivers on FreeBSD might prepend a 4-byte ATM pseudo-header to DLT_ATM_RFC1483, with LLC header following; we might have to implement that at some point. */ |