gerald@xxxxxxxxxxxxx wrote:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46211
User: gerald
Date: 2012/11/26 02:35 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r45674 | darkjames | 2012-10-20 13:50:25 -0700 (Sat, 20 Oct 2012) | 2 lines
Changed paths:
M /trunk/epan/addr_resolv.c
Make r45511 work also without HAVE_C_ARES.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r45511 | gerald | 2012-10-12 14:37:02 -0700 (Fri, 12 Oct 2012) | 9 lines
Changed paths:
M /trunk/epan/addr_resolv.c
M /trunk/epan/packet.c
M /trunk/wiretap/file_access.c
M /trunk/wiretap/pcapng.c
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.
------------------------------------------------------------------------
Hmm, perhaps this is a bad time to mention it, but I had noticed last
week(?) that I can't currently add hosts information to a PCAPNG file in
trunk. At the time I was in a hurry and just used a 1.8 build to get my
hosts info into the file and haven't had time to follow up.
I just tried again (with this revision in) and sure enough, now in
trunk-1.8 (to 46213) that function doesn't work. Maybe these revisions
should wait until we find the problem?
Steps to reproduce:
./tshark -W n -H /etc/hosts -r /some/file -w /tmp/foo
./tshark -z hosts -qr /tmp/foo
Currently trunk and (now) trunk-1.8 give no hosts entries for the 2nd
command.
