diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-03 22:31:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-03 22:31:26 +0000 |
| commit | e56b77f4cd8229eed54603b9447b0226339d9e43 (patch) | |
| tree | e0e81ac55e449cd4ea95b398ae728ee27f0a7199 /wiretap | |
| parent | deadb2896c5aac3834c609161f391a8a56ce4ce0 (diff) | |
Add support for SDLC encapsulation in DOS Sniffer captures; that
includes adding an SDLC dissector.
svn path=/trunk/; revision=6848
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/ngsniffer.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 08aa22c151..8aaf5e0950 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -1,6 +1,6 @@ /* ngsniffer.c * - * $Id: ngsniffer.c,v 1.98 2003/01/03 20:42:52 guy Exp $ + * $Id: ngsniffer.c,v 1.99 2003/01/03 22:31:26 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -775,6 +775,10 @@ process_rec_header2_v45(wtap *wth, unsigned char *buffer, guint16 length, */ switch (buffer[4]) { + case NET_SDLC: + wth->file_encap = WTAP_ENCAP_SDLC; + break; + case NET_HDLC: wth->file_encap = WTAP_ENCAP_LAPB; break; diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 0c5351ab65..f4f4f3c746 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.76 2003/01/03 06:45:45 guy Exp $ + * $Id: wtap.c,v 1.77 2003/01/03 22:31:26 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -157,6 +157,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_WFLEET_HDLC */ { "Wellfleet HDLC", "whdlc" }, + + /* WTAP_ENCAP_SDLC */ + { "SDLC", "sdlc" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 8dc1b1f923..edb1589da5 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.128 2003/01/03 06:45:45 guy Exp $ + * $Id: wtap.h,v 1.129 2003/01/03 22:31:26 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -121,10 +121,11 @@ #define WTAP_ENCAP_DOCSIS 29 #define WTAP_ENCAP_COSINE 30 #define WTAP_ENCAP_WLAN_HEADER 31 -#define WTAP_ENCAP_WFLEET_HDLC 32 +#define WTAP_ENCAP_WFLEET_HDLC 32 +#define WTAP_ENCAP_SDLC 33 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 33 +#define WTAP_NUM_ENCAP_TYPES 34 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |