diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-04-18 02:48:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-04-18 02:48:23 +0000 |
| commit | 477185a38715414928fe691f5c88ae6b05b15c5f (patch) | |
| tree | 495b0a44186580a38e2b544a560a463d96c0f487 /wiretap | |
| parent | 81209da65b0d146a66367b90faa80b120ec54a66 (diff) | |
If we see a 5View time-stamped header with a bad key, make sure we
return the right error code and information string.
InfoVista bought Accellent Group, and, at least according to the
InfoVista Web site, it's "5View", not "5Views".
svn path=/trunk/; revision=42119
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/5views.c | 6 | ||||
| -rw-r--r-- | wiretap/file_access.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index 90e2e75f1a..1ad604204f 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -223,8 +223,12 @@ _5views_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wth->data_offset += bytes_read; TimeStamped_Header.Key = pletohl(&TimeStamped_Header.Key); - if(TimeStamped_Header.Key != CST_5VW_RECORDS_HEADER_KEY) + if(TimeStamped_Header.Key != CST_5VW_RECORDS_HEADER_KEY) { + *err = WTAP_ERR_BAD_FILE; + *err_info = g_strdup_printf("5views: Time-stamped header has bad key value 0x%08X", + TimeStamped_Header.Key); return FALSE; + } TimeStamped_Header.RecSubType = pletohl(&TimeStamped_Header.RecSubType); diff --git a/wiretap/file_access.c b/wiretap/file_access.c index d4ddd6f735..5fb1ae6762 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -446,7 +446,7 @@ static const struct file_type_info dump_open_table_base[] = { libpcap_dump_can_write_encap, libpcap_dump_open }, /* WTAP_FILE_5VIEWS */ - { "Accellent 5Views capture", "5views", "5vw", NULL, TRUE, FALSE, + { "InfoVista 5View capture", "5views", "5vw", NULL, TRUE, FALSE, _5views_dump_can_write_encap, _5views_dump_open }, /* WTAP_FILE_IPTRACE_1_0 */ |