Changes - j0ke.net Open Build Service

@@ -1,10 +0,0 @@ -# Interim releases: Enable packaging, add a "pre" to the version. -#enable: 1 -#pkg_format: pre1-%# -#pkg_enable: 1 - -# Final release: Disable package version stamps. -enable: 1 -pkg_format: -pkg_enable: 0 -is_release: 1

@@ -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 @@ 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 + r39719 | stig | 2011-11-02 13:06:40 -0700 (Wed, 02 Nov 2011) | 1 line 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 - 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 + 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 - Added register action for loading Lua plugins. - Removed an unused argument to wslua_init(). + 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. ------------------------------------------------------------------------ - r39221 | stig | 2011-10-02 09:19:55 -0700 (Sun, 02 Oct 2011) | 6 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/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. + M /trunk/epan/wslua/wslua_proto.c - Added generic splash updates for python register and handoff instead. + Do not return from within a TRY/CATCH/ENDTRY because this will make the + except stack invalid, and will lead to a crash. - This should fix bug 5431. + In this case it was when calling a dissector from a table in a Lua script. ------------------------------------------------------------------------ - r39234 | etxrab | 2011-10-02 22:13:53 -0700 (Sun, 02 Oct 2011) | 3 lines + r39777 | guy | 2011-11-09 16:53:48 -0800 (Wed, 09 Nov 2011) | 8 lines Changed paths: - M /trunk/epan/dissectors/packet-ipsec-udp.c + M /trunk/epan/prefs.c - From David Mueller: - Incorrect identification of UDP-encapsulated NAT-keepalive packets. - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6414 + 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. ------------------------------------------------------------------------ - r39248 | stig | 2011-10-04 03:12:55 -0700 (Tue, 04 Oct 2011) | 3 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/epan/proto.h - - Add proto_unregister_field(). + M /trunk/asn1/snmp/packet-snmp-template.c + M /trunk/epan/dissectors/packet-snmp.c - This can be used to unregister fields registered in dissector UAT's. + Do some more length checking to avoid a dissector bug error. Should fix + bug 6564. ------------------------------------------------------------------------ - r39251 | stig | 2011-10-04 11:40:56 -0700 (Tue, 04 Oct 2011) | 3 lines + 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 - 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. + 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. ------------------------------------------------------------------------ - 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 +Copy over by hand: - 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 ------------------------------------------------------------------------ - r39277 | cmaynard | 2011-10-05 13:28:50 -0700 (Wed, 05 Oct 2011) | 2 lines + r39749 | stig | 2011-11-07 08:09:41 -0800 (Mon, 07 Nov 2011) | 4 lines Changed paths: - M /trunk/tap-iousers.c + M /trunk/epan/ftypes/ftype-tvbuff.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 + Do not return from within a TRY/CATCH/ENDTRY because this will make the + except stack invalid, and will lead to a crash. - Typo FT_IPv4 isf FT_IPv6. - Fixes - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435 + In this case it was when doing compare functions on a FT_PROTOCOL. ------------------------------------------------------------------------ - r39304 | morriss | 2011-10-07 06:53:43 -0700 (Fri, 07 Oct 2011) | 5 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. - -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: - - ------------------------------------------------------------------------ - 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: +Copy over r39902 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 + r39902 | cmaynard | 2011-11-17 07:57:44 -0800 (Thu, 17 Nov 2011) | 2 lines 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 - - 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 - Changed paths: - M /trunk/epan/proto.c - - Display BASE_DEC_HEX correct for int64/uint64. - ------------------------------------------------------------------------ - - -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. + 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. ------------------------------------------------------------------------ - 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,7 +1,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 39598 2011-10-26 05:33:30Z etxrab $ +# $Id: Makefile.am 39914 2011-11-17 20:11:41Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -1012,15 +1012,3 @@ cd ../dissectors && $(MAKE) checkapi cd ../../plugins && $(MAKE) checkapi cd ../wsutil && $(MAKE) checkapi - -# When we build a release tarball, tell make-version that it is such. This -# prevents make-version from looking for SVN details in the source tarball, -# failing, and then labelling the build as from "SVN version unknown." -dist-hook: - if test -f $(top_srcdir)/version.conf -a ! -f $(top_distdir)/version.conf ; then \ - cp $(top_srcdir)/version.conf $(top_distdir); \ - if grep "^is_release: *1" $(top_distdir)/version.conf ; then :; \ - else \ - echo "is_release: 1" >> $(top_distdir)/version.conf; \ - fi ; \ - fi

@@ -17,7 +17,7 @@ # Makefile.am # Automake file for Wireshark # -# $Id: Makefile.am 39598 2011-10-26 05:33:30Z etxrab $ +# $Id: Makefile.am 39914 2011-11-17 20:11:41Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -512,8 +512,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ @@ -4109,9 +4107,6 @@ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -4313,18 +4308,18 @@ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-binPROGRAMS clean-generic clean-libtool \ clean-local clean-recursive ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-binSCRIPTS \ - install-data install-data-am install-diameterDATA \ - install-dtdsDATA install-exec install-exec-am \ - install-exec-hook install-info install-info-am install-man \ - install-pkgdataDATA install-radiusDATA install-strip \ - install-tpncpDATA install-wimaxasncpDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-binSCRIPTS install-data \ + install-data-am install-diameterDATA install-dtdsDATA \ + install-exec install-exec-am install-exec-hook install-info \ + install-info-am install-man install-pkgdataDATA \ + install-radiusDATA install-strip install-tpncpDATA \ + install-wimaxasncpDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ @@ -4492,18 +4487,6 @@ cd ../dissectors && $(MAKE) checkapi cd ../../plugins && $(MAKE) checkapi cd ../wsutil && $(MAKE) checkapi - -# When we build a release tarball, tell make-version that it is such. This -# prevents make-version from looking for SVN details in the source tarball, -# failing, and then labelling the build as from "SVN version unknown." -dist-hook: - if test -f $(top_srcdir)/version.conf -a ! -f $(top_distdir)/version.conf ; then \ - cp $(top_srcdir)/version.conf $(top_distdir); \ - if grep "^is_release: *1" $(top_distdir)/version.conf ; then :; \ - else \ - echo "is_release: 1" >> $(top_distdir)/version.conf; \ - fi ; \ - fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT:

@@ -1,4 +1,4 @@ -Wireshark 1.6.3 Release Notes +Wireshark 1.6.4 Release Notes ------------------------------------------------------------------ @@ -12,115 +12,23 @@ 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 @@ 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

