diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-30 20:51:18 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-30 20:51:18 +0000 |
| commit | 55da3a22540c952c3e65b3942a4902e0c99600d0 (patch) | |
| tree | 16a905a09d5f4a43cfb2274297553699c256e80c /wiretap | |
| parent | bc78191e3180a5f1c60228a97d81fcc6b169f02c (diff) | |
| download | wireshark-55da3a22540c952c3e65b3942a4902e0c99600d0.tar.gz | |
From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8644 :
SEL RTAC (Real Time Automation Controller) EIA-232 Serial-Line Dissection
svn path=/trunk/; revision=49635
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 8 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 3fc6502441..cfd090c60d 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -340,7 +340,7 @@ static const struct { /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ { 201, WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR }, /* AX.25 packet with a 1-byte KISS header */ - { 202, WTAP_ENCAP_AX25_KISS }, + { 202, WTAP_ENCAP_AX25_KISS }, /* LAPD frame */ { 203, WTAP_ENCAP_LAPD }, /* PPP with pseudoheader */ @@ -374,7 +374,7 @@ static const struct { /* Raw IPv6 */ { 229, WTAP_ENCAP_RAW_IP6 }, /* IEEE 802.15.4 Wireless PAN no fcs */ - { 230, WTAP_ENCAP_IEEE802_15_4_NOFCS }, + { 230, WTAP_ENCAP_IEEE802_15_4_NOFCS }, /* D-BUS */ { 231, WTAP_ENCAP_DBUS }, /* DVB-CI (Common Interface) */ @@ -396,7 +396,9 @@ static const struct { /* SCTP */ { 248, WTAP_ENCAP_SCTP}, /* USBPcap */ - { 249, WTAP_ENCAP_USBPCAP}, + { 249, WTAP_ENCAP_USBPCAP}, + /* RTAC SERIAL */ + { 250, WTAP_ENCAP_RTAC_SERIAL}, /* * To repeat: diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 35b33c6045..08104366ce 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -608,6 +608,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_USBPCAP */ { "USB packets with USBPcap header", "usb-usbpcap" }, + + /* WTAP_ENCAP_RTAC_SERIAL */ + { "RTAC serial-line", "rtac-serial" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 2f855c72e2..6c4bd2e88a 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -244,6 +244,7 @@ extern "C" { #define WTAP_ENCAP_INFINIBAND 151 #define WTAP_ENCAP_JUNIPER_SVCS 152 #define WTAP_ENCAP_USBPCAP 153 +#define WTAP_ENCAP_RTAC_SERIAL 154 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |