diff options
| -rw-r--r-- | ChangeLog | 1070 | ||||
| -rw-r--r-- | NEWS | 118 | ||||
| -rw-r--r-- | version.conf | 12 |
3 files changed, 147 insertions, 1053 deletions
@@ -1,5 +1,5 @@ ------------------------------------------------------------------------ -r38944 | gerald | 2011-09-08 10:11:56 -0700 (Thu, 08 Sep 2011) | 2 lines +r39706 | gerald | 2011-11-01 12:23:36 -0700 (Tue, 01 Nov 2011) | 2 lines Changed paths: M /trunk-1.6/config.nmake M /trunk-1.6/configure.in @@ -7,1064 +7,252 @@ Changed paths: M /trunk-1.6/docbook/release-notes.xml M /trunk-1.6/version.conf -1.6.2 → 1.6.3. +1.6.3 → 1.6.4. ------------------------------------------------------------------------ -r38962 | gerald | 2011-09-11 07:33:54 -0700 (Sun, 11 Sep 2011) | 1 line +r39727 | gerald | 2011-11-03 14:46:00 -0700 (Thu, 03 Nov 2011) | 14 lines Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/services + M /trunk-1.6/docbook/release-notes.xml + M /trunk-1.6/gtk/main_welcome.c -[Automatic manuf, services and enterprise-numbers update for 2011-09-11] ------------------------------------------------------------------------- -r38979 | gerald | 2011-09-12 11:23:53 -0700 (Mon, 12 Sep 2011) | 2 lines -Changed paths: - M /trunk-1.6/tools/make-manuf +Copy over r38045 from the trunk: -Copy over proxy and CaveBear URL fixes from the trunk. + ------------------------------------------------------------------------ + r38045 | tuexen | 2011-07-15 07:58:45 -0700 (Fri, 15 Jul 2011) | 3 lines + Changed paths: + M /trunk/gtk/main_welcome.c ------------------------------------------------------------------------- -r39033 | gerald | 2011-09-18 07:33:56 -0700 (Sun, 18 Sep 2011) | 1 line -Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf - M /trunk-1.6/services + You can't create a mutex without initializing the thread system. + So #ifdef the code with USE_THREADS. + ------------------------------------------------------------------------ -[Automatic manuf, services and enterprise-numbers update for 2011-09-18] ------------------------------------------------------------------------- -r39127 | gerald | 2011-09-25 07:33:54 -0700 (Sun, 25 Sep 2011) | 1 line -Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf - M /trunk-1.6/services -[Automatic manuf, services and enterprise-numbers update for 2011-09-25] ------------------------------------------------------------------------- -r39217 | gerald | 2011-10-02 07:33:49 -0700 (Sun, 02 Oct 2011) | 1 line -Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf - M /trunk-1.6/services +Update the release notes. -[Automatic manuf, services and enterprise-numbers update for 2011-10-02] ------------------------------------------------------------------------ -r39324 | gerald | 2011-10-09 07:33:49 -0700 (Sun, 09 Oct 2011) | 1 line +r39728 | gerald | 2011-11-03 14:50:29 -0700 (Thu, 03 Nov 2011) | 10 lines Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf - M /trunk-1.6/services + M /trunk-1.6/configure.in + +Copy over r38046 from the trunk: + + ------------------------------------------------------------------------ + r38046 | tuexen | 2011-07-15 07:59:42 -0700 (Fri, 15 Jul 2011) | 2 lines + Changed paths: + M /trunk/configure.in + + Ensure that USE_THREADS is defined when --enable-threads is specified. + ------------------------------------------------------------------------ -[Automatic manuf, services and enterprise-numbers update for 2011-10-09] ------------------------------------------------------------------------ -r39434 | gerald | 2011-10-16 07:33:48 -0700 (Sun, 16 Oct 2011) | 1 line +r39742 | gerald | 2011-11-06 07:33:51 -0800 (Sun, 06 Nov 2011) | 1 line Changed paths: M /trunk-1.6/epan/enterprise-numbers M /trunk-1.6/manuf M /trunk-1.6/services -[Automatic manuf, services and enterprise-numbers update for 2011-10-16] +[Automatic manuf, services and enterprise-numbers update for 2011-11-06] ------------------------------------------------------------------------ -r39486 | jake | 2011-10-19 23:47:54 -0700 (Wed, 19 Oct 2011) | 3 lines +r39780 | etxrab | 2011-11-09 22:11:04 -0800 (Wed, 09 Nov 2011) | 5 lines Changed paths: - M /trunk-1.6/debian/wireshark-common.files - M /trunk-1.6/debian/wireshark-common.shlibs + M /trunk-1.6/epan/dissectors/packet-capwap.c -Fix for bug 6049: -Use the correct lib versions in wireshark-common.files and wireshark-commin.shlibs. +From Dirk: +CAPWAP dissector tries to allocate -1 bytes of memory during reassembly. +- changed to return offset. +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6555 ------------------------------------------------------------------------ -r39511 | gerald | 2011-10-23 07:33:53 -0700 (Sun, 23 Oct 2011) | 1 line +r39819 | gerald | 2011-11-13 07:33:51 -0800 (Sun, 13 Nov 2011) | 1 line Changed paths: M /trunk-1.6/epan/enterprise-numbers M /trunk-1.6/manuf M /trunk-1.6/services -[Automatic manuf, services and enterprise-numbers update for 2011-10-23] +[Automatic manuf, services and enterprise-numbers update for 2011-11-13] ------------------------------------------------------------------------ -r39537 | gerald | 2011-10-24 11:44:00 -0700 (Mon, 24 Oct 2011) | 20 lines +r39914 | gerald | 2011-11-17 12:11:41 -0800 (Thu, 17 Nov 2011) | 2 lines Changed paths: - M /trunk-1.6/Makefile.nmake - M /trunk-1.6/config.h.win32 - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/dumpcap.c - M /trunk-1.6/gtk/main.c - M /trunk-1.6/gtk/main_welcome.c - M /trunk-1.6/gtk/main_welcome.h - M /trunk-1.6/gtk/menus.c - -Copy over r38033 with manual intervention: - - ------------------------------------------------------------------------ - r38033 | gerald | 2011-07-14 16:18:02 -0700 (Thu, 14 Jul 2011) | 4 lines - Changed paths: - M /trunk/Makefile.nmake - M /trunk/config.h.win32 - M /trunk/dumpcap.c - M /trunk/gtk/main.c - M /trunk/gtk/main_welcome.c - M /trunk/gtk/main_welcome.h - M /trunk/gtk/menus.c - - On Windows enable threads everywhere instead of just in dumpcap. If - threads are enabled use them to check the recent file list. Fixes bug - 3810. - ------------------------------------------------------------------------ + M /trunk-1.6/Makefile.am + M /trunk-1.6/config.nmake + M /trunk-1.6/make-version.pl -Update the release notes. +Copy over recent changes to the versioning environment. ------------------------------------------------------------------------ -r39541 | gerald | 2011-10-24 13:47:40 -0700 (Mon, 24 Oct 2011) | 151 lines +r39917 | gerald | 2011-11-17 13:52:47 -0800 (Thu, 17 Nov 2011) | 2 lines Changed paths: - M /trunk-1.6/Makefile.am - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-bacapp.c - M /trunk-1.6/epan/dissectors/packet-csn1.c - M /trunk-1.6/epan/dissectors/packet-dtn.c - M /trunk-1.6/epan/dissectors/packet-eth.c - M /trunk-1.6/epan/dissectors/packet-ieee80211.c - M /trunk-1.6/epan/dissectors/packet-per.c - M /trunk-1.6/epan/dissectors/packet-rtp.c - M /trunk-1.6/epan/dissectors/packet-stun.c - M /trunk-1.6/epan/libwireshark.def - M /trunk-1.6/gtk/conversations_table.c M /trunk-1.6/make-version.pl -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r38301 | jmayer | 2011-08-01 07:48:19 -0700 (Mon, 01 Aug 2011) | 2 lines - Changed paths: - M /trunk/epan/libwireshark.def - - Add tvb_get_bits - ------------------------------------------------------------------------ - r38948 | cmaynard | 2011-09-08 19:11:53 -0700 (Thu, 08 Sep 2011) | 3 lines - Changed paths: - M /trunk/gtk/conversations_table.c - - Fix locale problem with "Rel Start" time, both with display and copy to CSV, by replacing rel_time_to_secs_str() with nstime_to_sec(). Problem reported on ask by packethunter. - Ref: http://ask.wireshark.org/questions/6207/decimal-point-vs-decimal-comma - ------------------------------------------------------------------------ - r38949 | etxrab | 2011-09-08 22:16:39 -0700 (Thu, 08 Sep 2011) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-stun.c - - From Ken Cox: - The change causes dissect_stun_message() to pass control to subdissectors when 'tree' is NULL. - Part of the patch from - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6322 - ------------------------------------------------------------------------ - r38950 | etxrab | 2011-09-08 22:23:43 -0700 (Thu, 08 Sep 2011) | 11 lines - Changed paths: - M /trunk/epan/dissectors/packet-rtp.c - - /* Get the fields in the second octet */ - octet2 = tvb_get_guint8( tvb, offset + 1 ); - payload_type = RTP_PAYLOAD_TYPE( octet2 ); - - /* Check for a sensible payload type - (recognised static and preferred dynamic ranges) */ - if ((payload_type <= PT_H263) || - /* Alex Lindberg - Modified range to use RTP Type Names */ - (payload_type >= PT_UNDF_96 && payload_type <= PT_UNDF_127)) { - - evaluates to allways trye as far as I can tell. - ------------------------------------------------------------------------ - r38953 | wmeier | 2011-09-09 13:37:49 -0700 (Fri, 09 Sep 2011) | 3 lines - Changed paths: - M /trunk/epan/dissectors/packet-rtp.c - - Don't do heuristic check for 'dstport being even' if checking for rtp over stun. - See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6322 - ------------------------------------------------------------------------ - r38956 | wmeier | 2011-09-09 14:23:27 -0700 (Fri, 09 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-rtp.c - - Fix compile error: remove forward declaration. - ------------------------------------------------------------------------ - r38951 | stig | 2011-09-09 10:29:20 -0700 (Fri, 09 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-csn1.c - - From Sylvain Munaut via bug 6328: - Fix bug in CSN_CHOICE implentation preventing subtree processing - ------------------------------------------------------------------------ - r38967 | etxrab | 2011-09-11 12:54:11 -0700 (Sun, 11 Sep 2011) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-dtn.c - - From Michael Mann: - Extend 64-bit SDNV decoding to Administrative Records. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4109 - ------------------------------------------------------------------------ - r38977 | wmeier | 2011-09-12 08:44:45 -0700 (Mon, 12 Sep 2011) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-bacapp.c - - From Danny Breton: Property name time-synchronization-interval(204) is incorrectly shown as time-synchronization-recipents. - - See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6336 - ------------------------------------------------------------------------ - r38990 | guy | 2011-09-13 14:17:45 -0700 (Tue, 13 Sep 2011) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-eth.c - - Always pass the FCS length to dissect_802_3() and ethertype(), so it - will process the FCS if it's known to be present and will attempt to - guess whether it's present if it's not known not to be present. - ------------------------------------------------------------------------ - r39017 | etxrab | 2011-09-15 13:02:19 -0700 (Thu, 15 Sep 2011) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-per.c - - From Pascal Quantin: - Incorrect decoding of BIT STRING type - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6347 - ------------------------------------------------------------------------ - r39024 | etxrab | 2011-09-15 22:16:18 -0700 (Thu, 15 Sep 2011) | 16 lines - Changed paths: - M /trunk/epan/dissectors/packet-ieee80211.c - - From Jouni Malinen: - If the GAS Query Request/Response Length field is incorrect, the - dissector function may return a value that is larger than the remaining - packet buffer. This results in a Tagged parameters item being added with - -1 byte length since tvb_reported_length_remaining() reports -1 once the - offset goes beyond the end of the packet. Clicking on that item results - in Wireshark dying on Gtk-ERROR. Note: this does not show up in tshark - and as such, cannot apparently be triggered with fuzz-test.sh. - - Fix this by refusing to dissect GAS frames that have too large length - field value. In addition, verify that tvb_reported_length_remaining() is - returning a value larger than 0 instead of non-zero (which could be -1) - to make the IEEE 802.11 dissector more robust against this type of - issues. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6345 - ------------------------------------------------------------------------ - - -Copy over by hand: - - ------------------------------------------------------------------------ - r38933 | morriss | 2011-09-07 18:53:41 -0700 (Wed, 07 Sep 2011) | 22 lines - Changed paths: - M /trunk/Makefile.am - M /trunk/make-version.pl - - Revert rev 38340 (which was itself a reversion of 34807): if we can't find the - SVN version, indicate that the SVN version is unknown. This puts back the fix - for bug 1413. - - Add a new version.conf option for make-version which tell is "this is a build - from a release tarball." When that option is present do not try to use SVN - to determine the SVN version, just use whatever SVN information shipped in the - tarball. - - If version.conf is present in the source tree (as it is only in the release - branches), deliver it in the source tarball but only after setting the "this - is a release tarball" option. - - - All of this means that that builds from release-branch tarballs will report - the SVN version of the release tarball rather than "unknown." This addresses - the issue reported in - http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown - - Builds from trunk (including the source tarballs) will continue to report that - the SVN version is unknown. (Maybe that, too, should be changed?) - ------------------------------------------------------------------------ - -Update the release notes. +Set the proper version. ------------------------------------------------------------------------ -r39542 | gerald | 2011-10-24 14:14:15 -0700 (Mon, 24 Oct 2011) | 48 lines +r39919 | gerald | 2011-11-17 14:28:46 -0800 (Thu, 17 Nov 2011) | 2 lines Changed paths: - M /trunk-1.6/AUTHORS + M /trunk-1.6/config.nmake M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-icmpv6.c - M /trunk-1.6/epan/dissectors/packet-pcep.c - M /trunk-1.6/epan/dissectors/packet-ssl-utils.c - M /trunk-1.6/gtk/export_object.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r39031 | cmaynard | 2011-09-16 20:58:41 -0700 (Fri, 16 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-pcep.c - - Update sub-object types of XRO to match RFC 5521. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3778. - ------------------------------------------------------------------------ - r39061 | cmaynard | 2011-09-20 09:28:21 -0700 (Tue, 20 Sep 2011) | 3 lines - Changed paths: - M /trunk/gtk/export_object.c - - From DeCount via bug 6362: Increase maximum allowable number of duplicate filesi from 10 to 1000. I modified his patch to avoid appending anything to the first filename, and other minor changes. - Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6362 - ------------------------------------------------------------------------ - r39062 | cmaynard | 2011-09-20 09:42:22 -0700 (Tue, 20 Sep 2011) | 2 lines - Changed paths: - M /trunk/AUTHORS - - Add DeCount for his contribution in bug 6362. - ------------------------------------------------------------------------ - r39080 | cmaynard | 2011-09-21 10:41:12 -0700 (Wed, 21 Sep 2011) | 2 lines - Changed paths: - M /trunk/gtk/export_object.c - - Don't pop up an error dialog box for every file that can't be saved. Before, this could have potentially meant having to manually close far too many of them. - ------------------------------------------------------------------------ - - -Copy over by hand: - - ------------------------------------------------------------------------ - r39029 | cmaynard | 2011-09-16 12:23:26 -0700 (Fri, 16 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-icmpv6.c - - Add dissection of router address(R) flag. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6350. - ------------------------------------------------------------------------ - r39049 | cmaynard | 2011-09-19 12:32:46 -0700 (Mon, 19 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-ssl-utils.c - - Close fp before checking if private_key is NULL to avoid memory leak. Fixes Coverity 597. - ------------------------------------------------------------------------ -Update the release notes. +Reset version info. ------------------------------------------------------------------------ -r39543 | gerald | 2011-10-24 15:34:56 -0700 (Mon, 24 Oct 2011) | 86 lines +r39920 | gerald | 2011-11-17 16:31:47 -0800 (Thu, 17 Nov 2011) | 2 lines Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/CMakeLists.txt - M /trunk-1.6/epan/dissectors/Makefile.common - M /trunk-1.6/epan/dissectors/packet-eth.c - M /trunk-1.6/epan/dissectors/packet-ethertype.c - M /trunk-1.6/epan/dissectors/packet-ieee8021ah.c - A /trunk-1.6/epan/dissectors/packet-vlan.c - A /trunk-1.6/epan/dissectors/packet-vlan.h - M /trunk-1.6/epan/prefs.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r39103 | wmeier | 2011-09-23 07:10:52 -0700 (Fri, 23 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/Makefile.common - - Put packet-vlan back into Makefile.common (to go with SVN #39100) - ------------------------------------------------------------------------ - r39104 | wmeier | 2011-09-23 07:15:49 -0700 (Fri, 23 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/CMakeLists.txt - - Add packet-vlan.c - ------------------------------------------------------------------------ - r39106 | wmeier | 2011-09-23 07:47:18 -0700 (Fri, 23 Sep 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-eth.c - - Uh, "Fix the fix (in SVN #39105)" so it compiles. - ------------------------------------------------------------------------ - r39136 | wmeier | 2011-09-25 14:10:04 -0700 (Sun, 25 Sep 2011) | 3 lines - Changed paths: - M /trunk/epan/prefs.c - - vlan dissector has been restored; - pref "eth.qinq_ethertype" has been moved(restored) to "vlan.qinq_ethertype". - ------------------------------------------------------------------------ - - -Copy over by hand: - - ------------------------------------------------------------------------ - r39100 | etxrab | 2011-09-23 04:01:13 -0700 (Fri, 23 Sep 2011) | 9 lines - Changed paths: - M /trunk/epan/dissectors/packet-eth.c - M /trunk/epan/dissectors/packet-ethertype.c - M /trunk/epan/dissectors/packet-ieee8021ah.c - A /trunk/epan/dissectors/packet-vlan.c - A /trunk/epan/dissectors/packet-vlan.h - M /trunk/epan/prefs.c - - Revert Revision 34838 "Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II." - as this causes a lot of problems. - See - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5680 - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6305 - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6366 - - Original bug: - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2254 - ------------------------------------------------------------------------ - r39101 | etxrab | 2011-09-23 04:22:48 -0700 (Fri, 23 Sep 2011) | 1 line - Changed paths: - M /trunk/epan/dissectors/packet-ethertype.c - - Remove code commited by misstake. - ------------------------------------------------------------------------ - r39105 | wmeier | 2011-09-23 07:39:23 -0700 (Fri, 23 Sep 2011) | 3 lines - Changed paths: - M /trunk/epan/dissectors/packet-eth.c - - Correction for SVN #39100:"Revert Revision 34838"; - Fixes buildbot compile error. - ------------------------------------------------------------------------ - r39134 | wmeier | 2011-09-25 12:28:07 -0700 (Sun, 25 Sep 2011) | 14 lines - Changed paths: - M /trunk/epan/dissectors/packet-eth.c - - Do some cleanup related to the reversion of SVN #34848 donr in SVN #39100. - - 1. Revert SVN #35830 (See Bug #5645); - This patch is no longer needed given the reversion. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5645 - - http://anonsvn.wireshark.org/viewvc?revision=39100&view=revision - - 2. Restore 'col_set_str(pinfo->cinfo, COL_INFO, "Ethernet II");' just to - be safe (altho it's possible that this line is not needed). - - 3. Remove several lines of no longer needed code. - ------------------------------------------------------------------------ + M /trunk-1.6/make-version.pl -Update the release notes. +Don't clobber release information in configure.in. ------------------------------------------------------------------------ -r39544 | gerald | 2011-10-24 15:44:13 -0700 (Mon, 24 Oct 2011) | 15 lines +r39924 | gerald | 2011-11-17 17:18:35 -0800 (Thu, 17 Nov 2011) | 4 lines Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-csn1.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r39140 | wmeier | 2011-09-25 15:01:50 -0700 (Sun, 25 Sep 2011) | 5 lines - Changed paths: - M /trunk/epan/dissectors/packet-csn1.c - - From Sylvain Munaut: Fix Bug #6351 (Buildbot fuzztest crash); + M /trunk-1.6/make-version.pl - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6351 - ------------------------------------------------------------------------ +Maybe it's not a good idea to modify configure.in or config.nmake during +compilation. Add a "--set-svn" option which only affects svnversion.h and +make it the default behavior. +------------------------------------------------------------------------ +r39925 | gerald | 2011-11-17 17:35:02 -0800 (Thu, 17 Nov 2011) | 2 lines +Changed paths: + M /trunk-1.6/make-version.pl -Update the release notes. +Use the source directory argument. ------------------------------------------------------------------------ -r39546 | gerald | 2011-10-24 16:43:17 -0700 (Mon, 24 Oct 2011) | 161 lines +r39927 | gerald | 2011-11-17 17:36:07 -0800 (Thu, 17 Nov 2011) | 85 lines Changed paths: - M /trunk-1.6/AUTHORS - M /trunk-1.6/asn1/s1ap/packet-s1ap-template.c + M /trunk-1.6/asn1/snmp/packet-snmp-template.c + M /trunk-1.6/config.nmake + M /trunk-1.6/configure.in M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-http.c - M /trunk-1.6/epan/dissectors/packet-ipsec-udp.c - M /trunk-1.6/epan/dissectors/packet-mysql.c - M /trunk-1.6/epan/dissectors/packet-s1ap.c - M /trunk-1.6/epan/epan.c - M /trunk-1.6/epan/libwireshark.def - M /trunk-1.6/epan/proto.c - M /trunk-1.6/epan/proto.h + M /trunk-1.6/epan/dissectors/packet-ieee80211.c + M /trunk-1.6/epan/dissectors/packet-snmp.c + M /trunk-1.6/epan/dissectors/packet-ucp.c + M /trunk-1.6/epan/ftypes/ftype-tvbuff.c + M /trunk-1.6/epan/prefs.c M /trunk-1.6/epan/wslua/init_wslua.c M /trunk-1.6/epan/wslua/wslua.h - M /trunk-1.6/epan/wspython/wspy_register.c - M /trunk-1.6/epan/wspython/wspy_register.h - M /trunk-1.6/gtk/about_dlg.c - M /trunk-1.6/gtk/main.c - M /trunk-1.6/gtk/simple_dialog.c - M /trunk-1.6/plugins/profinet/packet-pn-rt.c - M /trunk-1.6/register.h - M /trunk-1.6/simple_dialog.h - M /trunk-1.6/tap-iousers.c + M /trunk-1.6/epan/wslua/wslua_dumper.c + M /trunk-1.6/epan/wslua/wslua_proto.c + M /trunk-1.6/epan/wslua/wslua_tvb.c + M /trunk-1.6/epan/wslua/wslua_util.c + M /trunk-1.6/gtk/dfilter_expr_dlg.c Copy over revisions from the trunk: ------------------------------------------------------------------------ - r39158 | guy | 2011-09-26 13:33:35 -0700 (Mon, 26 Sep 2011) | 18 lines - Changed paths: - M /trunk/plugins/profinet/packet-pn-rt.c - - Use ENC_ values in proto_tree_add_item() calls. - - Get rid of the code that attempts to deal with the FCS; if the - link-layer dissector hasn't removed the FCS, either: - - 1) the link-layer dissector is buggy and should be fixed; - - or - - 2) the link-layer dissector doesn't know whether there's an FCS - and you have to tell it by setting a preference (and if there - is no such preference, one needs to be added). - - The code in question was causing errors when the link-layer dissector - was removing the FCS when it's known to be present, as it should do. - - Get rid of 4-space tabs in favor of spaces. - ------------------------------------------------------------------------ - r39162 | guy | 2011-09-26 14:48:54 -0700 (Mon, 26 Sep 2011) | 6 lines - Changed paths: - M /trunk/plugins/profinet/packet-pn-rt.c - - More white space cleanup. - - We need the PDU length to find stuff at the end; use - tvb_reported_length(), *not* tvb_length(), to get it, so we're not - confused by a snapshot length. Rename it "pdu_len" to make that clear. - ------------------------------------------------------------------------ - r39188 | wmeier | 2011-09-29 14:47:01 -0700 (Thu, 29 Sep 2011) | 8 lines + r39719 | stig | 2011-11-02 13:06:40 -0700 (Wed, 02 Nov 2011) | 1 line Changed paths: - M /trunk/AUTHORS - M /trunk/epan/dissectors/packet-mysql.c - - From András Veres-Szentkirályi: Added cursor type decoding to MySQL dissector - - "The current MySQL dissector treats the exec_flags field as unused, however - since MySQL 5.0, this field is used to indicate the type of the cursor as it - can be read at - http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Execute_Packet_.28Tentative_Description.29 - ------------------------------------------------------------------------ - r39213 | stig | 2011-10-02 06:39:15 -0700 (Sun, 02 Oct 2011) | 1 line - Changed paths: - M /trunk/gtk/about_dlg.c + M /trunk/gtk/dfilter_expr_dlg.c - Always update splash screen when action has changed. + Revert revision 39665 (for bug 6472) which introduced bug 6537. ------------------------------------------------------------------------ - r39214 | stig | 2011-10-02 06:39:35 -0700 (Sun, 02 Oct 2011) | 2 lines + r39744 | stig | 2011-11-06 09:39:13 -0800 (Sun, 06 Nov 2011) | 6 lines Changed paths: - M /trunk/epan/epan.c M /trunk/epan/wslua/init_wslua.c M /trunk/epan/wslua/wslua.h - M /trunk/gtk/about_dlg.c - M /trunk/register.h - - Added register action for loading Lua plugins. - Removed an unused argument to wslua_init(). - ------------------------------------------------------------------------ - r39221 | stig | 2011-10-02 09:19:55 -0700 (Sun, 02 Oct 2011) | 6 lines - Changed paths: - M /trunk/epan/proto.c - M /trunk/epan/wspython/wspy_register.c - M /trunk/epan/wspython/wspy_register.h - M /trunk/gtk/about_dlg.c - M /trunk/register.h - - Removed the protocol registration updates in the splash screen for Python - dissectors, because it does not work as expected and causes an assert. - - Added generic splash updates for python register and handoff instead. - - This should fix bug 5431. - ------------------------------------------------------------------------ - 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 + M /trunk/epan/wslua/wslua_dumper.c + M /trunk/epan/wslua/wslua_proto.c + M /trunk/epan/wslua/wslua_tvb.c + M /trunk/epan/wslua/wslua_util.c - From David Mueller: - Incorrect identification of UDP-encapsulated NAT-keepalive packets. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6414 + From Robert G. Jakabosky via bug 5575: + Fix memory errors in Lua dissectors. + - Free Tvb when created from ByteArray. + - Free TvbRange correctly. + - Free string from get_persconffile_path and get_datafile_path. + - Some code cleanup. ------------------------------------------------------------------------ - r39248 | stig | 2011-10-04 03:12:55 -0700 (Tue, 04 Oct 2011) | 3 lines + r39748 | stig | 2011-11-06 23:41:03 -0800 (Sun, 06 Nov 2011) | 4 lines Changed paths: - M /trunk/epan/proto.c - M /trunk/epan/proto.h - - Add proto_unregister_field(). + M /trunk/epan/wslua/wslua_proto.c - This can be used to unregister fields registered in dissector UAT's. - ------------------------------------------------------------------------ - r39251 | stig | 2011-10-04 11:40:56 -0700 (Tue, 04 Oct 2011) | 3 lines - Changed paths: - M /trunk/epan/dissectors/packet-http.c + Do not return from within a TRY/CATCH/ENDTRY because this will make the + except stack invalid, and will lead to a crash. - 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. + In this case it was when calling a dissector from a table in a Lua script. ------------------------------------------------------------------------ - r39258 | stig | 2011-10-04 14:06:20 -0700 (Tue, 04 Oct 2011) | 1 line + r39777 | guy | 2011-11-09 16:53:48 -0800 (Wed, 09 Nov 2011) | 8 lines Changed paths: - M /trunk/epan/dissectors/packet-http.c + M /trunk/epan/prefs.c - Free duplicated strings in hf entries. + prefs_reset() has to reset the dissector preferences to their defaults, + as we don't save to a preferences file preference values that are equal + to their defaults, so if you change profiles, a preference that has a + non-default value in the old profile and a default value in the new + profile, so that it's *not* in the preference file for the new profile, + will not be set to the right value unless we reset all protocol + preferences to their defaults first. ------------------------------------------------------------------------ - r39267 | stig | 2011-10-05 04:44:19 -0700 (Wed, 05 Oct 2011) | 2 lines + r39831 | guy | 2011-11-14 10:42:11 -0800 (Mon, 14 Nov 2011) | 3 lines Changed paths: - M /trunk/epan/proto.c + M /trunk/asn1/snmp/packet-snmp-template.c + M /trunk/epan/dissectors/packet-snmp.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. + Do some more length checking to avoid a dissector bug error. Should fix + bug 6564. ------------------------------------------------------------------------ - r39268 | stig | 2011-10-05 04:44:29 -0700 (Wed, 05 Oct 2011) | 1 line + r39834 | cmaynard | 2011-11-14 11:57:45 -0800 (Mon, 14 Nov 2011) | 2 lines Changed paths: - M /trunk/epan/dissectors/packet-http.c + M /trunk/epan/dissectors/packet-ucp.c - Cleanup the unregister loop to avoid freeing wrong data. + The Originator protocol identifier is not present in the "provisioning actions operation -61", only the "session management operatin -60". Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570. ------------------------------------------------------------------------ - 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 - ------------------------------------------------------------------------ - r39277 | cmaynard | 2011-10-05 13:28:50 -0700 (Wed, 05 Oct 2011) | 2 lines - Changed paths: - M /trunk/tap-iousers.c - In iousers_init(), compare "conv,ipv6" before "conv,ip" and be sure to compare all 9 characters of that string instead of only 7. Also correct the offset when looking for a possible comma followed by an optional filter. - ------------------------------------------------------------------------ - r39297 | etxrab | 2011-10-06 12:07:26 -0700 (Thu, 06 Oct 2011) | 3 lines - Changed paths: - M /trunk/asn1/s1ap/packet-s1ap-template.c - M /trunk/epan/dissectors/packet-s1ap.c +Copy over by hand: - Typo FT_IPv4 isf FT_IPv6. - Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435 ------------------------------------------------------------------------ - r39304 | morriss | 2011-10-07 06:53:43 -0700 (Fri, 07 Oct 2011) | 5 lines + r39749 | stig | 2011-11-07 08:09:41 -0800 (Mon, 07 Nov 2011) | 4 lines Changed paths: - M /trunk/epan/libwireshark.def - - As suggested/requested in - http://ask.wireshark.org/questions/6756/linking-error-with-str_to_str : - - Add str_to_str to the list of exported functions. - ------------------------------------------------------------------------ - - -Update the release notes. - ------------------------------------------------------------------------- -r39552 | etxrab | 2011-10-24 22:45:13 -0700 (Mon, 24 Oct 2011) | 11 lines -Changed paths: - M /trunk-1.6/epan/dissectors/packet-per.c - -From Neil Piercy: - -The binary display and decimal values are corrupt in the case where they are -"stitched" together from words and octets: the complete words are extracted -ready for LSB padding, but when the final octet/word is added (also so -extracted), the data already present is shifted by a whole number of octets -(not allowing for the padding), and the value is then used by the binary and -decimal display functions as if it were MSB padded. This results in both a -corrupt bit pattern and wrong padding of the bit pattern in the display. + M /trunk/epan/ftypes/ftype-tvbuff.c -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6473 ------------------------------------------------------------------------- -r39573 | gerald | 2011-10-25 12:06:15 -0700 (Tue, 25 Oct 2011) | 11 lines -Changed paths: - M /trunk-1.6/Makefile.am - -Copy over r39572 from the trunk: + Do not return from within a TRY/CATCH/ENDTRY because this will make the + except stack invalid, and will lead to a crash. + In this case it was when doing compare functions on a FT_PROTOCOL. ------------------------------------------------------------------------ - r39572 | gerald | 2011-10-25 12:04:26 -0700 (Tue, 25 Oct 2011) | 3 lines - Changed paths: - M /trunk/Makefile.am - - In dist-hook, don't try to copy version.conf if it already exists in the - destination directory. - ----------------------------------------------------------------------- - ------------------------------------------------------------------------- -r39576 | etxrab | 2011-10-25 12:18:51 -0700 (Tue, 25 Oct 2011) | 4 lines -Changed paths: - M /trunk-1.6/epan/dissectors/packet-nas_eps.c - -From Pascal Quantin. -wrong decoding of Activate default EPS bearer context request message containing a IPv6 interface id. - -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6484 ------------------------------------------------------------------------- -r39581 | gerald | 2011-10-25 15:01:26 -0700 (Tue, 25 Oct 2011) | 2 lines -Changed paths: - M /trunk-1.6/Makefile.am - -Try to fix distcheck. - ------------------------------------------------------------------------- -r39583 | gerald | 2011-10-25 15:47:00 -0700 (Tue, 25 Oct 2011) | 76 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-ajp13.c - M /trunk-1.6/epan/dissectors/packet-ieee80211.c - M /trunk-1.6/wiretap/file_access.c - M /trunk-1.6/wiretap/network_instruments.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r39311 | alagoutte | 2011-10-08 09:55:54 -0700 (Sat, 08 Oct 2011) | 6 lines + r39754 | alagoutte | 2011-11-08 06:45:35 -0800 (Tue, 08 Nov 2011) | 3 lines Changed paths: M /trunk/epan/dissectors/packet-ieee80211.c - From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6420 - WPA IE pairwise cipher suite dissector uses incorrect value_string list - - From me : - * Use correct value_string for WPA Key MGMT... - ------------------------------------------------------------------------ - r39388 | guy | 2011-10-12 10:53:58 -0700 (Wed, 12 Oct 2011) | 8 lines - Changed paths: - M /trunk/epan/dissectors/packet-ajp13.c - - From Iain Arnell: - - Revision 35984 introduced a regression in ajp13_get_nstring. According - to the comments here, the returned length _includes_ the trailing null. - The encoded length, however, does _not_ including the trailing null. - This patch resolves the problem by simply adding 1 to the returned - length. - ------------------------------------------------------------------------ - r39390 | guy | 2011-10-12 10:55:49 -0700 (Wed, 12 Oct 2011) | 9 lines - Changed paths: - M /trunk/epan/dissectors/packet-ajp13.c - - From Iain Arnell: - - A missing value_ptr parameter in the handling of ajp13 response headers - led to them being displayed differently than the request headers. - - This patch also simplifies the offset/length calculation for header - values, and skips the size for consistency with handling of other ajp13 - string values. - ------------------------------------------------------------------------ - r39392 | wmeier | 2011-10-12 11:04:58 -0700 (Wed, 12 Oct 2011) | 12 lines - Changed paths: - M /trunk/wiretap/file_access.c - M /trunk/wiretap/network_instruments.c - - From Robert Bullen: Fix for: Two minor bugs in Wiretap library: - - First bug: The Network Instruments Observer file format abbreviation is - incorrect. It is "niobserverv" instead of "niobserver", which is probably a - vestige from 1.4 when the abbreviation was "niobserverv9". - - Second bug: The packet header magic number field is correctly swapped the first - time when reading the entire packet header. It is incorrectly swapped yet again - when reporting an invalid value. Both swaps use GUINT_FROM_LE, which is a no-op - on little-endian platforms. But the error message that is displayed to users of - big-endian platforms will contain a byte-reversed value. - ------------------------------------------------------------------------ - - -Copy over by hand: - - ------------------------------------------------------------------------ - r39416 | guy | 2011-10-14 00:45:22 -0700 (Fri, 14 Oct 2011) | 8 lines - Changed paths: - M /trunk/epan/dissectors/packet-ajp13.c - - From Iain Arnell: - - AJP13 uses a string size of 0xFFFF to indicate a null string; - ajp13_get_nstring function would incorrectly return invalid data. - - In disaply_req_body function, the content_length really is the length of - the data; there is no trailing null. + From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548 + 80211 QoS Control: Add Raw TID ------------------------------------------------------------------------ Update the release notes. ------------------------------------------------------------------------ -r39584 | gerald | 2011-10-25 15:58:14 -0700 (Tue, 25 Oct 2011) | 13 lines +r39928 | gerald | 2011-11-17 19:05:03 -0800 (Thu, 17 Nov 2011) | 2 lines Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-infiniband.c - -Copy over r39500 from the trunk: - - ------------------------------------------------------------------------ - r39500 | gerald | 2011-10-20 16:46:04 -0700 (Thu, 20 Oct 2011) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-infiniband.c - - From Huzaifa Sidhpurwala: Fix a null pointer dereference. - ------------------------------------------------------------------------ - + M /trunk-1.6/config.nmake + M /trunk-1.6/configure.in -Update the release notes. +Reset release information accidentally checked in with r39927. ------------------------------------------------------------------------ -r39585 | gerald | 2011-10-25 16:01:25 -0700 (Tue, 25 Oct 2011) | 17 lines +r39939 | gerald | 2011-11-18 08:52:15 -0800 (Fri, 18 Nov 2011) | 2 lines Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/wiretap/erf.c - -Copy over r39508 from the trunk: - - ------------------------------------------------------------------------ - r39508 | gerald | 2011-10-21 12:07:42 -0700 (Fri, 21 Oct 2011) | 6 lines - Changed paths: - M /trunk/wiretap/erf.c - - From Huzaifa Sidhpurwala of Red Hat Security Response Team: - - I found a heap-based buffer overflow, when parsing ERF file format. - The overflow seems to be controlled by the values read from the file, - and hence seems exploitable to me. - ------------------------------------------------------------------------ - + M /trunk-1.6/make-version.pl -Update the release notes. +Try to preserve native line endings when we rewrite files. ------------------------------------------------------------------------ -r39586 | gerald | 2011-10-25 16:39:05 -0700 (Tue, 25 Oct 2011) | 49 lines +r39940 | gerald | 2011-11-18 09:46:50 -0800 (Fri, 18 Nov 2011) | 12 lines Changed paths: - M /trunk-1.6/doc/text2pcap.pod M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-gsm_sms.c - M /trunk-1.6/epan/dissectors/packet-isup.c - M /trunk-1.6/epan/dissectors/packet-netflow.c - M /trunk-1.6/epan/dissectors/packet-rtps2.c M /trunk-1.6/epan/proto.c - M /trunk-1.6/epan/wslua/wslua_proto.c - M /trunk-1.6/file.c - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r39529 | guy | 2011-10-23 15:49:11 -0700 (Sun, 23 Oct 2011) | 11 lines - Changed paths: - M /trunk/doc/text2pcap.pod - - Speak of a "link-layer header type" rather than a "link-layer type"; a - given link-layer type, e.g. 802.11, might have multiple header types - (802.11, 802.11 plus various radio headers, Ethernet), and multiple - link-layer types might have the same header type (802.11 interfaces - might supply Ethernet headers, and Linux loopback interfaces supply - Ethernet headers as well). - - Point to tcpdump.org's page of link-layer header types, rather than to - the net/bpf.h header that 1) might not exist on your system and 2) might - not be up-to-date if it does exist. - ------------------------------------------------------------------------ - r39558 | stig | 2011-10-25 03:48:03 -0700 (Tue, 25 Oct 2011) | 1 line - Changed paths: - M /trunk/epan/proto.c - - Fixed using signed 64-bits integer in custom column. - ------------------------------------------------------------------------ - r39562 | stig | 2011-10-25 04:13:11 -0700 (Tue, 25 Oct 2011) | 3 lines - Changed paths: - M /trunk/epan/wslua/wslua_proto.c - Added Lua error messages when: - - Adding a INT64/UINT64 field with a value string (currently unsupported). - - Trying to display a signed integer as hexadecimal. - ------------------------------------------------------------------------ - r39563 | stig | 2011-10-25 04:20:54 -0700 (Tue, 25 Oct 2011) | 2 lines - Changed paths: - M /trunk/epan/wslua/wslua_proto.c +Copy over r39902 from the trunk: - Added another Lua warning: - - FT_FRAMENUM can not have a bitmask. ------------------------------------------------------------------------ - r39569 | stig | 2011-10-25 10:58:08 -0700 (Tue, 25 Oct 2011) | 1 line + r39902 | cmaynard | 2011-11-17 07:57:44 -0800 (Thu, 17 Nov 2011) | 2 lines Changed paths: M /trunk/epan/proto.c - Display BASE_DEC_HEX correct for int64/uint64. + Fix crash caused by trying to apply a field of type BASE_CUSTOM as a column. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6503. ------------------------------------------------------------------------ - Update the release notes. ------------------------------------------------------------------------ -r39598 | etxrab | 2011-10-25 22:33:30 -0700 (Tue, 25 Oct 2011) | 1 line -Changed paths: - M /trunk-1.6/Makefile.am - M /trunk-1.6/diameter/Cisco.xml - M /trunk-1.6/packaging/nsis/wireshark.nsi - M /trunk-1.6/radius/dictionary - A /trunk-1.6/radius/dictionary.acme - M /trunk-1.6/radius/dictionary.airespace - A /trunk-1.6/radius/dictionary.alcatel.esam - A /trunk-1.6/radius/dictionary.alcatel.sr - M /trunk-1.6/radius/dictionary.aruba - A /trunk-1.6/radius/dictionary.audiocodes - M /trunk-1.6/radius/dictionary.cisco - M /trunk-1.6/radius/dictionary.compat - M /trunk-1.6/radius/dictionary.eltex - M /trunk-1.6/radius/dictionary.erx - M /trunk-1.6/radius/dictionary.extreme - M /trunk-1.6/radius/dictionary.foundry - M /trunk-1.6/radius/dictionary.freeradius - M /trunk-1.6/radius/dictionary.freeradius.internal - M /trunk-1.6/radius/dictionary.hp - M /trunk-1.6/radius/dictionary.huawei - A /trunk-1.6/radius/dictionary.iea - M /trunk-1.6/radius/dictionary.juniper - A /trunk-1.6/radius/dictionary.motorola.wimax - M /trunk-1.6/radius/dictionary.patton - M /trunk-1.6/radius/dictionary.redback - M /trunk-1.6/radius/dictionary.rfc2866 - A /trunk-1.6/radius/dictionary.rfc4603 - A /trunk-1.6/radius/dictionary.rfc5580 - A /trunk-1.6/radius/dictionary.rfc5607 - A /trunk-1.6/radius/dictionary.rfc5904 - D /trunk-1.6/radius/dictionary.tunnel - A /trunk-1.6/radius/dictionary.ukerna - D /trunk-1.6/radius/dictionary.unisphere - A /trunk-1.6/radius/dictionary.wichorus - A /trunk-1.6/radius/dictionary.wimax.wichorus - -Copy ower Diameter and Radius dictionaries. ------------------------------------------------------------------------- -r39625 | gerald | 2011-10-26 17:10:59 -0700 (Wed, 26 Oct 2011) | 22 lines -Changed paths: - M /trunk-1.6/epan/radius_dict.l - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r37405 | wmeier | 2011-05-25 19:59:25 -0700 (Wed, 25 May 2011) | 7 lines - Changed paths: - M /trunk/epan/radius_dict.l - M /trunk/radius/dictionary.foundry - - Allow the character '.' in radius dictionary ATTRIBUTE names; - - Fixes issue caused by dictionary.foundry having ATTRIBUTE names containing - a '.' (e.g., Foundry-MAC-Authent-needs-802.1x). - - So: Revert SVN #37386 which temporarily changed the '.' to '-'. - ------------------------------------------------------------------------ - r37408 | morriss | 2011-05-26 07:15:51 -0700 (Thu, 26 May 2011) | 1 line - Changed paths: - M /trunk/epan/radius_dict.l - - Escape the '.' in radius dictionary ATTRIBUTE names. This may fix the OSX-10.5 builds too. - ------------------------------------------------------------------------ - ------------------------------------------------------------------------- -r39636 | gerald | 2011-10-27 09:00:31 -0700 (Thu, 27 Oct 2011) | 24 lines -Changed paths: - M /trunk-1.6/epan/radius_dict.l - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r37419 | wmeier | 2011-05-26 18:33:24 -0700 (Thu, 26 May 2011) | 2 lines - Changed paths: - M /trunk/epan/radius_dict.l - - Try a stab-in-the-dark to see if we can fix the OSX compile issue. - ------------------------------------------------------------------------ - r37421 | wmeier | 2011-05-26 19:25:20 -0700 (Thu, 26 May 2011) | 11 lines - Changed paths: - M /trunk/epan/radius_dict.l - - SVN #37419 fixed an OSX compile issue and reverted SVN #37408. - - The actual cause of an OSX compile problem: The text [^[:blank:]] in a comment. - - SVN #37408 was reverted because a period (or most other characters) - in a RE character class don't need to be escaped. - - This patch adds some replacement text in the spot in the comment - originally occupied by the text [^[:blank:]] - ------------------------------------------------------------------------ - ------------------------------------------------------------------------- -r39671 | gerald | 2011-10-30 07:33:49 -0700 (Sun, 30 Oct 2011) | 1 line -Changed paths: - M /trunk-1.6/epan/enterprise-numbers - M /trunk-1.6/manuf - M /trunk-1.6/services - -[Automatic manuf, services and enterprise-numbers update for 2011-10-30] ------------------------------------------------------------------------- -r39689 | gerald | 2011-10-31 09:53:23 -0700 (Mon, 31 Oct 2011) | 45 lines -Changed paths: - M /trunk-1.6/asn1/snmp/packet-snmp-template.c - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/epan/dissectors/packet-ber.c - M /trunk-1.6/epan/dissectors/packet-snmp.c - M /trunk-1.6/epan/wslua/wslua_proto.c - M /trunk-1.6/gtk/dfilter_expr_dlg.c - M /trunk-1.6/wireshark.desktop - -Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r39665 | stig | 2011-10-29 03:28:58 -0700 (Sat, 29 Oct 2011) | 2 lines - Changed paths: - M /trunk/gtk/dfilter_expr_dlg.c - - Based on a patch provided by Prashanth in bug 6472: - Only have one Filter Expression window. - ------------------------------------------------------------------------ - r39666 | stig | 2011-10-29 11:26:57 -0700 (Sat, 29 Oct 2011) | 4 lines - Changed paths: - M /trunk/asn1/snmp/packet-snmp-template.c - M /trunk/epan/dissectors/packet-snmp.c - - Added support for big integer64 values. - - This fixes bug 6295. - ------------------------------------------------------------------------ - r39670 | rbalint | 2011-10-30 07:24:29 -0700 (Sun, 30 Oct 2011) | 1 line - Changed paths: - M /trunk/wireshark.desktop - - pass file to wireshark in wireshark.desktop - ------------------------------------------------------------------------ - r39673 | stig | 2011-10-30 08:55:18 -0700 (Sun, 30 Oct 2011) | 3 lines - Changed paths: - M /trunk/epan/dissectors/packet-ber.c - - Increase the size of a unknown INTEGER to FT_INT64 to be able to show - negative integers and integers up to MAXINT64. We still don't support - integers between MAXINT64 and MAXUINT64, which would be 9 bytes long. - ------------------------------------------------------------------------ - r39681 | stig | 2011-10-30 14:32:27 -0700 (Sun, 30 Oct 2011) | 3 lines - Changed paths: - M /trunk/epan/wslua/wslua_proto.c - - Don't ep_strdup the protocol name when register a dissector, because - this name will be collected when loading a capture file and the name - will be gone. - ------------------------------------------------------------------------ - - -Update the release notes. - ------------------------------------------------------------------------- -r39693 | gerald | 2011-10-31 13:30:20 -0700 (Mon, 31 Oct 2011) | 2 lines -Changed paths: - M /trunk-1.6/debian/wireshark-common.files - M /trunk-1.6/epan/Makefile.am - M /trunk-1.6/wiretap/Makefile.am - -Bump the library versions. - ------------------------------------------------------------------------- -r39694 | gerald | 2011-10-31 13:37:05 -0700 (Mon, 31 Oct 2011) | 10 lines -Changed paths: - M /trunk-1.6/docbook/release-notes.xml - M /trunk-1.6/gtk/Makefile.am - -Copy over r37431 from the trunk: - - ------------------------------------------------------------------------ - r37431 | etxrab | 2011-05-27 03:49:34 -0700 (Fri, 27 May 2011) | 1 line - Changed paths: - M /trunk/gtk/Makefile.am - - Include text_import_scanner.l in the distribution. - ------------------------------------------------------------------------ - ------------------------------------------------------------------------- @@ -1,4 +1,4 @@ -Wireshark 1.6.3 Release Notes +Wireshark 1.6.4 Release Notes ------------------------------------------------------------------ @@ -12,115 +12,23 @@ What's New Bug Fixes - The following vulnerabilities have been fixed. - - o wnpa-sec-2011-17 - - The CSN.1 dissector could crash. (Bug 6351) - - Versions affected: 1.6.0 to 1.6.2. - - o wnpa-sec-2011-18 - - Huzaifa Sidhpurwala of Red Hat Security Response Team - discovered that the Infiniband dissector could dereference a - NULL pointer. (Bug 6476) - - Versions affected: 1.4.0 to 1.4.9, 1.6.0 to 1.6.2. - - o wnpa-sec-2011-19 - - Huzaifa Sidhpurwala of Red Hat Security Response Team - discovered a buffer overflow in the ERF file reader. (Bug - 6479) - - Versions affected: 1.4.0 to 1.4.9, 1.6.0 to 1.6.2. - The following bugs have been fixed: - o Assertion failed when doing File->Quit->Save during live - capture. (Bug 1710) - - o Wrong PCEP XRO sub-object decoding. (Bug 3778) - - o Wireshark window takes very long time to show up if invalid - network file path is at recent file list (Bug 3810) - - o Decoding [Status Records] Timestamp Sequence Field in Bundle - Protocol fails if over 32 bits. (Bug 4109) - - o ISUP party number dissection. (Bug 5221) - - o wireshark-1.4.2 crashes when testing the example python - dissector because of a dissector count assertion. (Bug 5431) - - o Ethernet packets with both VLAN tag and LLC header no longer - displayed correctly. (Bug 5645) - - o SLL encapsuled 802.1Q VLAN is not dissected. (Bug 5680) - - o Wireshark crashes when attempting to open a file via drag & - drop when there's already a file open. (Bug 5987) - - o Adding and removing custom HTTP headers requires a restart. - (Bug 6241) - - o Can't read full 64-bit SNMP values. (Bug 6295) - - o Dissection fails for frames with Gigamon Header and VLAN. (Bug - 6305) - - o RTP Stream Analysis does not work for TURN-encapsulated RTP. - (Bug 6322) - - o packet-csn1.c doesn't process CSN_CHOICE entries properly. - (Bug 6328) - - o BACnet property time-synchronization-interval (204) name shown - incorrectly as time-synchronization-recipients. (Bug 6336) - - o GUI crash on invalid IEEE 802.11 GAS frame. (Bug 6345) - - o [ASN.1 PER] Incorrect decoding of BIT STRING type. (Bug 6347) - - o ICMPv6 router advertisement Prefix Information Flag R "Router - Address" missing. (Bug 6350) - - o Export -> Object -> HTTP -> save all: Error on saving files. - (Bug 6362) - - o Inner tag of 802.1ad frames not parsed properly. (Bug 6366) - - o Added cursor type decoding to MySQL dissector. (Bug 6396) - - o Incorrect identification of UDP-encapsulated NAT-keepalive - packets. (Bug 6414) - - o WPA IE pairwise cipher suite dissector uses incorrect - value_string list. (Bug 6420) - - o S1AP protocol can't decode IPv6 transportLayerAddress. (Bug - 6435) - - o RTPS2 dissector doesn't handle 0 in the octestToNextHeader - field. (Bug 6449) - - o packet-ajp13 fix, cleanup, and enhancement. (Bug 6452) + o Patch to fix memory leaks/errors in Lua plugin. (Bug 5575) - o Network Instruments Observer file format bugs. (Bug 6453) + o Wireshark crashes if a field of type BASE_CUSTOM is applied as + a column. (Bug 6503) - o Wireshark crashes when using "Open Recent" 2 times in a row. - (Bug 6457) + o Filter Expression dialog can only be opened once. (Bug 6537) - o Wireshark packet_gsm-sms, display bug: Filler bits in TP-User - Data Header. (Bug 6469) + o Wireshark crashes if compiled without GLib thread support. + (Bug 6540) - o wireshark unable to decode NetFlow options which have system - scope size != 4 bytes. (Bug 6471) + o 80211 QoS Control: Add Raw TID. (Bug 6548) - o Display filter Expression Dialog Box Error. (Bug 6472) + o SNMP length check error. (Bug 6564) - o text_import_scanner.l missing. (Bug 6531) + o UCP dissector bug of operation 61. (Bug 6570) New and Updated Features @@ -132,13 +40,11 @@ What's New Updated Protocol Support - AJP13, ASN.1 PER, BACnet, CSN.1, DTN, Ethernet, ICMPv6, IEEE - 802.11, IEEE 802.1q, Infiniband, IPsec, MySQL, PCEP, PN-RT, RTP, - S1AP, SSL + . New and Updated Capture File Support - Endace ERF. + . Getting Wireshark diff --git a/version.conf b/version.conf index 37bef0baf7..4e358d2d42 100644 --- a/version.conf +++ b/version.conf @@ -1,9 +1,9 @@ # Interim releases: Enable packaging, add a "pre" to the version. -enable: 1 -pkg_format: pre1-%# -pkg_enable: 1 +#enable: 1 +#pkg_format: pre1-%# +#pkg_enable: 1 # Final release: Disable package version stamps. -#enable: 1 -#pkg_format: -#pkg_enable: 0 +enable: 1 +pkg_format: +pkg_enable: 0 |