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

AUTHORS

@@ -3235,6 +3235,10 @@ Grzegorz Szczytowski	<Grzegorz.Szczytowski [AT] gmail.com>  {
 	E212 dissector MCC 260 upgrade and modification
 }
 
+Martin Kaiser		<martin [AT] kaiser.cx> {
+	DVB-CI (Common Interface) dissector
+}
+
 
 and by:
 

epan/CMakeLists.txt

@@ -511,6 +511,7 @@ set(DISSECTOR_SRC
 	dissectors/packet-dtp.c
 	dissectors/packet-dtpt.c
 	dissectors/packet-dua.c
+	dissectors/packet-dvbci.c
 	dissectors/packet-dvmrp.c
 	dissectors/packet-e100.c
 	dissectors/packet-e164.c

epan/dissectors/Makefile.common

@@ -423,6 +423,7 @@ DISSECTOR_SRC = \
 	packet-dtp.c		\
 	packet-dtpt.c		\
 	packet-dua.c		\
+	packet-dvbci.c		\
 	packet-dvmrp.c		\
 	packet-e100.c		\
 	packet-e164.c		\

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:

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);

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()