@@ -331,8 +331,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -273,8 +273,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -331,8 +331,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -17,7 +17,7 @@ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2) * Copyright (C) 2007 Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: packet-snmp-template.c 39689 2011-10-31 16:53:23Z gerald $ + * $Id: packet-snmp-template.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -824,13 +824,47 @@ hfid = hf_snmp_unknown_value; break; } - if ((value_len == 9) && (tvb_get_guint8(tvb, value_offset) == 0)) { - /* Check if this is an unsigned int64 with a big value */ + if (value_len > 8) { + /* + * Too long for an FT_UINT64 or an FT_INT64. + */ header_field_info *hfinfo = proto_registrar_get_nth(hfid); if (hfinfo->type == FT_UINT64) { + /* + * Check if this is an unsigned int64 with + * a big value. + */ + if (value_len > 9 || tvb_get_guint8(tvb, value_offset) != 0) { + /* It is. Fail. */ + pi_value = proto_tree_add_text(pt_varbind,tvb,value_offset,value_len,"Integral value too large"); + expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Unsigned integer value > 2^64 - 1"); + goto already_added; + } /* Cheat and skip the leading 0 byte */ value_len--; value_offset++; + } else if (hfinfo->type == FT_INT64) { + /* + * For now, just reject these. + */ + pi_value = proto_tree_add_text(pt_varbind,tvb,value_offset,value_len,"Integral value too large or too small"); + expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Signed integer value > 2^63 - 1 or <= -2^63"); + goto already_added; + } + } else if (value_len == 0) { + /* + * X.690 section 8.3.1 "Encoding of an integer value": + * "The encoding of an integer value shall be + * primitive. The contents octets shall consist of + * one or more octets." + * + * Zero is not "one or more". + */ + header_field_info *hfinfo = proto_registrar_get_nth(hfid); + if (hfinfo->type == FT_UINT64 || hfinfo->type == FT_INT64) { + pi_value = proto_tree_add_text(pt_varbind,tvb,value_offset,value_len,"Integral value is zero-length"); + expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Integral value is zero-length"); + goto already_added; } } pi_value = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,FALSE);

@@ -331,8 +331,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -284,8 +284,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -359,6 +359,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Support for threads */ +#undef USE_THREADS + /* Version number of package */ #undef VERSION

@@ -1,4 +1,4 @@ -# $Id: config.nmake 38944 2011-09-08 17:11:56Z gerald $ +# $Id: config.nmake 39928 2011-11-18 03:05:03Z gerald $ # Some more information about the settings in this file can be found in # the file README.windows and the Developer's Guide (available online). @@ -12,19 +12,24 @@ ##### Versions ##### -# The current Wireshark version -# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged +# The SVN revision of our build. Updated by make-version.pl +SVN_REVISION=39941 + +# The current Wireshark version. Recommended: Leave unchanged. +# Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=6 -VERSION_MICRO=3 -VERSION_BUILD=39702 -# It's recommended to change VERSION_EXTRA for your own custom builds -# e.g. "-SVN-12345" +VERSION_MICRO=4 +VERSION_BUILD=$(SVN_REVISION) + +# Local build information. Recommended: Unique string for your +# environment, e.g. "-JackStackBarbecue". Updated by make-version.pl + VERSION_EXTRA= -# The version of the wiretap library (recommended: leave unchanged) -WTAP_VERSION_MAJOR=1 -WTAP_VERSION_MINOR=0 +# The version of the wiretap library. Recommended: Leave unchanged. +WTAP_VERSION_MAJOR=$(VERSION_MAJOR) +WTAP_VERSION_MINOR=$(VERSION_MINOR) WTAP_VERSION_MICRO=0 ##### Directories #####

@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for wireshark 1.6.3. +# Generated by GNU Autoconf 2.65 for wireshark 1.6.4. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.6.3' -PACKAGE_STRING='wireshark 1.6.3' +PACKAGE_VERSION='1.6.4' +PACKAGE_STRING='wireshark 1.6.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -835,8 +835,6 @@ GTK_CFLAGS USE_PROFILE_BUILD_FALSE USE_PROFILE_BUILD_TRUE -USE_THREADS_FALSE -USE_THREADS_TRUE LAUNCHSERVICES_FRAMEWORKS CORESERVICES_FRAMEWORKS LDFLAGS_SHAREDLIB @@ -1631,7 +1629,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wireshark 1.6.3 to adapt to many kinds of systems. +\`configure' configures wireshark 1.6.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1702,7 +1700,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wireshark 1.6.3:";; + short | recursive ) echo "Configuration of wireshark 1.6.4:";; esac cat <<\_ACEOF @@ -1889,7 +1887,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.6.3 +wireshark configure 1.6.4 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2429,7 +2427,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wireshark $as_me 1.6.3, which was +It was created by wireshark $as_me 1.6.4, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3201,7 +3199,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.6.3' + VERSION='1.6.4' cat >>confdefs.h <<_ACEOF @@ -5663,13 +5661,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5666: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5664: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5669: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5667: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5672: output\"" >&5) + (eval echo "\"\$as_me:5670: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6875,7 +6873,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6878 "configure"' > conftest.$ac_ext + echo '#line 6876 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8741,11 +8739,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8744: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8742: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8748: \$? = $ac_status" >&5 + echo "$as_me:8746: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9080,11 +9078,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9083: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9081: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9087: \$? = $ac_status" >&5 + echo "$as_me:9085: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9185,11 +9183,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9188: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9186: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9192: \$? = $ac_status" >&5 + echo "$as_me:9190: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9240,11 +9238,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9243: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9241: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9247: \$? = $ac_status" >&5 + echo "$as_me:9245: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11624,7 +11622,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11627 "configure" +#line 11625 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11720,7 +11718,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11723 "configure" +#line 11721 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13676,11 +13674,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13677: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13683: \$? = $ac_status" >&5 + echo "$as_me:13681: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13775,11 +13773,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13776: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13782: \$? = $ac_status" >&5 + echo "$as_me:13780: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13827,11 +13825,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13830: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13828: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13834: \$? = $ac_status" >&5 + echo "$as_me:13832: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18841,17 +18839,12 @@ enable_threads=no fi +if test x$enable_threads = xyes; then +$as_echo "#define USE_THREADS 1" >>confdefs.h -if test x$enable_threads = xyes; then - USE_THREADS_TRUE= - USE_THREADS_FALSE='#' -else - USE_THREADS_TRUE='#' - USE_THREADS_FALSE= fi - # Check whether --enable-profile-build was given. if test "${enable_profile_build+set}" = set; then : enableval=$enable_profile_build; enable_profile_build=$enableval @@ -25191,10 +25184,6 @@ as_fn_error "conditional \"HAVE_WARNINGS_AS_ERRORS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_THREADS_TRUE}" && test -z "${USE_THREADS_FALSE}"; then - as_fn_error "conditional \"USE_THREADS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${USE_PROFILE_BUILD_TRUE}" && test -z "${USE_PROFILE_BUILD_FALSE}"; then as_fn_error "conditional \"USE_PROFILE_BUILD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -25664,7 +25653,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wireshark $as_me 1.6.3, which was +This file was extended by wireshark $as_me 1.6.4, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25730,7 +25719,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wireshark config.status 1.6.3 +wireshark config.status 1.6.4 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\"

@@ -1,8 +1,8 @@ -# $Id: configure.in 38944 2011-09-08 17:11:56Z gerald $ +# $Id: configure.in 39928 2011-11-18 03:05:03Z gerald $ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.6.3) +AC_INIT(wireshark, 1.6.4) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or @@ -730,7 +730,9 @@ AC_HELP_STRING( [--enable-threads], [use threads in wireshark. @<:@default=no@:>@]), enable_threads=$enableval,enable_threads=no) -AM_CONDITIONAL(USE_THREADS, test x$enable_threads = xyes) +if test x$enable_threads = xyes; then + AC_DEFINE(USE_THREADS, 1, [Support for threads]) +fi AC_ARG_ENABLE(profile-build, AC_HELP_STRING( [--enable-profile-build],

@@ -1,4 +1,4 @@ -wireshark (1.6.3) unstable; urgency=low +wireshark (1.6.4) unstable; urgency=low * Self-made package

@@ -282,8 +282,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -250,8 +250,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -2,7 +2,7 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - +  - <!ENTITY WiresharkCurrentVersion "1.6.3"> +<!ENTITY WiresharkCurrentVersion "1.6.4"> ]> @@ -31,70 +31,6 @@ <para> - The following vulnerabilities have been fixed. - <itemizedlist> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-17.html">wnpa-sec-2011-17</ulink> - </para> - <para> - The CSN.1 dissector could crash. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6351">Bug - 6351</ulink>) - </para> - <para>Versions affected: 1.6.0 to 1.6.2.</para> -  - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-18.html">wnpa-sec-2011-18</ulink> - </para> - <para> - Huzaifa Sidhpurwala of Red Hat Security Response Team discovered - that the Infiniband dissector could dereference a NULL pointer. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6476">Bug - 6476</ulink>) - </para> - <para>Versions affected: 1.4.0 to 1.4.9, 1.6.0 to 1.6.2.</para> -  - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-19.html">wnpa-sec-2011-19</ulink> - </para> - <para> - Huzaifa Sidhpurwala of Red Hat Security Response Team discovered a - buffer overflow in the ERF file reader. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6479">Bug - 6479</ulink>) - </para> - <para>Versions affected: 1.4.0 to 1.4.9, 1.6.0 to 1.6.2.</para> -  - </listitem> - </itemizedlist> - - </para> - - <para> - The following bugs have been fixed: <itemizedlist> @@ -109,199 +45,51 @@ </para></listitem> --> - <listitem><para> - Assertion failed when doing File->Quit->Save during live capture. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1710">Bug - 1710</ulink>) - </para></listitem> - - <listitem><para> - Wrong PCEP XRO sub-object decoding. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3778">Bug - 3778</ulink>) - </para></listitem> - - <listitem><para> - Wireshark window takes very long time to show up if invalid network file path is at recent file list - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3810">Bug - 3810</ulink>) - </para></listitem> - - <listitem><para> - Decoding [Status Records] Timestamp Sequence Field in Bundle Protocol fails if over 32 bits. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4109">Bug - 4109</ulink>) - </para></listitem> - - <listitem><para> - ISUP party number dissection. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5221">Bug - 5221</ulink>) - </para></listitem> - - <listitem><para> - wireshark-1.4.2 crashes when testing the example python dissector because of a dissector count assertion. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5431">Bug - 5431</ulink>) - </para></listitem> - - <listitem><para> - Ethernet packets with both VLAN tag and LLC header no longer displayed correctly. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5645">Bug - 5645</ulink>) - </para></listitem> - - <listitem><para> - SLL encapsuled 802.1Q VLAN is not dissected. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5680">Bug - 5680</ulink>) - </para></listitem> - - <listitem><para> - Wireshark crashes when attempting to open a file via drag & drop when there's already a file open. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5987">Bug - 5987</ulink>) - </para></listitem> - - <listitem><para> - Adding and removing custom HTTP headers requires a restart. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6241">Bug - 6241</ulink>) - </para></listitem> - - <listitem><para> - Can't read full 64-bit SNMP values. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6295">Bug - 6295</ulink>) - </para></listitem> - - <listitem><para> - Dissection fails for frames with Gigamon Header and VLAN. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6305">Bug - 6305</ulink>) - </para></listitem> - - <listitem><para> - RTP Stream Analysis does not work for TURN-encapsulated RTP. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6322">Bug - 6322</ulink>) - </para></listitem> + Compilation on Windows using the release tarball has been fixed. <listitem><para> - packet-csn1.c doesn't process CSN_CHOICE entries properly. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6328">Bug - 6328</ulink>) + Patch to fix memory leaks/errors in Lua plugin. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5575">Bug + 5575</ulink>) </para></listitem> <listitem><para> - BACnet property time-synchronization-interval (204) name shown incorrectly as time-synchronization-recipients. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6336">Bug - 6336</ulink>) + Wireshark crashes if a field of type BASE_CUSTOM is applied as a column. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6503">Bug + 6503</ulink>) </para></listitem> - <listitem><para> - GUI crash on invalid IEEE 802.11 GAS frame. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6345">Bug - 6345</ulink>) - </para></listitem> - - <listitem><para> - [ASN.1 PER] Incorrect decoding of BIT STRING type. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6347">Bug - 6347</ulink>) - </para></listitem> - - <listitem><para> - ICMPv6 router advertisement Prefix Information Flag R "Router Address" missing. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6350">Bug - 6350</ulink>) - </para></listitem> - - <listitem><para> - Export -> Object -> HTTP -> save all: Error on saving files. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6362">Bug - 6362</ulink>) - </para></listitem> - - <listitem><para> - Inner tag of 802.1ad frames not parsed properly. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6366">Bug - 6366</ulink>) - </para></listitem> - - <listitem><para> - Added cursor type decoding to MySQL dissector. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6396">Bug - 6396</ulink>) - </para></listitem> - - <listitem><para> - Incorrect identification of UDP-encapsulated NAT-keepalive packets. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6414">Bug - 6414</ulink>) - </para></listitem> - - <listitem><para> - WPA IE pairwise cipher suite dissector uses incorrect value_string list. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6420">Bug - 6420</ulink>) - </para></listitem> - - <listitem><para> - S1AP protocol can't decode IPv6 transportLayerAddress. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435">Bug - 6435</ulink>) - </para></listitem> - - <listitem><para> - RTPS2 dissector doesn't handle 0 in the octestToNextHeader field. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6449">Bug - 6449</ulink>) - </para></listitem> - - <listitem><para> - packet-ajp13 fix, cleanup, and enhancement. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6452">Bug - 6452</ulink>) - </para></listitem> - - <listitem><para> - Network Instruments Observer file format bugs. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6453">Bug - 6453</ulink>) - </para></listitem> - - <listitem><para> - Wireshark crashes when using "Open Recent" 2 times in a row. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6457">Bug - 6457</ulink>) + <listitem><para> + Filter Expression dialog can only be opened once. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6537">Bug + 6537</ulink>) </para></listitem> <listitem><para> - Wireshark packet_gsm-sms, display bug: Filler bits in TP-User Data Header. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6469">Bug - 6469</ulink>) + Wireshark crashes if compiled without GLib thread support. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6540">Bug + 6540</ulink>) </para></listitem> <listitem><para> - wireshark unable to decode NetFlow options which have system scope size != 4 bytes. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6471">Bug - 6471</ulink>) + 80211 QoS Control: Add Raw TID. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548">Bug + 6548</ulink>) </para></listitem> <listitem><para> - Display filter Expression Dialog Box Error. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6472">Bug - 6472</ulink>) + SNMP length check error. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6564">Bug + 6564</ulink>) </para></listitem> <listitem><para> - text_import_scanner.l missing. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6531">Bug - 6531</ulink>) + UCP dissector bug of operation 61. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570">Bug + 6570</ulink>) </para></listitem> - </itemizedlist> + </itemizedlist> </para> @@ -326,23 +114,7 @@ <section id="UpdatedProtocols"><title>Updated Protocol Support</title> <para>  -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 +. </para> </section> @@ -350,7 +122,7 @@ <section id="NewCapture"><title>New and Updated Capture File Support</title> <para> -Endace ERF. +. </para> </section>

