http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39638
User: gerald
Date: 2011/10/27 10:28 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r39234 | etxrab | 2011-10-02 22:13:53 -0700 (Sun, 02 Oct 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-ipsec-udp.c
From David Mueller:
Incorrect identification of UDP-encapsulated NAT-keepalive packets.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6414
------------------------------------------------------------------------
r39248 | stig | 2011-10-04 03:12:55 -0700 (Tue, 04 Oct 2011) | 3 lines
Changed paths:
M /trunk/epan/proto.c
M /trunk/epan/proto.h
Add proto_unregister_field().
This can be used to unregister fields registered in dissector UAT's.
------------------------------------------------------------------------
r39258 | stig | 2011-10-04 14:06:20 -0700 (Tue, 04 Oct 2011) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-http.c
Free duplicated strings in hf entries.
------------------------------------------------------------------------
r39267 | stig | 2011-10-05 04:44:19 -0700 (Wed, 05 Oct 2011) | 2 lines
Changed paths:
M /trunk/epan/proto.c
Use g_tree_steal to remove an entry without calling the destroy function.
This because we use the destroy function to determine same_name_hfinfo.
------------------------------------------------------------------------
r39268 | stig | 2011-10-05 04:44:29 -0700 (Wed, 05 Oct 2011) | 1 line
Changed paths:
M /trunk/epan/dissectors/packet-http.c
Cleanup the unregister loop to avoid freeing wrong data.
------------------------------------------------------------------------
r39266 | etxrab | 2011-10-04 22:53:53 -0700 (Tue, 04 Oct 2011) | 3 lines
Changed paths:
M /trunk/gtk/main.c
M /trunk/gtk/simple_dialog.c
M /trunk/simple_dialog.h
Michael Mann:
Removed the Save button if live capture is going on when File->Quit is selected. Solves Assertion failed when doing File->Quit->Save during live capture
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1710
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r39251 | stig | 2011-10-04 11:40:56 -0700 (Tue, 04 Oct 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-http.c
Unregister and delete allocated header fields when updating the UAT.
Avoid double loading the UAT.
Use the post update callback in uat_new for regenerating header_fields_hash.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/epan/dissectors/
Changes Path Action
+23 -51 packet-http.c Modified
+3 -3 packet-ipsec-udp.c Modified
Directory: /trunk-1.4/docbook/
Changes Path Action
+18 -0 release-notes.xml Modified
Directory: /trunk-1.4/epan/
Changes Path Action
+28 -0 proto.c Modified
+6 -0 proto.h Modified
Directory: /trunk-1.4/gtk/
Changes Path Action
+9 -7 main.c Modified
+3 -0 simple_dialog.c Modified
Directory: /trunk-1.4/
Changes Path Action
+2 -0 simple_dialog.h Modified