diff options
| -rw-r--r-- | wiretap/file_access.c | 8 | ||||
| -rw-r--r-- | wiretap/network_instruments.c | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 810a6ca5cc..b975cae0a8 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -464,11 +464,11 @@ static const struct file_type_info dump_open_table_base[] = { catapult_dct2000_dump_can_write_encap, catapult_dct2000_dump_open }, /* WTAP_FILE_NETXRAY_OLD */ - { "Cinco Networks NetXRay 1.x", "netxray1", "*.cap", ".cap", FALSE, FALSE, + { "Cinco Networks NetXRay 1.x", "netxray1", "*.cap", ".cap", TRUE, FALSE, NULL, NULL }, /* WTAP_FILE_NETXRAY_1_0 */ - { "Cinco Networks NetXRay 2.0 or later", "netxray2", "*.cap", ".cap", FALSE, FALSE, + { "Cinco Networks NetXRay 2.0 or later", "netxray2", "*.cap", ".cap", TRUE, FALSE, NULL, NULL }, /* WTAP_FILE_COSINE */ @@ -536,7 +536,7 @@ static const struct file_type_info dump_open_table_base[] = { netxray_dump_can_write_encap_2_0, netxray_dump_open_2_0 }, /* WTAP_FILE_NETWORK_INSTRUMENTS_V9 */ - { "Network Instruments Observer (V9)", "niobserverv9", "*.bfr", ".bfr", TRUE, FALSE, + { "Network Instruments Observer (V9)", "niobserverv9", "*.bfr", ".bfr", FALSE, FALSE, network_instruments_dump_can_write_encap, network_instruments_dump_open }, /* WTAP_FILE_LANALYZER */ @@ -564,7 +564,7 @@ static const struct file_type_info dump_open_table_base[] = { NULL, NULL}, /* WTAP_FILE_K12 */ - { "Tektronix K12xx 32-bit .rf5 format", "rf5", "*.rf5", ".rf5", FALSE, FALSE, + { "Tektronix K12xx 32-bit .rf5 format", "rf5", "*.rf5", ".rf5", TRUE, FALSE, k12_dump_can_write_encap, k12_dump_open }, /* WTAP_FILE_TOSHIBA */ diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index c6c1fa93fb..0a7850bc12 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -514,10 +514,6 @@ gboolean network_instruments_dump_open(wtap_dumper *wdh, int *err) g_snprintf(comment, 64, "This capture was saved from Wireshark on %s", asctime(current_time)); /* create the file header */ - if (fseek(wdh->fh, 0, SEEK_SET) == -1) { - *err = errno; - return FALSE; - } memset(&file_header, 0x00, sizeof(capture_file_header)); g_strlcpy(file_header.observer_version, network_instruments_magic, 32); file_header.offset_to_first_packet = (guint16) (sizeof(capture_file_header) + sizeof(tlv_header) + strlen(comment)); |