@@ -409,8 +409,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -313,8 +313,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -346,8 +346,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -1160,8 +1160,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -265,8 +265,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -2,7 +2,7 @@ * Routines for CAPWAP dissection (RFC 5415 / RFC5416) * Copyright 2009, Alexis La Goutte <alexis.lagoutte at gmail dot com> * - * $Id: packet-capwap.c 37015 2011-05-08 10:23:53Z alagoutte $ + * $Id: packet-capwap.c 39780 2011-11-10 06:11:04Z etxrab $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1374,13 +1374,17 @@ if (global_capwap_reassemble && fragment_is) { + const int len_rem = tvb_length_remaining(tvb, offset); + if (len_rem <= 0) + return offset; + pinfo->fragmented = TRUE; frag_msg = fragment_add_check(tvb, offset, pinfo,fragment_id, capwap_fragment_table, capwap_reassembled_table, fragment_offset, - tvb_length_remaining(tvb, offset), + len_rem, fragment_more); next_tvb = process_reassembled_data(tvb, offset, pinfo,

@@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c 39583 2011-10-25 22:47:00Z gerald $ + * $Id: packet-ieee80211.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1307,6 +1307,7 @@ /* ************************************************************************* */ /* Header values for QoS control field */ /* ************************************************************************* */ +static int hf_ieee80211_qos_tid = -1; static int hf_ieee80211_qos_priority = -1; static int hf_ieee80211_qos_ack_policy = -1; static int hf_ieee80211_qos_amsdu_present = -1; @@ -5081,7 +5082,7 @@ proto_tree_add_item(aci_aifsn_tree, hf_ieee80211_wfa_ie_wme_acp_aifsn, tvb, offset, 1, ENC_NA); proto_tree_add_item(aci_aifsn_tree, hf_ieee80211_wfa_ie_wme_acp_reserved, tvb, offset, 1, ENC_NA); aci_aifsn = tvb_get_guint8(tvb, offset); - proto_item_append_text(ac_item, " ACI %u (%s), ACM %s, AIFSN %u", + proto_item_append_text(ac_item, " ACI %u (%s), ACM %s, AIFSN %u", (aci_aifsn & 0x60) >> 5, match_strval((aci_aifsn & 0x60) >> 5, ieee80211_wfa_ie_wme_acs_vals), (aci_aifsn & 0x10) ? "yes" : "no ", aci_aifsn & 0x0f); offset += 1; @@ -9406,6 +9407,7 @@ guint16 qosoff; guint16 qos_control; + guint16 qos_tid; guint16 qos_priority; guint16 qos_ack_policy; guint16 qos_amsdu_present; @@ -9427,12 +9429,16 @@ qos_tree = proto_item_add_subtree (qos_fields, ett_qos_parameters); qos_control = tvb_get_letohs(tvb, qosoff + 0); + qos_tid = QOS_TID(qos_control); qos_priority = QOS_PRIORITY(qos_control); qos_ack_policy = QOS_ACK_POLICY(qos_control); qos_amsdu_present = QOS_AMSDU_PRESENT(qos_control); qos_eosp = QOS_EOSP(qos_control); qos_field_content = QOS_FIELD_CONTENT(qos_control); + proto_tree_add_uint (qos_tree, hf_ieee80211_qos_tid, tvb, + qosoff, 1, qos_tid); + proto_tree_add_uint_format (qos_tree, hf_ieee80211_qos_priority, tvb, qosoff, 1, qos_priority, "Priority: %d (%s) (%s)", @@ -11687,6 +11693,10 @@ {"Sequence number", "wlan.seq", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, + {&hf_ieee80211_qos_tid, + {"TID", "wlan.qos.tid", FT_UINT16, BASE_DEC, NULL, 0, + "TID", HFILL }}, + {&hf_ieee80211_qos_priority, {"Priority", "wlan.qos.priority", FT_UINT16, BASE_DEC, NULL, 0, "802.1D Tag", HFILL }},

@@ -25,7 +25,7 @@ * See RFC 2578 for Structure of Management Information Version 2 (SMIv2) * Copyright (C) 2007 Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: packet-snmp.c 39689 2011-10-31 16:53:23Z gerald $ + * $Id: packet-snmp.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -926,13 +926,47 @@ hfid = hf_snmp_unknown_value; break; } - if ((value_len == 9) && (tvb_get_guint8(tvb, value_offset) == 0)) { - /* Check if this is an unsigned int64 with a big value */ + if (value_len > 8) { + /* + * Too long for an FT_UINT64 or an FT_INT64. + */ header_field_info *hfinfo = proto_registrar_get_nth(hfid); if (hfinfo->type == FT_UINT64) { + /* + * Check if this is an unsigned int64 with + * a big value. + */ + if (value_len > 9 || tvb_get_guint8(tvb, value_offset) != 0) { + /* It is. Fail. */ + pi_value = proto_tree_add_text(pt_varbind,tvb,value_offset,value_len,"Integral value too large"); + expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Unsigned integer value > 2^64 - 1"); + goto already_added; + } /* Cheat and skip the leading 0 byte */ value_len--; value_offset++; + } else if (hfinfo->type == FT_INT64) { + /* + * For now, just reject these. + */ + pi_value = proto_tree_add_text(pt_varbind,tvb,value_offset,value_len,"Integral value too large or too small"); + expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Signed integer value > 2^63 - 1 or <= -2^63"); + goto already_added; + } + } else if (value_len == 0) { + /* + * X.690 section 8.3.1 "Encoding of an integer value": + * "The encoding of an integer value shall be + * primitive. The contents octets shall consist of + * one or more octets." + * + * Zero is not "one or more". + */ + header_field_info *hfinfo = proto_registrar_get_nth(hfid); + if (hfinfo->type == FT_UINT64 || hfinfo->type == FT_INT64) { + pi_value = proto_tree_add_text(pt_varbind,tvb,value_offset,value_len,"Integral value is zero-length"); + expert_add_info_format(actx->pinfo, pi_value, PI_UNDECODED, PI_NOTE, "Integral value is zero-length"); + goto already_added; } } pi_value = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,FALSE); @@ -2724,7 +2758,7 @@ /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1504 "../../asn1/snmp/packet-snmp-template.c" +#line 1538 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3641,7 +3675,7 @@ NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2156 "../../asn1/snmp/packet-snmp-template.c" +#line 2190 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3681,7 +3715,7 @@ &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2172 "../../asn1/snmp/packet-snmp-template.c" +#line 2206 "../../asn1/snmp/packet-snmp-template.c" }; module_t *snmp_module;

@@ -2,7 +2,7 @@ * Routines for Universal Computer Protocol dissection * Copyright 2001, Tom Uijldert <tom.uijldert@cmg.nl> * - * $Id: packet-ucp.c 36807 2011-04-22 14:30:19Z morriss $ + * $Id: packet-ucp.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1681,10 +1681,12 @@ UcpHandleString(hf_ucp_parm_LAdC); UcpHandleByte(hf_ucp_parm_LTON); UcpHandleByte(hf_ucp_parm_LNPI); - UcpHandleInt(hf_ucp_parm_OPID); + if (OT == 60) { + UcpHandleInt(hf_ucp_parm_OPID); + } UcpHandleData(hf_ucp_parm_RES1); if (OT == 61) { - UcpHandleData(hf_ucp_parm_RES2); + UcpHandleData(hf_ucp_parm_RES2); } }

@@ -265,8 +265,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2011-10-29) +(last updated 2011-11-12) SMI Network Management Private Enterprise Codes: @@ -15691,8 +15691,8 @@ dottur&aplion.com 3922 Operational Research Consultants - Robert Cope - coper&orc.com + Denise M B Finnance + finnanced&orc.com 3923 Intrak, Inc. Frank Fullen @@ -60464,8 +60464,8 @@ jiangpeng&venustech.com.cn 15228 Damm Cellular Systems A/S - Hauke Behrendsen - hb&damm.dk + Dennis Boy + db&damm.dk 15229 T-Systems Schweiz AG Stefan Steinemann @@ -70403,9 +70403,9 @@ Miguel Angel Sarasa Lopez sarasam&tb-solutions.com 17713 - PipingHot Networks Limited - Richard Carter - richard.carter&pipinghotnetworks.com + Cambium Networks Limited (previous was 'PipingHot Networks Limited') + Antony Holmes + antony.holmes&cambiumnetworks.com 17714 ASM Enterprises Mark Jeweler @@ -82645,8 +82645,8 @@ oid&prioritynetworks.net 20772 Optica Technologies Inc. - Dennis Kerrisk - dennis.kerrisk&opticatech.com + Serge Rioux + serge.rioux&opticatech.com 20773 Accenture Business Services for Utilities Steen Lauridsen @@ -89828,9 +89828,9 @@ Olivier Gérault olivier.gerault&devoteam.com 22567 - Escola Superior de Tecnologia de Castelo Branco - Pedro Gonçalves - ci&est.ipcb.pt + Instituto Politécnico de Castelo Branco + Fernando Emanuel Azevedo Reis + informatica&ipcb.pt 22568 Redwave Technology Ltd Phil Hughes @@ -102058,10 +102058,9 @@ Chris Greve snmp-num&zmicro.com 25622 - UKERNA (United Kingdom Education and Research Networking -Association) - Steve Williams - s.williams&ukerna.ac.uk + JANET(UK) (previous was 'UKERNA (United Kingdom Education and Research Networking Association)') + Mark O'Leary + mark.oleary&ja.net 25623 OpenVAS Tim Brown @@ -147345,8 +147344,8 @@ serafim&sentinelasecurity.com.br 36940 TLO - Moses Hernandez - moses&tlo.com + Jason Rowe + itsecurity&tlo.com 36941 Solekai Systems Corporation Kert Jans @@ -153901,8 +153900,8 @@ David.Papis&nyct.com 38579 Pike Aerospace Research Corporation - Douglas Goodall - doug&pikeaero.com + Mike Sharkey + mike&pikeaero.com 38580 i3 International inc. Bob Hoang @@ -154624,9 +154623,9 @@ Vandael Tim tim.vandael&khlim.be 38760 - ABC Software, Ltd - Jurijs Kornijenko - jurijs.kornijenko&abcsoftware.lv + Veselības ekonomikas centrs (previous was 'ABC Software, Ltd') + Margreta Baltgalve + margreta.baltgalve&vec.gov.lv 38761 OSnode Geoffrey Rekier @@ -155027,6 +155026,290 @@ comadot.net Luke Comadot iana-pen&comadot.net +38861 + Rudy Gevaert + Rudy Gevaert + rudy&webworm.org +38862 + Erstikalender.info + Andreas Neumann + andreas.neumann&tu-ilmenau.de +38863 + SiChuan Andi industry co.LTD + Liangkun Jiao + qishankai&andisat.net +38864 + Virgin Holidays Ltd + Gary Payne + infrastructure&virginholidays.com +38865 + Squadra Technologies + Anthony LaMark + anthony&squadratechnologies.com +38866 + TRIMET ALUMINIUM AG + Christoph Hackstein + christoph.hackstein&trimet.de +38867 + mecodia GmbH + Tobias Birmili + it&mecodia.de +38868 + Comision Nacional de Bancos y Seguros + Luis Lupiac + llupiac&cnbs.gov.hn +38869 + Alexey S Khromov + Alexey S Khromov + zxalexis&gmail.com +38870 + Mandiant + Dave Merkel + dave.merkel&mandiant.com +38871 + Vostokcement Ltd. + Sergey Rudenko + sysadmin&vostokcement.ru +38872 + JSC "Prompribor" + N.I.Kobylkin + sales&prompribor.ru +38873 + Alex Bolgov + Alex Bolgov + bolgov2009&gmail.com +38874 + ENABIL Solutions Ltd. + Lindsay Murfin + IT.Team&enabil.com +38875 + UnifiedPost S.A. + Arjen Van Drie + hostmaster&unifiedpost.com +38876 + Mork + Bjørn Mork + bjorn&mork.no +38877 + BPM Advanced Technology Company + Fred Legros + contact&flowmind.org +38878 + s.d.i. s.p.a. + Castiglioni Lorenzo + l.castiglioni&sdiautomazione.it +38879 + tradebridge Pty Ltd + Graham Brown + graham&healthbridge.co.za +38880 + MicroAutomation + D'Artagnion R. Pope + dpope&microautomation.com +38881 + Abelium d.o.o. + Primoz Luksic + primoz.luksic&abelium.eu +38882 + Barron McCann Technology + Cliff Young + cliff&bemac.com +38883 + Phenomic Business Systems Ltd + David Barker + david.barker&phenomic.co.uk +38884 + Electrolux + Aleksander Brozek + oid&electrolux.com +38885 + nPulse Technologies Inc. + Bill Cantrell + bc&npulsetech.com +38886 + Societe d'exploitation de Reseaux et de Services Securises (SER2S) + Philippe Provost + gin-manager&e-rsb.com +38887 + VIS - Verein der Informatik Studierenden + Pascal Spörri + sysadmin&vis.ethz.ch +38888 + c3pb e.V. + Helge Jung + infrastruktur&c3pb.de +38889 + Okuejina + Pontus Carlsson + PontusCarlsson&live.se +38890 + Blue Shield of California + Charles Blas + charles.blas&blueshieldca.com +38891 + Jimma University + Alemayehu Lishane + alemayehu.Lishane&ju.edu.et +38892 + Axiovista S.A. + Juan J. Sierralta + juanjose.sierralta&axiovista.com +38893 + Marc Luehr + Marc Luehr + marcluehr&googlemail.com +38894 + GROB-WERKE GmbH & Co. KG + Wolfgang Rothermel + wrothermel&grobgroup.com +38895 + sig21 labs + Martin Mueller + mm&sig21.net +38896 + Findaway World + Kevin Kovach + kkovach&findawayworld.com +38897 + Safegate International AB + Markus Andersson + markus.andersson&safegate.com +38898 + La France du Nord au Sud + Laurent Ollagnier + laurent.ollagnier&dunordausud.fr +38899 + National Institute Of Weather And Atmopheric Research + Gabriella Turek + g.turek&niwa.co.nz +38900 + Fukuoka University + Tastuo Kimura + densan&adm.fukuoka-u.ac.jp +38901 + Landsvirkjun + Larus Gudmundsson + lgudmund&lv.is +38902 + NovAtel Inc. + Patrick Fenton + patrick.fenton&novatel.com +38903 + Malin Space Science Systems + Scott Davis + davis&msss.com +38904 + School Specialty, Inc. + Mark Ziesemer + Mark.Ziesemer&SchoolSpecialty.com +38905 + Timanetworks Inc. + Albee Bu + albee.bu&timanetworks.com +38906 + Goethe-Universitaet Frankfurt am Main + Prof. Dr. Udo Kebschull + basisdienste&rz.uni-frankfurt.de +38907 + Zumbox, Inc. + Gareth Greenaway + ggreenaway&zumbox.com +38908 + Aon Corporation + Kenton Morneau + kenton.morneau&aon.com +38909 + Linguistic Data Consortium + Wayne Hill + systems&ldc.upenn.edu +38910 + Xicoy Electronica S.L. + Gaspar Espiell + gaspar&xicoy.com +38911 + McLeod Health + Sharmayne Donley + sdonley&mcleodhealth.org +38912 + psych0tik.net + Rich Healey + richo&psych0tik.net +38913 + QXTN Pty Ltd + Richard Ham + admin&qxtn.net +38914 + JNT SOUND SYSTEM AB + Richard Dahlstrom + richard&jnt.se +38915 + avono AG + Stefan Engel + admin&avono.de +38916 + Shanghai ekingstar Digital Campus Co,.Ltd. + liu hongqing + liuhongqing&ekingstar.com +38917 + Guangxi Xinhai Communication Technology Co.,Ltd + He Kai + hekai&gzhyit.com +38918 + DEK Technologies Pty Ltd + Rick Collings + ictteam&dektech.com.au +38919 + EPRONA, a.s. + Zdenek Cermak + cermak&eprona.cz +38920 + SnapTV AS + Åsmund Grammeltvedt + asmundg&snap.tv +38921 + Capetti Elettronica srl + Maurizio Bertero + maurizio.bertero&capetti.it +38922 + Hypotecni banka, a.s. + Filip Sixta + sixta.filip&hypotecnibanka.cz +38923 + iProfs + Afdeling Beheer + beheer&iprofs.nl +38924 + Damarel Systems International Ltd. + John Boult + jboult&damarel.com +38925 + PROCENTEC + Paulo Silva + psilva&procentec.com +38926 + InnovAction srl + Francesco Policastrese + fpolicastrese&innovaction.it +38927 + Versile AS + Tore Skaug + toresk&versile.com +38928 + Powel Energy Management AB + Lars Lindström + lars.lindstrom&powel.se +38929 + Fugro Geos Ltd + Ian Bellamy + i.bellamy&geos.com +38930 + @Planet Ltd + Tom Bamford + tom&atplanet.co.uk +38931 + Chaz6 + Chris Hills + chaz&chaz6.com End of Document

@@ -311,8 +311,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -1,5 +1,5 @@ /* - * $Id: ftype-tvbuff.c 33735 2010-08-08 19:04:35Z stig $ + * $Id: ftype-tvbuff.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -131,22 +131,21 @@ static int val_repr_len(fvalue_t *fv, ftrepr_t rtype) { - guint length; + guint length = 0; if (rtype != FTREPR_DFILTER) return -1; TRY { - length = tvb_length(fv->value.tvb); /* 3 bytes for each byte of the byte "NN:" minus 1 byte * as there's no trailing ":". */ - return length * 3 - 1; + length = tvb_length(fv->value.tvb) * 3 - 1; } CATCH_ALL { /* nothing */ } ENDTRY; - return 0; + return (int) length; } static void @@ -190,18 +189,18 @@ static guint len(fvalue_t *fv) { + guint length = 0; + TRY { if (fv->value.tvb) - return tvb_length(fv->value.tvb); - else - return 0; + length = tvb_length(fv->value.tvb); } CATCH_ALL { /* nothing */ } ENDTRY; - return 0; + return length; } static void @@ -227,22 +226,20 @@ { tvbuff_t *a = fv_a->value.tvb; tvbuff_t *b = fv_b->value.tvb; + gboolean eq = FALSE; TRY { guint a_len = tvb_length(a); - if (a_len != tvb_length(b)) { - return FALSE; - } - - return (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) == 0); + if (a_len == tvb_length(b)) + eq = (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) == 0); } CATCH_ALL { /* nothing */ } ENDTRY; - return FALSE; + return eq; } static gboolean @@ -250,22 +247,21 @@ { tvbuff_t *a = fv_a->value.tvb; tvbuff_t *b = fv_b->value.tvb; + gboolean ne = TRUE; TRY { guint a_len = tvb_length(a); - if (a_len != tvb_length(b)) { - return TRUE; + if (a_len == tvb_length(b)) { + ne = (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) != 0); } - - return (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) != 0); } CATCH_ALL { /* nothing */ } ENDTRY; - return FALSE; + return ne; } static gboolean @@ -273,27 +269,24 @@ { tvbuff_t *a = fv_a->value.tvb; tvbuff_t *b = fv_b->value.tvb; + gboolean gt = FALSE; TRY { guint a_len = tvb_length(a); guint b_len = tvb_length(b); if (a_len > b_len) { - return TRUE; + gt = TRUE; + } else if (a_len == b_len) { + gt = (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) > 0); } - - if (a_len < b_len) { - return FALSE; - } - - return (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) > 0); } CATCH_ALL { /* nothing */ } ENDTRY; - return FALSE; + return gt; } static gboolean @@ -301,27 +294,24 @@ { tvbuff_t *a = fv_a->value.tvb; tvbuff_t *b = fv_b->value.tvb; + gboolean ge = FALSE; TRY { guint a_len = tvb_length(a); guint b_len = tvb_length(b); if (a_len > b_len) { - return TRUE; - } - - if (a_len < b_len) { - return FALSE; + ge = TRUE; + } else if (a_len == b_len) { + ge = (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) >= 0); } - - return (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) >= 0); } CATCH_ALL { /* nothing */ } ENDTRY; - return FALSE; + return ge; } static gboolean @@ -329,27 +319,24 @@ { tvbuff_t *a = fv_a->value.tvb; tvbuff_t *b = fv_b->value.tvb; + gboolean lt = FALSE; TRY { guint a_len = tvb_length(a); guint b_len = tvb_length(b); if (a_len < b_len) { - return TRUE; - } - - if (a_len > b_len) { - return FALSE; + lt = TRUE; + } else if (a_len == b_len) { + lt = (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) < 0); } - - return (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) < 0); } CATCH_ALL { /* nothing */ } ENDTRY; - return FALSE; + return lt; } static gboolean @@ -357,38 +344,34 @@ { tvbuff_t *a = fv_a->value.tvb; tvbuff_t *b = fv_b->value.tvb; + gboolean le = FALSE; TRY { guint a_len = tvb_length(a); guint b_len = tvb_length(b); if (a_len < b_len) { - return TRUE; + le = TRUE; + } else if (a_len == b_len) { + le = (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) <= 0); } - - if (a_len > b_len) { - return FALSE; - } - - return (memcmp(tvb_get_ptr(a, 0, a_len), tvb_get_ptr(b, 0, a_len), a_len) <= 0); } CATCH_ALL { /* nothing */ } ENDTRY; - return FALSE; + return le; } static gboolean cmp_contains(fvalue_t *fv_a, fvalue_t *fv_b) { + gboolean contains = FALSE; + TRY { if (tvb_find_tvb(fv_a->value.tvb, fv_b->value.tvb, 0) > -1) { - return TRUE; - } - else { - return FALSE; + contains = TRUE; } } CATCH_ALL { @@ -396,7 +379,7 @@ } ENDTRY; - return FALSE; + return contains; } #ifdef HAVE_LIBPCRE

