Use WTAP_ERR_UNSUPPORTED for input file stuff we can't handle.

WTAP_ERR_UNSUPPORTED_ENCAP means "I can't *write* that particular
encapsulation type to a file of this format", which mainly means "that
file format simply can't handle packets of that type";
WTAP_ERR_UNSUPPORTED means "this file can't currently be supported by
Wireshark, as there's some feature in the file - such as a file or
per-packet encapsulation type - that we don't (yet) handle".

Change-Id: I53cadf9913d20efb2bccb29f61877b71d53807be
Reviewed-on: https://code.wireshark.org/review/5794
Reviewed-by: Guy Harris <guy@alum.mit.edu>

14 files changed, 30 insertions, 30 deletions

diff --git a/wiretap/5views.c b/wiretap/5views.c
index 114e1562fc..d615a3eca4 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -162,7 +162,7 @@ _5views_open(wtap *wth, int *err, gchar **err_info)
 		break;
 */
 	default:
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("5views: network type %u unknown or unsupported",
 		    Capture_Header.Info_Header.FileType);
 		return WTAP_OPEN_ERROR;
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 52400a96c4..fc3700e2cf 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -480,7 +480,7 @@ static gboolean erf_read_header(FILE_T fh,
     case ERF_TYPE_TCP_FLOW_COUNTER:
       /* unsupported, continue with default: */
     default:
-      *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+      *err = WTAP_ERR_UNSUPPORTED;
       *err_info = g_strdup_printf("erf: unknown record encapsulation %u",
                                   erf_header->type);
       return FALSE;
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index c652af700d..f92241fefd 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -135,7 +135,7 @@ iptrace_read_rec_1_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
 	pkt_hdr.if_type = header[28];
 	phdr->pkt_encap = wtap_encap_ift(pkt_hdr.if_type);
 	if (phdr->pkt_encap == WTAP_ENCAP_UNKNOWN) {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("iptrace: interface type IFT=0x%02x unknown or unsupported",
 		    pkt_hdr.if_type);
 		return FALSE;
@@ -327,7 +327,7 @@ iptrace_read_rec_2_0(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf,
 	 * that we don't handle?
 	 */
 	if (phdr->pkt_encap == WTAP_ENCAP_UNKNOWN) {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("iptrace: interface type IFT=0x%02x unknown or unsupported",
 		    pkt_hdr.if_type);
 		return FALSE;
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index 449534b2ae..9aed765f8d 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -207,17 +207,17 @@ k12text_set_headers(struct wtap_pkthdr *phdr, int *err, gchar **err_info)
 	    case WTAP_ENCAP_MTP2:      /* not (yet) supported		*/
 		    /* XXX: I don't know how to fill in the		*/
 		    /* pseudo_header for these types.			*/
-		    *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		    *err = WTAP_ERR_UNSUPPORTED;
 		    *err_info = g_strdup("k12text: MTP2 packets not yet supported");
 		    return FALSE;
 	    case WTAP_ENCAP_ATM_PDUS:  /* not (yet) supported		*/
 		    /* XXX: I don't know how to fill in the		*/
 		    /* pseudo_header for these types.			*/
-		    *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		    *err = WTAP_ERR_UNSUPPORTED;
 		    *err_info = g_strdup("k12text: SSCOP packets not yet supported");
 		    return FALSE;
 	    default:
-		    *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		    *err = WTAP_ERR_UNSUPPORTED;
 		    *err_info = g_strdup("k12text: unknown encapsulation type");
 		    return FALSE;
 	}
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index de51491ee8..6eaeb7f44b 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -404,7 +404,7 @@ wtap_open_return_val lanalyzer_open(wtap *wth, int *err, gchar **err_info)
 						wth->file_encap = WTAP_ENCAP_TOKEN_RING;
 						break;
 					default:
-						*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+						*err = WTAP_ERR_UNSUPPORTED;
 						*err_info = g_strdup_printf("lanalyzer: board type %u unknown",
 						    board_type);
 						return WTAP_OPEN_ERROR;
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 47d1aacbab..03266b975d 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -253,7 +253,7 @@ wtap_open_return_val libpcap_open(wtap *wth, int *err, gchar **err_info)
 
 	file_encap = wtap_pcap_encap_to_wtap_encap(hdr.network);
 	if (file_encap == WTAP_ENCAP_UNKNOWN) {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("pcap: network type %u unknown or unsupported",
 		    hdr.network);
 		return WTAP_OPEN_ERROR;
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 8a0725ad08..9b23d284b7 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -237,7 +237,7 @@ wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info)
 	hdr.network = pletoh16(&hdr.network);
 	if (hdr.network >= NUM_NETMON_ENCAPS
 	    || netmon_encap[hdr.network] == WTAP_ENCAP_UNKNOWN) {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("netmon: network type %u unknown or unsupported",
 		    hdr.network);
 		return WTAP_OPEN_ERROR;
@@ -669,7 +669,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
 			network &= 0x0FFF;
 			pkt_encap = wtap_pcap_encap_to_wtap_encap(network);
 			if (pkt_encap == WTAP_ENCAP_UNKNOWN) {
-				*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+				*err = WTAP_ERR_UNSUPPORTED;
 				*err_info = g_strdup_printf("netmon: converted pcap network type %u unknown or unsupported",
 				    network);
 				return FAILURE;
@@ -680,7 +680,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
 			 */
 			pkt_encap = netmon_encap[network];
 			if (pkt_encap == WTAP_ENCAP_UNKNOWN) {
-				*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+				*err = WTAP_ERR_UNSUPPORTED;
 				*err_info = g_strdup_printf("netmon: network type %u unknown or unsupported",
 				    network);
 				return FAILURE;
@@ -734,7 +734,7 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
 				return RETRY;
 
 			default:
-				*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+				*err = WTAP_ERR_UNSUPPORTED;
 				*err_info = g_strdup_printf("netmon: network type %u unknown or unsupported",
 				    network);
 				return FAILURE;
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index 36d3100a0d..54c97b0758 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -209,14 +209,14 @@ wtap_open_return_val network_instruments_open(wtap *wth, int *err, gchar **err_i
 
     /* check the packet's magic number */
     if (packet_header.packet_magic != observer_packet_magic) {
-        *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+        *err = WTAP_ERR_UNSUPPORTED;
         *err_info = g_strdup_printf("Observer: unsupported packet version %ul", packet_header.packet_magic);
         return WTAP_OPEN_ERROR;
     }
 
     /* check the data link type */
     if (observer_to_wtap_encap(packet_header.network_type) == WTAP_ENCAP_UNKNOWN) {
-        *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+        *err = WTAP_ERR_UNSUPPORTED;
         *err_info = g_strdup_printf("Observer: network type %u unknown or unsupported", packet_header.network_type);
         return WTAP_OPEN_ERROR;
     }
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index bb795fe362..fad1f8454e 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -551,7 +551,7 @@ netxray_open(wtap *wth, int *err, gchar **err_info)
 
 	if (network_type >= NUM_NETXRAY_ENCAPS
 	    || netxray_encap[network_type] == WTAP_ENCAP_UNKNOWN) {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("netxray: network type %u (%u) unknown or unsupported",
 		    network_type, hdr.network_plus);
 		return WTAP_OPEN_ERROR;
@@ -813,7 +813,7 @@ netxray_open(wtap *wth, int *err, gchar **err_info)
 					break;
 
 				default:
-					*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+					*err = WTAP_ERR_UNSUPPORTED;
 					*err_info = g_strdup_printf("netxray: WAN HDLC capture subsubtype 0x%02x unknown or unsupported",
 					   hdr.wan_hdlc_subsub_captype);
 					return WTAP_OPEN_ERROR;
@@ -835,7 +835,7 @@ netxray_open(wtap *wth, int *err, gchar **err_info)
 				break;
 
 			default:
-				*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+				*err = WTAP_ERR_UNSUPPORTED;
 				*err_info = g_strdup_printf("netxray: WAN capture subtype 0x%02x unknown or unsupported",
 				   hdr.captype);
 				return WTAP_OPEN_ERROR;
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index c665fc1f6b..3f31395e0d 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -609,7 +609,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info)
 	/* Check the data link type. */
 	if (version.network >= NUM_NGSNIFF_ENCAPS
 	    || sniffer_encap[version.network] == WTAP_ENCAP_UNKNOWN) {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("ngsniffer: network type %u unknown or unsupported",
 		    version.network);
 		return WTAP_OPEN_ERROR;
@@ -888,7 +888,7 @@ process_rec_header2_v2(wtap *wth, unsigned char *buffer, guint16 length,
 		/*
 		 * There's not enough data to compare.
 		 */
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("ngsniffer: WAN capture has too-short protocol list");
 		return -1;
 	}
@@ -899,7 +899,7 @@ process_rec_header2_v2(wtap *wth, unsigned char *buffer, guint16 length,
 		 */
 		wth->file_encap = WTAP_ENCAP_LAPB;
 	} else {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("ngsniffer: WAN capture protocol string %.*s unknown",
 		    length, buffer);
 		return -1;
@@ -919,7 +919,7 @@ process_rec_header2_v145(wtap *wth, unsigned char *buffer, guint16 length,
 		/*
 		 * There is no 5th byte; give up.
 		 */
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup("ngsniffer: WAN capture has no network subtype");
 		return -1;
 	}
@@ -988,7 +988,7 @@ process_rec_header2_v145(wtap *wth, unsigned char *buffer, guint16 length,
 				/*
 				 * There is no 5th byte; give up.
 				 */
-				*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+				*err = WTAP_ERR_UNSUPPORTED;
 				*err_info = g_strdup("ngsniffer: WAN bridge/router capture has no ISDN flag");
 				return -1;
 			}
@@ -1006,7 +1006,7 @@ process_rec_header2_v145(wtap *wth, unsigned char *buffer, guint16 length,
 		/*
 		 * Reject these until we can figure them out.
 		 */
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("ngsniffer: WAN network subtype %u unknown or unsupported",
 		    buffer[4]);
 		return -1;
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 6e88d9334c..8317f67c36 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -413,7 +413,7 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info)
     }
     if (mediaSubType >= NUM_PEEKTAGGED_ENCAPS
         || peektagged_encap[mediaSubType] == WTAP_ENCAP_UNKNOWN) {
-	*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+	*err = WTAP_ERR_UNSUPPORTED;
 	*err_info = g_strdup_printf("peektagged: network type %u unknown or unsupported",
 	    mediaSubType);
 	return WTAP_OPEN_ERROR;
diff --git a/wiretap/radcom.c b/wiretap/radcom.c
index c2f20ab30e..53f5505434 100644
--- a/wiretap/radcom.c
+++ b/wiretap/radcom.c
@@ -201,7 +201,7 @@ wtap_open_return_val radcom_open(wtap *wth, int *err, gchar **err_info)
 	else if (memcmp(search_encap, "ATM/", 4) == 0)
 		wth->file_encap = WTAP_ENCAP_ATM_RFC1483;
 	else {
-		*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+		*err = WTAP_ERR_UNSUPPORTED;
 		*err_info = g_strdup_printf("radcom: network type \"%.4s\" unknown", search_encap);
 		return WTAP_OPEN_ERROR;
 	}
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index ad3886ec7c..9bd2cdbc74 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -369,7 +369,7 @@ wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info)
 	if (is_shomiti) {
 		if (hdr.network >= NUM_SHOMITI_ENCAPS
 		    || shomiti_encap[hdr.network] == WTAP_ENCAP_UNKNOWN) {
-			*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+			*err = WTAP_ERR_UNSUPPORTED;
 			*err_info = g_strdup_printf("snoop: Shomiti network type %u unknown or unsupported",
 			    hdr.network);
 			return WTAP_OPEN_ERROR;
@@ -381,7 +381,7 @@ wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info)
 	} else if (hdr.network & SNOOP_PRIVATE_BIT) {
 		if ((hdr.network^SNOOP_PRIVATE_BIT) >= NUM_SNOOP_PRIVATE_ENCAPS
 		    || snoop_private_encap[hdr.network^SNOOP_PRIVATE_BIT] == WTAP_ENCAP_UNKNOWN) {
-			*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+			*err = WTAP_ERR_UNSUPPORTED;
 			*err_info = g_strdup_printf("snoop: private network type %u unknown or unsupported",
 			    hdr.network);
 			return WTAP_OPEN_ERROR;
@@ -393,7 +393,7 @@ wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info)
 	} else {
 		if (hdr.network >= NUM_SNOOP_ENCAPS
 		    || snoop_encap[hdr.network] == WTAP_ENCAP_UNKNOWN) {
-			*err = WTAP_ERR_UNSUPPORTED_ENCAP;
+			*err = WTAP_ERR_UNSUPPORTED;
 			*err_info = g_strdup_printf("snoop: network type %u unknown or unsupported",
 			    hdr.network);
 			return WTAP_OPEN_ERROR;
diff --git a/wiretap/visual.c b/wiretap/visual.c
index c29216d94d..e29b79009f 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -241,7 +241,7 @@ wtap_open_return_val visual_open(wtap *wth, int *err, gchar **err_info)
        break;
 
     default:
-        *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+        *err = WTAP_ERR_UNSUPPORTED;
         *err_info = g_strdup_printf("visual: network type %u unknown or unsupported",
                                      vfile_hdr.media_type);
         return WTAP_OPEN_ERROR;