Changes - j0ke.net Open Build Service

Changes of Revision 15

[-] [+]	Changed	wireshark.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Nov 2 09:40:17 UTC 2013 - cs@linux-administrator.com + +- update to release 1.8.11 + +------------------------------------------------------------------- Fri Sep 13 20:09:45 UTC 2013 - cs@linux-administrator.com - update to release 1.8.10
[-] [+]	Changed	wireshark.spec ^
@@ -22,7 +22,7 @@ License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.8.10 +Version: 1.8.11 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
[-] [+]	Deleted	wireshark-1.8.10.tar.bz2/docbook/release-notes.xml ^
@@ -1,404 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - -<!-- $Id: release-notes.xml 51932 2013-09-10 15:55:18Z gerald $ --> - -<!-- -DOCUMENT SECTION --Use this section to encode all document information ---> - -<!-- -Wireshark Info ---> -<!ENTITY WiresharkCurrentVersion "1.8.10"> - -]> - -<article> - <title>Wireshark &WiresharkCurrentVersion; Release Notes</title> - - <section id="WhatIs"><title>What is Wireshark?</title> - <para> - Wireshark is the world's most popular network protocol analyzer. It - is used for troubleshooting, analysis, development and education. - </para> - </section> - - <section id="WhatsNew"><title>What's New</title> - <section id="BugFixes"><title>Bug Fixes</title> - - <para> - - The following vulnerabilities have been fixed. - <itemizedlist> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2013-55.html">wnpa-sec-2013-55</ulink> - </para> - <para> - The NBAP dissector could crash. Discovered by Laurent Butti. - <!-- Fixed in trunk: r51195 --> - <!-- Fixed in trunk-1.10: r51228 --> - <!-- Fixed in trunk-1.8: r51230 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005">Bug - 9005</ulink>) - </para> - <para>Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-????">CVE-2013-????</ulink> - </para> - --> - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2013-56.html">wnpa-sec-2013-56</ulink> - </para> - <para> - The ASSA R3 dissector could go into an infinite loop. Discovered by Ben Schmidt. - <!-- Fixed in trunk: r51196 --> - <!-- Fixed in trunk-1.10: r51231 --> - <!-- Fixed in trunk-1.8: r51232 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9020">Bug 9020 - </ulink>) - </para> - <para>Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-????">CVE-2013-????</ulink> - </para> - --> - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2013-57.html">wnpa-sec-2013-57</ulink> - </para> - <para> - The RTPS dissector could overflow a buffer. Discovered by Ben Schmidt. - <!-- Fixed in trunk: r51213 --> - <!-- Fixed in trunk-1.10: r51623 --> - <!-- Fixed in trunk-1.8: r51624 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9019">Bug 9019 - </ulink>) - </para> - <para>Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-????">CVE-2013-????</ulink> - </para> - --> - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2013-58.html">wnpa-sec-2013-58</ulink> - </para> - <para> - The MQ dissector could crash. - <!-- Fixed in trunk: r51603 --> - <!-- Fixed in trunk-1.10: r51623 --> - <!-- Fixed in trunk-1.8: r51624 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9079">Bug 9079 - </ulink>) - </para> - <para>Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-????">CVE-2013-????</ulink> - </para> - --> - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2013-59.html">wnpa-sec-2013-59</ulink> - </para> - <para> - The LDAP dissector could crash. - <!-- Fixed in trunk: r51516 --> - <!-- Fixed in trunk-1.10: r51623 --> - <!-- Fixed in trunk-1.8: r51624 --> - <!-- (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=">Bug - </ulink>) --> - </para> - <para>Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-????">CVE-2013-????</ulink> - </para> - --> - </listitem> - - <listitem> - <para> - <ulink url="http://www.wireshark.org/security/wnpa-sec-2013-60.html">wnpa-sec-2013-60</ulink> - </para> - <para> - The Netmon file parser could crash. Discovered by G. Geshev. - <!-- Fixed in trunk: r49673 --> - <!-- Fixed in trunk-1.10: r51910 --> - <!-- Fixed in trunk-1.8: r51911 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8742">Bug 8742 - </ulink>) - </para> - <para>Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-????">CVE-2013-????</ulink> - </para> - --> - </listitem> - - - </itemizedlist> - </para> - - <para> - - The following bugs have been fixed: - - <itemizedlist> - -<!-- Sort by bug # --> -<!-- - <listitem><para> - Wireshark will strip the paint off your car, then apply a hideous - flame job to the hood and fenders using gray, red, and black primer. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=0000">Bug - 0000</ulink>) - </para></listitem> ---> - - <listitem><para> - Lua ByteArray:append() causes wireshark crash. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4461">Bug - 4461</ulink>) - </para></listitem> - - <listitem><para> - Lua script can not get "data-text-lines" protocol data. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5200">Bug - 5200</ulink>) - </para></listitem> - - <listitem><para> - PER normally small non-negative whole number decoding is wrong when >= 64. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8841">Bug - 8841</ulink>) - </para></listitem> - - <listitem><para> - Incorrect parsing of IPFIX *IpTotalLength elements. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8918">Bug - 8918</ulink>) - </para></listitem> - - <listitem><para> - IO graph/advanced, max/min/summ error on frames with multiple Diameter messages. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8980">Bug - 8980</ulink>) - </para></listitem> - - <listitem><para> - Wireshark fails to decode single-line, multiple Contact: URIs in SIP responses. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031">Bug - 9031</ulink>) - </para></listitem> - - <listitem><para> - Dissector for EtherCAT: ADS highlighting in the Packet Bytes Pane is incorrect. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036">Bug - 9036</ulink>) - </para></listitem> - - <listitem><para> - 802.11 HT Extended Capabilities B10 decode incorrect. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9038">Bug - 9038</ulink>) - </para></listitem> - - <listitem><para> - Weird malformed HTTP error. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101">Bug - 9101</ulink>) - </para></listitem> - - </itemizedlist> - - </para> - - </section> - - <section id="NewFeatures"><title>New and Updated Features</title> - <para> - -There are no new features in this release. - - </para> - </section> - - <section id="NewProtocols"><title>New Protocol Support</title> - <para> - -There are no new protocols in this release. - - </para> - </section> - - <section id="UpdatedProtocols"><title>Updated Protocol Support</title> <para> - -<!-- Sort alphabetically --> - -ASSA R3, -EtherCAT AMS, -GTPv2, -HTTP, -IEEE 802.11, -IPFIX, -LDAP, -MQ, -NBAP, -NCP SSS, -RTPS, -SIP, - - </para> - </section> - - <section id="NewCapture"><title>New and Updated Capture File Support</title> - <para> - -. - - </para> - </section> - - </section> - - <section id="GettingWireshark"><title>Getting Wireshark</title> - <para> - Wireshark source code and installation packages are available from - <ulink url="http://www.wireshark.org/download.html">http://www.wireshark.org/download.html</ulink>. - </para> - - <section id="VendorPackages"><title>Vendor-supplied Packages</title> - <para> - Most Linux and Unix vendors supply their own Wireshark packages. - You can usually install or upgrade Wireshark using the package management - system specific to that platform. A list of third-party packages - can be found on the - <ulink url="http://www.wireshark.org/download.html#thirdparty">download page</ulink> - on the Wireshark web site. - </para> - </section> - - </section> - - <!-- XXX needs to be written - <section id="RemovingWireshark"><title>Removing Wireshark</title> - <para> - </para> - </section> - --> - - <section id="FileLocations"><title>File Locations</title> - <para> - Wireshark and TShark look in several different locations for - preference files, plugins, SNMP MIBS, and RADIUS dictionaries. - These locations vary from platform to platform. You can use - About→Folders to find the default locations on your system. - </para> - </section> - - <section id="KnownProblems"><title>Known Problems</title> - - <para> - Dumpcap might not quit if Wireshark or TShark crashes. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419">Bug - 1419</ulink>) - </para> - - <para> - The BER dissector might infinitely loop. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516">Bug - 1516</ulink>) - </para> - - <para> - Capture filters aren't applied when capturing from named pipes. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814">Bug - 1814</ulink>) - </para> - - <para> - Filtering tshark captures with display filters (-R) no longer works. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234">Bug - 2234</ulink>) - </para> - - <para> - The 64-bit Windows installer does not support Kerberos decryption. - (<ulink url="https://wiki.wireshark.org/Development/Win64">Win64 - development page</ulink>) - </para> - - <para> - Application crash when changing real-time option. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035">Bug - 4035</ulink>) - </para> - - <para> - Hex pane display issue after startup. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056">Bug - 4056</ulink>) - </para> - - <para> - Packet list rows are oversized. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357">Bug - 4357</ulink>) - </para> - - <para> - Summary pane selected frame highlighting not maintained. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445">Bug - 4445</ulink>) - </para> - - <para> - Wireshark and TShark will display incorrect delta times in some cases. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985">Bug - 4985</ulink>) - </para> - - </section> - - <section id="GettingHelp"><title>Getting Help</title> - <para> - Community support is available on - <ulink url="http://ask.wireshark.org/">Wireshark's Q&A site</ulink> - and on the wireshark-users mailing list. - Subscription information and archives for all of Wireshark's mailing - lists can be found on <ulink url="http://www.wireshark.org/lists/">the - web site</ulink>. - </para> - <para> - Official Wireshark training and certification are available from - <ulink url="http://www.wiresharktraining.com/">Wireshark University</ulink>. - </para> - </section> - - <section id="FAQ"><title>Frequently Asked Questions</title> - <para> - A complete FAQ is available on the - <ulink url="http://www.wireshark.org/faq.html">Wireshark web site</ulink>. - </para> - </section> - -</article>
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ChangeLog ^
@@ -1 +1,589 @@ ------------------------------------------------------------------------ +r51941 \| gerald \| 2013-09-10 13:02:31 -0700 (Tue, 10 Sep 2013) \| 2 lines +Changed paths: + M /trunk-1.8/ChangeLog + M /trunk-1.8/docbook/release-notes.xml + M /trunk-1.8/make-version.pl + +1.8.10 → 1.8.11. + +------------------------------------------------------------------------ +r52059 \| gerald \| 2013-09-15 07:34:57 -0700 (Sun, 15 Sep 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + M /trunk-1.8/services + +[Automatic manuf, services and enterprise-numbers update for 2013-09-15] +------------------------------------------------------------------------ +r52171 \| gerald \| 2013-09-22 07:34:54 -0700 (Sun, 22 Sep 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + M /trunk-1.8/services + +[Automatic manuf, services and enterprise-numbers update for 2013-09-22] +------------------------------------------------------------------------ +r52174 \| eapache \| 2013-09-22 09:50:24 -0700 (Sun, 22 Sep 2013) \| 3 lines +Changed paths: + M /trunk-1.8/epan/dissectors/packet-gluster.h + M /trunk-1.8/epan/dissectors/packet-glusterfs.c + +Manual backport of r52142 and r52144 to fix collision between gluster defines +and system header dirent.h + +------------------------------------------------------------------------ +r52196 \| eapache \| 2013-09-23 16:38:34 -0700 (Mon, 23 Sep 2013) \| 13 lines +Changed paths: + M /trunk-1.8/epan/reassemble.c + +Manual backport of r52195 from trunk-1.10: + +Replace r51826 with a slightly different backport fix for +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9027 +that doesn't leak memory. I thought the leaks would be pretty minor and not +worth worrying about, but +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9169 +showed otherwise. + +Major thanks to Jakub for figuring out we could create a dummy TVB hooked up to +the parent, even though the 1.8 reassembly code doesn't know about the real +child TVB. + +------------------------------------------------------------------------ +r52200 \| eapache \| 2013-09-23 18:50:23 -0700 (Mon, 23 Sep 2013) \| 7 lines +Changed paths: + M /trunk-1.8/epan/dissectors/packet-ntlmssp.c + +Simply don't store (or look for) the conversation struct in the packet proto +data, since it leads to mis-casts and bad corruptions. This is effectively a +backport for Jeff's r50734 fixing +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8941 +but since we don't have the index count for p_add_proto_data I had to go through +and prove to myself that the entire thing can be safely removed. + +------------------------------------------------------------------------ +r52240 \| guy \| 2013-09-28 10:47:45 -0700 (Sat, 28 Sep 2013) \| 9 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/wiretap/pcapng.c + +Copy over r52238 from trunk: + + ------------------------------------------------------------------------ + r52238 \| guy \| 2013-09-28 10:44:50 -0700 (Sat, 28 Sep 2013) \| 4 lines + + There's no interface ID in a Simple Packet Block. + + Fixes one problem found by the file in bug 9200. + +------------------------------------------------------------------------ +r52243 \| guy \| 2013-09-28 11:12:50 -0700 (Sat, 28 Sep 2013) \| 17 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/wiretap/pcapng.c + +Copy over r52241 from trunk, with manual intervention: + + ------------------------------------------------------------------------ + r52241 \| guy \| 2013-09-28 11:03:20 -0700 (Sat, 28 Sep 2013) \| 12 lines + + In a Simple Packet Block, the captured length isn't the block length + minus the lengths of the two length fields and the packet length field, + it's the minimum of that and the packet length, as there might be + padding. + + Fixes one problem found by the file in bug 9200. + + While we're at it, pcapng_read_packet_block() and + pcapng_read_simple_packet_block() return an integer, not a Boolean; + return 0, not FALSE (they have the same value, but returning 0 makes it + clearer that the return value isn't restricted to TRUE or FALSE). + +------------------------------------------------------------------------ +r52246 \| guy \| 2013-09-28 11:26:58 -0700 (Sat, 28 Sep 2013) \| 11 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/wiretap/pcapng.c + +Copy over r52244 from trunk: + + ------------------------------------------------------------------------ + r52244 \| guy \| 2013-09-28 11:25:07 -0700 (Sat, 28 Sep 2013) \| 6 lines + + Correctly calculate the captured length in a Simple Packet Block - + subtract out the minimum SPB size, which includes the length of + everything except for the packet data. + + Fixes one problem found by the file in bug 9200. + +------------------------------------------------------------------------ +r52249 \| guy \| 2013-09-28 12:27:55 -0700 (Sat, 28 Sep 2013) \| 9 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/wiretap/pcapng.c + +Copy over r52247 from trunk: + + ------------------------------------------------------------------------ + r52247 \| guy \| 2013-09-28 12:26:23 -0700 (Sat, 28 Sep 2013) \| 4 lines + + Fix cut-and-pasteo. + + Finishes the fix for bug 9200. + +------------------------------------------------------------------------ +r52252 \| guy \| 2013-09-28 13:11:56 -0700 (Sat, 28 Sep 2013) \| 15 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/wiretap/pcapng.c + +Copy over r52250 from trunk: + + ------------------------------------------------------------------------ + r52250 \| guy \| 2013-09-28 13:08:39 -0700 (Sat, 28 Sep 2013) \| 10 lines + + Actually, the captured length must be the minimum of: + + the number of bytes available for packet data in the block; + + the packet length; + + and the snapshot length for the interface. + + One more fix for bug 9200, so it should now be fixed. + +------------------------------------------------------------------------ +r52255 \| guy \| 2013-09-28 14:08:49 -0700 (Sat, 28 Sep 2013) \| 8 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/wiretap/pcapng.c + +Copy over r52253 from trunk: + + ------------------------------------------------------------------------ + r52253 \| guy \| 2013-09-28 14:06:17 -0700 (Sat, 28 Sep 2013) \| 3 lines + + The pcap-ng spec says the captured length is the minimum of the + interface snapshot length and the packet length; make it so. + +------------------------------------------------------------------------ +r52259 \| guy \| 2013-09-28 14:32:08 -0700 (Sat, 28 Sep 2013) \| 2 lines +Changed paths: + M /trunk-1.8/docbook/release-notes.xml + +Mention bug 9200 being fixed. + +------------------------------------------------------------------------ +r52267 \| gerald \| 2013-09-29 07:34:51 -0700 (Sun, 29 Sep 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + +[Automatic manuf, services and enterprise-numbers update for 2013-09-29] +------------------------------------------------------------------------ +r52326 \| guy \| 2013-10-01 14:55:57 -0700 (Tue, 01 Oct 2013) \| 3 lines +Changed paths: + M /trunk-1.8/packaging/macosx/Read_me_first.rtf + +We install the wrapper scripts for the command-line tools in +/usr/local/bin, not in /Library/Wireshark. + +------------------------------------------------------------------------ +r52402 \| gerald \| 2013-10-06 07:35:01 -0700 (Sun, 06 Oct 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + +[Automatic manuf, services and enterprise-numbers update for 2013-10-06] +------------------------------------------------------------------------ +r52466 \| pascal \| 2013-10-09 09:08:55 -0700 (Wed, 09 Oct 2013) \| 9 lines +Changed paths: + M /trunk-1.8/epan/dissectors/packet-wccp.c + +Copy over manually from the trunk: +------------------------------------------------------------------------ +r52464 \| pascal \| 2013-10-09 18:07:24 +0200 (mer., 09 oct. 2013) \| 3 lines + +From Peter Van Eynde via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9252 : +Fix WCCP fix hash buckets assignment info decoding + +------------------------------------------------------------------------ + +------------------------------------------------------------------------ +r52491 \| eapache \| 2013-10-10 06:10:47 -0700 (Thu, 10 Oct 2013) \| 21 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/epan/dissectors/packet-openwire.c + +Copy over from trunk to pacify the fuzzbot and so Michael's patch backports +cleanly + + ------------------------------------------------------------------------ + r52458 \| eapache \| 2013-10-08 19:16:53 -0400 (Tue, 08 Oct 2013) \| 10 lines + Changed paths: + M /trunk/epan/dissectors/packet-openwire.c + + Hacky fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248 + Just break out of the loop if offset doesn't go up. + + There's almost certainly a better fix - the dissector is weird, and I'm not sure + if all the _length_remaining() checks are important or legacy, and what affect + they have on this issue. + + At the very least this will pacify the fuzzbots until somebody has time to + figure it out properly. + + ------------------------------------------------------------------------ + + +------------------------------------------------------------------------ +r52547 \| morriss \| 2013-10-11 11:18:56 -0700 (Fri, 11 Oct 2013) \| 9 lines +Changed paths: + M /trunk-1.8/epan/dissectors/packet-ncp-sss.c + +Copy over with manual intervention (to eliminate imlicit declaration warning): + + ------------------------------------------------------------------------ + r51451 \| darkjames \| 2013-08-21 13:01:05 -0400 (Wed, 21 Aug 2013) \| 2 lines + + small fix for r51448 isprint() is locale aware, we want just ascii + ------------------------------------------------------------------------ + + +------------------------------------------------------------------------ +r52586 \| gerald \| 2013-10-13 07:34:52 -0700 (Sun, 13 Oct 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + M /trunk-1.8/services + +[Automatic manuf, services and enterprise-numbers update for 2013-10-13] +------------------------------------------------------------------------ +r52714 \| gerald \| 2013-10-20 07:34:51 -0700 (Sun, 20 Oct 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + +[Automatic manuf, services and enterprise-numbers update for 2013-10-20] +------------------------------------------------------------------------ +r52892 \| gerald \| 2013-10-27 07:35:00 -0700 (Sun, 27 Oct 2013) \| 1 line +Changed paths: + M /trunk-1.8/manuf + M /trunk-1.8/services + +[Automatic manuf, services and enterprise-numbers update for 2013-10-27] +------------------------------------------------------------------------ +r52956 \| gerald \| 2013-10-29 11:37:57 -0700 (Tue, 29 Oct 2013) \| 19 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/docbook/release-notes.xml + M /trunk-1.8/epan/dissectors/packet-ieee802154.c + +Copy over revisions from the trunk: + + ------------------------------------------------------------------------ + r52036 \| eapache \| 2013-09-14 06:15:31 -0700 (Sat, 14 Sep 2013) \| 8 lines + Changed paths: + M /trunk/epan/dissectors/packet-ieee802154.c + + _lookup_extended takes a pointer to the key-pointer since it has to set the old + key pointer value. _insert just takes the key-pointer, not a pointer to it. + Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a + struct (when it in fact points to a pointer to struct) and leads to incorrect + behaviour and uninitialized/out-of-bounds memory accesses. + + Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 + ------------------------------------------------------------------------ + + +Update the release notes. + +------------------------------------------------------------------------ +r52958 \| gerald \| 2013-10-29 11:46:49 -0700 (Tue, 29 Oct 2013) \| 14 lines +Changed paths: + M /trunk-1.8/asn1/nbap/nbap.cnf + M /trunk-1.8/asn1/nbap/packet-nbap-template.c + M /trunk-1.8/docbook/release-notes.xml + M /trunk-1.8/epan/dissectors/packet-nbap.c + +Copy over r52154 by hand: + + ------------------------------------------------------------------------ + r52154 \| etxrab \| 2013-09-20 07:19:31 -0700 (Fri, 20 Sep 2013) \| 1 line + Changed paths: + M /trunk/asn1/nbap/nbap.cnf + M /trunk/asn1/nbap/packet-nbap-template.c + M /trunk/epan/dissectors/packet-nbap.c + + DCH-ID can be 255 + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r52960 \| gerald \| 2013-10-29 11:59:51 -0700 (Tue, 29 Oct 2013) \| 13 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/docbook/release-notes.xml + M /trunk-1.8/epan/dissectors/packet-sip.c + +Copy over r52354 from the trunk: + + ------------------------------------------------------------------------ + r52354 \| pascal \| 2013-10-04 03:29:57 -0700 (Fri, 04 Oct 2013) \| 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-sip.c + + Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9228 : + Ensure that decompressed tvb exists before trying to add it to the tree + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r52962 \| gerald \| 2013-10-29 12:55:46 -0700 (Tue, 29 Oct 2013) \| 14 lines +Changed paths: + M /trunk-1.8/docbook/release-notes.xml + M /trunk-1.8/epan/dissectors/packet-tcp.c + +Copy over r52570 with manual intervention: + + ------------------------------------------------------------------------ + r52570 \| cmaynard \| 2013-10-12 11:03:34 -0700 (Sat, 12 Oct 2013) \| 4 lines + Changed paths: + M /trunk/epan/dissectors/packet-tcp.c + + Don't assume that tvb_length_remaining() or tvb_reported_length_remaining() always return a value >= 0. Part of fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 + + #BACKPORT(1.10,1.8) + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r53005 \| gerald \| 2013-10-31 11:57:01 -0700 (Thu, 31 Oct 2013) \| 3 lines +Changed paths: + M /trunk-1.8/config.nmake + M /trunk-1.8/configure.in + M /trunk-1.8/docbook/Makefile.am + M /trunk-1.8/docbook/Makefile.common + M /trunk-1.8/docbook/Makefile.nmake + A /trunk-1.8/docbook/asciidoc.conf (from /trunk-1.10/docbook/asciidoc.conf:53004) + A /trunk-1.8/docbook/release-notes.asciidoc (from /trunk-1.8/docbook/release-notes.xml:53004) + D /trunk-1.8/docbook/release-notes.xml + +Convert the release notes to AsciiDoc. Apply r48307 for most files, +convert the notes themselves using Pandoc followed by manual fixups. + +------------------------------------------------------------------------ +r53006 \| gerald \| 2013-10-31 12:09:42 -0700 (Thu, 31 Oct 2013) \| 2 lines +Changed paths: + M /trunk-1.8/docbook/release-notes.asciidoc + +Fix the sample bug entry. + +------------------------------------------------------------------------ +r53007 \| gerald \| 2013-10-31 12:22:04 -0700 (Thu, 31 Oct 2013) \| 3 lines +Changed paths: + M /trunk-1.8/docbook/asciidoc.conf + M /trunk-1.8/docbook/release-notes.asciidoc + M /trunk-1.8/make-version.pl + M /trunk-1.8/tools/svnadd + +Backport asciidoc.conf support in make-version.pl from r48405. Backport +AsciiDoc support in svnadd from r48392. Set some keywords. + +------------------------------------------------------------------------ +r53008 \| gerald \| 2013-10-31 12:24:22 -0700 (Thu, 31 Oct 2013) \| 2 lines +Changed paths: + M /trunk-1.8/config.nmake + M /trunk-1.8/configure.in + M /trunk-1.8/debian/changelog + M /trunk-1.8/debian/wireshark-common.files + M /trunk-1.8/epan/Makefile.am + M /trunk-1.8/wiretap/Makefile.am + +1.8.10 → 1.8.11. + +------------------------------------------------------------------------ +r53010 \| gerald \| 2013-10-31 14:52:27 -0700 (Thu, 31 Oct 2013) \| 37 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/diameter/dictionary.xml + M /trunk-1.8/docbook/release-notes.asciidoc + M /trunk-1.8/epan/dissectors/packet-bssgp.c + M /trunk-1.8/epan/dissectors/packet-enip.c + M /trunk-1.8/ui/win32/print_win32.c + +Copy over revisions from the trunk: + + ------------------------------------------------------------------------ + r51942 \| pascal \| 2013-09-10 14:18:28 -0700 (Tue, 10 Sep 2013) \| 3 lines + Changed paths: + M /trunk/diameter/dictionary.xml + + From Philippe Rosenfeld via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 : + Fix the value of 'SEND_TO_UE' in the DIAMETER Gx dictionary for Packet-Filter-Usage AVP + ------------------------------------------------------------------------ + r52131 \| pascal \| 2013-09-17 14:56:35 -0700 (Tue, 17 Sep 2013) \| 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-bssgp.c + + From Jason Wzhy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9157 : + BSSGP: Fix dissection of Trace Type IE in SGSN-INVOKE-TRACE message + ------------------------------------------------------------------------ + r52157 \| mmann \| 2013-09-20 11:35:10 -0700 (Fri, 20 Sep 2013) \| 4 lines + Changed paths: + M /trunk/epan/dissectors/packet-enip.c + + Bugfix a few items: + + 1. Correct Interface Flag enumeration + 2. Dissect ARP data without making it look like its an ARP packet by disabling column writing. + ------------------------------------------------------------------------ + r52221 \| cmaynard \| 2013-09-26 10:27:53 -0700 (Thu, 26 Sep 2013) \| 4 lines + Changed paths: + M /trunk/ui/win32/print_win32.c + + When a line of text wraps to the next line, the character that caused the line to wrap was not being printed. + + #BACKPORT(1.10,1.8) + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r53011 \| gerald \| 2013-10-31 15:46:40 -0700 (Thu, 31 Oct 2013) \| 63 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/docbook/release-notes.asciidoc + M /trunk-1.8/epan/dissectors/packet-dcerpc-nt.c + M /trunk-1.8/epan/dissectors/packet-dcerpc.c + M /trunk-1.8/epan/dissectors/packet-eth.c + M /trunk-1.8/epan/dissectors/packet-ethertype.c + M /trunk-1.8/epan/packet.c + M /trunk-1.8/plugins/wimax/packet-wmx.c + M /trunk-1.8/tshark.c + M /trunk-1.8/ui/gtk/uat_gui.c + +Copy over revisions from the trunk: + + ------------------------------------------------------------------------ + r52209 \| mmann \| 2013-09-24 14:06:05 -0700 (Tue, 24 Sep 2013) \| 3 lines + Changed paths: + M /trunk/plugins/wimax/packet-wmx.c + + Prevent crashing as a result of tree removal in r52208. Tree removal + this patch should be the "quick" fix to bug 5349 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349). I knew the tree check was preventing some dissection/column data/etc, but from the comments in bug 5349, the tree check was also protecting this (and maybe other) crashes (due to missed NULL checking). + + I want to follow up with some massive cleanup (remove PITEM_FINFO calls), but this with r52208 should be good enough to backport to 1.8 and 1.10 to fix bug 5349. Cleanup shouldn't need to be backported. + ------------------------------------------------------------------------ + r52734 \| mmann \| 2013-10-21 08:50:23 -0700 (Mon, 21 Oct 2013) \| 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-dcerpc-nt.c + + Datablob size is NDR64/32 dependant. Bug 9301 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9301). + + From Matthieu Patou + ------------------------------------------------------------------------ + r52735 \| mmann \| 2013-10-21 08:58:52 -0700 (Mon, 21 Oct 2013) \| 1 line + Changed paths: + M /trunk/epan/dissectors/packet-dcerpc-nt.c + + Fix compile errors introduced in r52734. + ------------------------------------------------------------------------ + r52736 \| mmann \| 2013-10-21 09:00:37 -0700 (Mon, 21 Oct 2013) \| 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-dcerpc.c + + dce-rpc: properly dissect multiple PDU in the same packet. Bug 9302 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9302). + + From Matthieu Patou + ------------------------------------------------------------------------ + r52738 \| cmaynard \| 2013-10-21 10:31:22 -0700 (Mon, 21 Oct 2013) \| 4 lines + Changed paths: + M /trunk/epan/dissectors/packet-eth.c + M /trunk/epan/dissectors/packet-ethertype.c + + Remove if (fh_tree) checks as add_ethernet_trailer() calls such functions as dissector_try_heuristic(), expert_add_info(), and col_append_str(), which all need to be called whether fh_tree is NULL or not. + + #BACKPORT(1.10,1.8) + ------------------------------------------------------------------------ + r52838 \| cmaynard \| 2013-10-25 05:51:16 -0700 (Fri, 25 Oct 2013) \| 4 lines + Changed paths: + M /trunk/tshark.c + + Display the frame number on the packet summary line if it's one of the configured columns. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9317 + + #BACKPORT(1.10,1.8) + ------------------------------------------------------------------------ + r52977 \| eapache \| 2013-10-29 18:42:11 -0700 (Tue, 29 Oct 2013) \| 6 lines + Changed paths: + M /trunk/epan/packet.c + + When adding an entry to a dissector string table, take a copy of the pattern + string (and pass g_free to g_hash_table_new_full to free it). + + This means callers don't have to worry about the scope of the memory they pass + in, and fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296 + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r53015 \| pascal \| 2013-11-01 08:12:40 -0700 (Fri, 01 Nov 2013) \| 14 lines +Changed paths: + M /trunk-1.8 + M /trunk-1.8/docbook/release-notes.asciidoc + M /trunk-1.8/epan/dissectors/packet-ptp.c + +Copy over from the trunk with manual intervention: + + ------------------------------------------------------------------------ + r52566 \| pascal \| 2013-10-12 16:05:32 +0200 (sam. 12 oct. 2013) \| 3 lignes + Chemins modifiés : + M /trunk/epan/dissectors/packet-ptp.c + + From Todd Newton via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9262 : + Fix dissection of PTP Management messages + + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r53019 \| gerald \| 2013-11-01 09:17:18 -0700 (Fri, 01 Nov 2013) \| 16 lines +Changed paths: + M /trunk-1.8/docbook/release-notes.asciidoc + M /trunk-1.8/epan/dissectors/packet-ntlmssp.c + +Copy over r52732 by hand. This appears to be in response to r52213 and +wmemification in the trunk, neither of which have been backported. The extra +check doesn't hurt, however. + + ------------------------------------------------------------------------ + r52732 \| mmann \| 2013-10-21 08:39:07 -0700 (Mon, 21 Oct 2013) \| 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-ntlmssp.c + + NULL check ref_nt_challenge_response and ref_lm_challenge_response. Bug 9299 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9299) + + From Matthieu Patou + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------ +r53021 \| gerald \| 2013-11-01 09:29:10 -0700 (Fri, 01 Nov 2013) \| 13 lines +Changed paths: + M /trunk-1.8/docbook/release-notes.asciidoc + M /trunk-1.8/epan/dissectors/packet-irc.c + +Copy over r53016 with manual intervention. + + ------------------------------------------------------------------------ + r53016 \| pascal \| 2013-11-01 08:48:57 -0700 (Fri, 01 Nov 2013) \| 3 lines + Changed paths: + M /trunk/epan/dissectors/packet-irc.c + + From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 : + Fix IRC response command filter + ------------------------------------------------------------------------ + +Update the release notes. + +------------------------------------------------------------------------
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/Makefile.in ^
@@ -386,6 +386,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ \| sed 's\|^\./\|$(prefix)/\|' \| grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -434,6 +435,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/NEWS ^
@@ -1,84 +1,63 @@ -Wireshark 1.8.10 Release Notes - - ------------------------------------------------------------------ + Wireshark 1.8.11 Release Notes + __________________________________________________________ What is Wireshark? - Wireshark is the world's most popular network protocol analyzer. - It is used for troubleshooting, analysis, development and - education. + Wireshark is the world's most popular network protocol + analyzer. It is used for troubleshooting, analysis, development + and education. + __________________________________________________________ What's New Bug Fixes The following vulnerabilities have been fixed. - - o wnpa-sec-2013-55 - - The NBAP dissector could crash. Discovered by Laurent Butti. - (Bug 9005) - - Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9. - - o wnpa-sec-2013-56 - - The ASSA R3 dissector could go into an infinite loop. - Discovered by Ben Schmidt. (Bug 9020 ) - - Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9. - - o wnpa-sec-2013-57 - - The RTPS dissector could overflow a buffer. Discovered by Ben - Schmidt. (Bug 9019 ) - - Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9. - - o wnpa-sec-2013-58 - - The MQ dissector could crash. (Bug 9079 ) - - Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9. - - o wnpa-sec-2013-59 - - The LDAP dissector could crash. - - Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9. - - o wnpa-sec-2013-60 - - The Netmon file parser could crash. Discovered by G. Geshev. - (Bug 8742 ) - - Versions affected: 1.10.0 to 1.10.1, 1.8.0 to 1.8.9. + * [1]wnpa-sec-2013-61 + The IEEE 802.15.4 dissector could crash. ([2]Bug 9139) + Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 + [3]CVE-2013-6336 + * [4]wnpa-sec-2013-62 + The NBAP dissector could crash. Discovered by Laurent + Butti. ([5]Bug 9168) + Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 + [6]CVE-2013-6337 + * [7]wnpa-sec-2013-63 + The SIP dissector could crash. ([8]Bug 9228) + Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 + [9]CVE-2013-6338 + * [10]wnpa-sec-2013-64 + The OpenWire dissector could go into a large loop. + Discovered by Murali. ([11]Bug 9248) + Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 + [12]CVE-2013-6339 + * [13]wnpa-sec-2013-65 + The TCP dissector could crash. ([14]Bug 9263) + Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 + [15]CVE-2013-6340 The following bugs have been fixed: - - o Lua ByteArray:append() causes wireshark crash. (Bug 4461) - - o Lua script can not get "data-text-lines" protocol data. (Bug - 5200) - - o PER normally small non-negative whole number decoding is wrong - when >= 64. (Bug 8841) - - o Incorrect parsing of IPFIX IpTotalLength elements. (Bug 8918) - - o IO graph/advanced, max/min/summ error on frames with multiple - Diameter messages. (Bug 8980) - - o Wireshark fails to decode single-line, multiple Contact: URIs - in SIP responses. (Bug 9031) - - o Dissector for EtherCAT: ADS highlighting in the Packet Bytes - Pane is incorrect. (Bug 9036) - - o 802.11 HT Extended Capabilities B10 decode incorrect. (Bug - 9038) - - o Weird malformed HTTP error. (Bug 9101) + new_packet_list: EAP-TLS reassemble does not happen when + NEW_PACKET_LIST is toggled. ([16]Bug 5349) + * The value of SEND_TO_UE in the DIAMETER Gx dictionary for + Packet-Filter-Usage AVP is 0 instead of 1. ([17]Bug 9126) + * Bssgp => SGSN-INVOKE-TRACE use the wrong function... + ([18]Bug 9157) + * Files with pcap-ng Simple Packet Blocks can't be read. + ([19]Bug 9200) + * Wireshark lua dissector unable to load for + media_type=application/octet-stream. ([20]Bug 9296) + * Wireshark crash when dissecting packet with NTLMSSP. + ([21]Bug 9299) + * DCERPC data_blobs are not correctly dissected when NDR64 + encoding is used. ([22]Bug 9301) + * multiple PDU in the same DCERPC packet are not correctly + decrypted. ([23]Bug 9302) + * The tshark summary line doesn't display the frame number or + displays it sporadically. ([24]Bug 9317) + * Fix dissection of PTP Management messages. ([25]Bug 9262) + * Duplicate IRC header field abbreviation breaks filter + (example: irc.response.command). ([26]Bug 9360) New and Updated Features @@ -90,70 +69,124 @@ Updated Protocol Support - ASSA R3, EtherCAT AMS, GTPv2, HTTP, IEEE 802.11, IPFIX, LDAP, MQ, - NBAP, NCP SSS, RTPS, SIP, + BSSGP, DCERPC, DCERPC NT, DIAMETER, Ethernet, EtherNet/IP, IEEE + 802.15.4, IRC, NBAP, NTLMSSP, OpenWire, SIP, and WiMax New and Updated Capture File Support - . + and . -Getting Wireshark + Getting Wireshark - Wireshark source code and installation packages are available from - http://www.wireshark.org/download.html. + Wireshark source code and installation packages are available + from [27]http://www.wireshark.org/download.html. Vendor-supplied Packages - Most Linux and Unix vendors supply their own Wireshark packages. - You can usually install or upgrade Wireshark using the package - management system specific to that platform. A list of third-party - packages can be found on the download page on the Wireshark web - site. + Most Linux and Unix vendors supply their own Wireshark + packages. You can usually install or upgrade Wireshark using + the package management system specific to that platform. A list + of third-party packages can be found on the [28]download page + on the Wireshark web site. + __________________________________________________________ File Locations Wireshark and TShark look in several different locations for preference files, plugins, SNMP MIBS, and RADIUS dictionaries. These locations vary from platform to platform. You can use - About→Folders to find the default locations on your system. + About->Folders to find the default locations on your system. + __________________________________________________________ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. (Bug 1419) + Dumpcap might not quit if Wireshark or TShark crashes. ([29]Bug + 1419) - The BER dissector might infinitely loop. (Bug 1516) + The BER dissector might infinitely loop. ([30]Bug 1516) Capture filters aren't applied when capturing from named pipes. - (Bug 1814) + ([31]Bug 1814) Filtering tshark captures with display filters (-R) no longer - works. (Bug 2234) + works. ([32]Bug 2234) - The 64-bit Windows installer does not support Kerberos decryption. - (Win64 development page) + The 64-bit Windows installer does not support Kerberos + decryption. ([33]Win64 development page) - Application crash when changing real-time option. (Bug 4035) + Application crash when changing real-time option. ([34]Bug + 4035) - Hex pane display issue after startup. (Bug 4056) + Hex pane display issue after startup. ([35]Bug 4056) - Packet list rows are oversized. (Bug 4357) + Packet list rows are oversized. ([36]Bug 4357) - Summary pane selected frame highlighting not maintained. (Bug - 4445) + Summary pane selected frame highlighting not maintained. + ([37]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. (Bug 4985) + cases. ([38]Bug 4985) + __________________________________________________________ Getting Help - Community support is available on Wireshark's Q&A site and on the - wireshark-users mailing list. Subscription information and - archives for all of Wireshark's mailing lists can be found on the - web site. - - Official Wireshark training and certification are available from - Wireshark University. + Community support is available on [39]Wireshark's Q&A site and + on the wireshark-users mailing list. Subscription information + and archives for all of Wireshark's mailing lists can be found + on [40]the web site. + + Official Wireshark training and certification are available + from [41]Wireshark University. + __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the Wireshark web site. + A complete FAQ is available on the [42]Wireshark web site. + __________________________________________________________ + + Last updated 2013-11-01 09:29:10 PDT + +References + + 1. https://www.wireshark.org/security/wnpa-sec-2013-61.html + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139 + 3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6336 + 4. https://www.wireshark.org/security/wnpa-sec-2013-62.html + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9168 + 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6337 + 7. https://www.wireshark.org/security/wnpa-sec-2013-63.html + 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9228 + 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6338 + 10. https://www.wireshark.org/security/wnpa-sec-2013-64.html + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9248 + 12. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6339 + 13. https://www.wireshark.org/security/wnpa-sec-2013-65.html + 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263 + 15. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6340 + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5349 + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9126 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9157 + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9200 + 20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9296 + 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9299 + 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9301 + 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9302 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9317 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9262 + 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9360 + 27. http://www.wireshark.org/download.html + 28. http://www.wireshark.org/download.html#thirdparty + 29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 33. https://wiki.wireshark.org/Development/Win64 + 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 35. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 39. http://ask.wireshark.org/ + 40. http://www.wireshark.org/lists/ + 41. http://www.wiresharktraining.com/ + 42. http://www.wireshark.org/faq.html
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/HI2Operations/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/Makefile.in ^
@@ -122,6 +122,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -170,6 +171,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/acp133/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/acse/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ansi_map/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ansi_tcap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/c1222/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/camel/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/cdt/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/charging_ase/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/cmip/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/cmp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/cms/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/credssp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/crmf/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/dap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/disp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/dop/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/dsp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ess/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ftam/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/gnm/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/goose/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/gprscdr/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/gsm_map/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h225/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h235/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h245/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h248/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h282/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h283/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h323/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h450-ros/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h450/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h460/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/h501/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/hnbap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/idmp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/inap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/kerberos/Makefile.in ^
@@ -124,6 +124,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -172,6 +173,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/lcsap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ldap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/logotypecertextn/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/lpp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/lppa/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/lte-rrc/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/m3ap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/mms/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/mpeg-audio/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/mpeg-pes/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/nbap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/nbap/nbap.cnf ^
@@ -1,7 +1,7 @@ # nbap.cnf # nbap conformation file # Copyright 2005 Anders Broman -# $Id: nbap.cnf 51230 2013-08-09 01:51:41Z morriss $ +# $Id: nbap.cnf 52958 2013-10-29 18:46:49Z gerald $ #.OPT PER @@ -625,7 +625,7 @@ #.FN_BODY DCH-Specific-FDD-Item/dCH-ID offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, maxNrOfDCHs, &dch_id, FALSE); + 0U, 255U, &dch_id, FALSE); if(g_num_dch_in_flow>0){ g_dchs_in_flow_list[g_num_dch_in_flow-1]=dch_id;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/nbap/packet-nbap-template.c ^
@@ -2,7 +2,7 @@ * Routines for UMTS Node B Application Part(NBAP) packet dissection * Copyright 2005, 2009 Anders Broman <anders.broman@ericsson.com> * - * $Id: packet-nbap-template.c 42922 2012-05-30 18:27:40Z pascal $ + * $Id: packet-nbap-template.c 52958 2013-10-29 18:46:49Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -114,7 +114,7 @@ }nbap_dch_channel_info_t; -nbap_dch_channel_info_t nbap_dch_chnl_info[maxNrOfDCHs]; +nbap_dch_channel_info_t nbap_dch_chnl_info[256]; /* Struct to collect E-DCH data in a packet * As the address data comes before the ddi entries
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ns_cert_exts/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ocsp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/p1/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/p22/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/p7/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/p772/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pcap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkcs1/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkcs12/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkinit/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkix1explicit/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkix1implicit/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkixac/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkixproxy/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkixqualified/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pkixtsp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/pres/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/q932-ros/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/q932/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/qsig/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ranap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/rnsap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ros/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/rrc/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/rrlp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/rtse/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/rua/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/s1ap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/sabp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/sbc-ap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/smrse/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/snmp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/spnego/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/sv/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/t124/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/t125/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/t38/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/tcap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/tetra/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/ulp/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/wlancertextn/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/x2ap/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/x509af/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/x509ce/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/x509if/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/x509sat/Makefile.in ^
@@ -148,6 +148,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -196,6 +197,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/asn1/x721/Makefile.in ^
@@ -124,6 +124,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -172,6 +173,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/codecs/Makefile.in ^
@@ -116,6 +116,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -164,6 +165,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/config.nmake ^
@@ -1,4 +1,4 @@ -# $Id: config.nmake 50938 2013-07-26 22:03:59Z gerald $ +# $Id: config.nmake 53008 2013-10-31 19:24:22Z 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). @@ -13,13 +13,13 @@ ##### Versions ##### # The SVN revision of our build. Updated by make-version.pl -SVN_REVISION=51935 +SVN_REVISION=53023 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=8 -VERSION_MICRO=10 +VERSION_MICRO=11 VERSION_BUILD=$(SVN_REVISION) # Local build information. Recommended: Unique string for your @@ -1084,7 +1084,8 @@ # the XML validator (part of cygwin's libxml2 package) XMLLINT="xmllint" - +# Asciidoc converter (part of cygwin's asciidoc package) +A2X="a2x" ############################################################################## #
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for wireshark 1.8.10. +# Generated by GNU Autoconf 2.68 for wireshark 1.8.11. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.8.10' -PACKAGE_STRING='wireshark 1.8.10' +PACKAGE_VERSION='1.8.11' +PACKAGE_STRING='wireshark 1.8.11' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -742,6 +742,10 @@ HAVE_FOP_TRUE HAVE_FOP FOP +HAVE_A2X_FALSE +HAVE_A2X_TRUE +HAVE_A2X +A2X HAVE_XMLLINT_FALSE HAVE_XMLLINT_TRUE HAVE_XMLLINT @@ -1518,7 +1522,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.8.10 to adapt to many kinds of systems. +\`configure' configures wireshark 1.8.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1589,7 +1593,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of wireshark 1.8.10:";; + short \| recursive ) echo "Configuration of wireshark 1.8.11:";; esac cat <<\_ACEOF @@ -1788,7 +1792,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.8.10 +wireshark configure 1.8.11 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2328,7 +2332,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.8.10, which was +It was created by wireshark $as_me 1.8.11, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3256,7 +3260,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.8.10' + VERSION='1.8.11' cat >>confdefs.h <<_ACEOF @@ -17535,6 +17539,94 @@ fi +# Check for a2x (convert asciidoc to another format) +# Extract the first word of "a2x", so it can be a program name with args. +set dummy a2x; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_A2X+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $A2X in + [\\/]* \| ?:[\\/]) + ac_cv_path_A2X="$A2X" # Let the user override the test with a path. + ;; + ) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +A2X=$ac_cv_path_A2X +if test -n "$A2X"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5 +$as_echo "$A2X" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "a2x", so it can be a program name with args. +set dummy a2x; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_HAVE_A2X+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_A2X"; then + ac_cv_prog_HAVE_A2X="$HAVE_A2X" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_HAVE_A2X=""yes"" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_A2X" && ac_cv_prog_HAVE_A2X=""no"" +fi +fi +HAVE_A2X=$ac_cv_prog_HAVE_A2X +if test -n "$HAVE_A2X"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_A2X" >&5 +$as_echo "$HAVE_A2X" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x$HAVE_A2X = xyes; then + HAVE_A2X_TRUE= + HAVE_A2X_FALSE='#' +else + HAVE_A2X_TRUE='#' + HAVE_A2X_FALSE= +fi + + # Check for fop (translate .fo to e.g. pdf) # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 @@ -28887,6 +28979,10 @@ as_fn_error $? "conditional \"HAVE_XMLLINT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_A2X_TRUE}" && test -z "${HAVE_A2X_FALSE}"; then + as_fn_error $? "conditional \"HAVE_A2X\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_FOP_TRUE}" && test -z "${HAVE_FOP_FALSE}"; then as_fn_error $? "conditional \"HAVE_FOP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -29377,7 +29473,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.8.10, which was +This file was extended by wireshark $as_me 1.8.11, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29443,7 +29539,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.8.10 +wireshark config.status 1.8.11 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/configure.in ^
@@ -1,8 +1,8 @@ -# $Id: configure.in 51926 2013-09-10 10:37:52Z guy $ +# $Id: configure.in 53008 2013-10-31 19:24:22Z gerald $ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.8.10) +AC_INIT(wireshark, 1.8.11) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or @@ -427,6 +427,11 @@ AC_CHECK_PROG(HAVE_XMLLINT, xmllint, "yes", "no") AM_CONDITIONAL(HAVE_XMLLINT, test x$HAVE_XMLLINT = xyes) +# Check for a2x (convert asciidoc to another format) +AC_PATH_PROG(A2X, a2x) +AC_CHECK_PROG(HAVE_A2X, a2x, "yes", "no") +AM_CONDITIONAL(HAVE_A2X, test x$HAVE_A2X = xyes) + # Check for fop (translate .fo to e.g. pdf) AC_PATH_PROG(FOP, fop) AC_CHECK_PROG(HAVE_FOP, fop, "yes", "no")
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/debian/changelog ^
@@ -1,4 +1,4 @@ -wireshark (1.8.10) unstable; urgency=low +wireshark (1.8.11) unstable; urgency=low * Self-made package
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/debian/wireshark-common.files ^
@@ -7,9 +7,9 @@ /usr/bin/rawshark /usr/bin/text2pcap /usr/lib/wireshark/libwireshark.so.2 -/usr/lib/wireshark/libwireshark.so.2.0.10 +/usr/lib/wireshark/libwireshark.so.2.0.11 /usr/lib/wireshark/libwiretap.so.2 -/usr/lib/wireshark/libwiretap.so.2.1.10 +/usr/lib/wireshark/libwiretap.so.2.1.11 /usr/lib/wireshark/libwsutil.so.2 /usr/lib/wireshark/libwsutil.so.2.0.0 /usr/lib/wireshark/plugins/*
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/diameter/dictionary.xml ^
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id: dictionary.xml 45011 2012-09-19 19:47:23Z morriss $ --> +<!-- $Id: dictionary.xml 53010 2013-10-31 21:52:27Z gerald $ --> <?type-proto key="MIPRegistrationRequest" value="mip" ?> <?avp-proto key="Example-AVP" value="data" ?> @@ -3877,7 +3877,7 @@ </avp> <avp name="Packet-Filter-Usage" code="1072" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="Enumerated"/> - <enum name="SEND_TO_UE" code="0"/> + <enum name="SEND_TO_UE" code="1"/> </avp> <avp name="Charging-Correlation-Indicator" code="1073" mandatory="mustnot" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP"> <type type-name="Enumerated"/>
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/doc/Makefile.in ^
@@ -119,6 +119,7 @@ MANS = $(man1_MANS) $(man4_MANS) $(man_MANS) DATA = $(noinst_DATA) $(pkgdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -167,6 +168,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/docbook/Makefile.am ^
@@ -3,16 +3,22 @@ # in several formats. # See the Readme.txt file for instructions. # -# $Id: Makefile.am 43935 2012-07-23 16:46:24Z gerald $ +# $Id: Makefile.am 53005 2013-10-31 18:57:01Z gerald $ # # formatting objects processor # Additional options to fop. # This needs to contain at least the argument '-Xmx256m' +# fop executable is found in configure.ac. FOP_OPTS=-Xmx256m -# fop executable is found in configure.in . -# XXX - have it check for the right version (0.20.5 or newer)? +# Asciidoc converter +A2X_HTML_OPTS="--stylesheet=ws.css" +A2X_TEXT_OPTS= + +#if HAVE_LYNX +A2X_TEXT_OPTS+="--lynx" +#endif # html to text converter for text version of release notes, e.g. elinks. # This could also be "lynx", or "true" if neither elinks nor lynx is installed @@ -202,48 +208,46 @@ if HAVE_FOP -RELEASE_NOTES_TARGETS=release_notes.validated release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf +RELEASE_NOTES_TARGETS=release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf else -RELEASE_NOTES_TARGETS=release_notes.validated release-notes.html release-notes.txt +RELEASE_NOTES_TARGETS=release-notes.html release-notes.txt endif release_notes: $(RELEASE_NOTES_TARGETS) -# validate the content -release_notes.validated: $(RELEASE_NOTES_SOURCE) -if HAVE_XMLLINT - @ echo --- RELEASE NOTES - VALIDATING XML --- - $(XMLLINT) --valid --noout $< - touch $@ -else - @ echo --- RELEASE NOTES - SKIP VALIDATION --- -endif - # create html single page file release-notes.html: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - HTML --- - $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< > $@ + $(A2X) --format=xhtml $(A2X_HTML_OPTS) release-notes.asciidoc # create txt single page file (through HTML) release-notes.txt: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - TXT --- - $(XSLTPROC) --stringparam generate.toc "article nop" \ - --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< \| $(HTML2TXT) > $@ + $(A2X) --format=text $(A2X_TEXT_OPTS) \ + --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ + release-notes.asciidoc + mv release-notes.text $@ news: release-notes.txt cp release-notes.txt ../NEWS -# create pdf file (through XSL-FO), portrait pages on US letter paper -# you will get lot's of errors, but that's ok -release-notes-us.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl - @ echo --- RELEASE NOTES - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl $< > $@ +# create pdf file, portrait pages on US letter paper +release-notes-us.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl + @ echo --- RELEASE NOTES - PDF US LETTER PAPER --- + $(A2X) --format=pdf $(A2X_HTML_OPTS) --fop \ + --xsltproc-opts "--stringparam paper.type letter --nonet" \ + --xsl-file=custom_layer_pdf.xsl \ + release-notes.asciidoc + mv release-notes.pdf $@ -# create pdf file (through XSL-FO), portrait pages on A4 paper -# you will get lot's of errors, but that's ok -release-notes-a4.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl +# create pdf file, portrait pages on A4 paper +release-notes-a4.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl @ echo --- RELEASE NOTES - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl $< > $@ + $(A2X) --format=pdf $(A2X_HTML_OPTS) --fop \ + --xsltproc-opts "--stringparam paper.type A4 --nonet" \ + --xsl-file=custom_layer_pdf.xsl \ + release-notes.asciidoc + mv release-notes.pdf $@ clean-local: -rm -rf $(CLEANDIRS)
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/docbook/Makefile.common ^
@@ -1,5 +1,5 @@ # -# $Id: Makefile.common 43218 2012-06-11 23:14:50Z gerald $ +# $Id: Makefile.common 53005 2013-10-31 18:57:01Z gerald $ # WSUG_FILES = \ wsug_src/WSUG_app_files.xml \ @@ -207,9 +207,9 @@ $(WSDG_GRAPHICS) RELEASE_NOTES_SOURCE = \ - release-notes.xml \ + release-notes.asciidoc \ Makefile.common \ - svn_version.xml + asciidoc.conf CLEANFILES = \ *.chm \ @@ -249,4 +249,3 @@ ../epan/wslua/wslua_tree.c \ ../epan/wslua/wslua_tvb.c \ ../epan/wslua/wslua_util.c -
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/docbook/Makefile.in ^
@@ -20,7 +20,7 @@ # in several formats. # See the Readme.txt file for instructions. # -# $Id: Makefile.am 43935 2012-07-23 16:46:24Z gerald $ +# $Id: Makefile.am 53005 2013-10-31 18:57:01Z gerald $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -67,6 +67,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -115,6 +116,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@ @@ -309,12 +311,17 @@ # formatting objects processor # Additional options to fop. # This needs to contain at least the argument '-Xmx256m' +# fop executable is found in configure.ac. FOP_OPTS = -Xmx256m + +# Asciidoc converter +A2X_HTML_OPTS = "--stylesheet=ws.css" + +#if HAVE_LYNX +A2X_TEXT_OPTS = "--lynx" @HAVE_ELINKS_FALSE@@HAVE_LYNX_FALSE@HTML2TXT = "true" @HAVE_ELINKS_FALSE@@HAVE_LYNX_TRUE@HTML2TXT = $(LYNX) -dump -width=72 -nolist -stdin -force-html - -# fop executable is found in configure.in . -# XXX - have it check for the right version (0.20.5 or newer)? +#endif # html to text converter for text version of release notes, e.g. elinks. # This could also be "lynx", or "true" if neither elinks nor lynx is installed @@ -323,7 +330,7 @@ @HAVE_ELINKS_TRUE@HTML2TXT = $(ELINKS) -dump -dump-width 72 -no-numbering -no-references # -# $Id: Makefile.common 43218 2012-06-11 23:14:50Z gerald $ +# $Id: Makefile.common 53005 2013-10-31 18:57:01Z gerald $ # WSUG_FILES = \ wsug_src/WSUG_app_files.xml \ @@ -533,9 +540,9 @@ $(WSDG_GRAPHICS) RELEASE_NOTES_SOURCE = \ - release-notes.xml \ + release-notes.asciidoc \ Makefile.common \ - svn_version.xml + asciidoc.conf CLEANFILES = \ *.chm \ @@ -587,8 +594,8 @@ # Wireshark Developer Guide @HAVE_FOP_TRUE@WSDG_TARGETS = wsdg.validated wsdg_html_chunked developer-guide.html developer-guide-a4.pdf developer-guide-us.pdf -@HAVE_FOP_FALSE@RELEASE_NOTES_TARGETS = release_notes.validated release-notes.html release-notes.txt -@HAVE_FOP_TRUE@RELEASE_NOTES_TARGETS = release_notes.validated release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf +@HAVE_FOP_FALSE@RELEASE_NOTES_TARGETS = release-notes.html release-notes.txt +@HAVE_FOP_TRUE@RELEASE_NOTES_TARGETS = release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf EXTRA_DIST = \ $(WSUG_SOURCE) \ $(WSDG_SOURCE) \ @@ -933,38 +940,39 @@ release_notes: $(RELEASE_NOTES_TARGETS) -# validate the content -release_notes.validated: $(RELEASE_NOTES_SOURCE) -@HAVE_XMLLINT_TRUE@ @ echo --- RELEASE NOTES - VALIDATING XML --- -@HAVE_XMLLINT_TRUE@ $(XMLLINT) --valid --noout $< -@HAVE_XMLLINT_TRUE@ touch $@ -@HAVE_XMLLINT_FALSE@ @ echo --- RELEASE NOTES - SKIP VALIDATION --- - # create html single page file release-notes.html: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - HTML --- - $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< > $@ + $(A2X) --format=xhtml $(A2X_HTML_OPTS) release-notes.asciidoc # create txt single page file (through HTML) release-notes.txt: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - TXT --- - $(XSLTPROC) --stringparam generate.toc "article nop" \ - --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< \| $(HTML2TXT) > $@ + $(A2X) --format=text $(A2X_TEXT_OPTS) \ + --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ + release-notes.asciidoc + mv release-notes.text $@ news: release-notes.txt cp release-notes.txt ../NEWS -# create pdf file (through XSL-FO), portrait pages on US letter paper -# you will get lot's of errors, but that's ok -release-notes-us.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl - @ echo --- RELEASE NOTES - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl $< > $@ +# create pdf file, portrait pages on US letter paper +release-notes-us.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl + @ echo --- RELEASE NOTES - PDF US LETTER PAPER --- + $(A2X) --format=pdf $(A2X_HTML_OPTS) --fop \ + --xsltproc-opts "--stringparam paper.type letter --nonet" \ + --xsl-file=custom_layer_pdf.xsl \ + release-notes.asciidoc + mv release-notes.pdf $@ -# create pdf file (through XSL-FO), portrait pages on A4 paper -# you will get lot's of errors, but that's ok -release-notes-a4.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl +# create pdf file, portrait pages on A4 paper +release-notes-a4.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl @ echo --- RELEASE NOTES - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl $< > $@ + $(A2X) --format=pdf $(A2X_HTML_OPTS) --fop \ + --xsltproc-opts "--stringparam paper.type A4 --nonet" \ + --xsl-file=custom_layer_pdf.xsl \ + release-notes.asciidoc + mv release-notes.pdf $@ clean-local: -rm -rf $(CLEANDIRS)
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/docbook/Makefile.nmake ^
@@ -5,7 +5,7 @@ # ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake [target ...] # -# $Id: Makefile.nmake 40084 2011-12-03 19:59:48Z wmeier $ +# $Id: Makefile.nmake 53005 2013-10-31 18:57:01Z gerald $ # ############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################ @@ -18,6 +18,10 @@ WSDG_SOURCE = $(WSDG_SOURCE) Makefile.nmake RELEASE_NOTES_SOURCE = $(RELEASE_NOTES_SOURCE) Makefile.nmake +# Asciidoc converter +A2X_HTML_OPTS="--stylesheet=ws.css" +A2X_TEXT_OPTS= + # Automatically generate .pdf files from .fo files .fo.pdf: $(FOP) $< $@ @@ -44,7 +48,7 @@ wsdg: wsdg.validated wsdg_x # Make only the release notes -release_notes: release_notes.validated release_notes_x +release_notes: $(RELEASE_NOTES_SOURCE) # Clean all clean: @@ -56,7 +60,7 @@ # -- All ------------------------------------------------------------------------------- -all_x: wsug.validated wsdg.validated release_notes.validated wsug_x wsdg_x release_notes_x +all_x: wsug.validated wsdg.validated wsug_x wsdg_x release_notes_x # -- User Guide ------------------------------------------------------------------------ @@ -202,50 +206,39 @@ # -- Release Notes ------------------------------------------------------------------------ -release_notes_x: release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf release-notes.chm - -# validate the content -release_notes.validated: $(RELEASE_NOTES_SOURCE) - @ echo --- RELEASE NOTES - VALIDATING XML --- - $(XMLLINT) --valid --noout release-notes.xml - touch $@ +release_notes_x: release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf # create html single page file release-notes.html: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - HTML --- - $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl release-notes.xml > $@ + $(A2X) --format=xhtml $(A2X_HTML_OPTS) release-notes.asciidoc # create txt single page file (through HTML) release-notes.txt: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - TXT --- - $(XSLTPROC) --stringparam generate.toc "article nop" --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl release-notes.xml \| $(HTML2TXT) > $@ + $(A2X) --format=text $(A2X_TEXT_OPTS) \ + --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ + release-notes.asciidoc + mv release-notes.text $@ news: release-notes.txt copy release-notes.txt ..\NEWS -# create pdf file (through XSL-FO), portrait pages on US letter paper (the default) -# you will get lot's of errors, but that's ok -release-notes-us.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl -!ifdef FOP - @ echo --- RELEASE NOTES - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl release-notes.xml > $@ -!endif +# create pdf file, portrait pages on US letter paper +release-notes-us.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl + @ echo --- RELEASE NOTES - PDF US LETTER PAPER --- + $(A2X) --format=pdf $(A2X_HTML_OPTS) --fop \ + --xsltproc-opts "--stringparam paper.type letter --nonet" \ + --xsl-file=custom_layer_pdf.xsl \ + release-notes.asciidoc + mv release-notes.pdf $@ -# create pdf file (through XSL-FO), portrait pages on A4 paper -# you will get lot's of errors, but that's ok -release-notes-a4.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl -!ifdef FOP +# create pdf file, portrait pages on A4 paper +release-notes-a4.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl @ echo --- RELEASE NOTES - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl release-notes.xml > $@ -!endif + $(A2X) --format=pdf $(A2X_HTML_OPTS) --fop \ + --xsltproc-opts "--stringparam paper.type A4 --nonet" \ + --xsl-file=custom_layer_pdf.xsl \ + release-notes.asciidoc + mv release-notes.pdf $@ -# create MS html help file (through html chunked pages) -release-notes.chm: $(RELEASE_NOTES_SOURCE) -!ifdef HHC_EXE - @ echo --- RELEASE NOTES - MICROSOFT HTML HELP --- - $(XSLTPROC) --stringparam base.dir release_notes_chm/ --stringparam use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam section.label.includes.component.label 1 --nonet http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl release-notes.xml - -$(HHC_EXE) htmlhelp.hhp - -mv htmlhelp.chm $@ - -rm -r htmlhelp.hhp - -rm -r toc.hhc -!endif
[-] [+]	Added	wireshark-1.8.11.tar.bz2/docbook/asciidoc.conf ^
@@ -0,0 +1,77 @@ +# AsciiDoc configuration for Wireshark +# $Id: asciidoc.conf 53007 2013-10-31 19:22:04Z gerald $ + +[replacements] + +# Yes, this is a fake macro. +wireshark-version:\[\]=1.8.11 + +[macros] + +# bugs.wireshark.org link +# ws-buglink:<dddd>[<bug text>] +# Default bug text is "Bug". +# Examples: ws-buglink:5000[] ws-buglink:4000[Wireshark bug number] +(?su)(?<!\w)[\\]?(?P<name>ws-buglink):(?P<target>\d+)\[(?P<attrlist>.?)(?<!\\)\]= + +# www.wireshark.org/security link +# ws-salink:<dddd-dd>[<advisory text>] +# Default advisory text is "". +# Examples: ws-salink:2013-32[] ws-salink:2013-12[Security advisory] +(?su)(?<!\w)[\\]?(?P<name>ws-salink):(?P<target>\d{4}-\d{2,3})\[(?P<attrlist>.?)(?<!\\)\]= + +# CVE ID link +# cve-idlink:<dddd-dddd>[] +# Example: cve-idlink:2013:0001 +(?su)(?<!\w)[\\]?(?P<name>cve-idlink):(?P<target>\d{4}-\d+)\[\]= + + +ifdef::backend-docbook45[] + +[ws-buglink-inlinemacro] +<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">{0=Bug} {target}</ulink> + +[ws-salink-inlinemacro] +<ulink url="https://www.wireshark.org/security/wnpa-sec-{target}.html">{0=}wnpa-sec-{target}</ulink> + +[cve-idlink-inlinemacro] +<ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</ulink> + +endif::backend-docbook45[] + + +ifdef::backend-html4,backend-html5,backend-xhtml11[] + +[ws-buglink-inlinemacro] +<a href="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id={target}">{0=Bug} {target}</a> + +[ws-salink-inlinemacro] +<a href="https://www.wireshark.org/security/wnpa-sec-{target}.html">{0=}wnpa-sec-{target}</a> + +[cve-idlink-inlinemacro] +<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</a> + +endif::backend-html4,backend-html5,backend-xhtml11[] + + +# Given a list of items, sort and comma-separate them. Blank lines are stripped. +# Case is ignored. For example, +# +# --sort-and-group-- +# One +# two +# red +# +# blue +# Fish +# +# --sort-and-group-- +# +# produces +# +# blue, Fish, One, red, two +[blockdef-sort-and-group] +delimiter=^--sort-and-group--$ +style=default +filter=sort --ignore-case +default-style=template="paragraph",filter='sort --ignore-case \| sed -e "s/,//g" \| sed -e "/^$/d" -e "$ s/^/and /" -e "$ ! s/$/,/"'
[-] [+]	Added	wireshark-1.8.11.tar.bz2/docbook/release-notes.asciidoc ^
@@ -0,0 +1,211 @@ += Wireshark wireshark-version:[] Release Notes +// $Id: release-notes.asciidoc 53021 2013-11-01 16:29:10Z gerald $ + +== What is Wireshark? + +Wireshark is the world's most popular network protocol analyzer. It is +used for troubleshooting, analysis, development and education. + +== What's New + +=== Bug Fixes + +The following vulnerabilities have been fixed. + +//* ws-buglink:5000[] +//* ws-buglink:6000[Wireshark bug] +//* ws-salink:2013-11[] +//* cve-idlink:2013-2486[] + +* ws-salink:2013-61[] ++ +The IEEE 802.15.4 dissector could crash. +// Fixed in trunk: r52036 +// Fixed in trunk-1.10: r52954 +// Fixed in trunk-1.8: r52956 +(ws-buglink:9139[]) ++ +Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 ++ +cve-idlink:2013-6336[] + +* ws-salink:2013-62[] ++ +The NBAP dissector could crash. Discovered by Laurent Butti. +// Fixed in trunk: r52154 +// Fixed in trunk-1.10: r52957 +// Fixed in trunk-1.8: r52958 +(ws-buglink:9168[]) ++ +Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 ++ +cve-idlink:2013-6337[] + +* ws-salink:2013-63[] ++ +The SIP dissector could crash. +// Fixed in trunk: r52354 +// Fixed in trunk-1.10: r52959 +// Fixed in trunk-1.8: r52960 +(ws-buglink:9228[]) ++ +Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 ++ +cve-idlink:2013-6338[] + +* ws-salink:2013-64[] ++ +The OpenWire dissector could go into a large loop. Discovered by Murali. +// Fixed in trunk: r52457, r52458, r52463 +// Fixed in trunk-1.10: r52490 +// Fixed in trunk-1.8: r52490 +(ws-buglink:9248[]) ++ +Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 ++ +cve-idlink:2013-6339[] + +* ws-salink:2013-65[] ++ +The TCP dissector could crash. +// Fixed in trunk: r52570 +// Fixed in trunk-1.10: r52961 +// Fixed in trunk-1.8: r52962 +(ws-buglink:9263[]) ++ +Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10 ++ +cve-idlink:2013-6340[] + + +The following bugs have been fixed: + +//* Wireshark will strip the paint off your car, then apply a hideous +//flame job to the hood and fenders using gray, red, and black primer. +//(ws-buglink:0000[]) + +* new_packet_list: EAP-TLS reassemble does not happen when NEW_PACKET_LIST is toggled. (ws-buglink:5349[]) + +* The value of 'SEND_TO_UE' in the DIAMETER Gx dictionary for Packet-Filter-Usage AVP is 0 instead of 1. (ws-buglink:9126[]) + +* Bssgp => SGSN-INVOKE-TRACE use the wrong function... (ws-buglink:9157[]) + +* Files with pcap-ng Simple Packet Blocks can't be read. +(ws-buglink:9200[]) + +* Wireshark lua dissector unable to load for media_type=application/octet-stream. (ws-buglink:9296[]) + +* Wireshark crash when dissecting packet with NTLMSSP. (ws-buglink:9299[]) + +* DCERPC data_blobs are not correctly dissected when NDR64 encoding is used. (ws-buglink:9301[]) + +* multiple PDU in the same DCERPC packet are not correctly decrypted. (ws-buglink:9302[]) + +* The tshark summary line doesn't display the frame number or displays it sporadically. (ws-buglink:9317[]) + +* Fix dissection of PTP Management messages. (ws-buglink:9262[]) + +* Duplicate IRC header field abbreviation breaks filter (example: irc.response.command). (ws-buglink:9360[]) + +=== New and Updated Features + +There are no new features in this release. + +=== New Protocol Support + +There are no new protocols in this release. + +=== Updated Protocol Support + +--sort-and-group-- + +BSSGP +DCERPC +DCERPC NT +DIAMETER +Ethernet +EtherNet/IP +IEEE 802.15.4 +IRC +NBAP +NTLMSSP +OpenWire +SIP +WiMax + +--sort-and-group-- + +=== New and Updated Capture File Support + +--sort-and-group-- + +. + +--sort-and-group-- + +=== Getting Wireshark + +Wireshark source code and installation packages are available from +http://www.wireshark.org/download.html. + +=== Vendor-supplied Packages + +Most Linux and Unix vendors supply their own Wireshark packages. You can +usually install or upgrade Wireshark using the package management system +specific to that platform. A list of third-party packages can be found +on the http://www.wireshark.org/download.html#thirdparty[download page] +on the Wireshark web site. + +== File Locations + +Wireshark and TShark look in several different locations for preference +files, plugins, SNMP MIBS, and RADIUS dictionaries. These locations vary +from platform to platform. You can use About→Folders to find the default +locations on your system. + +== Known Problems + +Dumpcap might not quit if Wireshark or TShark crashes. +(ws-buglink:1419[]) + +The BER dissector might infinitely loop. +(ws-buglink:1516[]) + +Capture filters aren't applied when capturing from named pipes. +(ws-buglink:1814[]) + +Filtering tshark captures with display filters (-R) no longer works. +(ws-buglink:2234[]) + +The 64-bit Windows installer does not support Kerberos decryption. +(https://wiki.wireshark.org/Development/Win64[Win64 development page]) + +Application crash when changing real-time option. +(ws-buglink:4035[]) + +Hex pane display issue after startup. +(ws-buglink:4056[]) + +Packet list rows are oversized. +(ws-buglink:4357[]) + +Summary pane selected frame highlighting not maintained. +(ws-buglink:4445[]) + +Wireshark and TShark will display incorrect delta times in some cases. +(ws-buglink:4985[]) + +== Getting Help + +Community support is available on http://ask.wireshark.org/[Wireshark's +Q&A site] and on the wireshark-users mailing list. Subscription +information and archives for all of Wireshark's mailing lists can be +found on http://www.wireshark.org/lists/[the web site]. + +Official Wireshark training and certification are available from +http://www.wiresharktraining.com/[Wireshark University]. + +== Frequently Asked Questions + +A complete FAQ is available on the +http://www.wireshark.org/faq.html[Wireshark web site].
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/Makefile.am ^
@@ -3,7 +3,7 @@ # (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer # Library) # -# $Id: Makefile.am 50938 2013-07-26 22:03:59Z gerald $ +# $Id: Makefile.am 53008 2013-10-31 19:24:22Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -56,7 +56,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 2:10:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:11:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ include Makefile.common
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/Makefile.in ^
@@ -20,7 +20,7 @@ # (EPAN is a historical name; it stands for Ethereal Protocol ANalyzer # Library) # -# $Id: Makefile.am 50938 2013-07-26 22:03:59Z gerald $ +# $Id: Makefile.am 53008 2013-10-31 19:24:22Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -309,6 +309,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -357,6 +358,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@ @@ -571,7 +573,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 2:10:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:11:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/crypt/Makefile.in ^
@@ -141,6 +141,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -189,6 +190,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dfilter/Makefile.in ^
@@ -178,6 +178,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -226,6 +227,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/Makefile.in ^
@@ -1155,6 +1155,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -1203,6 +1204,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/dcerpc/Makefile.in ^
@@ -82,6 +82,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -130,6 +131,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-bssgp.c ^
@@ -2,7 +2,7 @@ * Routines for Base Station Subsystem GPRS Protocol dissection * Copyright 2000, Susanne Edlund <susanne.edlund@ericsson.com> * - * $Id: packet-bssgp.c 49237 2013-05-10 22:06:34Z gerald $ + * $Id: packet-bssgp.c 53010 2013-10-31 21:52:27Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -4735,7 +4735,7 @@ pinfo->link_dir = P2P_DIR_UL; /* Trace Type Trace Type/11.3.38 M TLV 3 / - ELEM_MAND_TELV(0x22, BSSGP_PDU_TYPE, DE_BSSGP_BVCI , NULL); + ELEM_MAND_TELV(0x22, BSSGP_PDU_TYPE, DE_BSSGP_TRACE_TYPE , NULL); / Trace Reference Trace Reference/11.3.37 M TLV 4 / ELEM_MAND_TELV(0x21, BSSGP_PDU_TYPE, DE_BSSGP_TRACE_REF , NULL); / Trigger Id Trigger Id/11.3.40 O TLV 4-24 */
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-dcerpc-nt.c ^
@@ -6,7 +6,7 @@ * Copyright 2001-2003, Tim Potter <tpot@samba.org> * Copyright 2011, Matthieu Patou <mat@matws.net> * - * $Id: packet-dcerpc-nt.c 42266 2012-04-26 16:05:05Z wmeier $ + * $Id: packet-dcerpc-nt.c 53011 2013-10-31 22:46:40Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -84,7 +84,7 @@ int use_remaining_space) { proto_item item; - guint32 len; + guint3264 len; proto_tree subtree = tree; item = proto_tree_add_text(tree, tvb, offset, 0, "%s", @@ -95,11 +95,11 @@ if (use_remaining_space) { len = tvb_length_remaining (tvb, offset); } else { - offset = dissect_ndr_uint32(tvb, offset, pinfo, subtree, drep, + offset = dissect_ndr_uint3264(tvb, offset, pinfo, subtree, drep, hf_nt_data_blob_len, &len); } - proto_tree_add_text(subtree, tvb, offset, len, "Blob data"); - offset += len; + proto_tree_add_text(subtree, tvb, offset, (int)len, "Blob data"); + offset += (int)len; return offset; }
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-dcerpc.c ^
@@ -4,7 +4,7 @@ * Copyright 2003, Tim Potter <tpot[AT]samba.org> * Copyright 2010, Julien Kerihuel <j.kerihuel[AT]openchange.org> * - * $Id: packet-dcerpc.c 42487 2012-05-07 22:11:34Z wmeier $ + * $Id: packet-dcerpc.c 53011 2013-10-31 22:46:40Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -4300,6 +4300,7 @@ static const guint8 nulls[4] = { 0 }; int start_offset; int padding = 0; + int subtvb_len = 0; proto_item ti = NULL; proto_item tf = NULL; proto_tree dcerpc_tree = NULL; @@ -4477,9 +4478,10 @@ (and other functions might fail as well) computing the right start * offset otherwise. / - fragment_tvb = tvb_new_subset(tvb, 0, - MIN((hdr.frag_len + (guint) start_offset), tvb_length(tvb)) / length /, - hdr.frag_len + start_offset / reported_length /); + subtvb_len = MIN(hdr.frag_len, tvb_length(tvb)); + fragment_tvb = tvb_new_subset(tvb, start_offset, + subtvb_len / length /, + hdr.frag_len / reported_length /); / * Packet type specific stuff is next. @@ -4487,36 +4489,36 @@ switch (hdr.ptype) { case PDU_BIND: case PDU_ALTER: - dissect_dcerpc_cn_bind(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr); + dissect_dcerpc_cn_bind(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr); break; case PDU_BIND_ACK: case PDU_ALTER_ACK: - dissect_dcerpc_cn_bind_ack(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr); + dissect_dcerpc_cn_bind_ack(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr); break; case PDU_AUTH3: /* * Nothing after the common header other than credentials. / - dissect_dcerpc_cn_auth(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr, TRUE, + dissect_dcerpc_cn_auth(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr, TRUE, &auth_info); break; case PDU_REQ: - dissect_dcerpc_cn_rqst(fragment_tvb, offset, pinfo, dcerpc_tree, tree, &hdr); + dissect_dcerpc_cn_rqst(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, tree, &hdr); break; case PDU_RESP: - dissect_dcerpc_cn_resp(fragment_tvb, offset, pinfo, dcerpc_tree, tree, &hdr); + dissect_dcerpc_cn_resp(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, tree, &hdr); break; case PDU_FAULT: - dissect_dcerpc_cn_fault(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr); + dissect_dcerpc_cn_fault(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr); break; case PDU_BIND_NAK: - dissect_dcerpc_cn_bind_nak(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr); + dissect_dcerpc_cn_bind_nak(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr); break; case PDU_CO_CANCEL: @@ -4525,7 +4527,7 @@ Nothing after the common header other than an authentication * verifier. / - dissect_dcerpc_cn_auth(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr, FALSE, + dissect_dcerpc_cn_auth(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr, FALSE, &auth_info); break; @@ -4536,12 +4538,12 @@ / break; case PDU_RTS: - dissect_dcerpc_cn_rts(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr); + dissect_dcerpc_cn_rts(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr); break; default: /* might as well dissect the auth info */ - dissect_dcerpc_cn_auth(fragment_tvb, offset, pinfo, dcerpc_tree, &hdr, FALSE, + dissect_dcerpc_cn_auth(fragment_tvb, MIN(offset - start_offset, subtvb_len), pinfo, dcerpc_tree, &hdr, FALSE, &auth_info); break; }
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-enip.c ^
@@ -14,7 +14,7 @@ * Michael Mann * Copyright 2011 * - * $Id: packet-enip.c 42271 2012-04-26 16:47:37Z wmeier $ + * $Id: packet-enip.c 53010 2013-10-31 21:52:27Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -400,7 +400,8 @@ { 0, "Auto-negotiation in progress" }, { 1, "Auto-negotiation and speed detection failed" }, { 2, "Auto-negotiation failed but detected speed" }, - { 3, "Auto-negotiation not attempted. Forced speed and duplex." }, + { 3, "Successfully negotiatied speed and duplex" }, + { 4, "Auto-negotiation not attempted. Forced speed and duplex" }, { 0, NULL } }; @@ -1110,6 +1111,7 @@ { tvbuff_t next_tvb; + gboolean save_info; if (total_len < 35) { @@ -1123,10 +1125,15 @@ if( tvb_get_guint8(tvb, offset) == 0 ) proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_LITTLE_ENDIAN); else - { - / Call ARP dissector / + { + / Dissect ARP PDU, but don't have it change column info */ + save_info = col_get_writable(pinfo->cinfo); + col_set_writable(pinfo->cinfo, FALSE); + next_tvb = tvb_new_subset(tvb, offset+7, 28, 28); call_dissector(arp_handle, next_tvb, pinfo, tree); + + col_set_writable(pinfo->cinfo, save_info); } return 35;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-eth.c ^
@@ -1,7 +1,7 @@ /* packet-eth.c * Routines for ethernet packet disassembly * - * $Id: packet-eth.c 50848 2013-07-23 18:46:20Z gerald $ + * $Id: packet-eth.c 53011 2013-10-31 22:46:40Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -512,7 +512,7 @@ proto_item item; proto_tree checksum_tree; - if (trailer_tvb && fh_tree) { + if (trailer_tvb) { guint trailer_length, trailer_reported_length; guint padding_length = 0; gboolean has_fcs = FALSE;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-ethertype.c ^
@@ -3,7 +3,7 @@ * payloads (i.e., payloads when there could be an Ethernet trailer and * possibly an FCS). * - * $Id: packet-ethertype.c 43932 2012-07-23 16:16:03Z gerald $ + * $Id: packet-ethertype.c 53011 2013-10-31 22:46:40Z gerald $ * * Gilbert Ramirez <gram@alumni.rice.edu> * @@ -337,9 +337,6 @@ guint length; tvbuff_t trailer_tvb; - if (fh_tree == NULL) - return; / we're not building a protocol tree / - / OK, how much is there in that tvbuff now? */ length = tvb_reported_length(next_tvb);
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-gluster.h ^
@@ -4,7 +4,7 @@ * With contributions from: * Shreedhara LG <shreedharlg@gmail.com> * - * $Id: packet-gluster.h 42979 2012-06-01 17:10:03Z pascal $ + * $Id: packet-gluster.h 52174 2013-09-22 16:50:24Z eapache $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -356,15 +356,15 @@ /* dir-entry types from libglusterfs/src/compat.h */ enum gluster_entry_types { - DT_UNKNOWN = 0, - DT_FIFO = 1, - DT_CHR = 2, - DT_DIR = 4, - DT_BLK = 6, - DT_REG = 8, - DT_LNK = 10, - DT_SOCK = 12, - DT_WHT = 14 + GLUSTER_DT_UNKNOWN = 0, + GLUSTER_DT_FIFO = 1, + GLUSTER_DT_CHR = 2, + GLUSTER_DT_DIR = 4, + GLUSTER_DT_BLK = 6, + GLUSTER_DT_REG = 8, + GLUSTER_DT_LNK = 10, + GLUSTER_DT_SOCK = 12, + GLUSTER_DT_WHT = 14 };
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-glusterfs.c ^
@@ -2,7 +2,7 @@ * Routines for GlusterFS dissection * Copyright 2012, Niels de Vos <ndevos@redhat.com> * - * $Id: packet-glusterfs.c 43218 2012-06-11 23:14:50Z gerald $ + * $Id: packet-glusterfs.c 52174 2013-09-22 16:50:24Z eapache $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1978,15 +1978,15 @@ /* dir-entry types */ static const value_string glusterfs_entry_type_names[] = { - { DT_UNKNOWN, "DT_UNKNOWN" }, - { DT_FIFO, "DT_FIFO" }, - { DT_CHR, "DT_CHR" }, - { DT_DIR, "DT_DIR" }, - { DT_BLK, "DT_BLK" }, - { DT_REG, "DT_REG" }, - { DT_LNK, "DT_LNK" }, - { DT_SOCK, "DT_SOCK" }, - { DT_WHT, "DT_WHT" }, + { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" }, + { GLUSTER_DT_FIFO, "DT_FIFO" }, + { GLUSTER_DT_CHR, "DT_CHR" }, + { GLUSTER_DT_DIR, "DT_DIR" }, + { GLUSTER_DT_BLK, "DT_BLK" }, + { GLUSTER_DT_REG, "DT_REG" }, + { GLUSTER_DT_LNK, "DT_LNK" }, + { GLUSTER_DT_SOCK, "DT_SOCK" }, + { GLUSTER_DT_WHT, "DT_WHT" }, { 0, NULL } };
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-ieee802154.c ^
@@ -1,6 +1,6 @@ /* packet-ieee802154.c * - * $Id: packet-ieee802154.c 50848 2013-07-23 18:46:20Z gerald $ + * $Id: packet-ieee802154.c 52956 2013-10-29 18:37:57Z gerald $ * * Auxiliary Security Header support and * option to force TI CC24xx FCS format @@ -2263,7 +2263,7 @@ /* link new mapping record to addr hash tables / if ( g_hash_table_lookup_extended(au_ieee802154_map->short_table, &addr16, &old_key, NULL) ) { / update short addr hash table, reusing pointer to old key / - g_hash_table_insert(au_ieee802154_map->short_table, &old_key, p_map_rec); + g_hash_table_insert(au_ieee802154_map->short_table, old_key, p_map_rec); } else { / create new hash entry / g_hash_table_insert(au_ieee802154_map->short_table, se_memdup(&addr16, sizeof(addr16)), p_map_rec); @@ -2271,7 +2271,7 @@ if ( g_hash_table_lookup_extended(au_ieee802154_map->long_table, &long_addr, &old_key, NULL) ) { / update long addr hash table, reusing pointer to old key / - g_hash_table_insert(au_ieee802154_map->long_table, &old_key, p_map_rec); + g_hash_table_insert(au_ieee802154_map->long_table, old_key, p_map_rec); } else { / create new hash entry */ g_hash_table_insert(au_ieee802154_map->long_table, se_memdup(&long_addr, sizeof(long_addr)), p_map_rec);
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-irc.c ^
@@ -1,6 +1,6 @@ /* packet-irc.c * - * $Id: packet-irc.c 49237 2013-05-10 22:06:34Z gerald $ + * $Id: packet-irc.c 53021 2013-11-01 16:29:10Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -530,7 +530,7 @@ { &hf_irc_response_command, { "Command", "irc.response.command", FT_STRING, BASE_NONE, NULL, 0x0, "Response command", HFILL }}, - { &hf_irc_response_num_command, { "Command", "irc.response.command", FT_UINT16, BASE_DEC, + { &hf_irc_response_num_command, { "Command", "irc.response.num_command", FT_UINT16, BASE_DEC, NULL, 0x0, "Response (numeric) command", HFILL }}, { &hf_irc_response_command_param, { "Parameter", "irc.response.command_parameter", FT_STRING, BASE_NONE,
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-nbap.c ^
@@ -10,7 +10,7 @@ * Routines for UMTS Node B Application Part(NBAP) packet dissection * Copyright 2005, 2009 Anders Broman <anders.broman@ericsson.com> * - * $Id: packet-nbap.c 51230 2013-08-09 01:51:41Z morriss $ + * $Id: packet-nbap.c 52958 2013-10-29 18:46:49Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -6507,7 +6507,7 @@ }nbap_dch_channel_info_t; -nbap_dch_channel_info_t nbap_dch_chnl_info[maxNrOfDCHs]; +nbap_dch_channel_info_t nbap_dch_chnl_info[256]; /* Struct to collect E-DCH data in a packet * As the address data comes before the ddi entries @@ -14566,7 +14566,7 @@ #line 626 "../../asn1/nbap/nbap.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, - 0U, maxNrOfDCHs, &dch_id, FALSE); + 0U, 255U, &dch_id, FALSE); if(g_num_dch_in_flow>0){ g_dchs_in_flow_list[g_num_dch_in_flow-1]=dch_id;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-ncp-sss.c ^
@@ -3,7 +3,7 @@ * Greg Morris <gmorris@novell.com> * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ncp-sss.c 51909 2013-09-09 23:46:20Z gerald $ + * $Id: packet-ncp-sss.c 52547 2013-10-11 18:18:56Z morriss $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -33,6 +33,7 @@ #include <epan/strutil.h> #include "packet-ncp-int.h" #include "packet-ncp-sss.h" +#include "isprint.h" static gint ett_sss = -1;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-ntlmssp.c ^
@@ -5,7 +5,7 @@ * Devin Heitmueller <dheitmueller@netilla.com> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-ntlmssp.c 47282 2013-01-25 20:19:58Z gerald $ + * $Id: packet-ntlmssp.c 53019 2013-11-01 16:17:18Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -714,7 +714,7 @@ md5_finish(&md5state,challenges_hash); memcpy(challenges_hash_first8,challenges_hash,8); crypt_des_ecb_long(nt_challenge_response,nt_password_hash,challenges_hash_first8); - if( !memcmp(ref_nt_challenge_response,nt_challenge_response,24) ) { + if (ref_nt_challenge_response && !memcmp(ref_nt_challenge_response, nt_challenge_response, 24)) { found = 1; break; } @@ -728,7 +728,11 @@ else { crypt_des_ecb_long(lm_challenge_response,lm_password_hash,serverchallenge); } - if( !memcmp(ref_nt_challenge_response,nt_challenge_response,24) && !memcmp(ref_lm_challenge_response,lm_challenge_response,24) ) { + if (ref_nt_challenge_response && + !memcmp(ref_nt_challenge_response, nt_challenge_response, 24) && + ref_lm_challenge_response && + !memcmp(ref_lm_challenge_response, lm_challenge_response, 24)) + { found = 1; } } @@ -1649,8 +1653,6 @@ * - has the AUTHENTICATE message in a second TCP connection; * (The authentication aparently succeeded). / - conv_ntlmssp_info = p_get_proto_data(pinfo->fd, proto_ntlmssp); - if (conv_ntlmssp_info == NULL) { / * There isn't any. Is there any from this conversation? If so, * it means this is the first time we've dissected this frame, so @@ -1668,8 +1670,6 @@ /* XXX: The conv_ntlmssp_info struct attached to the frame is the same as the one attached to the conversation. That is: both* point to the exact same struct in memory. Is this what is indended ? */ - p_add_proto_data(pinfo->fd, proto_ntlmssp, conv_ntlmssp_info); - } if (conv_ntlmssp_info != NULL) { if (conv_ntlmssp_info->flags & NTLMSSP_NEGOTIATE_UNICODE)
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-openwire.c ^
@@ -3,7 +3,7 @@ * * metatech <metatechbe@gmail.com> * - * $Id: packet-openwire.c 49237 2013-05-10 22:06:34Z gerald $ + * $Id: packet-openwire.c 52491 2013-10-10 13:10:47Z eapache $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -942,6 +942,9 @@ /* Value */ offset += dissect_openwire_type(tvb, pinfo, entry_tree, offset, hf_openwire_none, OPENWIRE_TYPE_NESTED, type, FALSE); proto_item_set_len(map_entry, offset - entryStartOffset); + if (offset - entryStartOffset <= 0) { + break; + } } } }
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-ptp.c ^
@@ -20,7 +20,7 @@ * - Torrey Atcitty & Dave Olsen 05.14.2010 * - Added support for 802.1AS D7.0 * - * $Id: packet-ptp.c 45484 2012-10-11 20:45:24Z wmeier $ + * $Id: packet-ptp.c 53015 2013-11-01 15:12:40Z pascal $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -2929,7 +2929,7 @@ break; } - managementData_ti = proto_tree_add_text(ptp_tree, tvb, Offset, tlv_length, "Data"); + managementData_ti = proto_tree_add_text(ptp_tree, tvb, Offset, tlv_length - 2, "Data"); /* data field of the management message (subtree)*/ ptp_managementData_tree = proto_item_add_subtree(managementData_ti, ett_ptp_v2_managementData);
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-sip.c ^
@@ -10,7 +10,7 @@ * Copyright 2004, Anders Broman <anders.broman@ericsson.com> * Copyright 2011, Anders Broman <anders.broman@ericsson.com>, Johan Wahl <johan.wahl@ericsson.com> * - * $Id: packet-sip.c 51906 2013-09-09 22:23:18Z gerald $ + * $Id: packet-sip.c 52960 2013-10-29 18:59:51Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -3093,11 +3093,20 @@ !strncmp(content_encoding_parameter_str, "gzip", 4)){ /* The body is gzip:ed */ next_tvb = tvb_uncompress(tvb, offset, datalen); - add_new_data_source(pinfo, next_tvb, "gunziped data"); - if(sip_tree) { - ti_a = proto_tree_add_item(sip_tree, hf_sip_msg_body, next_tvb, 0, -1, - ENC_NA); - message_body_tree = proto_item_add_subtree(ti_a, ett_sip_message_body); + if (next_tvb) { + add_new_data_source(pinfo, next_tvb, "gunziped data"); + if(sip_tree) { + ti_a = proto_tree_add_item(sip_tree, hf_sip_msg_body, next_tvb, 0, -1, + ENC_NA); + message_body_tree = proto_item_add_subtree(ti_a, ett_sip_message_body); + } + } else { + next_tvb = tvb_new_subset(tvb, offset, datalen, reported_datalen); + if(sip_tree) { + ti_a = proto_tree_add_item(sip_tree, hf_sip_msg_body, next_tvb, 0, -1, + ENC_NA); + message_body_tree = proto_item_add_subtree(ti_a, ett_sip_message_body); + } } }else{ next_tvb = tvb_new_subset(tvb, offset, datalen, reported_datalen);
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-tcp.c ^
@@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c 49831 2013-06-07 06:58:31Z sake $ + * $Id: packet-tcp.c 52962 2013-10-29 19:55:46Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1737,7 +1737,7 @@ /* TCP analysis already flags this (in COL_INFO) as a retransmission--if it's enabled / } - nbytes = tvb_reported_length_remaining(tvb, offset); + nbytes = MAX(0, tvb_reported_length_remaining(tvb, offset)); proto_tree_add_bytes_format(tcp_tree, hf_tcp_data, tvb, offset, nbytes, NULL, "%sTCP segment data (%u byte%s)", str, nbytes, plurality(nbytes, "", "s")); @@ -1761,7 +1761,7 @@ / if (msp->flags&MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT) { /* The dissector asked for the entire segment / - len = tvb_length_remaining(tvb, offset); + len = MAX(0, tvb_length_remaining(tvb, offset)); } else { len = MIN(nxtseq, msp->nxtpdu) - seq; } @@ -1906,7 +1906,7 @@ will complete reassembly even if it * is only one single byte in length. / - msp->nxtpdu = seq + tvb_reported_length_remaining(tvb, offset) + 1; + msp->nxtpdu = seq + MAX(0, tvb_reported_length_remaining(tvb, offset)) + 1; msp->flags \|= MSP_FLAGS_REASSEMBLE_ENTIRE_SEGMENT; } else if (pinfo->desegment_len == DESEGMENT_UNTIL_FIN) { tcpd->fwd->flags \|= TCP_FLOW_REASSEMBLE_UNTIL_FIN; @@ -1930,7 +1930,7 @@ / nbytes = another_pdu_follows > 0 ? another_pdu_follows - : tvb_reported_length_remaining(tvb, offset); + : MAX(0, tvb_reported_length_remaining(tvb, offset)); proto_tree_add_bytes_format(tcp_tree, hf_tcp_data, tvb, offset, nbytes, NULL, "TCP segment data (%u byte%s)", nbytes, plurality(nbytes, "", "s")); @@ -2078,7 +2078,7 @@ * XXX - remember what protocol the last subdissector * was, and report it as a continuation of that, instead? / - nbytes = tvb_reported_length_remaining(tvb, deseg_offset); + nbytes = MAX(0, tvb_reported_length_remaining(tvb, deseg_offset)); proto_tree_add_bytes_format(tcp_tree, hf_tcp_data, tvb, deseg_offset, -1, NULL, "TCP segment data (%u byte%s)", nbytes, plurality(nbytes, "", "s")); @@ -2240,7 +2240,7 @@ / if(!pinfo->fd->flags.visited && tcp_analyze_seq){ guint remaining_bytes; - remaining_bytes=tvb_reported_length_remaining(tvb, offset); + remaining_bytes = MAX(0, tvb_reported_length_remaining(tvb, offset)); if(plen>remaining_bytes){ pinfo->want_pdu_tracking=2; pinfo->bytes_until_next_pdu=plen-remaining_bytes; @@ -4603,7 +4603,7 @@ /* Check the packet length to see if there's more data (it could be an ACK-only packet) */ - length_remaining = tvb_length_remaining(tvb, offset); + length_remaining = MAX(0, tvb_length_remaining(tvb, offset)); if (tcph->th_have_seglen) { if( data_out_file ) {
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/packet-wccp.c ^
@@ -2,7 +2,7 @@ * Routines for Web Cache Communication Protocol dissection * Jerry Talkington <jtalkington@users.sourceforge.net> * - * $Id: packet-wccp.c 39503 2011-10-21 02:10:19Z wmeier $ + * $Id: packet-wccp.c 52466 2013-10-09 16:08:55Z pascal $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -996,8 +996,8 @@ if (bucket == 0xff) { cur="Unassigned"; } else { - cur=ep_strdup_printf("%u%s", bucket >> 1, - (bucket & 0x01) ? " (Alt)" : ""); + cur=ep_strdup_printf("%u%s", bucket & 0x7F, + (bucket & 0x80) ? " (Alt)" : ""); } return cur; } @@ -1052,7 +1052,7 @@ for (i = 0; i < 256; i += 4) { proto_tree_add_text(info_tree, tvb, offset, 4, - "Buckets %d - %d: %10s %10s %10s %10s", + "Buckets %3d - %3d: %10s %10s %10s %10s", i, i + 3, assignment_bucket_name(tvb_get_guint8(tvb, offset)), assignment_bucket_name(tvb_get_guint8(tvb, offset+1)),
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/dissectors/pidl/Makefile.in ^
@@ -82,6 +82,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -130,6 +131,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/ftypes/Makefile.in ^
@@ -141,6 +141,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -189,6 +190,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/packet.c ^
@@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c 47278 2013-01-25 19:35:19Z gerald $ + * $Id: packet.c 53011 2013-10-31 22:46:40Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1055,7 +1055,7 @@ dtbl_entry->initial = dtbl_entry->current; /* do the table insertion / - g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern, + g_hash_table_insert( sub_dissectors->hash_table, (gpointer)g_strdup(pattern), (gpointer)dtbl_entry); / @@ -1131,7 +1131,7 @@ dtbl_entry->current = handle; /* do the table insertion */ - g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern, + g_hash_table_insert( sub_dissectors->hash_table, (gpointer)g_strdup(pattern), (gpointer)dtbl_entry); } @@ -1532,7 +1532,7 @@ case FT_STRINGZ: sub_dissectors->hash_table = g_hash_table_new_full( g_str_hash, g_str_equal, - NULL, + &g_free, &g_free ); break;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/reassemble.c ^
@@ -1,7 +1,7 @@ /* reassemble.c * Routines for {fragment,segment} reassembly * - * $Id: reassemble.c 51827 2013-09-07 21:51:42Z eapache $ + * $Id: reassemble.c 52196 2013-09-23 23:38:34Z eapache $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -871,12 +871,17 @@ /* we have received an entire packet, defragment it and * free all fragments / - / We can't free the old data because of + /* A slightly different fix for * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9027 - * This is a leak, but there's too much other architectural junk - * involved to make a real backport possible, and a leak is better than - * a crash. + * that also addresses + * https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9169 / + if (fd_head->data) { + tvbuff_t old_tvb_data; + + old_tvb_data = tvb_new_child_real_data(tvb, fd_head->data, 0, 0); + tvb_set_free_cb(old_tvb_data, g_free); + } fd_head->data = g_malloc(max); /* add all data fragments */
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/wslua/Makefile.in ^
@@ -146,6 +146,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -194,6 +195,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/epan/wspython/Makefile.in ^
@@ -173,6 +173,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -221,6 +222,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/help/Makefile.in ^
@@ -111,6 +111,7 @@ am__installdirs = "$(DESTDIR)$(helpdir)" DATA = $(help_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -159,6 +160,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/make-version.pl ^
@@ -2,7 +2,7 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id: make-version.pl 51909 2013-09-09 23:46:20Z gerald $ +# $Id: make-version.pl 53007 2013-10-31 19:22:04Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -75,7 +75,7 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 8, - "version_micro" => 10, + "version_micro" => 11, "version_build" => 0, "enable" => 1, @@ -313,23 +313,23 @@ print "$filepath has been updated.\n"; } -# Read docbook/release_notes.xml, then write it back out with an updated -# "WiresharkCurrentVersion" line. +# Read docbook/asciidoc.conf, then write it back out with an updated +# wireshark-version replacement line. sub update_release_notes { my $line; my $contents = ""; my $version = ""; - my $filepath = "$srcdir/docbook/release-notes.xml"; + my $filepath = "$srcdir/docbook/asciidoc.conf"; return if (!$set_version); - open(RELNOTES, "< $filepath") \|\| die "Can't read $filepath!"; - while ($line = <RELNOTES>) { - # <!ENTITY WiresharkCurrentVersion "1.7.1"> + open(ADOC_CONF, "< $filepath") \|\| die "Can't read $filepath!"; + while ($line = <ADOC_CONF>) { + # wireshark-version:\[\]=1.9.1 - if ($line =~ /<\!ENTITY\s+WiresharkCurrentVersion\s+.([\r\n]+)$/) { - $line = sprintf("<!ENTITY WiresharkCurrentVersion \"%d.%d.%d\">$1", + if ($line =~ /^wireshark-version:\\\[\\\]=.([\r\n]+)$/) { + $line = sprintf("wireshark-version:\\\[\\\]=%d.%d.%d$1", $version_pref{"version_major"}, $version_pref{"version_minor"}, $version_pref{"version_micro"}, @@ -338,9 +338,9 @@ $contents .= $line } - open(RELNOTES, "> $filepath") \|\| die "Can't write $filepath!"; - print(RELNOTES $contents); - close(RELNOTES); + open(ADOC_CONF, "> $filepath") \|\| die "Can't write $filepath!"; + print(ADOC_CONF $contents); + close(ADOC_CONF); print "$filepath has been updated.\n"; }
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/manuf ^
@@ -4,7 +4,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf 51837 2013-09-08 14:34:52Z gerald $ +# $Id: manuf 52892 2013-10-27 14:35:00Z gerald $ # # Laurent Deniel <laurent.deniel [AT] free.fr> # @@ -6477,7 +6477,7 @@ 00:19:32 GudeAnal # Gude Analog- und Digialsysteme GmbH 00:19:33 Strix # Strix Systems, Inc. 00:19:34 TrendonT # TRENDON TOUCH TECHNOLOGY CORP. -00:19:35 DürrDent # DÜRR DENTAL AG +00:19:35 DuerrDen # DUERR DENTAL AG 00:19:36 Sterlite # STERLITE OPTICAL TECHNOLOGIES LIMITED 00:19:37 Commerce # CommerceGuard AB 00:19:38 UmbCommu # UMB Communications Co., Ltd. @@ -7817,7 +7817,7 @@ 00:1E:6E Shenzhen # Shenzhen First Mile Communications Ltd 00:1E:6F Magna-Po # Magna-Power Electronics, Inc. 00:1E:70 CobhamDe # Cobham Defence Communications Ltd -00:1E:71 Igeacare # Igeacare Solutions Inc. +00:1E:71 MircomGr # MIrcom Group of Companies 00:1E:72 Pcs 00:1E:73 Zte # ZTE CORPORATION 00:1E:74 SagemCom # SAGEM COMMUNICATION @@ -11598,7 +11598,7 @@ 00:50:C2:34:F0:00/36 NorthPol # North Pole Engineering, Inc. 00:50:C2:35:00:00/36 KinesysP # Kinesys Projects Limited 00:50:C2:35:10:00/36 Finesyst # Finesystem Co., Ltd -00:50:C2:35:20:00/36 Edixia +00:50:C2:35:20:00/36 Luceo 00:50:C2:35:30:00/36 Crossing # Crossing Informationssysteme GmbH 00:50:C2:35:40:00/36 Advanced # Advanced IP Communications 00:50:C2:35:50:00/36 Ihm @@ -14280,7 +14280,7 @@ 00:50:C2:DD:80:00/36 SelexInt # Selex Systems Integration Inc 00:50:C2:DD:90:00/36 Metrawar # Metraware 00:50:C2:DD:A0:00/36 RbzRobot # rbz robot design s.l. -00:50:C2:DD:B0:00/36 Edixia +00:50:C2:DD:B0:00/36 Luceo 00:50:C2:DD:C0:00/36 VisionCo # Vision & Control GmbH 00:50:C2:DD:D0:00/36 A&AGener # A&A GENERAL SRL 00:50:C2:DD:E0:00/36 DrsIts # DRS ITS @@ -15254,7 +15254,7 @@ 00:80:61 Litton # LITTON SYSTEMS, INC. 00:80:62 Interfac # INTERFACE CO. 00:80:63 Hirschma # Hirschmann Automation and Control GmbH -00:80:64 TattileS # Tattile SRL +00:80:64 WyseTech # WYSE TECHNOLOGY LLC 00:80:65 Cybergra # CYBERGRAPHIC SYSTEMS PTY LTD. 00:80:66 ArcomCon # ARCOM CONTROL SYSTEMS, LTD. 00:80:67 SquareD # SQUARE D COMPANY @@ -15316,7 +15316,7 @@ 00:80:9F AlcatelB # ALCATEL BUSINESS SYSTEMS 00:80:A0 EdisaHew # EDISA HEWLETT PACKARD S/A 00:80:A1 Microtes # MICROTEST, INC. -00:80:A2 TattileS # Tattile SRL +00:80:A2 Creative # CREATIVE ELECTRONIC SYSTEMS 00:80:A3 Lantroni # Lantronix 00:80:A4 LibertyE # LIBERTY ELECTRONICS 00:80:A5 SpeedInt # SPEED INTERNATIONAL @@ -15338,7 +15338,7 @@ 00:80:B5 UnitedNe # UNITED NETWORKS INC. 00:80:B6 ThemisCo # THEMIS COMPUTER 00:80:B7 StellarC # STELLAR COMPUTER -00:80:B8 Bug # BUG, INCORPORATED +00:80:B8 BUGMoris # B.U.G. MORISEIKI, INCORPORATED 00:80:B9 ArcheTec # ARCHE TECHNOLIGIES INC. 00:80:BA Speciali # SPECIALIX (ASIA) PTE, LTD 00:80:BB HughesLa # HUGHES LAN SYSTEMS @@ -16849,10 +16849,12 @@ 04:32:F4 Partron 04:36:04 Gyeyoung # Gyeyoung I&T 04:3D:98 Chongqin # ChongQing QingJia Electronics CO.,LTD +04:44:A1 TeleconG # TELECON GALICIA,S.A. 04:46:65 MurataMa # Murata Manufacturing Co., Ltd. 04:4A:50 RamaxelT # Ramaxel Technology (Shenzhen) limited company 04:4B:FF Guangzho # GuangZhou Hedy Digital Technology Co., Ltd 04:4C:EF FujianSa # Fujian Sanao Technology Co.,Ltd +04:4E:06 Ericsson # Ericsson AB 04:4F:8B Adapteva # Adapteva, Inc. 04:4F:AA RuckusWi # Ruckus Wireless 04:54:53 Apple @@ -16919,6 +16921,7 @@ 04:F4:BC XenaNetw # Xena Networks 04:F7:E4 Apple 04:F8:C2 Flaircom # Flaircomm Microelectronics, Inc. +04:F9:38 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 04:FE:31 SamsungE # Samsung Electronics Co.,Ltd 04:FE:7F Cisco # CISCO SYSTEMS, INC. 04:FF:51 Novamedi # NOVAMEDIA INNOVISION SP. Z O.O. @@ -17064,6 +17067,7 @@ 08:00:8E TandemCo # TANDEM COMPUTERS 08:00:8F Chipcom # CHIPCOM CORPORATION 08:00:90 Retix +08:03:71 KrgCorpo # KRG CORPORATE 08:08:C2 SamsungE # Samsung Electronics 08:08:EA Amsc 08:0C:0B SysmikDr # SysMik GmbH Dresden @@ -17093,10 +17097,14 @@ 08:3A:B8 ShinodaP # Shinoda Plasma Co., Ltd. 08:3E:0C ArrisGro # ARRIS Group, Inc. 08:3E:8E HonHaiPr # Hon Hai Precision Ind.Co.Ltd +08:3F:76 Intellia # Intellian Technologies, Inc. +08:40:27 Gridstor # Gridstore Inc. 08:48:2C RaycoreT # Raycore Taiwan Co., LTD. 08:4E:1C H2aLlc # H2A Systems, LLC 08:4E:BF BroadNet # Broad Net Mux Corporation 08:51:2E OrionDia # Orion Diagnostica Oy +08:52:40 EbvElekt # EbV Elektronikbau- und Vertriebs GmbH +08:5A:E0 Recovisi # Recovision Technology Co., Ltd. 08:5B:0E Fortinet # Fortinet, Inc. 08:60:6E AsustekC # ASUSTek COMPUTER INC. 08:63:61 HuaweiTe # Huawei Technologies Co., Ltd @@ -17152,10 +17160,12 @@ 08:FA:E0 FohhnAud # Fohhn Audio AG 08:FC:52 OpenxsBv # OpenXS BV 08:FC:88 SamsungE # Samsung Electronics Co.,Ltd +08:FD:0E SamsungE # Samsung Electronics Co.,Ltd 09:00:6A AT&T 0C:04:00 JantarDO # Jantar d.o.o. 0C:05:35 Juniper # Juniper Systems 0C:11:05 Ringslin # Ringslink (Xiamen) Network Communication Technologies Co., Ltd +0C:12:62 Zte # zte corporation 0C:13:0B Uniqoteq # Uniqoteq Ltd. 0C:14:20 SamsungE # Samsung Electronics Co.,Ltd 0C:15:C5 Sdtec # SDTEC Co., Ltd. @@ -17171,11 +17181,13 @@ 0C:37:DC HuaweiTe # Huawei Technologies Co., Ltd 0C:39:56 Observat # Observator instruments 0C:3C:65 DomeImag # Dome Imaging Inc +0C:3E:9F Apple # Apple, Inc 0C:46:9D MsSedco # MS Sedco 0C:47:3D HitronTe # Hitron Technologies. Inc 0C:4C:39 Mitrasta # Mitrastar Technology 0C:4D:E9 Apple 0C:51:F7 ChauvinA # CHAUVIN ARNOUX +0C:54:A5 Pegatron # PEGATRON CORPORATION 0C:55:21 Axiros # Axiros GmbH 0C:56:5C HybroadV # HyBroad Vision (Hong Kong) Technology Co Ltd 0C:57:EB Mueller # Mueller Systems @@ -17216,9 +17228,11 @@ 0C:A6:94 SunitecE # Sunitec Enterprise Co.,Ltd 0C:AF:5A GenusPow # GENUS POWER INFRASTRUCTURES LIMITED 0C:B4:EF Digience # Digience Co.,Ltd. +0C:BD:51 TctMobil # TCT Mobile Limited 0C:BF:15 Genetec 0C:C0:C0 MagnetiM # MAGNETI MARELLI SISTEMAS ELECTRONICOS MEXICO 0C:C3:A7 Meritec +0C:C4:7A SuperMic # Super Micro Computer, Inc. 0C:C4:7E Eucast # EUCAST Co., Ltd. 0C:C6:55 WuxiYste # Wuxi YSTen Technology Co.,Ltd. 0C:C6:6A Nokia # Nokia Corporation @@ -17267,6 +17281,7 @@ 10:0D:32 Embedian # Embedian, Inc. 10:0D:7F Netgear # NETGEAR INC., 10:0E:2B NecCasio # NEC CASIO Mobile Communications +10:0E:7E JuniperN # Juniper networks 10:10:B6 Mccain # McCain Inc 10:12:12 VivoInte # Vivo International Corporation Pty Ltd 10:12:48 Itg # ITG, Inc. @@ -17281,6 +17296,7 @@ 10:28:31 Morion # Morion Inc. 10:2D:96 Looxcie # Looxcie Inc. 10:2E:AF TexasIns # Texas Instruments +10:33:78 Flectron # FLECTRON Co., LTD 10:37:11 SimlinkA # Simlink AS 10:3B:59 SamsungE # Samsung Electronics Co.,Ltd 10:3D:EA HfcTechn # HFC Technology (Beijing) Ltd. Co. @@ -17321,9 +17337,12 @@ 10:9A:DD Apple 10:9F:A9 Actionte # Actiontec Electronics, Inc 10:A1:3B Fujikura # FUJIKURA RUBBER LTD. +10:A5:D0 MurataMa # Murata Manufacturing Co.,Ltd. 10:A7:43 SkMtek # SK Mtek Limited 10:A9:32 BeijingC # Beijing Cyber Cloud Technology Co. ,Ltd. +10:AE:60 Private 10:B2:6B Base # base Co.,Ltd. +10:B7:13 Private 10:B7:F6 Plastofo # Plastoform Industries Ltd. 10:B9:FE LikaSrl # Lika srl 10:BA:A5 GanaI&C # GANA I&C CO., LTD @@ -17339,6 +17358,7 @@ 10:D1:DC InstarDe # INSTAR Deutschland GmbH 10:D5:42 SamsungE # Samsung Electronics Co.,Ltd 10:DD:B1 Apple +10:DD:F4 MaxwayEl # Maxway Electronics CO.,LTD 10:E2:D5 QiHardwa # Qi Hardware Inc. 10:E3:C7 SeohwaTe # Seohwa Telecom 10:E4:AF AprLlc # APR, LLC @@ -17400,6 +17420,7 @@ 14:8F:C6 Apple 14:90:90 KongtopI # KongTop industrial(shen zhen)CO.,LTD 14:94:48 BluCastl # BLU CASTLE S.A. +14:99:E2 Apple # Apple, Inc 14:9F:E8 LenovoMo # Lenovo Mobile Communication Technology Ltd. 14:A6:2C SMDezacS # S.M. Dezac S.A. 14:A8:6B Shenzhen # ShenZhen Telacom Science&Technology Co., Ltd @@ -17421,8 +17442,10 @@ 14:E4:EC MlogicLl # mLogic LLC 14:E6:E4 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 14:EB:33 Bsmedias # BSMediasoft Co., Ltd. +14:ED:A5 WächterS # Wächter GmbH Sicherheitssysteme 14:EE:9D AirnavLl # AirNav Systems LLC 14:F0:C5 Xtremio # Xtremio Ltd. +14:F2:8E Shenyang # ShenYang ZhongKe-Allwin Technology Co.LTD 14:F4:2A SamsungE # Samsung Electronics 14:FE:AF Sagittar # SAGITTAR LIMITED 14:FE:B5 Dell # Dell Inc @@ -17442,7 +17465,9 @@ 18:17:14 Daewoois 18:17:25 CameoCom # Cameo Communications, Inc. 18:19:3F TamtronO # Tamtron Oy +18:1B:EB Actionte # Actiontec Electronics, Inc 18:1E:B0 SamsungE # Samsung Electronics Co.,Ltd +18:20:12 AztechAs # Aztech Associates Inc. 18:20:32 Apple 18:26:66 SamsungE # Samsung Electronics Co.,Ltd 18:28:61 AirtiesW # AirTies Wireless Networks @@ -17476,6 +17501,7 @@ 18:67:51 KomegInd # KOMEG Industrielle Messtechnik GmbH 18:67:B0 SamsungE # Samsung Electronics Co.,LTD 18:6D:99 Adanis # Adanis Inc. +18:79:A2 GmjElect # GMJ ELECTRIC LIMITED 18:7A:93 AmiccomE # AMICCOM Electronics Corporation 18:7C:81 ValeoVis # Valeo Vision Systems 18:7E:D5 Shenzhen # shenzhen kaism technology Co. Ltd @@ -17490,9 +17516,11 @@ 18:92:2C VirtualI # Virtual Instruments 18:97:FF Techfait # TechFaith Wireless Technology Limited 18:9A:67 Cse-Serv # CSE-Servelec Limited +18:9C:5D Cisco 18:9E:FC Apple 18:A9:05 Hewlett- # Hewlett-Packard Company 18:A9:9B DellPcba # Dell Inc PCBA Test +18:AA:45 FonTechn # Fon Technology 18:AB:F5 UltraEle # Ultra Electronics - Electrics 18:AD:4D Polostar # Polostar Technology Corporation 18:AE:BB SiemensC # Siemens Convergence Creators GmbH&Co.KG @@ -17535,6 +17563,7 @@ 1C:18:4A Shenzhen # ShenZhen RicherLink Technologies Co.,LTD 1C:19:DE Eyevis # eyevis GmbH 1C:1D:67 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd +1C:1D:86 Cisco 1C:33:4D ItsTelec # ITS Telecom 1C:34:77 Innovati # Innovation Wireless 1C:35:F1 NewLiftN # NEW Lift Neue Elektronische Wege Steuerungsbau GmbH @@ -17566,6 +17595,7 @@ 1C:6F:65 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 1C:75:08 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. 1C:76:CA TerasicT # Terasic Technologies Inc. +1C:78:39 Shenzhen # Shenzhen Tencent Computer System Co., Ltd. 1C:7B:21 SonyMobi # Sony Mobile Communications AB 1C:7C:11 Eid 1C:7C:45 VitekInd # Vitek Industrial Video Products, Inc. @@ -17594,6 +17624,7 @@ 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 +1C:C1:1A Wavetron # Wavetronix 1C:C1:DE Hewlett- # Hewlett-Packard Company 1C:C3:16 Milesigh # MileSight Technology Co., Ltd. 1C:C6:3C Arcadyan # Arcadyan Technology Corporation @@ -17615,6 +17646,7 @@ 20:05:E8 OooInpro # OOO InProMedia 20:0A:5E Xiangsha # Xiangshan Giant Eagle Technology Developing co.,LTD 20:0B:C7 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +20:0E:95 Iec–Tc9W # IEC – TC9 WG43 20:10:7A GemtekTe # Gemtek Technology Co., Ltd. 20:12:57 MostLuck # Most Lucky Trading Ltd 20:13:E0 SamsungE # Samsung Electronics Co.,Ltd @@ -17656,6 +17688,7 @@ 20:7D:74 Apple 20:85:8C Assa 20:89:84 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD +20:89:86 Zte # zte corporation 20:91:8A Profalux 20:91:D9 IM # I'M SPA 20:9B:A5 JiaxingG # JIAXING GLEAD Electronics Co.,Ltd @@ -17670,6 +17703,7 @@ 20:BB:C6 JabilCir # Jabil Circuit Hungary Ltd. 20:BF:DB Dvl 20:C1:AF IWitDigi # i Wit Digital Co., Limited +20:C6:0D Shanghai # Shanghai annijie Information technology Co.,LTD 20:C6:EB Panasoni # Panasonic Corporation AVC Networks Company 20:C8:B3 Shenzhen # SHENZHEN BUL-TECH CO.,LTD. 20:C9:D0 Apple @@ -17697,6 +17731,7 @@ 20:FE:CD SystemIn # System In Frontier Inc. 20:FE:DB M2mSolut # M2M Solution S.A.S. 24:01:C7 Cisco +24:05:0F MtnElect # MTN Electronic Co. Ltd 24:09:17 DevlinEl # Devlin Electronics Limited 24:0A:64 Azurewav # AzureWaveTechnologies,Inc 24:0B:2A ViettelG # Viettel Group @@ -17732,8 +17767,11 @@ 24:93:CA Voxtroni # Voxtronic Technology Computer-Systeme GmbH 24:94:42 OpenRoad # OPEN ROAD SOLUTIONS , INC. 24:95:04 Sfr +24:A2:E1 Apple # Apple, Inc 24:A4:2C KoukaamA # KOUKAAM a.s. 24:A4:3C Ubiquiti # Ubiquiti Networks, INC +24:A4:95 ThalesCa # Thales Canada Inc. +24:A8:7D Panasoni # Panasonic Automotive Systems Asia Pacific(Thailand)Co.,Ltd. 24:A9:37 PureStor # PURE Storage 24:AB:81 Apple 24:AF:4A Alcatel- # Alcatel-Lucent-IPD @@ -17761,9 +17799,11 @@ 24:DA:B6 Sistemas # Sistemas de Gestión Energética S.A. de C.V 24:DB:AC Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd 24:DB:AD Shoppert # ShopperTrak RCT Corporation +24:DB:ED SamsungE # Samsung Electronics Co.,Ltd 24:DE:C6 ArubaNet # Aruba Networks 24:E2:71 QingdaoH # Qingdao Hisense Communications Co.,Ltd 24:E6:BA JscZavod # JSC Zavod im. Kozitsky +24:E9:B3 Cisco 24:EA:40 SystemeH # Systeme Helmholz GmbH 24:EB:65 SaetISSR # SAET I.S. S.r.l. 24:EC:99 AskeyCom # Askey Computer Corp @@ -17904,7 +17944,9 @@ 2C:54:2D Cisco # CISCO SYSTEMS, INC. 2C:55:3C Gainspee # Gainspeed, Inc. 2C:59:E5 HewlettP # Hewlett Packard +2C:5A:05 Nokia # Nokia Corporation 2C:5A:A3 PromateE # PROMATE ELECTRONIC CO.LTD +2C:5D:93 RuckusWi # Ruckus Wireless 2C:5F:F3 Pertroni # Pertronic Industries 2C:62:5A FinestSe # Finest Security Systems Co., Ltd 2C:62:89 Regeners # Regenersis (Glenrothes) Ltd @@ -18011,6 +18053,7 @@ 30:8C:FB Dropcam 30:90:AB Apple 30:92:F6 Shanghai # SHANGHAI SUNMON COMMUNICATION TECHNOGY CO.,LTD +30:9B:AD BbkElect # BBK Electronics Corp., Ltd., 30:AA:BD Shanghai # Shanghai Reallytek Information Technology Co.,Ltd 30:AE:7B DeqingDu # Deqing Dusun Electron CO., LTD 30:AE:F6 RadioMob # Radio Mobile Access @@ -18034,6 +18077,7 @@ 30:FD:11 Macrotec # MACROTECH (USA) INC. 34:07:FB Ericsson # Ericsson AB 34:08:04 D-Link # D-Link Corporation +34:13:A8 Mediplan # Mediplan Limited 34:13:E8 IntelCor # Intel Corporate 34:15:9E Apple 34:1A:4C Shenzhen # SHENZHEN WEIBU ELECTRONICS CO.,LTD. @@ -18044,6 +18088,7 @@ 34:25:5D Shenzhen # Shenzhen Loadcom Technology Co.,Ltd 34:29:EA McdElect # MCD ELECTRONICS SP. Z O.O. 34:2F:6E Anywire # Anywire corporation +34:31:11 SamsungE # Samsung Electronics Co.,Ltd 34:40:B5 Ibm 34:4B:3D Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 34:4B:50 Zte # ZTE Corporation @@ -18067,6 +18112,7 @@ 34:84:46 Ericsson # Ericsson AB 34:86:2A HeinzLac # Heinz Lackmann GmbH & Co KG 34:88:5D Logitech # Logitech Far East +34:8A:AE Sagemcom # SAGEMCOM SAS 34:95:DB Logitec # Logitec Corporation 34:97:FB Advanced # ADVANCED RF TECHNOLOGIES INC 34:99:6F VpiEngin # VPI Engineering @@ -18096,6 +18142,7 @@ 34:BD:C8 Cisco # Cisco Systems 34:BD:F9 Shanghai # Shanghai WDK Industrial Co.,Ltd. 34:BD:FA CiscoSpv # Cisco SPVTG +34:BE:00 SamsungE # Samsung Electronics Co.,Ltd 34:BF:90 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 34:C0:59 Apple 34:C3:AC SamsungE # Samsung Electronics @@ -18124,6 +18171,7 @@ 38:06:B4 ADC # A.D.C. GmbH 38:0A:0A Sky-City # Sky-City Communication and Electronics Limited Company 38:0A:94 SamsungE # Samsung Electronics Co.,Ltd +38:0B:40 SamsungE # Samsung Electronics Co.,Ltd 38:0D:D4 PrimaxEl # Primax Electronics LTD. 38:0F:4A Apple 38:0F:E4 Dedicate # Dedicated Network Partners Oy @@ -18157,6 +18205,7 @@ 38:6B:BB ArrisGro # ARRIS Group, Inc. 38:6E:21 WasionGr # Wasion Group Ltd. 38:72:C0 Comtrend +38:7B:47 Akela # AKELA, Inc. 38:83:45 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 38:89:DC OpticonS # Opticon Sensors Europe B.V. 38:8A:B7 ItcNetwo # ITC Networks @@ -18175,10 +18224,13 @@ 38:B7:4D Fijowave # Fijowave Limited 38:BB:23 Ozvision # OzVision America LLC 38:BC:1A MeizuTec # Meizu technology co.,ltd +38:BF:2F Espec # Espec Corp. 38:BF:33 NecCasio # NEC CASIO Mobile Communications 38:C0:96 AlpsElec # ALPS ELECTRIC CO.,LTD. 38:C7:BA CsServic # CS Services Co.,Ltd. 38:C8:5C CiscoSpv # Cisco SPVTG +38:C9:A9 SmartHig # SMART High Reliability Solutions, Inc. +38:CA:97 ContourD # Contour Design LLC 38:D1:35 EasyioSd # EasyIO Corporation Sdn. Bhd. 38:DB:BB SunbowTe # Sunbow Telecom Co., Ltd. 38:DE:60 Mohlenho # Mohlenhoff GmbH @@ -18202,6 +18254,7 @@ 3C:07:71 Sony # Sony Corporation 3C:08:1E BeijingY # Beijing Yupont Electric Power Technology Co.,Ltd 3C:09:6D Powerhou # Powerhouse Dynamics +3C:0E:23 Cisco 3C:0F:C1 KbcNetwo # KBC Networks 3C:10:40 DaesungN # daesung network 3C:10:6F Albahith # ALBAHITH TECHNOLOGIES @@ -18216,7 +18269,9 @@ 3C:27:63 SleQuali # SLE quality engineering GmbH & Co. KG 3C:2D:B7 TexasIns # Texas Instruments 3C:2F:3A Sforzato # SFORZATO Corp. +3C:30:0C DewarEle # Dewar Electronics Pty Ltd 3C:36:3D Nokia # Nokia Corporation +3C:36:E4 ArrisGro # Arris Group, Inc. 3C:38:88 Connectq # ConnectQuest, llc 3C:39:C3 JwElectr # JW Electronics Co., Ltd. 3C:3A:73 Avaya # Avaya, Inc @@ -18273,6 +18328,7 @@ 3C:CE:73 Cisco # CISCO SYSTEMS, INC. 3C:D0:F8 Apple 3C:D1:6E Telepowe # Telepower Communication Co., Ltd +3C:D4:D6 Wireless # WirelessWERX, Inc 3C:D7:DA SkMtekMi # SK Mtek microelectronics(shenzhen)limited 3C:D9:2B Hewlett- # Hewlett-Packard Company 3C:DF:1E Cisco # CISCO SYSTEMS, INC. @@ -18307,12 +18363,14 @@ 40:2B:A1 SonyEric # Sony Ericsson Mobile Communications AB 40:2C:F4 Universa # Universal Global Scientific Industrial Co., Ltd. 40:30:04 Apple +40:30:67 ConlogPt # Conlog (Pty) Ltd 40:33:6C GodrejBo # Godrej & Boyce Mfg. co. ltd 40:37:AD MacroIma # Macro Image Technology, Inc. 40:3C:FC Apple 40:40:22 Ziv 40:40:6B Icomera 40:4A:03 ZyxelCom # ZyXEL Communications Corporation +40:4A:18 AddrekSm # Addrek Smart Solutions 40:4D:8E Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd 40:50:E0 MiltonSe # Milton Security Group LLC 40:51:6C GrandexI # Grandex International Corporation @@ -18356,6 +18414,7 @@ 40:B3:95 Apple 40:B3:FC Logital # Logital Co. Limited 40:B4:F0 JuniperN # Juniper Networks +40:B6:B1 Sungsam # SUNGSAM CO,.Ltd 40:B7:F3 ArrisGro # ARRIS Group, Inc. 40:BA:61 ArimaCom # Arima Communications Corp. 40:BC:73 Cronopla # Cronoplast S.L. @@ -18399,7 +18458,7 @@ 40:D8:55:01:90:00/36 Nautel # Nautel Limited 40:D8:55:01:A0:00/36 MeggittD # MEGGITT DEFENSE SYSTEMS INC. 40:D8:55:01:B0:00/36 AudioEnh # Audio Enhancement -40:D8:55:01:C0:00/36 Berg +40:D8:55:01:C0:00/36 BergClou # BERG Cloud Limited 40:D8:55:01:D0:00/36 ScharcoE # Scharco Elektronik GmbH 40:D8:55:01:E0:00/36 A2s 40:D8:55:01:F0:00/36 SitepIta # Sitep Italia Spa @@ -18734,10 +18793,59 @@ 40:D8:55:16:B0:00/36 Techway 40:D8:55:16:D0:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS 40:D8:55:16:E0:00/36 Secuinfo # Secuinfo Co.Ltd +40:D8:55:16:F0:00/36 Brightle # BrightLeaf Power +40:D8:55:17:00:00/36 IcsEletr # ICS Eletronics +40:D8:55:17:10:00/36 SiconSrl # Sicon srl +40:D8:55:17:20:00/36 YawataEl # YAWATA ELECTRIC INDUSTRIAL CO.,LTD. +40:D8:55:17:30:00/36 ContecSt # Contec Steuerungstechnik & Automation GmbH +40:D8:55:17:40:00/36 Ecoguard # EcoGuard AB +40:D8:55:17:50:00/36 AhbSyste # AHB Systeme GmbH +40:D8:55:17:60:00/36 Schneide # Schneider Electric Motion, Inc. USA +40:D8:55:17:70:00/36 TriEngin # TRI Engineering co.,ltd. +40:D8:55:17:80:00/36 RederDom # REDER Domotic GmbH +40:D8:55:17:90:00/36 Servo-Ro # Servo-Robot Inc. +40:D8:55:17:A0:00/36 Argus-Sp # ARGUS-SPECTRUM +40:D8:55:17:B0:00/36 Luceo +40:D8:55:17:C0:00/36 Critical # Critical Link +40:D8:55:17:D0:00/36 Kiwigrid # Kiwigrid GmbH +40:D8:55:17:E0:00/36 Tokhatec +40:D8:55:17:F0:00/36 Telvent +40:D8:55:18:00:00/36 Broadsof # BroadSoft Inc +40:D8:55:18:10:00/36 Erocca +40:D8:55:18:20:00/36 GeorgNeu # Georg Neumann GmbH +40:D8:55:18:30:00/36 Emac # EMAC, Inc. +40:D8:55:18:40:00/36 Satkirit # Satkirit Ltd +40:D8:55:18:50:00/36 Standard # Standard Change Makers +40:D8:55:18:60:00/36 KstTechn # KST technology +40:D8:55:18:70:00/36 Cdex # CDEX Corp. +40:D8:55:18:80:00/36 Array # Array Corporation +40:D8:55:18:90:00/36 Yoozma # Yoozma Corporation +40:D8:55:18:A0:00/36 AplexTec # Aplex Technology Inc. +40:D8:55:18:B0:00/36 Diagnosy # Diagnosys Test Systems Ltd +40:D8:55:18:C0:00/36 EosSRL # EOS S.r.l. +40:D8:55:18:D0:00/36 ZoeMedic # Zoe Medical +40:D8:55:18:E0:00/36 KerunVis # Kerun Visual Technology Co., Ltd.(Shenzhen) +40:D8:55:18:F0:00/36 BeatSens # Beat Sensing co. , ltd. +40:D8:55:19:00:00/36 SpiderTe # Spider Tecnologia Ind. e Com Ltda +40:D8:55:19:10:00/36 SoukaiEl # Soukai Electric +40:D8:55:19:20:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS +40:D8:55:19:30:00/36 ForzaSil # FORZA SILICON CORP. +40:D8:55:19:40:00/36 RfCode # RF Code +40:D8:55:19:50:00/36 TonnaEle # TONNA ELECTRONIQUE +40:D8:55:19:60:00/36 Advanced # Advanced Micro Controls Inc. +40:D8:55:19:70:00/36 BergClou # Berg Cloud Limited +40:D8:55:19:80:00/36 Devboard # devboards GmbH +40:D8:55:19:90:00/36 PressolS # PRESSOL Schmiergeraete GmbH +40:D8:55:19:A0:00/36 Rohde&Sc # Rohde&Schwarz Topex SA +40:D8:55:19:B0:00/36 Northern # Northern Star Technologies +40:D8:55:19:C0:00/36 ParrisSe # Parris Service Corporation +40:D8:55:19:D0:00/36 Emac # EMAC, Inc. +40:D8:55:19:E0:00/36 Thirdway # Thirdwayv Inc. 40:E7:30 DeyStora # DEY Storage Systems, Inc. 40:E7:93 Shenzhen # Shenzhen Siviton Technology Co.,Ltd 40:EC:F8 Siemens # Siemens AG 40:EF:4C Fihonest # Fihonest communication co.,Ltd +40:F0:2F LiteonTe # Liteon Technology Corporation 40:F1:4C IseEurop # ISE Europe SPRL 40:F2:E9 Ibm 40:F3:08 MurataMa # Murata Manufactuaring Co.,Ltd. @@ -18756,6 +18864,7 @@ 44:2A:60 Apple 44:2A:FF E3Techno # E3 Technology, Inc. 44:2B:03 Cisco # CISCO SYSTEMS, INC. +44:31:92 HewlettP # Hewlett Packard 44:32:2A Avaya # Avaya, Inc 44:32:C8 Technico # Technicolor USA Inc. 44:33:4C Shenzhen # Shenzhen Bilian electronic CO.,LTD @@ -18765,6 +18874,7 @@ 44:37:E6 HonHaiPr # Hon Hai Precision Ind.Co.Ltd 44:38:39 CumulusN # Cumulus Networks, inc 44:39:C4 Universa # Universal Global Scientific Industrial Co.,Ltd +44:3C:9C PintschT # Pintsch Tiefenbach GmbH 44:3D:21 Nuvolt 44:3E:B2 Deotron # DEOTRON Co., LTD. 44:45:53 Microsoft @@ -18815,6 +18925,8 @@ 44:C1:5C TexasIns # Texas Instruments 44:C2:33 Guangzho # Guangzhou Comet Technology Development Co.Ltd 44:C3:9B OooRubez # OOO RUBEZH NPO +44:C4:A9 OpticomC # Opticom Communication, LLC +44:C5:6F NgnEasyS # NGN Easy Satfinder (Tianjin) Electronic Co., Ltd 44:C9:A2 Greenwal # Greenwald Industries 44:D1:5E Shanghai # Shanghai Kingto Information Technology Ltd 44:D2:CA AnviaTvO # Anvia TV Oy @@ -18844,6 +18956,7 @@ 48:2C:EA Motorola # Motorola Inc Business Light Radios 48:33:DD ZennioAv # ZENNIO AVANCE Y TECNOLOGIA, S.L. 48:34:3D Iep # IEP GmbH +48:3D:32 SyscorCo # Syscor Controls & Automation 48:44:53 Hds??? # HDS ??? 48:44:87 CiscoSpv # Cisco SPVTG 48:44:F7 SamsungE # Samsung Electronics Co., LTD @@ -18867,10 +18980,12 @@ 48:9B:E2 SciInnov # SCI Innovations Ltd 48:9D:24 Research # Research In Motion 48:A2:2D Shenzhen # Shenzhen Huaxuchang Telecom Technology Co.,Ltd +48:A2:B7 KodofonJ # Kodofon JSC 48:A6:D2 GjsunOpt # GJsun Optical Science and Tech Co.,Ltd. 48:AA:5D StoreEle # Store Electronic Systems 48:B2:53 Marketax # Marketaxess Corporation 48:B8:DE Homewins # HOMEWINS TECHNOLOGY CO.,LTD. +48:B9:77 PulseonO # PulseOn Oy 48:B9:C2 Teletics # Teletics Inc. 48:BE:2D Symanitr # Symanitron 48:C1:AC Plantron # PLANTRONICS, INC. @@ -18895,6 +19010,7 @@ 48:F8:E1 AlcatelL # Alcatel Lucent WT 48:F9:25 Maestron # Maestronic 48:FC:B8 Woodstre # Woodstream Corporation +48:FE:EA HomaBV # HOMA B.V. 4C:00:82 Cisco 4C:02:2E CmrKorea # CMR KOREA CO., LTD 4C:02:89 LexCompu # LEX COMPUTECH CO., LTD @@ -18902,6 +19018,7 @@ 4C:07:C9 Computer # COMPUTER OFFICE Co.,Ltd. 4C:09:B4 Zte # zte corporation 4C:0B:3A TctMobil # TCT Mobile Limited +4C:0D:EE JabilCir # JABIL CIRCUIT (SHANGHAI) LTD. 4C:0F:6E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 4C:0F:C7 EardaEle # Earda Electronics Co.,Ltd 4C:14:80 Noregon # NOREGON SYSTEMS, INC @@ -18972,7 +19089,10 @@ 4C:CB:F5 Zte # zte corporation 4C:CC:34 Motorola # Motorola Solutions Inc. 4C:D6:37 QsonoEle # Qsono Electronics Co., Ltd +4C:D7:B6 HelmerSc # Helmer Scientific +4C:D9:C4 MagnetiM # Magneti Marelli Automotive Electronics (Guangzhou) Co. Ltd 4C:DF:3D TeamEngi # TEAM ENGINEERS ADVANCE TECHNOLOGIES INDIA PVT LTD +4C:E1:BB ZhuhaiHi # Zhuhai HiFocus Technology Co., Ltd. 4C:E6:76 Buffalo # Buffalo Inc. 4C:EB:42 IntelCor # Intel Corporate 4C:ED:DE AskeyCom # Askey Computer Corp @@ -18986,6 +19106,7 @@ 50:0E:6D Trafficc # TrafficCast International 50:11:EB Silverne # SilverNet Ltd 50:17:FF Cisco +50:1A:C5 Microsof # Microsoft 50:20:6B EmersonC # Emerson Climate Technologies Transportation Solutions 50:22:67 Pixelink 50:25:2B NethraIm # Nethra Imaging Incorporated @@ -19023,6 +19144,7 @@ 50:79:5B Interexp # Interexport Telecomunicaciones S.A. 50:7D:02 Biodit 50:7E:5D Arcadyan # Arcadyan Technology Corporation +50:85:69 SamsungE # Samsung Electronics Co.,LTD 50:87:B8 Nuvyyo # Nuvyyo Inc 50:8A:42 UptmateT # Uptmate Technology Co., LTD 50:8A:CB Shenzhen # SHENZHEN MAXMADE TECHNOLOGY CO., LTD. @@ -19057,12 +19179,14 @@ 50:E5:49 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 50:EA:D6 Apple 50:EB:1A BrocadeC # Brocade Communications Systems, Inc. +50:ED:78 Changzho # Changzhou Yongse Infotech Co.,Ltd 50:ED:94 EgatelSl # Egatel SL 50:F0:03 OpenStac # Open Stack, Inc. 50:F5:20 SamsungE # Samsung Electronics Co.,Ltd 50:F6:1A KunshanJ # Kunshan JADE Technologies co., Ltd. 50:FA:AB L-TekDOO # L-tek d.o.o. 50:FC:30 Treehous # Treehouse Labs +50:FC:9F SamsungE # Samsung Electronics Co.,Ltd 52:54:00 RealtekU # Realtek (UpTech? also reported) 52:54:4C Novell20 # Novell 2000 52:54:AB RealtekA # REALTEK (a Realtek 8029 based PCI Card) @@ -19086,6 +19210,7 @@ 54:31:31 RasterVi # Raster Vision Ltd 54:35:DF Symeo # Symeo GmbH 54:39:68 Edgewate # Edgewater Networks Inc +54:39:DF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 54:3D:37 RuckusWi # Ruckus Wireless 54:42:49 Sony # Sony Corporation 54:44:08 Nokia # Nokia Corporation @@ -19106,6 +19231,7 @@ 54:7F:EE Cisco # CISCO SYSTEMS, INC. 54:81:AD EagleRes # Eagle Research Corporation 54:84:7B DigitalD # Digital Devices GmbH +54:88:0E SamsungE # Samsung Electro Mechanics co., LTD. 54:89:22 Zelfy # Zelfy Inc 54:89:98 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 54:92:BE SamsungE # Samsung Electronics Co.,Ltd @@ -19237,6 +19363,7 @@ 5C:22:C4 DaeEunEl # DAE EUN ELETRONICS CO., LTD 5C:24:79 Baltech # Baltech AG 5C:26:0A Dell # Dell Inc. +5C:2A:EF OpenAcce # Open Access Pty Ltd 5C:33:27 SpazioIt # Spazio Italia srl 5C:33:5C Swisspho # Swissphone Telecom AG 5C:33:8E AlphaNet # Alpha Networkc Inc. @@ -19273,6 +19400,7 @@ 5C:9A:D8 Fujitsu # Fujitsu Limited 5C:A3:9D SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD. 5C:A3:EB LokelSRO # Lokel s.r.o. +5C:A4:8A Cisco 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 @@ -19307,6 +19435,8 @@ 5C:FF:35 Wistron # Wistron Corporation 5C:FF:FF Shenzhen # Shenzhen Kezhonglong Optoelectronic Technology Co., Ltd 60:02:B4 WistronN # Wistron NeWeb Corp. +60:03:08 Apple +60:03:47 BillionE # Billion Electric Co. Ltd. 60:0F:77 Silverpl # SilverPlus, Inc 60:11:99 Siama # Siama Systems Inc 60:12:83 Solucion # Soluciones Tecnologicas para la Salud y el Bienestar SA @@ -19354,6 +19484,7 @@ 60:8C:2B HansonTe # Hanson Technology 60:8D:17 SentrusG # Sentrus Government Systems Division, Inc 60:90:84 Dssd # DSSD Inc +60:96:20 Private 60:9A:A4 GviSecur # GVI SECURITY INC. 60:9E:64 Vivonic # Vivonic GmbH 60:9F:9D Cloudswi # CloudSwitch @@ -19368,6 +19499,7 @@ 60:BB:0C BeijingH # Beijing HuaqinWorld Technology Co,Ltd 60:BC:4C EwmHight # EWM Hightec Welding GmbH 60:BD:91 MoveInno # Move Innovation +60:BE:B5 Motorola # Motorola Mobility LLC 60:C3:97 2wire # 2Wire Inc 60:C5:47 Apple 60:C5:A8 BeijingL # Beijing LT Honway Technology Co.,Ltd @@ -19479,6 +19611,7 @@ 64:B3:10 SamsungE # Samsung Electronics Co.,Ltd 64:B6:4A Vivotech # ViVOtech, Inc. 64:B9:E8 Apple +64:BA:BD SdjTechn # SDJ Technologies, Inc. 64:BC:11 Combiq # CombiQ AB 64:C5:AA SouthAfr # South African Broadcasting Corporation 64:C6:67 Barnes&N # Barnes&Noble @@ -19497,6 +19630,7 @@ 64:DE:1C Kingneti # Kingnetic Pte Ltd 64:E1:61 Dep # DEP Corp. 64:E5:99 EfmNetwo # EFM Networks +64:E6:25 WoxuWire # Woxu Wireless Co., Ltd 64:E6:82 Apple 64:E8:4F Serialwa # Serialway Communication Technology Co. Ltd 64:E8:E6 GlobalMo # global moisture management system @@ -19527,6 +19661,7 @@ 68:3B:1E Countwis # Countwise LTD 68:3E:EC Ereca 68:43:52 Bhuu # Bhuu Limited +68:48:98 SamsungE # Samsung Electronics Co.,Ltd 68:4B:88 Galtroni # Galtronics Telemetry Inc. 68:4C:A8 Shenzhen # Shenzhen Herotel Tech. Co., Ltd. 68:51:B7 Powerclo # PowerCloud Systems, Inc. @@ -19613,6 +19748,7 @@ 6C:39:1D BeijingZ # Beijing ZhongHuaHun Network Information center 6C:3A:84 Shenzhen # Shenzhen Aero-Startech. Co.Ltd 6C:3B:E5 HewlettP # Hewlett Packard +6C:3C:53 Soundhaw # SoundHawk Corp 6C:3E:6D Apple 6C:3E:9C KeKneste # KE Knestel Elektronik GmbH 6C:40:C6 NimbusDa # Nimbus Data Systems, Inc. @@ -19717,6 +19853,7 @@ 70:56:81 Apple 70:58:12 Panasoni # Panasonic AVC Networks Company 70:59:57 Medallio # Medallion Instrumentation Systems +70:59:86 OooTtv # OOO TTV 70:5A:B6 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. 70:5C:AD KonamiGa # Konami Gaming Inc 70:5E:AA ActionTa # Action Target, Inc. @@ -19726,6 +19863,7 @@ 70:65:82 SuzhouHa # Suzhou Hanming Technologies Co., Ltd. 70:6F:81 Private 70:70:4C PurpleCo # Purple Communications, Inc +70:71:B3 Brain # Brain Corporation 70:71:BC Pegatron # PEGATRON CORPORATION 70:72:3C HuaweiTe # Huawei Technologies Co., Ltd 70:72:CF Edgecore # EdgeCore Networks @@ -19734,6 +19872,7 @@ 70:76:DD Oxyguard # Oxyguard International A/S 70:76:F0 Levelone # LevelOne Communications (India) Private Limited 70:7B:E8 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +70:7C:18 AdataTec # ADATA Technology Co., Ltd 70:7E:43 ArrisGro # ARRIS Group, Inc. 70:7E:DE Nastec # NASTEC LTD. 70:81:05 Cisco # CISCO SYSTEMS, INC. @@ -19798,6 +19937,7 @@ 74:32:56 Nt-WareS # NT-ware Systemprg GmbH 74:37:2F Tongfang # Tongfang Shenzhen Cloudcomputing Technology Co.,Ltd 74:38:89 AnnaxAnz # ANNAX Anzeigesysteme GmbH +74:3E:CB Gentrice # Gentrice tech 74:44:01 Netgear 74:45:8A SamsungE # Samsung Electronics Co.,Ltd 74:46:A0 HewlettP # Hewlett Packard @@ -19814,6 +19954,7 @@ 74:66:30 T:MiYtti # T:mi Ytti 74:6A:89 Rezolt # Rezolt Corporation 74:6B:82 Movek +74:6F:3D Contec # Contec GmbH 74:72:F2 ChipsipT # Chipsip Technology Co., Ltd. 74:78:18 Servicea # ServiceAssure 74:7B:7A Eth # ETH Inc. @@ -19824,6 +19965,7 @@ 74:88:8B AdbBroad # ADB Broadband Italia 74:8E:08 Bestek # Bestek Corp. 74:8E:F8 BrocadeC # Brocade Communications Systems, Inc. +74:8F:1B Masterim # MasterImage 3D 74:90:50 RenesasE # Renesas Electronics Corporation 74:91:1A RuckusWi # Ruckus Wireless 74:93:A4 ZebraTec # Zebra Technologies Corp. @@ -19887,6 +20029,7 @@ 78:30:E1 Ultracle # UltraClenz, LLC 78:32:4F Millenni # Millennium Group, Inc. 78:3C:E3 Kai-Ee +78:3D:5B TelnetRe # TELNET Redes Inteligentes S.A. 78:3F:15 Easysync # EasySYNC Ltd. 78:44:05 FujituHo # FUJITU(HONG KONG) ELECTRONIC Co.,LTD. 78:44:76 ZioncomT # Zioncom technology co.,ltd @@ -19932,10 +20075,13 @@ 78:A6:83 Precidat # Precidata 78:A6:BD DaeyeonC # DAEYEON Control&Instrument Co,.Ltd 78:A7:14 Amphenol +78:A8:73 SamsungE # Samsung Electronics Co.,Ltd 78:AB:60 AbbAustr # ABB Australia 78:AB:BB SamsungE # Samsung Electronics Co.,LTD 78:AC:C0 Hewlett- # Hewlett-Packard Company +78:AE:0C FarSouth # Far South Networks 78:B3:CE EloTouch # Elo touch solutions +78:B5:D2 EverTrea # Ever Treasure Industrial Limited 78:B6:C1 AoboTele # AOBO Telecom Co.,Ltd 78:B8:1A InterSal # INTER SALES A/S 78:BA:D0 Shinybow # Shinybow Technology Co. Ltd. @@ -19947,6 +20093,7 @@ 78:C6:BB Innovasi # Innovasic, Inc. 78:CA:04 Nokia # Nokia Corporation 78:CA:39 Apple +78:CA:5E Elno 78:CB:33 DhcSoftw # DHC Software Co.,Ltd 78:CD:8E SmcNetwo # SMC Networks Inc 78:D0:04 NeousysT # Neousys Technology Inc. @@ -19966,6 +20113,7 @@ 78:E7:D1 Hewlett- # Hewlett-Packard Company 78:E8:B6 Zte # zte corporation 78:EC:22 Shanghai # Shanghai Qihui Telecom Technology Co., LTD +78:EC:74 Kyland-U # Kyland-USA 78:EF:4C Unetconv # Unetconvergence Co., Ltd. 78:F5:E5 BegaGant # BEGA Gantenbrink-Leuchten KG 78:F5:FD HuaweiTe # Huawei Technologies Co., Ltd @@ -19990,6 +20138,7 @@ 7C:1A:FC DalianCo # Dalian Co-Edifice Video Technology Co., Ltd 7C:1E:52 Microsof # Microsoft 7C:1E:B3 2nTeleko # 2N TELEKOMUNIKACE a.s. +7C:20:48 Koamtac 7C:20:64 AlcatelL # Alcatel Lucent IPD 7C:2C:F3 SecureEl # Secure Electrans Ltd 7C:2E:0D Blackmag # Blackmagic Design @@ -20000,6 +20149,7 @@ 7C:3B:D5 ImagoGro # Imago Group 7C:3E:9D Patech 7C:43:8F E-BandCo # E-Band Communications Corp. +7C:44:4C Entertai # Entertainment Solutions, S.L. 7C:49:B9 PlexusMa # Plexus Manufacturing Sdn Bhd 7C:4A:82 Portsmit # Portsmith LLC 7C:4A:A8 Mindtree # MindTree Wireless PVT Ltd @@ -20012,6 +20162,7 @@ 7C:61:93 Htc # HTC Corporation 7C:66:9D TexasIns # Texas Instruments 7C:69:F6 Cisco +7C:6A:B3 IbcTechn # IBC TECHNOLOGIES INC. 7C:6A:DB Safetone # SafeTone Technology Co.,Ltd 7C:6B:33 TenyuTec # Tenyu Tech Co. Ltd. 7C:6B:52 TigaroWi # Tigaro Wireless @@ -20020,6 +20171,7 @@ 7C:6D:62 Apple 7C:6F:06 Caterpil # Caterpillar Trimble Control Technologies 7C:6F:F8 Shenzhen # ShenZhen ACTO Digital Video Technology Co.,Ltd. +7C:72:E4 UnikeyTe # Unikey Technologies 7C:76:73 Enmas # ENMAS GmbH 7C:7A:91 IntelCor # Intel Corporate 7C:7B:E4 ZSedaiKe # Z'SEDAI KENKYUSHO CORPORATION @@ -20029,6 +20181,7 @@ 7C:8E:E4 TexasIns # Texas Instruments 7C:94:B2 PhilipsH # Philips Healthcare PCCI 7C:95:F3 Cisco +7C:97:63 Openmati # Openmatics s.r.o. 7C:9A:9B VseValen # VSE valencia smart energy 7C:A1:5D GnResoun # GN ReSound A/S 7C:A2:9B DSignt # D.SignT GmbH & Co. KG @@ -20051,6 +20204,7 @@ 7C:C8:D0 TianjinY # TIANJIN YAAN TECHNOLOGY CO., LTD. 7C:C8:D7 Damalisk 7C:CB:0D AntairaT # Antaira Technologies, LLC +7C:CD:11 Ms-Magne # MS-Magnet 7C:CD:3C Guangzho # Guangzhou Juzing Technology Co., Ltd 7C:CF:CF Shanghai # Shanghai SEARI Intelligent System Co., Ltd 7C:D1:C3 Apple @@ -20099,6 +20253,7 @@ 80:3F:D6 BytesAtW # bytes at work AG 80:42:7C AdolfTed # Adolf Tedsen GmbH & Co. KG 80:47:31 PacketDe # Packet Design, Inc. +80:48:A5 SichuanT # SICHUAN TIANYI COMHEART TELECOM CO.,LTD 80:49:71 Apple 80:4B:20 Ventilat # Ventilation Control 80:4F:58 Thinkeco # ThinkEco, Inc. @@ -20141,6 +20296,7 @@ 80:B6:86 HuaweiTe # Huawei Technologies Co., Ltd 80:B9:5C Elftech # ELFTECH Co., Ltd. 80:BA:AC Teleadap # TeleAdapt Ltd +80:BA:E6 Neets 80:BB:EB Satmap # Satmap Systems Ltd 80:C1:6E HewlettP # Hewlett Packard 80:C6:3F RemecBro # Remec Broadband Wireless , LLC @@ -20153,7 +20309,9 @@ 80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd 80:D7:33 QsrAutom # QSR Automations, Inc. 80:DB:31 PowerQuo # Power Quotient International Co., Ltd. +80:EA:96 Apple 80:EE:73 Shuttle # Shuttle Inc. +80:F2:5E Kyynel 80:F5:93 IrcoSist # IRCO Sistemas de Telecomunicación S.A. 80:F6:2E Hangzhou # Hangzhou H3C Technologies Co., Limited 80:FA:5B Clevo # CLEVO CO. @@ -20170,6 +20328,7 @@ 84:21:41 Shenzhen # Shenzhen Ginwave Technologies Ltd. 84:24:8D Motorola # Motorola Solutions Inc 84:25:3F SilexTec # Silex Technology, Inc +84:25:A4 Tariox # Tariox Limited 84:25:DB SamsungE # Samsung Electronics Co.,Ltd 84:26:2B Alcatel- # Alcatel-Lucent 84:27:CE OfPresid # Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints @@ -20188,7 +20347,9 @@ 84:48:23 WoxterTe # WOXTER TECHNOLOGY Co. Ltd 84:49:15 VarmourN # vArmour Networks, Inc. 84:4B:F5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +84:4F:03 Ablelink # Ablelink Electronics Ltd 84:51:81 SamsungE # Samsung Electronics Co.,Ltd +84:56:9C CohoData # Coho Data, Inc., 84:57:87 DvrC&C # DVR C&C Co., Ltd. 84:5C:93 Chabrier # Chabrier Services 84:5D:D7 Shenzhen # Shenzhen Netcom Electronics Co.,Ltd @@ -20202,6 +20363,7 @@ 84:7A:88 Htc # HTC Corporation 84:7E:40 TexasIns # Texas Instruments 84:82:F4 BeijingH # Beijing Huasun Unicreate Technology Co., Ltd +84:83:36 Newrun 84:83:71 Avaya # Avaya, Inc 84:85:06 Apple 84:8D:84 Rajant # Rajant Corporation @@ -20212,6 +20374,7 @@ 84:9C:A6 Arcadyan # Arcadyan Technology Corporation 84:9D:C5 CenteraP # Centera Photonics Inc. 84:A6:C8 IntelCor # Intel Corporate +84:A7:83 AlcatelL # Alcatel Lucent 84:A8:E4 Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd 84:A9:91 CyberTra # Cyber Trans Japan Co.,Ltd. 84:AC:A4 BeijingN # Beijing Novel Super Digital TV Technology Co., Ltd @@ -20235,6 +20398,7 @@ 84:F4:93 OmsSpolS # OMS spol. s.r.o. 84:F6:4C CrossPoi # Cross Point BV 84:FC:FE Apple +84:FE:9E RtcIndus # RTC Industries, Inc. 88:03:55 Arcadyan # Arcadyan Technology Corp. 88:09:05 Mtmcommu # MTMCommunications 88:10:36 PanodicS # Panodic(ShenZhen) Electronics Limted @@ -20280,6 +20444,7 @@ 88:89:64 GsiElect # GSI Electronics Inc. 88:8B:5D StorageA # Storage Appliance Corporation 88:8C:19 BradyAsi # Brady Corp Asia Pacific Ltd +88:91:66 Viewcoop # Viewcooper Corp. 88:91:DD Racktivi # Racktivity 88:94:F9 GemicomT # Gemicom Technology, Inc. 88:95:B9 UnifiedP # Unified Packet Systems Crop @@ -20287,6 +20452,7 @@ 88:97:DF Entrypas # Entrypass Corporation Sdn. Bhd. 88:98:21 Teraon 88:9B:39 SamsungE # Samsung Electronics Co.,Ltd +88:9C:A6 BtbKorea # BTB Korea INC 88:9F:FA HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 88:A3:CC AmatisCo # Amatis Controls 88:A5:BD Qpcom # QPCOM INC. @@ -20297,6 +20463,7 @@ 88:BA:7F Qfiednet # Qfiednet Co., Ltd. 88:BF:D5 SimpleAu # Simple Audio Ltd 88:C3:6E BeijingE # Beijing Ereneben lnformation Technology Limited +88:C6:26 Logitech # Logitech - Ultimate Ears 88:C6:63 Apple 88:CB:87 Apple 88:D7:BC Dep # DEP Company @@ -20312,6 +20479,7 @@ 88:F4:88 CellonCo # cellon communications technology(shenzhen)Co.,Ltd. 88:F4:90 Jetmobil # Jetmobile Pte Ltd 88:FD:15 Lineeye # LINEEYE CO., LTD +88:FE:D6 Shanghai # ShangHai WangYong Software Co., Ltd. 8C:00:6D Apple 8C:04:FF Technico # Technicolor USA Inc. 8C:07:8C FlowData # FLOW DATA INC @@ -20328,16 +20496,19 @@ 8C:2D:AA Apple 8C:2F:39 IbaDosim # IBA Dosimetry GmbH 8C:33:30 Emfirst # EmFirst Co., Ltd. +8C:3A:E3 LgElectr # LG Electronics 8C:3C:07 SkivaTec # Skiva Technologies, Inc. 8C:3C:4A NakayoTe # NAKAYO TELECOMMUNICATIONS,INC. 8C:44:35 Shanghai # Shanghai BroadMobi Communication Technology Co., Ltd. 8C:4A:EE GigaTms # GIGA TMS INC 8C:4B:59 3dImagin # 3D Imaging & Simulations Corp 8C:4C:DC PlanexCo # PLANEX COMMUNICATIONS INC. +8C:4D:B9 Unmonday # Unmonday Ltd 8C:4D:EA Cerio # Cerio Corporation 8C:51:05 Shenzhen # Shenzhen ireadygo Information Technology CO.,LTD. 8C:53:F7 A&DEngin # A&D ENGINEERING CO., LTD. 8C:54:1D Lge +8C:56:9D ImagingS # Imaging Solutions Group 8C:56:C5 Nintendo # Nintendo Co., Ltd. 8C:57:FD LvxWeste # LVX Western 8C:58:77 Apple @@ -20373,6 +20544,7 @@ 8C:AE:4C Plugable # Plugable Technologies 8C:AE:89 Y-CamSol # Y-cam Solutions Ltd 8C:B6:4F Cisco # CISCO SYSTEMS, INC. +8C:B7:F7 Shenzhen # Shenzhen UniStrong Science & Technology Co., Ltd 8C:B8:2C IpitomyC # IPitomy Communications 8C:B8:64 AcsipTec # AcSiP Technology Corp. 8C:C1:21 Panasoni # Panasonic Corporation AVC Networks Company @@ -20389,6 +20561,7 @@ 8C:DB:25 EsgSolut # ESG Solutions 8C:DD:8D Wifly-Ci # Wifly-City System Inc. 8C:DE:52 IsscTech # ISSC Technologies Corp. +8C:DE:99 Comlab # Comlab Inc. 8C:E0:81 Zte # zte corporation 8C:E7:48 Private 8C:E7:B3 Sonardyn # Sonardyne International Ltd @@ -20399,6 +20572,7 @@ 8C:FD:F0 Qualcomm # QUALCOMM Incorporated 90:00:4E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:01:3B Sagemcom +90:02:8A Shenzhen # Shenzhen Shidean Legrand Electronic Products Co.,Ltd 90:02:A9 Zhejiang # ZHEJIANG DAHUA TECHNOLOGY CO.,LTD 90:03:B7 Parrot 90:09:17 Far-Sigh # Far-sighted mobile @@ -20418,6 +20592,7 @@ 90:27:E4 Apple 90:2B:34 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 90:2E:87 Labjack +90:31:CD OnyxHeal # Onyx Healthcare Inc. 90:34:2B Gatekeep # Gatekeeper Systems, Inc. 90:34:FC HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:35:6E Vodafone # Vodafone Omnitel N.V. @@ -20454,6 +20629,7 @@ 90:7A:F1 SnupiTec # SNUPI Technologies 90:7F:61 ChiconyE # Chicony Electronics Co., Ltd. 90:82:60 Ieee1904 # IEEE 1904.1 Working Group +90:83:7A GeneralE # General Electric Water & Process Technologies 90:84:0D Apple 90:88:A2 IonicsTe # IONICS TECHNOLOGY ME LTDA 90:8C:44 HKZongmu # H.K ZONGMU TECHNOLOGY CO., LTD. @@ -20476,6 +20652,7 @@ 90:B1:34 ArrisGro # ARRIS Group, Inc. 90:B2:1F Apple 90:B8:D0 Joyent # Joyent, Inc. +90:B9:31 Apple # Apple, Inc 90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota 90:C1:15 SonyEric # Sony Ericsson Mobile Communications AB 90:CC:24 Synaptic # Synaptics, Inc @@ -20502,6 +20679,7 @@ 90:FF:79 MetroEth # Metro Ethernet Forum 94:00:70 Nokia # Nokia Corporation 94:01:49 Autohotb # AutoHotBox +94:01:C2 SamsungE # Samsung Electronics Co.,Ltd 94:0B:2D NetviewT # NetView Technologies(Shenzhen) Co., Ltd 94:0B:D5 HimaxTec # Himax Technologies, Inc 94:0C:6D Tp-LinkT # TP-LINK Technologies Co.,Ltd. @@ -20553,6 +20731,7 @@ 94:AC:CA TrivumTe # trivum technologies GmbH 94:AE:61 AlcatelL # Alcatel Lucent 94:B8:C5 Ruggedco # RuggedCom Inc. +94:B9:B4 AptosTec # Aptos Technology 94:BA:31 Visionte # Visiontec da Amazônia Ltda. 94:BA:56 Shenzhen # Shenzhen Coship Electronics Co., Ltd. 94:BF:1E Eflow/Sm # eflow Inc. / Smart Device Planning and Development Division @@ -20587,6 +20766,7 @@ 94:F6:92 Geminico # Geminico co.,Ltd. 94:F7:20 TianjinD # Tianjin Deviser Electronics Instrument Co., Ltd 94:FA:E8 Shenzhen # Shenzhen Eycom Technology Co., Ltd +94:FB:B2 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd 94:FD:1D Wherewhe # WhereWhen Corp 94:FD:2E Shanghai # Shanghai Uniscope Technologies Co.,Ltd 94:FE:F4 Sagemcom @@ -20656,6 +20836,7 @@ 98:D6:BB Apple 98:D6:F7 LgElectr # LG Electronics 98:D8:8C NortelNe # Nortel Networks +98:DA:92 Vuzix # Vuzix Corporation 98:DC:D9 Unitec # UNITEC Co., Ltd. 98:E1:65 Accutome 98:E7:9A FoxconnN # Foxconn(NanJing) Communication Co.,Ltd. @@ -20667,6 +20848,8 @@ 98:FC:11 Cisco-Li # Cisco-Linksys, LLC 98:FE:03 Ericsson # Ericsson - North America 98:FE:94 Apple +98:FF:6A OtecShan # OTEC(Shanghai)Technology Co.,Ltd. +98:FF:D0 LenovoMo # Lenovo Mobile Communication Technology Ltd. 9C:01:11 Shenzhen # Shenzhen Newabel Electronic Co., Ltd. 9C:02:98 SamsungE # Samsung Electronics Co.,Ltd 9C:03:9E BeijingW # Beijing Winchannel Software Technology Co., Ltd @@ -20689,6 +20872,7 @@ 9C:3A:AF SamsungE # Samsung Electronics Co.,Ltd 9C:41:7C HameTech # Hame Technology Co., Limited 9C:44:3D ChengduX # CHENGDU XUGUANG TECHNOLOGY CO, LTD +9C:44:A6 Swifttes # SwiftTest, Inc. 9C:45:63 DimepSis # DIMEP Sistemas 9C:4A:7B Nokia # Nokia Corporation 9C:4C:AE MesaLabs # Mesa Labs @@ -20715,6 +20899,7 @@ 9C:79:AC SuntecSo # Suntec Software(Shanghai) Co., Ltd. 9C:7B:D2 NeolabCo # NEOLAB Convergence 9C:80:7D Syscable # SYSCABLE Korea Inc. +9C:80:DF Arcadyan # Arcadyan Technology Corporation 9C:88:88 SimacTec # Simac Techniek NV 9C:8B:F1 Warehous # The Warehouse Limited 9C:8D:1A IntegPro # INTEG process group inc @@ -20772,6 +20957,7 @@ A0:18:59 Shenzhen # Shenzhen Yidashi Electronics Co Ltd A0:19:17 BertelSP # Bertel S.p.a. A0:1C:05 NimaxTel # NIMAX TELECOM CO.,LTD. +A0:1D:48 HewlettP # Hewlett Packard A0:21:95 SamsungE # Samsung Electronics Digital Imaging A0:21:B7 Netgear A0:23:1B Telecomp # TeleComp R&D Corp. @@ -20806,6 +20992,7 @@ A0:73:32 Cashmast # Cashmaster International Limited A0:73:FC RancoreT # Rancore Technologies Private Limited A0:75:91 SamsungE # Samsung Electronics Co.,Ltd +A0:77:71 VialisBv # Vialis BV A0:78:BA Pantech # Pantech Co., Ltd. A0:82:1F SamsungE # Samsung Electronics Co.,Ltd A0:82:C7 PTI # P.T.I Co.,LTD @@ -20838,6 +21025,7 @@ A0:C6:EC Shenzhen # ShenZhen ANYK Technology Co.,LTD A0:CE:C8 CeLink # CE LINK LIMITED A0:CF:5B Cisco # CISCO SYSTEMS, INC. +A0:D3:C1 HewlettP # Hewlett Packard A0:DC:04 Becker-A # Becker-Antriebe GmbH A0:DD:97 Polarlin # PolarLink Technologies, Ltd A0:DD:E5 Sharp # SHARP Corporation @@ -20845,6 +21033,7 @@ A0:E2:01 AvtraceC # AVTrace Ltd.(China) A0:E2:5A AmicusSk # Amicus SK, s.r.o. A0:E2:95 DatSyste # DAT System Co.,Ltd +A0:E4:53 SonyMobi # Sony Mobile Communications AB A0:E5:34 StratecB # Stratec Biomedical AG A0:E5:E9 Enimai # enimai Inc A0:E9:DB NingboFr # Ningbo FreeWings Technologies Co.,Ltd @@ -20860,6 +21049,7 @@ A0:FE:91 AvatAuto # AVAT Automation GmbH A4:01:30 Abisyste # ABIsystems Co., LTD A4:05:9E StaInfin # STA Infinity LLP +A4:09:CB AlfredKa # Alfred Kaercher GmbH & Co KG A4:0B:ED CarryTec # Carry Technology Co.,Ltd A4:0C:C3 Cisco # CISCO SYSTEMS, INC. A4:13:4E Luxul @@ -20876,6 +21066,7 @@ A4:2C:08 Masterwo # Masterwork Automodules A4:33:D1 Fibrlink # Fibrlink Communications Co.,Ltd. A4:38:FC PlasticL # Plastic Logic +A4:3A:69 Vers # Vers Inc A4:46:6B EocTechn # EOC Technology A4:46:FA AmtranVi # AmTRAN Video Corporation A4:4B:15 SunCupid # Sun Cupid Technology (HK) LTD @@ -20891,6 +21082,8 @@ A4:5D:36 HewlettP # Hewlett Packard A4:67:06 Apple A4:6E:79 DftSyste # DFT System Co.Ltd +A4:77:33 Google +A4:77:60 Nokia # Nokia Corporation A4:79:E4 Klinfo # KLINFO Corp A4:7A:A4 ArrisGro # ARRIS Group, Inc. A4:7A:CF VibicomC # VIBICOM COMMUNICATIONS INC. @@ -20955,6 +21148,7 @@ A4:FC:CE Security # Security Expert Ltd. A8:01:80 ImagoTec # IMAGO Technologies GmbH A8:06:00 SamsungE # Samsung Electronics Co.,Ltd +A8:0C:0D Cisco A8:15:4D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. A8:16:B2 LgElectr # LG Electronics A8:17:58 Elektron # Elektronik System i Umeå AB @@ -20982,6 +21176,7 @@ A8:6A:6F Rim A8:70:A5 Unicomm # UniComm Inc. A8:75:D6 FreetekI # FreeTek International Co., Ltd. +A8:75:E2 Aventura # Aventura Technologies, Inc. A8:77:6F Zonoff A8:7B:39 Nokia # Nokia Corporation A8:7E:33 NokiaDan # Nokia Danmark A/S @@ -21039,6 +21234,7 @@ AC:19:9F SungrowP # SUNGROW POWER SUPPLY CO.,LTD. AC:20:AA Dmatek # DMATEK Co., Ltd. AC:22:0B AsustekC # ASUSTek COMPUTER INC. +AC:2D:A3 Txtr # TXTR GmbH AC:2F:A8 Humannix # Humannix Co.,Ltd. AC:31:9D Shenzhen # Shenzhen TG-NET Botone Technology Co.,Ltd. AC:34:CB ShanhaiG # Shanhai GBCOM Communication Technology Co. Ltd @@ -21064,6 +21260,7 @@ AC:5E:8C Utillink AC:61:23 Drivven # Drivven, Inc. AC:67:06 RuckusWi # Ruckus Wireless +AC:6B:AC JennySci # Jenny Science AG AC:6E:1A Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd AC:6F:4F Enspert # Enspert Inc AC:6F:BB TatungTe # TATUNG Technology Inc. @@ -21097,6 +21294,7 @@ AC:BE:75 UfineTec # Ufine Technologies Co.,Ltd. AC:BE:B6 Visualed # Visualedge Technology Co., Ltd. AC:C2:EC CltIntLI # CLT INT'L IND. CORP. +AC:C5:95 Graphite # Graphite Systems AC:C6:98 KohzuPre # Kohzu Precision Co., Ltd. AC:C9:35 Ness # Ness Corporation AC:CA:54 TelldusT # Telldus Technologies AB @@ -21127,6 +21325,7 @@ AC:F2:C5 Cisco AC:F7:F3 Xiaomi # XIAOMI CORPORATION AC:F9:7E Elesys # ELESYS INC. +AC:FD:EC Apple # Apple, Inc B0:05:94 LiteonTe # Liteon Technology Corporation B0:12:03 Dynamics # Dynamics Hong Kong Limited B0:12:66 Futaba-K # Futaba-Kikaku @@ -21134,6 +21333,7 @@ B0:17:43 EdisonGl # EDISON GLOBAL CIRCUITS LLC B0:1B:7C OntrolAS # Ontrol A.S. B0:1C:91 Elim # Elim Co +B0:24:F3 Progeny # Progeny Systems B0:35:8D Nokia # Nokia Corporation B0:38:29 Siliconw # Siliconware Precision Industries Co., Ltd. B0:38:50 NanjingC # Nanjing CAS-ZDC IOT SYSTEM CO.,LTD @@ -21165,6 +21365,7 @@ B0:90:74 FulanEle # Fulan Electronics Limited B0:91:34 Taleo B0:97:3A E-Fuel # E-Fuel Corporation +B0:98:9F LgCns # LG CNS B0:99:28 Fujitsu # Fujitsu Limited B0:9A:E2 StemmerI # STEMMER IMAGING GmbH B0:9B:D4 GnhSoftw # GNH Software India Private Limited @@ -21174,6 +21375,7 @@ B0:A8:6E JuniperN # Juniper Networks B0:AA:36 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD. B0:AC:FA Fujitsu # Fujitsu Limited +B0:AD:AA Avaya # Avaya, Inc B0:B2:DC ZyxelCom # Zyxel Communications Corporation B0:B3:2B SlicanSp # Slican Sp. z o.o. B0:B4:48 TexasIns # Texas Instruments @@ -21191,6 +21393,7 @@ B0:CF:4D Mi-ZoneT # MI-Zone Technology Ireland B0:D0:9C SamsungE # Samsung Electronics Co.,Ltd B0:D2:F5 Vello # Vello Systems, Inc. +B0:D7:C5 StpKft # STP KFT B0:DF:3A SamsungE # Samsung Electronics Co.,Ltd B0:E3:9D CatSyste # CAT SYSTEM CO.,LTD. B0:E5:0E Nrg # NRG SYSTEMS INC @@ -21226,6 +21429,7 @@ B4:35:F7 Zhejiang # Zhejiang Pearmain Electronics Co.ltd. B4:37:41 Consert # Consert, Inc. B4:39:D6 Procurve # ProCurve Networking by HP +B4:3A:28 SamsungE # Samsung Electronics Co.,Ltd B4:3D:B2 Degreane # Degreane Horizon B4:3E:3B Viablewa # Viableware, Inc B4:41:7A Shenzhen # ShenZhen Gongjin Electronics Co.,Ltd @@ -21299,6 +21503,7 @@ B8:20:E7 Guangzho # Guangzhou Horizontal Information & Network Integration Co. Ltd B8:24:10 MagnetiM # Magneti Marelli Slovakia s.r.o. B8:24:1A SwedaInf # SWEDA INFORMATICA LTDA +B8:26:6C AnovFran # ANOV France B8:26:D4 Furukawa # Furukawa Industrial S.A. Produtos Elétricos B8:27:EB Raspberr # Raspberry Pi Foundation B8:28:8B ParkerHa # Parker Hannifin @@ -21312,6 +21517,7 @@ B8:3D:4E Shenzhen # Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch B8:3E:59 Roku # Roku, Inc B8:41:5F Asp # ASP AG +B8:43:E4 Vlatacom B8:47:C6 SanjetTe # SanJet Technology Corp. B8:55:10 ZioncomE # Zioncom Electronics (Shenzhen) Ltd. B8:58:10 Numera # NUMERA, INC. @@ -21332,6 +21538,7 @@ B8:77:C3 DecagonD # Decagon Devices, Inc. B8:78:2E Apple B8:79:7E SecureMe # Secure Meters (UK) Limited +B8:7A:C9 Siemens # Siemens Ltd. B8:87:1E GoodMind # Good Mind Industries Co., Ltd. B8:87:A8 StepAhea # Step Ahead Innovations Inc. B8:88:E3 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD @@ -21345,6 +21552,7 @@ B8:96:74 Alldsp # AllDSP GmbH & Co. KG B8:97:5A BiostarM # BIOSTAR Microtech Int'l Corp. B8:98:B0 Atlona # Atlona Inc. +B8:98:F7 GioneeCo # Gionee Communication Equipment Co,Ltd.ShenZhen B8:9A:ED Oceanser # OceanServer Technology, Inc B8:9B:C9 SmcNetwo # SMC Networks Inc B8:A3:86 D-LinkIn # D-Link International @@ -21361,6 +21569,7 @@ B8:BA:72 Cynove B8:BB:6D Eneres # ENERES Co.,Ltd. B8:BE:BF Cisco # CISCO SYSTEMS, INC. +B8:C1:A2 DragonPa # Dragon Path Technologies Co., Limited B8:C4:6F Primmcon # PRIMMCON INDUSTRIES INC B8:C6:8E SamsungE # Samsung Electronics Co.,Ltd B8:C7:16 Fiberhom # Fiberhome Telecommunication Technologies Co.,LTD @@ -21398,8 +21607,10 @@ BC:0F:2B FortuneT # FORTUNE TECHGROUP CO.,LTD BC:12:5E BeijingW # Beijing WisVideo INC. BC:14:01 HitronTe # Hitron Technologies. Inc +BC:14:EF ItonTech # ITON Technology Limited BC:15:A6 TaiwanJa # Taiwan Jantek Electronics,Ltd. BC:16:65 Cisco +BC:1A:67 YfTechno # YF Technology Co., Ltd BC:20:A4 SamsungE # Samsung Electronics BC:20:BA InspurSh # Inspur (Shandong) Electronic Information Co., Ltd BC:26:1D HongKong # HONG KONG TECON TECHNOLOGY @@ -21408,7 +21619,9 @@ BC:2B:6B BeijingH # Beijing Haier IC Design Co.,Ltd BC:2B:D7 RevogiIn # Revogi Innovation Co., Ltd. BC:2C:55 BearFlag # Bear Flag Design, Inc. +BC:2D:98 Thinglob # ThinGlobal LLC BC:30:5B Dell # Dell Inc. +BC:30:7D WistronN # Wistron Neweb Corp. BC:35:E5 Hydro # Hydro Systems Company BC:38:D2 Pandachi # Pandachip Limited BC:39:A6 CsunSyst # CSUN System Technology Co.,LTD @@ -21471,7 +21684,9 @@ BC:E0:9D Eoslink BC:E5:9F Waterwor # WATERWORLD Technology Co.,LTD BC:EA:2B Citycom # CityCom GmbH +BC:EE:7B AsustekC # ASUSTek COMPUTER INC. BC:F2:AF Devolo # devolo AG +BC:F5:AC LgElectr # LG Electronics BC:F6:85 D-LinkIn # D-Link International BC:FE:8C Altronic # Altronic, LLC BC:FF:AC Topcon # TOPCON CORPORATION @@ -21498,6 +21713,7 @@ C0:3E:0F Bskyb # BSkyB Ltd C0:3F:0E Netgear C0:3F:2A Biscotti # Biscotti, Inc. +C0:3F:D5 Elitegro # Elitegroup Computer Systems Co., LTD C0:41:F6 LgElectr # LG Electronics Inc C0:43:01 EpecOy # Epec Oy C0:44:E3 Shenzhen # Shenzhen Sinkna Electronics Co., LTD @@ -21510,10 +21726,12 @@ C0:5E:79 Shenzhen # SHENZHEN HUAXUN ARK TECHNOLOGIES CO.,LTD C0:62:6B Cisco # CISCO SYSTEMS, INC. C0:63:94 Apple +C0:64:C6 Nokia # Nokia Corporation C0:65:99 SamsungE # Samsung Electronics Co.,Ltd C0:67:AF Cisco C0:6C:0F DobbsSta # Dobbs Stanford C0:6C:6D Magnemot # MagneMotion, Inc. +C0:7B:BC Cisco C0:7E:40 Shenzhen # SHENZHEN XDK COMMUNICATION EQUIPMENT CO.,LTD C0:81:70 EffigisG # Effigis GeoSolutions C0:83:0A 2wire @@ -21544,6 +21762,7 @@ C0:C1:C0 Cisco-Li # Cisco-Linksys, LLC C0:C3:B6 Automati # Automatic Systems C0:C5:20 RuckusWi # Ruckus Wireless +C0:C5:69 Shanghai # SHANGHAI LYNUC CNC TECHNOLOGY CO.,LTD C0:C6:87 CiscoSpv # Cisco SPVTG C0:C9:46 MitsuyaL # MITSUYA LABORATORIES INC. C0:CB:38 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -21555,7 +21774,9 @@ C0:E4:22 TexasIns # Texas Instruments C0:E5:4E DenxComp # DENX Computer Systems GmbH C0:EA:E4 Sonicwal # Sonicwall +C0:F1:C4 Pacidal # Pacidal Corporation Ltd. C0:F8:DA HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. +C0:F9:91 GmeStand # GME Standard Communications P/L C4:01:42 Maxmedia # MaxMedia Technology Limited C4:01:7C RuckusWi # Ruckus Wireless C4:01:B1 Seektech # SeekTech INC @@ -21583,6 +21804,7 @@ C4:3D:C7 Netgear C4:43:8F LgElectr # LG Electronics C4:45:67 SambonPr # SAMBON PRECISON and ELECTRONICS +C4:45:EC Shanghai # Shanghai Yali Electron Co.,LTD C4:46:19 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C4:48:38 SatcomDi # Satcom Direct, Inc. C4:4A:D0 Fireflie # FIREFLIES SYSTEMS @@ -21613,6 +21835,7 @@ C4:7D:FE ANSoluti # A.N. Solutions GmbH C4:7F:51 Inventek # Inventek Systems C4:82:3F FujianNe # Fujian Newland Auto-ID Tech. Co,.Ltd. +C4:82:4E Changzho # Changzhou Uchip Electronics Co., LTD. C4:85:08 IntelCor # Intel Corporate C4:88:E5 SamsungE # Samsung Electronics Co.,Ltd C4:93:00 8devices @@ -21624,6 +21847,7 @@ C4:AD:21 Mediaedg # MEDIAEDGE Corporation C4:B5:12 GeneralE # General Electric Digital Energy C4:BA:99 I+MeActi # I+ME Actia Informatik und Mikro-Elektronik GmbH +C4:C0:AE MidoriEl # MIDORI ELECTRONIC CO., LTD. C4:C1:9F National # National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO) C4:C7:55 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd C4:CA:D9 Hangzhou # Hangzhou H3C Technologies Co., Limited @@ -21671,6 +21895,7 @@ C8:48:F5 MedisonX # MEDISON Xray Co., Ltd C8:4C:75 Cisco # CISCO SYSTEMS, INC. C8:56:45 Intermas # Intermas France +C8:56:63 SunflexE # Sunflex Europe GmbH C8:60:00 AsustekC # ASUSTek COMPUTER INC. C8:64:C7 Zte # zte corporation C8:6C:1E Display # Display Systems Ltd @@ -21734,6 +21959,7 @@ C8:F3:6B YamatoSc # Yamato Scale Co.,Ltd. C8:F3:86 Shenzhen # Shenzhen Xiaoniao Technology Co.,Ltd C8:F4:06 Avaya # Avaya, Inc +C8:F6:8D SETechno # S.E.TECHNOLOGIES LIMITED C8:F7:04 Building # Building Block Video C8:F7:33 IntelCor # Intel Corporate C8:F9:81 SenecaSR # Seneca s.r.l. @@ -21780,12 +22006,14 @@ CC:5D:4E ZyxelCom # ZyXEL Communications Corporation CC:5D:57 Informat # Information System Research Institute,Inc. CC:60:BB EmpowerR # Empower RF Systems +CC:65:AD ArrisGro # ARRIS Group, Inc. CC:69:B0 GlobalTr # Global Traffic Technologies, LLC CC:6B:98 MinetecW # Minetec Wireless Technologies CC:6B:F1 SoundMas # Sound Masking Inc. CC:6D:A0 Roku # Roku, Inc. CC:6D:EF TjkTieto # TJK Tietolaite Oy CC:72:0F Viscount # Viscount Systems Inc. +CC:74:98 Filmetri # Filmetrics Inc. CC:76:69 Seetech CC:78:5F Apple CC:7A:30 CmaxWire # CMAX Wireless Co., Ltd. @@ -21864,6 +22092,7 @@ D0:59:C3 Ceramicr # CeraMicro Technology Corporation D0:5A:0F I-BtDigi # I-BT DIGITAL CO.,LTD D0:5F:CE HitachiD # Hitachi Data Systems +D0:63:4D MeikoMas # Meiko Maschinenbau GmbH & Co. KG D0:63:B4 Solidrun # SolidRun Ltd. D0:66:7B SamsungE # Samsung Electronics Co., LTD D0:67:E5 Dell # Dell Inc @@ -21888,8 +22117,10 @@ D0:AF:B6 LinktopT # Linktop Technology Co., LTD D0:B3:3F Shenzhen # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD. D0:B4:98 RobertBo # Robert Bosch LLC Automotive Electronics +D0:B5:23 Bestcare # Bestcare Cloucal Corp. D0:B5:3D SeproRob # SEPRO ROBOTIQUE D0:BB:80 ShlTelem # SHL Telemedicine International Ltd. +D0:BD:01 DsIntern # DS International D0:BE:2C Cnslink # CNSLink Co., Ltd. D0:C1:B1 SamsungE # Samsung Electronics Co.,Ltd D0:C2:82 Cisco # CISCO SYSTEMS, INC. @@ -21908,6 +22139,7 @@ D0:DF:9A LiteonTe # Liteon Technology Corporation D0:DF:B2 GenieNet # Genie Networks Limited D0:DF:C7 SamsungE # Samsung Electronics Co.,Ltd +D0:E1:40 Apple # Apple, Inc D0:E3:47 Yoga D0:E4:0B Wearable # Wearable Inc. D0:E5:4D Pace # Pace plc @@ -21969,6 +22201,7 @@ D4:6F:42 WaxessUs # WAXESS USA Inc D4:79:C3 Camerone # Cameronet GmbH & Co. KG D4:7B:75 HartingE # HARTING Electronics GmbH +D4:81:CA Idevices # iDevices, LLC D4:82:3E ArgosyTe # Argosy Technologies, Ltd. D4:85:64 Hewlett- # Hewlett-Packard Company D4:87:D8 SamsungE # Samsung Electronics @@ -22052,6 +22285,7 @@ D8:50:E6 AsustekC # ASUSTek COMPUTER INC. D8:54:3A TexasIns # Texas Instruments D8:57:EF SamsungE # Samsung Electronics +D8:58:D7 CzNicZSP # CZ.NIC, z.s.p.o. D8:5D:4C Tp-LinkT # TP-LINK Technologies Co.,Ltd. D8:5D:84 CaxSoft # CAx soft GmbH D8:62:DB Eno # Eno Inc. @@ -22065,6 +22299,7 @@ D8:76:0A Escort # Escort, Inc. D8:78:E5 KuhnSa # KUHN SA D8:79:88 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. +D8:7C:DD Sanix # SANIX INCORPORATED D8:8A:3B Unit-Em D8:90:E8 SamsungE # Samsung Electronics Co.,Ltd D8:95:2F TexasIns # Texas Instruments @@ -22212,6 +22447,7 @@ E0:3E:7D Data-Com # data-complex GmbH E0:46:9A Netgear E0:55:97 Emergent # Emergent Vision Technologies Inc. +E0:56:F4 Axesnetw # AxesNetwork Solutions inc. E0:58:9E LaerdalM # Laerdal Medical E0:5B:70 Innovid # Innovid, Co., Ltd. E0:5D:A6 DetlefFi # Detlef Fink Elektronik & Softwareentwicklung @@ -22222,8 +22458,10 @@ E0:64:BB Digiview # DigiView S.r.l. E0:67:B3 C-DataTe # C-Data Technology Co., Ltd E0:69:95 Pegatron # PEGATRON CORPORATION +E0:75:0A AlpsErec # ALPS ERECTORIC CO.,LTD. E0:75:7D Motorola # Motorola Mobility LLC E0:7C:62 WhistleL # Whistle Labs, Inc. +E0:7F:53 Techboar # TECHBOARD SRL E0:7F:88 Evidence # EVIDENCE Network SIA E0:81:77 Greenbyt # GreenBytes, Inc. E0:87:B1 Nata-Inf # Nata-Info Ltd. @@ -22256,6 +22494,7 @@ E0:C3:F3 Zte # ZTE Corporation E0:C6:B3 Mildef # MilDef AB E0:C7:9D TexasIns # Texas Instruments +E0:C8:6A Shenzhen # SHENZHEN TW-SCIE Co., Ltd E0:C9:22 JirehEne # Jireh Energy Tech., Ltd. E0:C9:7A Apple E0:CA:4D Shenzhen # Shenzhen Unistar Communication Co.,LTD @@ -22271,6 +22510,7 @@ E0:DA:DC JvcKenwo # JVC KENWOOD Corporation E0:DB:55 Dell # Dell Inc E0:DC:A0 SiemensE # Siemens Electrical Apparatus Ltd., Suzhou Chengdu Branch +E0:E6:31 SnbTechn # SNB TECHNOLOGIES LIMITED E0:E7:51 Nintendo # Nintendo Co., Ltd. E0:E8:E8 OliveTel # Olive Telecommunication Pvt. Ltd E0:ED:1A Vastrive # vastriver Technology Co., Ltd @@ -22285,6 +22525,7 @@ E0:F9:BE Cloudena # Cloudena Corp. E0:FA:EC PlatanSp # Platan sp. z o.o. sp. k. E2:0C:0F Kingston # Kingston Technologies +E4:04:39 TomtomSo # TomTom Software Ltd E4:11:5B HewlettP # Hewlett Packard E4:12:89 Topsyste # topsystem Systemhaus GmbH E4:1C:4B V2Techno # V2 TECHNOLOGY, INC. @@ -22324,6 +22565,7 @@ E4:77:D4 MinrrayI # Minrray Industry Co.,Ltd E4:7C:F9 SamsungE # Samsung Electronics Co., LTD E4:7D:5A BeijingH # Beijing Hanbang Technology Corp. +E4:81:84 Alcatel- # Alcatel-Lucent E4:81:B3 Shenzhen # Shenzhen ACT Industrial Co.,Ltd. E4:83:99 ArrisGro # ARRIS Group, Inc. E4:8A:D5 RfWindow # RF WINDOW CO., LTD. @@ -22398,6 +22640,7 @@ E8:5B:F0 ImagingD # Imaging Diagnostics E8:5E:53 Infratec # Infratec Datentechnik GmbH E8:61:1F DawningI # Dawning Information Industry Co.,Ltd +E8:61:83 BlackDia # Black Diamond Advanced Technology, LLC E8:6C:DA Supercom # Supercomputers and Neurocomputers Research Center E8:6D:52 ArrisGro # ARRIS Group, Inc. E8:6D:54 DigitMob # Digit Mobile Inc @@ -22446,6 +22689,7 @@ E8:E1:E2 Energote # Energotest E8:E5:D6 SamsungE # Samsung Electronics Co.,Ltd E8:E7:32 Alcatel- # Alcatel-Lucent +E8:E7:70 Warp9Tec # Warp9 Tech Design, Inc. E8:E7:76 Shenzhen # Shenzhen Kootion Technology Co., Ltd E8:E8:75 Is5Commu # iS5 Communications Inc. E8:EA:DA DenkoviA # Denkovi Assembly Electroncs LTD @@ -22486,6 +22730,7 @@ EC:63:E5 EpboardD # ePBoard Design LLC EC:66:D1 B&WGroup # B&W Group LTD EC:6C:9F ChengduV # Chengdu Volans Technology CO.,LTD +EC:71:DB Shenzhen # Shenzhen Baichuan Digital Technology Co., Ltd. EC:7C:74 JustoneT # Justone Technologies Co., Ltd. EC:7D:9D Mei EC:83:6C RmTech # RM Tech Co., Ltd. @@ -22543,11 +22788,13 @@ F0:24:05 OpusHigh # OPUS High Technology Corporation F0:24:08 TalarisS # Talaris (Sweden) AB F0:25:72 Cisco # CISCO SYSTEMS, INC. +F0:25:B7 SamsungE # Samsung Electro Mechanics co., LTD. F0:26:4C DrSigris # Dr. Sigrist AG F0:27:65 MurataMa # Murata Manufactuaring Co.,Ltd. F0:29:29 Cisco F0:2A:61 WaldoNet # Waldo Networks, Inc. F0:2F:D8 Bi2-Visi # Bi2-Vision +F0:32:1A Mita-Tek # Mita-Teknik A/S F0:37:A1 HuikeEle # Huike Electronics (SHENZHEN) CO., LTD. F0:3A:55 OmegaEle # Omega Elektronik AS F0:43:35 DvnShang # DVN(Shanghai)Ltd. @@ -22561,6 +22808,7 @@ F0:5D:89 Dycon # Dycon Limited F0:5D:C8 Duracell # Duracell Powermat F0:5F:5A Getriebe # Getriebebau NORD GmbH and Co. KG +F0:61:30 Advantag # Advantage Pharmacy Services, LLC F0:62:0D Shenzhen # Shenzhen Egreat Tech Corp.,Ltd F0:62:81 Procurve # ProCurve Networking by HP F0:65:DD PrimaxEl # Primax Electronics Ltd. @@ -22611,12 +22859,14 @@ F0:DE:F1 WistronI # Wistron InfoComm (Kunshan)Co F0:E5:C3 Drägerwe # Drägerwerk AG & Co. KG aA F0:E7:7E SamsungE # Samsung Electronics Co.,Ltd +F0:EB:D0 Shanghai # Shanghai Feixun Communication Co.,Ltd. F0:EC:39 Essec F0:ED:1E BilkonBi # Bilkon Bilgisayar Kontrollu Cih. Im.Ltd. F0:EE:BB Vipar # VIPAR GmbH F0:F0:02 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. F0:F2:60 Mobitec # Mobitec AB F0:F5:AE Adaptrum # Adaptrum Inc. +F0:F6:1C Apple F0:F6:44 Whitesky # Whitesky Science & Technology Co.,Ltd. F0:F6:69 MotionAn # Motion Analysis Corporation F0:F7:55 Cisco # CISCO SYSTEMS, INC. @@ -22626,6 +22876,7 @@ F0:FD:A0 AcurixNe # Acurix Networks LP F4:03:21 BenextBV # BeNeXt B.V. F4:04:4C Valencet # ValenceTech Limited +F4:06:8D Devolo # devolo AG F4:0B:93 Research # Research In Motion F4:0F:9B Wavelink F4:15:FD Shanghai # Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd. @@ -22690,6 +22941,7 @@ F4:CA:E5 FreeboxS # FREEBOX SA F4:CD:90 Vispiron # Vispiron Rotec GmbH F4:CE:46 Hewlett- # Hewlett-Packard Company +F4:CF:E2 Cisco F4:D9:FB SamsungE # Samsung Electronics CO., LTD F4:DC:4D BeijingC # Beijing CCD Digital Technology Co., Ltd F4:DC:DA ZhuhaiJi # Zhuhai Jiahe Communication Technology Co., limited @@ -22714,6 +22966,7 @@ F8:15:47 Avaya # Avaya, Inc F8:16:54 IntelCor # Intel Corporate F8:1A:67 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. +F8:1C:E5 Telefonb # Telefonbau Behnke GmbH F8:1D:93 Longdhua # Longdhua(Beijing) Controls Technology Co.,Ltd F8:1E:DF Apple F8:22:85 CypressT # Cypress Technology CO., LTD. @@ -22741,6 +22994,7 @@ F8:51:6D DenwaTec # Denwa Technology Corp. F8:52:DF VnlEurop # VNL Europe AB F8:54:AF EciTelec # ECI Telecom Ltd. +F8:57:2E CoreBran # Core Brands, LLC F8:5B:C9 M-Cube # M-Cube Spa F8:5F:2A Nokia # Nokia Corporation F8:62:AA Xn # xn systems @@ -22766,7 +23020,9 @@ F8:9D:0D ControlT # Control Technology Inc. F8:9F:B8 YazakiEn # YAZAKI Energy System Corporation F8:A0:3D DinstarT # Dinstar Technologies Co., Ltd. +F8:A2:B4 Rhewa-Wa # RHEWA-WAAGENFABRIK August Freudewald GmbH &Co. KG F8:A4:5F BeijingX # Beijing Xiaomi communications co.,ltd +F8:A9:63 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. F8:A9:DE Puissanc # PUISSANCE PLUS F8:AA:8A AxviewTe # Axview Technology (Shenzhen) Co.,Ltd F8:AC:6D Deltenna # Deltenna Ltd @@ -22811,6 +23067,7 @@ FC:01:CD Fundacio # FUNDACION TEKNIKER FC:06:47 Cortland # Cortland Research, LLC FC:08:77 PrentkeR # Prentke Romich Company +FC:09:D8 ActeonGr # ACTEON Group FC:0A:81 Motorola # Motorola Solutions Inc. FC:0F:E6 SonyComp # Sony Computer Entertainment Inc. FC:10:BD ControlS # Control Sistematizado S.A. @@ -22834,6 +23091,7 @@ FC:44:99 SwarcoLe # Swarco LEA d.o.o. FC:45:5F JiangxiS # JIANGXI SHANSHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD FC:48:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +FC:4B:1C Intersen # INTERSENSOR S.R.L. FC:4B:BC SunplusT # Sunplus Technology Co., Ltd. FC:4D:D4 Universa # Universal Global Scientific Industrial Co., Ltd. FC:50:90 SimexSpZ # SIMEX Sp. z o.o. @@ -22891,7 +23149,7 @@ # # Well-known addresses. # -# $Id: manuf 51837 2013-09-08 14:34:52Z gerald $ +# $Id: manuf 52892 2013-10-27 14:35:00Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald [AT] wireshark.org>
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/Makefile.in ^
@@ -98,6 +98,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -146,6 +147,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/macosx/Info.plist ^
@@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.8.10, Copyright 1998-2012 Wireshark Development Team</string> + <string>1.8.11, Copyright 1998-2012 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Wireshark.icns</string> <key>CFBundleIdentifier</key> @@ -56,11 +56,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.8.10</string> + <string>1.8.11</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.8.10</string> + <string>1.8.11</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2012 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/macosx/Makefile.in ^
@@ -59,6 +59,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -107,6 +108,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/macosx/Read_me_first.rtf ^
@@ -1,40 +1,40 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350 -{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;} +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370 +\cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} {\\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} {\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\\levelmarker \{disc\}}{\leveltext\leveltemplateid101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid2} {\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\\levelmarker \{decimal\}.}{\leveltext\leveltemplateid201\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid3}} {\\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}} \margl1440\margr1440\vieww13060\viewh12960\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f0\b\fs28 \cf0 Before You Begin\ \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later, including X11.app. If you are running OS X 10.5.4 or older, you can install using MacPorts or Fink. +\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later, including X11.app. If you are running OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew. \f0\b\fs28 \ \ Quick Setup\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \b0\fs24 \cf0 \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural \ls1\ilvl0 \f1 \cf0 Simply double-click the Wireshark package. For details about the installation read below.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f0\b\fs28 \cf0 What changes does the installer make?\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \b0\fs24 \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f1 \cf0 The installer writes to the following locations:\ \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural \ls2\ilvl0\cf0 {\listtext \'95 } \i /Applications/Wireshark \i0 . The main Wireshark application.\ @@ -44,26 +44,27 @@ \i /dev/bpf \i0 ) when the system starts up.\ {\listtext \'95 } -\i /Library/Wireshark -\i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /Library/Wireshark to your PATH.\ -\pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\i /usr/local/bin +\i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /usr/local/bin to your PATH if it's not already in your PATH.\ +\pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \cf0 \ Additionally a group named \i access_bpf \i0 is created. The user who opened the package is added to the group.\ \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural \f0\b\fs28 \cf0 How do I uninstall?\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\b0\fs24 \ -\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural +\b0\fs24 \cf0 \ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural \ls3\ilvl0 \f1 \cf0 {\listtext 1. }Remove \i /Applications/Wireshark \i0 \ -{\listtext 2. }Remove -\i /Library/Wireshark +{\listtext 2. }Remove the wrapper scripts from +\i /usr/local/bin \i0 \ {\listtext 3. }Remove \i /Library/StartupItems/ChmodBPF
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/nsis/Makefile.in ^
@@ -58,6 +58,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -106,6 +107,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/rpm/Makefile.in ^
@@ -98,6 +98,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -146,6 +147,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/rpm/SPECS/Makefile.in ^
@@ -59,6 +59,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -107,6 +108,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/packaging/svr4/Makefile.in ^
@@ -59,6 +59,7 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -107,6 +108,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/Makefile.in ^
@@ -121,6 +121,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -169,6 +170,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/asn1/Makefile.in ^
@@ -173,6 +173,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -221,6 +222,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/docsis/Makefile.in ^
@@ -185,6 +185,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -233,6 +234,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/ethercat/Makefile.in ^
@@ -173,6 +173,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -221,6 +222,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/gryphon/Makefile.in ^
@@ -174,6 +174,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -222,6 +223,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/irda/Makefile.in ^
@@ -171,6 +171,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -219,6 +220,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/m2m/Makefile.in ^
@@ -173,6 +173,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -221,6 +222,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/mate/Makefile.in ^
@@ -198,6 +198,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -246,6 +247,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/opcua/Makefile.in ^
@@ -179,6 +179,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -227,6 +228,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/profinet/Makefile.in ^
@@ -175,6 +175,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -223,6 +224,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/stats_tree/Makefile.in ^
@@ -171,6 +171,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -219,6 +220,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/unistim/Makefile.in ^
@@ -173,6 +173,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -221,6 +222,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/wimax/Makefile.in ^
@@ -186,6 +186,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -234,6 +235,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/wimax/packet-wmx.c ^
@@ -5,7 +5,7 @@ * * Author: Lu Pan <lu.pan@intel.com> * - * $Id: packet-wmx.c 47334 2013-01-28 23:11:25Z gerald $ + * $Id: packet-wmx.c 53011 2013-10-31 22:46:40Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -645,7 +645,7 @@ /* display the TLV name and display the value in hex. Highlight type, length, and value. / tlv_item = proto_tree_add_item(tree, hfindex, tvb, start, tlv_value_length, little_endian); - if (!PITEM_FINFO(tlv_item)) + if ((tlv_item == NULL) \|\| (!PITEM_FINFO(tlv_item))) return tree; / Correct the highlighting. / @@ -744,7 +744,7 @@ va_end(ap); tlv_item = proto_tree_add_protocol_format(tree, hfindex, tvb, start, length, "%s", message); - if (!PITEM_FINFO(tlv_item)) + if ((tlv_item == NULL) \|\| (!PITEM_FINFO(tlv_item))) return tree; / Correct the highlighting. */
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/plugins/wimaxasncp/Makefile.in ^
@@ -197,6 +197,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -245,6 +246,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/services ^
@@ -1,6 +1,6 @@ # This is a local copy of the IANA port-numbers file. # -# $Id: services 51837 2013-09-08 14:34:52Z gerald $ +# $Id: services 52892 2013-10-27 14:35:00Z gerald $ # # Wireshark uses it to resolve port numbers into human readable # service names, e.g. TCP port 80 -> http. @@ -775,7 +775,7 @@ alpes 463/udp # alpes [Alain_Durand] [Alain_Durand] kpasswd 464/tcp # kpasswd [Theodore_Ts_o] [Theodore_Ts_o] kpasswd 464/udp # kpasswd [Theodore_Ts_o] [Theodore_Ts_o] -urd 465/tcp # URL Rendesvous Directory for SSM +urd 465/tcp # URL Rendesvous Directory for SSM [Toerless_Eckert] [Toerless_Eckert] igmpv3lite 465/udp # IGMP over UDP for SSM [Toerless_Eckert] [Toerless_Eckert] digital-vrc 466/tcp # digital-vrc [Peter_Higginson] [Peter_Higginson] digital-vrc 466/udp # digital-vrc [Peter_Higginson] [Peter_Higginson] @@ -8022,6 +8022,7 @@ bmc-reporting 4568/udp # BMC Reporting [Portnoy_Boxman] [Portnoy_Boxman] iax 4569/tcp # Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] Defined TXT keys: auth plaintext \| md5 \| rsakeys userid alphanumeric, additionally '_', '+', '-' secret any printable ASCII characters domain any DNS domain name or IP address extension alphanumeric, additionally '', '#', '_', '+', '-' context alphanumeric, additionally '_', '+', '-' trunk yes \| no \| 0 \| 1 welcome alphanumeric, additionally '', '#', '_', '+', '-' voicemail alphanumeric, additionally '', '#', '_', '+', '-' reception alphanumeric, additionally '', '#', '_', '+', '-' echotest alphanumeric, additionally '', '#', '_', '+', '-' ivrtest alphanumeric, additionally '', '#', '_', '+', '-'All of these TXT record keys are optional, they may be omitted.Further keys may be added in the future. iax 4569/udp # Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] Defined TXT keys: auth plaintext \| md5 \| rsakeys userid alphanumeric, additionally '_', '+', '-' secret any printable ASCII characters domain any DNS domain name or IP address extension alphanumeric, additionally '', '#', '_', '+', '-' context alphanumeric, additionally '_', '+', '-' trunk yes \| no \| 0 \| 1 welcome alphanumeric, additionally '', '#', '_', '+', '-' voicemail alphanumeric, additionally '', '#', '_', '+', '-' reception alphanumeric, additionally '', '#', '_', '+', '-' echotest alphanumeric, additionally '', '#', '_', '+', '-' ivrtest alphanumeric, additionally '', '#', '_', '+', '-'All of these TXT record keys are optional, they may be omitted.Further keys may be added in the future. +deploymentmap 4570/tcp # Service to distribute and update within a site deployment information for Oracle Communications Suite [Oracle_3] [Dan_Newman] 2013-09-20 rid 4590/tcp # RID over HTTP/TLS [IESG] [IETF_Chair] [RFC6546] l3t-at-an 4591/tcp # HRPD L3T (AT-AN) [Avi_Lior] [Avi_Lior] 2009-02-27 l3t-at-an 4591/udp # HRPD L3T (AT-AN) [Avi_Lior] [Avi_Lior] 2009-02-27 @@ -9157,6 +9158,7 @@ dt-vra 6326/tcp # Double-Take Virtual Recovery Assistant [Vision_Solutions] [James_Wilkinson2] 2012-10-08 sflow 6343/tcp # sFlow traffic monitoring [Peter_Phaal] [Peter_Phaal] 2003-06 sflow 6343/udp # sFlow traffic monitoring [Peter_Phaal] [Peter_Phaal] 2003-06 +streletz 6344/tcp # Argus-Spectr security and fire-prevention systems service [Argus_Spectr] [Kirill_Marinushkin] 2013-10-25 gnutella-svc 6346/tcp # gnutella-svc [Serguei_Osokine] [Serguei_Osokine] gnutella-svc 6346/udp # gnutella-svc [Serguei_Osokine] [Serguei_Osokine] gnutella-rtr 6347/tcp # gnutella-rtr [Serguei_Osokine] [Serguei_Osokine] @@ -10557,8 +10559,11 @@ asgcypresstcps 11489/tcp # ASG Cypress Secure Only [David_Luxford] [David_Luxford] 2010-07-01 tempest-port 11600/tcp # Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] tempest-port 11600/udp # Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] +emc-xsw-dconfig 11623/tcp # EMC XtremSW distributed config [EMC] [David_Erel] 2013-09-18 h323callsigalt 11720/tcp # H.323 Call Control Signalling Alternate [ITU-T] [ITU-T_TSB] 2013-01-31 h323callsigalt 11720/udp # H.323 Call Control Signalling Alternate [ITU-T] [ITU-T_TSB] 2013-01-31 +emc-xsw-dcache 11723/tcp # EMC XtremSW distributed cache [EMC] [David_Erel] 2013-09-18 +emc-xsw-dcache 11723/udp # EMC XtremSW distributed cache [EMC] [David_Erel] 2013-09-18 intrepid-ssl 11751/tcp # Intrepid SSL [Robert_Eden] [Robert_Eden] 2003-03 intrepid-ssl 11751/udp # Intrepid SSL [Robert_Eden] [Robert_Eden] 2003-03 lanschool 11796/tcp # LanSchool [Stoneware_Inc] [Dana_Doggett] 2012-05-18 @@ -11169,6 +11174,14 @@ ethercat 34980/tcp # EtherCAT Port [Martin_Rostan] [Martin_Rostan] 2003-11 ethercat 34980/udp # EhterCAT Port [Martin_Rostan] [Martin_Rostan] 2003-11 heathview 35000/tcp # HeathView [Heathwest_Systems_Limited] [Andrew_Porrer] 2013-03-21 +rt-viewer 35001/tcp # ReadyTech Viewer [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-viewer 35001/udp # ReadyTech Viewer [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-sound 35002/tcp # ReadyTech Sound Server [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-devicemapper 35003/tcp # ReadyTech DeviceMapper Server [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-classmanager 35004/tcp # ReadyTech ClassManager [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-classmanager 35004/udp # ReadyTech ClassManager [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-labtracker 35005/tcp # ReadyTech LabTracker [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 +rt-helper 35006/tcp # ReadyTech Helper Service [ReadyTech_Corporation] [Kevin_Woodward] 2013-09-13 kitim 35354/tcp # KIT Messenger [Rudi_Visser] [Rudi_Visser] 2011-07-07 altova-lm 35355/tcp # Altova License Management [Alexander_Falk_2] [Alexander_Falk_2] 2011-07-07 altova-lm-disc 35355/udp # Altova License Management Discovery [Alexander_Falk_2] [Alexander_Falk_2] 2011-07-07 @@ -11245,6 +11258,7 @@ pmcd 44321/udp # PCP server (pmcd) [Ken_McDonell] [Ken_McDonell] 2010-12-20 pmcdproxy 44322/tcp # PCP server (pmcd) proxy [Ken_McDonell] [Ken_McDonell] 2003-07 2010-12-20 pmcdproxy 44322/udp # PCP server (pmcd) proxy [Ken_McDonell] [Ken_McDonell] 2003-07 2010-12-20 +pmwebapi 44323/tcp # HTTP binding for Performance Co-Pilot client API [Performance_Co-Pilot_PCP_Project] [Ken_McDonell_2] 2013-10-09 cognex-dataman 44444/tcp # Cognex DataMan Management Protocol [Cognex] [Mario_Joussen] 2012-08-28 domiq 44544/udp # DOMIQ Building Automation [DOMIQ_Sp_zoo] [Filip_Zawadiak] 2011-08-29 rbr-debug 44553/tcp # REALbasic Remote Debug [Aaron_Ballman] [Aaron_Ballman] 2004-11
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/svnversion.h ^
@@ -1,2 +1,2 @@ -#define SVNVERSION "SVN Rev 51935" +#define SVNVERSION "SVN Rev 53023" #define SVNPATH "/trunk-1.8"
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/tools/Makefile.in ^
@@ -123,6 +123,7 @@ dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -171,6 +172,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/tools/lemon/Makefile.in ^
@@ -116,6 +116,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -164,6 +165,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/tshark.c ^
@@ -3,7 +3,7 @@ * Text-mode variant of Wireshark, along the lines of tcpdump and snoop, * by Gilbert Ramirez <gram@alumni.rice.edu> and Guy Harris <guy@alum.mit.edu>. * - * $Id: tshark.c 48199 2013-03-08 19:01:12Z gerald $ + * $Id: tshark.c 53011 2013-10-31 22:46:40Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -3205,21 +3205,6 @@ continue; switch (cf->cinfo.col_fmt[i]) { case COL_NUMBER: -#ifdef HAVE_LIBPCAP - /* - * Don't print this if we're doing a live capture from a network - * interface - if we're doing a live capture, you won't be - * able to look at the capture in the future (it's not being - * saved anywhere), so the frame numbers are unlikely to be - * useful. - * - * (XXX - it might be nice to be able to save and print at - * the same time, sort of like an "Update list of packets - * in real time" capture in Wireshark.) - */ - if (global_capture_opts.ifaces->len > 0) - continue; -#endif column_len = strlen(cf->cinfo.col_data[i]); if (column_len < 3) column_len = 3;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ui/Makefile.in ^
@@ -172,6 +172,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -220,6 +221,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ui/cli/Makefile.in ^
@@ -205,6 +205,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -253,6 +254,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ui/gtk/Makefile.in ^
@@ -352,6 +352,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -400,6 +401,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ui/gtk/uat_gui.c ^
@@ -1,7 +1,7 @@ /* * uat_gui.c * - * $Id: uat_gui.c 47325 2013-01-28 18:02:58Z gerald $ + * $Id: uat_gui.c 53011 2013-10-31 22:46:40Z gerald $ * * User Accessible Tables GUI * Mantain an array of user accessible data strucures @@ -151,9 +151,9 @@ } static char* fld_tostr(void* rec, uat_field_t* f) { - guint len; + guint len; const char* ptr; - char* out; + char* out; f->cb.tostr(rec,&ptr,&len,f->cbdata.tostr,f->fld_data);
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ui/qt/Makefile.in ^
@@ -229,6 +229,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -277,6 +278,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/ui/win32/print_win32.c ^
@@ -1,7 +1,7 @@ -/* print_mswin.c +/* print_win32.c * Printing support for MSWindows * - * $Id: print_win32.c 50845 2013-07-23 18:09:22Z gerald $ + * $Id: print_win32.c 53010 2013-10-31 21:52:27Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -250,7 +250,6 @@ y_pos = Y_OFFSET; y_cnt = 0; } - continue; } buf[cnt++] = ch;
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/wiretap/Makefile.am ^
@@ -1,7 +1,7 @@ # Makefile.am # Automake file for Wiretap # -# $Id: Makefile.am 50938 2013-07-26 22:03:59Z gerald $ +# $Id: Makefile.am 53008 2013-10-31 19:24:22Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -30,7 +30,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:10:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:11:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ if HAVE_WARNINGS_AS_ERRORS AM_NON_GENERATED_CFLAGS = -Werror
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/wiretap/Makefile.in ^
@@ -18,7 +18,7 @@ # Makefile.am # Automake file for Wiretap # -# $Id: Makefile.am 50938 2013-07-26 22:03:59Z gerald $ +# $Id: Makefile.am 53008 2013-10-31 19:24:22Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -224,6 +224,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -272,6 +273,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@ @@ -609,7 +611,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:10:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:11:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/wiretap/pcapng.c ^
@@ -1,6 +1,6 @@ /* pcapng.c * - * $Id: pcapng.c 50841 2013-07-23 16:31:48Z gerald $ + * $Id: pcapng.c 52255 2013-09-28 21:08:49Z guy $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -376,6 +376,7 @@ /* Interface data in private struct / typedef struct interface_data_s { int wtap_encap; + guint32 snap_len; guint64 time_units_per_second; } interface_data_t; @@ -1056,7 +1057,7 @@ err = WTAP_ERR_BAD_FILE; err_info = g_strdup_printf("pcapng: interface index %u is not less than interface count %u.", wblock->data.packet.interface_id, pn->number_of_interfaces); - return FALSE; + return 0; } int_data = g_array_index(pn->interface_data, interface_data_t, wblock->data.packet.interface_id); @@ -1081,7 +1082,7 @@ err, err_info); if (pseudo_header_len < 0) { - return FALSE; + return 0; } block_read += pseudo_header_len; if (pseudo_header_len != pcap_get_phdr_size(int_data.wtap_encap, wblock->pseudo_header)) { @@ -1230,11 +1231,13 @@ pcapng_read_simple_packet_block(FILE_T fh, pcapng_block_header_t bh, pcapng_t pn, wtapng_block_t wblock, int err, gchar err_info) { int bytes_read; - int block_read; + guint block_read; guint64 file_offset64; interface_data_t int_data; - int pseudo_header_len; pcapng_simple_packet_block_t spb; + guint32 block_total_length; + guint32 padding; + int pseudo_header_len; / * Is this block long enough to be an SPB? @@ -1259,15 +1262,60 @@ } block_read = bytes_read; + if (0 >= pn->number_of_interfaces) { + err = WTAP_ERR_BAD_FILE; + err_info = g_strdup_printf("pcapng: SPB appeared before any IDBs"); + return 0; + } + int_data = g_array_index(pn->interface_data, interface_data_t, 0); + if (pn->byte_swapped) { wblock->data.simple_packet.packet_len = BSWAP32(spb.packet_len); } else { wblock->data.simple_packet.packet_len = spb.packet_len; } - wblock->data.simple_packet.cap_len = bh->block_total_length - - (guint32)sizeof(pcapng_simple_packet_block_t) - - (guint32)sizeof(bh->block_total_length); + /* + * The captured length is not a field in the SPB; it can be + * calculated as the minimum of the snapshot length from the + * IDB and the packet length, as per the pcap-ng spec. + / + wblock->data.simple_packet.cap_len = wblock->data.simple_packet.packet_len; + if (wblock->data.simple_packet.cap_len > int_data.snap_len) + wblock->data.simple_packet.cap_len = int_data.snap_len; + + / + * How much padding is there at the end of the packet data? + / + if ((wblock->data.simple_packet.cap_len % 4) != 0) + padding = 4 - (wblock->data.simple_packet.cap_len % 4); + else + padding = 0; + + / add padding bytes to "block total length" / + / (the "block total length" of some example files don't contain the packet data padding bytes!) / + if (bh->block_total_length % 4) { + block_total_length = bh->block_total_length + 4 - (bh->block_total_length % 4); + } else { + block_total_length = bh->block_total_length; + } + pcapng_debug1("pcapng_read_simple_packet_block: block_total_length %d", block_total_length); + + / + * Is this block long enough to hold the packet data? + / + if (block_total_length < MIN_SPB_SIZE + wblock->data.simple_packet.cap_len + padding) { + / + * No. That means that the problem is with the packet + * length; the snapshot length can be bigger than the amount + * of packet data in the block, as it's a maximum length, + * not a minimum length. + / + err = WTAP_ERR_BAD_FILE; + err_info = g_strdup_printf("pcapng_read_simple_packet_block: total block length %u of PB is too small for %u bytes of packet data", + block_total_length, wblock->data.simple_packet.packet_len); + return -1; + } if (wblock->data.simple_packet.cap_len > WTAP_MAX_PACKET_SIZE) { err = WTAP_ERR_BAD_FILE; @@ -1278,14 +1326,6 @@ pcapng_debug1("pcapng_read_simple_packet_block: packet data: packet_len %u", wblock->data.simple_packet.packet_len); - if (0 >= pn->number_of_interfaces) { - err = WTAP_ERR_BAD_FILE; - err_info = g_strdup_printf("pcapng: interface index 0 is not less than interface count %u.", - pn->number_of_interfaces); - return FALSE; - } - int_data = g_array_index(pn->interface_data, interface_data_t, 0); - pcapng_debug1("pcapng_read_simple_packet_block: Need to read pseudo header of size %d", pcap_get_phdr_size(int_data.wtap_encap, wblock->pseudo_header)); @@ -1314,7 +1354,7 @@ return 0; } wblock->packet_header->caplen = wblock->data.simple_packet.cap_len - pseudo_header_len; - wblock->packet_header->len = wblock->data.packet.packet_len - pseudo_header_len; + wblock->packet_header->len = wblock->data.simple_packet.packet_len - pseudo_header_len; block_read += pseudo_header_len; if (pseudo_header_len != pcap_get_phdr_size(int_data.wtap_encap, wblock->pseudo_header)) { pcapng_debug1("pcapng_read_simple_packet_block: Could only read %d bytes for pseudo header.", @@ -2006,6 +2046,7 @@ wth->number_of_interfaces++; interface_data.wtap_encap = wblock->data.if_descr.wtap_encap; + interface_data.snap_len = wblock->data.if_descr.snap_len; interface_data.time_units_per_second = wblock->data.if_descr.time_units_per_second; g_array_append_val(pcapng->interface_data, interface_data); @@ -2188,9 +2229,24 @@ return FALSE; case(BLOCK_TYPE_PB): - case(BLOCK_TYPE_SPB): case(BLOCK_TYPE_EPB): /* packet block - we've found a packet / + + / not an SPB: check interface ID / + if (wblock.data.packet.interface_id < pcapng->number_of_interfaces) { + } else { + wth->phdr.pkt_encap = WTAP_ENCAP_UNKNOWN; + err = WTAP_ERR_BAD_FILE; + err_info = g_strdup_printf("pcapng: interface index %u is not less than interface count %u.", + wblock.data.packet.interface_id, pcapng->number_of_interfaces); + pcapng_debug1("pcapng_read: data_offset is finally %" G_GINT64_MODIFIER "d", data_offset + bytes_read); + return FALSE; + } + goto got_packet; + + case(BLOCK_TYPE_SPB): + /* packet block - we've found a packet / + / SPB: no interface ID to check / goto got_packet; case(BLOCK_TYPE_IDB): @@ -2250,15 +2306,6 @@ } got_packet: - if (wblock.data.packet.interface_id < pcapng->number_of_interfaces) { - } else { - wth->phdr.pkt_encap = WTAP_ENCAP_UNKNOWN; - err = WTAP_ERR_BAD_FILE; - err_info = g_strdup_printf("pcapng: interface index %u is not less than interface count %u.", - wblock.data.packet.interface_id, pcapng->number_of_interfaces); - pcapng_debug1("pcapng_read: data_offset is finally %" G_GINT64_MODIFIER "d", data_offset + bytes_read); - return FALSE; - } /pcapng_debug2("Read length: %u Packet length: %u", bytes_read, wth->phdr.caplen);/ pcapng_debug1("pcapng_read: data_offset is finally %" G_GINT64_MODIFIER "d", *data_offset + bytes_read);
[-] [+]	Changed	wireshark-1.8.11.tar.bz2/wsutil/Makefile.in ^
@@ -209,6 +209,7 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A2X = @A2X@ ACLOCAL = @ACLOCAL@ ADNS_LIBS = @ADNS_LIBS@ AMTAR = @AMTAR@ @@ -257,6 +258,7 @@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +HAVE_A2X = @HAVE_A2X@ HAVE_BLESS = @HAVE_BLESS@ HAVE_DOXYGEN = @HAVE_DOXYGEN@ HAVE_DPKG_BUILDPACKAGE = @HAVE_DPKG_BUILDPACKAGE@