@@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c 39543 2011-10-24 22:34:56Z gerald $ + * $Id: prefs.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1141,7 +1141,9 @@ #define DEF_NUM_COLS 7 -/* Initialize preferences to wired-in default values. +/* Initialize non-dissector preferences to wired-in default values. + * (The dissector preferences are assumed to be set to those values + * by the dissectors.) * They may be overridden by the global preferences file or the * user's preferences file. */ @@ -1323,12 +1325,88 @@ prefs_initialized = TRUE; } +/* + * Reset a single dissector preference. + */ +static void +reset_pref(gpointer data, gpointer user_data _U_) +{ + pref_t *pref = data; + + switch (pref->type) { + + case PREF_UINT: + *pref->varp.uint = pref->default_val.uint; + break; + + case PREF_BOOL: + *pref->varp.boolp = pref->default_val.boolval; + break; + + case PREF_ENUM: + /* + * For now, we save the "description" value, so that if we + * save the preferences older versions of Wireshark can at + * least read preferences that they supported; we support + * either the short name or the description when reading + * the preferences file or a "-o" option. + */ + *pref->varp.enump = pref->default_val.enumval; + break; + + case PREF_STRING: + g_free((void *)*pref->varp.string); + *pref->varp.string = g_strdup(pref->default_val.string); + break; + + case PREF_RANGE: + g_free(*pref->varp.range); + *pref->varp.range = range_copy(pref->default_val.range); + break; + + case PREF_STATIC_TEXT: + case PREF_UAT: + /* Nothing to do */ + break; + + case PREF_OBSOLETE: + /* + * This preference is no longer supported; it's not a + * real preference, so we don't reset it (i.e., we + * treat it as if it weren't found in the list of + * preferences, and we weren't called in the first place). + */ + break; + } +} + +typedef struct { + module_t *module; +} reset_pref_arg_t; + +/* + * Reset all preferences for a module. + */ +static gboolean +reset_module_prefs(void *value, void *data _U_) +{ + reset_pref_arg_t arg; + + arg.module = value; + g_list_foreach(arg.module->prefs, reset_pref, &arg); + return FALSE; +} + /* Reset preferences */ void prefs_reset(void) { prefs_initialized = FALSE; + /* + * Free information associated with the current values of non-dissector + * preferences. + */ g_free(prefs.pr_file); g_free(prefs.pr_cmd); free_col_info(&prefs); @@ -1345,9 +1423,25 @@ g_free(prefs.capture_devices_hide); g_free(prefs.capture_devices_monitor_mode); + /* + * Unload all UAT preferences. + */ uat_unload_all(); + + /* + * Unload any loaded MIBs. + */ oids_cleanup(); + + /* + * Reset the non-dissector preferences. + */ init_prefs(); + + /* + * Reset the non-UAT dissector preferences. + */ + pe_tree_foreach(prefs_modules, reset_module_prefs, NULL); } /* Read the preferences file, fill in "prefs", and return a pointer to it. @@ -2783,7 +2877,7 @@ } write_pref_arg_t; /* - * Write out a single preference. + * Write out a single dissector preference. */ static void write_pref(gpointer data, gpointer user_data) @@ -2922,6 +3016,9 @@ } } +/* + * Write out all preferences for a module. + */ static gboolean write_module_prefs(void *value, void *data) {

