diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-16 22:22:29 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-17 06:22:57 +0000 |
| commit | 40f69b2778cb6a9add18cfeacbca430284b1cd66 (patch) | |
| tree | 009e9cf4303fe66a2c8b3755fb2952ad993f2c4a /wiretap/netxray.c | |
| parent | b56d4d01876a378530922e4de446b8434f75d871 (diff) | |
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>
Diffstat (limited to 'wiretap/netxray.c')
| -rw-r--r-- | wiretap/netxray.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |