diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-10-12 21:37:02 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-10-12 21:37:02 +0000 |
| commit | c91c1df500cc3950cc7a375aaae72f20ea0eb652 (patch) | |
| tree | 34af7abdf706f06c2e9a44c55f877bcebeb600fa /wiretap/file_access.c | |
| parent | c5e0d7ce3265b40d4ad49b670691224792551987 (diff) | |
Use seasonal allocation for name resolution. This effectively scrubs our
resolution information between capture files so that we don't leak host
entries from one file to another (e.g. embarassing-host-name.example.com
from file1.pcapng into a name resolution block in file2.pcapng).
host_name_lookup_cleanup and host_name_lookup_init must now be called
after each call to se_free_all. As a result we now end up reading our
various name resolution files much more than we should.
svn path=/trunk/; revision=45511
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 1850405bd1..bf24f55241 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -742,11 +742,11 @@ static const struct file_type_info dump_open_table_base[] = { /* WTAP_FILE_MPEG_2_TS */ { "MPEG2 transport stream", "mp2t", "mp2t", "ts;mpg", FALSE, FALSE, NULL, NULL }, - + /* WTAP_FILE_VWR_80211 */ { "Ixia IxVeriWave .vwr Raw 802.11 Capture", "vwr80211", "*.vwr", ".vwr", FALSE, FALSE, NULL, NULL }, - + /* WTAP_FILE_VWR_ETH */ { "Ixia IxVeriWave .vwr Raw Ethernet Capture", "vwreth", "*.vwr", ".vwr", FALSE, FALSE, NULL, NULL } @@ -827,7 +827,7 @@ wtap_dump_can_write_encaps(int ft, const GArray *file_encaps) */ if (!wtap_dump_can_write_encap(ft, wtap_dump_file_encap_type(file_encaps))) return FALSE; - + /* * Yes. Are all the individual encapsulation types supported? */ |