@@ -1,7 +1,7 @@ /* proto.c * Routines for protocol tree * - * $Id: proto.c 39586 2011-10-25 23:39:05Z gerald $ + * $Id: proto.c 39940 2011-11-18 17:46:50Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -3849,7 +3849,9 @@ case FT_FRAMENUM: u_integer = fvalue_get_uinteger(&finfo->value); if (hfinfo->strings) { - if (hfinfo->display & BASE_RANGE_STRING) { + if (hfinfo->display & BASE_CUSTOM) { + g_snprintf(result+offset_r, size-offset_r, "%u", u_integer); + } else if (hfinfo->display & BASE_RANGE_STRING) { g_strlcpy(result+offset_r, rval_to_str(u_integer, hfinfo->strings, "%u"), size-offset_r); } else if (hfinfo->display & BASE_EXT_STRING) { g_strlcpy(result+offset_r, val_to_str_ext(u_integer, (value_string_ext *) (hfinfo->strings), "%u"), size-offset_r); @@ -3881,7 +3883,7 @@ offset_r = (int)strlen(result); break; case FT_EUI64: - offset_r += (int)g_strlcpy(result+offset_r, eui64_to_str(fvalue_get_integer64(&finfo->value)), size-offset_r); + offset_r += (int)g_strlcpy(result+offset_r, eui64_to_str(fvalue_get_integer64(&finfo->value)), size-offset_r); break; /* XXX - make these just FT_INT? */ case FT_INT8: @@ -3890,7 +3892,9 @@ case FT_INT32: integer = fvalue_get_sinteger(&finfo->value); if (hfinfo->strings) { - if (hfinfo->display & BASE_RANGE_STRING) { + if (hfinfo->display & BASE_CUSTOM) { + g_snprintf(result+offset_r, size-offset_r, "%d", integer); + } else if (hfinfo->display & BASE_RANGE_STRING) { g_strlcpy(result+offset_r, rval_to_str(integer, hfinfo->strings, "%d"), size-offset_r); } else if (hfinfo->display & BASE_EXT_STRING) { g_strlcpy(result+offset_r, val_to_str_ext(integer, (value_string_ext *) (hfinfo->strings), "%d"), size-offset_r);

@@ -17734,7 +17734,7 @@ { 17710, "michael j van ham" }, { 17711, "Aisai communication technology CO.,LTD" }, { 17712, "TB-Solutions Technologies Software S.L." }, - { 17713, "PipingHot Networks Limited" }, + { 17713, "Cambium Networks Limited (previous was 'PipingHot Networks Limited')" }, { 17714, "ASM Enterprises" }, { 17715, "Mitsukoshi Infomation Service Co.,Ltd." }, { 17716, "Georgia Tech Foundation" }, @@ -22588,7 +22588,7 @@ { 22564, "ULX Ltd." }, { 22565, "Odyss\0303\0251e Syst\0303\0250mes" }, { 22566, "Devoteam" }, - { 22567, "Escola Superior de Tecnologia de Castelo Branco" }, + { 22567, "Instituto Polit\0303\0251cnico de Castelo Branco" }, { 22568, "Redwave Technology Ltd" }, { 22569, "Dynameeting spa" }, { 22570, "Thomas Taeger Datenblatt" }, @@ -25643,7 +25643,7 @@ { 25619, "Ultragreen" }, { 25620, "Ost-West Handelsbank AG" }, { 25621, "Z Microsystems" }, - { 25622, "UKERNA (United Kingdom Education and Research Networking" }, + { 25622, "JANET(UK) (previous was 'UKERNA (United Kingdom Education and Research Networking Association)')" }, { 25623, "OpenVAS" }, { 25624, "Kent School District" }, { 25625, "ChattenAssociates, Inc." }, @@ -38781,7 +38781,7 @@ { 38757, "Sigtec Pty Ltd" }, { 38758, "GrandCapital Ltd." }, { 38759, "Katholieke Hogeschool Limburg" }, - { 38760, "ABC Software, Ltd" }, + { 38760, "Vesel\0304\0253bas ekonomikas centrs (previous was 'ABC Software, Ltd')" }, { 38761, "OSnode" }, { 38762, "Deutsche Rentenversicherung Bund" }, { 38763, "cenhare AG" }, @@ -38882,6 +38882,77 @@ { 38858, "General Micro Systems, Inc" }, { 38859, "Agile Communications, Inc." }, { 38860, "comadot.net" }, + { 38861, "Rudy Gevaert" }, + { 38862, "Erstikalender.info" }, + { 38863, "SiChuan Andi industry co.LTD" }, + { 38864, "Virgin Holidays Ltd" }, + { 38865, "Squadra Technologies" }, + { 38866, "TRIMET ALUMINIUM AG" }, + { 38867, "mecodia GmbH" }, + { 38868, "Comision Nacional de Bancos y Seguros" }, + { 38869, "Alexey S Khromov" }, + { 38870, "Mandiant" }, + { 38871, "Vostokcement Ltd." }, + { 38872, "JSC \"Prompribor\"" }, + { 38873, "Alex Bolgov" }, + { 38874, "ENABIL Solutions Ltd." }, + { 38875, "UnifiedPost S.A." }, + { 38876, "Mork" }, + { 38877, "BPM Advanced Technology Company" }, + { 38878, "s.d.i. s.p.a." }, + { 38879, "tradebridge Pty Ltd" }, + { 38880, "MicroAutomation" }, + { 38881, "Abelium d.o.o." }, + { 38882, "Barron McCann Technology" }, + { 38883, "Phenomic Business Systems Ltd" }, + { 38884, "Electrolux" }, + { 38885, "nPulse Technologies Inc." }, + { 38886, "Societe d'exploitation de Reseaux et de Services Securises (SER2S)" }, + { 38887, "VIS - Verein der Informatik Studierenden" }, + { 38888, "c3pb e.V." }, + { 38889, "Okuejina" }, + { 38890, "Blue Shield of California" }, + { 38891, "Jimma University" }, + { 38892, "Axiovista S.A." }, + { 38893, "Marc Luehr" }, + { 38894, "GROB-WERKE GmbH & Co. KG" }, + { 38895, "sig21 labs" }, + { 38896, "Findaway World" }, + { 38897, "Safegate International AB" }, + { 38898, "La France du Nord au Sud" }, + { 38899, "National Institute Of Weather And Atmopheric Research" }, + { 38900, "Fukuoka University" }, + { 38901, "Landsvirkjun" }, + { 38902, "NovAtel Inc." }, + { 38903, "Malin Space Science Systems" }, + { 38904, "School Specialty, Inc." }, + { 38905, "Timanetworks Inc." }, + { 38906, "Goethe-Universitaet Frankfurt am Main" }, + { 38907, "Zumbox, Inc." }, + { 38908, "Aon Corporation" }, + { 38909, "Linguistic Data Consortium" }, + { 38910, "Xicoy Electronica S.L." }, + { 38911, "McLeod Health" }, + { 38912, "psych0tik.net" }, + { 38913, "QXTN Pty Ltd" }, + { 38914, "JNT SOUND SYSTEM AB" }, + { 38915, "avono AG" }, + { 38916, "Shanghai ekingstar Digital Campus Co,.Ltd." }, + { 38917, "Guangxi Xinhai Communication Technology Co.,Ltd" }, + { 38918, "DEK Technologies Pty Ltd" }, + { 38919, "EPRONA, a.s." }, + { 38920, "SnapTV AS" }, + { 38921, "Capetti Elettronica srl" }, + { 38922, "Hypotecni banka, a.s." }, + { 38923, "iProfs" }, + { 38924, "Damarel Systems International Ltd." }, + { 38925, "PROCENTEC" }, + { 38926, "InnovAction srl" }, + { 38927, "Versile AS" }, + { 38928, "Powel Energy Management AB" }, + { 38929, "Fugro Geos Ltd" }, + { 38930, "@Planet Ltd" }, + { 38931, "Chaz6" }, { 0, NULL} };

@@ -298,8 +298,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: init_wslua.c 39546 2011-10-24 23:43:17Z gerald $ + * $Id: init_wslua.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -53,6 +53,7 @@ static void lua_frame_end(void) { clear_outstanding_Tvb(); + clear_outstanding_TvbRange(); clear_outstanding_Pinfo(); clear_outstanding_Column(); clear_outstanding_Columns();

@@ -7,7 +7,7 @@ * (c) 2007, Tamas Regos <tamas.regos@ericsson.com> * (c) 2008, Balint Reczey <balint.reczey@ericsson.com> * - * $Id: wslua.h 39546 2011-10-24 23:43:17Z gerald $ + * $Id: wslua.h 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -64,6 +64,7 @@ struct _wslua_tvb { tvbuff_t* ws_tvb; gboolean expired; + gboolean need_free; }; struct _wslua_pinfo { @@ -390,6 +391,7 @@ extern Tvb* push_Tvb(lua_State* L, tvbuff_t* tvb); extern void clear_outstanding_Tvb(void); +extern void clear_outstanding_TvbRange(void); extern Pinfo* push_Pinfo(lua_State* L, packet_info* p); extern void clear_outstanding_Pinfo(void);

@@ -5,7 +5,7 @@ * * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: wslua_dumper.c 36751 2011-04-21 13:13:39Z stig $ + * $Id: wslua_dumper.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -175,7 +175,8 @@ static char fname_clean[256]; char* f; - strncpy(fname_clean,fname,256); + g_strlcpy(fname_clean,fname,255); + fname_clean[255] = '\0'; for(f = fname_clean; *f; f++) { switch(*f) {

@@ -6,7 +6,7 @@ * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org> * (c) 2007, Tamas Regos <tamas.regos@ericsson.com> * - * $Id: wslua_proto.c 39689 2011-10-31 16:53:23Z gerald $ + * $Id: wslua_proto.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -568,10 +568,10 @@ /* arrays in LUA start with index number 1 */ if ((guint32)lua_tonumber(L,-2) == 1) - tf.true_string = strdup(lua_tostring(L,-1)); + tf.true_string = g_strdup(lua_tostring(L,-1)); if ((guint32)lua_tonumber(L,-2) == 2) - tf.false_string = strdup(lua_tostring(L,-1)); + tf.false_string = g_strdup(lua_tostring(L,-1)); lua_pop(L, 1); } @@ -1625,6 +1625,7 @@ Pinfo pinfo = checkPinfo(L,4); TreeItem ti = checkTreeItem(L,5); ftenum_t type; + gboolean handled = FALSE; gchar *volatile error = NULL; if (! (dt && tvb && tvb->ws_tvb && pinfo && ti) ) return 0; @@ -1636,22 +1637,24 @@ if (type == FT_STRING) { const gchar* pattern = luaL_checkstring(L,2); - if (!pattern) return 0; + if (!pattern) + handled = TRUE; - if (dissector_try_string(dt->table,pattern,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree)) - return 0; + else if (dissector_try_string(dt->table,pattern,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree)) + handled = TRUE; } else if ( type == FT_UINT32 || type == FT_UINT16 || type == FT_UINT8 || type == FT_UINT24 ) { - int port = luaL_checkint(L, 2); + int port = luaL_checkint(L, 2); - if (dissector_try_uint(dt->table,port,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree)) - return 0; + if (dissector_try_uint(dt->table,port,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree)) + handled = TRUE; } else { - luaL_error(L,"No such type of dissector_table"); + luaL_error(L,"No such type of dissector_table"); } - call_dissector(lua_data_handle,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree); + if (!handled) + call_dissector(lua_data_handle,tvb->ws_tvb,pinfo->ws_pinfo,ti->tree); /* XXX Are we sure about this??? is this the right/only thing to catch */ } CATCH(ReportedBoundsError) {

@@ -7,7 +7,7 @@ * (c) 2008, Balint Reczey <balint.reczey@ericsson.com> * (c) 2009, Stig Bjorlykke <stig@bjorlykke.org> * - * $Id: wslua_tvb.c 37981 2011-07-11 22:22:02Z gerald $ + * $Id: wslua_tvb.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -350,13 +350,49 @@ #define PUSH_TVB(L,t) {g_ptr_array_add(outstanding_Tvb,t);pushTvb(L,t);} #define PUSH_TVBRANGE(L,t) {g_ptr_array_add(outstanding_TvbRange,t);pushTvbRange(L,t);} -CLEAR_OUTSTANDING(Tvb,expired, TRUE) +static void free_Tvb(Tvb tvb) { + if (!tvb) return; + + if (!tvb->expired) { + tvb->expired = TRUE; + } else { + if (tvb->need_free) + tvb_free(tvb->ws_tvb); + g_free(tvb); + } +} + +void clear_outstanding_Tvb(void) { + while (outstanding_Tvb->len) { + Tvb tvb = (Tvb)g_ptr_array_remove_index_fast(outstanding_Tvb,0); + free_Tvb(tvb); + } +} + +static void free_TvbRange(TvbRange tvbr) { + if (!(tvbr && tvbr->tvb)) return; + + if (!tvbr->tvb->expired) { + tvbr->tvb->expired = TRUE; + } else { + free_Tvb(tvbr->tvb); + g_free(tvbr); + } +} + +void clear_outstanding_TvbRange(void) { + while (outstanding_TvbRange->len) { + TvbRange tvbr = (TvbRange)g_ptr_array_remove_index_fast(outstanding_TvbRange,0); + free_TvbRange(tvbr); + } +} Tvb* push_Tvb(lua_State* L, tvbuff_t* ws_tvb) { Tvb tvb = g_malloc(sizeof(struct _wslua_tvb)); tvb->ws_tvb = ws_tvb; tvb->expired = FALSE; + tvb->need_free = FALSE; g_ptr_array_add(outstanding_Tvb,tvb); return pushTvb(L,tvb); } @@ -386,6 +422,7 @@ tvb = g_malloc(sizeof(struct _wslua_tvb)); tvb->ws_tvb = tvb_new_real_data(data, ba->len,ba->len); tvb->expired = FALSE; + tvb->need_free = TRUE; tvb_set_free_cb(tvb->ws_tvb, g_free); add_new_data_source(lua_pinfo, tvb->ws_tvb, name); @@ -409,6 +446,7 @@ if (tvb_offset_exists(tvbr->tvb->ws_tvb, tvbr->offset + tvbr->len -1 )) { tvb = g_malloc(sizeof(struct _wslua_tvb)); tvb->expired = FALSE; + tvb->need_free = FALSE; tvb->ws_tvb = tvb_new_subset(tvbr->tvb->ws_tvb,tvbr->offset,tvbr->len, tvbr->len); PUSH_TVB(L, tvb); return 1; @@ -439,12 +477,7 @@ static int Tvb__gc(lua_State* L) { Tvb tvb = checkTvb(L,1); - if (!tvb) return 0; - - if (!tvb->expired) - tvb->expired = TRUE; - else - g_free(tvb); + free_Tvb(tvb); return 0; @@ -524,10 +557,11 @@ return NULL; } - tvbr = ep_alloc(sizeof(struct _wslua_tvbrange)); + tvbr = g_malloc(sizeof(struct _wslua_tvbrange)); tvbr->tvb = g_malloc(sizeof(struct _wslua_tvb)); tvbr->tvb->ws_tvb = ws_tvb; tvbr->tvb->expired = FALSE; + tvbr->tvb->need_free = FALSE; tvbr->offset = offset; tvbr->len = len; @@ -1082,6 +1116,15 @@ return 0; } +static int TvbRange__gc(lua_State* L) { + TvbRange tvbr = checkTvbRange(L,1); + + free_TvbRange(tvbr); + + return 0; + +} + WSLUA_METHOD TvbRange_len(lua_State* L) { /* Obtain the length of a TvbRange */ TvbRange tvbr = checkTvbRange(L,1); @@ -1091,8 +1134,8 @@ luaL_error(L,"expired tvb"); return 0; } - lua_pushnumber(L,(lua_Number)tvbr->len); - return 1; + lua_pushnumber(L,(lua_Number)tvbr->len); + return 1; } WSLUA_METHOD TvbRange_offset(lua_State* L) { @@ -1104,8 +1147,8 @@ luaL_error(L,"expired tvb"); return 0; } - lua_pushnumber(L,(lua_Number)tvbr->offset); - return 1; + lua_pushnumber(L,(lua_Number)tvbr->offset); + return 1; } @@ -1154,6 +1197,7 @@ {"__tostring", TvbRange__tostring}, {"__concat", wslua__concat}, {"__call", TvbRange_range}, + {"__gc", TvbRange__gc}, { NULL, NULL } };

@@ -3,7 +3,7 @@ * * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org> * - * $Id: wslua_util.c 36751 2011-04-21 13:13:39Z stig $ + * $Id: wslua_util.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -161,7 +161,7 @@ char* f; char* filename; - strncpy(fname_clean,fname,255); + g_strlcpy(fname_clean,fname,255); fname_clean[255] = '\0'; for(f = fname_clean; *f; f++) { @@ -241,18 +241,20 @@ WSLUA_FUNCTION wslua_persconffile_path(lua_State* L) { #define WSLUA_OPTARG_persconffile_path_FILENAME 1 /* A filename */ const char *fname = luaL_optstring(L, WSLUA_OPTARG_persconffile_path_FILENAME,""); - const char* filename = get_persconffile_path(fname,FALSE,FALSE); + char* filename = get_persconffile_path(fname,FALSE,FALSE); lua_pushstring(L,filename); + g_free(filename); WSLUA_RETURN(1); /* The full pathname for a file in the personal configuration directory */ } WSLUA_FUNCTION wslua_datafile_path(lua_State* L) { #define WSLUA_OPTARG_datafile_path_FILENAME 1 /* A filename */ const char *fname = luaL_optstring(L, WSLUA_OPTARG_datafile_path_FILENAME,""); - const char* filename = get_datafile_path(fname); + char* filename = get_datafile_path(fname); lua_pushstring(L,filename); + g_free(filename); WSLUA_RETURN(1); /* The full pathname for a file in wireshark's configuration directory */ }

@@ -320,8 +320,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -462,8 +462,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c 39689 2011-10-31 16:53:23Z gerald $ + * $Id: dfilter_expr_dlg.c 39927 2011-11-18 01:36:07Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -75,8 +75,6 @@ int hfinfo_index; } protocol_data_t; -static GtkWidget *window; - static void show_relations(GtkWidget *relation_list, ftenum_t ftype); static gboolean relation_is_presence_test(const char *string); static void add_relation_list(GtkWidget *relation_list, const char *relation, gboolean sensitive); @@ -911,7 +909,7 @@ GtkWidget * dfilter_expr_dlg_new(GtkWidget *filter_te) { - GtkWidget *main_vb, *main_hb; + GtkWidget *window, *main_vb, *main_hb; GtkWidget *field_vb, *field_tree_lb, *field_tree, *tree_scrolled_win; @@ -936,13 +934,7 @@ GtkListStore *l_store; GtkTreeSelection *l_sel; - if (window != NULL) { - /* There's already an "Expression" dialog box; reactivate it. */ - reactivate_window(window); - return window; - } - - proto_initialize_all_prefixes(); + proto_initialize_all_prefixes(); window = dlg_conf_window_new("Wireshark: Filter Expression"); gtk_window_set_default_size(GTK_WINDOW(window), 500, 400);

@@ -1,6 +1,6 @@ /* main_welcome.c * - * $Id: main_welcome.c 39537 2011-10-24 18:44:00Z gerald $ + * $Id: main_welcome.c 39727 2011-11-03 21:46:00Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -94,7 +94,9 @@ static GSList *status_messages = NULL; +#ifdef USE_THREADS static GMutex *recent_mtx = NULL; +#endif /* The "scroll box dynamic" is a (complicated) pseudo widget to */ /* place a vertically list of widgets in (currently the interfaces and recent files). */ @@ -456,7 +458,9 @@ * most OSes use. */ err = ws_stat64(ri_stat->filename, &stat_buf); +#ifdef USE_THREADS g_mutex_lock(recent_mtx); +#endif ri_stat->err = err; if(err == 0) { if (stat_buf.st_size/1024/1024/1024 > 10) { @@ -482,7 +486,9 @@ } else { ri_stat->stat_done = TRUE; } +#ifdef USE_THREADS g_mutex_unlock(recent_mtx); +#endif return NULL; } @@ -498,8 +504,9 @@ return FALSE; } +#ifdef USE_THREADS g_mutex_lock(recent_mtx); - +#endif if (ri_stat->stat_done) { again = FALSE; gtk_label_set_markup(GTK_LABEL(ri_stat->label), ri_stat->str->str); @@ -514,8 +521,9 @@ ri_stat->timer = 0; } /* Else append some sort of Unicode or ASCII animation to the label? */ +#ifdef USE_THREADS g_mutex_unlock(recent_mtx); - +#endif return again; } @@ -526,7 +534,9 @@ return; } +#ifdef USE_THREADS g_mutex_lock(recent_mtx); +#endif if (ri_stat->timer) { g_source_remove(ri_stat->timer); ri_stat->timer = 0; @@ -541,7 +551,9 @@ } else { ri_stat->label = NULL; } +#ifdef USE_THREADS g_mutex_unlock(recent_mtx); +#endif } /* a file link was pressed */ @@ -1106,7 +1118,9 @@ welcome_eb); gtk_widget_show_all(welcome_scrollw); +#ifdef USE_THREADS recent_mtx = g_mutex_new(); +#endif return welcome_scrollw; }

@@ -274,8 +274,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -2,7 +2,7 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id: make-version.pl 39541 2011-10-24 20:47:40Z gerald $ +# $Id: make-version.pl 39939 2011-11-18 16:52:15Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -22,30 +22,24 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# usage: ./make-version.pl [-p|--package-version] +# See below for usage # -# If "version.conf" is present, it is parsed for configuration values. +# If "version.conf" is present, it is parsed for configuration values. # Possible values are: # # enable - Enable or disable versioning. Zero (0) disables, nonzero # enables. # svn_client - Use svn client i.s.o. ugly internal SVN file hack # format - A strftime() formatted string to use as a template for -# the version string. The sequence "%#" will substitute +# the version string. The sequence "%#" will substitute # the SVN revision number. -# pkg_enable - Enable or disable package versioning. -# pkg_format - Like "format", but used for the package version. -# is_release - Specifies that we're building from a release tarball; -# svnversion.h is not updated. This should be added only -# to the *released* version.conf, not the one used to build -# the release (IOW it should be added by automake's dist-hook). -# -# If run with the "-p" or "--package-version" argument, the -# AC_INIT macro in configure.in and the VERSION macro in -# config.nmake will have the pkg_format template appended to the -# version number. svnversion.h will _not_ be generated if either -# argument is present (it will also not be generated if 'is_release' is set -# in version.conf). +# pkg_enable - Enable or disable local package versioning. +# pkg_format - Like "format", but used for the local package version. +# +# If run with the "-r" or "--set-release" argument the AC_INIT macro in +# configure.in and the VERSION macro in config.nmake will have the +# pkg_format template appended to the version number. svnversion.h will +# _not_ be generated if either argument is present. # # Default configuration: # @@ -63,19 +57,32 @@ use Time::Local; use POSIX qw(strftime); use Getopt::Long; +use Pod::Usage; +use IO::Handle; +use English; my $version_file = 'svnversion.h'; my $package_string = ""; my $vconf_file = 'version.conf'; +my $tortoise_file = "tortoise_template"; my $last_change = 0; my $revision = 0; my $repo_path = "unknown"; -my $pkg_version = 0; +my $get_svn = 0; +my $set_svn = 0; +my $set_version = 0; +my $set_release = 0; my %version_pref = ( - "enable" => 1, - "svn_client" => 1, - "format" => "SVN %Y%m%d%H%M%S", - "is_release" => 0, + "version_major" => 1, + "version_minor" => 6, + "version_micro" => 4, + "version_build" => 0, + + "enable" => 1, + "svn_client" => 1, + "tortoise_svn" => 0, + "format" => "SVN %Y%m%d%H%M%S", + "is_release" => 0, # Normal development builds "pkg_enable" => 1, @@ -102,11 +109,20 @@ my $repo_root = undef; my $repo_url = undef; my $do_hack = 1; + my $info_source = "Unknown"; if ($version_pref{"pkg_enable"}) { $package_format = $version_pref{"pkg_format"}; } + if (-d "$srcdir/.svn") { + $info_source = "Command line (svn info)"; + $svn_info_cmd = "svn info $srcdir"; + } elsif (-d "$srcdir/.git/svn") { + $info_source = "Command line (git-svn)"; + $svn_info_cmd = "(cd $srcdir; git svn info)"; + } + if ($version_pref{"svn_client"}) { eval { use warnings "all"; @@ -132,6 +148,37 @@ if ($last_change && $revision && $repo_url && $repo_root) { $do_hack = 0; } + } elsif ($version_pref{"tortoise_svn"}) { + # Dynamically generic template file needed by TortoiseSVN + open(TORTOISE, ">$tortoise_file"); + print TORTOISE "#define SVNVERSION \"\$WCREV\$\"\r\n"; + print TORTOISE "#define SVNPATH \"\$WCURL\$\"\r\n"; + close(TORTOISE); + + $info_source = "Command line (SubWCRev)"; + $svn_info_cmd = "SubWCRev $srcdir $tortoise_file $version_file"; + my $tortoise = system($svn_info_cmd); + if ($tortoise == 0) { + $do_hack = 0; + } + + #clean up the template file + unlink($tortoise_file); + } + + if ($revision == 0) { + # Fall back to config.nmake + $info_source = "Prodding config.nmake"; + my $filepath = "$srcdir/config.nmake"; + open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!"; + while ($line = <CFGNMAKE>) { + if ($line =~ /^SVN_REVISION=(\d+)/) { + $revision = $1; + $do_hack = 0; + last; + } + } + close (CFGNMAKE); } # 'svn info' failed or the user really wants us to dig around in .svn/entries @@ -140,6 +187,7 @@ if (! open (ENTRIES, "< $srcdir/.svn/entries")) { print ("Unable to open $srcdir/.svn/entries\n"); } else { + $info_source = "Prodding .svn"; # We need to find out whether our parser can handle the entries file $line = <ENTRIES>; chomp $line; @@ -179,116 +227,214 @@ } } - # If we picked up the revision and modification time, + # If we picked up the revision and modification time, # generate our strings. if ($revision && $last_change) { $version_format =~ s/%#/$revision/; $package_format =~ s/%#/$revision/; $package_string = strftime($package_format, gmtime($last_change)); } - + if ($repo_url && $repo_root && index($repo_url, $repo_root) == 0) { $repo_path = substr($repo_url, length($repo_root)); } + + if ($get_svn) { + print <<"Fin"; +SVN revision : $revision +Revision source : $info_source +Release stamp : $package_string +Fin + } } -# Read configure.in, then write it back out with an updated +# Read configure.in, then write it back out with an updated # "AC_INIT" line. sub update_configure_in { my $line; my $contents = ""; my $version = ""; - - return if ($package_string eq ""); - - open(CFGIN, "< configure.in") || die "Can't read configure.in!"; + my $filepath = "$srcdir/configure.in"; + + return if (!$set_version && $package_string eq ""); + + open(CFGIN, "< $filepath") || die "Can't read $filepath!"; while ($line = <CFGIN>) { - if ($line =~ /^AC_INIT\(wireshark, (\d+)\.(\d+).(\d+)/) { - $line = "AC_INIT\(wireshark, $1.$2.$3$package_string)\n"; + if ($line =~ /^AC_INIT\(wireshark, (\d+)\.(\d+).(\d+).*([\r\n]+)$/) { + $line = sprintf("AC_INIT\(wireshark, %d.%d.%d%s)$4", + $set_version ? $version_pref{"version_major"} : $1, + $set_version ? $version_pref{"version_minor"} : $2, + $set_version ? $version_pref{"version_micro"} : $3, + $package_string + ); + } $contents .= $line } - - open(CFGIN, "> configure.in") || die "Can't write configure.in!"; + + open(CFGIN, "> $filepath") || die "Can't write $filepath!"; print(CFGIN $contents); close(CFGIN); - print "configure.in has been updated.\n"; + print "$filepath has been updated.\n"; } -# Read config.nmake, then write it back out with an updated +# Read config.nmake, then write it back out with an updated # "VERSION" line. sub update_config_nmake { my $line; my $contents = ""; my $version = ""; - my $update_ve = 0; - - if ($package_string ne "") { $update_ve = 1; }; - - open(CFGIN, "< config.nmake") || die "Can't read config.nmake!"; - while ($line = <CFGIN>) { - if ($update_ve && $line =~ /^VERSION_EXTRA=/) { - $line = "VERSION_EXTRA=$package_string\n"; + my $filepath = "$srcdir/config.nmake"; + + open(CFGNMAKE, "< $filepath") || die "Can't read $filepath!"; + while ($line = <CFGNMAKE>) { + if ($line =~ /^SVN_REVISION=.*([\r\n]+)$/) { + $line = sprintf("SVN_REVISION=%d$1", $revision); + } elsif ($set_version && $line =~ /^VERSION_MAJOR=.*([\r\n]+)$/) { + $line = sprintf("VERSION_MAJOR=%d$1", $version_pref{"version_major"}); + } elsif ($set_version && $line =~ /^VERSION_MINOR=.*([\r\n]+)$/) { + $line = sprintf("VERSION_MINOR=%d$1", $version_pref{"version_minor"}); + } elsif ($set_version && $line =~ /^VERSION_MICRO=.*([\r\n]+)$/) { + $line = sprintf("VERSION_MICRO=%d$1", $version_pref{"version_micro"}); + } elsif ($line =~ /^VERSION_EXTRA=.*([\r\n]+)$/) { + $line = "VERSION_EXTRA=$package_string$1"; } - if ($line =~ /^VERSION_BUILD=/ && int($revision) > 0) { - $line = "VERSION_BUILD=$revision\n"; + $contents .= $line + } + + open(CFGNMAKE, "> $filepath") || die "Can't write $filepath!"; + print(CFGNMAKE $contents); + close(CFGNMAKE); + print "$filepath has been updated.\n"; +} + +# Read docbook/release_notes.xml, then write it back out with an updated +# "WiresharkCurrentVersion" line. +sub update_release_notes +{ + my $line; + my $contents = ""; + my $version = ""; + my $filepath = "$srcdir/docbook/release-notes.xml"; + + return if (!$set_version); + + open(RELNOTES, "< $filepath") || die "Can't read $filepath!"; + while ($line = <RELNOTES>) { + # <!ENTITY WiresharkCurrentVersion "1.7.1"> + + if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+.*([\r\n]+)$/) { + $line = sprintf("<!ENTITY WiresharkCurrentVersion \"%d.%d.%d\">$1", + $version_pref{"version_major"}, + $version_pref{"version_minor"}, + $version_pref{"version_micro"}, + ); } $contents .= $line } - - open(CFGIN, "> config.nmake") || die "Can't write config.nmake!"; - print(CFGIN $contents); - close(CFGIN); - print "config.nmake has been updated.\n"; + + open(RELNOTES, "> $filepath") || die "Can't write $filepath!"; + print(RELNOTES $contents); + close(RELNOTES); + print "$filepath has been updated.\n"; } +# Read debian/changelog, then write back out an updated version. +sub update_debian_changelog +{ + my $line; + my $contents = ""; + my $version = ""; + my $filepath = "$srcdir/debian/changelog"; + return if ($set_version == 0); + + open(CHANGELOG, "< $filepath") || die "Can't read $filepath!"; + while ($line = <CHANGELOG>) { + if ($set_version && CHANGELOG->input_line_number() == 1) { + $line = sprintf("wireshark (%d.%d.%d) unstable; urgency=low\n", + $version_pref{"version_major"}, + $version_pref{"version_minor"}, + $version_pref{"version_micro"}, + ); + } + $contents .= $line + } + + open(CHANGELOG, "> $filepath") || die "Can't write $filepath!"; + print(CHANGELOG $contents); + close(CHANGELOG); + print "$filepath has been updated.\n"; +} + +# Update distributed files that contain any version information +sub update_versioned_files +{ + &update_configure_in; + &update_config_nmake; + &update_release_notes; + &update_debian_changelog; +} # Print the SVN version to $version_file. # Don't change the file if it is not needed. -sub print_svn_version +sub print_svn_revision { - my $svn_version; + my $svn_revision; my $needs_update = 1; - if ($pkg_version || $version_pref{"is_release"} == 1) { return; } - if ($last_change && $revision) { - $svn_version = "#define SVNVERSION \"SVN Rev " . + $svn_revision = "#define SVNVERSION \"SVN Rev " . $revision . "\"\n" . "#define SVNPATH \"" . $repo_path . "\"\n"; } else { - $svn_version = "#define SVNVERSION \"SVN Rev Unknown\"\n" . + $svn_revision = "#define SVNVERSION \"SVN Rev Unknown\"\n" . "#define SVNPATH \"unknown\"\n"; } - if (open(OLDVER, "<$version_file")) { - my $old_svn_version = <OLDVER> . <OLDVER>; - if ($old_svn_version eq $svn_version) { + if (open(OLDREV, "<$version_file")) { + my $old_svn_revision = <OLDREV> . <OLDREV>; + if ($old_svn_revision eq $svn_revision) { $needs_update = 0; } - close OLDVER; + close OLDREV; } - if ($needs_update == 1) { - # print "Updating $version_file so it contains:\n$svn_version"; + if (! $set_svn) { return; } + + if ($needs_update) { + # print "Updating $version_file so it contains:\n$svn_revision"; open(VER, ">$version_file") || die ("Cannot write to $version_file ($!)\n"); - print VER "$svn_version"; + print VER "$svn_revision"; close VER; print "$version_file has been updated.\n"; } else { - print "$version_file is up-to-date.\n"; + print "$version_file unchanged.\n"; } } # Read values from the configuration file, if it exists. sub get_config { my $arg; + my $show_help = 0; # Get our command-line args - GetOptions("package-version", \$pkg_version); + # XXX - Do we need an option to undo --set-release? + GetOptions( + "help|h", \$show_help, + "get-svn|g", \$get_svn, + "set-svn|s", \$set_svn, + "set-version|v", \$set_version, + "set-release|r|package-version|p", \$set_release + ) || pod2usage(2); + + if ($show_help) { pod2usage(1); } + + if ( !( $show_help || $get_svn || $set_svn || $set_version || $set_release ) ) { + $set_svn = 1; + } if ($#ARGV >= 0) { $srcdir = $ARGV[0] @@ -316,30 +462,54 @@ &get_config(); -if (-d "$srcdir/.svn") { - $svn_info_cmd = "svn info $srcdir"; -} elsif (-d "$srcdir/.git/svn") { - $svn_info_cmd = "git svn info $srcdir"; -} +&read_svn_info(); -if ($svn_info_cmd) { - print "This is a build from SVN (or a SVN snapshot).\n"; - &read_svn_info(); - if ($pkg_version) { - print "Generating package version. Ignoring $version_file\n"; - &update_configure_in; - &update_config_nmake; - } elsif ($version_pref{"enable"} == 0) { - print "Version tag disabled in $vconf_file.\n"; - $last_change = 0; - $revision = 0; +&print_svn_revision; + +if ($set_version || $set_release) { + if ($set_version) { + print "Generating version information\n"; + } + + if ($version_pref{"enable"} == 0) { + print "Release information disabled in $vconf_file.\n"; + $set_release = 0; + } + + if ($set_release) { + print "Generating release information\n"; } else { - print "SVN version tag will be computed.\n"; + print "Resetting release information\n"; + $revision = 0; + $package_string = ""; } -} else { - print "This is not a SVN build.\n"; -} -&print_svn_version; + &update_versioned_files; +} __END__ + +=head1 NAM + +make-version.pl - Get and set build-time version information for Wireshark + +=head1 SYNOPSIS + +make-version.pl [options] [source directory] + + Options: + + --help, -h This help message + --get-svn, -g Print the SVN revision and source. + --set-svn, -s Set the information in svnversion.h + --set-version, -v Set the major, minor, and micro versions in + configure.in, config.nmake, debian/changelog, + and docbook/release_notes.xml. + Resets the release information when used by + itself. + --set-release, -r Set the release information in configure.in + and config.nmake + --package-version, -p Deprecated. Same as --set-release. + +Options can be used in any combination. If none are specified B<--set-svn> +is assumed.

@@ -4,7 +4,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf 39671 2011-10-30 14:33:49Z gerald $ +# $Id: manuf 39819 2011-11-13 15:33:51Z gerald $ # # Laurent Deniel <laurent.deniel [AT] free.fr> # @@ -623,7 +623,7 @@ 00:02:38 SeromeTe # Serome Technology, Inc. 00:02:39 Visicom 00:02:3A ZskStick # ZSK Stickmaschinen GmbH -00:02:3B RedbackN # Redback Networks +00:02:3B Ericsson 00:02:3C Creative # Creative Technology, Ltd. 00:02:3D Cisco # Cisco Systems, Inc. 00:02:3E SeltaTel # Selta Telematica S.p.a @@ -1162,7 +1162,7 @@ 00:04:53 Yottayot # YottaYotta, Inc. 00:04:54 Quadriga # Quadriga UK 00:04:55 AntaraNe # ANTARA.net -00:04:56 Motorola # Motorola PTP Inc +00:04:56 CambiumN # Cambium Networks Limited 00:04:57 Universa # Universal Access Technology, Inc. 00:04:58 FusionX # Fusion X Co., Ltd. 00:04:59 Veristar # Veristar Corporation @@ -2076,7 +2076,7 @@ 00:07:E5 Coup # Coup Corporation 00:07:E6 Edgeflow # edgeflow Canada Inc. 00:07:E7 Freewave # FreeWave Technologies -00:07:E8 StBernar # St. Bernard Software +00:07:E8 Edgewave 00:07:E9 Intel # Intel Corporation 00:07:EA Massana # Massana, Inc. 00:07:EB Cisco # Cisco Systems Inc. @@ -4222,7 +4222,7 @@ 00:10:64 DnpgLlc # DNPG, LLC 00:10:65 Radyne # RADYNE CORPORATION 00:10:66 Advanced # ADVANCED CONTROL SYSTEMS, INC. -00:10:67 RedbackN # REDBACK NETWORKS, INC. +00:10:67 Ericsson 00:10:68 ComosTel # COMOS TELECOM 00:10:69 HeliossC # HELIOSS COMMUNICATIONS, INC. 00:10:6A DigitalM # DIGITAL MICROWAVE CORPORATION @@ -10293,6 +10293,7 @@ 00:33:6C Synapsen # SynapSense Corporation 00:34:F1 RadicomR # Radicom Research, Inc. 00:35:32 Electro- # Electro-Metrics Corporation +00:37:6D MurataMa # Murata Manufacturing Co., Ltd. 00:3A:98 Cisco # Cisco Systems 00:3A:99 Cisco # Cisco Systems 00:3A:9A Cisco # Cisco Systems @@ -10303,7 +10304,7 @@ 00:3C:C5 WonwooEn # WONWOO Engineering Co., Ltd 00:3D:41 Hattelan # Hatteland Computer AS 00:40:00 PciCompo # PCI COMPONENTES DA AMZONIA LTD -00:40:01 ZyxelCom # ZYXEL COMMUNICATIONS, INC. +00:40:01 ZeroOneT # Zero One Technology Co. Ltd. 00:40:02 Perle # PERLE SYSTEMS LIMITED 00:40:03 EmersonP # Emerson Process Management Power & Water Solutions, Inc. 00:40:04 Icm # ICM CO. LTD. @@ -14510,6 +14511,19 @@ 00:50:C2:EC:C0:00/36 Saia-Bur # Saia-Burgess Controls AG 00:50:C2:EC:D0:00/36 PeekTraf # Peek Traffic Corporation 00:50:C2:EC:E0:00/36 EasiiIcA # easii ic adiis +00:50:C2:EC:F0:00/36 TaiwanHi # TAIWAN HIPLUS CORPORATION +00:50:C2:ED:00:00/36 NipponSy # Nippon Systemware Co.,Ltd. +00:50:C2:ED:10:00/36 Arcontia # Arcontia Technology AB +00:50:C2:ED:20:00/36 Klangspe # Klangspektrum GmbH +00:50:C2:ED:30:00/36 EcoMonit # ECO MONITORING UTILITY SYSTEMS LTD +00:50:C2:ED:40:00/36 Tamagawa # TAMAGAWA ELECTRONICS CO.,LTD. +00:50:C2:ED:50:00/36 RflElect # RFL Electronics Inc. +00:50:C2:ED:60:00/36 Cat # Cat AB +00:50:C2:ED:70:00/36 FbtElett # FBT Elettronica spa +00:50:C2:ED:80:00/36 Avocatio # AVocation Systems, Inc. +00:50:C2:ED:90:00/36 Plasmatr # Plasmatronics pty ltd +00:50:C2:ED:A0:00/36 JointSto # Joint Stock Company "Svyaz Inginiring M" +00:50:C2:ED:B0:00/36 BelikSPR # BELIK S.P.R.L. 00:50:C4 Imd 00:50:C5 AdsTechn # ADS Technologies, Inc 00:50:C6 LoopTele # LOOP TELECOMMUNICATION INTERNATIONAL, INC. @@ -16456,6 +16470,7 @@ 00:E6:D3 NixdorfC # NIXDORF COMPUTER CORP. 00:F0:51 Kwb # KWB Gmbh 00:F8:60 PtPanggu # PT. Panggung Electric Citrabuana +00:FA:3B CloosEle # CLOOS ELECTRONIC GMBH 00:FC:58 Websilic # WebSilicon Ltd. 00:FC:70 Intrepid # Intrepid Control Systems, Inc. 01:0E:CF PN-MC # PROFINET Multicast @@ -16729,6 +16744,7 @@ 0C:82:30 Shenzhen # SHENZHEN MAGNUS TECHNOLOGIES CO.,LTD 0C:82:6A WuhanHua # Wuhan Huagong Genuine Optics Technology Co., Ltd 0C:84:11 AOSmithW # A.O. Smith Water Products +0C:85:25 Cisco # Cisco Systems 0C:8D:98 TopEight # TOP EIGHT IND CORP 0C:92:4E RiceLake # Rice Lake Weighing Systems 0C:A4:02 AlcatelL # Alcatel Lucent IPD @@ -16921,6 +16937,7 @@ 1C:95:5D I-LaxEle # I-LAX ELECTRONICS INC. 1C:AA:07 Cisco # Cisco Systems 1C:AF:F7 D-LinkIn # D-LINK INTERNATIONAL PTE LIMITED +1C:B1:7F NecAcces # NEC AccessTechnica, Ltd. 1C:BB:A8 Ojsc"Ufi # OJSC "Ufimskiy Zavod "Promsvyaz" 1C:BD:0E Amplifie # Amplified Engineering Pty Ltd 1C:BD:B9 D-LinkIn # D-LINK INTERNATIONAL PTE LIMITED @@ -16998,6 +17015,7 @@ 24:AF:54 NexgenMe # NEXGEN Mediatech Inc. 24:B6:57 Cisco # Cisco Systems 24:B6:B8 Friem # FRIEM SPA +24:B6:FD Dell # Dell Inc 24:B8:8C Crenus # Crenus Co.,Ltd. 24:B8:D2 OpzoonTe # Opzoon Technology Co.,Ltd. 24:BA:30 Technica # Technical Consumer Products, Inc. @@ -17023,6 +17041,7 @@ 28:0D:FC SonyComp # Sony Computer Entertainment Inc. 28:14:71 Lantis # Lantis co., LTD. 28:16:2E 2wire +28:18:FD AdityaIn # Aditya Infotech Ltd. 28:26:A6 PbrElect # PBR electronics GmbH 28:34:10 EnigmaDi # Enigma Diagnostics Limited 28:37:37 Apple # Apple, Inc. @@ -17051,9 +17070,11 @@ 28:C0:DA JuniperN # Juniper Networks 28:C7:18 Altierre 28:CC:FF Corporac # Corporacion Empresarial Altra SL +28:CD:1C EspotelO # Espotel Oy 28:CD:4C Individu # Individual Computers GmbH 28:CF:DA Apple # Apple Inc 28:D1:AF Nokia # Nokia Corporation +28:D5:76 PremierW # Premier Wireless, Inc. 28:D9:97 YuduanMo # Yuduan Mobile Co., Ltd. 28:E0:2C Apple # Apple, Inc. 28:E2:97 Shanghai # Shanghai InfoTM Microelectronics Co.,Ltd. @@ -17135,6 +17156,7 @@ 30:7E:CB Sfr 30:87:30 HuaweiDe # Huawei Device Co., Ltd 30:8C:FB Dropcam +30:B3:A2 Shenzhen # Shenzhen Heguang Measurement & Control Technology Co.,Ltd 30:DE:86 CedacSof # Cedac Software S.r.l. 30:E4:8E Vodafone # Vodafone UK 30:E4:DB Cisco # Cisco Systems @@ -17168,6 +17190,7 @@ 34:AA:EE Mikrovis # Mikrovisatos Servisas UAB 34:B5:71 Plds 34:BA:51 Se-KureC # Se-Kure Controls, Inc. +34:BA:9A Asiatelc # Asiatelco Technologies Co. 34:BC:A6 BeijingD # Beijing Ding Qing Technology, Ltd. 34:BD:F9 Shanghai # Shanghai WDK Industrial Co.,Ltd. 34:C3:AC SamsungE # Samsung Electronics @@ -17292,7 +17315,7 @@ 40:5F:BE Rim 40:5F:C2 TexasIns # Texas Instruments 40:61:86 Micro-St # MICRO-STAR INT'L CO.,LTD -40:61:8E Hort-Pla # Hort-Plan +40:61:8E Stella-G # Stella-Green Co 40:66:7A Mediola- # mediola - connected living AG 40:6A:AB Rim 40:6C:8F Apple # Apple, Inc. @@ -17415,6 +17438,7 @@ 48:D8:FE ClaridyS # ClarIDy Solutions, Inc. 48:DC:FB Nokia # Nokia Corporation 48:DF:1C WuhanNec # Wuhan NEC Fibre Optic Communications industry Co. Ltd +48:E1:AF Vity 48:EB:30 EternaTe # ETERNA TECHNOLOGY, INC. 48:F3:17 Private 48:F4:7D Techvisi # TechVision Holding Internation Limited @@ -17464,6 +17488,7 @@ 4C:EB:42 IntelCor # Intel Corporate 4C:ED:DE AskeyCom # Askey Computer Corp 4C:F7:37 SamjiEle # SamJi Electronics Co., Ltd +50:00:8C HongKong # Hong Kong Telecommunications (HKT) Limited 50:0B:32 FoxdaTec # Foxda Technology Industrial(ShenZhen)Co.,LTD 50:0E:6D Trafficc # TrafficCast International 50:22:67 Pixelink @@ -17539,6 +17564,7 @@ 58:05:56 Elettron # Elettronica GF S.r.L. 58:16:26 Avaya # Avaya, Inc 58:17:0C SonyEric # Sony Ericsson Mobile Communications AB +58:1D:91 Advanced # Advanced Mobile Telecom co.,ltd. 58:1F:AA Apple # Apple, Inc. 58:1F:EF Tuttnaer # Tuttnaer LTD 58:2E:FE Lighting # Lighting Science Group @@ -17563,6 +17589,7 @@ 58:8D:09 Cisco # Cisco Systems 58:91:CF IntelCor # Intel Corporate 58:92:0D KineticA # Kinetic Avionics Limited +58:93:96 RuckusWi # Ruckus Wireless 58:94:6B IntelCor # Intel Corporate 58:98:35 Technico # Technicolor 58:A7:6F Id # iD corporation @@ -17611,6 +17638,7 @@ 5C:AC:4C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 5C:B5:24 SonyEric # Sony Ericsson Mobile Communications AB 5C:BD:9E Hongkong # HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED +5C:C2:13 FrSauter # Fr. Sauter AG 5C:C6:D0 Skyworth # Skyworth Digital technology(shenzhen)co.ltd. 5C:C9:D3 Palladiu # PALLADIUM ENERGY ELETRONICA DA AMAZONIA LTDA 5C:CA:32 Theben # Theben AG @@ -17699,6 +17727,7 @@ 64:80:8B VgContro # VG Controls, Inc. 64:80:99 Intel # Intel Corporation 64:81:25 Alphatro # Alphatron Marine BV +64:87:88 JuniperN # Juniper Networks 64:87:D7 PirelliB # PIRELLI BROADBAND SOLUTIONS 64:99:5D Lge # LGE 64:9B:24 VTechnol # V Technology Co., Ltd. @@ -17769,6 +17798,7 @@ 68:E4:1F Unglaube # Unglaube Identech GmbH 68:EB:AE SamsungE # Samsung Electronics Co.,Ltd 68:EB:C5 Angstrem # Angstrem Telecom +68:ED:43 Research # Research In Motion 68:EF:BD Cisco # Cisco Systems 68:F1:25 DataCont # Data Controls Inc. 68:F8:95 Redflow # Redflow Limited @@ -17798,6 +17828,7 @@ 6C:9B:02 Nokia # Nokia Corporation 6C:9C:E9 NimbleSt # Nimble Storage 6C:9C:ED Cisco # Cisco Systems +6C:A6:82 EdamInfo # EDAM information & communications 6C:A7:80 Nokia # Nokia Corporation 6C:A9:06 Telefiel # Telefield Ltd 6C:AB:4D DigitalP # Digital Payment Technologies @@ -17825,6 +17856,7 @@ 70:38:EE Avaya # Avaya Inc 70:3A:D8 Shenzhen # Shenzhen Afoundry Electronic Co., Ltd 70:3C:39 SeawingK # SEAWING Kft +70:41:B7 EdwardsL # Edwards Lifesciences LLC 70:46:42 ChyngHon # CHYNG HONG ELECTRONIC CO., LTD. 70:4A:AE XstreamF # Xstream Flow (Pty) Ltd 70:58:12 Panasoni # Panasonic AVC Networks Company @@ -17856,6 +17888,7 @@ 70:D4:F2 Rim 70:D5:7E Scalar # Scalar Corporation 70:D5:E7 Wellcore # Wellcore Corporation +70:D6:B6 MetrumTe # Metrum Technologies 70:D8:80 UposSyst # Upos System sp. z o.o. 70:DD:A1 Tellabs 70:DE:E2 Apple # Apple, Inc. @@ -18082,6 +18115,7 @@ 84:8F:69 Dell # Dell Inc. 84:90:00 Arnold&A # Arnold & Richter Cine Technik 84:97:B8 Memjet # Memjet Inc. +84:A6:C8 IntelCor # Intel Corporate 84:A8:E4 HuaweiDe # Huawei Device Co., Ltd 84:A9:91 CyberTra # Cyber Trans Japan Co.,Ltd. 84:C7:27 Gnodal # Gnodal Ltd @@ -18181,6 +18215,7 @@ 90:00:4E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:01:3B Sagemcom 90:02:A9 Zhejiang # ZHEJIANG DAHUA TECHNOLOGY CO.,LTD +90:03:B7 Parrot 90:09:17 Far-Sigh # Far-sighted mobile 90:0D:66 Digimore # Digimore Electronics Co., Ltd 90:18:5E ApexTool # Apex Tool Group GmbH & Co OHG @@ -18188,6 +18223,7 @@ 90:19:00 ScsSa # SCS SA 90:21:55 Htc # HTC Corporation 90:27:E4 Apple +90:2B:34 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 90:2E:87 Labjack 90:34:2B Gatekeep # Gatekeeper Systems, Inc. 90:34:FC HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -18222,6 +18258,7 @@ 90:A7:C1 PakedgeD # Pakedge Device and Software Inc. 90:B8:D0 Joyent # Joyent, Inc. 90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota +90:C1:15 SonyEric # Sony Ericsson Mobile Communications AB 90:CF:15 Nokia # Nokia Corporation 90:D1:1B PalomarM # Palomar Medical Technologies 90:D7:4F Bookeen @@ -18243,6 +18280,7 @@ 94:1D:1C TlabWest # TLab West Systems AB 94:20:53 Nokia # Nokia Corporation 94:23:6E Shenzhen # Shenzhen Junlan Electronic Ltd +94:2E:17 Schneide # Schneider Electric Canada Inc 94:2E:63 Finsécur 94:31:9B Alphatro # Alphatronics BV 94:33:DD TacoElec # Taco Electronic Solutions, Inc. @@ -18359,6 +18397,7 @@ 9C:A3:BA SakuraIn # SAKURA Internet Inc. 9C:AD:EF ObihaiTe # Obihai Technology, Inc. 9C:AF:CA Cisco # Cisco Systems +9C:B0:08 Ubiquito # Ubiquitous Computing Technology Corporation 9C:B2:06 Procente # PROCENTEC 9C:B7:0D LiteonTe # Liteon Technology Corporation 9C:C0:77 Printcou # PrintCounts, LLC @@ -18393,6 +18432,7 @@ A0:5A:A4 GrandPro # Grand Products Nevada, Inc. A0:5D:C1 Tmct # TMCT Co., LTD. A0:5D:E7 Directv # DIRECTV, Inc. +A0:5E:6B Melper # MELPER Co., Ltd. A0:69:86 WellavTe # Wellav Technologies Ltd A0:6A:00 Verilink # Verilink Corporation A0:6C:EC Rim @@ -18472,6 +18512,7 @@ A8:26:D9 Htc # HTC Corporation A8:39:44 Actionte # Actiontec Electronics, Inc A8:40:41 DraginoT # Dragino Technology Co., Limited +A8:49:A5 Lisantec # Lisantech Co., Ltd. A8:55:6A Pocketne # Pocketnet Technology Inc. A8:5B:B0 Shenzhen # Shenzhen Dehoo Technology Co.,Ltd A8:5B:F3 Audivo # Audivo GmbH @@ -18480,6 +18521,7 @@ A8:63:F2 TexasIns # Texas Instruments A8:6A:6F Rim A8:70:A5 Unicomm # UniComm Inc. +A8:77:6F Zonoff A8:7B:39 Nokia # Nokia Corporation A8:7E:33 NokiaDan # Nokia Danmark A/S A8:87:92 Broadban # Broadband Antenna Tracking Systems @@ -18660,6 +18702,7 @@ B8:8E:3A Infinite # Infinite Technologies JLT B8:92:1D BgT&Amp; # BG T&A B8:94:D2 RetailIn # Retail Innovation HTT AB +B8:96:74 Alldsp&A # AllDSP GmbH & Co. KG B8:97:5A BiostarM # BIOSTAR Microtech Int'l Corp. B8:9A:ED Oceanser # OceanServer Technology, Inc B8:9B:C9 SmcNetwo # SMC Networks Inc @@ -18723,11 +18766,13 @@ BC:AE:C5 AsustekC # ASUSTek COMPUTER INC. BC:B1:81 Sharp # SHARP CORPORATION BC:B1:F3 SamsungE # Samsung Electronics +BC:B8:52 Cybera # Cybera, Inc. BC:BB:C9 Kellendo # Kellendonk Elektronik GmbH BC:C6:1A SpectraE # SPECTRA EMBEDDED SYSTEMS BC:CD:45 Voismart BC:D5:B6 D2dTechn # d2d technologies BC:E0:9D Eoslink +BC:E5:9F Waterwor # WATERWORLD Technology Co.,LTD BC:F2:AF Devolo # devolo AG BC:FE:8C Altronic # Altronic, LLC BC:FF:AC Topcon # TOPCON CORPORATION @@ -18762,6 +18807,7 @@ C0:CB:38 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C0:CF:A3 Creative # Creative Electronics & Software, Inc. C0:D0:44 Sagemcom +C0:D9:62 AskeyCom # Askey Computer Corp. C0:E4:22 TexasIns # Texas Instruments C0:E5:4E DenxComp # DENX Computer Systems GmbH C0:EA:E4 Sonicwal # Sonicwall @@ -18794,6 +18840,7 @@ C4:7D:4F Cisco # Cisco Systems C4:82:3F FujianNe # Fujian Newland Auto-ID Tech. Co,.Ltd. C4:85:08 Intel # Intel Corporation +C4:93:00 8devices C4:93:13 100fioNe # 100fio networks technology llc C4:AA:A1 SummitDe # SUMMIT DEVELOPMENT, spol.s r.o. C4:B5:12 GeneralE # General Electric Digital Energy @@ -18828,6 +18875,7 @@ C8:6C:87 ZyxelCom # Zyxel Communications Corp C8:6C:B6 Optcom # Optcom Co., Ltd. C8:72:48 AplicomO # Aplicom Oy +C8:7B:5B Zte # zte corporation C8:7C:BC Valink # Valink Co., Ltd. C8:7D:77 Shenzhen # Shenzhen Kingtech Communication Equipment Co.,Ltd C8:7E:75 SamsungE # Samsung Electronics Co.,Ltd @@ -18891,6 +18939,7 @@ CC:7E:E7 Panasoni # Panasonic AVC Networks Company CC:8C:E3 TexasIns # Texas Instruments CC:90:93 HansongT # Hansong Tehnologies +CC:94:4A Pfeiffer # Pfeiffer Vacuum GmbH CC:96:A0 HuaweiDe # Huawei Device Co., Ltd CC:9E:00 Nintendo # Nintendo Co., Ltd. CC:A3:74 Guangdon # Guangdong Guanglian Electronic Technology Co.Ltd @@ -18970,6 +19019,7 @@ D4:2C:3D SkyLight # Sky Light Digital Limited D4:3A:E9 Dongguan # DONGGUAN ipt INDUSTRIAL CO., LTD D4:3D:67 CarmaInd # Carma Industries Inc. +D4:43:A8 Changzho # Changzhou Haojie Electric Co., Ltd. D4:4B:5E TaiyoYud # TAIYO YUDEN CO., LTD. D4:4C:24 Vuppalam # Vuppalamritha Magnetic Components LTD D4:4C:A7 Informte # Informtekhnika & Communication, LLC @@ -19022,6 +19072,7 @@ D8:05:2E Skyviia # Skyviia Corporation D8:1B:FE Twinlinx # TWINLINX CORPORATION D8:1C:14 Compacta # Compacta International, Ltd. +D8:24:BD Cisco # Cisco Systems D8:26:B9 Guangdon # Guangdong Coagent Electronics S &T Co., Ltd. D8:28:C9 GeneralE # General Electric Consumer and Industrial D8:29:86 BestWish # Best Wish Technology LTD @@ -19037,6 +19088,7 @@ D8:71:57 LenovoMo # Lenovo Mobile Communication Technology Ltd. D8:75:33 Nokia # Nokia Corporation D8:76:0A Escort # Escort, Inc. +D8:78:E5 KuhnSa # KUHN SA D8:79:88 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. D8:95:2F TexasIns # Texas Instruments D8:96:85 Gopro @@ -19049,6 +19101,7 @@ D8:B1:2A Panasoni # Panasonic Mobile Communications Co., Ltd. D8:B3:77 Htc # HTC Corporation D8:B6:C1 Networka # NetworkAccountant, Inc. +D8:B9:0E TripleDo # Triple Domain Vision Co.,Ltd. D8:C0:68 Netgenet # Netgenetech.co.,ltd. D8:C3:FB Detracom D8:C7:C8 ArubaNet # Aruba Networks @@ -19086,6 +19139,7 @@ DC:9F:DB Ubiquiti # Ubiquiti Networks, Inc. DC:A6:BD BeijingL # Beijing Lanbo Technology Co., Ltd. DC:A7:D9 Compress # Compressor Controls Corp +DC:A8:CF NewSpinG # New Spin Golf, LLC. DC:A9:71 IntelCor # Intel Corporate DC:B4:C4 Microsof # Microsoft XCG DC:C1:01 SolidTec # SOLiD Technologies, Inc. @@ -19162,6 +19216,7 @@ E4:1F:13 Ibm # IBM Corp E4:27:71 Smartlab # Smartlabs E4:2A:D3 MagnetiM # Magneti Marelli S.p.A. Powertrain +E4:2C:56 Lilee # Lilee Systems, Ltd. E4:2F:F6 UnicoreC # Unicore communication Inc. E4:35:93 Hangzhou # Hangzhou GoTo technology Co.Ltd E4:35:FB SabreTec # Sabre Technology (Hull) Ltd @@ -19286,6 +19341,7 @@ EC:F2:36 Neomonta # NEOMONTANA ELECTRONICS EC:FA:AA Ims # The IMS Company EC:FE:7E Blueradi # BlueRadios, Inc. +F0:00:7F Janz-Con # Janz - Contadores de Energia, SA F0:02:2B Chrontel F0:02:48 Smartebu # SmarteBuilding F0:08:F1 SamsungE # Samsung Electronics Co.,Ltd @@ -19441,6 +19497,7 @@ FC:35:98 Favite # Favite Inc. FC:44:63 Universa # Universal Audio FC:45:5F JiangxiS # JIANGXI SHANSHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD +FC:4D:D4 Universa # Universal Global Scientific Industrial Co., Ltd. FC:5B:24 WeibelSc # Weibel Scientific A/S FC:61:98 NecPerso # NEC Personal Products, Ltd FC:68:3E Directed # Directed Perception, Inc @@ -19473,7 +19530,7 @@ # # Well-known addresses. # -# $Id: manuf 39671 2011-10-30 14:33:49Z gerald $ +# $Id: manuf 39819 2011-11-13 15:33:51Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald [AT] wireshark.org>

@@ -250,8 +250,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.6.3, Copyright 1998-2011 Wireshark Development Team</string> + <string>1.6.4, Copyright 1998-2011 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Wireshark.icns</string> <key>CFBundleIdentifier</key> @@ -42,11 +42,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.6.3</string> + <string>1.6.4</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.6.3</string> + <string>1.6.4</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2011 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>

@@ -242,8 +242,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -241,8 +241,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -250,8 +250,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -242,8 +242,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@

@@ -273,8 +273,6 @@ STRPTIME_LO = @STRPTIME_LO@ USE_PROFILE_BUILD_FALSE = @USE_PROFILE_BUILD_FALSE@ USE_PROFILE_BUILD_TRUE = @USE_PROFILE_BUILD_TRUE@ -USE_THREADS_FALSE = @USE_THREADS_FALSE@ -USE_THREADS_TRUE = @USE_THREADS_TRUE@ VERSION = @VERSION@ XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@