diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-03-07 02:22:48 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-03-07 02:22:48 +0000 |
| commit | 16b528aaf1176f5cf90cea4bef6ea75b3290ccfc (patch) | |
| tree | f7915a4d9e3c41c2c81f6de9e46a672d4c2e71af /wiretap | |
| parent | 4d3d029e09eecfd034d8cb04bbe7045446854944 (diff) | |
From Martin Kaiser: dissector for DVB-CI (Common Interface)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5654
From me:
- Entry for DVBCI added to wtap.c encap_table_base[];
- Some code simplification with respect to the use of col_...() for COL_INFO;
- Certain tests for "enough bytes available" not really needed;
- (Other minor tweaks);
- #include<stdio.h> not req'd;
- Minor reformatting and whitespace cleanup;
svn path=/trunk/; revision=36149
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 4f58e70aa6..88c47a7f3d 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -367,6 +367,8 @@ static const struct { { 229, WTAP_ENCAP_RAW_IP6 }, /* IEEE 802.15.4 Wireless PAN no fcs */ { 230, WTAP_ENCAP_IEEE802_15_4_NOFCS }, + /* DVB-CI (Common Interface) */ + { 235, WTAP_ENCAP_DVBCI }, /* * To repeat: diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 49a76e9869..ae070418b7 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -488,7 +488,10 @@ static struct encap_type_info encap_table_base[] = { { "Raw IPv6", "rawip6" }, /* WTAP_ENCAP_LAPD */ - { "Lapd header", "lapd" } + { "Lapd header", "lapd" }, + + /* WTAP_ENCAP_DVBCI */ + { "DVB-CI (Common Interface)", "dvbci"} }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); diff --git a/wiretap/wtap.h b/wiretap/wtap.h index eb70e745a8..de7060066a 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -221,6 +221,7 @@ extern "C" { #define WTAP_ENCAP_RAW_IP4 129 #define WTAP_ENCAP_RAW_IP6 130 #define WTAP_ENCAP_LAPD 131 +#define WTAP_ENCAP_DVBCI 132 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |