From c3321fc131ee0f98ab3d12c70023e3fe6f2c89d7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 16 Dec 2014 22:22:29 -0800 Subject: 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: I3617c5ff89d45a6bf00b00621de0d11f209bb3c0 Reviewed-on: https://code.wireshark.org/review/5795 Reviewed-by: Guy Harris --- wiretap/5views.c | 2 +- wiretap/erf.c | 2 +- wiretap/iptrace.c | 4 ++-- wiretap/lanalyzer.c | 2 +- wiretap/libpcap.c | 2 +- wiretap/netmon.c | 8 ++++---- wiretap/network_instruments.c | 4 ++-- wiretap/netxray.c | 6 +++--- wiretap/ngsniffer.c | 12 ++++++------ wiretap/peektagged.c | 2 +- wiretap/radcom.c | 2 +- wiretap/snoop.c | 6 +++--- wiretap/visual.c | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/wiretap/5views.c b/wiretap/5views.c index f46e18bba3..253fbd319a 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -164,7 +164,7 @@ int _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 -1; diff --git a/wiretap/erf.c b/wiretap/erf.c index 0d47ee0f56..b5b6f7590f 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -467,7 +467,7 @@ static int 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 e5192e9981..229aaf7972 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -142,7 +142,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; @@ -337,7 +337,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/lanalyzer.c b/wiretap/lanalyzer.c index 9fea6b34ea..e3d4ee40a7 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -412,7 +412,7 @@ int 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 -1; diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 0c35dddc94..0721284ca0 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -245,7 +245,7 @@ int 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 -1; diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 23c1aa3c40..b2c4b12974 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -247,7 +247,7 @@ int 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 -1; @@ -698,7 +698,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; @@ -709,7 +709,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; @@ -763,7 +763,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 fb571a041f..a4694166cf 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -224,14 +224,14 @@ int network_instruments_open(wtap *wth, int *err, gchar **err_info) /* 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 -1; } /* 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 -1; } diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 49e810ad61..320729ad4c 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -561,7 +561,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 -1; @@ -823,7 +823,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 -1; @@ -845,7 +845,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 -1; diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 459191d2de..dfa00d3ee5 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -628,7 +628,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 -1; @@ -925,7 +925,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; } @@ -936,7 +936,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; @@ -956,7 +956,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; } @@ -1025,7 +1025,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; } @@ -1043,7 +1043,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 3084ebf353..6549c93be8 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -318,7 +318,7 @@ int 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 -1; diff --git a/wiretap/radcom.c b/wiretap/radcom.c index 024b62c598..000cd8a1d7 100644 --- a/wiretap/radcom.c +++ b/wiretap/radcom.c @@ -207,7 +207,7 @@ int 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 -1; } diff --git a/wiretap/snoop.c b/wiretap/snoop.c index e5f831f3d8..f3a2da17d1 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -386,7 +386,7 @@ int 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 -1; @@ -398,7 +398,7 @@ int 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 -1; @@ -410,7 +410,7 @@ int 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 -1; diff --git a/wiretap/visual.c b/wiretap/visual.c index 84b87be60f..d0d054fe9b 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -250,7 +250,7 @@ int 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 -1; -- cgit v1.2.1