wiretap: register most built-in file types from its module.

Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().

This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler).  (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)

A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.

Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine.  In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.

Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.

While we're at it, add modelines to a file that lacked them.

1 files changed, 0 insertions, 365 deletions

diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 1b0b897b75..e4c5ec734c 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -1267,11 +1267,6 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
 	  FALSE, FALSE, 0,
 	  libpcap_dump_can_write_encap, libpcap_dump_open, NULL },
 
-	/* WTAP_FILE_TYPE_SUBTYPE_5VIEWS */
-	{ "InfoVista 5View capture", "5views", "5vw", NULL,
-	   TRUE, FALSE, 0,
-	  _5views_dump_can_write_encap, _5views_dump_open, NULL },
-
 	/* WTAP_FILE_TYPE_SUBTYPE_IPTRACE_1_0 */
 	{ "AIX iptrace 1.0", "iptrace_1", NULL, NULL,
 	  FALSE, FALSE, 0,
@@ -1287,374 +1282,14 @@ static const struct file_type_subtype_info dump_open_table_base[] = {
 	  FALSE, FALSE, 0,
 	  NULL, NULL, NULL },
 
-	/* WTAP_FILE_TYPE_SUBTYPE_HCIDUMP */
-	{ "Bluetooth HCI dump", "hcidump", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_CATAPULT_DCT2000 */
-	{ "Catapult DCT2000 trace (.out format)", "dct2000", "out", NULL,
-	  FALSE, FALSE, 0,
-	  catapult_dct2000_dump_can_write_encap, catapult_dct2000_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETXRAY_OLD */
-	{ "Cinco Networks NetXRay 1.x", "netxray1", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETXRAY_1_0 */
-	{ "Cinco Networks NetXRay 2.0 or later", "netxray2", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_COSINE */
-	{ "CoSine IPSX L2 capture", "cosine", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_CSIDS */
-	{ "CSIDS IPLog", "csids", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_DBS_ETHERWATCH */
-	{ "DBS Etherwatch (VMS)", "etherwatch", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
 	/* WTAP_FILE_TYPE_SUBTYPE_ERF */
 	{ "Endace ERF capture", "erf", "erf", NULL,
 	  FALSE, TRUE, WTAP_COMMENT_PER_SECTION|WTAP_COMMENT_PER_INTERFACE|WTAP_COMMENT_PER_PACKET,
 	  erf_dump_can_write_encap, erf_dump_open, NULL },
 
-	/* WTAP_FILE_TYPE_SUBTYPE_EYESDN */
-	{ "EyeSDN USB S0/E1 ISDN trace format", "eyesdn", "trc", NULL,
-	   FALSE, FALSE, 0,
-	   eyesdn_dump_can_write_encap, eyesdn_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETTL */
-	{ "HP-UX nettl trace", "nettl", "trc0", "trc1",
-	  FALSE, FALSE, 0,
-	  nettl_dump_can_write_encap, nettl_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_ISERIES */
-	{ "IBM iSeries comm. trace (ASCII)", "iseries_ascii", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_ISERIES_UNICODE */
-	{ "IBM iSeries comm. trace (Unicode)", "iseries_unicode", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_I4BTRACE */
-	{ "I4B ISDN trace", "i4btrace", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_ASCEND */
-	{ "Lucent/Ascend access server trace", "ascend", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETMON_1_x */
-	{ "Microsoft NetMon 1.x", "netmon1", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  netmon_dump_can_write_encap_1_x, netmon_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETMON_2_x */
-	{ "Microsoft NetMon 2.x", "netmon2", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  netmon_dump_can_write_encap_2_x, netmon_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NGSNIFFER_UNCOMPRESSED */
-	{ "Sniffer (DOS)", "ngsniffer", "cap", "enc;trc;fdc;syc",
-	  FALSE, FALSE, 0,
-	  ngsniffer_dump_can_write_encap, ngsniffer_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NGSNIFFER_COMPRESSED */
-	{ "Sniffer (DOS), compressed", "ngsniffer_comp", "cap", "enc;trc;fdc;syc",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETXRAY_1_1 */
-	{ "NetXray, Sniffer (Windows) 1.1", "ngwsniffer_1_1", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  netxray_dump_can_write_encap_1_1, netxray_dump_open_1_1, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETXRAY_2_00x */
-	{ "Sniffer (Windows) 2.00x", "ngwsniffer_2_0", "cap", "caz",
-	  TRUE, FALSE, 0,
-	  netxray_dump_can_write_encap_2_0, netxray_dump_open_2_0, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETWORK_INSTRUMENTS */
-	{ "Network Instruments Observer", "niobserver", "bfr", NULL,
-	  FALSE, FALSE, 0,
-	  network_instruments_dump_can_write_encap, network_instruments_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LANALYZER */
-	{ "Novell LANalyzer","lanalyzer", "tr1", NULL,
-	  TRUE, FALSE, 0,
-	  lanalyzer_dump_can_write_encap, lanalyzer_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_PPPDUMP */
-	{ "pppd log (pppdump format)", "pppd", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_RADCOM */
-	{ "RADCOM WAN/LAN analyzer", "radcom", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_SNOOP */
-	{ "Sun snoop", "snoop", "snoop", "cap",
-	  FALSE, FALSE, 0,
-	  snoop_dump_can_write_encap, snoop_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_SHOMITI */
-	{ "Shomiti/Finisar Surveyor", "shomiti", "cap", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_VMS */
-	{ "TCPIPtrace (VMS)", "tcpiptrace", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_K12 */
-	{ "Tektronix K12xx 32-bit .rf5 format", "rf5", "rf5", NULL,
-	   TRUE, FALSE, 0,
-	   k12_dump_can_write_encap, k12_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_TOSHIBA */
-	{ "Toshiba Compact ISDN Router snoop", "toshiba", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_VISUAL_NETWORKS */
-	{ "Visual Networks traffic capture", "visual", NULL, NULL,
-	  TRUE, FALSE, 0,
-	  visual_dump_can_write_encap, visual_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_PEEKCLASSIC_V56 */
-	{ "Savvius classic (V5 and V6)", "peekclassic56", "pkt", "tpc;apc;wpz",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_PEEKCLASSIC_V7 */
-	{ "Savvius classic (V7)", "peekclassic7", "pkt", "tpc;apc;wpz",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_PEEKTAGGED */
-	{ "Savvius tagged", "peektagged", "pkt", "tpc;apc;wpz",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_MPEG */
-	{ "MPEG", "mpeg", "mpeg", "mpg;mp3",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_K12TEXT  */
-	{ "K12 text file", "k12text", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  k12text_dump_can_write_encap, k12text_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETSCREEN */
-	{ "NetScreen snoop text file", "netscreen", "txt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_COMMVIEW */
-	{ "TamoSoft CommView", "commview", "ncf", NULL,
-	  FALSE, FALSE, 0,
-	  commview_dump_can_write_encap, commview_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_BTSNOOP */
-	{ "Symbian OS btsnoop", "btsnoop", "log", NULL,
-	  FALSE, FALSE, 0,
-	  btsnoop_dump_can_write_encap, btsnoop_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_TNEF */
-	{ "Transport-Neutral Encapsulation Format", "tnef", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_DCT3TRACE */
-	{ "Gammu DCT3 trace", "dct3trace", "xml", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_PACKETLOGGER */
-	{ "macOS PacketLogger", "pklg", "pklg", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_DAINTREE_SNA */
-	{ "Daintree SNA", "dsna", "dcf", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0 */
-	{ "NetScaler Trace (Version 1.0)", "nstrace10", NULL, NULL,
-	  TRUE, FALSE, 0,
-	  nstrace_10_dump_can_write_encap, nstrace_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0 */
-	{ "NetScaler Trace (Version 2.0)", "nstrace20", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  nstrace_20_dump_can_write_encap, nstrace_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_JPEG_JFIF */
-	{ "JPEG/JFIF", "jpeg", "jpg", "jpeg;jfif",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_IPFIX */
-	{ "IPFIX File Format", "ipfix", "pfx", "ipfix",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_MIME */
-	{ "MIME File Format", "mime", NULL, NULL,
-	   FALSE, FALSE, 0,
-	   NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_AETHRA */
-	{ "Aethra .aps file", "aethra", "aps", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_MPEG_2_TS */
-	{ "MPEG2 transport stream", "mp2t", "mp2t", "ts;mpg",
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_VWR_80211 */
-	{ "Ixia IxVeriWave .vwr Raw 802.11 Capture", "vwr80211", "vwr", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_VWR_ETH */
-	{ "Ixia IxVeriWave .vwr Raw Ethernet Capture", "vwreth", "vwr", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_CAMINS */
-	{ "CAM Inspector file", "camins", "camins", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_STANAG_4607 */
-	{ "STANAG 4607 Format", "stanag4607", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0 */
-	{ "NetScaler Trace (Version 3.0)", "nstrace30", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  nstrace_30_dump_can_write_encap, nstrace_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT */
-	{ "Android Logcat Binary format", "logcat", "logcat", NULL,
-	  FALSE, FALSE, 0,
-	  logcat_dump_can_write_encap, logcat_binary_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_BRIEF */
-	{ "Android Logcat Brief text format", "logcat-brief", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  logcat_text_brief_dump_can_write_encap, logcat_text_brief_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_PROCESS */
-	{ "Android Logcat Process text format", "logcat-process", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  logcat_text_process_dump_can_write_encap, logcat_text_process_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_TAG */
-	{ "Android Logcat Tag text format", "logcat-tag", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  logcat_text_tag_dump_can_write_encap, logcat_text_tag_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_THREAD */
-	{ "Android Logcat Thread text format", "logcat-thread", NULL, NULL,
-	   FALSE, FALSE, 0,
-	   logcat_text_thread_dump_can_write_encap, logcat_text_thread_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_TIME */
-	{ "Android Logcat Time text format", "logcat-time", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  logcat_text_time_dump_can_write_encap, logcat_text_time_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_THREADTIME */
-	{ "Android Logcat Threadtime text format", "logcat-threadtime", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  logcat_text_threadtime_dump_can_write_encap, logcat_text_threadtime_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_LONG */
-	{ "Android Logcat Long text format", "logcat-long", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  logcat_text_long_dump_can_write_encap, logcat_text_long_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_COLASOFT_CAPSA */
-	{ "Colasoft Capsa format", "capsa", "cscpkt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_COLASOFT_PACKET_BUILDER */
-	{ "Colasoft Packet Builder format", "colasoft-pb", "cscpkt", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_JSON */
-	{ "JavaScript Object Notation", "json", "json", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5 */
-	{ "NetScaler Trace (Version 3.5)", "nstrace35", "cap", NULL,
-	  TRUE, FALSE, 0,
-	  nstrace_35_dump_can_write_encap, nstrace_dump_open, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_NETTRACE_3GPP_32_423 */
-	{ "3GPP TS 32.423 Trace", "3gpp32423", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_MPLOG */
-	{ "Micropross mplog", "mplog", "mplog", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_DPA400 */
-	{ "Unigraf DPA-400 capture", "dpa400", "bin", NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_RFC7468 */
-	{ "RFC 7468 files", "rfc7468", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_RUBY_MARSHAL */
-	{ "Ruby marshal files", "ruby_marshal", NULL, NULL,
-	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
 	/* WTAP_FILE_TYPE_SUBTYPE_SYSTEMD_JOURNAL */
 	{ "systemd journal export", "systemd_journal", NULL, NULL,
 	  FALSE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_LOG_3GPP */
-	{ "3GPP Log", "3gpp_log", "*.log", NULL,
-	  TRUE, FALSE, 0,
-	  NULL, NULL, NULL },
-
-	/* WTAP_FILE_TYPE_SUBTYPE_MP4 */
-	{ "MP4 media", "mp4", "mp4", NULL,
-	  FALSE, FALSE, 0,
 	  NULL, NULL, NULL }
 };