diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-30 07:14:22 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-30 07:14:22 +0000 |
| commit | a7bb49b0d967c759dccab991e3ab049495a39dfc (patch) | |
| tree | d2124c81f2ca7a0d8f1f849a1362bc8261966b4b /capture.c | |
| parent | 9161ba8e7f3fa9d8c59f5f7719625689a9867d6f (diff) | |
| download | wireshark-a7bb49b0d967c759dccab991e3ab049495a39dfc.tar.gz wireshark-a7bb49b0d967c759dccab991e3ab049495a39dfc.tar.bz2 wireshark-a7bb49b0d967c759dccab991e3ab049495a39dfc.zip | |
Add support for LocalTalk Link Access Protocol.
Rename WTAP_ENCAP_PRISM to WTAP_ENCAP_PRISM_HEADER, to match
DLT_PRISM_HEADER.
Add in missing capture support for WTAP_ENCAP_PRISM_HEADER when
capturing with "pcap_open_live()" rather than reading the capture from a
pipe.
svn path=/trunk/; revision=4299
Diffstat (limited to 'capture.c')
| -rw-r--r-- | capture.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.160 2001/11/28 07:11:07 guy Exp $ + * $Id: capture.c,v 1.161 2001/11/30 07:14:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -149,6 +149,7 @@ #include "wiretap/libpcap.h" #include "wiretap/wtap.h" +#include "packet-atalk.h" #include "packet-clip.h" #include "packet-eth.h" #include "packet-fddi.h" @@ -1158,7 +1159,7 @@ pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr) case WTAP_ENCAP_FDDI_BITSWAPPED: capture_fddi(pd, whdr.caplen, &ld->counts); break; - case WTAP_ENCAP_PRISM: + case WTAP_ENCAP_PRISM_HEADER: capture_prism(pd, 0, whdr.caplen, &ld->counts); break; case WTAP_ENCAP_TOKEN_RING: @@ -1182,6 +1183,9 @@ pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr) case WTAP_ENCAP_CHDLC: capture_chdlc(pd, 0, whdr.caplen, &ld->counts); break; + case WTAP_ENCAP_LOCALTALK: + capture_llap(pd, whdr.caplen, &ld->counts); + break; /* XXX - FreeBSD may append 4-byte ATM pseudo-header to DLT_ATM_RFC1483, with LLC header following; we should implement it at some point. */ @@ -1879,6 +1883,9 @@ capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr, case WTAP_ENCAP_FDDI_BITSWAPPED: capture_fddi(pd, phdr->len, &ld->counts); break; + case WTAP_ENCAP_PRISM_HEADER: + capture_prism(pd, 0, phdr->len, &ld->counts); + break; case WTAP_ENCAP_TOKEN_RING: capture_tr(pd, 0, phdr->len, &ld->counts); break; @@ -1897,6 +1904,9 @@ capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr, case WTAP_ENCAP_LINUX_ATM_CLIP: capture_clip(pd, phdr->len, &ld->counts); break; + case WTAP_ENCAP_LOCALTALK: + capture_llap(pd, phdr->len, &ld->counts); + break; /* XXX - FreeBSD may append 4-byte ATM pseudo-header to DLT_ATM_RFC1483, with LLC header following; we should implement it at some point. */ |