Changes - j0ke.net Open Build Service

@@ -1,750 +1,399 @@ ------------------------------------------------------------------------ -r35491 | gerald | 2011-01-11 15:07:11 -0800 (Tue, 11 Jan 2011) | 2 lines +r36116 | gerald | 2011-03-01 14:22:20 -0800 (Tue, 01 Mar 2011) | 2 lines Changed paths: + M /trunk-1.4/config.nmake + M /trunk-1.4/configure.in + M /trunk-1.4/debian/changelog M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/version.conf -Remove a link. +1.4.4 → 1.4.5. ------------------------------------------------------------------------ -r35553 | gerald | 2011-01-16 09:04:44 -0800 (Sun, 16 Jan 2011) | 1 line +r36145 | gerald | 2011-03-06 09:04:40 -0800 (Sun, 06 Mar 2011) | 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-01-16] +[Automatic manuf, services and enterprise-numbers update for 2011-03-06] ------------------------------------------------------------------------ -r35628 | gerald | 2011-01-23 09:04:46 -0800 (Sun, 23 Jan 2011) | 1 line +r36184 | gerald | 2011-03-13 09:04:34 -0700 (Sun, 13 Mar 2011) | 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-01-23] ------------------------------------------------------------------------- -r35635 | gerald | 2011-01-24 09:19:19 -0800 (Mon, 24 Jan 2011) | 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Clear out old items. - ------------------------------------------------------------------------- -r35660 | wmeier | 2011-01-26 09:02:28 -0800 (Wed, 26 Jan 2011) | 22 lines -Changed paths: - M /trunk-1.4/epan/dissectors/packet-ntlmssp.c - -Copy over revisions from trunk. - ------------------------------------------------------------------------- -r34018 | morriss | 2010-08-30 13:05:37 -0400 (Mon, 30 Aug 2010) | 5 lines -Changed paths: - M /trunk/epan/dissectors/packet-ntlmssp.c - -Fix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5157 : - -If get_unicode_or_ascii_string() returns a NULL pointer, return a pointer to an -empty string back to our caller. - ------------------------------------------------------------------------- -r34300 | wmeier | 2010-09-30 17:32:42 -0400 (Thu, 30 Sep 2010) | 3 lines -Changed paths: - M /trunk/epan/dissectors/packet-ntlmssp.c - -Fix some mangled comments (apparently mangled so that code could be commented out by an -enclosing comment). The code is now commented out with #if 0. - ------------------------------------------------------------------------- - +[Automatic manuf, services and enterprise-numbers update for 2011-03-13] ------------------------------------------------------------------------ -r35661 | wmeier | 2011-01-26 09:24:24 -0800 (Wed, 26 Jan 2011) | 2 lines +r36189 | wmeier | 2011-03-14 08:28:57 -0700 (Mon, 14 Mar 2011) | 2 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml -Clear out old entries from "Updated Protocols" & "Update Capture File Suport". +Clear out old items ... ------------------------------------------------------------------------ -r35662 | wmeier | 2011-01-26 10:05:22 -0800 (Wed, 26 Jan 2011) | 2 lines +r36191 | wmeier | 2011-03-14 09:19:41 -0700 (Mon, 14 Mar 2011) | 15 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/gtk/new_packet_list.c + M /trunk-1.4/gtk/packet_list_store.c + M /trunk-1.4/gtk/packet_list_store.h -Update release notes re NTLMSSP fixes. +Copy over r36180 manually: ------------------------------------------------------------------------ -r35701 | gerald | 2011-01-30 09:06:15 -0800 (Sun, 30 Jan 2011) | 1 line -Changed paths: - M /trunk-1.4/epan/enterprise-numbers - M /trunk-1.4/manuf +r36180 | wmeier | 2011-03-12 14:02:24 -0500 (Sat, 12 Mar 2011) | 7 lines -[Automatic manuf, services and enterprise-numbers update for 2011-01-30] +Fix bug #5189: Wireshark crashes when cancelling a large sort operation. +Essentially: Don't try to sort if the pre-requisite "columnization" step is stopped + via the progressbar dialog window before the step completes. +Also: Fix a (very) minor bug wherein the sort-indicator not always cleared on the + "previous column" when "No Sorting" was selected from a column context menu. +Also: Do minor code, comments & whitespace cleanup. ------------------------------------------------------------------------ -r35792 | gerald | 2011-02-03 14:53:50 -0800 (Thu, 03 Feb 2011) | 16 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/tshark.c - M /trunk-1.4/wiretap/pcapng.c -Copy over r35791 from the trunk. +Update release notes. ------------------------------------------------------------------------ -r35791 | gerald | 2011-02-03 14:50:49 -0800 (Thu, 03 Feb 2011) | 5 lines -Changed paths: - M /trunk/tshark.c - M /trunk/wiretap/pcapng.c - -From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't -free uninitialized memory. - -See also: bug 5652. ------------------------------------------------------------------------- - -Update the release notes. - ------------------------------------------------------------------------- -r35794 | gerald | 2011-02-03 14:56:46 -0800 (Thu, 03 Feb 2011) | 2 lines +r36192 | wmeier | 2011-03-14 09:49:01 -0700 (Mon, 14 Mar 2011) | 20 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/tools/win-setup.sh -Update revision numbers. - ------------------------------------------------------------------------- -r35798 | morriss | 2011-02-03 18:15:16 -0800 (Thu, 03 Feb 2011) | 8 lines -Changed paths: - M /trunk-1.4/wiretap/pcapng.c - -Copy over revision from trunk: - ------------------------------------------------------------------------- -r35796 | morriss | 2011-02-03 21:08:47 -0500 (Thu, 03 Feb 2011) | 1 line - -Use g_strdup() instead of strdup() - - ------------------------------------------------------------------------- -r35802 | guy | 2011-02-03 18:28:11 -0800 (Thu, 03 Feb 2011) | 12 lines -Changed paths: - M /trunk-1.4/wiretap/pcapng.c - -Copy over revision from trunk: - ------------------------------------------------------------------------- -r35800 | guy | 2011-02-03 18:24:33 -0800 (Thu, 03 Feb 2011) | 7 lines - -Put more data into the "additional error information" messages. - -Get rid of debugging printouts that are equivalent to the "additional -error information" messages. - -Return additional error info for all WTAP_ERR_BAD_RECORD errors. - ------------------------------------------------------------------------- -r35812 | guy | 2011-02-04 02:21:50 -0800 (Fri, 04 Feb 2011) | 7 lines -Changed paths: - M /trunk-1.4/wiretap/k12.c - -Copy over revision from trunk: +Copy over r35788 from trunk: ------------------------------------------------------------------------ -r35809 | guy | 2011-02-04 01:45:39 -0800 (Fri, 04 Feb 2011) | 2 lines +r35788 | wmeier | 2011-02-03 14:33:48 -0500 (Thu, 03 Feb 2011) | 12 lines -Set the error code and additional information string in more cases. +Fix: Cygwin make fails after updating to bash v 4.1.9.2 ------------------------------------------------------------------------- -r35826 | gerald | 2011-02-04 08:24:32 -0800 (Fri, 04 Feb 2011) | 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml +Extracts from the cygwin Bash 4.1.9.2 release announcement: -Add a CVE ID. +4a. For a single affected script, add this line just after the she-bang: + (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed ------------------------------------------------------------------------- -r35833 | etxrab | 2011-02-05 04:20:47 -0800 (Sat, 05 Feb 2011) | 8 lines -Changed paths: - M /trunk-1.4/asn1/ansi_map/ansi_map.asn - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-ansi_map.c +4e. bash-4.1.9-1 dropped support for 'shopt -s igncr'; -Log: - Copy over revision from trunk: - - ------------------------------------------------------------------------ -35556 |etxrab |Sun Jan 16 18:36:17 2011 UTC - - From Porus Mehta: -Corrections to ANSI MAP ASN.1 specifications. +I'm assuming this is backwards compatible; If not, we'll know quite shortly :) ------------------------------------------------------------------------ -r35835 | etxrab | 2011-02-05 06:49:12 -0800 (Sat, 05 Feb 2011) | 9 lines -Changed paths: - M /trunk-1.4/asn1/ansi_map/packet-ansi_map-template.c - M /trunk-1.4/asn1/ansi_map/packet-ansi_map-template.h - M /trunk-1.4/asn1/ansi_tcap/packet-ansi_tcap-template.c - M /trunk-1.4/epan/dissectors/packet-ansi_map.c - M /trunk-1.4/epan/dissectors/packet-ansi_map.h - M /trunk-1.4/epan/dissectors/packet-ansi_tcap.c -Copy ower: -http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35822 +Update release notes -User: etxrab -Date: 2011/02/04 08:13 AM -Log: - Introduce preferences to set the strictness of Invoke/response - tracking. ------------------------------------------------------------------------ -r35838 | gerald | 2011-02-06 09:04:41 -0800 (Sun, 06 Feb 2011) | 1 line +r36217 | gerald | 2011-03-20 09:04:43 -0700 (Sun, 20 Mar 2011) | 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-02-06] ------------------------------------------------------------------------- -r35857 | gerald | 2011-02-07 11:39:56 -0800 (Mon, 07 Feb 2011) | 5 lines -Changed paths: - M /trunk-1.4/wiretap/pcapng.c - -Check for a large packet_len. Fixes a bug reported by Huzaifa -Sidhpurwala of the Red Hat Security Response Team. - -See also: bug 5661. - ------------------------------------------------------------------------- -r35859 | gerald | 2011-02-07 11:43:07 -0800 (Mon, 07 Feb 2011) | 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Update the release notes. - ------------------------------------------------------------------------- -r35925 | gerald | 2011-02-11 16:07:21 -0800 (Fri, 11 Feb 2011) | 2 lines -Changed paths: - M /trunk-1.4/config.nmake - -Check for Python 2.7. - ------------------------------------------------------------------------- -r35932 | gerald | 2011-02-12 09:57:26 -0800 (Sat, 12 Feb 2011) | 2 lines -Changed paths: - M /trunk-1.4/packaging/portableapps/win32/makefile.nmake - -Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash. - +[Automatic manuf, services and enterprise-numbers update for 2011-03-20] ------------------------------------------------------------------------ -r35941 | gerald | 2011-02-13 09:04:45 -0800 (Sun, 13 Feb 2011) | 1 line +r36371 | gerald | 2011-03-27 09:04:28 -0700 (Sun, 27 Mar 2011) | 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-02-13] +[Automatic manuf, services and enterprise-numbers update for 2011-03-27] ------------------------------------------------------------------------ -r36014 | gerald | 2011-02-20 09:04:17 -0800 (Sun, 20 Feb 2011) | 1 line +r36438 | gerald | 2011-04-03 09:04:45 -0700 (Sun, 03 Apr 2011) | 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-02-20] ------------------------------------------------------------------------- -r36024 | jake | 2011-02-21 14:00:45 -0800 (Mon, 21 Feb 2011) | 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Clean up the release notes. - +[Automatic manuf, services and enterprise-numbers update for 2011-04-03] ------------------------------------------------------------------------ -r36027 | jake | 2011-02-22 11:42:40 -0800 (Tue, 22 Feb 2011) | 2 lines +r36535 | gerald | 2011-04-10 09:04:37 -0700 (Sun, 10 Apr 2011) | 1 line Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Fix the cleanup. - ------------------------------------------------------------------------- -r36030 | jake | 2011-02-22 23:23:36 -0800 (Tue, 22 Feb 2011) | 30 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-bittorrent.c - M /trunk-1.4/epan/dissectors/packet-dtpt.c - M /trunk-1.4/epan/dissectors/packet-quake.c - M /trunk-1.4/epan/wslua/wslua_pinfo.c - -Copy over revisions from the trunk: - ------------------------------------------------------------------------- -r33136 | wmeier | 2010-06-07 18:32:21 +0200 (Mon, 07 Jun 2010) | 3 lines -Changed paths: - M /trunk/epan/dissectors/packet-bittorrent.c - M /trunk/epan/dissectors/packet-dtpt.c - M /trunk/epan/dissectors/packet-quake.c - -Use find_or_create_conversation() rather than only conversation_new(). -Fixes bug #2907: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ------------------------------------------------------------------------- -r34618 | stig | 2010-10-22 08:47:00 +0200 (Fri, 22 Oct 2010) | 4 lines -Changed paths: - M /trunk/epan/wslua/wslua_pinfo.c - -From Regis Cridlig via bug 5326: -The Lua text string passed to column:set(text) by a dissector will eventually -be reclaimed. This causes the column to display incorrect characters. ------------------------------------------------------------------------- -r35795 | jake | 2011-02-04 00:17:31 +0100 (Fri, 04 Feb 2011) | 5 lines -Changed paths: - M /trunk/epan/wslua/wslua_pinfo.c - -From David Carne: -col_set_str simply stores the pointer passed to it, and luaL_checkstring -returns a temporary pointer. Changing col_set_str to col_add_str in -Columns_newindex seems to fix the issue. ------------------------------------------------------------------------- + M /trunk-1.4/epan/enterprise-numbers + M /trunk-1.4/manuf + M /trunk-1.4/services +[Automatic manuf, services and enterprise-numbers update for 2011-04-10] ------------------------------------------------------------------------ -r36036 | gerald | 2011-02-23 13:49:51 -0800 (Wed, 23 Feb 2011) | 3 lines +r36570 | gerald | 2011-04-11 16:18:27 -0700 (Mon, 11 Apr 2011) | 20 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-6lowpan.c + M /trunk-1.4/epan/dissectors/packet-nfs.c -Paul Makowski discovered that 32 bit systems could crash while reading a -malformed 6LoWPAN packet. +Copy over r34115 from the trunk: ------------------------------------------------------------------------ -r36038 | gerald | 2011-02-23 15:05:41 -0800 (Wed, 23 Feb 2011) | 2 lines +r34115 | gerald | 2010-09-14 08:43:19 -0700 (Tue, 14 Sep 2010) | 12 lines Changed paths: - M /trunk-1.4/docbook/release-notes.xml + M /trunk/epan/dissectors/packet-nfs.c -Fix attribution. - ------------------------------------------------------------------------- -r36041 | etxrab | 2011-02-23 22:17:25 -0800 (Wed, 23 Feb 2011) | 1 line -Changed paths: - M /trunk-1.4/epan/dissectors/packet-isup.c +From Cal Turney via bug 5209: -Register the BICC dissector by name. +Decode of SETCLIENTID calls in the Windows x86 version fail with "[Dissector +bug, protocol NFS: STATUS_ACCESS_VIOLATION: dissector accessed an invalid +memory address]". This error occurs in packet-nfs.c in +dissect_nfs_clientaddr4() where vars 'protocol' and 'universal_ip_address' get +stepped on following the call to scanf(). The b1-b10 vars are declared as +quint8. While "hh" modifier used in the scanf() is documented in Linux to +correspond to an a signed/unsigned char arg, I cannot find a similar +designation in Windows (MSDN). The Windows C compiler interprets %hhu as +corresponding to a int16 rather than int8. ------------------------------------------------------------------------ -r36043 | etxrab | 2011-02-23 22:23:54 -0800 (Wed, 23 Feb 2011) | 1 line -Changed paths: - M /trunk-1.4/diameter/dictionary.xml -Update Diameter files. ------------------------------------------------------------------------ -r36046 | jake | 2011-02-23 23:50:30 -0800 (Wed, 23 Feb 2011) | 61 lines +r36571 | gerald | 2011-04-11 17:02:47 -0700 (Mon, 11 Apr 2011) | 117 lines Changed paths: - M /trunk-1.4/asn1/snmp/packet-snmp-template.c + M /trunk-1.4/asn1/ldap/ldap.cnf + M /trunk-1.4/capinfos.c + M /trunk-1.4/docbook/check_svn_version.sh M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/addr_resolv.c - M /trunk-1.4/epan/dfilter/semcheck.c - M /trunk-1.4/epan/dissectors/packet-p_mul.c - M /trunk-1.4/epan/dissectors/packet-snmp.c - M /trunk-1.4/epan/oids.c - M /trunk-1.4/gtk/main_proto_draw.c + M /trunk-1.4/epan/dissectors/packet-ldap.c + M /trunk-1.4/epan/dissectors/packet-mysql.c + M /trunk-1.4/epan/dissectors/packet-sflow.c + M /trunk-1.4/epan/dissectors/packet-ssl-utils.c + M /trunk-1.4/epan/dissectors/packet-tcp.c + M /trunk-1.4/epan/libwireshark.def + M /trunk-1.4/gtk/compare_stat.c + M /trunk-1.4/pcapio.c + M /trunk-1.4/tap-comparestat.c + M /trunk-1.4/text2pcap.c + M /trunk-1.4/wiretap/netscreen.c Copy over revisions from the trunk: ------------------------------------------------------------------------ -r35583 | sfisher | 2011-01-19 18:58:53 +0100 (Wed, 19 Jan 2011) | 5 lines +r36160 | cmaynard | 2011-03-07 13:58:30 -0800 (Mon, 07 Mar 2011) | 6 lines Changed paths: - M /trunk/gtk/main_proto_draw.c + M /trunk/tap-comparestat.c +Allow <interval> to be successfully sscanf'd no matter the locale for the +decimal symbol. Similar to the fix made to tap-iostat.c to resolve bug 2880. -From Cal Turney via bug #5585: When searching in packet bytes, the field and -bytes are not immediately shown. +Motivated by the discussion started from this thread on the user list: +http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html ------------------------------------------------------------------------ -r35594 | jake | 2011-01-20 09:58:03 +0100 (Thu, 20 Jan 2011) | 2 lines +r36162 | sake | 2011-03-08 03:26:34 -0800 (Tue, 08 Mar 2011) | 3 lines Changed paths: - M /trunk/asn1/snmp/packet-snmp-template.c - M /trunk/epan/dissectors/packet-snmp.c + M /trunk/epan/dissectors/packet-tcp.c -Allow for expert items to be actually attached somewhere. +Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used ------------------------------------------------------------------------ -r35599 | jake | 2011-01-20 21:04:39 +0100 (Thu, 20 Jan 2011) | 2 lines +r36166 | cmaynard | 2011-03-08 06:57:38 -0800 (Tue, 08 Mar 2011) | 3 lines Changed paths: - M /trunk/epan/oids.c + M /trunk/gtk/compare_stat.c -Allow presentation of Gauge32 values larger than 0x7FFFFFFF. +Allow <variance> to be successfully sscanf'd no matter the locale for the +decimal symbol. Same change and reason as for revision 36160. ------------------------------------------------------------------------ -r35621 | morriss | 2011-01-22 16:15:51 +0100 (Sat, 22 Jan 2011) | 14 lines +r36174 | wmeier | 2011-03-08 16:43:49 -0800 (Tue, 08 Mar 2011) | 6 lines Changed paths: - M /trunk/epan/dfilter/semcheck.c - -From Johannes Lange via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5606 : + M /trunk/epan/dissectors/packet-ssl-utils.c -In semcheck.c the display filter string of an expression is checked against the -header_field_info.display value BASE_CUSTOM. But the value of BASE_CUSTOM is -applied as bitmask while the actual type is an enum (BASE_CUSTOM = 6). +Check that imported private key is RSA; Prevents a crash. -With this BASE_DEC, BASE_DEC_HEX and BASE_HEX_DEC are also matching and are not -accepted as filter expression. +Fixes Bug #5662 - -Actually: BASE_DEC works but not BASE_HEX. And the problem only shows up when -trying to match a field in one of these bases against a string (from a -value_string). +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662 ------------------------------------------------------------------------ -r35626 | stig | 2011-01-22 19:07:28 +0100 (Sat, 22 Jan 2011) | 6 lines +r36177 | cmaynard | 2011-03-11 17:32:35 -0800 (Fri, 11 Mar 2011) | 2 lines Changed paths: - M /trunk/epan/dissectors/packet-p_mul.c - -Ensure we keep the pkg_data pointer for the init routine to cleanup correctly, -because the ep memory is cleared before the init routine is called. + M /trunk/epan/dissectors/packet-sflow.c -Fixed the variable name for the no_yes true_false_string. -Update reference to protocol description. +Handle PPP in HDLC framing. Fixes bug 5746. ------------------------------------------------------------------------ -r35651 | jake | 2011-01-25 23:11:59 +0100 (Tue, 25 Jan 2011) | 4 lines +r36178 | sfisher | 2011-03-11 18:06:25 -0800 (Fri, 11 Mar 2011) | 6 lines Changed paths: - M /trunk/epan/addr_resolv.c - -Fix fo bug 5615: -Remove the filters on IPv6 Link Local and Multicast addresses, since -these _can_ be resolved through the hosts file and manual entry. ------------------------------------------------------------------------- + M /trunk/epan/dissectors/packet-sflow.c +Improve r36177 per Guy's suggestion at bug #5746 to always call the +PPP-over-HDLC dissector since it will do the check for us to see if +the HDLC framing is present or not. ------------------------------------------------------------------------ -r36050 | gerald | 2011-02-24 10:37:21 -0800 (Thu, 24 Feb 2011) | 12 lines +r36226 | wmeier | 2011-03-21 10:07:18 -0700 (Mon, 21 Mar 2011) | 4 lines Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/wiretap/dct3trace.c + M /trunk/pcapio.c -Copy over r35953 from the trunk: +Don't close file handle if a file write error; (caller does the close) +Fixes "USE_AFTER_FREE" defect reported by Coverity Prevent. ------------------------------------------------------------------------ -r35953 | gerald | 2011-02-15 16:42:06 -0800 (Tue, 15 Feb 2011) | 2 lines +r36232 | sake | 2011-03-21 15:04:22 -0700 (Mon, 21 Mar 2011) | 3 lines Changed paths: - M /trunk/wiretap/dct3trace.c + M /trunk/wiretap/netscreen.c -Fix a buffer overflow found by the Visual C++ analyzer. +Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off). ------------------------------------------------------------------------ - -Update the release notes. - ------------------------------------------------------------------------- -r36053 | gerald | 2011-02-24 12:07:11 -0800 (Thu, 24 Feb 2011) | 27 lines +r36470 | etxrab | 2011-04-04 22:50:45 -0700 (Mon, 04 Apr 2011) | 3 lines Changed paths: - M /trunk-1.4/asn1/ldap/packet-ldap-template.c - M /trunk-1.4/asn1/ldap/packet-ldap-template.h - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-dns.c - M /trunk-1.4/epan/dissectors/packet-dns.h - M /trunk-1.4/epan/dissectors/packet-ldap.c - M /trunk-1.4/epan/dissectors/packet-ldap.h - M /trunk-1.4/epan/dissectors/packet-smb-common.c - M /trunk-1.4/epan/dissectors/packet-smb-common.h - M /trunk-1.4/epan/dissectors/packet-smb-logon.c - -Copy over r36029 with manual assistance: + M /trunk/capinfos.c +From Jose Pedro Oliveira: +#ifdef HAVE_LIBGCRYPT block includes a line too many. +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5803 ------------------------------------------------------------------------ -r36029 | gerald | 2011-02-22 16:51:02 -0800 (Tue, 22 Feb 2011) | 9 lines +r36471 | tuexen | 2011-04-05 07:28:33 -0700 (Tue, 05 Apr 2011) | 3 lines Changed paths: - M /trunk/asn1/ldap/packet-ldap-template.c - M /trunk/asn1/ldap/packet-ldap-template.h - M /trunk/epan/dissectors/packet-dns.c - M /trunk/epan/dissectors/packet-dns.h - M /trunk/epan/dissectors/packet-ldap.c - M /trunk/epan/dissectors/packet-ldap.h - M /trunk/epan/dissectors/packet-smb-common.c - M /trunk/epan/dissectors/packet-smb-common.h - M /trunk/epan/dissectors/packet-smb-logon.c - -Split get_dns_name() into get_dns_name() and expand_dns_name(). - -In dissect_ms_compressed_string() dissect_mscldap_string() simply call -expand_dns_name() instead of using duplicate (and insecure) code. This -*might* break CLDAP and SMB dissection. If that's the case we should -probably revert get_dns_name() and simplify expand_dns_name(). - -Fixes infinite recursion errors found by joernchen of Phenoelit. ------------------------------------------------------------------------- - -Update the release notes. + M /trunk/text2pcap.c +Fix a typo in the help message. +Reported by Matthias Wellmeyer. ------------------------------------------------------------------------ -r36056 | jake | 2011-02-24 14:12:02 -0800 (Thu, 24 Feb 2011) | 55 lines +r36498 | sfisher | 2011-04-06 09:34:45 -0700 (Wed, 06 Apr 2011) | 5 lines Changed paths: - M /trunk-1.4/cmake/modules/FindGTK2.cmake - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-dcm.c - M /trunk-1.4/epan/dissectors/packet-dhcpv6.c - M /trunk-1.4/epan/dissectors/packet-hip.c - M /trunk-1.4/epan/dissectors/packet-lldp.c - M /trunk-1.4/gtk/voip_calls.c - -Copy over revisions from the trunk: - ------------------------------------------------------------------------- -r35686 | sfisher | 2011-01-28 01:20:37 +0100 (Fri, 28 Jan 2011) | 7 lines -Changed paths: - M /trunk/epan/dissectors/packet-dhcpv6.c - + M /trunk/docbook/check_svn_version.sh -Fix bug #5627: DHCPv6 dissector formats DUID_LLT time incorrectly - -Add 30 years of seconds, not 20 years, since the DHCP_LLT time is seconds -since Jan 1 2000 and epoch is 30 years before that. +From Peter via bug #5798: Don't try to run svnversion if it isn't +executable. ------------------------------------------------------------------------ -r35726 | wmeier | 2011-01-31 19:58:38 +0100 (Mon, 31 Jan 2011) | 8 lines +r36554 | cmaynard | 2011-04-11 06:44:31 -0700 (Mon, 11 Apr 2011) | 2 lines Changed paths: - M /trunk/epan/dissectors/packet-dcm.c - M /trunk/gtk/voip_calls.c - -Fix two cases of 'if (x = y)' which should be 'if (x == y)'. + M /trunk/epan/libwireshark.def -Found by reviewing msvc level 4 warnings "assignment within conditional expression". - -(Unfortunately most of the warnings are false positives so this warning can't be enabled) +Add proto_field_is_referenced. Fixes bug 5816. ------------------------------------------------------------------------ -r35737 | jake | 2011-01-31 23:31:05 +0100 (Mon, 31 Jan 2011) | 7 lines -Changed paths: - M /trunk/epan/dissectors/packet-lldp.c -From Johan Kristell: -In the standard 802.3at-2009 the PoE+ TLVs are 12 bytes long, but in the -earlier version 802.3bc-2009, they are 7 bytes long (the power type/ -source/priority, and the requested and allocated fields are lacking). -Not respecting the length of the TLV leads to wireshark displaying garbage -data and could lead to reading outside of buffer. ------------------------------------------------------------------------- -r35777 | jake | 2011-02-03 07:32:35 +0100 (Thu, 03 Feb 2011) | 8 lines -Changed paths: - M /trunk/epan/dissectors/packet-hip.c -From Samu Varjonen: -This patch fixes four issues with the Host Identity Protocol (HIP dissector: +Copy over with manual intervenion: -1. The incorrect parsing of the "type 1" locator of HIP. -2. Updates the comments to reflect the approval of RFC 5770. -3. Cosmetic change (uppercase SPI) -4. Change in the checksum dissection - (when the HIP packet is UDP encapsulated 0 checksum is correct). ------------------------------------------------------------------------ -r35888 | jake | 2011-02-09 08:43:34 +0100 (Wed, 09 Feb 2011) | 2 lines +r36190 | gerald | 2011-03-14 09:00:51 -0700 (Mon, 14 Mar 2011) | 2 lines Changed paths: - M /trunk/cmake/modules/FindGTK2.cmake - -Accommodate the CMake build on Ubuntu 10.10. ------------------------------------------------------------------------- + M /trunk/asn1/ldap/ldap.cnf + M /trunk/epan/dissectors/packet-ldap.c +Properly initialize our filter counters. ------------------------------------------------------------------------ -r36057 | gerald | 2011-02-24 15:10:30 -0800 (Thu, 24 Feb 2011) | 37 lines +r36330 | morriss | 2011-03-25 08:45:37 -0700 (Fri, 25 Mar 2011) | 8 lines Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-gsm_a_gm.c - M /trunk-1.4/epan/dissectors/packet-gtp.c - M /trunk-1.4/epan/tfs.c - M /trunk-1.4/epan/tfs.h - M /trunk-1.4/gtk/capture_dlg.c + M /trunk/epan/dissectors/packet-tcp.c -Copy over revisions from the trunk: +Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785#c14 : +If we thought we finished reassembly (and called the subdissector) only to find +out that the subdissector asked for more data, handle the case where the +subdissector asked for DESEGMENT_UNTIL_FIN. Previously we only handled the +possibility that the subdissector would ask for a specific number of bytes or +DESEGMENT_ONE_MORE_SEGMENT. ------------------------------------------------------------------------ -r35596 | etxrab | 2011-01-20 05:19:26 -0800 (Thu, 20 Jan 2011) | 1 line -Changed paths: - M /trunk/epan/dissectors/packet-gtp.c -Update a comment. ------------------------------------------------------------------------ -r35597 | etxrab | 2011-01-20 06:03:13 -0800 (Thu, 20 Jan 2011) | 1 line +r36572 | gerald | 2011-04-11 17:10:16 -0700 (Mon, 11 Apr 2011) | 15 lines Changed paths: - M /trunk/epan/dissectors/packet-gtp.c - -Fix typos ------------------------------------------------------------------------- - - -Copy over with manual intervention: + M /trunk-1.4/Makefile.nmake + M /trunk-1.4/config.nmake + M /trunk-1.4/packaging/nsis/wireshark.nsi + M /trunk-1.4/tools/win32-setup.sh + M /trunk-1.4/tools/win64-setup.sh ------------------------------------------------------------------------- -r35561 | etxrab | 2011-01-16 14:32:22 -0800 (Sun, 16 Jan 2011) | 2 lines -Changed paths: - M /trunk/epan/dissectors/packet-gsm_a_gm.c +Copy over r36483 by hand. -Switch to using proto_add_bits_item in a couple of places and fix -missing stepping of bit_offset. ------------------------------------------------------------------------ -r35595 | etxrab | 2011-01-20 05:05:17 -0800 (Thu, 20 Jan 2011) | 3 lines +r36483 | gerald | 2011-04-05 15:38:12 -0700 (Tue, 05 Apr 2011) | 3 lines Changed paths: - M /trunk/epan/dissectors/packet-gtp.c + M /trunk/Makefile.nmake + M /trunk/config.nmake + M /trunk/packaging/nsis/wireshark.nsi + M /trunk/tools/win32-setup.sh + M /trunk/tools/win64-setup.sh -In MM context the container contains IE:s not a complete -DTAP message. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598 +Use the latest library tag, which updates GNUTLS. Add code to check for +libintl-8.dll and add the GNUTLS version if needed. ------------------------------------------------------------------------ - ------------------------------------------------------------------------ -r36058 | gerald | 2011-02-24 15:52:22 -0800 (Thu, 24 Feb 2011) | 77 lines +r36573 | gerald | 2011-04-11 17:35:22 -0700 (Mon, 11 Apr 2011) | 2 lines Changed paths: - M /trunk-1.4/AUTHORS - M /trunk-1.4/asn1/ulp/ulp.cnf M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/dumpcap.c - M /trunk-1.4/epan/dissectors/packet-e212.c - M /trunk-1.4/epan/dissectors/packet-ieee802154.c - M /trunk-1.4/epan/dissectors/packet-ipp.c - M /trunk-1.4/epan/dissectors/packet-netflow.c - M /trunk-1.4/epan/dissectors/packet-skinny.c - M /trunk-1.4/epan/dissectors/packet-ulp.c - M /trunk-1.4/epan/to_str.c - -Copy over revisions from the trunk: ------------------------------------------------------------------------- -r35679 | etxrab | 2011-01-27 07:43:55 -0800 (Thu, 27 Jan 2011) | 2 lines -Changed paths: - M /trunk/asn1/ulp/ulp.cnf - M /trunk/epan/dissectors/packet-ulp.c +Add our updated protocols. -The attemt to pretify MSISDN and IMSI breaks the dissection. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593 ------------------------------------------------------------------------ -r35914 | guy | 2011-02-10 21:54:34 -0800 (Thu, 10 Feb 2011) | 3 lines +r36612 | gerald | 2011-04-12 14:21:31 -0700 (Tue, 12 Apr 2011) | 18 lines Changed paths: - M /trunk/epan/dissectors/packet-ipp.c + M /trunk-1.4/asn1/x509if/packet-x509if-template.c + M /trunk-1.4/asn1/x509if/x509if.cnf + M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/epan/dissectors/packet-x509if.c -Register for the media type "application/ipp", so *any* HTTP request or -response with that content type will be dissected as IPP. ------------------------------------------------------------------------- -r35916 | guy | 2011-02-11 01:28:05 -0800 (Fri, 11 Feb 2011) | 2 lines -Changed paths: - M /trunk/epan/dissectors/packet-ipp.c +Copy over r36608 from the trunk: -Don't assume we're on port 631. ------------------------------------------------------------------------ -r35947 | jake | 2011-02-14 12:51:40 -0800 (Mon, 14 Feb 2011) | 2 lines +r36608 | gerald | 2011-04-12 13:39:48 -0700 (Tue, 12 Apr 2011) | 5 lines Changed paths: - M /trunk/epan/dissectors/packet-skinny.c + M /trunk/asn1/x509if/packet-x509if-template.c + M /trunk/asn1/x509if/x509if.cnf + M /trunk/epan/dissectors/packet-x509if.c + M /trunk/epan/dissectors/packet-x509if.h -Make sure RTP conversations are created. +Add x509if_frame_end() which is passed to register_frame_end_routine() +and which resets our global variables. Remove a boolean which was used +to track a char *; just check if the pointer is NULL instead. Fixes bugs +5754 and 5793, hopefully without breaking anything. ------------------------------------------------------------------------ -r35949 | jake | 2011-02-14 23:14:22 -0800 (Mon, 14 Feb 2011) | 3 lines -Changed paths: - M /trunk/epan/to_str.c -From Matthew Parris: -Display "Day of Year" for January 1 as 1, not 0. ------------------------------------------------------------------------- -r35999 | jake | 2011-02-18 00:02:53 -0800 (Fri, 18 Feb 2011) | 4 lines -Changed paths: - M /trunk/epan/dissectors/packet-ieee802154.c +Update the release notes. -From Ivan Lawrow: -The Final CAP Slot field "wpan.cap" in the Superframe Specification for a -beacon is always displayed as zero. ------------------------------------------------------------------------ -r36052 | wmeier | 2011-02-24 11:26:38 -0800 (Thu, 24 Feb 2011) | 4 lines +r36644 | gerald | 2011-04-14 10:17:08 -0700 (Thu, 14 Apr 2011) | 6 lines Changed paths: - M /trunk/dumpcap.c - -Fix Bug #5716: "dumpcap: -q option behavior doesn't match documentation" -Rework code slightly to print "Packets captured: " at 'dumpcap -q ...' exit. -Also: SigInfo now prints: "Packets captured: n" iso "n Packets captured". ------------------------------------------------------------------------- - - -Copy over with manual intervention: + M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/epan/dissectors/packet-dect.c ------------------------------------------------------------------------- -r35889 | jake | 2011-02-09 00:46:21 -0800 (Wed, 09 Feb 2011) | 5 lines -Changed paths: - M /trunk/AUTHORS - M /trunk/epan/dissectors/packet-e212.c +From Paul Makowski of SEI/CERT: -From Grzegorz Szczytowski: -Update of packet-e212.c dissector according to local national regulatory -MNC assignment document. -www.uke.gov.pl/uke/redir.jsp?place=galleryStats&id=24439 ------------------------------------------------------------------------- -r36028 | jake | 2011-02-22 13:19:13 -0800 (Tue, 22 Feb 2011) | 4 lines -Changed paths: - M /trunk/epan/dissectors/packet-netflow.c +Fix a buffer overflow in the DECT dissector. -Fix for bug 5702: -In RFC 5102 (for IPFIX), id=128 is defined as "bgpNextAdjacentAsNumber" which -is DST_AS_PEER and id=129 as "bgpPrevAdjacentAsNumber" which is SRC_AS_PEER. ------------------------------------------------------------------------- +From me: Update the release notes. ------------------------------------------------------------------------ -r36064 | gerald | 2011-02-24 17:09:08 -0800 (Thu, 24 Feb 2011) | 16 lines +r36645 | gerald | 2011-04-14 11:07:36 -0700 (Thu, 14 Apr 2011) | 19 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/wiretap/lanalyzer.c + M /trunk-1.4/epan/dissectors/packet-3g-a11.c + M /trunk-1.4/epan/dissectors/packet-tcp.c -Copy over r36061 from the trunk: +Copy over with manual intervention: ------------------------------------------------------------------------ -r36061 | wmeier | 2011-02-24 16:40:22 -0800 (Thu, 24 Feb 2011) | 6 lines +r36629 | cmaynard | 2011-04-13 11:15:41 -0700 (Wed, 13 Apr 2011) | 2 lines Changed paths: - M /trunk/wiretap/lanalyzer.c - -From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files" -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698 - -(Note from me: Before the fix "File ! Save As" in Lanalyzer format - crashed quite consistently on my Windows 7) ------------------------------------------------------------------------- - -Update the releast notes. + M /trunk/epan/dissectors/packet-tcp.c +Allow TCP segment data to be filterable via "tcp.data". ------------------------------------------------------------------------ -r36066 | etxrab | 2011-02-24 23:27:20 -0800 (Thu, 24 Feb 2011) | 2 lines +r36642 | cmaynard | 2011-04-14 06:58:40 -0700 (Thu, 14 Apr 2011) | 2 lines Changed paths: - M /trunk-1.4/asn1/ansi_map/ansi_map.asn - M /trunk-1.4/epan/dissectors/packet-ansi_map.c + M /trunk/epan/dissectors/packet-3g-a11.c -Copy over 35842 -Add a missing IE found in trace from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637 +Revert r24047. Fixes bug 5822. ------------------------------------------------------------------------ -r36076 | jake | 2011-02-26 03:02:41 -0800 (Sat, 26 Feb 2011) | 2 lines -Changed paths: - M /trunk-1.4/Makefile.nmake - M /trunk-1.4/tools/win32-setup.sh - M /trunk-1.4/tools/win64-setup.sh -Update the User's Guide. ------------------------------------------------------------------------- -r36081 | gerald | 2011-02-27 09:04:32 -0800 (Sun, 27 Feb 2011) | 1 line -Changed paths: - M /trunk-1.4/epan/enterprise-numbers - M /trunk-1.4/manuf - M /trunk-1.4/services +Update the release notes. -[Automatic manuf, services and enterprise-numbers update for 2011-02-27] ------------------------------------------------------------------------ -r36102 | gerald | 2011-02-28 17:09:12 -0800 (Mon, 28 Feb 2011) | 17 lines +r36646 | gerald | 2011-04-14 14:26:25 -0700 (Thu, 14 Apr 2011) | 20 lines Changed paths: - M /trunk-1.4/asn1/ldap/ldap.cnf - M /trunk-1.4/asn1/ldap/packet-ldap-template.c M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-ldap.c + M /trunk-1.4/gtk/export_object.c Copy over revisions from the trunk: ------------------------------------------------------------------------ -r36101 | gerald | 2011-02-28 16:50:17 -0800 (Mon, 28 Feb 2011) | 5 lines +r34805 | cmaynard | 2010-11-08 08:53:11 -0800 (Mon, 08 Nov 2010) | 4 lines Changed paths: - M /trunk/asn1/ldap/ldap.cnf - M /trunk/asn1/ldap/packet-ldap-template.c - M /trunk/epan/dissectors/packet-ldap.c + M /trunk/gtk/export_object.c -If we encounter an excessively long filter string or one with too many -elements, add an expert item and throw a ReportedBoundsError. We may -want to handle this more cleanly in the future but this avoids -allocating a huge amount of memory. +Allow objects to be saved that otherwise couldn't be due to invalid characters +in the filename, excessive filename lengths or duplicate filenames. Fixes +bug 1671. ------------------------------------------------------------------------ - -Update the release notes. - ------------------------------------------------------------------------- -r36104 | gerald | 2011-02-28 17:14:20 -0800 (Mon, 28 Feb 2011) | 12 lines +r34808 | cmaynard | 2010-11-08 09:53:13 -0800 (Mon, 08 Nov 2010) | 2 lines Changed paths: - M /trunk-1.4/epan/uat_load.l - -Copy over r36096 from the trunk: + M /trunk/gtk/export_object.c +Make maxlen a gsize instead of a guint. ------------------------------------------------------------------------ -r36096 | stig | 2011-02-28 08:11:20 -0800 (Mon, 28 Feb 2011) | 4 lines -Changed paths: - M /trunk/epan/uat_load.l -Close UAT file after loading. - -Open files may prevent deleting a used profile with UAT files. ------------------------------------------------------------------------- +Update the release notes. ------------------------------------------------------------------------

@@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 36076 2011-02-26 11:02:41Z jake $ +# $Id: Makefile.nmake 36572 2011-04-12 00:10:16Z gerald $ # We "Deploy using XCopy," which is described at # http://msdn.microsoft.com/en-us/library/ms235291.aspx @@ -862,6 +862,7 @@ rm -r -f $(WIRESHARK_LIBS)/glib rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.1-1 rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.5-*-win??ws + rm -r -f $(WIRESHARK_LIBS)/gnutls-2.10.3-*-win??ws rm -r -f $(WIRESHARK_LIBS)/gtk2 rm -r -f $(WIRESHARK_LIBS)/gtk+ rm -r -f $(WIRESHARK_LIBS)/gtk-wimp @@ -1068,6 +1069,11 @@ xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d +! IF "$(INTL_DLL)" != "libintl-8.dll" +# The gtk+ bundle doesn't provide libintl-8.dll (which is the case +# with the 32-bit package); use the GNUTLS version. + xcopy $(GNUTLS_DIR)\bin\libintl-8.dll $(INSTALL_DIR) /d +! ENDIF !ENDIF !IFDEF LUA_DIR xcopy "$(LUA_DIR)\lua5.1.dll" $(INSTALL_DIR) /d

@@ -1,4 +1,4 @@ -Wireshark 1.4.4 Release Notes +Wireshark 1.4.5 Release Notes ------------------------------------------------------------------ @@ -15,102 +15,60 @@ The following vulnerabilities have been fixed. See the security advisory for details and a workaround. - o Huzaifa Sidhpurwala of the Red Hat Security Response Team - discovered that Wireshark could free an uninitialized pointer - while reading a malformed pcap-ng file. (Bug 5652) + o The NFS dissector could crash on Windows. (Bug 5209) - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. + Versions affected: 1.4.0 to 1.4.4. - CVE-2011-0538 + o The X.509if dissector could crash. (Bug 5754, Bug 5793) - o Huzaifa Sidhpurwala of the Red Hat Security Response Team - discovered that a large packet length in a pcap-ng file could - crash Wireshark. (Bug 5661) + Versions affected: 1.2.0 to 1.2.15 and 1.4.0 to 1.4.4. - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. + o Paul Makowski from SEI/CERT discovered that the DECT dissector + could overflow a buffer. He verified that this could allow + remote code execution on many platforms. - o Wireshark could overflow a buffer while reading a Nokia DCT3 - trace file. (Bug 5661) - - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. - - CVE-2011-0713 - - o Paul Makowski working for SEI/CERT discovered that Wireshark - on 32 bit systems could crash while reading a malformed - 6LoWPAN packet. (Bug 5661) - - Versions affected: 1.4.0 to 1.4.3. - - o joernchen of Phenoelit discovered that the LDAP and SMB - dissectors could overflow the stack. (Bug 5717) - - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior - versions including 1.0.x are also affected.) - - o Xiaopeng Zhang of Fortinet's Fortiguard Labs discovered that - large LDAP Filter strings can consume excessive amounts of - memory. (Bug 5732) - - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior - versions including 1.0.x are also affected.) + Versions affected: 1.4.0 to 1.4.4. The following bugs have been fixed: - o A TCP stream would not always be recognized as the same - stream. (Bug 2907) - - o Wireshark Crashing by pressing 2 Buttons. (Bug 4645) + o Cygwin make fails after updating to bash v 4.1.9.2 - o A crash can occur in the NTLMSSP dissector. (Bug 5157) + o Export HTTP > All - System Appears Hung (but isn't). (Bug + 1671) - o The column texts from a Lua dissector could be mangled. (Bug - 5326) (Bug 5630) + o Some HTTP responses don't decode with TCP reassembly on. (Bug + 3785) - o Corrections to ANSI MAP ASN.1 specifications. (Bug 5584) + o Wireshark crashes when cancelling a large sort operation. (Bug + 5189) - o When searching in packet bytes, the field and bytes are not - immediately shown. (Bug 5585) + o Wireshark crashes if SSL preferences RSA key is actually a DSA + key. (Bug 5662) - o Malformed Packet: ULP reported when dissecting ULP SessionID - PDU. (Bug 5593) + o tshark incorrectly calculates TCP stream for some syn packets. + (Bug 5743) - o Wrong IEI in container of decode_gtp_mm_cntxt. (Bug 5598) + o Wireshark not able to decode the PPP frame in a sflow + (RFC3176) flow sample packet because Wireshark incorrectly + read the protocol in PPP frame header. (Bug 5746) - o Display filter does not work for expressions of type BASE_DEC, - BASE_DEC_HEX and BASE_HEX_DEC. (Bug 5606) + o Mysql protocol dissector: all fields should be little endian. + (Bug 5759) - o NTLMSSP dissector may fail to compile due to space embedded in - C comment delimiters. (Bug 5614) + o Error when opening snoop from Juniper SSG-140. (Bug 5762) - o Allow for name resolution of link-scope and multicast IPv6 - addresses from local host file. (Bug 5615) + o svnversion: command not found. (Bug 5798) - o DHCPv6 dissector formats DUID_LLT time incorrectly. (Bug 5627) + o capinfos: #ifdef HAVE_LIBGCRYPT block includes a line too + many. (Bug 5803) - o Allow for IEEE 802.3bc-2009 style PoE TLVs. (Bug 5639) + o Value of TCP segment data cannot be copied. (Bug 5811) - o Various fixes to the HIP packet dissector. (Bug 5646) + o proto_field_is_referenced() is not exported in + libwireshark.dll. (Bug 5816) - o Display "Day of Year" for January 1 as 1, not 0. (Bug 5653) - - o Accommodate the CMake build on Ubuntu 10.10. (Bug 5665) - - o E.212 MCC 260 Poland update according to local national - regulatory. (Bug 5668) - - o IPP on ports other than 631 not recognized. (Bug 5677) - - o Potential access violation when writing to LANalyzer files. - (Bug 5698) - - o IEEE 802.15.4 Superframe Specification - Final CAP Slot always - 0. (Bug 5700) - - o Peer SRC and DST AS numbers are swapped for cflow. (Bug 5702) - - o dumpcap: -q option behavior doesn't match documentation. (Bug - 5716) + o Wireshark ver. 1.4.4 not displayed "Granted QoS" field in a + A11 packet. (Bug 5822) New and Updated Features @@ -122,14 +80,10 @@ Updated Protocol Support - ANSI MAP, BitTorrent, DCM, DHCPv6, DTAP, DTPT, E.212, GSM - Management, GTP, HIP, IEEE 802.15.4, IPP, LDAP, LLDP, Netflow, - NTLMSSP, P_Mul, Quake, Skinny, SMB, SNMP, ULP + HTTP, LDAP, MySQL, NFS, sFlow, SSL, TCP New and Updated Capture File Support - LANalyzer, Nokia DCT3, Pcap-ng - Getting Wireshark Wireshark source code and installation packages are available from

@@ -1,7 +1,7 @@ # ldap.cnf # LDAP conformation file # Copyright 2005 Anders Broman -# $Id: ldap.cnf 36102 2011-03-01 01:09:12Z gerald $ +# $Id: ldap.cnf 36571 2011-04-12 00:02:47Z gerald $ #.PDU @@ -527,10 +527,14 @@ #.FN_HDR SearchRequest/_untag/filter Filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; #.FN_FTR SearchRequest/_untag/filter Filter_string=NULL; and_filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; #.FN_FTR Filter/equalityMatch Filter_string=ep_strdup_printf("(%s=%s)",

@@ -2,7 +2,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.c 32417 2010-04-07 16:54:29Z wmeier $ + * $Id: packet-x509if-template.c 36612 2011-04-12 21:21:31Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -37,6 +37,7 @@ #include "packet-x509if.h" #include "packet-x509sat.h" #include <epan/strutil.h> +#include <epan/dissectors/packet-frame.h> #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" @@ -51,13 +52,12 @@ /* Initialize the subtree pointers */ #include "packet-x509if-ett.c" -static const char *object_identifier_id; +static const char *object_identifier_id = NULL; static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; static gboolean rdn_one_value = FALSE; /* have we seen one value in an RDN yet */ static gboolean dn_one_rdn = FALSE; /* have we seen one RDN in a DN yet */ -static gboolean doing_dn = TRUE; static gboolean doing_attr = FALSE; #define MAX_RDN_STR_LEN 64 @@ -72,6 +72,22 @@ #define MAX_AVA_STR_LEN 64 static char *last_ava = NULL; +static void +x509if_frame_end(void) +{ + object_identifier_id = NULL; + top_of_dn = NULL; + top_of_rdn = NULL; + + rdn_one_value = FALSE; + dn_one_rdn = FALSE; + doing_attr = FALSE; + + last_dn = NULL; + last_rdn = NULL; + last_ava = NULL; +} + #include "packet-x509if-fn.c" const char * x509if_get_last_dn(void)

@@ -1,7 +1,7 @@ # x509if.cnf # X509IF conformation file -# $Id: x509if.cnf 28589 2009-06-02 09:44:52Z gal $ +# $Id: x509if.cnf 36612 2011-04-12 21:21:31Z gerald $ #.IMPORT ../x509sat/x509sat-exp.cnf @@ -197,7 +197,7 @@ name = oid_resolved_from_string(object_identifier_id); if(!name) name = object_identifier_id; - if(doing_dn) { /* append it to the RDN */ + if(last_rdn) { /* append it to the RDN */ g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); @@ -213,6 +213,7 @@ if((fmt = val_to_str(hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s", name, fmt); @@ -245,7 +246,7 @@ /* it was a string - format it */ value = tvb_format_text(out_tvb, 0, tvb_length(out_tvb)); - if(doing_dn) { + if(last_rdn) { g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); /* append it to the tree*/ @@ -255,6 +256,10 @@ if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ + if (!last_ava) { + last_ava = ep_alloc(MAX_AVA_STR_LEN); + } + if(!(name = oid_resolved_from_string(object_identifier_id))) name = object_identifier_id; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s %%s", name, fmt, value); @@ -330,7 +335,7 @@ rdn_one_value = FALSE; top_of_rdn = tree; last_rdn = ep_alloc(MAX_DN_STR_LEN); *last_rdn = '\0'; - doing_dn = TRUE; + register_frame_end_routine (x509if_frame_end); %(DEFAULT_BODY)s @@ -349,7 +354,6 @@ } } - doing_dn = FALSE; last_rdn = NULL; /* it will get freed when the next packet is dissected */ #.FN_BODY RelativeDistinguishedName/_item @@ -358,7 +362,7 @@ top_of_rdn = tree; } else { - if(doing_dn) + if(last_rdn) /* this is an additional value - delimit */ g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -373,6 +377,8 @@ dn_one_rdn = FALSE; /* reset */ last_dn = ep_alloc(MAX_DN_STR_LEN); *last_dn = '\0'; top_of_dn = NULL; + register_frame_end_routine (x509if_frame_end); + %(DEFAULT_BODY)s @@ -402,6 +408,7 @@ ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); %(DEFAULT_BODY)s @@ -409,10 +416,9 @@ #.FN_BODY Attribute doing_attr = TRUE; + register_frame_end_routine (x509if_frame_end); %(DEFAULT_BODY)s - - doing_attr = FALSE; #.END

@@ -3,7 +3,7 @@ * * Copyright 2004 Ian Schorr * - * $Id: capinfos.c 33041 2010-06-02 00:24:03Z gerald $ + * $Id: capinfos.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -391,8 +391,8 @@ print_stats_table_header_label("RIPEMD160"); print_stats_table_header_label("MD5"); } - if (cap_in_order) print_stats_table_header_label("Strict time order"); #endif /* HAVE_LIBGCRYPT */ + if (cap_in_order) print_stats_table_header_label("Strict time order"); printf("\n"); }

@@ -1,4 +1,4 @@ -# $Id: config.nmake 35925 2011-02-12 00:07:21Z gerald $ +# $Id: config.nmake 36572 2011-04-12 00:10:16Z 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). @@ -16,8 +16,8 @@ # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged VERSION_MAJOR=1 VERSION_MINOR=4 -VERSION_MICRO=4 -VERSION_BUILD=36110 +VERSION_MICRO=5 +VERSION_BUILD=36650 # It's recommended to change VERSION_EXTRA for your own custom builds # e.g. "-SVN-12345" VERSION_EXTRA= @@ -295,7 +295,7 @@ # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=2.8.5-4.12 +GNUTLS_PKG=2.10.3-1.11 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -503,7 +503,7 @@ # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=2.8.5-3.16 +GNUTLS_PKG=2.10.3-1.7 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption.

@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for wireshark 1.4.4. +# Generated by GNU Autoconf 2.65 for wireshark 1.4.5. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='wireshark 1.4.4' +PACKAGE_VERSION='1.4.5' +PACKAGE_STRING='wireshark 1.4.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1619,7 +1619,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.4.4 to adapt to many kinds of systems. +\`configure' configures wireshark 1.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1690,7 +1690,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wireshark 1.4.4:";; + short | recursive ) echo "Configuration of wireshark 1.4.5:";; esac cat <<\_ACEOF @@ -1874,7 +1874,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.4.4 +wireshark configure 1.4.5 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2414,7 +2414,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.4.4, which was +It was created by wireshark $as_me 1.4.5, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3186,7 +3186,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.4.4' + VERSION='1.4.5' cat >>confdefs.h <<_ACEOF @@ -24996,7 +24996,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.4.4, which was +This file was extended by wireshark $as_me 1.4.5, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25062,7 +25062,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.4.4 +wireshark config.status 1.4.5 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\"

@@ -1,8 +1,8 @@ -# $Id: configure.in 35489 2011-01-11 23:00:27Z gerald $ +# $Id: configure.in 36116 2011-03-01 22:22:20Z gerald $ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.4.4) +AC_INIT(wireshark, 1.4.5) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or

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

@@ -2,7 +2,7 @@ # # Check for SVN version # -# $Id: check_svn_version.sh 31379 2009-12-29 12:12:26Z jmayer $ +# $Id: check_svn_version.sh 36571 2011-04-12 00:02:47Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -24,7 +24,7 @@ # echo -n '<!ENTITY SvnVersion "' > svn_version_tmp.xml -svnversion -n . >> svn_version_tmp.xml +[ -x svnversion ] && svnversion -n . >> svn_version_tmp.xml echo '">' >> svn_version_tmp.xml # /dev/null buries the output of the "cmp" command.

@@ -2,7 +2,7 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - +  - <!ENTITY WiresharkCurrentVersion "1.4.4"> + <!ENTITY WiresharkCurrentVersion "1.4.5"> ]> @@ -32,112 +32,59 @@ <para> The following vulnerabilities have been fixed. See the - <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-04.html">security advisory</ulink> for details and a workaround. + <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-06.html">security advisory</ulink> for details and a workaround. <itemizedlist> <listitem> <para> - Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered - that Wireshark could free an uninitialized pointer while reading a - malformed pcap-ng file. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5652">Bug - 5652</ulink>) + The NFS dissector could crash on Windows. +  +  +  + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5209">Bug + 5209</ulink>) </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.</para> - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0538">CVE-2011-0538</ulink> - </para> - </listitem> - - <listitem> - <para> - Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered - that a large packet length in a pcap-ng file could crash Wireshark. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5661">Bug - 5661</ulink>) - </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.</para> -  - </listitem> - - <listitem> - <para> - Wireshark could overflow a buffer while reading a Nokia DCT3 - trace file. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5661">Bug - 5661</ulink>) - </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.</para> - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0713">CVE-2011-0713</ulink> - </para> - </listitem> - - <listitem> - <para> - Paul Makowski working for SEI/CERT discovered that Wireshark on 32 - bit systems could crash while reading a malformed 6LoWPAN packet. -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5661">Bug - 5661</ulink>) - </para> - <para>Versions affected: 1.4.0 to 1.4.3.</para> -  +--> </listitem> <listitem> <para> - joernchen of Phenoelit discovered that the LDAP and SMB dissectors - could overflow the stack. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5717">Bug - 5717</ulink>) + The X.509if dissector could crash. +  +  +  + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5754">Bug + 5754</ulink>, + <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5793">Bug + 5793</ulink>) </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior versions including 1.0.x are also affected.)</para> -  +--> </listitem> <listitem> <para> - Xiaopeng Zhang of Fortinet's Fortiguard Labs discovered that large - LDAP Filter strings can consume excessive amounts of memory. -  -  -  - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5732">Bug - 5732</ulink>) + Paul Makowski from SEI/CERT discovered that the DECT dissector could + overflow a buffer. He verified that this could allow remote code + execution on many platforms. +  </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior versions including 1.0.x are also affected.)</para> -  +--> </listitem> </itemizedlist> @@ -158,138 +105,87 @@ 0000</ulink>) </para></listitem> --> - <listitem><para> - A TCP stream would not always be recognized as the same stream. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907">Bug - 2907</ulink>) - </para></listitem> <listitem><para> - Wireshark Crashing by pressing 2 Buttons. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4645">Bug - 4645</ulink>) + Cygwin make fails after updating to bash v 4.1.9.2 </para></listitem> <listitem><para> - A crash can occur in the NTLMSSP dissector. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5157">Bug - 5157</ulink>) + Export HTTP > All - System Appears Hung (but isn't). + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1671">Bug + 1671</ulink>) </para></listitem> <listitem><para> - The column texts from a Lua dissector could be mangled. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5326">Bug - 5326</ulink>) - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5630">Bug - 5630</ulink>) + Some HTTP responses don't decode with TCP reassembly on. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785">Bug + 3785</ulink>) </para></listitem> <listitem><para> - Corrections to ANSI MAP ASN.1 specifications. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5584">Bug - 5584</ulink>) + Wireshark crashes when cancelling a large sort operation. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5189">Bug + 5189</ulink>) </para></listitem> <listitem><para> - When searching in packet bytes, the field and bytes are not immediately shown. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5585">Bug - 5585</ulink>) + Wireshark crashes if SSL preferences RSA key is actually a DSA key. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662">Bug + 5662</ulink>) </para></listitem> <listitem><para> - Malformed Packet: ULP reported when dissecting ULP SessionID PDU. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593">Bug - 5593</ulink>) + tshark incorrectly calculates TCP stream for some syn packets. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5743">Bug + 5743</ulink>) </para></listitem> <listitem><para> - Wrong IEI in container of decode_gtp_mm_cntxt. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598">Bug - 5598</ulink>) + Wireshark not able to decode the PPP frame in a sflow (RFC3176) flow sample packet because Wireshark incorrectly read the protocol in PPP frame header. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5746">Bug + 5746</ulink>) </para></listitem> <listitem><para> - Display filter does not work for expressions of type BASE_DEC, BASE_DEC_HEX and BASE_HEX_DEC. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5606">Bug - 5606</ulink>) + Mysql protocol dissector: all fields should be little endian. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5759">Bug + 5759</ulink>) </para></listitem> <listitem><para> - NTLMSSP dissector may fail to compile due to space embedded in C comment delimiters. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5614">Bug - 5614</ulink>) + Error when opening snoop from Juniper SSG-140. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5762">Bug + 5762</ulink>) </para></listitem> <listitem><para> - Allow for name resolution of link-scope and multicast IPv6 addresses from local host file. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5615">Bug - 5615</ulink>) + svnversion: command not found. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5798">Bug + 5798</ulink>) </para></listitem> <listitem><para> - DHCPv6 dissector formats DUID_LLT time incorrectly. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5627">Bug - 5627</ulink>) + capinfos: #ifdef HAVE_LIBGCRYPT block includes a line too many. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5803">Bug + 5803</ulink>) </para></listitem> <listitem><para> - Allow for IEEE 802.3bc-2009 style PoE TLVs. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5639">Bug - 5639</ulink>) + Value of TCP segment data cannot be copied. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5811">Bug + 5811</ulink>) </para></listitem> <listitem><para> - Various fixes to the HIP packet dissector. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5646">Bug - 5646</ulink>) + proto_field_is_referenced() is not exported in libwireshark.dll. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5816">Bug + 5816</ulink>) </para></listitem> <listitem><para> - Display "Day of Year" for January 1 as 1, not 0. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5653">Bug - 5653</ulink>) - </para></listitem> - - <listitem><para> - Accommodate the CMake build on Ubuntu 10.10. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5665">Bug - 5665</ulink>) - </para></listitem> - - <listitem><para> - E.212 MCC 260 Poland update according to local national regulatory. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5668">Bug - 5668</ulink>) - </para></listitem> - - <listitem><para> - IPP on ports other than 631 not recognized. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5677">Bug - 5677</ulink>) - </para></listitem> - - <listitem><para> - Potential access violation when writing to LANalyzer files. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698">Bug - 5698</ulink>) - </para></listitem> - - <listitem><para> - IEEE 802.15.4 Superframe Specification - Final CAP Slot always 0. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5700">Bug - 5700</ulink>) - </para></listitem> - - <listitem><para> - Peer SRC and DST AS numbers are swapped for cflow. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5702">Bug - 5702</ulink>) - </para></listitem> - - <listitem><para> - dumpcap: -q option behavior doesn't match documentation. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5716">Bug - 5716</ulink>) + Wireshark ver. 1.4.4 not displayed "Granted QoS" field in a A11 packet. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5822">Bug + 5822</ulink>) </para></listitem> </itemizedlist> @@ -318,28 +214,14 @@ <para>  -ANSI MAP, -BitTorrent, -DCM, -DHCPv6, -DTAP, -DTPT, -E.212, -GSM Management, -GTP, -HIP, -IEEE 802.15.4, -IPP, + +HTTP, LDAP, -LLDP, -Netflow, -NTLMSSP, -P_Mul, -Quake, -Skinny, -SMB, -SNMP, -ULP +MySQL, +NFS, +sFlow, +SSL, +TCP </para> </section> @@ -347,7 +229,6 @@ <section id="NewCapture"><title>New and Updated Capture File Support</title> <para> -LANalyzer, Nokia DCT3, Pcap-ng </para> </section>

@@ -1 +1 @@ -<!ENTITY SvnVersion "36110"> +<!ENTITY SvnVersion "">

@@ -11,7 +11,7 @@ * Routines for Mobile IP dissection * Copyright 2000, Stefan Raab <sraab@cisco.com> * - * $Id: packet-3g-a11.c 32089 2010-03-03 13:52:17Z etxrab $ + * $Id: packet-3g-a11.c 36645 2011-04-14 18:07:36Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -32,7 +32,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * *Ref: - * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v1.0_070801.pdf + * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v3.0_100621.pdf * http://www.3gpp2.org/Public_html/specs/A.S0017-D_v1.0_070624.pdf (IOS 5.1) */ @@ -102,7 +102,6 @@ static int hf_a11_ase_pcf_addr_key = -1; /* Forward QoS Information */ -static int hf_a11_fqi_length = -1; static int hf_a11_fqi_srid = -1; static int hf_a11_fqi_flags = -1; static int hf_a11_fqi_flowcount = -1; @@ -116,7 +115,6 @@ static int hf_a11_fqi_granted_qos = -1; /* Reverse QoS Information */ -static int hf_a11_rqi_length = -1; static int hf_a11_rqi_srid = -1; static int hf_a11_rqi_flowcount = -1; static int hf_a11_rqi_flowid = -1; @@ -883,13 +881,6 @@ guint8 flow_index; guint8 dscp_enabled = 0; - /* - * Starts with a length field - * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v1.0_070801.pdf - */ - proto_tree_add_item(ext_tree, hf_a11_fqi_length, tvb, offset+clen, 2, FALSE); - clen = clen + 2; - /* SR Id */ proto_tree_add_item(ext_tree, hf_a11_fqi_srid, tvb, offset+clen, 1, FALSE); clen++; @@ -967,13 +958,6 @@ guint8 flow_count; guint8 flow_index; - /* - * Starts with a length field - * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v1.0_070801.pdf - */ - proto_tree_add_item(ext_tree, hf_a11_fqi_length, tvb, offset+clen, 2, FALSE); - clen = clen + 2; - /* SR Id */ proto_tree_add_item(ext_tree, hf_a11_rqi_srid, tvb, offset+clen, 1, FALSE); clen++; @@ -1960,11 +1944,6 @@ FT_IPv4, BASE_NONE, NULL, 0, "PCF IP Address.", HFILL } }, - { &hf_a11_fqi_length, - { "Length", "a11.ext.fqi.length", - FT_UINT16, BASE_DEC, NULL, 0, - NULL, HFILL } - }, { &hf_a11_fqi_srid, { "SRID", "a11.ext.fqi.srid", FT_UINT8, BASE_DEC, NULL, 0, @@ -2020,11 +1999,6 @@ FT_BYTES, BASE_NONE, NULL, 0, "Forward Granted QoS.", HFILL } }, - { &hf_a11_rqi_length, - { "Length", "a11.ext.rqi.length", - FT_UINT16, BASE_DEC, NULL, 0, - NULL, HFILL } - }, { &hf_a11_rqi_srid, { "SRID", "a11.ext.rqi.srid", FT_UINT8, BASE_DEC, NULL, 0,

@@ -3,7 +3,7 @@ * Dissector for the Digital Enhanced Cordless Telecommunications * protocol. * - * $Id: packet-dect.c 33406 2010-07-02 00:06:16Z gerald $ + * $Id: packet-dect.c 36644 2011-04-14 17:17:08Z gerald $ * * Copyright 2008-2009: * - Andreas Schuler <andreas (A) schulerdev.de> @@ -1882,10 +1882,13 @@ pkt_afield.RCRC=(((guint16)pkt_ptr[6])<<8)|pkt_ptr[7]; /* fill B-Field */ - if(pkt_len>DECT_PACKET_INFO_LEN+2) + if(pkt_len>DECT_PACKET_INFO_LEN+2) { + if (pkt_len > 128+5+8) + pkt_len = 128+5+8; /* make these values into logical #defines */ memcpy((char*)(&(pkt_bfield.Data)), (char*)(pkt_ptr+8), pkt_len-5-8); - else + } else { memset((char*)(&(pkt_bfield.Data)), 0, 128); + } pkt_bfield.Length=pkt_len-DECT_PACKET_INFO_LEN-8; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT");

@@ -11,7 +11,7 @@ * * See RFC 1777 (LDAP v2), RFC 2251 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap.c 36102 2011-03-01 01:09:12Z gerald $ + * $Id: packet-ldap.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1219,7 +1219,7 @@ static int dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 701 "ldap.cnf" +#line 705 "ldap.cnf" /* make sure the protocol op comes first */ ldap_do_protocolop(actx->pinfo); @@ -1235,7 +1235,7 @@ static int dissect_ldap_T_ntlmsspAuth(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 708 "ldap.cnf" +#line 712 "ldap.cnf" /* make sure the protocol op comes first */ ldap_do_protocolop(actx->pinfo); @@ -1400,7 +1400,7 @@ static int dissect_ldap_T_bindResponse_matchedDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 715 "ldap.cnf" +#line 719 "ldap.cnf" tvbuff_t *new_tvb=NULL; offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb); @@ -1675,7 +1675,7 @@ dissect_ldap_T_and_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 559 "ldap.cnf" +#line 563 "ldap.cnf" if(and_filter_string){ and_filter_string=ep_strdup_printf("(&%s%s)",and_filter_string,Filter_string); } else { @@ -1693,7 +1693,7 @@ static int dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 566 "ldap.cnf" +#line 570 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; const char *old_and_filter_string=and_filter_string; @@ -1726,7 +1726,7 @@ dissect_ldap_T_or_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 586 "ldap.cnf" +#line 590 "ldap.cnf" if(or_filter_string){ or_filter_string=ep_strdup_printf("(|%s%s)",or_filter_string,Filter_string); } else { @@ -1745,7 +1745,7 @@ static int dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 594 "ldap.cnf" +#line 598 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; const char *old_or_filter_string=or_filter_string; @@ -1776,7 +1776,7 @@ dissect_ldap_T_not(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 615 "ldap.cnf" +#line 619 "ldap.cnf" Filter_string=ep_strdup_printf("(!%s)",string_or_null(Filter_string)); @@ -1814,7 +1814,7 @@ dissect_ldap_T_equalityMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 536 "ldap.cnf" +#line 540 "ldap.cnf" Filter_string=ep_strdup_printf("(%s=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1845,7 +1845,7 @@ T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item, NULL); -#line 641 "ldap.cnf" +#line 645 "ldap.cnf" if (substring_item_final) { substring_value=ep_strdup_printf("%s%s", (substring_value?substring_value:"*"), @@ -1885,7 +1885,7 @@ static int dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 655 "ldap.cnf" +#line 659 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; const char *old_substring_value=substring_value; @@ -1920,7 +1920,7 @@ dissect_ldap_T_greaterOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 542 "ldap.cnf" +#line 546 "ldap.cnf" Filter_string=ep_strdup_printf("(%s>=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1936,7 +1936,7 @@ dissect_ldap_T_lessOrEqual(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 548 "ldap.cnf" +#line 552 "ldap.cnf" Filter_string=ep_strdup_printf("(%s<=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1952,7 +1952,7 @@ dissect_ldap_T_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeDescription(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 612 "ldap.cnf" +#line 616 "ldap.cnf" Filter_string=ep_strdup_printf("(%s=*)",string_or_null(Filter_string)); @@ -1965,7 +1965,7 @@ dissect_ldap_T_approxMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 554 "ldap.cnf" +#line 558 "ldap.cnf" Filter_string=ep_strdup_printf("(%s~=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1987,7 +1987,7 @@ static int dissect_ldap_T_dnAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 618 "ldap.cnf" +#line 622 "ldap.cnf" gboolean val; offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &val); @@ -2022,7 +2022,7 @@ static int dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 627 "ldap.cnf" +#line 631 "ldap.cnf" attr_type=NULL; matching_rule_string=NULL; ldapvalue_string=NULL; @@ -2031,7 +2031,7 @@ offset = dissect_ldap_MatchingRuleAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 633 "ldap.cnf" +#line 637 "ldap.cnf" Filter_string=ep_strdup_printf("(%s:%s%s%s=%s)", (attr_type?attr_type:""), (matching_rule_dnattr?"dn:":""), @@ -2074,7 +2074,7 @@ static int dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 677 "ldap.cnf" +#line 681 "ldap.cnf" proto_tree *tr=NULL; proto_item *it=NULL; attributedesc_string=NULL; @@ -2112,13 +2112,17 @@ dissect_ldap_T_filter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 529 "ldap.cnf" Filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 532 "ldap.cnf" +#line 534 "ldap.cnf" Filter_string=NULL; and_filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; return offset; @@ -2398,7 +2402,7 @@ static int dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 775 "ldap.cnf" +#line 779 "ldap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 19, TRUE, dissect_ldap_SEQUENCE_OF_LDAPURL); @@ -2675,7 +2679,7 @@ static int dissect_ldap_AbandonRequest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 782 "ldap.cnf" +#line 786 "ldap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 16, TRUE, dissect_ldap_MessageID); @@ -2747,7 +2751,7 @@ static int dissect_ldap_T_requestValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 750 "ldap.cnf" +#line 754 "ldap.cnf" if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) { offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2896,12 +2900,12 @@ static int dissect_ldap_T_intermediateResponse_responseValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 758 "ldap.cnf" +#line 762 "ldap.cnf" const gchar *name; -#line 762 "ldap.cnf" +#line 766 "ldap.cnf" if(ldm_tree && object_identifier_id) { proto_item_set_text(ldm_tree, "%s %s", "IntermediateResponse", object_identifier_id); name = oid_resolved_from_string(object_identifier_id); @@ -3082,7 +3086,7 @@ static int dissect_ldap_T_controlValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 731 "ldap.cnf" +#line 735 "ldap.cnf" gint8 class; gboolean pc, ind; gint32 tag;

@@ -5,7 +5,7 @@ * * MySQL 4.1+ protocol by Axel Schwenke <axel@mysql.com> * - * $Id: packet-mysql.c 34439 2010-10-08 19:42:00Z gerald $ + * $Id: packet-mysql.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1198,10 +1198,10 @@ } if (tree) { - ti= proto_tree_add_item(tree, proto_mysql, tvb, offset, -1, FALSE); + ti= proto_tree_add_item(tree, proto_mysql, tvb, offset, -1, ENC_LITTLE_ENDIAN); mysql_tree= proto_item_add_subtree(ti, ett_mysql); proto_tree_add_item(mysql_tree, hf_mysql_packet_length, tvb, - offset, 3, TRUE); + offset, 3, ENC_LITTLE_ENDIAN); } offset+= 3; @@ -1316,7 +1316,7 @@ tvb_get_ptr(tvb, offset, strlen)); } proto_tree_add_item(greeting_tree, hf_mysql_version, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; /* 4 bytes little endian thread_id */ @@ -1328,7 +1328,7 @@ /* salt string */ strlen= tvb_strsize(tvb,offset); proto_tree_add_item(greeting_tree, hf_mysql_salt, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+=strlen; /* rest is optional */ @@ -1347,14 +1347,14 @@ /* 13 bytes unused */ proto_tree_add_item(greeting_tree, hf_mysql_unused, tvb, - offset, 13, FALSE ); + offset, 13, ENC_LITTLE_ENDIAN); offset+= 13; /* 4.1+ server: rest of salt */ if (tvb_reported_length_remaining(tvb, offset)) { strlen= tvb_strsize(tvb,offset); proto_tree_add_item(greeting_tree, hf_mysql_salt2, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } @@ -1413,7 +1413,7 @@ tvb_get_ptr(tvb,offset,strlen)); } proto_tree_add_item(login_tree, hf_mysql_user, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; /* rest is optional */ @@ -1428,7 +1428,7 @@ } if (tree && strlen > 1) { proto_tree_add_item(login_tree, hf_mysql_passwd, - tvb, offset, strlen, FALSE); + tvb, offset, strlen, ENC_LITTLE_ENDIAN); } offset+= strlen; @@ -1450,7 +1450,7 @@ col_append_fstr(pinfo->cinfo, COL_INFO, " db=%s", buf); } proto_tree_add_item(login_tree, hf_mysql_schema, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } @@ -1512,7 +1512,7 @@ case MYSQL_DROP_DB: strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_schema, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; conn_data->state= RESPONSE_OK; break; @@ -1520,7 +1520,7 @@ case MYSQL_QUERY: strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_query, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); if (mysql_showquery) { if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " { %s } ", @@ -1533,7 +1533,7 @@ case MYSQL_STMT_PREPARE: strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_query, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; conn_data->state= RESPONSE_PREPARE; break; @@ -1544,14 +1544,14 @@ g_hash_table_remove(conn_data->stmts, &stmt); } proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= REQUEST; break; case MYSQL_STMT_RESET: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= RESPONSE_OK; break; @@ -1566,7 +1566,7 @@ case MYSQL_PROCESS_KILL: proto_tree_add_item(req_tree, hf_mysql_thd_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= RESPONSE_OK; break; @@ -1574,17 +1574,17 @@ case MYSQL_CHANGE_USER: strlen= tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_user, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; strlen= tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_passwd, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_schema, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; conn_data->state= RESPONSE_OK; break; @@ -1632,29 +1632,29 @@ case MYSQL_STMT_FETCH: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; proto_tree_add_item(req_tree, hf_mysql_num_rows, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= RESPONSE_TABULAR; break; case MYSQL_STMT_SEND_LONG_DATA: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; proto_tree_add_item(req_tree, hf_mysql_param, - tvb, offset, 2, TRUE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; /* rest is data */ strlen= tvb_reported_length_remaining(tvb, offset); if (tree && strlen > 0) { proto_tree_add_item(req_tree, hf_mysql_payload, - tvb, offset, strlen, FALSE); + tvb, offset, strlen, ENC_LITTLE_ENDIAN); } offset+= strlen; conn_data->state= REQUEST; @@ -1662,15 +1662,15 @@ case MYSQL_STMT_EXECUTE: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; proto_tree_add_item(req_tree, hf_mysql_exec_flags, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+= 1; proto_tree_add_item(req_tree, hf_mysql_exec_iter, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; #if 0 @@ -1732,7 +1732,7 @@ /* pre-4.1 packet ends here */ if (tvb_reported_length_remaining(tvb, offset)) { proto_tree_add_item(tree, hf_mysql_num_warn, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset= mysql_dissect_server_status(tvb, offset+2, tree); } @@ -1759,7 +1759,7 @@ case RESPONSE_MESSAGE: if ((strlen= tvb_reported_length_remaining(tvb, offset))) { proto_tree_add_item(tree, hf_mysql_message, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } conn_data->state= REQUEST; @@ -1816,11 +1816,11 @@ if (tvb_get_guint8(tvb, offset) == '#') { offset+= 1; - proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, FALSE); + proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, ENC_LITTLE_ENDIAN); offset+= 5; } - proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, ENC_LITTLE_ENDIAN); offset+= tvb_reported_length_remaining(tvb, offset); return offset; @@ -1856,7 +1856,7 @@ /* 4.1+ protocol only: 2 bytes number of warnings */ if (conn_data->clnt_caps & conn_data->srv_caps & MYSQL_CAPS_CU) { proto_tree_add_item(tree, hf_mysql_num_warn, tvb, - offset, 2, FALSE); + offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; } } @@ -1864,7 +1864,7 @@ /* optional: message string */ if ((strlen= tvb_reported_length_remaining(tvb, offset))) { proto_tree_add_item(tree, hf_mysql_message, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } @@ -2011,7 +2011,7 @@ else { proto_tree_add_item(tree, field, tvb, offset, - (int)lelen, FALSE); + (int)lelen, ENC_LITTLE_ENDIAN); offset += (int)lelen; } return offset; @@ -2035,9 +2035,9 @@ mysql_dissect_collation(tvb, offset, tree, conn_data->srv_caps, tvb_get_letohs(tvb, offset), hf_mysql_fld_charsetnr); offset += 2; /* charset */ - proto_tree_add_item(tree, hf_mysql_fld_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_mysql_fld_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; /* length */ - proto_tree_add_item(tree, hf_mysql_fld_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_mysql_fld_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* type */ flags = tvb_get_letohs(tvb, offset); @@ -2058,7 +2058,7 @@ proto_tree_add_boolean(flags_tree, hf_mysql_fld_set, tvb, offset, 2, flags); offset += 2; /* flags */ - proto_tree_add_item(tree, hf_mysql_fld_decimals, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_mysql_fld_decimals, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; /* decimals */ offset += 2; /* filler */

@@ -3,7 +3,7 @@ * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> * Copyright 2000-2004, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding) * - * $Id: packet-nfs.c 33665 2010-07-28 23:58:20Z gerald $ + * $Id: packet-nfs.c 36570 2011-04-11 23:18:27Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -7798,7 +7798,7 @@ { char *universal_ip_address = NULL; char *protocol = NULL; - guint8 b1, b2, b3, b4, b5, b6, b7, b8, b9, b10; + guint b1, b2, b3, b4, b5, b6, b7, b8, b9, b10; guint16 port; int addr_offset; @@ -7807,23 +7807,22 @@ offset = dissect_rpc_string(tvb, tree, hf_nfs_r_addr, offset, &universal_ip_address); if(strlen(protocol) == 3 && strncmp(protocol,"tcp",3) == 0) { - if (universal_ip_address && sscanf(universal_ip_address, "%hhu.%hhu.%hhu.%hhu.%hhu.%hhu", + if (universal_ip_address && sscanf(universal_ip_address, "%u.%u.%u.%u.%u.%u", &b1, &b2, &b3, &b4, &b5, &b6) == 6) { /* IPv4: h1.h2.h3.h4.p1.p2 */ port = (b5<<8) | b6; proto_tree_add_text(tree, tvb, addr_offset, offset, "[callback IPv4 address %u.%u.%u.%u, protocol=%s, port=%u]", b1, b2, b3, b4, protocol, port); - } else if (universal_ip_address && sscanf(universal_ip_address, "%hhu.%hhu", + } else if (universal_ip_address && sscanf(universal_ip_address, "%u.%u", &b1, &b2) == 2) { /* Some clients (linux) sometimes send only the port. */ port = (b1<<8) | b2; - proto_tree_add_text(tree, tvb, addr_offset, offset-addr_offset, "[callback ip address NOT SPECIFIED, protocol=%s, port=%u]", - protocol, - port); - } else if (universal_ip_address && sscanf(universal_ip_address, "%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx.%hhu.%hhu", + proto_tree_add_text(tree, tvb, addr_offset, offset-addr_offset, + "[callback ip address NOT SPECIFIED, protocol=%s, port=%u]", protocol, port); + } else if (universal_ip_address && sscanf(universal_ip_address, + "%2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x.%u.%u", &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &b9, &b10) == 10) { - port = (b9<<8) | b10; proto_tree_add_text(tree, tvb, addr_offset, offset, "[callback IPv6 address %2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x, protocol=%s, port=%u]", @@ -7832,7 +7831,6 @@ proto_tree_add_text(tree, tvb, addr_offset, offset-addr_offset, "[Invalid address]"); } } - return offset; }

@@ -7,7 +7,7 @@ * * By Yi Yu <yiyu.inbox@gmail.com> * - * $Id: packet-sflow.c 31900 2010-02-16 21:17:26Z wmeier $ + * $Id: packet-sflow.c 36571 2011-04-12 00:02:47Z gerald $ * * TODO: * 802.11 aggregation data dissection (sFlow v5) @@ -669,7 +669,7 @@ static dissector_handle_t fddi_handle; static dissector_handle_t fr_handle; static dissector_handle_t x25_handle; -static dissector_handle_t ppp_handle; +static dissector_handle_t ppp_hdlc_handle; static dissector_handle_t smds_handle; static dissector_handle_t aal5_handle; static dissector_handle_t ipv4_handle; @@ -786,7 +786,7 @@ call_dissector(x25_handle, next_tvb, pinfo, sflow_245_header_tree); break; case SFLOW_245_HEADER_PPP: - call_dissector(ppp_handle, next_tvb, pinfo, sflow_245_header_tree); + call_dissector(ppp_hdlc_handle, next_tvb, pinfo, sflow_245_header_tree); break; case SFLOW_245_HEADER_SMDS: call_dissector(smds_handle, next_tvb, pinfo, sflow_245_header_tree); @@ -3431,7 +3431,7 @@ fddi_handle = find_dissector("fddi"); fr_handle = find_dissector("fr"); x25_handle = find_dissector("x.25"); - ppp_handle = find_dissector("ppp"); + ppp_hdlc_handle = find_dissector("ppp_hdlc"); #if 0 smds_handle = find_dissector("smds"); #else @@ -3478,7 +3478,7 @@ fddi_handle = data_handle; fr_handle = data_handle; x25_handle = data_handle; - ppp_handle = data_handle; + ppp_hdlc_handle = data_handle; smds_handle = data_handle; aal5_handle = data_handle; ipv4_handle = data_handle;

@@ -2,7 +2,7 @@ * ssl manipulation functions * By Paolo Abeni <paolo.abeni@email.com> * - * $Id: packet-ssl-utils.c 35416 2011-01-07 01:31:01Z gerald $ + * $Id: packet-ssl-utils.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -2391,6 +2391,14 @@ g_free(key.data); return NULL; } + + if (gnutls_x509_privkey_get_pk_algorithm(priv_key) != GNUTLS_PK_RSA) { + ssl_debug_printf("ssl_load_key: private key public key algorithm isn't RSA\n"); + g_free(private_key); + g_free(key.data); + return NULL; + } + g_free(key.data); private_key->x509_pkey = priv_key; @@ -2553,6 +2561,12 @@ g_free(private_key); return 0; } + + if (gnutls_x509_privkey_get_pk_algorithm(ssl_pkey) != GNUTLS_PK_RSA) { + ssl_debug_printf("ssl_load_pkcs12: private key public key algorithm isn't RSA\n"); + g_free(private_key); + return 0; + } private_key->x509_pkey = ssl_pkey; private_key->sexp_pkey = ssl_privkey_to_sexp(ssl_pkey);

@@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c 35462 2011-01-10 21:13:38Z gerald $ + * $Id: packet-tcp.c 36645 2011-04-14 18:07:36Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -172,6 +172,7 @@ static int hf_tcp_proc_dst_pid = -1; static int hf_tcp_proc_dst_uname = -1; static int hf_tcp_proc_dst_cmd = -1; +static int hf_tcp_data = -1; static gint ett_tcp = -1; static gint ett_tcp_flags = -1; @@ -1696,6 +1697,7 @@ * needs desegmentation). */ fragment_set_partial_reassembly(pinfo,msp->first_frame,tcp_fragment_table); + /* Update msp->nxtpdu to point to the new next * pdu boundary. */ @@ -1710,6 +1712,8 @@ */ msp->nxtpdu=seq+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; } else { msp->nxtpdu=seq + last_fragment_len + pinfo->desegment_len; } @@ -1730,8 +1734,8 @@ nbytes = another_pdu_follows > 0 ? another_pdu_follows : tvb_reported_length_remaining(tvb, offset); - proto_tree_add_text(tcp_tree, tvb, offset, nbytes, - "TCP segment data (%u byte%s)", nbytes, + proto_tree_add_bytes_format(tcp_tree, hf_tcp_data, tvb, offset, + nbytes, NULL, "TCP segment data (%u byte%s)", nbytes, plurality(nbytes, "", "s")); print_tcp_fragment_tree(ipfd_head, tree, tcp_tree, pinfo, next_tvb); @@ -1881,8 +1885,8 @@ * was, and report it as a continuation of that, instead? */ nbytes = tvb_reported_length_remaining(tvb, deseg_offset); - proto_tree_add_text(tcp_tree, tvb, deseg_offset, -1, - "TCP segment data (%u byte%s)", nbytes, + 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")); } pinfo->can_desegment=0; @@ -3119,9 +3123,6 @@ conv=find_or_create_conversation(pinfo); tcpd=get_tcp_conversation_data(conv,pinfo); - item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, conv->index); - PROTO_ITEM_SET_GENERATED(item); - /* If this is a SYN packet, then check if it's seq-nr is different * from the base_seq of the retrieved conversation. If this is the * case, create a new conversation with the same addresses and ports @@ -3141,6 +3142,9 @@ tcpd->ta->flags|=TCP_A_REUSED_PORTS; } + item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, conv->index); + PROTO_ITEM_SET_GENERATED(item); + /* Do we need to calculate timestamps relative to the tcp-stream? */ if (tcp_calculate_ts) { @@ -4132,7 +4136,11 @@ { &hf_tcp_proc_dst_cmd, { "Destination process name", "tcp.proc.dstcmd", FT_STRING, BASE_NONE, NULL, 0x0, - "Destination process command name", HFILL}} + "Destination process command name", HFILL}}, + + { &hf_tcp_data, + { "TCP segment data", "tcp.data", FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL}} }; static gint *ett[] = {

@@ -10,7 +10,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if.c 32748 2010-05-11 03:53:31Z morriss $ + * $Id: packet-x509if.c 36612 2011-04-12 21:21:31Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -45,6 +45,7 @@ #include "packet-x509if.h" #include "packet-x509sat.h" #include <epan/strutil.h> +#include <epan/dissectors/packet-frame.h> #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" @@ -214,7 +215,7 @@ static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 50 "packet-x509if-template.c" +#line 51 "packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -295,15 +296,14 @@ static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /*--- End of included file: packet-x509if-ett.c ---*/ -#line 53 "packet-x509if-template.c" +#line 54 "packet-x509if-template.c" -static const char *object_identifier_id; +static const char *object_identifier_id = NULL; static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; static gboolean rdn_one_value = FALSE; /* have we seen one value in an RDN yet */ static gboolean dn_one_rdn = FALSE; /* have we seen one RDN in a DN yet */ -static gboolean doing_dn = TRUE; static gboolean doing_attr = FALSE; #define MAX_RDN_STR_LEN 64 @@ -318,6 +318,22 @@ #define MAX_AVA_STR_LEN 64 static char *last_ava = NULL; +static void +x509if_frame_end(void) +{ + object_identifier_id = NULL; + top_of_dn = NULL; + top_of_rdn = NULL; + + rdn_one_value = FALSE; + dn_one_rdn = FALSE; + doing_attr = FALSE; + + last_dn = NULL; + last_rdn = NULL; + last_ava = NULL; +} + /*--- Included file: packet-x509if-fn.c ---*/ #line 1 "packet-x509if-fn.c" @@ -349,7 +365,7 @@ static int dissect_x509if_T_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 310 "x509if.cnf" +#line 315 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -374,7 +390,7 @@ static int dissect_x509if_T_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 280 "x509if.cnf" +#line 285 "x509if.cnf" offset=call_ber_oid_callback("unknown", tvb, offset, actx->pinfo, tree); @@ -395,7 +411,7 @@ static int dissect_x509if_T_contextValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 292 "x509if.cnf" +#line 297 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -492,15 +508,14 @@ int dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 411 "x509if.cnf" +#line 418 "x509if.cnf" doing_attr = TRUE; + register_frame_end_routine (x509if_frame_end); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Attribute_sequence, hf_index, ett_x509if_Attribute); - doing_attr = FALSE; - return offset; } @@ -518,7 +533,7 @@ int dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 298 "x509if.cnf" +#line 303 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -539,7 +554,7 @@ static int dissect_x509if_T_assertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 304 "x509if.cnf" +#line 309 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -650,10 +665,11 @@ int dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 402 "x509if.cnf" +#line 408 "x509if.cnf" ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion); @@ -719,7 +735,7 @@ name = oid_resolved_from_string(object_identifier_id); if(!name) name = object_identifier_id; - if(doing_dn) { /* append it to the RDN */ + if(last_rdn) { /* append it to the RDN */ g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); @@ -735,6 +751,7 @@ if((fmt = val_to_str(hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s", name, fmt); @@ -752,7 +769,7 @@ static int dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 225 "x509if.cnf" +#line 226 "x509if.cnf" int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; @@ -776,7 +793,7 @@ /* it was a string - format it */ value = tvb_format_text(out_tvb, 0, tvb_length(out_tvb)); - if(doing_dn) { + if(last_rdn) { g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); /* append it to the tree*/ @@ -786,6 +803,10 @@ if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && *fmt) { /* we have a format */ + if (!last_ava) { + last_ava = ep_alloc(MAX_AVA_STR_LEN); + } + if(!(name = oid_resolved_from_string(object_identifier_id))) name = object_identifier_id; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s %s", name, fmt, value); @@ -804,7 +825,7 @@ static int dissect_x509if_T_distingAttrValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 325 "x509if.cnf" +#line 330 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -861,13 +882,13 @@ static int dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 356 "x509if.cnf" +#line 360 "x509if.cnf" if(!rdn_one_value) { top_of_rdn = tree; } else { - if(doing_dn) + if(last_rdn) /* this is an additional value - delimit */ g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -889,13 +910,13 @@ int dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 328 "x509if.cnf" +#line 333 "x509if.cnf" char *temp_dn; rdn_one_value = FALSE; top_of_rdn = tree; last_rdn = ep_alloc(MAX_DN_STR_LEN); *last_rdn = '\0'; - doing_dn = TRUE; + register_frame_end_routine (x509if_frame_end); offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); @@ -916,7 +937,6 @@ } } - doing_dn = FALSE; last_rdn = NULL; /* it will get freed when the next packet is dissected */ @@ -928,7 +948,7 @@ static int dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 391 "x509if.cnf" +#line 397 "x509if.cnf" if(!dn_one_rdn) { /* this is the first element - record the top */ @@ -952,12 +972,14 @@ int dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 371 "x509if.cnf" +#line 375 "x509if.cnf" const char *fmt; dn_one_rdn = FALSE; /* reset */ last_dn = ep_alloc(MAX_DN_STR_LEN); *last_dn = '\0'; top_of_dn = NULL; + register_frame_end_routine (x509if_frame_end); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence); @@ -1362,7 +1384,7 @@ static int dissect_x509if_T_ra_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 271 "x509if.cnf" +#line 276 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1396,7 +1418,7 @@ static int dissect_x509if_T_ra_values_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 277 "x509if.cnf" +#line 282 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1458,7 +1480,7 @@ static int dissect_x509if_T_contextValue_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 316 "x509if.cnf" +#line 321 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1559,7 +1581,7 @@ static int dissect_x509if_T_restrictionValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 322 "x509if.cnf" +#line 327 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1680,7 +1702,7 @@ static int dissect_x509if_T_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 286 "x509if.cnf" +#line 291 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2080,7 +2102,7 @@ /*--- End of included file: packet-x509if-fn.c ---*/ -#line 76 "packet-x509if-template.c" +#line 92 "packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2746,7 +2768,7 @@ NULL, HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 121 "packet-x509if-template.c" +#line 137 "packet-x509if-template.c" }; /* List of subtrees */ @@ -2829,7 +2851,7 @@ &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 126 "packet-x509if-template.c" +#line 142 "packet-x509if-template.c" }; /* Register protocol */ @@ -2885,6 +2907,6 @@ /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 145 "packet-x509if-template.c" +#line 161 "packet-x509if-template.c" }

@@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2011-02-26) +(last updated 2011-04-09) SMI Network Management Private Enterprise Codes: @@ -9414,9 +9414,9 @@ Ed Liu zliu&resonateinc.com 2352 - RedBack Networks - Jeff Johnson - jjohnson&redbacknetworks.com + Ericsson, Inc. (previous was 'RedBack Networks') + Michael Thatcher + michael.thatcher&ericsson.com 2353 Nexware Corporation Hunghsin Kuo @@ -10543,8 +10543,8 @@ jwilliams&cti.ca 2634 Western Telematic, Inc. - Srikanth Sherman - sri&westtel.com + Anthony Barrera + anthonyb&wti.com 2635 ADTX Chris Jan Cortes @@ -61988,8 +61988,8 @@ NKaczenski&ar-hannover.de 15609 Iskon Internet d.d. - Iva Cabric - ivac+iana&mail.iskon.hr + Jerko Klarica + jerko.klarica&iskon.hr 15610 Herbert Retail Ltd. Rowan Bradley @@ -62043,9 +62043,9 @@ Rick Clark rick&aptare.com 15623 - Darryl Ross + Bachblue Pty Ltd t/a AFOYI Darryl Ross - darryl&fuzzitech.net + darryl&afoyi.com 15624 Skopeo LLC Vanson Samuel @@ -73639,9 +73639,9 @@ Vinícius Augusto Sacramento Ferreira vinicius&takenet.com.br 18522 - Barmala - Christian Barmala - OID.Admin&barmala.com + Unassigned + Removed 2011-03-08 + ---none--- 18523 Liverton Limited Brendan Law @@ -90058,8 +90058,8 @@ equipe&excellent-rameur.com 22624 Source Technologies - Snehal Vashi - svashi&sourcetech.com + Frank Woods + mhitz&sourcetech.com 22625 ProcessClaims Joe Gomez @@ -93191,9 +93191,9 @@ Jamie M Vachon jamie.vachon&levelonenetworks.com 23407 - Bryant Broadcast and Data Communications + Bryant Unlimited Simon Quill - simon&bryant-broadcast.co.uk + simon&bryant-unlimited.co.uk 23408 Rhombus Systems Ltd. David Hartley @@ -99236,8 +99236,8 @@ support&essent.com 24917 Collaborative Fusion, Inc. - Brian A. Seklecki - bseklecki&collaborativefusion.com + Sean McAfee + smcafee&collaborativefusion.com 24918 Radmer Randy Radmer @@ -106296,9 +106296,9 @@ Jacek Drobiecki j.drobiecki&emcom.pl 26680 - General Dynamics UK Limited - Ron Smith - ron.smith&generaldynamics.uk.com + General Dynamics United Kingdom Limited + Jonathan Hansford + jonathan.hansford&generaldynamics.uk.com 26681 Phi Theta Kappa International Honor Society Larry Olin Horn @@ -107312,9 +107312,9 @@ Dominique LeBlond dominique.leblond&tridion.com 26934 - TattileS.r.l. - Paolo Boniotti - p.boniotti&tattile.com + Tattile S.r.l. + Livio Bonisoli + l.bonisoli&tattile.com 26935 Oseo Xavier de Broca @@ -124554,7 +124554,7 @@ Brian Foster brian&fosterhardware.com 31243 - Interhost ANS + Interhost AS Asbjørn Sannes asbjorn.sannes&interhost.no 31244 @@ -142392,9 +142392,9 @@ chunguo li lichunguo&ceopen.cn 35702 - Optical Components & Systems - Vlaznev Dmitry - soft&oco.ru + NTO IRE-Polus, Ltd. (previous was 'Optical Components & Systems') + Alexander Gutor + sanya.gutor&gmail.com 35703 JSC DevLab Kolesnyk Oleksij @@ -144432,7 +144432,7 @@ Daniel Foerst foerst&cua.edu 36212 - Higher Education Bridge Certification Authority, Inc. + Research and Education Bridge Certification Authority, Inc. Benjamin T. Wilson ben&digicert.com 36213 @@ -147797,7 +147797,7 @@ support&andone.co.jp 37053 MMR Network Management Science & Technology Co., Ltd - ShiHaoQing + HaoQing Shi mr_shq&163.com 37054 AirP Systems LLC @@ -149499,6 +149499,994 @@ The Karthikeyans Muruganand Karthikeyan muru&mkarthik.cz.cc +37479 + Warimax Ltd. + Michael Todd Peterson + support&warimax.com +37480 + SkySQL Ab + Kaj Arnö + kaj&skysql.com +37481 + Canyons School District + Scot McCombs + itmsengineers&canyonsdistrict.org +37482 + Stewart McKelvey + Scott Gorrill + sgorrill&smss.com +37483 + A.5 Security Consulting Group, SL + Sergi Gonzalez + sgonzalez&a5security.com +37484 + PT. Teknologi Multimedia Indonesia + Agastiya S. Mohammad + egi&pure-technology.net +37485 + Alico Graphic Web Designs + Sean Ali + sean&alicographics.com +37486 + OOO Verified Solutions + Alexander Ryzhov + admin&vs5.ru +37487 + Nicolas Ledez + Nicolas Ledez + iana&ledez.net +37488 + Ridgetop Group, Inc. + Robert Wagoner + rwagoner&ridgetopgroup.com +37489 + scality + Dos Santos Patrick + iana&scality.com +37490 + ENCO Systems, Inc. + Eugene Novacek, P.E. + research&enco.com +37491 + FTM Systems Kft. + Néher Márton + neher.marton&ftmsystems.hu +37492 + Mindstorm Networks + Nick Whalen + nickw&mindstorm-networks.net +37493 + Cyberlink AG + Thomas Bader + bader&cyberlink.ch +37494 + Vincent de Lau + Vincent de Lau + vincent&delau.nl +37495 + MARS Advanced Research Systems + Robert Leslie + pen.iana.org&mars.org +37496 + ZHEJIANG DAHUA TECHNOLOGY CO.,LTD + Wang Lingli + wang_lingli&dahuatech.com +37497 + Delphi Innovations + Marshall Reeske + mreeske&gmail.com +37498 + NasuTek Enterprises + Michael Manley + mmanley&nasutek.com +37499 + NetSoft Distributed Solutions Pty Ltd + Keith Willis + iana&netsoft.com.au +37500 + Schmid Industrieholding + Thomas Brandner + iana&sih.co.at +37501 + Progetto Archivio S.r.l. + Massimo Nuvoli + info&progettoarchivio.com +37502 + kyberna AG + Thomas Fritz + noc&kyberna.net +37503 + Seratel Technology SAL + John Hobdell + john&seratel.com +37504 + ONETASTIC S.r.l. + Visentin Sergio + onetastic&onetastic.com +37505 + WSO2 Inc. + Prabath Siriwardana + external-relations&wso2.com +37506 + Biodec s.r.l. + Mauro Amico + mauro&biodec.com +37507 + Freenet Liberec, o.s. + Jakub Petržílka + kubapet&lbcfree.net +37508 + AQUAPHOR + Nikolay Kartashev + kolq&aquaphor.ru +37509 + DirectorySelfService + Mohd EQbal. + DirectorySelfService&tashawour.com +37510 + SilentSystem + Shinichi Nakamoto + naka&silentsystem.jp +37511 + Future Dynamics Interstellar + Napoleon A. Courtney + napoleoncourtney&gmail.com +37512 + Systems Corps + Michael Carey + mike&systemscorps.com +37513 + Citkomm + Marc Risse + risse&citkomm.de +37514 + Raphael Frasch GmbH + Raphael Frasch + info&frasch.de +37515 + Avajadi Solutions + Eddie Olsson + ewt&avajadi.org +37516 + Software Integration Development + C.H.W. van Zon + c.v.zon&softint.nl +37517 + Sveriges Radio AB + Henrik Sörling + Henrik.sorling&sr.se +37518 + Firewall Services + Hervé Lardin + tech&firewall-services.com +37519 + Draexlmaier Group + Mario Lohner + Lohner.Mario&DRAEXLMAIER.DE +37520 + Kassenaerztliche Vereinigung Baden-Wuerttemberg + Eike Ott + NetzwerkeundSecurity&kvbawue.de +37521 + Network Pipeline Inc. + Brad J. Wilkus + bradwilkus&networkpipeline.com +37522 + Kousec Software, Inc. + Masato Kataoka + masato.kataoka&kousec.com +37523 + Alyrica Networks Inc + Joseph Sullivan + joseph.sullivan&alyrica.net +37524 + Com1 Communication Solutions B.V. + Bas Sanders + b.sanders&com1.nl +37525 + Infovide-Matrix + Pawel Biedronski + pbiedronski&ivmx.pl +37526 + WellCentive, LLC + Andre Thenot + agthenot&wellcentive.com +37527 + Signalsky Communication Co., Ltd. + Li Chunsheng + tom&signalsky.com +37528 + Crompton Greaves Limited + Yogendra Namjoshi + yogendra.namjoshi&cgglobal.com +37529 + A and A System Co., Ltd. + Shigetaka Furukawa + moroheiya&aa-sys.co.jp +37530 + WebRadar + Daniel Hart + daniel&hart.net +37531 + Frank Moeller + Frank Moeller + frank&nx01.de +37532 + BBT Technology Corp. + PanJie + pjie131&yahoo.com.cn +37533 + Delta Electronics (Thailand) Public Co.,Ltd + Phichej Cheevanantachai + Phichej&delta.co.th +37534 + uher.info + Marek Uher + marek&uher.info +37535 + microDATA GIS, Inc. + Jeremy Jackson + jjackson&md-911.com +37536 + NRG2 B.V. + B. Sanders + bsanders&nrg2.nl +37537 + JADE + Błażej Kukliński + bkuklinski&jade.pl +37538 + Big Switch Networks + Kanzhe Jiang + kanzhe.jiang&bigswitch.com +37539 + Code One GmbH + Arne Bönninghoff + ab&codeone.tv +37540 + N3 Labs Sdn. Bhd. + Ihsan Junaidi Ibrahim + ihsan&n3labs.my +37541 + COMPUTER HI-TECH INC. + Koji Suzue + suzue&cht.co.jp +37542 + Depelmaan Ltd + Alireza Khodaian + a.khodaian&depelmaan.com +37543 + Crowe Horwath LLP + Ted Dyck + ted.dyck&crowehorwath.com +37544 + UM Labs Ltd + Peter Cox + peter&um-labs.com +37545 + GFI Solutions Group inc. + Christophe Dupre + christophe.dupre&gfisolutions.com +37546 + BNP Paribas Fortis group + Bruno-Louis MATUZ + bruno-louis.matuz&bnpparibasfortis.com +37547 + Europapier International GmbH + Daniel Masek + it&europapier.cz +37548 + CenturyLink + Russell Petree + russell.petree&centurylink.com +37549 + C&T sas + Roberto Casalegno + roberto.casalegno&ct-sas.it +37550 + Flexenclosure AB + Magnus Persson + magnus.persson&flexenclosure.com +37551 + IFM Infomaster SpA + Giampaolo Sica + giampaolo.sica&ifminfomaster.com +37552 + RAYCORE TAIWAN CO., LTD. + Andrew Chang + ac&raycore.com.tw +37553 + FRDLWEB + Till Wehowski + till&webfan.de +37554 + Archbold Medical Center + Lou Ellen Parker, RN + lparker&archbold.org +37555 + Enabling Technologies Company, Inc. + Mark Mercer + markm&brailler.com +37556 + Brandwatch + Luke Alexander + luke&brandwatch.com +37557 + Pathology Associates Medical Laboratories, LLC + Sean Rowe + srowe&paml.com +37558 + VM-DG Hemmert & Schuster GbR + Marco Schuster + marco&vmsoft-gbr.de +37559 + Socialcast + Patrick Kile + patrick&socialcast.com +37560 + Simena, LLC + Sezen Uysal + suysal&simena.net +37561 + Beijing KEMACOM technologies Co., Ltd. + Yongjie Zhang + eddy.jhang&gmail.com +37562 + Hangzhou Yuwan Technology Co., Ltd. + Shuyun Guo + support&itmone.com +37563 + NNS - Nigl Network Solutions + NIGL Sascha + s.nigl&nns.at +37564 + Everest Display Inc. + Michael B. F. Wu + michaelbfwu&everestdisplay.com.tw +37565 + Struck Innovative Systeme GmbH + Thorsten Fritzke + thorsten.fritzke&struck.de +37566 + Discovery Reply S.r.l. + Andrea Ceciarelli + a.ceciarelli&reply.it +37567 + Alliant Techsystems Inc. + Darren Hibbard + darren.hibbard&atk.com +37568 + Commend International GmbH + Johannes Helminger + j.helminger&commend.com +37569 + Vocative Ltd. + Dmitry Glukhov + gludminick&vocative.ru +37570 + ELFF Tech + Lonny Fairfield + lfairfie&wyoming.com +37571 + KVUC + Mik Helmich + mik&kvuc.dk +37572 + Panini s.p.a. + Massimo Gullotto + Massimo.Gullotto&panini.com +37573 + LightSoft Research Ltd. + Alexey Leontev + alex&lightsoft.ru +37574 + Alberta Distance Learning Centre + Arlen Baker + abaker&adlc.ca +37575 + Infobip LTD + Izabel Jelenic + izabel.jelenic&infobip.com +37576 + NovelSat + Guy Cohen + guy.c&novelsat.com +37577 + Branch of LLC "Tabak-Invest" Trade Center "Korona" + Mikhail Koren + mike.it&korona.by +37578 + Samworth Brothers Ltd + thomas wing + helpdesk&ginsters.co.uk +37579 + Synetrix Holdings Limited + John Shaw-Miller + john.shaw-miller&synetrix.co.uk +37580 + Chao-Inn elementary school + Chia-Hui Chen + mis&cies.tyc.edu.tw +37581 + Mika timing GmbH + Joerg Mika + joerg.mika&mikatiming.de +37582 + Theobroma Systems Design und Consulting GmbH + Dr. Philipp Tomsich + oid-admin&theobroma-systems.com +37583 + Surescripts, LLC + Pete Palmer + pete.palmer&surescripts.com +37584 + Gary Hawkins + Gary Hawkins + gary.hawkins&garyhawkins.me.uk +37585 + QDIAGNOSTICA + Ayuda Imagen + ayuda.imagen&diagnosticorecoletas.com +37586 + E-sektionens Teletekniska Avdelning + Anton Landberg + anton.landberg&gmail.com +37587 + QualVu, Inc. + Rodney D. Holm + rholm&qualvu.com +37588 + QingDao Easytelecom Co., Ltd. + Lin Guo + easytelecom&public.qd.sd.cn +37589 + Institut de l'Ebre + Sergi Tur Badenas + stur&iesebre.com +37590 + Meyer Burger Technology AG + Jonas Reusser + j.reusser&meyerburger.ch +37591 + Reggiani + Andrea Pagni + support&reggiani.it +37592 + Ev.-Luth. Brüdergemeinde Enger e.V. + Alexander Gebel + alex&elb-enger.de +37593 + Platform-a Arastirma Gelistirme Koordinasyon Hizmetleri A. S. + Ilhan Uncuoglu + ilhan.uncuoglu&platform-a.org +37594 + Netmining LLC + Cristian Ferencz + cristian.ferencz&netmining.com +37595 + Geomarine Ltd + Ian Macdonald + ianmac51&gmail.com +37596 + Agri-hitech LLC + Shigeru Makino + mac&agri-hitech.com +37597 + Decatur Hospital Authority dba Wise Regional Health System + Joe Arispe + jarispe&wiseregional.com +37598 + CipherCloud, Inc. + Pravin Kothari + pkothari&ciphercloud.com +37599 + Meontrust Inc. + Markku Mehtälä + markku&meontrust.com +37600 + ledeuns.org + Denis FONDRAS + contact&ledeuns.org +37601 + Xech S.r.l. + Marco Tiraboschi + mtiraboschi&xech.it +37602 + Spider Software GmbH + Michael Becker + pen&spider-software.net +37603 + Meami.org + Martin Musatov + musatov&att.net +37604 + RMG Tech (Malaysia) Sdn Bhd + Jean-Yves Sireau + sysadmin&regentmarkets.com +37605 + MCX Telecom 2 Sp. z o.o. + Tomasz Sadowski + tomasz.sadowski&mcx.pl +37606 + "SM Finance",JSC + Vladimir V. Losev + losev&smfin.ru +37607 + Cascada Software & Consulting + Marcos Luna + marcos.luna&gmail.com +37608 + CareEvolution, Inc + Himabindu Bolisetty + bindu&careevolution.com +37609 + Dang Networks Inc. + Andrew Duffy + andrewd&dangnetworks.com +37610 + The TuxClan + Carel Lubbe + carel.lubbe&gmail.com +37611 + CJSC TSI Service + Ivan Yu. Malinin + miu&tsinet.ru +37612 + Kassenärztliche Vereinigung Niedersachsen + Christian Strassburg + christian.strassburg&kvn.de +37613 + ennovatis GmbH + Hartmut Freihofer + h.freihofer&ennovatis.de +37614 + Siqura + Peter de Konink + pkonink&siqura.com +37615 + V Labs Informatica Ltda + Andre Luiz de Senna + senna&igenesis.com.br +37616 + SATS Holding AB + Ludvig Nilsson + it&sats.com +37617 + Ventek Sistemas e Automação + Guilherme Namen Pimenta + guilherme&ventek.com.br +37618 + Tumblr + Fredrik Nylander + fredrik&tumblr.com +37619 + SCHIEx + Himabindu Bolisetty + bindu&careevolution.com +37620 + Alegent Health + Cathi Bishop + cathi.bishop&alegent.org +37621 + Ename, S.A. + Jose Lameira + oid&ename.pt +37622 + Chrysalis Utah, Inc. + Dustin Carroll + dustin.carroll&gochrysalis.com +37623 + Red Hound Software, Inc. + Carl Wallace + carl&redhoundsoftware.com +37624 + M & PI Software S.r.l. + Pierluigi Brugnone + pierluigi.brugnone&mpisoftware.it +37625 + Mike Johnson + Mike Johnson + m.d.johnson&durhamonline.org +37626 + STC AKTOR + Alexey Vorontsov + av&aktor.ru +37627 + ensemble + Mike Joe + mikej&ensemble.com +37628 + NETRATOR Andrzej Dopierala + Andrzej Dopierala + dopieralaa&netrator.pl +37629 + COMTEC NET + Diana Ioan + diana.ioan&tecnet.ro +37630 + Iron Technology Solutions Ltd + Regis Savry + regis&irontech.co.nz +37631 + Plasmatronics Pty Ltd + Brendan English + iana&plasmatronics.com.au +37632 + The Frontier Group + Matthew Lambie + mlambie&thefrontiergroup.com.au +37633 + Bolnisnica Golnik KOPA + Tomaz Knific + tomaz.knific&klinika-golnik.si +37634 + Achieve3000, Inc. + Yaakov Goldberg + yaakov.goldberg&achieve3000.com +37635 + Awarepoint + Brandon Gilmore + bgilmore&awarepoint.com +37636 + Catholic Health + Michael Brown + mbrown&chsbuffalo.org +37637 + Henry County Hospital + Louetta Dishman + ldishman&hcmhcares.org +37638 + Infinitrum Co., Ltd + David cheng + david.cheng&infinitrum.com +37639 + ECYS S.A. + Fernando Valenzuela + fdvalenzuela&ecyssa.com +37640 + Federal Cardiovascular surgery center + Nikulin Andrey + avn&krascor.ru +37641 + Neebula Systems + Shai Mohaban + shai&neebula.com +37642 + GK "SoftExpert" + Alexander Sentyurin + asentyurin&sfx-tula.ru +37643 + IBM BTO Business Consulting Services Sp. z o.o. + Lukasz Kozubal + lukasz.kozubal&pl.ibm.com +37644 + Fuzhou Ucore Information Technologies Co,.Ltd + Wensheng Hu + 13705084159&139.com +37645 + Medical Data Express + Alan Hagerman + alan.hagerman&medicaldataexpress.com +37646 + Wyoming Valley Health Care System + Luann Draht + ldraht&wvhcs.org +37647 + Ministry of Interior - UAE (Governmental Entity) + Major General Matar Salem Bin Msaeed Al Neyadi – ICT Director / Dr. Haider Khalid A.A. Al-Ameed – Senior ICT Advisor + hkameed&adpolice.gov.ae +37648 + Kalmia Technology Co, LLC + Alton Brantley + alton.brantley&gmail.com +37649 + Helium Inc. + Tracy Flynn + tflynn&helium.com +37650 + Shared Technology Services Group, Inc. + Venu Venugopal + vvenugopal&stsgi.com +37651 + JoyStem Web Services Private Limited + Chandra Sekhar Challapilla + sekhar&joystem.com +37652 + I-TECH + Alex McGee + camcgee&uw.edu +37653 + Lamby + Stefan Lamby + support&lamby.de +37654 + Moccu GmbH + Thomas Walter + admin&moccu.com +37655 + Far South Networks + Michael Walton + mike&farsouthnet.com +37656 + Broxtowe Borough Council + Stuart Chaffin + Stuart.Chaffin&broxtowe.gov.uk +37657 + Erskine Design + Phil Howell + dev&erskinedesign.com +37658 + Czech National Bank + Martin Podstata + certificateadmins&cnb.cz +37659 + ControlCircle Ltd. + Andy Coates + MonitoringTeam&ControlCircle.com +37660 + Unit of Research of Technologies of Information and Communication (UTIC) + Heithem Abbes + heithem.abbes&gmail.com +37661 + Transcon Electronic Systems spol. s r. o. + Martin Persich + persich&transcon.cz +37662 + Ablerex Electronic Co., Ltd. + Fred Hsu + fred&ablerex.com.tw +37663 + nGen - Niagara Interactive Media Generator + Thomas Madej + tmadej&ngen-niagara.com +37664 + Zone de Police Midi + Jacques Struelens + dir.tel&zpz5341.irisnet.be +37665 + R. W. Beckett Corporation + John Bohan + engineering&beckettenergy.com +37666 + Airebullas C.B. + Juan Gomez Melero + airebullas&airebullas.es +37667 + Office of the Auditor General of Norway + Stig Kristiansen + stig.kristiansen&riksrevisjonen.no +37668 + bit GmbH + M. Botzem + m.botzem&bit-germany.de +37669 + FONDEMI + Marco Saldivia + msaldivia&fondemi.gob.ve +37670 + Barling Bay LLC + Perry Minchew + pminchew&barlingbay.com +37671 + The Biostatistics Center - GWU + Aria Bamdad + aria&bsc.gwu.edu +37672 + VERSCOM INTERNATIONAL HOLDING UK LLP + Aydin Pirinccioglu + snmp.pen&verscom.com +37673 + Estech Systems, Inc. + Brian Berger + bberger&esi-estech.com +37674 + Heineken International + Jan den Otter + Jan.denotter&heineken.com +37675 + LoveBee + Phillip O'Donnell + admin.iana&lovebee.co.nz +37676 + Sutunam Co., Ltd. + Martin PANEL + network&sutunam.com +37677 + Linuxsoft s.r.o. + Ales Hakl + adh&linuxsoft.cz +37678 + Hall Research + Justin Ireland + justin&hallresearch.com +37679 + AGILiCOM + Frédéric BAHUAUD + f.bahuaud&agilicom.fr +37680 + Scott Ellis + Scott Ellis + mail&scottellis.com.au +37681 + Sinefa Pty Ltd + John Bothe + john&sinefa.com +37682 + AlexxHost + Alexey bogomolov + alexx.b84&gmail.com +37683 + TimoCom Soft- und Hardware GmbH + Marco Haack + hostmaster&timocom.com +37684 + Grupo Alsa + Pablo Alvarez Menendez + guardia&alsa.es +37685 + Online Marketing Solutions AG + Michael Junghans + notify&online-marketing-solutions.com +37686 + Lookout Mobile Security, Inc. + Ryan Dooley + ryan.dooley&mylookout.com +37687 + Bethesda Memorial Hospital + Leslie Durham + leslie.durham&bethesdahealthcare.com +37688 + ACE Computer bv + Stephen Day + stephen&ace.nl +37689 + unixtastic + Stephen Day + sd&unixtastic.com +37690 + JOTATEC + Julio Cesar Gomes da Silva + julio&jotatec.com.br +37691 + Broadcast Devices Inc. + Ron Kumetz + ron&broadcast-devices.com +37692 + StringIT + Jeroen Dekkers + iana&stringit.nl +37693 + Brattleboro Memorial Hospital + Jonathan Farina + jfarina&bmhvt.org +37694 + Tsubakimoto Chain Co. + Kohei Yamada + mitaro.sales&mitaro.gr.jp +37695 + Quantum Data Systems (HK) Ltd + Leonard Siu + info&quantum.com.hk +37696 + WIKA Polska S.A. + Maciej Czyznielewski + it&wikapolska.pl +37697 + Higher One + Ian Preston + ipreston&higherone.com +37698 + Customs and Border Protection + Thomas Lawson + Victor.T.Lawson&cbp.dhs.gov +37699 + BolzWachtel Dental Clinic + Christian Fohmann + edv&ipi-muc.de +37700 + Axed S.p.A. + Gennaro Coppola + sistemi&axed-technology.com +37701 + energie-m.de + Hans-Stefan Müller + mail&energie-m.de +37702 + Narodowy Fundusz Zdrowia - Centrala + Pawel Malara + informatyka&nfz.gov.pl +37703 + Mywindowslab.com + Laith Al Shamri + laith&live.it +37704 + Interconcept GmbH + Tobias Reibling + t.reibling&interconcept.de +37705 + CommSoft RMS LLC + Stewart Foote + sf&commsoft-rms.com +37706 + Netmedia Systems e. K. + Matthias Meinecke + info&nmsweb.de +37707 + Rocrail + Rob Versluis + info&rocrail.net +37708 + Systola Forwardingm GmbH + Roman Kuznetsov + rk&systola.de +37709 + S3 Satcom Ltd + John Kennett + john.kennett&s3sat.com +37710 + Dane E. Jones + Dane E. Jones + dane.jones&att.net +37711 + FileMaker Inc + Meena Rajvaidya + meena_rajvaidya&filemaker.com +37712 + Eurosistemi + Michael Lattari + michael&lattari.eu +37713 + Winextreme.org + Artem Pronichkin + artem&pronichkin.com +37714 + AppFolio, Inc. + Ross Harvey + noc&appfolio.com +37715 + FTN + Pascal Fontaine + pascal.fontaine&ftn.ch +37716 + Ville de Lausanne + Pascal Fontaine + securite.informatique&lausanne.ch +37717 + Herbert Smith LLP + Tom Maher + tom.maher&herbertsmith.com +37718 + Fresenius Vial + Franck Rakotonindrainy + franck.rakotonindrainy&fresenius-vial.fr +37719 + PT. Multi Structure + Muhammad Ibrahim Nurmansyah + muhammad.ibrahim&multistructure.co.id +37720 + CSR ZHUZHOU INSTITUTE CO LTD + xiaoyan jiang + jiangxy&teg.cn +37721 + OpenSys (M) Berhad + Zainun Romli + zromli&myopensys.com +37722 + Trusted Information Consulting Sp. z o.o. + Daniel Wachnik + daniel.wachnik&ticons.pl +37723 + ODIN technologies + Scott Barvick + sbarvick&odinrfid.com +37724 + Chalet Technologies Inc. + James Lin + jamesl&chalettech.com +37725 + Yupiq Corp + Paul Reimer + paul.reimer&yupiq.com End of Document

@@ -1,5 +1,5 @@ ; libwireshark.def -; $Id: libwireshark.def 34916 2010-11-16 21:18:03Z gerald $ +; $Id: libwireshark.def 36571 2011-04-12 00:02:47Z gerald $ ; Add symbols that should be exported out of libwireshark.dll, ; e.g. when used inside the GUI. @@ -705,6 +705,7 @@ proto_construct_match_selected_string proto_data DATA proto_enable_all +proto_field_is_referenced proto_find_field_from_offset proto_find_finfo proto_frame DATA

@@ -2364,7 +2364,7 @@ { 2349, "Mission Critical Software, Inc." }, { 2350, "Data Research and Applications, Inc." }, { 2351, "Resonate Inc." }, - { 2352, "RedBack Networks" }, + { 2352, "Ericsson, Inc. (previous was 'RedBack Networks')" }, { 2353, "Nexware Corporation" }, { 2354, "ADC Wireless Systems" }, { 2355, "ITIS" }, @@ -15511,7 +15511,7 @@ { 15620, "Ceiva Logic" }, { 15621, "ZP Technologies" }, { 15622, "APTARE" }, - { 15623, "Darryl Ross" }, + { 15623, "Bachblue Pty Ltd t/a AFOYI" }, { 15624, "Skopeo LLC" }, { 15625, "Excedent Technologies" }, { 15626, "Campus Crusade Asia Ltd" }, @@ -18406,7 +18406,7 @@ { 18519, "Jahi Networks Inc." }, { 18520, "APSI Inc." }, { 18521, "TakeNET" }, - { 18522, "Barmala" }, + { 18522, "Unassigned" }, { 18523, "Liverton Limited" }, { 18524, "Empresa Metal\0303\0272rgica Central de Acero \"Jos\0303\0251 Valdes Reyes\"" }, { 18525, "robinbowes.com" }, @@ -23288,7 +23288,7 @@ { 23404, "DAVANTEL" }, { 23405, "JSC Sahalinmorsvjaz" }, { 23406, "LDAPtive Pty Ltd" }, - { 23407, "Bryant Broadcast and Data Communications" }, + { 23407, "Bryant Unlimited" }, { 23408, "Rhombus Systems Ltd." }, { 23409, "Torque.net inc." }, { 23410, "Hackstrike Ltd." }, @@ -26561,7 +26561,7 @@ { 26677, "Datactics Ltd." }, { 26678, "Canadian Space Agency" }, { 26679, "EMCom sp. z o.o." }, - { 26680, "General Dynamics UK Limited" }, + { 26680, "General Dynamics United Kingdom Limited" }, { 26681, "Phi Theta Kappa International Honor Society" }, { 26682, "lohnet.org" }, { 26683, "Vinci Consulting Corp" }, @@ -26815,7 +26815,7 @@ { 26931, "Reaktor Innovations Oy" }, { 26932, "Visma Software ASA" }, { 26933, "Tridion B.V." }, - { 26934, "TattileS.r.l." }, + { 26934, "Tattile S.r.l." }, { 26935, "Oseo" }, { 26936, "Ville de Marseille" }, { 26937, "Yahata Kosei Hospital" }, @@ -31123,7 +31123,7 @@ { 31240, "i-move internet gmbh" }, { 31241, "Cross Industries AG" }, { 31242, "Foster Link Inc." }, - { 31243, "Interhost ANS" }, + { 31243, "Interhost AS" }, { 31244, "Fresh Media Group" }, { 31245, "Brandon Werner" }, { 31246, "Realmagic Technology Ltd." }, @@ -35574,7 +35574,7 @@ { 35699, "Cummins Power Generation" }, { 35700, "Tyrian Technical Consulting" }, { 35701, "phpcoms" }, - { 35702, "Optical Components & Systems" }, + { 35702, "NTO IRE-Polus, Ltd. (previous was 'Optical Components & Systems')" }, { 35703, "JSC DevLab" }, { 35704, "SALUC" }, { 35705, "HWS Informationssysteme GmbH" }, @@ -36083,7 +36083,7 @@ { 36209, "RGazdi Kft." }, { 36210, "Centre hospitalier de l'Universit\0303\0251 de Montr\0303\0251al" }, { 36211, "The Catholic University of America" }, - { 36212, "Higher Education Bridge Certification Authority, Inc." }, + { 36212, "Research and Education Bridge Certification Authority, Inc." }, { 36213, "SIA \"INBOKSS\"" }, { 36214, "Galaxy Telecom Technologies Ltd" }, { 36215, "Greek Universities Network" }, @@ -37350,6 +37350,253 @@ { 37476, "ViaThinkSoft" }, { 37477, "SIGNALIS" }, { 37478, "The Karthikeyans" }, + { 37479, "Warimax Ltd." }, + { 37480, "SkySQL Ab" }, + { 37481, "Canyons School District" }, + { 37482, "Stewart McKelvey" }, + { 37483, "A.5 Security Consulting Group, SL" }, + { 37484, "PT. Teknologi Multimedia Indonesia" }, + { 37485, "Alico Graphic Web Designs" }, + { 37486, "OOO Verified Solutions" }, + { 37487, "Nicolas Ledez" }, + { 37488, "Ridgetop Group, Inc." }, + { 37489, "scality" }, + { 37490, "ENCO Systems, Inc." }, + { 37491, "FTM Systems Kft." }, + { 37492, "Mindstorm Networks" }, + { 37493, "Cyberlink AG" }, + { 37494, "Vincent de Lau" }, + { 37495, "MARS Advanced Research Systems" }, + { 37496, "ZHEJIANG DAHUA TECHNOLOGY CO.,LTD" }, + { 37497, "Delphi Innovations" }, + { 37498, "NasuTek Enterprises" }, + { 37499, "NetSoft Distributed Solutions Pty Ltd" }, + { 37500, "Schmid Industrieholding" }, + { 37501, "Progetto Archivio S.r.l." }, + { 37502, "kyberna AG" }, + { 37503, "Seratel Technology SAL" }, + { 37504, "ONETASTIC S.r.l." }, + { 37505, "WSO2 Inc." }, + { 37506, "Biodec s.r.l." }, + { 37507, "Freenet Liberec, o.s." }, + { 37508, "AQUAPHOR" }, + { 37509, "DirectorySelfService" }, + { 37510, "SilentSystem" }, + { 37511, "Future Dynamics Interstellar" }, + { 37512, "Systems Corps" }, + { 37513, "Citkomm" }, + { 37514, "Raphael Frasch GmbH" }, + { 37515, "Avajadi Solutions" }, + { 37516, "Software Integration Development" }, + { 37517, "Sveriges Radio AB" }, + { 37518, "Firewall Services" }, + { 37519, "Draexlmaier Group" }, + { 37520, "Kassenaerztliche Vereinigung Baden-Wuerttemberg" }, + { 37521, "Network Pipeline Inc." }, + { 37522, "Kousec Software, Inc." }, + { 37523, "Alyrica Networks Inc" }, + { 37524, "Com1 Communication Solutions B.V." }, + { 37525, "Infovide-Matrix" }, + { 37526, "WellCentive, LLC" }, + { 37527, "Signalsky Communication Co., Ltd." }, + { 37528, "Crompton Greaves Limited" }, + { 37529, "A and A System Co., Ltd." }, + { 37530, "WebRadar" }, + { 37531, "Frank Moeller" }, + { 37532, "BBT Technology Corp." }, + { 37533, "Delta Electronics (Thailand) Public Co.,Ltd" }, + { 37534, "uher.info" }, + { 37535, "microDATA GIS, Inc." }, + { 37536, "NRG2 B.V." }, + { 37537, "JADE" }, + { 37538, "Big Switch Networks" }, + { 37539, "Code One GmbH" }, + { 37540, "N3 Labs Sdn. Bhd." }, + { 37541, "COMPUTER HI-TECH INC." }, + { 37542, "Depelmaan Ltd" }, + { 37543, "Crowe Horwath LLP" }, + { 37544, "UM Labs Ltd" }, + { 37545, "GFI Solutions Group inc." }, + { 37546, "BNP Paribas Fortis group" }, + { 37547, "Europapier International GmbH" }, + { 37548, "CenturyLink" }, + { 37549, "C&T sas" }, + { 37550, "Flexenclosure AB" }, + { 37551, "IFM Infomaster SpA" }, + { 37552, "RAYCORE TAIWAN CO., LTD." }, + { 37553, "FRDLWEB" }, + { 37554, "Archbold Medical Center" }, + { 37555, "Enabling Technologies Company, Inc." }, + { 37556, "Brandwatch" }, + { 37557, "Pathology Associates Medical Laboratories, LLC" }, + { 37558, "VM-DG Hemmert & Schuster GbR" }, + { 37559, "Socialcast" }, + { 37560, "Simena, LLC" }, + { 37561, "Beijing KEMACOM technologies Co., Ltd." }, + { 37562, "Hangzhou Yuwan Technology Co., Ltd. " }, + { 37563, "NNS - Nigl Network Solutions" }, + { 37564, "Everest Display Inc." }, + { 37565, "Struck Innovative Systeme GmbH" }, + { 37566, "Discovery Reply S.r.l." }, + { 37567, "Alliant Techsystems Inc." }, + { 37568, "Commend International GmbH" }, + { 37569, "Vocative Ltd." }, + { 37570, "ELFF Tech" }, + { 37571, "KVUC" }, + { 37572, "Panini s.p.a." }, + { 37573, "LightSoft Research Ltd." }, + { 37574, "Alberta Distance Learning Centre" }, + { 37575, "Infobip LTD" }, + { 37576, "NovelSat" }, + { 37577, "Branch of LLC \"Tabak-Invest\" Trade Center \"Korona\"" }, + { 37578, "Samworth Brothers Ltd" }, + { 37579, "Synetrix Holdings Limited" }, + { 37580, "Chao-Inn elementary school" }, + { 37581, "Mika timing GmbH" }, + { 37582, "Theobroma Systems Design und Consulting GmbH" }, + { 37583, "Surescripts, LLC" }, + { 37584, "Gary Hawkins" }, + { 37585, "QDIAGNOSTICA" }, + { 37586, "E-sektionens Teletekniska Avdelning" }, + { 37587, "QualVu, Inc." }, + { 37588, "QingDao Easytelecom Co., Ltd." }, + { 37589, "Institut de l'Ebre" }, + { 37590, "Meyer Burger Technology AG" }, + { 37591, "Reggiani" }, + { 37592, "Ev.-Luth. Br\0303\0274dergemeinde Enger e.V." }, + { 37593, "Platform-a Arastirma Gelistirme Koordinasyon Hizmetleri A. S." }, + { 37594, "Netmining LLC" }, + { 37595, "Geomarine Ltd" }, + { 37596, "Agri-hitech LLC" }, + { 37597, "Decatur Hospital Authority dba Wise Regional Health System" }, + { 37598, "CipherCloud, Inc." }, + { 37599, "Meontrust Inc." }, + { 37600, "ledeuns.org" }, + { 37601, "Xech S.r.l." }, + { 37602, "Spider Software GmbH" }, + { 37603, "Meami.org" }, + { 37604, "RMG Tech (Malaysia) Sdn Bhd" }, + { 37605, "MCX Telecom 2 Sp. z o.o." }, + { 37606, "\"SM Finance\",JSC" }, + { 37607, "Cascada Software & Consulting" }, + { 37608, "CareEvolution, Inc" }, + { 37609, "Dang Networks Inc." }, + { 37610, "The TuxClan" }, + { 37611, "CJSC TSI Service" }, + { 37612, "Kassen\0303\0244rztliche Vereinigung Niedersachsen " }, + { 37613, "ennovatis GmbH" }, + { 37614, "Siqura" }, + { 37615, "V Labs Informatica Ltda" }, + { 37616, "SATS Holding AB" }, + { 37617, "Ventek Sistemas e Automa\0303\0247\0303\0243o" }, + { 37618, "Tumblr" }, + { 37619, "SCHIEx" }, + { 37620, "Alegent Health" }, + { 37621, "Ename, S.A." }, + { 37622, "Chrysalis Utah, Inc." }, + { 37623, "Red Hound Software, Inc." }, + { 37624, "M & PI Software S.r.l." }, + { 37625, "Mike Johnson" }, + { 37626, "STC AKTOR" }, + { 37627, "ensemble" }, + { 37628, "NETRATOR Andrzej Dopierala" }, + { 37629, "COMTEC NET" }, + { 37630, "Iron Technology Solutions Ltd" }, + { 37631, "Plasmatronics Pty Ltd" }, + { 37632, "The Frontier Group" }, + { 37633, "Bolnisnica Golnik KOPA" }, + { 37634, "Achieve3000, Inc." }, + { 37635, "Awarepoint" }, + { 37636, "Catholic Health" }, + { 37637, "Henry County Hospital" }, + { 37638, "Infinitrum Co., Ltd" }, + { 37639, "ECYS S.A." }, + { 37640, "Federal Cardiovascular surgery center" }, + { 37641, "Neebula Systems" }, + { 37642, "GK \"SoftExpert\"" }, + { 37643, "IBM BTO Business Consulting Services Sp. z o.o." }, + { 37644, "Fuzhou Ucore Information Technologies Co,.Ltd" }, + { 37645, "Medical Data Express" }, + { 37646, "Wyoming Valley Health Care System" }, + { 37647, "Ministry of Interior - UAE (Governmental Entity)" }, + { 37648, "Kalmia Technology Co, LLC" }, + { 37649, "Helium Inc." }, + { 37650, "Shared Technology Services Group, Inc." }, + { 37651, "JoyStem Web Services Private Limited" }, + { 37652, "I-TECH" }, + { 37653, "Lamby" }, + { 37654, "Moccu GmbH" }, + { 37655, "Far South Networks" }, + { 37656, "Broxtowe Borough Council" }, + { 37657, "Erskine Design" }, + { 37658, "Czech National Bank" }, + { 37659, "ControlCircle Ltd." }, + { 37660, "Unit of Research of Technologies of Information and Communication (UTIC)" }, + { 37661, "Transcon Electronic Systems spol. s r. o." }, + { 37662, "Ablerex Electronic Co., Ltd." }, + { 37663, "nGen - Niagara Interactive Media Generator" }, + { 37664, "Zone de Police Midi" }, + { 37665, "R. W. Beckett Corporation" }, + { 37666, "Airebullas C.B." }, + { 37667, "Office of the Auditor General of Norway" }, + { 37668, "bit GmbH" }, + { 37669, "FONDEMI" }, + { 37670, "Barling Bay LLC" }, + { 37671, "The Biostatistics Center - GWU" }, + { 37672, "VERSCOM INTERNATIONAL HOLDING UK LLP" }, + { 37673, "Estech Systems, Inc." }, + { 37674, "Heineken International" }, + { 37675, "LoveBee" }, + { 37676, "Sutunam Co., Ltd." }, + { 37677, "Linuxsoft s.r.o." }, + { 37678, "Hall Research" }, + { 37679, "AGILiCOM" }, + { 37680, "Scott Ellis" }, + { 37681, "Sinefa Pty Ltd" }, + { 37682, "AlexxHost" }, + { 37683, "TimoCom Soft- und Hardware GmbH" }, + { 37684, "Grupo Alsa" }, + { 37685, "Online Marketing Solutions AG" }, + { 37686, "Lookout Mobile Security, Inc." }, + { 37687, "Bethesda Memorial Hospital" }, + { 37688, "ACE Computer bv" }, + { 37689, "unixtastic" }, + { 37690, "JOTATEC" }, + { 37691, "Broadcast Devices Inc." }, + { 37692, "StringIT" }, + { 37693, "Brattleboro Memorial Hospital" }, + { 37694, "Tsubakimoto Chain Co." }, + { 37695, "Quantum Data Systems (HK) Ltd" }, + { 37696, "WIKA Polska S.A." }, + { 37697, "Higher One" }, + { 37698, "Customs and Border Protection" }, + { 37699, "BolzWachtel Dental Clinic" }, + { 37700, "Axed S.p.A." }, + { 37701, "energie-m.de" }, + { 37702, "Narodowy Fundusz Zdrowia - Centrala" }, + { 37703, "Mywindowslab.com" }, + { 37704, "Interconcept GmbH" }, + { 37705, "CommSoft RMS LLC" }, + { 37706, "Netmedia Systems e. K." }, + { 37707, "Rocrail" }, + { 37708, "Systola Forwardingm GmbH" }, + { 37709, "S3 Satcom Ltd" }, + { 37710, "Dane E. Jones" }, + { 37711, "FileMaker Inc" }, + { 37712, "Eurosistemi" }, + { 37713, "Winextreme.org" }, + { 37714, "AppFolio, Inc." }, + { 37715, "FTN" }, + { 37716, "Ville de Lausanne" }, + { 37717, "Herbert Smith LLP" }, + { 37718, "Fresenius Vial" }, + { 37719, "PT. Multi Structure" }, + { 37720, "CSR ZHUZHOU INSTITUTE CO LTD" }, + { 37721, "OpenSys (M) Berhad" }, + { 37722, "Trusted Information Consulting Sp. z o.o." }, + { 37723, "ODIN technologies" }, + { 37724, "Chalet Technologies Inc." }, + { 37725, "Yupiq Corp" }, { 0, NULL} };

@@ -3,7 +3,7 @@ * Copyright 2008 Vincenzo Condoleo, Christophe Dirac, Reto Ruoss * supported by HSR (Hochschule Rapperswil) * - * $Id: compare_stat.c 32545 2010-04-23 21:21:11Z gerald $ + * $Id: compare_stat.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -718,8 +718,11 @@ const char *filter=NULL; GString *error_string; - if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf,%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ + if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ if(pos){ + if(*(optarg+pos)==',') + filter=optarg+pos+1; + else filter=optarg+pos; } else { filter=NULL;

@@ -2,7 +2,7 @@ * Common routines for tracking & saving objects found in streams of data * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object.c 28645 2009-06-05 22:42:47Z guy $ + * $Id: export_object.c 36646 2011-04-14 21:26:25Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -53,6 +53,7 @@ #include <gtk/main.h> #include <gtk/stock_icons.h> #include "gtk/export_object.h" +#include <string.h> enum { EO_PKT_NUM_COLUMN, @@ -186,6 +187,78 @@ window_destroy(save_as_w); } +#define HINIBBLE(x) (((x) >> 4) & 0xf) +#define LONIBBLE(x) ((x) & 0xf) +#define HEXTOASCII(x) (((x) < 10) ? ((x) + '0') : ((x) - 10 + 'a')) +#define MAXFILELEN 255 + +static GString *eo_rename(GString *gstr, gchar dup) +{ + gchar tmp[4] = "( )"; + gchar *tmp_ptr; + GString *ext_str; + + tmp[1] = dup; + if ( (tmp_ptr = strrchr(gstr->str, '.')) != NULL ) { + /* Retain the extension */ + ext_str = g_string_new(tmp_ptr); + gstr = g_string_truncate(gstr, gstr->len - ext_str->len); + if ( gstr->len >= (MAXFILELEN - (strlen(tmp) + ext_str->len)) ) + gstr = g_string_truncate(gstr, MAXFILELEN - (strlen(tmp) + ext_str->len)); + gstr = g_string_append(gstr, tmp); + gstr = g_string_append(gstr, ext_str->str); + g_string_free(ext_str, TRUE); + } + else { + if ( gstr->len >= (MAXFILELEN - strlen(tmp)) ) + gstr = g_string_truncate(gstr, MAXFILELEN - strlen(tmp)); + gstr = g_string_append(gstr, tmp); + } + return gstr; +} + +static GString * +eo_massage_str(const gchar *in_str, gsize maxlen, gchar dup) +{ + gchar *tmp_ptr; + /* The characters in "reject" come from: + * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx. + * Add to the list as necessary for other OS's. + */ + const gchar *reject = "<>:\"/\\|?*" + "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a" + "\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" + "\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"; + GString *out_str; + GString *ext_str; + + out_str = g_string_new(""); + + /* Find all disallowed characters/bytes and replace them with %xx */ + while ( (tmp_ptr = strpbrk(in_str, reject)) != NULL ) { + out_str = g_string_append_len(out_str, in_str, tmp_ptr - in_str); + out_str = g_string_append_c(out_str, '%'); + out_str = g_string_append_c(out_str, HEXTOASCII(HINIBBLE(*tmp_ptr))); + out_str = g_string_append_c(out_str, HEXTOASCII(LONIBBLE(*tmp_ptr))); + in_str = tmp_ptr + 1; + } + out_str = g_string_append(out_str, in_str); + if ( out_str->len > maxlen ) { + if ( (tmp_ptr = strrchr(out_str->str, '.')) != NULL ) { + /* Retain the extension */ + ext_str = g_string_new(tmp_ptr); + out_str = g_string_truncate(out_str, maxlen - ext_str->len); + out_str = g_string_append(out_str, ext_str->str); + g_string_free(ext_str, TRUE); + } + else + out_str = g_string_truncate(out_str, maxlen); + } + if ( dup != '0' ) + out_str = eo_rename(out_str, dup); + return out_str; +} + static void eo_save_all_clicked_cb(GtkWidget *widget _U_, gpointer arg) { @@ -195,6 +268,9 @@ GtkWidget *save_in_w; GSList *slist = object_list->entries; gboolean all_saved = TRUE; + gchar *save_in_path; + GString *safe_filename; + int count = 0; save_in_w = file_selection_new("Wireshark: Save All Objects In ...", FILE_SELECTION_CREATE_FOLDER); @@ -206,9 +282,20 @@ while(slist) { entry = slist->data; - save_as_fullpath = g_build_filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_in_w)), entry->filename, NULL); - - if (!eo_save_entry(save_as_fullpath, entry, FALSE)) + save_in_path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_in_w)); + if ( strlen(save_in_path) < MAXFILELEN ) { + do { + safe_filename = eo_massage_str(entry->filename, + MAXFILELEN - strlen(save_in_path), count | 0x30); + save_as_fullpath = g_build_filename( + save_in_path, safe_filename->str, NULL); + g_string_free(safe_filename, TRUE); + } while ( g_file_test(save_as_fullpath, G_FILE_TEST_EXISTS) && (++count < 10) ); + count = 0; + if (!eo_save_entry(save_as_fullpath, entry, TRUE)) + all_saved = FALSE; + } + else all_saved = FALSE; slist = slist->next;

@@ -3,7 +3,7 @@ * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * Co-authors Anders Broman, Kovarththanan Rajaratnam and Stig Bjorlykke. * - * $Id: new_packet_list.c 34417 2010-10-08 00:28:43Z gerald $ + * $Id: new_packet_list.c 36191 2011-03-14 16:19:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -263,19 +263,37 @@ gtk_widget_show_all(win); } +/* Process sort request; + * order: GTK_SORT_ASCENDING or GTK_SORT_DESCENDING + * sort_indicator: TRUE: set sort_indicator on column; FALSE: don't set .... + * + * If necessary, columns are first "columnized" for all rows in the packet-list; If this + * is not completed (i.e., stopped), then the sort request is aborted. + */ static void -new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType order) +new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType order, gboolean sort_indicator) { - GtkTreeViewColumn *prev_col = (GtkTreeViewColumn *) + GtkTreeViewColumn *prev_col; + + if (col == NULL) { + col = gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col_id); + } + g_assert(col); + + if (!packet_list_do_packet_list_dissect_and_cache_all(packetlist, col_id)) { + return; /* "stopped": do not try to sort */ + } + + prev_col = (GtkTreeViewColumn *) g_object_get_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY); if (prev_col) { gtk_tree_view_column_set_sort_indicator(prev_col, FALSE); } - gtk_tree_view_column_set_sort_indicator(col, TRUE); + gtk_tree_view_column_set_sort_indicator(col, sort_indicator); gtk_tree_view_column_set_sort_order (col, order); g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY, col); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order); /* triggers sort callback */ scroll_to_current (); } @@ -294,13 +312,11 @@ return; if (!gtk_tree_view_column_get_sort_indicator(col)) { - new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE); } else if (order == GTK_SORT_ASCENDING) { - new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE); } else { - gtk_tree_view_column_set_sort_indicator(col, FALSE); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING); - scroll_to_current (); + new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE); } } @@ -427,15 +443,13 @@ switch (action) { case COLUMN_SELECTED_SORT_ASCENDING: - new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE); break; case COLUMN_SELECTED_SORT_DESCENDING: - new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE); break; case COLUMN_SELECTED_SORT_NONE: - gtk_tree_view_column_set_sort_indicator(col, FALSE); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING); - scroll_to_current (); + new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE); break; case COLUMN_SELECTED_ALIGN_LEFT: new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_LEFT); @@ -672,9 +686,7 @@ /* XXX is this correct in all cases? * Reset the sort column, use packetlist as model in case the list is frozen. */ - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), - 0, GTK_SORT_ASCENDING); - + new_packet_list_sort_column(0, NULL, GTK_SORT_ASCENDING, FALSE); } void

@@ -3,7 +3,7 @@ * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * * Co-authors Anders Broman and Kovarththanan Rajaratnam. * - * $Id: packet_list_store.c 33867 2010-08-20 23:04:06Z gerald $ + * $Id: packet_list_store.c 36191 2011-03-14 16:19:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -631,9 +631,9 @@ g_return_val_if_fail(PACKETLIST_IS_LIST(packet_list), -1); newrecord = se_alloc(sizeof(PacketListRecord)); - newrecord->columnized = FALSE; - newrecord->colorized = FALSE; - newrecord->fdata = fdata; + newrecord->columnized = FALSE; + newrecord->colorized = FALSE; + newrecord->fdata = fdata; newrecord->physical_pos = PACKET_LIST_RECORD_COUNT(packet_list->physical_rows); if (fdata->flags.passed_dfilter || fdata->flags.ref_time) { @@ -645,14 +645,11 @@ PACKET_LIST_RECORD_APPEND(packet_list->physical_rows, newrecord); - if (packet_list->columnized) { - /* XXX, dissect? */ - packet_list->columnized = FALSE; - } + packet_list->columnized = FALSE; /* XXX, dissect? */ - /* + /* * Issue a row_inserted signal if the model is connected - * and the row is vissible. + * and the row is visible. */ if((model)&&(newrecord->visible_pos!=-1)) packet_list_row_inserted(packet_list, newrecord->visible_pos); @@ -774,7 +771,15 @@ return FALSE; } -static void +/* packet_list_dissect_and_cache_all() + * returns: + * TRUE if columnization completed; + * packet_list->columnized set to TRUE; + * FALSE: columnization did not complete (i.e., was stopped by the user); + * packet_list->columnized unchanged (i.e., FALSE). + */ + +static gboolean packet_list_dissect_and_cache_all(PacketList *packet_list) { PacketListRecord *record; @@ -807,47 +812,70 @@ main_window_update(); for (progbar_loop_var = 0; progbar_loop_var < progbar_loop_max; ++progbar_loop_var) { - record = PACKET_LIST_RECORD_GET(packet_list->physical_rows, progbar_loop_var); - packet_list_dissect_and_cache_record(packet_list, record, TRUE, FALSE); + record = PACKET_LIST_RECORD_GET(packet_list->physical_rows, progbar_loop_var); + packet_list_dissect_and_cache_record(packet_list, record, TRUE, FALSE); - /* Create the progress bar if necessary. - We check on every iteration of the loop, so that it takes no - longer than the standard time to create it (otherwise, for a - large file, we might take considerably longer than that standard - time in order to get to the next progress bar step). */ - if (progbar == NULL) - progbar = delayed_create_progress_dlg("Construct", "Columns", - TRUE, &progbar_stop_flag, - &progbar_start_time, progbar_val); - - if (progbar_loop_var >= progbar_nextstep) { - /* let's not divide by zero. We should never be started - * with count == 0, so let's assert that */ - g_assert(progbar_loop_max > 0); - - progbar_val = (gfloat) progbar_loop_var / progbar_loop_max; - - if (progbar != NULL) { - g_snprintf(progbar_status_str, sizeof(progbar_status_str), - "%u of %u frames", progbar_loop_var+1, progbar_loop_max); - update_progress_dlg(progbar, progbar_val, progbar_status_str); - } + /* Create the progress bar if necessary. + We check on every iteration of the loop, so that it takes no + longer than the standard time to create it (otherwise, for a + large file, we might take considerably longer than that standard + time in order to get to the next progress bar step). */ + if (progbar == NULL) + /* Note: The following may call gtk_main_iteration() which will */ + /* allow certain "interupts" to happen during this code. */ + /* (Note that the progress_dlg window is set to "modal" */ + /* so that clicking on other windows is disabled). */ + progbar = delayed_create_progress_dlg("Construct", "Columns", + TRUE, &progbar_stop_flag, + &progbar_start_time, progbar_val); + + if (progbar_loop_var >= progbar_nextstep) { + /* let's not divide by zero. We should never be started + * with count == 0, so let's assert that */ + g_assert(progbar_loop_max > 0); + + progbar_val = (gfloat) progbar_loop_var / progbar_loop_max; + + if (progbar != NULL) { + g_snprintf(progbar_status_str, sizeof(progbar_status_str), + "%u of %u frames", progbar_loop_var+1, progbar_loop_max); + /* Note: See comment above re use of gtk_main_iteration() */ + update_progress_dlg(progbar, progbar_val, progbar_status_str); + } - progbar_nextstep += progbar_quantum; - } + progbar_nextstep += progbar_quantum; + } - if (progbar_stop_flag) { - /* Well, the user decided to abort the resizing... */ - break; - } + if (progbar_stop_flag) { + /* Well, the user decided to abort ... */ + break; + } } - /* We're done resizing the columns; destroy the progress bar if it - was created. */ + /* We're done; destroy the progress bar if it was created. */ if (progbar != NULL) - destroy_progress_dlg(progbar); + destroy_progress_dlg(progbar); + + if (progbar_stop_flag) { + return FALSE; /* user aborted before columnization completed */ + } packet_list->columnized = TRUE; + return TRUE; +} + +/* packet_list_do_packet_list_dissect_and_cache_all() + * returns: + * TRUE: if columnization not needed or columnization completed; + * FALSE: columnization did not complete (i.e., stopped by the user) + */ +gboolean +packet_list_do_packet_list_dissect_and_cache_all(PacketList *packet_list, gint sort_col_id) +{ + if (!packet_list_column_contains_values(packet_list, sort_col_id)) { + return packet_list_dissect_and_cache_all(packet_list); + } + return TRUE; } static void @@ -872,9 +900,6 @@ if(PACKET_LIST_RECORD_COUNT(packet_list->physical_rows) == 0) return; - if (!packet_list_column_contains_values(packet_list, sort_col_id)) - packet_list_dissect_and_cache_all(packet_list); - packet_list_resort(packet_list); /* emit "sort-column-changed" signal to tell any tree views @@ -931,7 +956,7 @@ /* Attempt to convert to numbers */ double num_a = atof(a->fdata->col_text[sort_id]); double num_b = atof(b->fdata->col_text[sort_id]); - + if (num_a < num_b) return -1; else if (num_a > num_b) @@ -956,17 +981,12 @@ g_assert(b->fdata->col_text[sort_id]); if(a->fdata->col_text[sort_id] == b->fdata->col_text[sort_id]) - return 0; /* not always NULL, but anyway no need to call strcmp() */ - - if((a->fdata->col_text[sort_id]) && (b->fdata->col_text[sort_id])) { - if (cfile.cinfo.col_fmt[sort_id] == COL_CUSTOM) { - return packet_list_compare_custom (sort_id, a, b); - } - return strcmp(a->fdata->col_text[sort_id], b->fdata->col_text[sort_id]); - } else - return (a->fdata->col_text[sort_id] == NULL) ? -1 : 1; + return 0; /* no need to call strcmp() */ - g_return_val_if_reached(0); + if (cfile.cinfo.col_fmt[sort_id] == COL_CUSTOM) { + return packet_list_compare_custom (sort_id, a, b); + } + return strcmp(a->fdata->col_text[sort_id], b->fdata->col_text[sort_id]); } static gint @@ -1089,7 +1109,13 @@ gboolean create_proto_tree; union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */ guint8 pd[WTAP_MAX_PACKET_SIZE]; /* Packet data */ - + + /* XXX: Does it work to check if the record is already columnized/colorized ? + * i.e.: test record->columnized and record->colorized and just return + * if they're both TRUE. + * Note: Part of the patch submitted with Bug #4273 had code to do this but it + * was commented out in the patch and was not included in SVN #33011. + */ fdata = record->fdata; if (dissect_columns) @@ -1119,7 +1145,7 @@ if (dissect_columns) { /* "Stringify" non frame_data vals */ - epan_dissect_fill_in_columns(&edt, FALSE, FALSE /* fill_fd_colums */); + epan_dissect_fill_in_columns(&edt, FALSE, FALSE /* fill_fd_columns */); for(col = 0; col < cinfo->num_cols; ++col) { /* Skip columns based om frame_data because we already store those. */ @@ -1262,7 +1288,7 @@ guint widest_column_len = 0; if (!packet_list->columnized) - packet_list_dissect_and_cache_all(packet_list); + packet_list_dissect_and_cache_all(packet_list); /* XXX: need to handle case of "incomplete" ? */ for(vis_idx = 0; vis_idx < PACKET_LIST_RECORD_COUNT(packet_list->visible_rows); ++vis_idx) { record = PACKET_LIST_RECORD_GET(packet_list->visible_rows, vis_idx);

@@ -1,6 +1,6 @@ /* packet_list_store.h * - * $Id: packet_list_store.h 31083 2009-11-26 08:52:44Z stig $ + * $Id: packet_list_store.h 36191 2011-03-14 16:19:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -113,6 +113,7 @@ gint packet_list_append_record(PacketList *packet_list, frame_data *fdata); void packet_list_change_record(PacketList *packet_list, guint row, gint col, column_info *cinfo); void packet_list_dissect_and_cache_iter(PacketList *packet_list, GtkTreeIter *iter, gboolean dissect_columns, gboolean dissect_color); +gboolean packet_list_do_packet_list_dissect_and_cache_all(PacketList *packet_list, gint sort_col_id); void packet_list_reset_colorized(PacketList *packet_list); const char* packet_list_get_widest_column_string(PacketList *packet_list, gint col);

@@ -4,7 +4,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf 36081 2011-02-27 17:04:32Z gerald $ +# $Id: manuf 36535 2011-04-10 16:04:37Z gerald $ # # Laurent Deniel <laurent.deniel [AT] free.fr> # @@ -518,7 +518,7 @@ 00:01:CF AlphaDataP # Alpha Data Parallel Systems, Ltd. 00:01:D0 Vitalpoint # VitalPoint, Inc. 00:01:D1 ConetCommu # CoNet Communications, Inc. -00:01:D2 MacpowerPe # MacPower Peripherals, Ltd. +00:01:D2 Inxtron # inXtron, Inc. 00:01:D3 Paxcomm # PAXCOMM, Inc. 00:01:D4 LeisureTim # Leisure Time, Inc. 00:01:D5 HaedongInf # HAEDONG INFO & COMM CO., LTD @@ -1265,7 +1265,7 @@ 00:04:BA KddMediaWi # KDD Media Will Corporation 00:04:BB Bardac # Bardac Corporation 00:04:BC Giantec # Giantec, Inc. -00:04:BD MotorolaBc # Motorola BCS +00:04:BD MotorolaMo # Motorola Mobility, Inc. 00:04:BE Optxcon # OptXCon, Inc. 00:04:BF Versalogic # VersaLogic Corp. 00:04:C0 Cisco # Cisco Systems, Inc. @@ -1882,6 +1882,7 @@ 00:07:23 ElconSyste # ELCON Systemtechnik GmbH 00:07:24 Telemax # Telemax Co., Ltd. 00:07:25 BematechIn # Bematech International Corp. +00:07:26 ShenzhenGo # Shenzhen Gongjin Electronics Co., Ltd. 00:07:27 ZiHk # Zi Corporation (HK) Ltd. 00:07:28 NeoTelecom # Neo Telecom 00:07:29 KistlerIns # Kistler Instrumente AG @@ -2111,7 +2112,7 @@ 00:08:0B BirkaBpaIn # Birka BPA Informationssystem AB 00:08:0C VdaElettro # VDA Elettronica spa 00:08:0D Toshiba -00:08:0E MotorolaBc # Motorola, BCS +00:08:0E MotorolaMo # Motorola Mobility, Inc. 00:08:0F ProximionF # Proximion Fiber Optics AB 00:08:10 KeyTechnol # Key Technology, Inc. 00:08:11 Voix # VOIX Corporation @@ -2240,7 +2241,7 @@ 00:08:AB EnerlinxCo # EnerLinx.com, Inc. 00:08:AC Eltromat # Eltromat GmbH 00:08:AD Toyo-Linx # Toyo-Linx Co., Ltd. -00:08:AE Packetfron # PacketFront Sweden AB +00:08:AE Packetfron # PacketFront International AB 00:08:AF Novatec # Novatec Corporation 00:08:B0 BktelCommu # BKtel communications GmbH 00:08:B1 Proquent # ProQuent Systems @@ -2839,7 +2840,7 @@ 00:0B:03 TaekwangIn # Taekwang Industrial Co., Ltd 00:0B:04 Volktek # Volktek Corporation 00:0B:05 PacificBro # Pacific Broadband Networks -00:0B:06 MotorolaBc # Motorola BCS +00:0B:06 MotorolaMo # Motorola Mobility, Inc. 00:0B:07 VoxpathNet # Voxpath Networks 00:0B:08 PillarData # Pillar Data Systems 00:0B:09 IfoundrySi # Ifoundry Systems Singapore @@ -3318,7 +3319,7 @@ 00:0C:E2 Rolls-Royc # Rolls-Royce 00:0C:E3 OptionInte # Option International N.V. 00:0C:E4 NeurocomIn # NeuroCom International, Inc. -00:0C:E5 MotorolaBc # Motorola BCS +00:0C:E5 MotorolaMo # Motorola Mobility, Inc. 00:0C:E6 MeruNetwor # Meru Networks Inc 00:0C:E7 Mediatek # MediaTek Inc. 00:0C:E8 GuangzhouA # GuangZhou AnJuBao Co., Ltd @@ -3693,7 +3694,7 @@ 00:0E:59 SagemSa # SAGEM SA 00:0E:5A Telefield # TELEFIELD inc. 00:0E:5B Parkervisi # ParkerVision - Direct2Data -00:0E:5C MotorolaBc # Motorola BCS +00:0E:5C MotorolaMo # Motorola Mobility, Inc. 00:0E:5D TriplePlay # Triple Play Technologies A/S 00:0E:5E RaisecomTe # Raisecom Technology 00:0E:5F Activ-Net # activ-net GmbH & Co. KG @@ -3950,7 +3951,7 @@ 00:0F:5A PeribitNet # Peribit Networks 00:0F:5B DeltaInfor # Delta Information Systems, Inc. 00:0F:5C DayOneDigi # Day One Digital Media Limited -00:0F:5D 42networks # 42Networks AB +00:0F:5D Packetfron # PacketFront International AB 00:0F:5E Veo 00:0F:5F NicetyTech # Nicety Technologies Inc. (NTS) 00:0F:60 Lifetron # Lifetron Co.,Ltd @@ -4016,13 +4017,13 @@ 00:0F:9C Panduit # Panduit Corp 00:0F:9D Displaylin # DisplayLink (UK) Ltd 00:0F:9E Murrelektr # Murrelektronik GmbH -00:0F:9F MotorolaBc # Motorola BCS +00:0F:9F MotorolaMo # Motorola Mobility, Inc. 00:0F:A0 CanonKorea # CANON KOREA BUSINESS SOLUTIONS INC. 00:0F:A1 Gigabit # Gigabit Systems Inc. 00:0F:A2 DigitalPat # Digital Path Networks 00:0F:A3 AlphaNetwo # Alpha Networks Inc. 00:0F:A4 SprecherAu # Sprecher Automation GmbH -00:0F:A5 Smp/BwaTec # SMP / BWA Technology GmbH +00:0F:A5 BwaTechnol # BWA Technology GmbH 00:0F:A6 S2Security # S2 Security Corporation 00:0F:A7 RaptorNetw # Raptor Networks Technology 00:0F:A8 Photometri # Photometrics, Inc. @@ -4394,7 +4395,7 @@ 00:11:17 Cesnet 00:11:18 BlxIcDesig # BLX IC Design Corp., Ltd. 00:11:19 Solteras # Solteras, Inc. -00:11:1A MotorolaBc # Motorola BCS +00:11:1A MotorolaMo # Motorola Mobility, Inc. 00:11:1B TargaDivL- # Targa Systems Div L-3 Communications Canada 00:11:1C PleoraTech # Pleora Technologies Inc. 00:11:1D Hectrix # Hectrix Limited @@ -4496,7 +4497,7 @@ 00:11:7D ZmdAmerica # ZMD America, Inc. 00:11:7E Progeny # Progeny Inc. 00:11:7F NeotuneInf # Neotune Information Technology Corporation,.LTD -00:11:80 MotorolaBc # Motorola BCS +00:11:80 MotorolaMo # Motorola Mobility, Inc. 00:11:81 Interenerg # InterEnergy Co.Ltd, 00:11:82 ImiNorgren # IMI Norgren Ltd 00:11:83 DatalogicM # Datalogic Mobile, Inc. @@ -4542,7 +4543,7 @@ 00:11:AB TrustableT # TRUSTABLE TECHNOLOGY CO.,LTD. 00:11:AC SimtecElec # Simtec Electronics 00:11:AD ShanghaiRu # Shanghai Ruijie Technology -00:11:AE MotorolaBc # Motorola BCS +00:11:AE MotorolaMo # Motorola Mobility, Inc. 00:11:AF Medialink- # Medialink-i,Inc 00:11:B0 Fortelink # Fortelink Inc. 00:11:B1 Blueexpert # BlueExpert Technology Corp. @@ -4661,7 +4662,7 @@ 00:12:22 SkardinUk # Skardin (UK) Ltd 00:12:23 Pixim 00:12:24 Nexql # NexQL Corporation -00:12:25 MotorolaBc # Motorola BCS +00:12:25 MotorolaMo # Motorola Mobility, Inc. 00:12:26 JapanDirex # Japan Direx Corporation 00:12:27 FranklinEl # Franklin Electric Co., Inc. 00:12:28 Data # Data Ltd. @@ -4762,7 +4763,7 @@ 00:12:87 DigitalEve # Digital Everywhere Unterhaltungselektronik GmbH 00:12:88 2wire # 2Wire, Inc 00:12:89 AdvanceSte # Advance Sterilization Products -00:12:8A MotorolaBc # Motorola BCS +00:12:8A MotorolaMo # Motorola Mobility, Inc. 00:12:8B SensoryNet # Sensory Networks Inc 00:12:8C WoodwardGo # Woodward Governor 00:12:8D StbDatense # STB Datenservice GmbH @@ -4825,7 +4826,7 @@ 00:12:C6 TgcAmerica # TGC America, Inc 00:12:C7 SecurayTec # SECURAY Technologies Ltd.Co. 00:12:C8 PerfectTec # Perfect tech -00:12:C9 MotorolaBc # Motorola BCS +00:12:C9 MotorolaMo # Motorola Mobility, Inc. 00:12:CA Mechatroni # Mechatronic Brick Aps 00:12:CB Css # CSS Inc. 00:12:CC Bitatek # Bitatek CO., LTD @@ -4966,7 +4967,7 @@ 00:13:53 HydacFilte # HYDAC Filtertechnik GMBH 00:13:54 ZcomaxTech # Zcomax Technologies, Inc. 00:13:55 TomenCyber # TOMEN Cyber-business Solutions, Inc. -00:13:56 TargetSyst # target systemelectronic gmbh +00:13:56 FlirRadiat # FLIR Radiation GmbH 00:13:57 SoyalTechn # Soyal Technology Co., Ltd. 00:13:58 Realm # Realm Systems, Inc. 00:13:59 Protelevis # ProTelevision Technologies A/S @@ -4993,7 +4994,7 @@ 00:13:6E Techmetro # Techmetro Corp. 00:13:6F Packetmoti # PacketMotion, Inc. 00:13:70 NokiaDanma # Nokia Danmark A/S -00:13:71 MotorolaCh # Motorola CHS +00:13:71 MotorolaMo # Motorola Mobility, Inc. 00:13:72 Dell # Dell Inc. 00:13:73 BlwaveElec # BLwave Electronics Co., Ltd 00:13:74 AtherosCom # Atheros Communications, Inc. @@ -5140,7 +5141,7 @@ 00:14:01 RivertreeN # Rivertree Networks Corp. 00:14:02 Kk-Electro # kk-electronic a/s 00:14:03 RenasisLlc # Renasis, LLC -00:14:04 MotorolaCh # Motorola CHS +00:14:04 MotorolaMo # Motorola Mobility, Inc. 00:14:05 Openib # OpenIB, Inc. 00:14:06 GoNetworks # Go Networks 00:14:07 SperianPro # Sperian Protection Instrumentation @@ -5290,7 +5291,7 @@ 00:14:97 ZhiyuanEle # ZHIYUAN Eletronics co.,ltd. 00:14:98 VikingDesi # Viking Design Technology 00:14:99 Helicomm # Helicomm Inc -00:14:9A MotorolaMo # Motorola Mobile Devices Business +00:14:9A MotorolaMo # Motorola Mobility, Inc. 00:14:9B NokotaComm # Nokota Communications, LLC 00:14:9C Hf # HF Company 00:14:9D SoundId # Sound ID Inc. @@ -5368,7 +5369,7 @@ 00:14:E5 Alticast 00:14:E6 AimInfraro # AIM Infrarotmodule GmbH 00:14:E7 Stolinx # Stolinx,. Inc -00:14:E8 MotorolaCh # Motorola CHS +00:14:E8 MotorolaMo # Motorola Mobility, Inc. 00:14:E9 NortechInt # Nortech International 00:14:EA SDigmSafeP # S Digm Inc. (Safe Paradigm Inc.) 00:14:EB Awarepoint # AwarePoint Corporation @@ -5439,7 +5440,7 @@ 00:15:2C Cisco # Cisco Systems 00:15:2D TenxNetwor # TenX Networks, LLC 00:15:2E Packethop # PacketHop, Inc. -00:15:2F MotorolaCh # Motorola CHS +00:15:2F MotorolaMo # Motorola Mobility, Inc. 00:15:30 Bus-Tech # Bus-Tech, Inc. 00:15:31 Kocom 00:15:32 ConsumerTe # Consumer Technologies Group, LLC @@ -5546,7 +5547,7 @@ 00:15:97 AetaAudio # AETA AUDIO SYSTEMS 00:15:98 KolektorGr # Kolektor group 00:15:99 SamsungEle # Samsung Electronics Co., LTD -00:15:9A MotorolaCh # Motorola CHS +00:15:9A MotorolaMo # Motorola Mobility, Inc. 00:15:9B Nortel 00:15:9C B-KyungSys # B-KYUNG SYSTEM Co.,Ltd. 00:15:9D MinicomAdv # Minicom Advanced Systems ltd @@ -5560,7 +5561,7 @@ 00:15:A5 Dci # DCI Co., Ltd. 00:15:A6 DigitalEle # Digital Electronics Products Ltd. 00:15:A7 Robatech # Robatech AG -00:15:A8 MotorolaMo # Motorola Mobile Devices +00:15:A8 MotorolaMo # Motorola Mobility, Inc. 00:15:A9 KwangWooI& # KWANG WOO I&C CO.,LTD 00:15:AA Rextechnik # Rextechnik International Co., 00:15:AB ProSound # PRO CO SOUND INC @@ -5686,7 +5687,7 @@ 00:16:23 IntervalMe # Interval Media 00:16:24 Teneros # Teneros, Inc. 00:16:25 Impinj # Impinj, Inc. -00:16:26 MotorolaCh # Motorola CHS +00:16:26 MotorolaMo # Motorola Mobility, Inc. 00:16:27 Embedded-L # embedded-logic DESIGN AND MORE GmbH 00:16:28 UltraElect # Ultra Electronics Manufacturing and Card Systems 00:16:29 Nivus # Nivus GmbH @@ -5765,7 +5766,7 @@ 00:16:72 ZenwayEnte # Zenway enterprise ltd 00:16:73 Bury # Bury GmbH & Co. KG 00:16:74 EurocbPhil # EuroCB (Phils.), Inc. -00:16:75 MotorolaMd # Motorola MDb +00:16:75 MotorolaMo # Motorola Mobility, Inc. 00:16:76 Intel # Intel Corporation 00:16:77 Bihl+Wiede # Bihl+Wiedemann GmbH 00:16:78 ShenzhenBa # SHENZHEN BAOAN GAOKE ELECTRONICS CO., LTD @@ -5829,7 +5830,7 @@ 00:16:B2 Drivecam # DriveCam Inc 00:16:B3 Photonicbr # Photonicbridges (China) Co., Ltd. 00:16:B4 Private -00:16:B5 MotorolaCh # Motorola CHS +00:16:B5 MotorolaMo # Motorola Mobility, Inc. 00:16:B6 Cisco-Link # Cisco-Linksys 00:16:B7 SeoulCommt # Seoul Commtech 00:16:B8 SonyEricss # Sony Ericsson Mobile Communications @@ -5904,7 +5905,7 @@ 00:16:FD JatyElectr # Jaty Electronics 00:16:FE AlpsElectr # Alps Electric Co., Ltd 00:16:FF WaminOptoc # Wamin Optocomm Mfg Corp -00:17:00 MotorolaMd # Motorola MDb +00:17:00 MotorolaMo # Motorola Mobility, Inc. 00:17:01 Kde # KDE, Inc. 00:17:02 OsungMidic # Osung Midicom Co., Ltd 00:17:03 MosdanInte # MOSDAN Internation Co.,Ltd @@ -6036,7 +6037,7 @@ 00:17:81 GreystoneD # Greystone Data System, Inc. 00:17:82 Lobenn # LoBenn Inc. 00:17:83 TexasInstr # Texas Instruments -00:17:84 MotorolaMo # Motorola Mobile Devices +00:17:84 MotorolaMo # Motorola Mobility, Inc. 00:17:85 SparrElect # Sparr Electronics Ltd 00:17:86 Wisembed 00:17:87 BrotherBro # Brother, Brother & Sons ApS @@ -6130,7 +6131,7 @@ 00:17:DF Cisco # Cisco Systems 00:17:E0 Cisco # Cisco Systems 00:17:E1 DacosTechn # DACOS Technologies Co., Ltd. -00:17:E2 MotorolaMo # Motorola Mobile Devices +00:17:E2 MotorolaMo # Motorola Mobility, Inc. 00:17:E3 TexasInstr # Texas Instruments 00:17:E4 TexasInstr # Texas Instruments 00:17:E5 TexasInstr # Texas Instruments @@ -6142,7 +6143,7 @@ 00:17:EB TexasInstr # Texas Instruments 00:17:EC TexasInstr # Texas Instruments 00:17:ED Woojooit # WooJooIT Ltd. -00:17:EE MotorolaCh # Motorola CHS +00:17:EE MotorolaMo # Motorola Mobility, Inc. 00:17:EF BladeNetwo # Blade Network Technologies, Inc. 00:17:F0 SzcomBroad # SZCOM Broadband Network Technology Co.,Ltd 00:17:F1 RenuElectr # Renu Electronics Pvt Ltd @@ -6197,7 +6198,7 @@ 00:18:22 CecTelecom # CEC TELECOM CO.,LTD. 00:18:23 DeltaElect # Delta Electronics, Inc. 00:18:24 KimaldiEle # Kimaldi Electronics, S.L. -00:18:25 Wavion # Wavion LTD +00:18:25 Private 00:18:26 CaleAccess # Cale Access AB 00:18:27 NecUnified # NEC UNIFIED SOLUTIONS NEDERLAND B.V. 00:18:28 E2vTechnol # e2v technologies (UK) ltd. @@ -6352,7 +6353,7 @@ 00:18:BD ShenzhenDv # SHENZHEN DVBWORLD TECHNOLOGY CO., LTD. 00:18:BE Ansa # ANSA Corporation 00:18:BF EssenceTec # Essence Technology Solution, Inc. -00:18:C0 MotorolaCh # Motorola CHS +00:18:C0 MotorolaMo # Motorola Mobility, Inc. 00:18:C1 AlmitecInf # Almitec Informática e Comércio Ltda. 00:18:C2 Firetide # Firetide, Inc 00:18:C3 C&SMicrowa # C&S Microwave @@ -6460,7 +6461,7 @@ 00:19:29 2m2bMontad # 2M2B Montadora de Maquinas Bahia Brasil LTDA 00:19:2A AntiopeAss # Antiope Associates 00:19:2B AclaraRf # Aclara RF Systems Inc. -00:19:2C MotorolaMo # Motorola Mobile Devices +00:19:2C MotorolaMo # Motorola Mobility, Inc. 00:19:2D Nokia # Nokia Corporation 00:19:2E SpectralIn # Spectral Instruments, Inc. 00:19:2F Cisco # Cisco Systems @@ -6510,7 +6511,7 @@ 00:19:5B D-Link # D-Link Corporation 00:19:5C Innotech # Innotech Corporation 00:19:5D ShenzhenXi # ShenZhen XinHuaTong Opto Electronics Co.,Ltd -00:19:5E MotorolaCh # Motorola CHS +00:19:5E MotorolaMo # Motorola Mobility, Inc. 00:19:5F ValemountN # Valemount Networks Corporation 00:19:60 Docomo # DoCoMo Systems, Inc. 00:19:61 Blaupunkt # Blaupunkt GmbH @@ -6582,7 +6583,7 @@ 00:19:A3 AsteelElec # asteel electronique atlantique 00:19:A4 AustarTech # Austar Technology (hang zhou) Co.,Ltd 00:19:A5 Radarfind # RadarFind Corporation -00:19:A6 MotorolaCh # Motorola CHS +00:19:A6 MotorolaMo # Motorola Mobility, Inc. 00:19:A7 Itu-T 00:19:A8 WiquestCom # WiQuest Communications 00:19:A9 Cisco # Cisco Systems @@ -6608,7 +6609,7 @@ 00:19:BD NewMediaLi # New Media Life 00:19:BE AltaiTechn # Altai Technologies Limited 00:19:BF CitiwayTec # Citiway technology Co.,ltd -00:19:C0 MotorolaMo # Motorola Mobile Devices +00:19:C0 MotorolaMo # Motorola Mobility, Inc. 00:19:C1 AlpsElectr # Alps Electric Co., Ltd 00:19:C2 EquustekSo # Equustek Solutions, Inc. 00:19:C3 Qualitrol @@ -6699,7 +6700,7 @@ 00:1A:18 AdvancedSi # Advanced Simulation Technology inc. 00:1A:19 ComputerEn # Computer Engineering Limited 00:1A:1A GentexCorp # Gentex Corporation/Electro-Acoustic Products -00:1A:1B MotorolaMo # Motorola Mobile Devices +00:1A:1B MotorolaMo # Motorola Mobility, Inc. 00:1A:1C Gt&TEngine # GT&T Engineering Pte Ltd 00:1A:1D PchomeOnli # PChome Online Inc. 00:1A:1E ArubaNetwo # Aruba Networks @@ -6774,7 +6775,7 @@ 00:1A:63 ElsterSolu # Elster Solutions, LLC, 00:1A:64 Ibm # IBM Corp 00:1A:65 Seluxit -00:1A:66 MotorolaCh # Motorola CHS +00:1A:66 MotorolaMo # Motorola Mobility, Inc. 00:1A:67 InfiniteQl # Infinite QL Sdn Bhd 00:1A:68 WeltecEnte # Weltec Enterprise Co., Ltd. 00:1A:69 WuhanYangt # Wuhan Yangtze Optical Technology CO.,Ltd. @@ -6791,7 +6792,7 @@ 00:1A:74 ProcareInt # Procare International Co 00:1A:75 SonyEricss # Sony Ericsson Mobile Communications 00:1A:76 SdtInforma # SDT information Technology Co.,LTD. -00:1A:77 MotorolaMo # Motorola Mobile Devices +00:1A:77 MotorolaMo # Motorola Mobility, Inc. 00:1A:78 Ubtos 00:1A:79 Telecomuni # TELECOMUNICATION TECHNOLOGIES LTD. 00:1A:7A LismoreIns # Lismore Instruments Limited @@ -6845,7 +6846,7 @@ 00:1A:AA Analogic # Analogic Corp. 00:1A:AB EwingsSRL # eWings s.r.l. 00:1A:AC Corelatus # Corelatus AB -00:1A:AD MotorolaCh # Motorola CHS +00:1A:AD MotorolaMo # Motorola Mobility, Inc. 00:1A:AE SavantLlc # Savant Systems LLC 00:1A:AF BlusensTec # BLUSENS TECHNOLOGY 00:1A:B0 SignalNetw # Signal Networks Pvt. Ltd., @@ -6891,10 +6892,10 @@ 00:1A:D8 Alsteraero # AlsterAero GmbH 00:1A:D9 Internatio # International Broadband Electric Communications, Inc. 00:1A:DA Biz-2-Me # Biz-2-Me Inc. -00:1A:DB MotorolaMo # Motorola Mobile Devices +00:1A:DB MotorolaMo # Motorola Mobility, Inc. 00:1A:DC NokiaDanma # Nokia Danmark A/S 00:1A:DD Pepwave # PePWave Ltd -00:1A:DE MotorolaCh # Motorola CHS +00:1A:DE MotorolaMo # Motorola Mobility, Inc. 00:1A:DF Interactiv # Interactivetv Pty Limited 00:1A:E0 MythologyT # Mythology Tech Express Inc. 00:1A:E1 EdgeAccess # EDGE ACCESS INC @@ -7010,7 +7011,7 @@ 00:1B:4F Avaya # Avaya Inc. 00:1B:50 NizhnyNovg # Nizhny Novgorod Factory named after M.Frunze, FSUE (NZiF) 00:1B:51 VectorTech # Vector Technology Corp. -00:1B:52 MotorolaMo # Motorola Mobile Devices +00:1B:52 MotorolaMo # Motorola Mobility, Inc. 00:1B:53 Cisco # Cisco Systems 00:1B:54 Cisco # Cisco Systems 00:1B:55 HurcoAutom # Hurco Automation Ltd. @@ -7149,7 +7150,7 @@ 00:1B:DA Utstarcom # UTStarcom Inc 00:1B:DB ValeoVecs # Valeo VECS 00:1B:DC Vencer # Vencer Co., Ltd. -00:1B:DD MotorolaCh # Motorola CHS +00:1B:DD MotorolaMo # Motorola Mobility, Inc. 00:1B:DE Renkus-Hei # Renkus-Heinz, Inc. 00:1B:DF IskraMis # Iskra MIS 00:1B:E0 TelenotEle # TELENOT ELECTRONIC GmbH @@ -7202,7 +7203,7 @@ 00:1C:0F Cisco # Cisco Systems 00:1C:10 Cisco-Link # Cisco-Linksys, LLC 00:1C:11 MotorolaMo # Motorola Mobility, Inc. -00:1C:12 MotorolaMo # Motorola Mobile Devices +00:1C:12 MotorolaMo # Motorola Mobility, Inc. 00:1C:13 OptsysTech # OPTSYS TECHNOLOGY CO., LTD. 00:1C:14 Vmware # VMware, Inc 00:1C:15 Txp # TXP Corporation @@ -7377,7 +7378,7 @@ 00:1C:BE Nintendo # Nintendo Co., Ltd. 00:1C:BF IntelCorpo # Intel Corporate 00:1C:C0 IntelCorpo # Intel Corporate -00:1C:C1 MotorolaMo # Motorola Mobile Devices +00:1C:C1 MotorolaMo # Motorola Mobility, Inc. 00:1C:C2 PartIiRese # Part II Research, Inc. 00:1C:C3 Pace # Pace plc 00:1C:C4 HewlettPac # Hewlett Packard @@ -7521,7 +7522,7 @@ 00:1D:4E TcmMobileL # TCM Mobile LLC 00:1D:4F AppleCompu # Apple Computer Inc. 00:1D:50 SpinetixSa # SPINETIX SA -00:1D:51 GeEnergy # GE Energy +00:1D:51 BabcockWil # Babcock & Wilcox Power Generation Group, Inc 00:1D:52 DefzoneBV # Defzone B.V. 00:1D:53 S&OElectro # S&O Electronics (Malaysia) Sdn. Bhd. 00:1D:54 SunnicTech # Sunnic Technology & Merchandise INC. @@ -7630,7 +7631,7 @@ 00:1D:BB DynamicSys # Dynamic System Electronics Corp. 00:1D:BC Nintendo # Nintendo Co., Ltd. 00:1D:BD Versamed # Versamed Inc. -00:1D:BE MotorolaMo # Motorola Mobile Devices +00:1D:BE MotorolaMo # Motorola Mobility, Inc. 00:1D:BF RadiientTe # Radiient Technologies, Inc. 00:1D:C0 EnphaseEne # Enphase Energy 00:1D:C1 AudinatePt # Audinate Pty L @@ -7837,7 +7838,7 @@ 00:1E:8A Ecopy # eCopy, Inc 00:1E:8B InfraAcces # Infra Access Korea Co., Ltd. 00:1E:8C AsustekCom # ASUSTek COMPUTER INC. -00:1E:8D MotorolaMo # Motorola Mobile Devices +00:1E:8D MotorolaMo # Motorola Mobility, Inc. 00:1E:8E Hunkeler # Hunkeler AG 00:1E:8F Canon # CANON INC. 00:1E:90 Elitegroup # Elitegroup Computer Systems Co @@ -8078,7 +8079,7 @@ 00:1F:7B Technexion # TechNexion Ltd. 00:1F:7C WitelcomAs # Witelcom AS 00:1F:7D EmbeddedWi # embedded wireless GmbH -00:1F:7E MotorolaMo # Motorola Mobile Devices +00:1F:7E MotorolaMo # Motorola Mobility, Inc. 00:1F:7F Phabrix # Phabrix Limited 00:1F:80 LucasBv # Lucas Holding bv 00:1F:81 AccelSemic # Accel Semiconductor Corp @@ -8091,7 +8092,7 @@ 00:1F:88 FmsForceMe # FMS Force Measuring Systems AG 00:1F:89 Signalion # Signalion GmbH 00:1F:8A EllionDigi # Ellion Digital Inc. -00:1F:8B Storspeed # Storspeed, Inc. +00:1F:8B CacheIq # Cache IQ 00:1F:8C Ccs # CCS Inc. 00:1F:8D Ingenieurb # Ingenieurbuero Stark GmbH und Ko. KG 00:1F:8E MetrisUsa # Metris USA Inc. @@ -8518,7 +8519,7 @@ 00:21:33 BuildingB # Building B, Inc 00:21:34 Brandywine # Brandywine Communications 00:21:35 Alcatel-Lu # ALCATEL-LUCENT -00:21:36 MotorolaMo # Motorola Mobile Devices business (MDb) +00:21:36 MotorolaMo # Motorola Mobility, Inc. 00:21:37 BayControl # Bay Controls, LLC 00:21:38 Cepheid 00:21:39 Escherlogi # Escherlogic Inc. @@ -8900,7 +8901,7 @@ 00:22:B1 Elbit # Elbit Systems 00:22:B2 4rfCommuni # 4RF Communications Ltd 00:22:B3 SeiSPA # Sei S.p.A. -00:22:B4 MotorolaMo # Motorola Mobile Devices +00:22:B4 MotorolaMo # Motorola Mobility, Inc. 00:22:B5 Novita 00:22:B6 SuperflowT # Superflow Technologies Group 00:22:B7 GssGrundig # GSS Grundig SAT-Systems GmbH @@ -9151,7 +9152,7 @@ 00:23:AC Cisco # Cisco Systems 00:23:AD Xmark # Xmark Corporation 00:23:AE Dell # Dell Inc. -00:23:AF MotorolaMo # Motorola Mobile Devices +00:23:AF MotorolaMo # Motorola Mobility, Inc. 00:23:B0 ComxionTec # COMXION Technology Inc. 00:23:B1 LongcheerT # Longcheer Technology (Singapore) Pte Ltd 00:23:B2 Intelligen # Intelligent Mechatronic Systems Inc @@ -9378,7 +9379,7 @@ 00:24:92 MotorolaBr # Motorola, Broadband Solutions Group 00:24:93 Motorola # Motorola, Inc 00:24:94 ShenzhenBa # Shenzhen Baoxin Tech CO., Ltd. -00:24:95 MotorolaMo # Motorola Mobile Devices +00:24:95 MotorolaMo # Motorola Mobility, Inc. 00:24:96 GinzingerE # Ginzinger electronic systems 00:24:97 Cisco # Cisco Systems 00:24:98 Cisco # Cisco Systems @@ -9422,7 +9423,7 @@ 00:24:BE Sony # Sony Corporation 00:24:BF Ciat 00:24:C0 NtiComodo # NTI COMODO INC -00:24:C1 HangzhouMo # Hangzhou Motorola Technologies LTD. +00:24:C1 MotorolaMo # Motorola Mobility, Inc. 00:24:C2 Asumo # Asumo Co.,Ltd. 00:24:C3 Cisco # Cisco Systems 00:24:C4 Cisco # Cisco Systems @@ -9792,7 +9793,7 @@ 00:26:33 Mir-Medica # MIR - Medical International Research 00:26:34 Infineta # Infineta Systems, Inc 00:26:35 Bluetechni # Bluetechnix GmbH -00:26:36 MotorolaMo # Motorola Mobile Devices +00:26:36 MotorolaMo # Motorola Mobility, Inc. 00:26:37 SamsungEle # Samsung Electro-Mechanics 00:26:38 XiaMenJoya # Xia Men Joyatech Co., Ltd. 00:26:39 TMElectron # T.M. Electronics, Inc. @@ -9922,7 +9923,7 @@ 00:26:B7 KingstonTe # Kingston Technology Company, Inc. 00:26:B8 ActiontecE # Actiontec Electronics, Inc 00:26:B9 Dell # Dell Inc -00:26:BA MotorolaMo # Motorola Mobile Devices +00:26:BA MotorolaMo # Motorola Mobility, Inc. 00:26:BB Apple # Apple, Inc 00:26:BC GeneralJac # General Jack Technology Ltd. 00:26:BD JtecCardCo # JTEC Card & Communication Co., Ltd. @@ -10536,7 +10537,7 @@ 00:40:ED NetworkCon # NETWORK CONTROLS INT'NATL INC. 00:40:EE Optimem 00:40:EF Hypercom # HYPERCOM, INC. -00:40:F0 Micro # MICRO SYSTEMS, INC. +00:40:F0 Microbrain # MicroBrain,Inc. 00:40:F1 ChuoElectr # CHUO ELECTRONICS CO., LTD. 00:40:F2 JanichKlas # JANICH & KLASS COMPUTERTECHNIK 00:40:F3 Netcor @@ -11756,7 +11757,7 @@ 00:50:C2:40:00:00/36 Smartmotor # SmartMotor AS 00:50:C2:40:10:00/36 Promess # Promess Incorporated 00:50:C2:40:20:00/36 NumeronSpZ # Numeron Sp. z o.o. -00:50:C2:40:30:00/36 TopexSA # TOPEX S.A. +00:50:C2:40:30:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:40:40:00/36 Nanshanbri # NanShanBridge Co.Ltd 00:50:C2:40:50:00/36 Guralp # Guralp Systems Limited 00:50:C2:40:60:00/36 Corestreet # CoreStreet, Ltd @@ -12859,7 +12860,7 @@ 00:50:C2:85:20:00/36 Einfochips # eInfochips Ltd. 00:50:C2:85:30:00/36 EttusResea # Ettus Research LLC 00:50:C2:85:40:00/36 Ratioplast # Ratioplast-Optoelectronics GmbH -00:50:C2:85:50:00/36 TopexSa # TOPEX SA +00:50:C2:85:50:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:85:60:00/36 Ct # CT Company 00:50:C2:85:70:00/36 EpelIndust # EPEL INDUSTRIAL 00:50:C2:85:80:00/36 WirelessAc # Wireless Acquisition LLC @@ -13072,7 +13073,7 @@ 00:50:C2:92:70:00/36 AtisGroupS # ATIS group s.r.o. 00:50:C2:92:80:00/36 Cinetix # Cinetix GmbH 00:50:C2:92:90:00/36 FlightDeck # Flight Deck Resources -00:50:C2:92:A0:00/36 TopexSa # TOPEX SA +00:50:C2:92:A0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:92:B0:00/36 DspDesign # DSP DESIGN 00:50:C2:92:C0:00/36 Exatrol # Exatrol Corporation 00:50:C2:92:D0:00/36 Approsoftw # APProSoftware.com @@ -13266,7 +13267,7 @@ 00:50:C2:9E:90:00/36 CiemmeSist # Ciemme Sistemi Spa 00:50:C2:9E:A0:00/36 Sismodular # SISMODULAR - Engenharia, Lda 00:50:C2:9E:B0:00/36 AforeSolut # AFORE Solutions Inc. -00:50:C2:9E:C0:00/36 TopexSa # TOPEX SA +00:50:C2:9E:C0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:9E:D0:00/36 PicellBV # Picell B.V. 00:50:C2:9E:E0:00/36 MichaelSte # Michael Stevens & Partners Ltd 00:50:C2:9E:F0:00/36 Woka-Elekt # WoKa-Elektronik GmbH @@ -13788,7 +13789,7 @@ 00:50:C2:BF:70:00/36 PhytecMess # Phytec Messtechnik GmbH 00:50:C2:BF:80:00/36 CrtiicalLi # Crtiical Link 00:50:C2:BF:90:00/36 VitelNet # Vitel Net -00:50:C2:BF:A0:00/36 TopexSa # TOPEX SA +00:50:C2:BF:A0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:BF:B0:00/36 EcsSrl # ecs srl 00:50:C2:BF:C0:00/36 Altronix # Altronix Corporation 00:50:C2:BF:D0:00/36 ErnemannCi # Ernemann Cine Tec GmbH @@ -13949,7 +13950,7 @@ 00:50:C2:C9:B0:00/36 SmElectron # Sm electronic co. 00:50:C2:C9:C0:00/36 Saia-Burge # Saia-Burgess Controls AG 00:50:C2:C9:D0:00/36 RadiusSwed # Radius Sweden AB -00:50:C2:C9:E0:00/36 TopexSa # TOPEX SA +00:50:C2:C9:E0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:C9:F0:00/36 Etherhome 00:50:C2:CA:00:00/36 KieferTech # Kiefer technic GmbH 00:50:C2:CA:10:00/36 WayneKerrE # Wayne Kerr Electronics @@ -14083,7 +14084,7 @@ 00:50:C2:D2:50:00/36 VafInstrum # VAF Instruments BV 00:50:C2:D2:60:00/36 Rch 00:50:C2:D2:70:00/36 FrSauter # Fr.Sauter AG -00:50:C2:D2:80:00/36 Digitale-A # Digitale-Analoge COMponenten West Electronic Vertriebs GmbH +00:50:C2:D2:80:00/36 DigitaleAn # Digitale Analoge COMponenten West Electronic Vertriebs GmbH 00:50:C2:D2:90:00/36 AxibleTech # Axible Technologies 00:50:C2:D2:A0:00/36 Millennium # Millennium Electronics Pty.Ltd. 00:50:C2:D2:B0:00/36 VideoTechL # Video Tech Laboratories, Inc. @@ -14114,7 +14115,7 @@ 00:50:C2:D4:40:00/36 Saia-Burge # Saia-Burgess Controls AG 00:50:C2:D4:50:00/36 Technagon # Technagon GmbH 00:50:C2:D4:60:00/36 ThalesNede # Thales Nederland BV -00:50:C2:D4:70:00/36 TopexSa # TOPEX SA +00:50:C2:D4:70:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:D4:80:00/36 WatermarkE # Watermark Estate Management Services, LLC 00:50:C2:D4:90:00/36 SmithMeter # Smith Meter, Inc 00:50:C2:D4:A0:00/36 AthSystem # ATH system @@ -14259,6 +14260,42 @@ 00:50:C2:DD:60:00/36 TransasMar # Transas Marine International AB 00:50:C2:DD:70:00/36 TornadoMod # Tornado Modular Systems 00:50:C2:DD:80:00/36 SelexInteg # Selex Systems Integration Inc +00:50:C2:DD:90:00/36 Metraware +00:50:C2:DD:A0:00/36 RbzRobotDe # rbz robot design s.l. +00:50:C2:DD:B0:00/36 Edixia +00:50:C2:DD:C0:00/36 VisionCont # Vision & Control GmbH +00:50:C2:DD:D0:00/36 A&AGeneral # A&A GENERAL SRL +00:50:C2:DD:E0:00/36 DrsRsta # DRS RSTA +00:50:C2:DD:F0:00/36 Device # Device GmbH +00:50:C2:DE:00:00/36 InternetPr # INTERNET PROTOCOLO LOGICA SL +00:50:C2:DE:10:00/36 AbbTransmi # ABB Transmission and Distribution Auto Eqip(Xiamen.China) +00:50:C2:DE:20:00/36 Sequtec # SEQUTEC INC +00:50:C2:DE:30:00/36 BreakawayL # Breakaway Systems LLC +00:50:C2:DE:40:00/36 EgsTechnol # EGS Technologies Ltd +00:50:C2:DE:50:00/36 Neets +00:50:C2:DE:60:00/36 FrSauter # Fr. Sauter AG +00:50:C2:DE:70:00/36 Elan # Elan Systems +00:50:C2:DE:80:00/36 VisualProd # Visual Productions +00:50:C2:DE:90:00/36 DigataleAn # Digatale Analoge COMponenten West Electronic Vertrieb GmbH +00:50:C2:DE:A0:00/36 Cerner # Cerner Corporation +00:50:C2:DE:B0:00/36 RuwischKol # Ruwisch & Kollegen GmbH +00:50:C2:DE:C0:00/36 Vendnovati # VendNovation LLC +00:50:C2:DE:D0:00/36 LeeLaser # Lee Laser +00:50:C2:DE:F0:00/36 Powersense # Powersense A/S +00:50:C2:DF:00:00/36 KoncarElec # Koncar Electrical Engineering Institute +00:50:C2:DF:10:00/36 Saia-Burge # Saia-Burgess Controls AG +00:50:C2:DF:20:00/36 Instrument # Instrument Concepts +00:50:C2:DF:30:00/36 Insevis # INSEVIS GmbH +00:50:C2:DF:40:00/36 PotterElec # Potter Electric Signal +00:50:C2:DF:50:00/36 Etherlight +00:50:C2:DF:60:00/36 HinoEngine # HINO ENGINEERING, INC +00:50:C2:DF:70:00/36 Combilent +00:50:C2:DF:80:00/36 TommotekWa # Tommotek (WA) Pty Ltd. +00:50:C2:DF:90:00/36 JennyScien # Jenny Science AG +00:50:C2:DF:A0:00/36 MacValves # MAC Valves, Inc. +00:50:C2:DF:B0:00/36 BettiniSrl # BETTINI SRL +00:50:C2:DF:C0:00/36 I-Evo # I-Evo Ltd +00:50:C2:DF:D0:00/36 Wotbox # Wotbox ltd 00:50:C4 Imd 00:50:C5 AdsTechnol # ADS Technologies, Inc 00:50:C6 LoopTeleco # LOOP TELECOMMUNICATION INTERNATIONAL, INC. @@ -14578,6 +14615,7 @@ 00:70:B0 M/A-ComCom # M/A-COM INC. COMPANIES 00:70:B3 DataRecall # DATA RECALL LTD. 00:72:98 KaonMedia # KAON MEDIA Co., Ltd. +00:78:9E Sagemcom 00:80:00 Multitech # MULTITECH SYSTEMS, INC. 00:80:01 Periphonic # PERIPHONICS CORPORATION 00:80:02 SatelcomUk # SATELCOM (UK) LTD @@ -14836,6 +14874,7 @@ 00:80:FF SocDeTelei # SOC. DE TELEINFORMATIQUE RTC 00:8C:10 BlackBox # Black Box Corp. 00:8C:FA Inventec # Inventec Corporation +00:8D:4E CjscNiiStt # CJSC NII STT 00:90:00 DiamondMul # DIAMOND MULTIMEDIA 00:90:01 NishimuEle # NISHIMU ELECTRONICS INDUSTRIES CO., LTD. 00:90:02 Allgon # ALLGON AB @@ -15302,7 +15341,7 @@ 00:A0:CB ArkTelecom # ARK TELECOMMUNICATIONS, INC. 00:A0:CC Lite-OnCom # LITE-ON COMMUNICATIONS, INC. 00:A0:CD DrJohannes # DR. JOHANNES HEIDENHAIN GmbH -00:A0:CE Astrocom # ASTROCOM CORPORATION +00:A0:CE Ecessa 00:A0:CF Sotas # SOTAS, INC. 00:A0:D0 TenXTechno # TEN X TECHNOLOGY, INC. 00:A0:D1 Inventec # INVENTEC CORPORATION @@ -15352,6 +15391,7 @@ 00:A0:FD ScitexDigi # SCITEX DIGITAL PRINTING, INC. 00:A0:FE BostonTech # BOSTON TECHNOLOGY, INC. 00:A0:FF TellabsOpe # TELLABS OPERATIONS, INC. +00:A1:DE ShenzhenSh # ShenZhen ShiHua Technology CO.,LTD 00:A2:DA Inat # INAT GmbH 00:AA:00 Intel # INTEL CORPORATION 00:AA:01 Intel # INTEL CORPORATION @@ -16192,6 +16232,7 @@ 00:E0:FF SecurityDy # SECURITY DYNAMICS TECHNOLOGIES, Inc. 00:E6:D3 NixdorfCom # NIXDORF COMPUTER CORP. 00:F8:60 PtPanggung # PT. Panggung Electric Citrabuana +00:FC:70 IntrepidCo # Intrepid Control Systems, Inc. 01:0E:CF PN-MC # PROFINET Multicast 02:04:06 BbnInterna # BBN internal usage (not registered) 02:07:01 Racal-Data # RACAL-DATACOM @@ -16214,6 +16255,7 @@ 02:E6:D3 NixdorfCom # NIXDORF COMPUTER CORPORATION 04:0A:83 Alcatel-Lu # Alcatel-Lucent 04:0A:E0 XmitComput # XMIT AG COMPUTER NETWORKS +04:0C:CE Apple # Apple, Inc. 04:0E:C2 ViewsonicM # ViewSonic Mobile China Limited 04:18:0F SamsungEle # Samsung Electronics Co.,Ltd 04:1D:10 DreamWare # Dream Ware Inc. @@ -16223,7 +16265,9 @@ 04:26:05 GfrGesells # GFR Gesellschaft fï¿½r Regelungstechnik und Energieeinsparung mbH 04:2B:BB Picocela # PicoCELA, Inc. 04:2F:56 AtocsShenz # ATOCS (Shenzhen) LTD +04:32:F4 Partron 04:36:04 GyeyoungI& # Gyeyoung I&T +04:46:65 MurataManu # Murata Manufacturing Co., Ltd. 04:4F:AA RuckusWire # Ruckus Wireless 04:55:CA BriviewXia # BriView (Xiamen) Corp. 04:5D:56 CamtronInd # camtron industrial inc. @@ -16244,6 +16288,7 @@ 04:C8:80 Samtec # Samtec Inc 04:DD:4C Ipblaze 04:E0:C4 Triumph-Ad # TRIUMPH-ADLER AG +04:E1:C8 ImsSoluï¿½ # IMS Soluï¿½ï¿½es em Energia Ltda. 04:E2:F8 AepSrl # AEP srl 04:E5:48 CohdaWirel # Cohda Wireless Pty Ltd 04:E6:62 Acroname # Acroname Inc. @@ -16425,9 +16470,12 @@ 0C:17:F1 Telecsys 0C:1D:C2 SeahNetwor # SeAH Networks 0C:27:55 ValuableTe # Valuable Techologies Limited +0C:39:56 Observator # Observator instruments 0C:3C:65 DomeImagin # Dome Imaging Inc 0C:46:9D MsSedco # MS Sedco 0C:60:76 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +0C:6E:4F Primevolt # PrimeVOLT Co., Ltd. +0C:74:C2 Apple # Apple Inc 0C:7D:7C KexiangInf # Kexiang Information Technology Co, Ltd. 0C:81:12 Private 0C:82:30 ShenzhenMa # SHENZHEN MAGNUS TECHNOLOGIES CO.,LTD @@ -16477,6 +16525,7 @@ 10:62:C9 Adatis # Adatis GmbH & Co. KG 10:64:E2 AdfwebComS # ADFweb.com s.r.l. 10:65:A3 Panamax # Panamax Inc. +10:76:8A Eocell 10:78:D2 Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD. 10:83:D2 Microseven # Microseven Systems, LLC 10:88:0F DarumaTele # DARUMA TELECOMUNICAÇÕES E INFORMÁTICA S/A @@ -16486,6 +16535,7 @@ 10:A1:3B FujikuraRu # FUJIKURA RUBBER LTD. 10:B7:F6 Plastoform # Plastoform Industries Ltd. 10:BA:A5 GanaI&C # GANA I&C CO., LTD +10:C5:86 BioSoundLa # BIO SOUND LAB CO., LTD. 10:C7:3F MidasKlark # Midas Klark Teknik Ltd 10:CA:81 Precia 10:CC:DB AximumProd # AXIMUM PRODUITS ELECTRONIQUES @@ -16494,6 +16544,8 @@ 10:E6:AE SourceTech # Source Technologies, LLC 10:E8:EE Phasespace 11:00:AA Private +14:07:08 Private +14:07:E0 Abrantix # Abrantix AG 14:14:4B FujianStar # FUJIAN STAR-NET COMMUNICATION CO.,LTD 14:1B:BD Volex # Volex Inc. 14:35:B3 FutureDesi # Future Designs, Inc. @@ -16541,6 +16593,8 @@ 18:B4:30 NestLabs # Nest Labs Inc. 18:B7:9E Invoxia 18:C0:86 Broadcom # Broadcom Corporation +18:D0:71 DasanSmc # DASAN SMC, Inc. +18:E2:88 SttCondigi # STT Condigi 18:E7:F4 Apple 18:EF:63 Cisco # Cisco Systems 18:F4:6A HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. @@ -16548,8 +16602,9 @@ 1C:06:56 Idy # IDY Corporation 1C:0F:CF SyproOptic # Sypro Optics GmbH 1C:12:9D IeeePesPsr # IEEE PES PSRC/SUB -1C:14:48 MotorolaCh # Motorola CHS +1C:14:48 MotorolaMo # Motorola Mobility, Inc. 1C:17:D3 Cisco # Cisco Systems +1C:18:4A ShenzhenRi # ShenZhen RicherLink Technologies Co.,LTD 1C:19:DE Eyevis # eyevis GmbH 1C:1D:67 HuaweiDevi # Huawei Device Co., Ltd 1C:33:4D ItsTelecom # ITS Telecom @@ -16561,9 +16616,11 @@ 1C:6F:65 Giga-ByteT # GIGA-BYTE TECHNOLOGY CO.,LTD. 1C:75:08 CompalInfo # COMPAL INFORMATION (KUNSHAN) CO., LTD. 1C:7C:11 Eid # EID +1C:7E:E5 D-LinkInte # D-Link International 1C:83:B0 LinkedIp # Linked IP GmbH 1C:8F:8A PhaseMotio # Phase Motion Control SpA 1C:95:5D I-LaxElect # I-LAX ELECTRONICS INC. +1C:AA:07 Cisco # Cisco Systems 1C:AF:F7 D-LinkInte # D-LINK INTERNATIONAL PTE LIMITED 1C:BD:0E AmplifiedE # Amplified Engineering Pty Ltd 1C:BD:B9 D-LinkInte # D-LINK INTERNATIONAL PTE LIMITED @@ -16576,6 +16633,7 @@ 20:05:E8 Ooo"Inprom # OOO "InProMedia" 20:0A:5E XiangshanG # Xiangshan Giant Eagle Technology Developing co.,LTD 20:12:57 MostLuckyT # Most Lucky Trading Ltd +20:13:E0 SamsungEle # Samsung Electronics Co.,Ltd 20:21:A5 LgElectron # LG Electronics Inc 20:2B:C1 HuaweiDevi # Huawei Device Co., Ltd 20:2C:B7 KongYueEle # Kong Yue Electronics & Information Industry (Xinhui) Ltd. @@ -16584,6 +16642,7 @@ 20:46:F9 AdvancedNe # Advanced Network Devices (dba:AND) 20:4A:AA HanscanSpa # Hanscan Spain S.A. 20:4E:6B AxxanaIsra # Axxana(israel) ltd +20:4E:7F Netgear 20:59:A0 ParagonTec # Paragon Technologies Inc. 20:5B:2A Private 20:6A:8A WistronInf # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd. @@ -16594,6 +16653,7 @@ 20:AA:25 Ip-NetLlc # IP-NET LLC 20:B0:F7 Enclustra # Enclustra GmbH 20:B3:99 Enterasys +20:B7:C0 OmicronEle # Omicron electronics GmbH 20:BF:DB Dvl 20:CF:30 AsustekCom # ASUSTek COMPUTER INC. 20:D5:AB KoreaInfoc # Korea Infocom Co.,Ltd. @@ -16608,6 +16668,7 @@ 24:21:AB SonyEricss # Sony Ericsson Mobile Communications 24:3C:20 DynamodeGr # Dynamode Group 24:45:97 GemueGebrM # GEMUE Gebr. Mueller Apparatebau +24:47:0E Pentronica # PentronicAB 24:77:03 IntelCorpo # Intel Corporate 24:82:8A ProwaveTec # Prowave Technologies Ltd. 24:94:42 OpenRoadSo # OPEN ROAD SOLUTIONS , INC. @@ -16617,16 +16678,20 @@ 24:AF:4A Alcatel-Lu # Alcatel-Lucent-IPD 24:AF:54 NexgenMedi # NEXGEN Mediatech Inc. 24:B6:B8 Friem # FRIEM SPA +24:B8:D2 OpzoonTech # Opzoon Technology Co.,Ltd. 24:BA:30 TechnicalC # Technical Consumer Products, Inc. 24:BF:74 Private 24:C8:6E ChaneyInst # Chaney Instrument Co. 24:C9:DE Genoray +24:CB:E7 Myk # MYK, Inc. 24:CF:21 ShenzhenSt # Shenzhen State Micro Technology Co., Ltd 24:D2:CC Smartdrive # SmartDrive Systems Inc. +24:DB:AC HuaweiDevi # Huawei Device Co., Ltd 24:DB:AD Shoppertra # ShopperTrak RCT Corporation 24:F0:FF Ght # GHT Co., Ltd. 28:06:1E NingboGlob # NINGBO GLOBAL USEFUL ELECTRIC CO.,LTD 28:06:8D ItlLlc # ITL, LLC +28:14:71 Lantis # Lantis co., LTD. 28:26:A6 PbrElectro # PBR electronics GmbH 28:34:10 EnigmaDiag # Enigma Diagnostics Limited 28:48:46 Gridcentri # GridCentric Inc. @@ -16640,6 +16705,7 @@ 28:85:2D TouchNetwo # Touch Networks 28:89:15 CashguardS # CashGuard Sverige AB 28:93:FE Cisco # Cisco Systems +28:A5:74 MillerElec # Miller Electric Mfg. Co. 28:C0:DA JuniperNet # Juniper Networks 28:CC:FF Corporacio # Corporacion Empresarial Altra SL 28:CD:4C Individual # Individual Computers GmbH @@ -16651,8 +16717,10 @@ 28:EF:01 Private 28:F3:58 2c-Trifono # 2C - Trifonov & Co 28:FB:D3 ShanghaiRa # Shanghai RagenTek Communication Technology Co.,Ltd. +2C:00:33 EcontrolsL # EControls, LLC 2C:06:23 WinLeader # Win Leader Inc. 2C:19:84 IdnTelecom # IDN Telecom, Inc. +2C:21:72 JuniperNet # Juniper Networks 2C:27:D7 HewlettPac # Hewlett Packard 2C:30:68 Pantech # Pantech Co.,Ltd 2C:34:27 Erco&Amp;G # ERCO & GENER @@ -16663,6 +16731,7 @@ 2C:7E:CF Onzo # Onzo Ltd 2C:80:65 HartingOfN # HARTING Inc. of North America 2C:81:58 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd +2C:8B:F2 HitachiMet # Hitachi Metals America Ltd 2C:91:27 Eintechno # Eintechno Corporation 2C:9E:5F MotorolaMo # Motorola Mobility, Inc. 2C:A1:57 Acromate # ACROMATE, INC. @@ -16697,12 +16766,14 @@ 30:69:4B Rim 30:7C:30 Rim 30:87:30 HuaweiDevi # Huawei Device Co., Ltd +30:8C:FB Dropcam 30:E4:8E VodafoneUk # Vodafone UK 30:EB:25 IntekDigit # INTEK DIGITAL 30:EF:D1 AlstomStro # Alstom Strongwish (Shenzhen) Co., Ltd. 34:08:04 D-Link # D-Link Corporation 34:15:9E Apple # Apple, Inc 34:21:09 JensenScan # Jensen Scandinavia AS +34:29:EA McdElectro # MCD ELECTRONICS SP. Z O.O. 34:68:4A Teraworks # Teraworks Co., Ltd. 34:6F:92 WhiteRodge # White Rodgers Division 34:78:77 O-NetCommu # O-NET Communications(Shenzhen) Limited @@ -16711,6 +16782,7 @@ 34:86:2A HeinzLackm # Heinz Lackmann GmbH & Co KG 34:9A:0D ZbdDisplay # ZBD Displays Ltd 34:A1:83 Aware # AWare, Inc +34:A7:09 TrevilSrl # Trevil srl 34:AA:EE Mikrovisat # Mikrovisatos Servisas UAB 34:B5:71 Plds 34:BA:51 Se-KureCon # Se-Kure Controls, Inc. @@ -16731,9 +16803,11 @@ 38:16:D1 SamsungEle # Samsung Electronics Co.,Ltd 38:22:9D PirelliBro # PIRELLI BROADBAND SOLUTIONS 38:22:D6 H3cTechnol # H3C Technologies Co., Limited +38:26:CD Andtek # ANDTEK 38:31:AC Weg 38:52:1A Alcatel-Lu # Alcatel-Lucent 7705 38:58:0C Panaccess # Panaccess Systems GmbH +38:59:F9 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. 38:5F:C3 YuJeongSys # Yu Jeong System, Co.Ltd 38:63:F6 3nodMultim # 3NOD MULTIMEDIA(SHENZHEN)CO.,LTD 38:6E:21 WasionGrou # Wasion Group Ltd. @@ -16768,6 +16842,7 @@ 3C:5F:01 Synerchip # Synerchip Co., Ltd. 3C:62:00 SamsungEle # Samsung electronics CO., LTD 3C:62:78 ShenzhenJe # SHENZHEN JETNET TECHNOLOGY CO.,LTD. +3C:67:2C Sciovid # Sciovid Inc. 3C:74:37 Rim 3C:75:4A MotorolaMo # Motorola Mobility, Inc. 3C:8B:FE SamsungEle # Samsung Electronics @@ -16777,6 +16852,7 @@ 3C:B1:5B Avaya # Avaya, Inc 3C:B1:7F Wattwatche # Wattwatchers Pty Ld 3C:C0:C6 D&Amp;BAud # d&b audiotechnik GmbH +3C:D9:2B HewlettPac # Hewlett Packard 3C:DF:1E Cisco # Cisco Systems 3C:E5:A6 HangzhouH3 # Hangzhou H3C Technologies Co., Ltd. 3C:EA:4F 2wire @@ -16787,6 +16863,7 @@ 40:12:E4 Compass-Eo # Compass-EOS 40:13:D9 GlobalEs # Global ES 40:15:97 ProtectAme # Protect America, Inc. +40:16:9F Tp-LinkTec # TP-LINK TECHNOLOGIES CO., LTD. 40:18:D7 WyleTeleme # Wyle Telemetry and Data Systems 40:1D:59 BiometricA # Biometric Associates, LP 40:22:ED DigitalPro # Digital Projection Ltd @@ -16801,6 +16878,7 @@ 40:55:39 Cisco # Cisco Systems 40:5A:9B Anovo 40:5F:BE Rim +40:5F:C2 TexasInstr # Texas Instruments 40:61:86 Micro-Star # MICRO-STAR INT'L CO.,LTD 40:61:8E Hort-Plan 40:83:DE Motorola @@ -16813,6 +16891,7 @@ 40:A6:A4 Passivsyst # PassivSystems Ltd 40:A6:D9 Apple 40:B2:C8 NortelNetw # Nortel Networks +40:B3:FC Logital # Logital Co. Limited 40:C2:45 ShenzhenHe # Shenzhen Hexicom Technology Co., Ltd. 40:C7:C9 Naviit # Naviit Inc. 40:CD:3A Z3Technolo # Z3 Technology @@ -16822,7 +16901,7 @@ 40:EF:4C FihonestCo # Fihonest communication co.,Ltd 40:F4:EC Cisco # Cisco Systems 40:F5:2E LeicaMicro # Leica Microsystems (Schweiz) AG -40:FC:89 MotorolaMo # Motorola Mobile Devices +40:FC:89 MotorolaMo # Motorola Mobility, Inc. 44:25:BB BambooEnte # Bamboo Entertainment Corporation 44:2A:60 Apple # Apple, Inc. 44:37:19 2SaveEnerg # 2 Save Energy Ltd @@ -16832,6 +16911,7 @@ 44:45:53 Microsoft 44:46:49 DfiDiamond # DFI (Diamond Flower Industries) 44:4E:1A SamsungEle # Samsung Electronics Co.,Ltd +44:4F:5E PanStudios # Pan Studios Co.,Ltd. 44:51:DB RaytheonBb # Raytheon BBN Technologies 44:54:C0 ThompsonAe # Thompson Aerospace 44:56:8D PncTechnol # PNC Technologies Co., Ltd. @@ -16844,6 +16924,7 @@ 44:6C:24 ReallinEle # Reallin Electronic Co.,Ltd 44:7C:7F InnolightT # Innolight Technology Corporation 44:7D:A5 VtionInfor # VTION INFORMATION TECHNOLOGY (FUJIAN) CO.,LTD +44:7E:95 AlphaAndOm # Alpha and Omega, Inc 44:83:12 Star-Net 44:85:00 Intel # Intel Corporation 44:87:FC Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD. @@ -16899,7 +16980,7 @@ 4C:1A:3A PrimaResea # PRIMA Research And Production Enterprise Ltd. 4C:1F:CC HuaweiTech # HUAWEI TECHNOLOGIES CO.,LTD 4C:2C:80 BeijingSky # Beijing Skyway Technologies Co.,Ltd -4C:30:89 ThalesRail # Thales Rail Signalling Solutions GmbH +4C:30:89 ThalesTran # Thales Transportation Systems GmbH 4C:32:2D TeledataNe # TELEDATA NETWORKS 4C:3B:74 VogtecHK # VOGTEC(H.K.) Co., Ltd 4C:42:4C Informatio # Information Modes software modified addresses (not registered?) @@ -16912,6 +16993,7 @@ 4C:73:A5 Kove 4C:80:93 IntelCorpo # Intel Corporate 4C:8B:55 GrupoDigic # Grupo Digicon +4C:98:EF Zeo 4C:9E:E4 HanyangNav # Hanyang Navicom Co.,Ltd. 4C:B4:EA HrdSPte # HRD (S) PTE., LTD. 4C:B9:C8 Conet # CONET CO., LTD. @@ -16940,7 +17022,9 @@ 50:A6:E3 DavidClark # David Clark Company 50:AF:73 ShenzhenBi # Shenzhen Bitland Information Technology Co., Ltd. 50:C5:8D JuniperNet # Juniper Networks +50:C9:71 GnNetcom # GN Netcom A/S 50:CE:75 MeasyElect # Measy Electronics Ltd +50:D6:D7 TakahataPr # Takahata Precision 50:E5:49 Giga-ByteT # GIGA-BYTE TECHNOLOGY CO.,LTD. 50:EB:1A BrocadeCom # Brocade Communications Systems, Inc 50:F0:03 OpenStack # Open Stack, Inc. @@ -16962,6 +17046,7 @@ 54:89:98 HuaweiTech # HUAWEI TECHNOLOGIES CO.,LTD 54:92:BE SamsungEle # Samsung Electronics Co.,Ltd 54:9A:16 UzushioEle # Uzushio Electric Co.,Ltd. +54:9B:12 SamsungEle # Samsung Electronics 54:A5:1B HuaweiDevi # Huawei Device Co., Ltd 54:B6:20 SuhdolE&C # SUHDOL E&C Co.Ltd. 54:D4:6F CiscoSpvtg # Cisco SPVTG @@ -16985,15 +17070,19 @@ 58:67:1A Barnes&Nob # BARNES&NOBLE.COM 58:6D:8F Cisco-Link # Cisco-Linksys, LLC 58:6E:D6 Private +58:75:21 CjscRtsoft # CJSC RTSoft 58:8D:09 Cisco # Cisco Systems 58:94:6B IntelCorpo # Intel Corporate +58:98:35 Technicolo # Technicolor 58:A7:6F Id # iD corporation 58:B0:35 Apple # Apple, Inc 58:B9:E1 Crystalfon # Crystalfontz America, Inc. 58:BC:27 Cisco # Cisco Systems 58:D0:8F Ieee19041W # IEEE 1904.1 Working Group 58:DB:8D Fast # Fast Co., Ltd. +58:E4:76 CentronCom # CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD 58:E7:47 Deltanet # Deltanet AG +58:E8:08 Autonics # AUTONICS CORPORATION 58:EE:CE IconTime # Icon Time Systems 58:F6:7B XiaMenUnio # Xia Men UnionCore Technology LTD. 58:F6:BF KyotoUnive # Kyoto University @@ -17034,6 +17123,7 @@ 60:11:99 Data-Teste # Data-Tester Inc. 60:12:83 Soluciones # Soluciones Tecnologicas para la Salud y el Bienestar SA 60:15:C7 Idatech +60:19:0C Rramac 60:1D:0F MidniteSol # Midnite Solar 60:2A:54 CardiotekB # CardioTek B.V. 60:2A:D0 CiscoSpvtg # Cisco SPVTG @@ -17080,6 +17170,7 @@ 64:68:0C Comtrend 64:69:BC HyteraComm # Hytera Communications Co .,ltd 64:6E:6C RadioDatac # Radio Datacom LLC +64:73:E2 Arbiter # Arbiter Systems, Inc. 64:7B:D4 TexasInstr # Texas Instruments 64:7D:81 YokotaIndu # YOKOTA INDUSTRIAL CO,.LTD 64:7F:DA TektelicCo # TEKTELIC Communications Inc. @@ -17104,7 +17195,7 @@ 64:DC:01 StaticGrou # Static Systems Group PLC 64:DE:1C KingneticP # Kingnetic Pte Ltd 64:E8:E6 GlobalMois # global moisture management system -64:ED:57 MotorolaMd # Motorola MDb/Broadband +64:ED:57 MotorolaMo # Motorola Mobility, Inc. 64:F9:70 KenadeElec # Kenade Electronics Technology Co.,LTD. 64:F9:87 Avvasi # Avvasi Inc. 64:FC:8C Zonar # Zonar Systems @@ -17115,6 +17206,7 @@ 68:4B:88 Galtronics # Galtronics Telemetry Inc. 68:54:F5 Enlighted # enLighted Inc 68:59:7F AlcatelLuc # Alcatel Lucent +68:5B:36 PowertechI # POWERTECH INDUSTRIAL CO., LTD. 68:5D:43 IntelCorpo # Intel Corporate 68:63:59 AdvancedDi # Advanced Digital Broadcast SA 68:78:4C NortelNetw # Nortel Networks @@ -17122,6 +17214,7 @@ 68:79:ED Sharp # SHARP Corporation 68:7F:74 Cisco-Link # Cisco-Linksys, LLC 68:85:40 IgiMobile # IGI Mobile, Inc. +68:87:6B InqMobile # INQ Mobile Limited 68:92:34 RuckusWire # Ruckus Wireless 68:A1:B7 HonghaoMin # Honghao Mingchuan Technology (Beijing) CO.,Ltd. 68:A3:C4 LiteonTech # Liteon Technology Corporation @@ -17136,6 +17229,7 @@ 68:EB:AE SamsungEle # Samsung Electronics Co.,Ltd 68:EB:C5 AngstremTe # Angstrem Telecom 68:EF:BD Cisco # Cisco Systems +68:F8:95 Redflow # Redflow Limited 6C:04:60 RbhAccessT # RBH Access Technologies Inc. 6C:0E:0D SonyEricss # Sony Ericsson Mobile Communications AB 6C:0F:6A JdcTech # JDC Tech Co., Ltd. @@ -17173,13 +17267,15 @@ 6C:FD:B9 ProwareTec # Proware Technologies Co Ltd. 6C:FF:BE MpbCommuni # MPB Communications Inc. 70:02:58 01db-Metra # 01DB-METRAVIB -70:14:04 Liability& # Limited Liability Company "Research Center "Bresler" +70:14:04 Liability" # Limited Liability Company "Research Center "Bresler" 70:1A:04 LiteonTech # Liteon Tech Corp. 70:1A:ED Advas # ADVAS CO., LTD. 70:2B:1D E-DomusInt # E-Domus International Limited 70:2F:97 AavaMobile # Aava Mobile Oy 70:32:D5 AthenaWire # Athena Wireless Communications Inc +70:3A:D8 ShenzhenAf # Shenzhen Afoundry Electronic Co., Ltd 70:3C:39 SeawingKft # SEAWING Kft +70:4A:AE XstreamFlo # Xstream Flow (Pty) Ltd 70:58:12 PanasonicA # Panasonic AVC Networks Company 70:5A:B6 CompalInfo # COMPAL INFORMATION (KUNSHAN) CO., LTD. 70:5E:AA ActionTarg # Action Target, Inc. @@ -17210,6 +17306,7 @@ 74:32:56 Nt-WareSys # NT-ware Systemprg GmbH 74:38:89 AnnaxAnzei # ANNAX Anzeigesysteme GmbH 74:56:12 MotorolaMo # Motorola Mobility, Inc. +74:5E:1C Pioneer # PIONEER CORPORATION 74:65:D1 Atlinks 74:6B:82 Movek # MOVEK 74:72:F2 ChipsipTec # Chipsip Technology Co., Ltd. @@ -17275,6 +17372,7 @@ 78:B8:1A InterSales # INTER SALES A/S 78:C4:0E H&DWireles # H&D Wireless 78:C6:BB Innovasic # Innovasic, Inc. +78:CA:04 Nokia # Nokia Corporation 78:CA:39 Apple 78:CD:8E SmcNetwork # SMC Networks Inc 78:D0:04 NeousysTec # Neousys Technology Inc. @@ -17297,6 +17395,7 @@ 7C:39:20 SsomaSecur # SSOMA SECURITY 7C:3B:D5 ImagoGroup # Imago Group 7C:3E:9D Patech +7C:4A:82 PortsmithL # Portsmith LLC 7C:4A:A8 MindtreeWi # MindTree Wireless PVT Ltd 7C:4F:B5 ArcadyanTe # Arcadyan Technology Corporation 7C:55:E7 Ysi # YSI, Inc. @@ -17336,8 +17435,11 @@ 80:3B:9A Ghe-CesEle # ghe-ces electronic ag 80:4F:58 Thinkeco # ThinkEco, Inc. 80:50:1B Nokia # Nokia Corporation +80:58:C5 NovatecKom # NovaTec Kommunikationstechnik GmbH +80:64:59 Nimbus # Nimbus Inc. 80:65:E9 Benq # BenQ Corporation 80:66:29 PrescopeTe # Prescope Technologies CO.,LTD. +80:6C:BC NetNewElec # NET New Electronic Technology GmbH 80:71:1F JuniperNet # Juniper Networks 80:7D:1B Neosystem # Neosystem Co. Ltd. 80:81:A5 TongqingCo # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd @@ -17398,13 +17500,17 @@ 88:B1:68 DeltaContr # Delta Control GmbH 88:B6:27 GembirdEur # Gembird Europe BV 88:BA:7F Qfiednet # Qfiednet Co., Ltd. +88:BF:D5 SimpleAudi # Simple Audio Ltd 88:C6:63 Apple # Apple Inc 88:DD:79 Voltaire 88:E0:A0 ShenzhenVi # Shenzhen VisionSTOR Technologies Co., Ltd 88:ED:1C CudoCommun # Cudo Communication Co., Ltd. +88:F0:77 Cisco # Cisco Systems 88:FD:15 Lineeye # LINEEYE CO., LTD +8C:11:CB AbusSecuri # ABUS Security-Center GmbH & Co. KG 8C:1F:94 RfSurgical # RF Surgical System Inc. 8C:27:8A Vocollect # Vocollect Inc +8C:44:35 ShanghaiBr # Shanghai BroadMobi Communication Technology Co., Ltd. 8C:4D:EA Cerio # Cerio Corporation 8C:51:05 ShenzhenIr # Shenzhen ireadygo Information Technology CO.,LTD. 8C:53:F7 A&DEnginee # A&D ENGINEERING CO., LTD. @@ -17412,6 +17518,7 @@ 8C:56:C5 Nintendo # Nintendo Co., Ltd. 8C:58:77 Apple # Apple, Inc. 8C:59:8B CTechnolog # C Technologies AB +8C:5C:A1 D-Broad # d-broad,INC 8C:5F:DF BeijingRai # Beijing Railway Signal Factory 8C:64:0B BsStoritve # BS Storitve d.o.o. 8C:64:22 SonyEricss # Sony Ericsson Mobile Communications AB @@ -17420,7 +17527,9 @@ 8C:7B:9D Apple 8C:7C:B5 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. 8C:7C:FF BrocadeCom # Brocade Communications Systems, Inc. +8C:82:A8 InsigmaTec # Insigma Technology Co.,Ltd 8C:84:01 Private +8C:89:A5 Micro-Star # Micro-Star INT'L CO., LTD 8C:90:D3 AlcatelLuc # Alcatel Lucent 8C:92:36 AusLinxTec # Aus.Linx Technology Co., Ltd. 8C:A0:48 BeijingNet # Beijing NeTopChip Technology Co.,LTD @@ -17432,6 +17541,7 @@ 8C:E7:B3 SonardyneI # Sonardyne International Ltd 8C:F9:C9 MesadaTech # MESADA Technology Co.,Ltd. 90:00:4E HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +90:09:17 Far-Sighte # Far-sighted mobile 90:18:AE ShanghaiMe # Shanghai Meridian Technologies, Co. Ltd. 90:19:00 ScsSa # SCS SA 90:21:55 Htc # HTC Corporation @@ -17452,10 +17562,14 @@ 90:7F:61 ChiconyEle # Chicony Electronics Co., Ltd. 90:84:0D Apple # Apple, Inc 90:88:A2 IonicsTech # IONICS TECHNOLOGY ME LTDA +90:8D:1D GhTechnolo # GH Technologies 90:90:3C TrisonTech # TRISON TECHNOLOGY CORPORATION +90:90:60 RsiVideoTe # RSI VIDEO TECHNOLOGIES 90:A2:DA GheoSa # GHEO SA 90:A4:DE WistronNew # Wistron Neweb Corp. 90:A7:C1 PakedgeDev # Pakedge Device and Software Inc. +90:B8:D0 Joyent # Joyent, Inc. +90:CF:15 Nokia # Nokia Corporation 90:D7:EB TexasInstr # Texas Instruments 90:D8:52 Comtec # Comtec Co., Ltd. 90:D9:2C Hug-Witsch # HUG-WITSCHI AG @@ -17477,7 +17591,10 @@ 94:5B:7E TrilobitLt # TRILOBIT LTDA. 94:81:A4 AzurayTech # Azuray Technologies 94:85:7A EvantageIn # Evantage Industries Corp +94:88:54 TexasInstr # Texas Instruments +94:8B:03 EagetInnov # EAGET Innovation and Technology Co., Ltd. 94:8D:50 BeamexOy # Beamex Oy Ab +94:8F:EE HughesTele # Hughes Telematics, Inc. 94:9C:55 AltaDataTe # Alta Data Technologies 94:A7:BC Bodymedia # BodyMedia, Inc. 94:AA:B8 JoviewBeij # Joview(Beijing) Technology Co. Ltd. @@ -17490,6 +17607,7 @@ 94:DD:3F A+VLinkTec # A+V Link Technologies, Corp. 94:E2:26 DOrtizCons # D. ORtiz Consulting, LLC 94:E7:11 XirkaDamaP # Xirka Dama Persada PT +94:E8:48 FyldeMicro # FYLDE MICRO LTD 94:F6:92 Geminico # Geminico co.,Ltd. 94:F7:20 TianjinDev # Tianjin Deviser Electronics Instrument Co., Ltd 94:FD:1D Wherewhen # WhereWhen Corp @@ -17499,11 +17617,15 @@ 98:0E:E4 Private 98:2C:BE 2wire 98:2D:56 Resolution # Resolution Audio +98:30:00 BeijingKem # Beijing KEMACOM Technologies Co., Ltd. 98:35:B8 AssembledP # Assembled Products Corporation +98:42:46 GemtekTech # Gemtek Technology Co., Ltd. +98:4B:4A MotorolaMo # Motorola Mobility Inc. 98:4B:E1 HewlettPac # Hewlett Packard 98:4E:97 StarlightM # Starlight Marketing (H. K.) Ltd. 98:59:45 TexasInstr # Texas Instruments 98:60:22 Emw # EMW Co., Ltd. +98:66:EA Industrial # Industrial Control Communications, Inc. 98:6D:C8 ToshibaMit # TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION 98:73:C4 SageElectr # Sage Electronic Engineering LLC 98:89:ED AnademInfo # Anadem Information Inc. @@ -17515,11 +17637,15 @@ 98:D8:8C NortelNetw # Nortel Networks 98:DC:D9 Unitec # UNITEC Co., Ltd. 98:E1:65 Accutome +98:EC:65 CosesyAps # Cosesy ApS 98:F5:37 Zte # zte corporation +98:F8:DB MariniImpi # Marini Impianti Industriali s.r.l. 98:FC:11 Cisco-Link # Cisco-Linksys, LLC 9C:18:74 NokiaDanma # Nokia Danmark A/S 9C:22:0E TascanServ # TASCAN Service GmbH 9C:28:BF Continenta # Continental Automotive Czech Republic s.r.o. +9C:31:B6 KuliteSemi # Kulite Semiconductor Products Inc +9C:41:7C HameTechno # Hame Technology Co., Limited 9C:45:63 DimepSiste # DIMEP Sistemas 9C:4A:7B Nokia # Nokia Corporation 9C:4E:20 Cisco # Cisco Systems @@ -17529,9 +17655,12 @@ 9C:5D:95 VtcElectro # VTC Electronics Corp. 9C:5E:73 CalibreUk # Calibre UK Ltd 9C:64:5E HarmanCons # Harman Consumer Group +9C:6A:BE QeesAps # QEES ApS. 9C:75:14 WildixSrl # Wildix srl 9C:77:AA Nadasnv 9C:80:7D SyscableKo # SYSCABLE Korea Inc. +9C:8E:99 HewlettPac # Hewlett Packard +9C:93:4E Xerox # Xerox Corporation 9C:95:F8 SmartdoorL # SmartDoor Systems, LLC 9C:AD:EF ObihaiTech # Obihai Technology, Inc. 9C:AF:CA Cisco # Cisco Systems @@ -17579,6 +17708,7 @@ A0:DE:05 Jsc"Irbis- # JSC "Irbis-T" A0:F2:17 GeMedicalS # GE Medical System(China) Co., Ltd. A4:0C:C3 Cisco # Cisco Systems +A4:13:4E LuxulWirel # Luxul Wireless A4:1B:C0 FastecImag # Fastec Imaging Corporation A4:21:8A NortelNetw # Nortel Networks A4:24:B3 FlatfrogLa # FlatFrog Laboratories AB @@ -17586,18 +17716,21 @@ A4:38:FC PlasticLog # Plastic Logic A4:50:55 BuswareDe # busware.de A4:56:1B Mcot # MCOT Corporation +A4:5A:1C Smart-Elec # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:67:06 Apple # Apple Inc A4:79:E4 Klinfo # KLINFO Corp A4:7A:A4 MotorolaMo # Motorola Mobility, Inc. A4:7C:1F GlobalMicr # Global Microwave Systems Inc. A4:85:6B QElectroni # Q Electronics Ltd +A4:99:81 FujianElit # FuJian Elite Power Tech CO.,LTD. A4:9B:13 BurroughsP # Burroughs Payment Systems, Inc. A4:A8:0F ShenzhenCo # Shenzhen Coship Electronics Co., Ltd. A4:AD:00 RagsdaleTe # Ragsdale Technology A4:AD:B8 VitecGroup # Vitec Group, Camera Dynamics Ltd A4:AE:9A MaestroWir # Maestro Wireless Solutions ltd. A4:B1:21 Arantia201 # Arantia 2010 S.L. +A4:B1:97 Apple # Apple, Inc. A4:B1:EE HZander # H. ZANDER GmbH & Co. KG A4:B2:A7 AdaxysSolu # Adaxys Solutions AG A4:BA:DB Dell # Dell Inc. @@ -17606,10 +17739,12 @@ A4:C2:AB HangzhouLe # Hangzhou LEAD-IT Information & Technology Co.,Ltd A4:D1:D1 EcotalityN # ECOtality North America A4:DA:3F Bionics # Bionics Corp. +A4:DB:2E KingspanEn # Kingspan Environmental Ltd A4:DE:50 TotalWalth # Total Walther GmbH A4:E3:2E Silicon&Am # Silicon & Software Systems Ltd. A4:E7:E4 Connex # Connex GmbH -A4:ED:4E MotorolaMo # Motorola Mobile Devices +A4:ED:4E MotorolaMo # Motorola Mobility, Inc. +A4:EE:57 SeikoEpson # SEIKO EPSON CORPORATION A8:1B:18 Xts # XTS CORP A8:39:44 ActiontecE # Actiontec Electronics, Inc A8:55:6A PocketnetT # Pocketnet Technology Inc. @@ -17645,13 +17780,16 @@ AA:00:04 DigitalEqu # DIGITAL EQUIPMENT CORPORATION AC:02:CF RwTecnolog # RW Tecnologia Industria e Comercio Ltda AC:06:13 Senselogix # Senselogix Ltd +AC:19:9F SungrowPow # SUNGROW POWER SUPPLY CO.,LTD. AC:20:AA Dmatek # DMATEK Co., Ltd. AC:2F:A8 Humannix # Humannix Co.,Ltd. AC:34:CB ShanhaiGbc # Shanhai GBCOM Communication Technology Co. Ltd AC:44:F2 Revolabs # Revolabs Inc +AC:47:23 Genelec AC:4F:FC Svs-Vistek # SVS-VISTEK GmbH AC:51:35 MpiTech # MPI TECH AC:58:3B HumanAssem # Human Assembler, Inc. +AC:5E:8C Utillink AC:61:23 Drivven # Drivven, Inc. AC:67:06 RuckusWire # Ruckus Wireless AC:6F:4F Enspert # Enspert Inc @@ -17662,6 +17800,7 @@ AC:83:F0 MagentaVid # Magenta Video Networks AC:86:74 OpenMesh # Open Mesh, Inc. AC:86:7E CreateNewT # Create New Technology (HK) Limited Company +AC:8A:CD RogerDWens # ROGER D.Wensker, G.Wensker sp.j. AC:93:2F Nokia # Nokia Corporation AC:9A:96 LantiqDeut # Lantiq Deutschland GmbH AC:9B:84 SmakTecnol # Smak Tecnologia e Automacao @@ -17669,6 +17808,7 @@ AC:AB:8D LyngsoMari # Lyngso Marine A/S AC:BE:75 UfineTechn # Ufine Technologies Co.,Ltd. AC:BE:B6 Visualedge # Visualedge Technology Co., Ltd. +AC:C9:35 Ness # Ness Corporation AC:CA:54 TelldusTec # Telldus Technologies AB AC:CA:BA Midokura # Midokura Co., Ltd. AC:CE:8F HwaYaoTech # HWA YAO TECHNOLOGIES CO., LTD @@ -17680,6 +17820,7 @@ AC:F9:7E Elesys # ELESYS INC. B0:1B:7C OntrolAS # Ontrol A.S. B0:38:29 Siliconwar # Siliconware Precision Industries Co., Ltd. +B0:48:7A Tp-LinkTec # TP-LINK TECHNOLOGIES CO., LTD. B0:51:8E HollTechno # Holl technology CO.Ltd. B0:5B:1F ThermoFish # THERMO FISHER SCIENTIFIC S.P.A. B0:65:63 ShanghaiRa # Shanghai Railway Communication Factory @@ -17688,6 +17829,7 @@ B0:90:74 FulanElect # Fulan Electronics Limited B0:91:34 Taleo B0:97:3A E-Fuel # E-Fuel Corporation +B0:99:28 Fujitsu # Fujitsu Limited B0:9A:E2 StemmerIma # STEMMER IMAGING GmbH B0:A1:0A Pivotal # Pivotal Systems Corporation B0:A7:2A EnsembleDe # Ensemble Designs, Inc. @@ -17708,6 +17850,7 @@ B4:28:F1 E-Prime # E-Prime Co., Ltd. B4:2A:39 OrbitMerre # ORBIT MERRET, spol. s r. o. B4:2C:BE DirectPaym # Direct Payment Solutions Limited +B4:35:F7 ZhejiangPe # Zhejiang Pearmain Electronics Co.ltd. B4:37:41 Consert # Consert, Inc. B4:39:D6 ProcurveNe # ProCurve Networking by HP B4:3D:B2 DegreaneHo # Degreane Horizon @@ -17715,10 +17858,12 @@ B4:4C:C2 NrElectric # NR ELECTRIC CO., LTD B4:52:53 SeagateTec # Seagate Technology B4:58:61 CremoteLlc # CRemote, LLC +B4:5C:A4 Thing-Talk # Thing-talk Wireless Communication Technologies Corporation Limited B4:74:9F AskeyCompu # askey computer corp B4:82:FE AskeyCompu # Askey Computer Corp B4:99:BA HewlettPac # Hewlett Packard B4:A4:E3 Cisco # Cisco Systems +B4:A5:A9 Modi # MODI GmbH B4:AA:4D Ensequence # Ensequence, Inc. B4:B0:17 Avaya # Avaya, Inc B4:B5:AF MinsungEle # Minsung Electronics @@ -17732,6 +17877,7 @@ B4:EE:D4 TexasInstr # Texas Instruments B4:F3:23 Petatel # PETATEL INC. B8:0B:9D RopexIndus # ROPEX Industrie-Elektronik GmbH +B8:3A:7B WorldplayC # Worldplay (Canada) Inc. B8:3D:4E ShenzhenCu # Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch B8:41:5F Asp # ASP AG B8:61:6F AcctonWire # Accton Wireless Broadband(AWB), Corp. @@ -17746,11 +17892,15 @@ B8:A3:E0 BenruiTech # BenRui Technology Co.,Ltd B8:A8:AF LogicSPA # Logic S.p.A. B8:AC:6F Dell # Dell Inc +B8:AF:67 HewlettPac # Hewlett Packard B8:B1:C7 Bt&Com # BT&COM CO.,LTD B8:BA:68 XiAnJizhon # Xi'an Jizhong Digital Communication Co.,Ltd B8:BA:72 Cynove B8:BE:BF Cisco # Cisco Systems +B8:C7:16 FiberhomeT # Fiberhome Telecommunication Technologies Co.,LTD +B8:C7:5D Apple # Apple Inc B8:D0:6F GuangzhouH # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE +B8:D4:9D MSevenSyst # M Seven System Ltd. B8:E5:89 PayterBv # Payter BV B8:E7:79 Private B8:EE:79 YwireTechn # YWire Technologies, Inc. @@ -17778,8 +17928,10 @@ BC:6A:16 Tdvine BC:6E:76 GreenEnerg # Green Energy Options Ltd BC:71:C1 Xtrillion # XTrillion, Inc. +BC:76:70 HuaweiDevi # Huawei Device Co., Ltd BC:77:37 IntelCorpo # Intel Corporate BC:7D:D1 RadioDataC # Radio Data Comms +BC:81:99 Basic # BASIC Co.,Ltd. BC:83:A7 ShenzhenCh # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT BC:99:BC FonseeTech # FonSee Technology Inc. BC:9D:A5 DascomEuro # DASCOM Europe GmbH @@ -17821,6 +17973,7 @@ C0:E4:22 TexasInstr # Texas Instruments C0:EA:E4 Sonicwall C0:F8:DA HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +C4:0F:09 HermesElec # Hermes electronic GmbH C4:10:8A RuckusWire # Ruckus Wireless C4:16:FA Prysm # Prysm Inc C4:17:FE HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. @@ -17828,6 +17981,7 @@ C4:1E:CE HmiSources # HMI Sources Ltd. C4:24:2E GalvanicAp # Galvanic Applied Sciences Inc C4:2C:03 Apple +C4:36:DA Rusteletec # Rusteletech Ltd. C4:3D:C7 Netgear C4:46:19 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. C4:4A:D0 FirefliesR # FIREFLIES RTLS @@ -17873,6 +18027,7 @@ C8:93:83 EmbeddedAu # Embedded Automation, Inc. C8:97:9F Nokia # Nokia Corporation C8:9C:1D Cisco # Cisco Systems +C8:9C:DC Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD. C8:A1:B6 ShenzhenLo # Shenzhen Longway Technologies Co., Ltd C8:A7:0A VerizonBus # Verizon Business C8:A7:29 Systronics # SYStronics Co., Ltd. @@ -17907,9 +18062,12 @@ CC:76:69 Seetech CC:7A:30 CmaxWirele # CMAX Wireless Co., Ltd. CC:7D:37 MotorolaMo # Motorola Mobility, Inc. +CC:7E:E7 PanasonicA # Panasonic AVC Networks Company CC:8C:E3 TexasInstr # Texas Instruments CC:96:A0 HuaweiDevi # Huawei Device Co., Ltd CC:9E:00 Nintendo # Nintendo Co., Ltd. +CC:AF:78 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +CC:B5:5A Fraunhofer # Fraunhofer ITWM CC:B8:88 AnbSecurit # AnB Securite s.a. CC:BE:71 OptilogixB # OptiLogix BV CC:C6:2B Tri-System # Tri-Systems Corporation @@ -17917,23 +18075,29 @@ CC:CD:64 Sm-Electro # SM-Electronic GmbH CC:CE:40 Janteq # Janteq Corp CC:D8:11 AiconnTech # Aiconn Technology Corporation +CC:D9:E9 ScrEnginee # SCR Engineers Ltd. CC:EA:1C Dconworks # DCONWORKS Co., Ltd CC:F3:A5 ChiMeiComm # Chi Mei Communication Systems, Inc CC:F6:7A AyeckaComm # Ayecka Communication Systems LTD CC:F8:41 Lumewave CC:FC:6D RizTransmi # RIZ TRANSMITTERS CC:FC:B1 WirelessTe # Wireless Technology, Inc. +D0:13:1E SunrexTech # Sunrex Technology Corp D0:15:4A Zte # zte corporation D0:1C:BB BeijingCti # Beijing Ctimes Digital Technology Co., Ltd. D0:27:88 HonHaiPrec # Hon Hai Precision Ind.Co.Ltd D0:37:61 TexasInstr # Texas Instruments D0:57:4C Cisco # Cisco Systems D0:58:75 ActiveCont # Active Control Technology Inc. +D0:5F:CE HitachiDat # Hitachi Data Systems +D0:66:7B SamsungEle # Samsung Electronics Co., LTD D0:75:BE RenoA&Amp; # Reno A&E D0:7D:E5 ForwardPay # Forward Pay Systems, Inc. D0:89:99 Apcon # APCON, Inc. D0:93:F8 Stonestree # Stonestreet One LLC +D0:9B:05 Emtronix D0:A3:11 NeubergerG # Neuberger Gebï¿½udeautomation GmbH +D0:AF:B6 LinktopTec # Linktop Technology Co., LTD D0:B3:3F ShenzhenTi # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD. D0:B5:3D SeproRobot # SEPRO ROBOTIQUE D0:BB:80 ShlTelemed # SHL Telemedicine International Ltd. @@ -17950,6 +18114,8 @@ D4:12:96 AnobitTech # Anobit Technologies Ltd. D4:1F:0C TviVisionO # TVI Vision Oy D4:28:B2 Iobridge # ioBridge, Inc. +D4:2C:3D SkyLightDi # Sky Light Digital Limited +D4:3A:E9 DongguanIp # DONGGUAN ipt INDUSTRIAL CO., LTD D4:3D:67 CarmaIndus # Carma Industries Inc. D4:4C:24 Vuppalamri # Vuppalamritha Magnetic Components LTD D4:4C:A7 Informtekh # Informtekhnika & Communication, LLC @@ -17973,6 +18139,7 @@ D4:9C:28 JaybirdGea # JayBird Gear LLC D4:9C:8E University # University of FUKUI D4:9E:6D WuhanZhong # Wuhan Zhongyuan Huadian Science & Technology Co., +D4:A4:25 SmaxTechno # SMAX Technology Co., Ltd. D4:A9:28 GreenwaveR # GreenWave Reality Inc D4:AA:FF MicroWorld # MICRO WORLD D4:C7:66 Acentic # Acentic GmbH @@ -17982,6 +18149,7 @@ D4:E3:2C SSiedleSoh # S. Siedle & Sohne D4:E8:B2 SamsungEle # Samsung Electronics D4:F0:27 NavetasEne # Navetas Energy Management +D4:F0:B4 NapcoSecur # Napco Security Technologies D4:F1:43 Iproad # IPROAD.,Inc D8:1B:FE Twinlinx # TWINLINX CORPORATION D8:1C:14 CompactaIn # Compacta International, Ltd. @@ -18001,7 +18169,9 @@ D8:76:0A Escort # Escort, Inc. D8:79:88 HonHaiPrec # Hon Hai Precision Ind. Co., Ltd. D8:95:2F TexasInstr # Texas Instruments +D8:97:3B EmersonNet # Emerson Network Power Embedded Power D8:9D:B9 EmegatechI # eMegatech International Corp. +D8:9E:3F Apple # Apple, Inc. D8:A2:5E Apple D8:AE:90 ItibiaTech # Itibia Technologies D8:B1:2A PanasonicM # Panasonic Mobile Communications Co., Ltd. @@ -18017,21 +18187,26 @@ D8:E7:2B OnpathTech # OnPATH Technologies D8:FE:8F Idfone # IDFone Co., Ltd. DC:02:65 MeditechKf # Meditech Kft +DC:05:ED Nabtesco # Nabtesco Corporation DC:07:C1 HangzhouQi # HangZhou QiYang Technology Co.,Ltd. +DC:16:A2 MedtronicD # Medtronic Diabetes DC:1D:9F UBTech # U & B tech DC:20:08 AsdElectro # ASD Electronics Ltd DC:2B:61 Apple DC:2B:66 Infoblock DC:2C:26 ItonTechno # Iton Technology Limited DC:33:50 Techsat # TechSAT GmbH +DC:3C:84 TicomGeoma # Ticom Geomatics, Inc. DC:49:C9 CascoSigna # CASCO SIGNAL LTD DC:4E:DE ShinyeiTec # SHINYEI TECHNOLOGY CO., LTD. DC:7B:94 Cisco # Cisco Systems DC:9B:1E Intercom # Intercom, Inc. DC:9C:52 SapphireTe # Sapphire Technology Limited. +DC:A6:BD BeijingLan # Beijing Lanbo Technology Co., Ltd. DC:A7:D9 Compressor # Compressor Controls Corp DC:A9:71 IntelCorpo # Intel Corporate DC:CB:A8 ExploraTec # Explora Technologies Inc +DC:CF:94 BeijingRon # Beijing Rongcheng Hutong Technology Co., Ltd. DC:D0:F7 Bentek # Bentek Systems Ltd. DC:D3:21 HumaxTld # HUMAX co.,tld DC:D8:7F ShenzhenJo # Shenzhen JoinCyber Telecom Equipment Ltd @@ -18078,9 +18253,11 @@ E0:E7:51 Nintendo # Nintendo Co., Ltd. E0:E8:E8 OliveTelec # Olive Telecommunication Pvt. Ltd E0:EE:1B PanasonicA # Panasonic Automotive Systems Company of America +E0:F2:11 Digitalwat # Digitalwatt E0:F3:79 Vaddio E0:F8:47 Apple # Apple Inc E2:0C:0F KingstonTe # Kingston Technologies +E4:12:89 TopsystemS # topsystem Systemhaus GmbH E4:1C:4B V2Technolo # V2 TECHNOLOGY, INC. E4:1F:13 Ibm # IBM Corp E4:27:71 Smartlabs @@ -18103,9 +18280,11 @@ E4:AD:7D SclElement # SCL Elements E4:CE:8F Apple # Apple Inc E4:D7:1D OrayaThera # Oraya Therapeutics +E4:DD:79 En-VisionA # En-Vision America, Inc. E4:E0:C5 SamsungEle # Samsung Electronics Co., LTD E4:EC:10 Nokia # Nokia Corporation E4:FF:DD ElectronIn # ELECTRON INDIA +E8:04:0B Apple # Apple Inc E8:04:62 Cisco # Cisco Systems E8:05:6D NortelNetw # Nortel Networks E8:06:88 Apple # Apple Inc. @@ -18129,8 +18308,12 @@ E8:9D:87 Toshiba E8:A4:C1 DeepSeaEle # Deep Sea Electronics PLC E8:B4:AE ShenzhenC& # Shenzhen C&D Electronics Co.,Ltd +E8:B7:48 Cisco # Cisco Systems +E8:BA:70 Cisco # Cisco Systems E8:BE:81 Sagemcom E8:C2:29 H-Displays # H-Displays (MSC) Bhd +E8:C3:20 AustcoComm # Austco Communication Systems Pty Ltd +E8:CC:32 Micronet # Micronet LTD E8:DA:AA VideohomeT # VideoHome Technology Corp. E8:DF:F2 Prf # PRF Co., Ltd. E8:E0:8F GravotechM # GRAVOTECH MARKING SAS @@ -18207,6 +18390,7 @@ F0:C2:7C MianyangNe # Mianyang Netop Telecom Equipment Co.,Ltd. F0:C8:8C Leddartech # LeddarTech Inc. F0:D7:67 AxemaPassa # Axema Passagekontroll AB +F0:DB:30 Yottabyte F0:DE:71 ShanghaiEd # Shanghai EDO Technologies Co.,Ltd. F0:DE:F1 WistronInf # Wistron InfoComm (Kunshan)Co F0:E5:C3 Draegerwer # Draegerwerk AG &amp; Co. KG aA @@ -18224,14 +18408,17 @@ F4:3E:9D BenuNetwor # Benu Networks, Inc. F4:42:27 SSResearch # S & S Research Inc. F4:45:ED PortableIn # Portable Innovation Technology Ltd. +F4:4E:FD ActionsSem # Actions Semiconductor Co.,Ltd.(Cayman Islands) F4:50:EB Telechips # Telechips Inc F4:55:95 Hengbao # HENGBAO Corporation LTD. F4:55:E0 NicewayCnc # Niceway CNC Technology Co.,Ltd.Hunan Province +F4:5F:D4 CiscoSpvtg # Cisco SPVTG F4:5F:F7 DqTechnolo # DQ Technology Inc. F4:63:49 Diffon # Diffon Corporation F4:6D:04 AsustekCom # ASUSTek COMPUTER INC. F4:76:26 Viltechmed # Viltechmeda UAB F4:9F:54 SamsungEle # Samsung Electronics +F4:A5:2A HawaTechno # Hawa Technologies Inc F4:AC:C1 Cisco # Cisco Systems F4:B5:49 YeastarTec # Yeastar Technology Co., Ltd. F4:C7:14 HuaweiDevi # Huawei Device Co., Ltd @@ -18243,9 +18430,11 @@ F4:E1:42 DeltaElekt # Delta Elektronika BV F4:EC:38 Tp-LinkTec # TP-LINK TECHNOLOGIES CO., LTD. F4:FC:32 TexasInstr # Texas Instruments +F8:03:32 Khomp F8:0F:41 WistronInf # Wistron InfoComm(ZhongShan) Corporation F8:0F:84 NaturalSec # Natural Security SAS F8:10:37 AtopiaLp # Atopia Systems, LP +F8:1D:93 LongdhuaBe # Longdhua(Beijing) Controls Technology Co.,Ltd F8:1E:DF Apple # Apple, Inc F8:47:2D X2genDigit # X2gen Digital Corp. Ltd F8:52:DF VnlEurope # VNL Europe AB @@ -18254,7 +18443,7 @@ F8:6E:CF Arcx # Arcx Inc F8:71:FE GoldmanSac # The Goldman Sachs Group, Inc. F8:76:9B Neopis # Neopis Co., Ltd. -F8:7B:7A MotorolaMo # Motorola Mobile Devices +F8:7B:7A MotorolaMo # Motorola Mobility, Inc. F8:7B:8C AmpedWirel # Amped Wireless F8:81:1A Overkiz F8:8D:EF Tenebraex @@ -18287,6 +18476,7 @@ FC:68:3E DirectedPe # Directed Perception, Inc FC:75:E6 Handreamne # Handreamnet FC:7C:E7 FciUsaLlc # FCI USA LLC +FC:83:29 TreiTechni # Trei technics FC:8E:7E PaceFrance # Pace France FC:A1:3E SamsungEle # Samsung Electronics FC:A8:41 Avaya # Avaya, Inc @@ -18306,7 +18496,7 @@ # # Well-known addresses. # -# $Id: manuf 36081 2011-02-27 17:04:32Z gerald $ +# $Id: manuf 36535 2011-04-10 16:04:37Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald [AT] wireshark.org>

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

@@ -1,7 +1,7 @@ ; ; wireshark.nsi ; -; $Id: wireshark.nsi 33496 2010-07-13 00:31:44Z gerald $ +; $Id: wireshark.nsi 36572 2011-04-12 00:10:16Z gerald $ ; Set the compression mechanism first. @@ -393,6 +393,9 @@ File "${GNUTLS_DIR}\bin\libgnutls-openssl-26.dll" File "${GNUTLS_DIR}\bin\libgpg-error-0.dll" File "${GNUTLS_DIR}\bin\libtasn1-3.dll" +StrCmp "${INTL_DLL}" "libintl-8.dll" SkipLibIntl8 +File "${GNUTLS_DIR}\bin\libintl-8.dll" +SkipLibIntl8: !endif !ifdef LUA_DIR File "${LUA_DIR}\lua5.1.dll"

@@ -16,7 +16,7 @@ * * Libpcap's pcap_dump() also doesn't return any error indications. * - * $Id: pcapio.c 28174 2009-04-27 09:58:09Z tuexen $ + * $Id: pcapio.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -182,7 +182,6 @@ } else { \ *error_pointer = 0; \ } \ - fclose(file_pointer); \ return FALSE; \ } \ written_length += (long)nwritten; \

@@ -14,7 +14,7 @@ PORT NUMBERS -(last updated 2011-02-24) +(last updated 2011-04-06) The port numbers are divided into three ranges: the Well Known Ports, the Registered Ports, and the Dynamic and/or Private Ports. @@ -2087,7 +2087,7 @@ # Carlisle Adams <Cadams&entrust.com> netconf-ssh 830/tcp NETCONF over SSH netconf-ssh 830/udp NETCONF over SSH -# [RFC4742] +# [RFC-ietf-netconf-rfc4742bis-08.txt] netconf-beep 831/tcp NETCONF over BEEP netconf-beep 831/udp NETCONF over BEEP # [RFC4744] @@ -2603,7 +2603,7 @@ # Vitali Fomine <info&winpopup-lan-messenger.com> November 2005 c1222-acse 1153/tcp ANSI C12.22 Port c1222-acse 1153/udp ANSI C12.22 Port -# [RFC-c1222-transport-over-ip-07.txt] +# [RFC6142] resacommunity 1154/tcp Community Service resacommunity 1154/udp Community Service # StÈphane MONS <stephane.mons&free.fr> September 2005 @@ -7594,7 +7594,7 @@ tksocket 2915/tcp TK Socket tksocket 2915/udp TK Socket # Previous contact: Alan Fahrner <alan&protix.com> -# Current contact: Alan Fahrner <afahrner&tickets.com> 13 March 2009 +# Current contact: Dino Ciano <DCiano&tickets.com> 02 March 2011 elvin_server 2916/tcp Elvin Server elvin_server 2916/udp Elvin Server elvin_client 2917/tcp Elvin Client @@ -11196,7 +11196,10 @@ pcoip 4172/tcp PC over IP pcoip 4172/udp PC over IP # Ken Unger <kunger&teradici.com> 23 December 2009 -# 4173-4174 Unassigned +# 4173 Unassigned +smcluster 4174/tcp StorMagic Cluster Services +# Chris Farey <chris_farey&stormagic.com> 09 March 2011 +# 4174/udp Reserved bccp 4175/tcp Brocade Cluster Communication Protocol # Norival Figueira <nfigueir&brocade.com> 07 April 2010 # 4175/udp Reserved @@ -12461,7 +12464,7 @@ # Bill Rettig <WRettig&efji.com> 19 May 2010 # 5221/udp Reserved xmpp-client 5222/tcp XMPP Client Connection -# [RFC-ietf-xmpp-3920bis-22.txt] +# [RFC6120] # 5222/udp Reserved hpvirtgrp 5223/tcp HP Virtual Machine Group Management hpvirtgrp 5223/udp HP Virtual Machine Group Management @@ -12480,7 +12483,13 @@ hpvroom 5228/tcp HP Virtual Room Service # Scott Levin <scott.levin&hp.com> 19 March 2009 # 5228/udp Reserved -# 5229-5233 Unassigned +# 5229-5231 Unassigned +csedaemon 5232/tcp Cruse Scanning System Service +# Christof J. Reetz <cjr&netplan.de> 09 March 2011 +# 5232/udp Reserved +enfs 5233/tcp Etinnae Network File Service +# Chris Peel <chrispeel.gsi&googlemail.com> 09 March 2011 +# 5233/udp Reserved eenet 5234/tcp EEnet communications eenet 5234/udp EEnet communications # Helmut Giritzer <helmut.giritzer&epluse.at> November 2005 @@ -12529,12 +12538,12 @@ # Abhay Rajaram <Abhay_Rajaram&3Com.com> March 2003 # 5266-5268 Unassigned xmpp-server 5269/tcp XMPP Server Connection -# [RFC-ietf-xmpp-3920bis-22.txt] +# [RFC6120] # 5269/udp Reserved xmp 5270/tcp Cartographer XMP xmp 5270/udp Cartographer XMP # Bobby Krupczak <rdk&krupczak.org> 03 April 2008 -cuelink 5271/tdp StageSoft CueLink messaging +cuelink 5271/tcp StageSoft CueLink messaging cuelink-disc 5271/udp StageSoft CueLink discovery # Todd Pichler <todd.pichler&stagesoft.com> 26 March 2010 pk 5272/tcp PK @@ -13150,7 +13159,7 @@ rfb 5900/tcp Remote Framebuffer rfb 5900/udp Remote Framebuffer # Tristan Richardson <iana&realvnc.com> March 2006 -# [RFC-levine-rfb-03.txt] +# [RFC6143] # 5901-5909 Unassigned cm 5910/tcp Context Management cm 5910/udp Context Management @@ -13713,7 +13722,14 @@ vision_elmd 6673/tcp vision_elmd vision_elmd 6673/udp vision_elmd # Chris Kramer <CKramer&gis.shl.com> -# 6674-6686 Unassigned +# 6674-6677 Unassigned +vfbp 6678/tcp Viscount Freedom Bridge Protocol +vfbp-disc 6678/udp Viscount Freedom Bridge Discovery +# Chris MacDonald <chris&viscount.com> 16 March 2011 +osaut 6679/tcp Osorno Automation +osaut 6679/udp Osorno Automation +# Peter Hombach <p.hombach&osorno.ca> 16 March 2011 +# 6680-6686 Unassigned clever-ctrace 6687/tcp CleverView for cTrace Message Service # David Cheng <davec&aesclever.com> 01 February 2010 # 6687/udp Reserved @@ -13726,7 +13742,7 @@ # 6690-6696 Unassigned # 6697/tcp Reserved babel 6697/udp Babel Routing Protocol -# [RFC-chroboczek-babel-routing-protocol-05.txt] +# [RFC6126] # 6698-6699 Unassigned # 6700 Unassigned (Removed 2010-01-26) kti-icad-srvr 6701/tcp KTI/ICAD Nameserver @@ -14018,7 +14034,11 @@ citrixuppg 7229/tcp Citrix UPP Gateway # Gary Barton <gary.barton&citrix.com> 24 February 2011 # 7229/udp Reserved -# 7230-7261 Unassigned +# 7230-7236 Unassigned +pads 7237/tcp PADS (Public Area Display System) Server +# Willie Jan Bons <WillieJan.Bons&nds.eu> 10 March 2011 +# 7237/udp Reserved +# 7238-7261 Unassigned cnap 7262/tcp Calypso Network Access Protocol cnap 7262/udp Calypso Network Access Protocol # Scott Halberg <eng&calypsosystems.com> 02 June 2009 @@ -14170,7 +14190,11 @@ sncp 7560/tcp Sniffer Command Protocol sncp 7560/udp Sniffer Command Protocol # Dominick Cafarelli <dominick.cafarelli&networkgeneral.com> August 2005 -# 7561-7565 Unassigned +# 7561-7562 Unassigned +cfw 7563/tcp Control Framework +# 7563/udp Reserved +# [RFC-ietf-mediactrl-sip-control-framework-12.txt] +# 7564-7565 Unassigned vsi-omega 7566/tcp VSI Omega vsi-omega 7566/udp VSI Omega # Curtis Smith <curtis.smith&vsin.com> @@ -15203,7 +15227,11 @@ ismserver 9500/tcp ismserver ismserver 9500/udp ismserver # Ian Gordon <iang&micromuse.co.uk> -# 9501-9534 Unassigned +# 9501-9521 Unassigned +# 9522/tcp Reserved +sma-spw 9522/udp SMA Speedwire +# SMA Solar Techology AG <thomas.weber&sma.de> 08 March 2011 +# 9523-9534 Unassigned mngsuite 9535/tcp Management Suite Remote Control mngsuite 9535/udp Management Suite Remote Control # Previous contact: Alan Butt <alan.butt&landesk.com> @@ -15571,7 +15599,8 @@ # 10809/udp Reserved # 10810/tcp Reserved nmc-disc 10810/udp Nuance Mobile Care Discovery -# Tim Shelton <tim.shelton&nuance.com> 02 August 2010 +# Previous contact: Tim Shelton <tim.shelton&nuance.com> 02 August 2010 +# Current contact: Gordon Waddell <gordon.waddell&nuance.com> 21 March 2011 # 10811-10859 Unassigned helix 10860/tcp Helix Client/Server helix 10860/udp Helix Client/Server @@ -15823,7 +15852,10 @@ dsmcc-ccp 13822/udp DSMCC Channel Change Protocol # Tim Addington <Tim.Addington&sciatl.com> # ISO/IEC 13818-6 MPEG-2 DSM-CC -# 13823-13928 Unassigned +bmdss 13823/tcp Blackmagic Design Streaming Server +# Sam Vaughan <samv&blackmagic-design.com> 01 March 2011 +# 13823/udp Reserved +# 13824-13928 Unassigned dta-systems 13929/tcp D-TA SYSTEMS dta-systems 13929/udp D-TA SYSTEMS # Alexis Bose <abose&d-ta.com> 08 December 2008 @@ -15884,7 +15916,11 @@ hydap 15000/tcp Hypack Data Aquisition hydap 15000/udp Hypack Data Aquisition # Mircea Neacsu <mircea&videotron.ca> -# 15001-15344 Unassigned +# 15001-15117 Unassigned +# 15118/tcp Reserved +v2g-secc 15118/udp v2g Supply Equipment Communication Controller Discovery Protocol +# Holger Lochner <holger.lochner&daimler.com> 06 April 2011 +# 15119-15344 Unassigned xpilot 15345/tcp XPilot Contact Port xpilot 15345/udp XPilot Contact Port # Bert Gijsbers <bert&xpilot.org> @@ -17011,15 +17047,12 @@ Transfer Part 3 (MTP3) - User Adaptation Layer (M3UA)", RFC 4666, September 2006. -[RFC4744] E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible - Exchange Protocol (BEEP)", RFC 4744, December 2006. - -[RFC4742] M. Wasserman and T. Goddard, "Using the NETCONF Configuration Protocol over - Secure Shell (SSH)", RFC 4742, December 2006. - [RFC4743] T. Goddard, "Using the Network Configuration Protocol (NETCONF) Over the Simple Object Access Protocol (SOAP)", RFC 4743, December 2006. +[RFC4744] E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible + Exchange Protocol (BEEP)", RFC 4744, December 2006. + [RFC4727] B. Fenner, "Experimental values In IPv4, IPv6, ICMPv4, ICMPv6, UDP and TCP Headers", RFC 4727, November 2006. @@ -17144,21 +17177,26 @@ [RFC6046] K. Moriarty and B. Trammell, "Transport of Real-time Inter-network Defense (RID) Messages", RFC 6045, November 2010. + +[RFC6120] P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", + RFC 6120, March 2011. -[RFC-c1222-transport-over-ip-07.txt] - A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", - RFC XXXX, Month Year. - -[RFC-levine-rfb-03.txt] - T. Richardson, J. Levine, "The Remote Framebuffer Protocol", RFC XXXX, - Month Year. +[RFC6142] A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", + RFC 6142, March 2011. + +[RFC6143] T. Richardson, J. Levine, "The Remote Framebuffer Protocol", RFC 6143, + March 2011. -[RFC-chroboczek-babel-routing-protocol-05.txt] - J. Chroboczek, "The Babel Routing Protocol", RFC XXXX, Month Year. +[RFC6126] J. Chroboczek, "The Babel Routing Protocol", RFC 6126, April 2011. -[RFC-ietf-xmpp-3920bis-22.txt] - P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", + +[RFC-ietf-mediactrl-sip-control-framework-12.txt] + C. Boulton, T. Melanchuk, S. McGlashan, "Media Control Channel Framework", RFC XXXX, Month Year. +[RFC-ietf-netconf-rfc4742bis-08.txt] + M. Wasserman, T. Goddard, "Using the NETCONF Configuration Protocol over + Secure Shell (SSH)", RFC XXXX, Month Year. + []

@@ -1,2 +1,2 @@ -#define SVNVERSION "SVN Rev 36110" +#define SVNVERSION "SVN Rev 36650" #define SVNPATH "/trunk-1.4"

@@ -3,7 +3,7 @@ * Copyright 2008 Vincenzo Condoleo, Christophe Dirac, Reto Ruoss * supported by HSR (Hochschule Rapperswil) * - * $Id: tap-comparestat.c 30176 2009-09-27 21:26:29Z stig $ + * $Id: tap-comparestat.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -516,8 +516,11 @@ gint start, stop,ttl, order, pos=0; gdouble variance; - if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf,%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ + if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ if(pos){ + if(*(optarg+pos)==',') + filter=optarg+pos+1; + else filter=optarg+pos; } else { filter=NULL;

@@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com> * - * $Id: text2pcap.c 33012 2010-05-28 20:19:55Z morriss $ + * $Id: text2pcap.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1075,7 +1075,7 @@ " -u <srcp>,<destp> prepend dummy UDP header with specified\n" " dest and source ports (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n" - " Example: -u 1000 69 to make the packets look like TFTP/UDP packets.\n" + " Example: -u 1000,69 to make the packets look like TFTP/UDP packets.\n" " -T <srcp>,<destp> prepend dummy TCP header with specified\n" " dest and source ports (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n"

@@ -1,8 +1,8 @@ #!/bin/bash -(shopt -s igncr) 2>/dev/null && shopt -s igncr; # hack to force this file to be processed by cygwin bash with -o igncr - # needed when this file is exec'd from win32-set.sh & win64-setup.sh +(set -o igncr) 2>/dev/null && set -o igncr; # hack to force this file to be processed by cygwin bash with -o igncr + # needed when this file is exec'd from win32-set.sh & win64-setup.sh # -# $Id: win-setup.sh 32614 2010-04-30 20:15:27Z wmeier $ +# $Id: win-setup.sh 36192 2011-03-14 16:49:01Z wmeier $ # This MUST be in the form # http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages

@@ -1,10 +1,10 @@ #!/bin/bash # -# $Id: win32-setup.sh 36076 2011-02-26 11:02:41Z jake $ +# $Id: win32-setup.sh 36572 2011-04-12 00:10:16Z gerald $ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-02-25-1.4" +export DOWNLOAD_TAG="2011-04-11-1.4" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/`

@@ -1,10 +1,10 @@ #!/bin/bash # -# $Id: win64-setup.sh 36076 2011-02-26 11:02:41Z jake $ +# $Id: win64-setup.sh 36572 2011-04-12 00:10:16Z gerald $ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-02-25-1.4" +export DOWNLOAD_TAG="2011-04-11-1.4" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/`

@@ -1,6 +1,6 @@ /* netscreen.c * - * $Id: netscreen.c 28471 2009-05-25 19:59:17Z sake $ + * $Id: netscreen.c 36571 2011-04-12 00:02:47Z gerald $ * * Juniper NetScreen snoop output parser * Created by re-using a lot of code from cosine.c @@ -322,7 +322,7 @@ return FALSE; } - return parse_netscreen_hex_dump(wth->random_fh, len, pd, err, err_info); + return (parse_netscreen_hex_dump(wth->random_fh, len, pd, err, err_info) != -1); } /* Parses a packet record header. There are a few possible formats:

[-] [+]	Changed	wireshark.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Apr 16 10:44:41 UTC 2011 - cs@linux-administrator.com + +- Update to version 1.4.5 + +------------------------------------------------------------------- Tue Mar 1 23:10:40 UTC 2011 - cs@linux-administrator.com - Update to version 1.4.4
[-] [+]	Changed	wireshark.spec ^
@@ -1,5 +1,5 @@ # -# spec file for package wireshark (Version 1.4.4) +# spec file for package wireshark (Version 1.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.4.4 +Version: 1.4.5 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/ChangeLog ^
@@ -1,750 +1,399 @@ ------------------------------------------------------------------------ -r35491 \| gerald \| 2011-01-11 15:07:11 -0800 (Tue, 11 Jan 2011) \| 2 lines +r36116 \| gerald \| 2011-03-01 14:22:20 -0800 (Tue, 01 Mar 2011) \| 2 lines Changed paths: + M /trunk-1.4/config.nmake + M /trunk-1.4/configure.in + M /trunk-1.4/debian/changelog M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/version.conf -Remove a link. +1.4.4 → 1.4.5. ------------------------------------------------------------------------ -r35553 \| gerald \| 2011-01-16 09:04:44 -0800 (Sun, 16 Jan 2011) \| 1 line +r36145 \| gerald \| 2011-03-06 09:04:40 -0800 (Sun, 06 Mar 2011) \| 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-01-16] +[Automatic manuf, services and enterprise-numbers update for 2011-03-06] ------------------------------------------------------------------------ -r35628 \| gerald \| 2011-01-23 09:04:46 -0800 (Sun, 23 Jan 2011) \| 1 line +r36184 \| gerald \| 2011-03-13 09:04:34 -0700 (Sun, 13 Mar 2011) \| 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-01-23] ------------------------------------------------------------------------- -r35635 \| gerald \| 2011-01-24 09:19:19 -0800 (Mon, 24 Jan 2011) \| 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Clear out old items. - ------------------------------------------------------------------------- -r35660 \| wmeier \| 2011-01-26 09:02:28 -0800 (Wed, 26 Jan 2011) \| 22 lines -Changed paths: - M /trunk-1.4/epan/dissectors/packet-ntlmssp.c - -Copy over revisions from trunk. - ------------------------------------------------------------------------- -r34018 \| morriss \| 2010-08-30 13:05:37 -0400 (Mon, 30 Aug 2010) \| 5 lines -Changed paths: - M /trunk/epan/dissectors/packet-ntlmssp.c - -Fix the crash reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5157 : - -If get_unicode_or_ascii_string() returns a NULL pointer, return a pointer to an -empty string back to our caller. - ------------------------------------------------------------------------- -r34300 \| wmeier \| 2010-09-30 17:32:42 -0400 (Thu, 30 Sep 2010) \| 3 lines -Changed paths: - M /trunk/epan/dissectors/packet-ntlmssp.c - -Fix some mangled comments (apparently mangled so that code could be commented out by an -enclosing comment). The code is now commented out with #if 0. - ------------------------------------------------------------------------- - +[Automatic manuf, services and enterprise-numbers update for 2011-03-13] ------------------------------------------------------------------------ -r35661 \| wmeier \| 2011-01-26 09:24:24 -0800 (Wed, 26 Jan 2011) \| 2 lines +r36189 \| wmeier \| 2011-03-14 08:28:57 -0700 (Mon, 14 Mar 2011) \| 2 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml -Clear out old entries from "Updated Protocols" & "Update Capture File Suport". +Clear out old items ... ------------------------------------------------------------------------ -r35662 \| wmeier \| 2011-01-26 10:05:22 -0800 (Wed, 26 Jan 2011) \| 2 lines +r36191 \| wmeier \| 2011-03-14 09:19:41 -0700 (Mon, 14 Mar 2011) \| 15 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/gtk/new_packet_list.c + M /trunk-1.4/gtk/packet_list_store.c + M /trunk-1.4/gtk/packet_list_store.h -Update release notes re NTLMSSP fixes. +Copy over r36180 manually: ------------------------------------------------------------------------ -r35701 \| gerald \| 2011-01-30 09:06:15 -0800 (Sun, 30 Jan 2011) \| 1 line -Changed paths: - M /trunk-1.4/epan/enterprise-numbers - M /trunk-1.4/manuf +r36180 \| wmeier \| 2011-03-12 14:02:24 -0500 (Sat, 12 Mar 2011) \| 7 lines -[Automatic manuf, services and enterprise-numbers update for 2011-01-30] +Fix bug #5189: Wireshark crashes when cancelling a large sort operation. +Essentially: Don't try to sort if the pre-requisite "columnization" step is stopped + via the progressbar dialog window before the step completes. +Also: Fix a (very) minor bug wherein the sort-indicator not always cleared on the + "previous column" when "No Sorting" was selected from a column context menu. +Also: Do minor code, comments & whitespace cleanup. ------------------------------------------------------------------------ -r35792 \| gerald \| 2011-02-03 14:53:50 -0800 (Thu, 03 Feb 2011) \| 16 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/tshark.c - M /trunk-1.4/wiretap/pcapng.c -Copy over r35791 from the trunk. +Update release notes. ------------------------------------------------------------------------ -r35791 \| gerald \| 2011-02-03 14:50:49 -0800 (Thu, 03 Feb 2011) \| 5 lines -Changed paths: - M /trunk/tshark.c - M /trunk/wiretap/pcapng.c - -From Huzaifa Sidhpurwala of the Red Hat Security Response Team: Don't -free uninitialized memory. - -See also: bug 5652. ------------------------------------------------------------------------- - -Update the release notes. - ------------------------------------------------------------------------- -r35794 \| gerald \| 2011-02-03 14:56:46 -0800 (Thu, 03 Feb 2011) \| 2 lines +r36192 \| wmeier \| 2011-03-14 09:49:01 -0700 (Mon, 14 Mar 2011) \| 20 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/tools/win-setup.sh -Update revision numbers. - ------------------------------------------------------------------------- -r35798 \| morriss \| 2011-02-03 18:15:16 -0800 (Thu, 03 Feb 2011) \| 8 lines -Changed paths: - M /trunk-1.4/wiretap/pcapng.c - -Copy over revision from trunk: - ------------------------------------------------------------------------- -r35796 \| morriss \| 2011-02-03 21:08:47 -0500 (Thu, 03 Feb 2011) \| 1 line - -Use g_strdup() instead of strdup() - - ------------------------------------------------------------------------- -r35802 \| guy \| 2011-02-03 18:28:11 -0800 (Thu, 03 Feb 2011) \| 12 lines -Changed paths: - M /trunk-1.4/wiretap/pcapng.c - -Copy over revision from trunk: - ------------------------------------------------------------------------- -r35800 \| guy \| 2011-02-03 18:24:33 -0800 (Thu, 03 Feb 2011) \| 7 lines - -Put more data into the "additional error information" messages. - -Get rid of debugging printouts that are equivalent to the "additional -error information" messages. - -Return additional error info for all WTAP_ERR_BAD_RECORD errors. - ------------------------------------------------------------------------- -r35812 \| guy \| 2011-02-04 02:21:50 -0800 (Fri, 04 Feb 2011) \| 7 lines -Changed paths: - M /trunk-1.4/wiretap/k12.c - -Copy over revision from trunk: +Copy over r35788 from trunk: ------------------------------------------------------------------------ -r35809 \| guy \| 2011-02-04 01:45:39 -0800 (Fri, 04 Feb 2011) \| 2 lines +r35788 \| wmeier \| 2011-02-03 14:33:48 -0500 (Thu, 03 Feb 2011) \| 12 lines -Set the error code and additional information string in more cases. +Fix: Cygwin make fails after updating to bash v 4.1.9.2 ------------------------------------------------------------------------- -r35826 \| gerald \| 2011-02-04 08:24:32 -0800 (Fri, 04 Feb 2011) \| 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml +Extracts from the cygwin Bash 4.1.9.2 release announcement: -Add a CVE ID. +4a. For a single affected script, add this line just after the she-bang: + (set -o igncr) 2>/dev/null && set -o igncr; # comment is needed ------------------------------------------------------------------------- -r35833 \| etxrab \| 2011-02-05 04:20:47 -0800 (Sat, 05 Feb 2011) \| 8 lines -Changed paths: - M /trunk-1.4/asn1/ansi_map/ansi_map.asn - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-ansi_map.c +4e. bash-4.1.9-1 dropped support for 'shopt -s igncr'; -Log: - Copy over revision from trunk: - - ------------------------------------------------------------------------ -35556 \|etxrab \|Sun Jan 16 18:36:17 2011 UTC - - From Porus Mehta: -Corrections to ANSI MAP ASN.1 specifications. +I'm assuming this is backwards compatible; If not, we'll know quite shortly :) ------------------------------------------------------------------------ -r35835 \| etxrab \| 2011-02-05 06:49:12 -0800 (Sat, 05 Feb 2011) \| 9 lines -Changed paths: - M /trunk-1.4/asn1/ansi_map/packet-ansi_map-template.c - M /trunk-1.4/asn1/ansi_map/packet-ansi_map-template.h - M /trunk-1.4/asn1/ansi_tcap/packet-ansi_tcap-template.c - M /trunk-1.4/epan/dissectors/packet-ansi_map.c - M /trunk-1.4/epan/dissectors/packet-ansi_map.h - M /trunk-1.4/epan/dissectors/packet-ansi_tcap.c -Copy ower: -http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35822 +Update release notes -User: etxrab -Date: 2011/02/04 08:13 AM -Log: - Introduce preferences to set the strictness of Invoke/response - tracking. ------------------------------------------------------------------------ -r35838 \| gerald \| 2011-02-06 09:04:41 -0800 (Sun, 06 Feb 2011) \| 1 line +r36217 \| gerald \| 2011-03-20 09:04:43 -0700 (Sun, 20 Mar 2011) \| 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-02-06] ------------------------------------------------------------------------- -r35857 \| gerald \| 2011-02-07 11:39:56 -0800 (Mon, 07 Feb 2011) \| 5 lines -Changed paths: - M /trunk-1.4/wiretap/pcapng.c - -Check for a large packet_len. Fixes a bug reported by Huzaifa -Sidhpurwala of the Red Hat Security Response Team. - -See also: bug 5661. - ------------------------------------------------------------------------- -r35859 \| gerald \| 2011-02-07 11:43:07 -0800 (Mon, 07 Feb 2011) \| 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Update the release notes. - ------------------------------------------------------------------------- -r35925 \| gerald \| 2011-02-11 16:07:21 -0800 (Fri, 11 Feb 2011) \| 2 lines -Changed paths: - M /trunk-1.4/config.nmake - -Check for Python 2.7. - ------------------------------------------------------------------------- -r35932 \| gerald \| 2011-02-12 09:57:26 -0800 (Sat, 12 Feb 2011) \| 2 lines -Changed paths: - M /trunk-1.4/packaging/portableapps/win32/makefile.nmake - -Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash. - +[Automatic manuf, services and enterprise-numbers update for 2011-03-20] ------------------------------------------------------------------------ -r35941 \| gerald \| 2011-02-13 09:04:45 -0800 (Sun, 13 Feb 2011) \| 1 line +r36371 \| gerald \| 2011-03-27 09:04:28 -0700 (Sun, 27 Mar 2011) \| 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf + M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-02-13] +[Automatic manuf, services and enterprise-numbers update for 2011-03-27] ------------------------------------------------------------------------ -r36014 \| gerald \| 2011-02-20 09:04:17 -0800 (Sun, 20 Feb 2011) \| 1 line +r36438 \| gerald \| 2011-04-03 09:04:45 -0700 (Sun, 03 Apr 2011) \| 1 line Changed paths: M /trunk-1.4/epan/enterprise-numbers M /trunk-1.4/manuf M /trunk-1.4/services -[Automatic manuf, services and enterprise-numbers update for 2011-02-20] ------------------------------------------------------------------------- -r36024 \| jake \| 2011-02-21 14:00:45 -0800 (Mon, 21 Feb 2011) \| 2 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Clean up the release notes. - +[Automatic manuf, services and enterprise-numbers update for 2011-04-03] ------------------------------------------------------------------------ -r36027 \| jake \| 2011-02-22 11:42:40 -0800 (Tue, 22 Feb 2011) \| 2 lines +r36535 \| gerald \| 2011-04-10 09:04:37 -0700 (Sun, 10 Apr 2011) \| 1 line Changed paths: - M /trunk-1.4/docbook/release-notes.xml - -Fix the cleanup. - ------------------------------------------------------------------------- -r36030 \| jake \| 2011-02-22 23:23:36 -0800 (Tue, 22 Feb 2011) \| 30 lines -Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-bittorrent.c - M /trunk-1.4/epan/dissectors/packet-dtpt.c - M /trunk-1.4/epan/dissectors/packet-quake.c - M /trunk-1.4/epan/wslua/wslua_pinfo.c - -Copy over revisions from the trunk: - ------------------------------------------------------------------------- -r33136 \| wmeier \| 2010-06-07 18:32:21 +0200 (Mon, 07 Jun 2010) \| 3 lines -Changed paths: - M /trunk/epan/dissectors/packet-bittorrent.c - M /trunk/epan/dissectors/packet-dtpt.c - M /trunk/epan/dissectors/packet-quake.c - -Use find_or_create_conversation() rather than only conversation_new(). -Fixes bug #2907: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ------------------------------------------------------------------------- -r34618 \| stig \| 2010-10-22 08:47:00 +0200 (Fri, 22 Oct 2010) \| 4 lines -Changed paths: - M /trunk/epan/wslua/wslua_pinfo.c - -From Regis Cridlig via bug 5326: -The Lua text string passed to column:set(text) by a dissector will eventually -be reclaimed. This causes the column to display incorrect characters. ------------------------------------------------------------------------- -r35795 \| jake \| 2011-02-04 00:17:31 +0100 (Fri, 04 Feb 2011) \| 5 lines -Changed paths: - M /trunk/epan/wslua/wslua_pinfo.c - -From David Carne: -col_set_str simply stores the pointer passed to it, and luaL_checkstring -returns a temporary pointer. Changing col_set_str to col_add_str in -Columns_newindex seems to fix the issue. ------------------------------------------------------------------------- + M /trunk-1.4/epan/enterprise-numbers + M /trunk-1.4/manuf + M /trunk-1.4/services +[Automatic manuf, services and enterprise-numbers update for 2011-04-10] ------------------------------------------------------------------------ -r36036 \| gerald \| 2011-02-23 13:49:51 -0800 (Wed, 23 Feb 2011) \| 3 lines +r36570 \| gerald \| 2011-04-11 16:18:27 -0700 (Mon, 11 Apr 2011) \| 20 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-6lowpan.c + M /trunk-1.4/epan/dissectors/packet-nfs.c -Paul Makowski discovered that 32 bit systems could crash while reading a -malformed 6LoWPAN packet. +Copy over r34115 from the trunk: ------------------------------------------------------------------------ -r36038 \| gerald \| 2011-02-23 15:05:41 -0800 (Wed, 23 Feb 2011) \| 2 lines +r34115 \| gerald \| 2010-09-14 08:43:19 -0700 (Tue, 14 Sep 2010) \| 12 lines Changed paths: - M /trunk-1.4/docbook/release-notes.xml + M /trunk/epan/dissectors/packet-nfs.c -Fix attribution. - ------------------------------------------------------------------------- -r36041 \| etxrab \| 2011-02-23 22:17:25 -0800 (Wed, 23 Feb 2011) \| 1 line -Changed paths: - M /trunk-1.4/epan/dissectors/packet-isup.c +From Cal Turney via bug 5209: -Register the BICC dissector by name. +Decode of SETCLIENTID calls in the Windows x86 version fail with "[Dissector +bug, protocol NFS: STATUS_ACCESS_VIOLATION: dissector accessed an invalid +memory address]". This error occurs in packet-nfs.c in +dissect_nfs_clientaddr4() where vars 'protocol' and 'universal_ip_address' get +stepped on following the call to scanf(). The b1-b10 vars are declared as +quint8. While "hh" modifier used in the scanf() is documented in Linux to +correspond to an a signed/unsigned char arg, I cannot find a similar +designation in Windows (MSDN). The Windows C compiler interprets %hhu as +corresponding to a int16 rather than int8. ------------------------------------------------------------------------ -r36043 \| etxrab \| 2011-02-23 22:23:54 -0800 (Wed, 23 Feb 2011) \| 1 line -Changed paths: - M /trunk-1.4/diameter/dictionary.xml -Update Diameter files. ------------------------------------------------------------------------ -r36046 \| jake \| 2011-02-23 23:50:30 -0800 (Wed, 23 Feb 2011) \| 61 lines +r36571 \| gerald \| 2011-04-11 17:02:47 -0700 (Mon, 11 Apr 2011) \| 117 lines Changed paths: - M /trunk-1.4/asn1/snmp/packet-snmp-template.c + M /trunk-1.4/asn1/ldap/ldap.cnf + M /trunk-1.4/capinfos.c + M /trunk-1.4/docbook/check_svn_version.sh M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/addr_resolv.c - M /trunk-1.4/epan/dfilter/semcheck.c - M /trunk-1.4/epan/dissectors/packet-p_mul.c - M /trunk-1.4/epan/dissectors/packet-snmp.c - M /trunk-1.4/epan/oids.c - M /trunk-1.4/gtk/main_proto_draw.c + M /trunk-1.4/epan/dissectors/packet-ldap.c + M /trunk-1.4/epan/dissectors/packet-mysql.c + M /trunk-1.4/epan/dissectors/packet-sflow.c + M /trunk-1.4/epan/dissectors/packet-ssl-utils.c + M /trunk-1.4/epan/dissectors/packet-tcp.c + M /trunk-1.4/epan/libwireshark.def + M /trunk-1.4/gtk/compare_stat.c + M /trunk-1.4/pcapio.c + M /trunk-1.4/tap-comparestat.c + M /trunk-1.4/text2pcap.c + M /trunk-1.4/wiretap/netscreen.c Copy over revisions from the trunk: ------------------------------------------------------------------------ -r35583 \| sfisher \| 2011-01-19 18:58:53 +0100 (Wed, 19 Jan 2011) \| 5 lines +r36160 \| cmaynard \| 2011-03-07 13:58:30 -0800 (Mon, 07 Mar 2011) \| 6 lines Changed paths: - M /trunk/gtk/main_proto_draw.c + M /trunk/tap-comparestat.c +Allow <interval> to be successfully sscanf'd no matter the locale for the +decimal symbol. Similar to the fix made to tap-iostat.c to resolve bug 2880. -From Cal Turney via bug #5585: When searching in packet bytes, the field and -bytes are not immediately shown. +Motivated by the discussion started from this thread on the user list: +http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html ------------------------------------------------------------------------ -r35594 \| jake \| 2011-01-20 09:58:03 +0100 (Thu, 20 Jan 2011) \| 2 lines +r36162 \| sake \| 2011-03-08 03:26:34 -0800 (Tue, 08 Mar 2011) \| 3 lines Changed paths: - M /trunk/asn1/snmp/packet-snmp-template.c - M /trunk/epan/dissectors/packet-snmp.c + M /trunk/epan/dissectors/packet-tcp.c -Allow for expert items to be actually attached somewhere. +Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used ------------------------------------------------------------------------ -r35599 \| jake \| 2011-01-20 21:04:39 +0100 (Thu, 20 Jan 2011) \| 2 lines +r36166 \| cmaynard \| 2011-03-08 06:57:38 -0800 (Tue, 08 Mar 2011) \| 3 lines Changed paths: - M /trunk/epan/oids.c + M /trunk/gtk/compare_stat.c -Allow presentation of Gauge32 values larger than 0x7FFFFFFF. +Allow <variance> to be successfully sscanf'd no matter the locale for the +decimal symbol. Same change and reason as for revision 36160. ------------------------------------------------------------------------ -r35621 \| morriss \| 2011-01-22 16:15:51 +0100 (Sat, 22 Jan 2011) \| 14 lines +r36174 \| wmeier \| 2011-03-08 16:43:49 -0800 (Tue, 08 Mar 2011) \| 6 lines Changed paths: - M /trunk/epan/dfilter/semcheck.c - -From Johannes Lange via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5606 : + M /trunk/epan/dissectors/packet-ssl-utils.c -In semcheck.c the display filter string of an expression is checked against the -header_field_info.display value BASE_CUSTOM. But the value of BASE_CUSTOM is -applied as bitmask while the actual type is an enum (BASE_CUSTOM = 6). +Check that imported private key is RSA; Prevents a crash. -With this BASE_DEC, BASE_DEC_HEX and BASE_HEX_DEC are also matching and are not -accepted as filter expression. +Fixes Bug #5662 - -Actually: BASE_DEC works but not BASE_HEX. And the problem only shows up when -trying to match a field in one of these bases against a string (from a -value_string). +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662 ------------------------------------------------------------------------ -r35626 \| stig \| 2011-01-22 19:07:28 +0100 (Sat, 22 Jan 2011) \| 6 lines +r36177 \| cmaynard \| 2011-03-11 17:32:35 -0800 (Fri, 11 Mar 2011) \| 2 lines Changed paths: - M /trunk/epan/dissectors/packet-p_mul.c - -Ensure we keep the pkg_data pointer for the init routine to cleanup correctly, -because the ep memory is cleared before the init routine is called. + M /trunk/epan/dissectors/packet-sflow.c -Fixed the variable name for the no_yes true_false_string. -Update reference to protocol description. +Handle PPP in HDLC framing. Fixes bug 5746. ------------------------------------------------------------------------ -r35651 \| jake \| 2011-01-25 23:11:59 +0100 (Tue, 25 Jan 2011) \| 4 lines +r36178 \| sfisher \| 2011-03-11 18:06:25 -0800 (Fri, 11 Mar 2011) \| 6 lines Changed paths: - M /trunk/epan/addr_resolv.c - -Fix fo bug 5615: -Remove the filters on IPv6 Link Local and Multicast addresses, since -these _can_ be resolved through the hosts file and manual entry. ------------------------------------------------------------------------- + M /trunk/epan/dissectors/packet-sflow.c +Improve r36177 per Guy's suggestion at bug #5746 to always call the +PPP-over-HDLC dissector since it will do the check for us to see if +the HDLC framing is present or not. ------------------------------------------------------------------------ -r36050 \| gerald \| 2011-02-24 10:37:21 -0800 (Thu, 24 Feb 2011) \| 12 lines +r36226 \| wmeier \| 2011-03-21 10:07:18 -0700 (Mon, 21 Mar 2011) \| 4 lines Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/wiretap/dct3trace.c + M /trunk/pcapio.c -Copy over r35953 from the trunk: +Don't close file handle if a file write error; (caller does the close) +Fixes "USE_AFTER_FREE" defect reported by Coverity Prevent. ------------------------------------------------------------------------ -r35953 \| gerald \| 2011-02-15 16:42:06 -0800 (Tue, 15 Feb 2011) \| 2 lines +r36232 \| sake \| 2011-03-21 15:04:22 -0700 (Mon, 21 Mar 2011) \| 3 lines Changed paths: - M /trunk/wiretap/dct3trace.c + M /trunk/wiretap/netscreen.c -Fix a buffer overflow found by the Visual C++ analyzer. +Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off). ------------------------------------------------------------------------ - -Update the release notes. - ------------------------------------------------------------------------- -r36053 \| gerald \| 2011-02-24 12:07:11 -0800 (Thu, 24 Feb 2011) \| 27 lines +r36470 \| etxrab \| 2011-04-04 22:50:45 -0700 (Mon, 04 Apr 2011) \| 3 lines Changed paths: - M /trunk-1.4/asn1/ldap/packet-ldap-template.c - M /trunk-1.4/asn1/ldap/packet-ldap-template.h - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-dns.c - M /trunk-1.4/epan/dissectors/packet-dns.h - M /trunk-1.4/epan/dissectors/packet-ldap.c - M /trunk-1.4/epan/dissectors/packet-ldap.h - M /trunk-1.4/epan/dissectors/packet-smb-common.c - M /trunk-1.4/epan/dissectors/packet-smb-common.h - M /trunk-1.4/epan/dissectors/packet-smb-logon.c - -Copy over r36029 with manual assistance: + M /trunk/capinfos.c +From Jose Pedro Oliveira: +#ifdef HAVE_LIBGCRYPT block includes a line too many. +https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5803 ------------------------------------------------------------------------ -r36029 \| gerald \| 2011-02-22 16:51:02 -0800 (Tue, 22 Feb 2011) \| 9 lines +r36471 \| tuexen \| 2011-04-05 07:28:33 -0700 (Tue, 05 Apr 2011) \| 3 lines Changed paths: - M /trunk/asn1/ldap/packet-ldap-template.c - M /trunk/asn1/ldap/packet-ldap-template.h - M /trunk/epan/dissectors/packet-dns.c - M /trunk/epan/dissectors/packet-dns.h - M /trunk/epan/dissectors/packet-ldap.c - M /trunk/epan/dissectors/packet-ldap.h - M /trunk/epan/dissectors/packet-smb-common.c - M /trunk/epan/dissectors/packet-smb-common.h - M /trunk/epan/dissectors/packet-smb-logon.c - -Split get_dns_name() into get_dns_name() and expand_dns_name(). - -In dissect_ms_compressed_string() dissect_mscldap_string() simply call -expand_dns_name() instead of using duplicate (and insecure) code. This -might break CLDAP and SMB dissection. If that's the case we should -probably revert get_dns_name() and simplify expand_dns_name(). - -Fixes infinite recursion errors found by joernchen of Phenoelit. ------------------------------------------------------------------------- - -Update the release notes. + M /trunk/text2pcap.c +Fix a typo in the help message. +Reported by Matthias Wellmeyer. ------------------------------------------------------------------------ -r36056 \| jake \| 2011-02-24 14:12:02 -0800 (Thu, 24 Feb 2011) \| 55 lines +r36498 \| sfisher \| 2011-04-06 09:34:45 -0700 (Wed, 06 Apr 2011) \| 5 lines Changed paths: - M /trunk-1.4/cmake/modules/FindGTK2.cmake - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-dcm.c - M /trunk-1.4/epan/dissectors/packet-dhcpv6.c - M /trunk-1.4/epan/dissectors/packet-hip.c - M /trunk-1.4/epan/dissectors/packet-lldp.c - M /trunk-1.4/gtk/voip_calls.c - -Copy over revisions from the trunk: - ------------------------------------------------------------------------- -r35686 \| sfisher \| 2011-01-28 01:20:37 +0100 (Fri, 28 Jan 2011) \| 7 lines -Changed paths: - M /trunk/epan/dissectors/packet-dhcpv6.c - + M /trunk/docbook/check_svn_version.sh -Fix bug #5627: DHCPv6 dissector formats DUID_LLT time incorrectly - -Add 30 years of seconds, not 20 years, since the DHCP_LLT time is seconds -since Jan 1 2000 and epoch is 30 years before that. +From Peter via bug #5798: Don't try to run svnversion if it isn't +executable. ------------------------------------------------------------------------ -r35726 \| wmeier \| 2011-01-31 19:58:38 +0100 (Mon, 31 Jan 2011) \| 8 lines +r36554 \| cmaynard \| 2011-04-11 06:44:31 -0700 (Mon, 11 Apr 2011) \| 2 lines Changed paths: - M /trunk/epan/dissectors/packet-dcm.c - M /trunk/gtk/voip_calls.c - -Fix two cases of 'if (x = y)' which should be 'if (x == y)'. + M /trunk/epan/libwireshark.def -Found by reviewing msvc level 4 warnings "assignment within conditional expression". - -(Unfortunately most of the warnings are false positives so this warning can't be enabled) +Add proto_field_is_referenced. Fixes bug 5816. ------------------------------------------------------------------------ -r35737 \| jake \| 2011-01-31 23:31:05 +0100 (Mon, 31 Jan 2011) \| 7 lines -Changed paths: - M /trunk/epan/dissectors/packet-lldp.c -From Johan Kristell: -In the standard 802.3at-2009 the PoE+ TLVs are 12 bytes long, but in the -earlier version 802.3bc-2009, they are 7 bytes long (the power type/ -source/priority, and the requested and allocated fields are lacking). -Not respecting the length of the TLV leads to wireshark displaying garbage -data and could lead to reading outside of buffer. ------------------------------------------------------------------------- -r35777 \| jake \| 2011-02-03 07:32:35 +0100 (Thu, 03 Feb 2011) \| 8 lines -Changed paths: - M /trunk/epan/dissectors/packet-hip.c -From Samu Varjonen: -This patch fixes four issues with the Host Identity Protocol (HIP dissector: +Copy over with manual intervenion: -1. The incorrect parsing of the "type 1" locator of HIP. -2. Updates the comments to reflect the approval of RFC 5770. -3. Cosmetic change (uppercase SPI) -4. Change in the checksum dissection - (when the HIP packet is UDP encapsulated 0 checksum is correct). ------------------------------------------------------------------------ -r35888 \| jake \| 2011-02-09 08:43:34 +0100 (Wed, 09 Feb 2011) \| 2 lines +r36190 \| gerald \| 2011-03-14 09:00:51 -0700 (Mon, 14 Mar 2011) \| 2 lines Changed paths: - M /trunk/cmake/modules/FindGTK2.cmake - -Accommodate the CMake build on Ubuntu 10.10. ------------------------------------------------------------------------- + M /trunk/asn1/ldap/ldap.cnf + M /trunk/epan/dissectors/packet-ldap.c +Properly initialize our filter counters. ------------------------------------------------------------------------ -r36057 \| gerald \| 2011-02-24 15:10:30 -0800 (Thu, 24 Feb 2011) \| 37 lines +r36330 \| morriss \| 2011-03-25 08:45:37 -0700 (Fri, 25 Mar 2011) \| 8 lines Changed paths: - M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-gsm_a_gm.c - M /trunk-1.4/epan/dissectors/packet-gtp.c - M /trunk-1.4/epan/tfs.c - M /trunk-1.4/epan/tfs.h - M /trunk-1.4/gtk/capture_dlg.c + M /trunk/epan/dissectors/packet-tcp.c -Copy over revisions from the trunk: +Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785#c14 : +If we thought we finished reassembly (and called the subdissector) only to find +out that the subdissector asked for more data, handle the case where the +subdissector asked for DESEGMENT_UNTIL_FIN. Previously we only handled the +possibility that the subdissector would ask for a specific number of bytes or +DESEGMENT_ONE_MORE_SEGMENT. ------------------------------------------------------------------------ -r35596 \| etxrab \| 2011-01-20 05:19:26 -0800 (Thu, 20 Jan 2011) \| 1 line -Changed paths: - M /trunk/epan/dissectors/packet-gtp.c -Update a comment. ------------------------------------------------------------------------ -r35597 \| etxrab \| 2011-01-20 06:03:13 -0800 (Thu, 20 Jan 2011) \| 1 line +r36572 \| gerald \| 2011-04-11 17:10:16 -0700 (Mon, 11 Apr 2011) \| 15 lines Changed paths: - M /trunk/epan/dissectors/packet-gtp.c - -Fix typos ------------------------------------------------------------------------- - - -Copy over with manual intervention: + M /trunk-1.4/Makefile.nmake + M /trunk-1.4/config.nmake + M /trunk-1.4/packaging/nsis/wireshark.nsi + M /trunk-1.4/tools/win32-setup.sh + M /trunk-1.4/tools/win64-setup.sh ------------------------------------------------------------------------- -r35561 \| etxrab \| 2011-01-16 14:32:22 -0800 (Sun, 16 Jan 2011) \| 2 lines -Changed paths: - M /trunk/epan/dissectors/packet-gsm_a_gm.c +Copy over r36483 by hand. -Switch to using proto_add_bits_item in a couple of places and fix -missing stepping of bit_offset. ------------------------------------------------------------------------ -r35595 \| etxrab \| 2011-01-20 05:05:17 -0800 (Thu, 20 Jan 2011) \| 3 lines +r36483 \| gerald \| 2011-04-05 15:38:12 -0700 (Tue, 05 Apr 2011) \| 3 lines Changed paths: - M /trunk/epan/dissectors/packet-gtp.c + M /trunk/Makefile.nmake + M /trunk/config.nmake + M /trunk/packaging/nsis/wireshark.nsi + M /trunk/tools/win32-setup.sh + M /trunk/tools/win64-setup.sh -In MM context the container contains IE:s not a complete -DTAP message. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598 +Use the latest library tag, which updates GNUTLS. Add code to check for +libintl-8.dll and add the GNUTLS version if needed. ------------------------------------------------------------------------ - ------------------------------------------------------------------------ -r36058 \| gerald \| 2011-02-24 15:52:22 -0800 (Thu, 24 Feb 2011) \| 77 lines +r36573 \| gerald \| 2011-04-11 17:35:22 -0700 (Mon, 11 Apr 2011) \| 2 lines Changed paths: - M /trunk-1.4/AUTHORS - M /trunk-1.4/asn1/ulp/ulp.cnf M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/dumpcap.c - M /trunk-1.4/epan/dissectors/packet-e212.c - M /trunk-1.4/epan/dissectors/packet-ieee802154.c - M /trunk-1.4/epan/dissectors/packet-ipp.c - M /trunk-1.4/epan/dissectors/packet-netflow.c - M /trunk-1.4/epan/dissectors/packet-skinny.c - M /trunk-1.4/epan/dissectors/packet-ulp.c - M /trunk-1.4/epan/to_str.c - -Copy over revisions from the trunk: ------------------------------------------------------------------------- -r35679 \| etxrab \| 2011-01-27 07:43:55 -0800 (Thu, 27 Jan 2011) \| 2 lines -Changed paths: - M /trunk/asn1/ulp/ulp.cnf - M /trunk/epan/dissectors/packet-ulp.c +Add our updated protocols. -The attemt to pretify MSISDN and IMSI breaks the dissection. -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593 ------------------------------------------------------------------------ -r35914 \| guy \| 2011-02-10 21:54:34 -0800 (Thu, 10 Feb 2011) \| 3 lines +r36612 \| gerald \| 2011-04-12 14:21:31 -0700 (Tue, 12 Apr 2011) \| 18 lines Changed paths: - M /trunk/epan/dissectors/packet-ipp.c + M /trunk-1.4/asn1/x509if/packet-x509if-template.c + M /trunk-1.4/asn1/x509if/x509if.cnf + M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/epan/dissectors/packet-x509if.c -Register for the media type "application/ipp", so any HTTP request or -response with that content type will be dissected as IPP. ------------------------------------------------------------------------- -r35916 \| guy \| 2011-02-11 01:28:05 -0800 (Fri, 11 Feb 2011) \| 2 lines -Changed paths: - M /trunk/epan/dissectors/packet-ipp.c +Copy over r36608 from the trunk: -Don't assume we're on port 631. ------------------------------------------------------------------------ -r35947 \| jake \| 2011-02-14 12:51:40 -0800 (Mon, 14 Feb 2011) \| 2 lines +r36608 \| gerald \| 2011-04-12 13:39:48 -0700 (Tue, 12 Apr 2011) \| 5 lines Changed paths: - M /trunk/epan/dissectors/packet-skinny.c + M /trunk/asn1/x509if/packet-x509if-template.c + M /trunk/asn1/x509if/x509if.cnf + M /trunk/epan/dissectors/packet-x509if.c + M /trunk/epan/dissectors/packet-x509if.h -Make sure RTP conversations are created. +Add x509if_frame_end() which is passed to register_frame_end_routine() +and which resets our global variables. Remove a boolean which was used +to track a char *; just check if the pointer is NULL instead. Fixes bugs +5754 and 5793, hopefully without breaking anything. ------------------------------------------------------------------------ -r35949 \| jake \| 2011-02-14 23:14:22 -0800 (Mon, 14 Feb 2011) \| 3 lines -Changed paths: - M /trunk/epan/to_str.c -From Matthew Parris: -Display "Day of Year" for January 1 as 1, not 0. ------------------------------------------------------------------------- -r35999 \| jake \| 2011-02-18 00:02:53 -0800 (Fri, 18 Feb 2011) \| 4 lines -Changed paths: - M /trunk/epan/dissectors/packet-ieee802154.c +Update the release notes. -From Ivan Lawrow: -The Final CAP Slot field "wpan.cap" in the Superframe Specification for a -beacon is always displayed as zero. ------------------------------------------------------------------------ -r36052 \| wmeier \| 2011-02-24 11:26:38 -0800 (Thu, 24 Feb 2011) \| 4 lines +r36644 \| gerald \| 2011-04-14 10:17:08 -0700 (Thu, 14 Apr 2011) \| 6 lines Changed paths: - M /trunk/dumpcap.c - -Fix Bug #5716: "dumpcap: -q option behavior doesn't match documentation" -Rework code slightly to print "Packets captured: " at 'dumpcap -q ...' exit. -Also: SigInfo now prints: "Packets captured: n" iso "n Packets captured". ------------------------------------------------------------------------- - - -Copy over with manual intervention: + M /trunk-1.4/docbook/release-notes.xml + M /trunk-1.4/epan/dissectors/packet-dect.c ------------------------------------------------------------------------- -r35889 \| jake \| 2011-02-09 00:46:21 -0800 (Wed, 09 Feb 2011) \| 5 lines -Changed paths: - M /trunk/AUTHORS - M /trunk/epan/dissectors/packet-e212.c +From Paul Makowski of SEI/CERT: -From Grzegorz Szczytowski: -Update of packet-e212.c dissector according to local national regulatory -MNC assignment document. -www.uke.gov.pl/uke/redir.jsp?place=galleryStats&id=24439 ------------------------------------------------------------------------- -r36028 \| jake \| 2011-02-22 13:19:13 -0800 (Tue, 22 Feb 2011) \| 4 lines -Changed paths: - M /trunk/epan/dissectors/packet-netflow.c +Fix a buffer overflow in the DECT dissector. -Fix for bug 5702: -In RFC 5102 (for IPFIX), id=128 is defined as "bgpNextAdjacentAsNumber" which -is DST_AS_PEER and id=129 as "bgpPrevAdjacentAsNumber" which is SRC_AS_PEER. ------------------------------------------------------------------------- +From me: Update the release notes. ------------------------------------------------------------------------ -r36064 \| gerald \| 2011-02-24 17:09:08 -0800 (Thu, 24 Feb 2011) \| 16 lines +r36645 \| gerald \| 2011-04-14 11:07:36 -0700 (Thu, 14 Apr 2011) \| 19 lines Changed paths: M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/wiretap/lanalyzer.c + M /trunk-1.4/epan/dissectors/packet-3g-a11.c + M /trunk-1.4/epan/dissectors/packet-tcp.c -Copy over r36061 from the trunk: +Copy over with manual intervention: ------------------------------------------------------------------------ -r36061 \| wmeier \| 2011-02-24 16:40:22 -0800 (Thu, 24 Feb 2011) \| 6 lines +r36629 \| cmaynard \| 2011-04-13 11:15:41 -0700 (Wed, 13 Apr 2011) \| 2 lines Changed paths: - M /trunk/wiretap/lanalyzer.c - -From Robert Bullen: Fix "Potential access violation when writing to LANalyzer files" -https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698 - -(Note from me: Before the fix "File ! Save As" in Lanalyzer format - crashed quite consistently on my Windows 7) ------------------------------------------------------------------------- - -Update the releast notes. + M /trunk/epan/dissectors/packet-tcp.c +Allow TCP segment data to be filterable via "tcp.data". ------------------------------------------------------------------------ -r36066 \| etxrab \| 2011-02-24 23:27:20 -0800 (Thu, 24 Feb 2011) \| 2 lines +r36642 \| cmaynard \| 2011-04-14 06:58:40 -0700 (Thu, 14 Apr 2011) \| 2 lines Changed paths: - M /trunk-1.4/asn1/ansi_map/ansi_map.asn - M /trunk-1.4/epan/dissectors/packet-ansi_map.c + M /trunk/epan/dissectors/packet-3g-a11.c -Copy over 35842 -Add a missing IE found in trace from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637 +Revert r24047. Fixes bug 5822. ------------------------------------------------------------------------ -r36076 \| jake \| 2011-02-26 03:02:41 -0800 (Sat, 26 Feb 2011) \| 2 lines -Changed paths: - M /trunk-1.4/Makefile.nmake - M /trunk-1.4/tools/win32-setup.sh - M /trunk-1.4/tools/win64-setup.sh -Update the User's Guide. ------------------------------------------------------------------------- -r36081 \| gerald \| 2011-02-27 09:04:32 -0800 (Sun, 27 Feb 2011) \| 1 line -Changed paths: - M /trunk-1.4/epan/enterprise-numbers - M /trunk-1.4/manuf - M /trunk-1.4/services +Update the release notes. -[Automatic manuf, services and enterprise-numbers update for 2011-02-27] ------------------------------------------------------------------------ -r36102 \| gerald \| 2011-02-28 17:09:12 -0800 (Mon, 28 Feb 2011) \| 17 lines +r36646 \| gerald \| 2011-04-14 14:26:25 -0700 (Thu, 14 Apr 2011) \| 20 lines Changed paths: - M /trunk-1.4/asn1/ldap/ldap.cnf - M /trunk-1.4/asn1/ldap/packet-ldap-template.c M /trunk-1.4/docbook/release-notes.xml - M /trunk-1.4/epan/dissectors/packet-ldap.c + M /trunk-1.4/gtk/export_object.c Copy over revisions from the trunk: ------------------------------------------------------------------------ -r36101 \| gerald \| 2011-02-28 16:50:17 -0800 (Mon, 28 Feb 2011) \| 5 lines +r34805 \| cmaynard \| 2010-11-08 08:53:11 -0800 (Mon, 08 Nov 2010) \| 4 lines Changed paths: - M /trunk/asn1/ldap/ldap.cnf - M /trunk/asn1/ldap/packet-ldap-template.c - M /trunk/epan/dissectors/packet-ldap.c + M /trunk/gtk/export_object.c -If we encounter an excessively long filter string or one with too many -elements, add an expert item and throw a ReportedBoundsError. We may -want to handle this more cleanly in the future but this avoids -allocating a huge amount of memory. +Allow objects to be saved that otherwise couldn't be due to invalid characters +in the filename, excessive filename lengths or duplicate filenames. Fixes +bug 1671. ------------------------------------------------------------------------ - -Update the release notes. - ------------------------------------------------------------------------- -r36104 \| gerald \| 2011-02-28 17:14:20 -0800 (Mon, 28 Feb 2011) \| 12 lines +r34808 \| cmaynard \| 2010-11-08 09:53:13 -0800 (Mon, 08 Nov 2010) \| 2 lines Changed paths: - M /trunk-1.4/epan/uat_load.l - -Copy over r36096 from the trunk: + M /trunk/gtk/export_object.c +Make maxlen a gsize instead of a guint. ------------------------------------------------------------------------ -r36096 \| stig \| 2011-02-28 08:11:20 -0800 (Mon, 28 Feb 2011) \| 4 lines -Changed paths: - M /trunk/epan/uat_load.l -Close UAT file after loading. - -Open files may prevent deleting a used profile with UAT files. ------------------------------------------------------------------------- +Update the release notes. ------------------------------------------------------------------------
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/Makefile.nmake ^
@@ -1,7 +1,7 @@ ## Makefile for building wireshark.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake 36076 2011-02-26 11:02:41Z jake $ +# $Id: Makefile.nmake 36572 2011-04-12 00:10:16Z gerald $ # We "Deploy using XCopy," which is described at # http://msdn.microsoft.com/en-us/library/ms235291.aspx @@ -862,6 +862,7 @@ rm -r -f $(WIRESHARK_LIBS)/glib rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.1-1 rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.5--win??ws + rm -r -f $(WIRESHARK_LIBS)/gnutls-2.10.3--win??ws rm -r -f $(WIRESHARK_LIBS)/gtk2 rm -r -f $(WIRESHARK_LIBS)/gtk+ rm -r -f $(WIRESHARK_LIBS)/gtk-wimp @@ -1068,6 +1069,11 @@ xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d +! IF "$(INTL_DLL)" != "libintl-8.dll" +# The gtk+ bundle doesn't provide libintl-8.dll (which is the case +# with the 32-bit package); use the GNUTLS version. + xcopy $(GNUTLS_DIR)\bin\libintl-8.dll $(INSTALL_DIR) /d +! ENDIF !ENDIF !IFDEF LUA_DIR xcopy "$(LUA_DIR)\lua5.1.dll" $(INSTALL_DIR) /d
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/NEWS ^
@@ -1,4 +1,4 @@ -Wireshark 1.4.4 Release Notes +Wireshark 1.4.5 Release Notes ------------------------------------------------------------------ @@ -15,102 +15,60 @@ The following vulnerabilities have been fixed. See the security advisory for details and a workaround. - o Huzaifa Sidhpurwala of the Red Hat Security Response Team - discovered that Wireshark could free an uninitialized pointer - while reading a malformed pcap-ng file. (Bug 5652) + o The NFS dissector could crash on Windows. (Bug 5209) - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. + Versions affected: 1.4.0 to 1.4.4. - CVE-2011-0538 + o The X.509if dissector could crash. (Bug 5754, Bug 5793) - o Huzaifa Sidhpurwala of the Red Hat Security Response Team - discovered that a large packet length in a pcap-ng file could - crash Wireshark. (Bug 5661) + Versions affected: 1.2.0 to 1.2.15 and 1.4.0 to 1.4.4. - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. + o Paul Makowski from SEI/CERT discovered that the DECT dissector + could overflow a buffer. He verified that this could allow + remote code execution on many platforms. - o Wireshark could overflow a buffer while reading a Nokia DCT3 - trace file. (Bug 5661) - - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. - - CVE-2011-0713 - - o Paul Makowski working for SEI/CERT discovered that Wireshark - on 32 bit systems could crash while reading a malformed - 6LoWPAN packet. (Bug 5661) - - Versions affected: 1.4.0 to 1.4.3. - - o joernchen of Phenoelit discovered that the LDAP and SMB - dissectors could overflow the stack. (Bug 5717) - - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior - versions including 1.0.x are also affected.) - - o Xiaopeng Zhang of Fortinet's Fortiguard Labs discovered that - large LDAP Filter strings can consume excessive amounts of - memory. (Bug 5732) - - Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior - versions including 1.0.x are also affected.) + Versions affected: 1.4.0 to 1.4.4. The following bugs have been fixed: - o A TCP stream would not always be recognized as the same - stream. (Bug 2907) - - o Wireshark Crashing by pressing 2 Buttons. (Bug 4645) + o Cygwin make fails after updating to bash v 4.1.9.2 - o A crash can occur in the NTLMSSP dissector. (Bug 5157) + o Export HTTP > All - System Appears Hung (but isn't). (Bug + 1671) - o The column texts from a Lua dissector could be mangled. (Bug - 5326) (Bug 5630) + o Some HTTP responses don't decode with TCP reassembly on. (Bug + 3785) - o Corrections to ANSI MAP ASN.1 specifications. (Bug 5584) + o Wireshark crashes when cancelling a large sort operation. (Bug + 5189) - o When searching in packet bytes, the field and bytes are not - immediately shown. (Bug 5585) + o Wireshark crashes if SSL preferences RSA key is actually a DSA + key. (Bug 5662) - o Malformed Packet: ULP reported when dissecting ULP SessionID - PDU. (Bug 5593) + o tshark incorrectly calculates TCP stream for some syn packets. + (Bug 5743) - o Wrong IEI in container of decode_gtp_mm_cntxt. (Bug 5598) + o Wireshark not able to decode the PPP frame in a sflow + (RFC3176) flow sample packet because Wireshark incorrectly + read the protocol in PPP frame header. (Bug 5746) - o Display filter does not work for expressions of type BASE_DEC, - BASE_DEC_HEX and BASE_HEX_DEC. (Bug 5606) + o Mysql protocol dissector: all fields should be little endian. + (Bug 5759) - o NTLMSSP dissector may fail to compile due to space embedded in - C comment delimiters. (Bug 5614) + o Error when opening snoop from Juniper SSG-140. (Bug 5762) - o Allow for name resolution of link-scope and multicast IPv6 - addresses from local host file. (Bug 5615) + o svnversion: command not found. (Bug 5798) - o DHCPv6 dissector formats DUID_LLT time incorrectly. (Bug 5627) + o capinfos: #ifdef HAVE_LIBGCRYPT block includes a line too + many. (Bug 5803) - o Allow for IEEE 802.3bc-2009 style PoE TLVs. (Bug 5639) + o Value of TCP segment data cannot be copied. (Bug 5811) - o Various fixes to the HIP packet dissector. (Bug 5646) + o proto_field_is_referenced() is not exported in + libwireshark.dll. (Bug 5816) - o Display "Day of Year" for January 1 as 1, not 0. (Bug 5653) - - o Accommodate the CMake build on Ubuntu 10.10. (Bug 5665) - - o E.212 MCC 260 Poland update according to local national - regulatory. (Bug 5668) - - o IPP on ports other than 631 not recognized. (Bug 5677) - - o Potential access violation when writing to LANalyzer files. - (Bug 5698) - - o IEEE 802.15.4 Superframe Specification - Final CAP Slot always - 0. (Bug 5700) - - o Peer SRC and DST AS numbers are swapped for cflow. (Bug 5702) - - o dumpcap: -q option behavior doesn't match documentation. (Bug - 5716) + o Wireshark ver. 1.4.4 not displayed "Granted QoS" field in a + A11 packet. (Bug 5822) New and Updated Features @@ -122,14 +80,10 @@ Updated Protocol Support - ANSI MAP, BitTorrent, DCM, DHCPv6, DTAP, DTPT, E.212, GSM - Management, GTP, HIP, IEEE 802.15.4, IPP, LDAP, LLDP, Netflow, - NTLMSSP, P_Mul, Quake, Skinny, SMB, SNMP, ULP + HTTP, LDAP, MySQL, NFS, sFlow, SSL, TCP New and Updated Capture File Support - LANalyzer, Nokia DCT3, Pcap-ng - Getting Wireshark Wireshark source code and installation packages are available from
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/asn1/ldap/ldap.cnf ^
@@ -1,7 +1,7 @@ # ldap.cnf # LDAP conformation file # Copyright 2005 Anders Broman -# $Id: ldap.cnf 36102 2011-03-01 01:09:12Z gerald $ +# $Id: ldap.cnf 36571 2011-04-12 00:02:47Z gerald $ #.PDU @@ -527,10 +527,14 @@ #.FN_HDR SearchRequest/_untag/filter Filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; #.FN_FTR SearchRequest/_untag/filter Filter_string=NULL; and_filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; #.FN_FTR Filter/equalityMatch Filter_string=ep_strdup_printf("(%s=%s)",
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/asn1/x509if/packet-x509if-template.c ^
@@ -2,7 +2,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if-template.c 32417 2010-04-07 16:54:29Z wmeier $ + * $Id: packet-x509if-template.c 36612 2011-04-12 21:21:31Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -37,6 +37,7 @@ #include "packet-x509if.h" #include "packet-x509sat.h" #include <epan/strutil.h> +#include <epan/dissectors/packet-frame.h> #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" @@ -51,13 +52,12 @@ /* Initialize the subtree pointers / #include "packet-x509if-ett.c" -static const char object_identifier_id; +static const char object_identifier_id = NULL; static proto_tree top_of_dn = NULL; static proto_tree top_of_rdn = NULL; static gboolean rdn_one_value = FALSE; / have we seen one value in an RDN yet / static gboolean dn_one_rdn = FALSE; / have we seen one RDN in a DN yet / -static gboolean doing_dn = TRUE; static gboolean doing_attr = FALSE; #define MAX_RDN_STR_LEN 64 @@ -72,6 +72,22 @@ #define MAX_AVA_STR_LEN 64 static char last_ava = NULL; +static void +x509if_frame_end(void) +{ + object_identifier_id = NULL; + top_of_dn = NULL; + top_of_rdn = NULL; + + rdn_one_value = FALSE; + dn_one_rdn = FALSE; + doing_attr = FALSE; + + last_dn = NULL; + last_rdn = NULL; + last_ava = NULL; +} + #include "packet-x509if-fn.c" const char * x509if_get_last_dn(void)
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/asn1/x509if/x509if.cnf ^
@@ -1,7 +1,7 @@ # x509if.cnf # X509IF conformation file -# $Id: x509if.cnf 28589 2009-06-02 09:44:52Z gal $ +# $Id: x509if.cnf 36612 2011-04-12 21:21:31Z gerald $ #.IMPORT ../x509sat/x509sat-exp.cnf @@ -197,7 +197,7 @@ name = oid_resolved_from_string(object_identifier_id); if(!name) name = object_identifier_id; - if(doing_dn) { /* append it to the RDN / + if(last_rdn) { / append it to the RDN / g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); @@ -213,6 +213,7 @@ if((fmt = val_to_str(hf_index, fmt_vals, "")) && fmt) { /* we have a format / last_ava = ep_alloc(MAX_AVA_STR_LEN); last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s", name, fmt); @@ -245,7 +246,7 @@ /* it was a string - format it / value = tvb_format_text(out_tvb, 0, tvb_length(out_tvb)); - if(doing_dn) { + if(last_rdn) { g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); / append it to the tree/ @@ -255,6 +256,10 @@ if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && fmt) { /* we have a format / + if (!last_ava) { + last_ava = ep_alloc(MAX_AVA_STR_LEN); + } + if(!(name = oid_resolved_from_string(object_identifier_id))) name = object_identifier_id; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%%s %%s %%s", name, fmt, value); @@ -330,7 +335,7 @@ rdn_one_value = FALSE; top_of_rdn = tree; last_rdn = ep_alloc(MAX_DN_STR_LEN); last_rdn = '\0'; - doing_dn = TRUE; + register_frame_end_routine (x509if_frame_end); %(DEFAULT_BODY)s @@ -349,7 +354,6 @@ } } - doing_dn = FALSE; last_rdn = NULL; /* it will get freed when the next packet is dissected / #.FN_BODY RelativeDistinguishedName/_item @@ -358,7 +362,7 @@ top_of_rdn = tree; } else { - if(doing_dn) + if(last_rdn) / this is an additional value - delimit / g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -373,6 +377,8 @@ dn_one_rdn = FALSE; / reset / last_dn = ep_alloc(MAX_DN_STR_LEN); last_dn = '\0'; top_of_dn = NULL; + register_frame_end_routine (x509if_frame_end); + %(DEFAULT_BODY)s @@ -402,6 +408,7 @@ ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); %(DEFAULT_BODY)s @@ -409,10 +416,9 @@ #.FN_BODY Attribute doing_attr = TRUE; + register_frame_end_routine (x509if_frame_end); %(DEFAULT_BODY)s - - doing_attr = FALSE; #.END
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/capinfos.c ^
@@ -3,7 +3,7 @@ * * Copyright 2004 Ian Schorr * - * $Id: capinfos.c 33041 2010-06-02 00:24:03Z gerald $ + * $Id: capinfos.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -391,8 +391,8 @@ print_stats_table_header_label("RIPEMD160"); print_stats_table_header_label("MD5"); } - if (cap_in_order) print_stats_table_header_label("Strict time order"); #endif /* HAVE_LIBGCRYPT */ + if (cap_in_order) print_stats_table_header_label("Strict time order"); printf("\n"); }
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/config.nmake ^
@@ -1,4 +1,4 @@ -# $Id: config.nmake 35925 2011-02-12 00:07:21Z gerald $ +# $Id: config.nmake 36572 2011-04-12 00:10:16Z 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). @@ -16,8 +16,8 @@ # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged VERSION_MAJOR=1 VERSION_MINOR=4 -VERSION_MICRO=4 -VERSION_BUILD=36110 +VERSION_MICRO=5 +VERSION_BUILD=36650 # It's recommended to change VERSION_EXTRA for your own custom builds # e.g. "-SVN-12345" VERSION_EXTRA= @@ -295,7 +295,7 @@ # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=2.8.5-4.12 +GNUTLS_PKG=2.10.3-1.11 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -503,7 +503,7 @@ # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=2.8.5-3.16 +GNUTLS_PKG=2.10.3-1.7 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for wireshark 1.4.4. +# Generated by GNU Autoconf 2.65 for wireshark 1.4.5. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='wireshark 1.4.4' +PACKAGE_VERSION='1.4.5' +PACKAGE_STRING='wireshark 1.4.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1619,7 +1619,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.4.4 to adapt to many kinds of systems. +\`configure' configures wireshark 1.4.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1690,7 +1690,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of wireshark 1.4.4:";; + short \| recursive ) echo "Configuration of wireshark 1.4.5:";; esac cat <<\_ACEOF @@ -1874,7 +1874,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.4.4 +wireshark configure 1.4.5 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2414,7 +2414,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.4.4, which was +It was created by wireshark $as_me 1.4.5, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3186,7 +3186,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.4.4' + VERSION='1.4.5' cat >>confdefs.h <<_ACEOF @@ -24996,7 +24996,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.4.4, which was +This file was extended by wireshark $as_me 1.4.5, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25062,7 +25062,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.4.4 +wireshark config.status 1.4.5 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/configure.in ^
@@ -1,8 +1,8 @@ -# $Id: configure.in 35489 2011-01-11 23:00:27Z gerald $ +# $Id: configure.in 36116 2011-03-01 22:22:20Z gerald $ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.4.4) +AC_INIT(wireshark, 1.4.5) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/debian/changelog ^
@@ -1,4 +1,4 @@ -wireshark (1.4.4) unstable; urgency=low +wireshark (1.4.5) unstable; urgency=low * Self-made package
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/docbook/check_svn_version.sh ^
@@ -2,7 +2,7 @@ # # Check for SVN version # -# $Id: check_svn_version.sh 31379 2009-12-29 12:12:26Z jmayer $ +# $Id: check_svn_version.sh 36571 2011-04-12 00:02:47Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> @@ -24,7 +24,7 @@ # echo -n '<!ENTITY SvnVersion "' > svn_version_tmp.xml -svnversion -n . >> svn_version_tmp.xml +[ -x svnversion ] && svnversion -n . >> svn_version_tmp.xml echo '">' >> svn_version_tmp.xml # /dev/null buries the output of the "cmp" command.
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/docbook/release-notes.xml ^
@@ -2,7 +2,7 @@ <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!-- $Id: release-notes.xml 36110 2011-03-01 16:55:04Z gerald $ --> +<!-- $Id: release-notes.xml 36646 2011-04-14 21:26:25Z gerald $ --> <!-- DOCUMENT SECTION @@ -12,7 +12,7 @@ <!-- Wireshark Info --> - <!ENTITY WiresharkCurrentVersion "1.4.4"> + <!ENTITY WiresharkCurrentVersion "1.4.5"> ]> @@ -32,112 +32,59 @@ <para> The following vulnerabilities have been fixed. See the - <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-04.html">security advisory</ulink> for details and a workaround. + <ulink url="http://www.wireshark.org/security/wnpa-sec-2011-06.html">security advisory</ulink> for details and a workaround. <itemizedlist> <listitem> <para> - Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered - that Wireshark could free an uninitialized pointer while reading a - malformed pcap-ng file. - <!-- Fixed in trunk: r35791 --> - <!-- Fixed in trunk-1.4: r35792 --> - <!-- Fixed in trunk-1.2: r35793 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5652">Bug - 5652</ulink>) + The NFS dissector could crash on Windows. + <!-- This is due to Visual C++ not supporting C99. Do non-Windows, non-gcc Wireshark packages exist? --> + <!-- Fixed in trunk: r34115 --> + <!-- Fixed in trunk-1.4: r36570 --> + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5209">Bug + 5209</ulink>) </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.</para> - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0538">CVE-2011-0538</ulink> - </para> - </listitem> - - <listitem> - <para> - Huzaifa Sidhpurwala of the Red Hat Security Response Team discovered - that a large packet length in a pcap-ng file could crash Wireshark. - <!-- Fixed in trunk: r35855 --> - <!-- Fixed in trunk-1.4: r35857 --> - <!-- Fixed in trunk-1.2: r35858 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5661">Bug - 5661</ulink>) - </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.</para> - <!-- - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-????">CVE-2011-????</ulink> - </para> - --> - </listitem> - - <listitem> - <para> - Wireshark could overflow a buffer while reading a Nokia DCT3 - trace file. - <!-- Fixed in trunk: r35953 --> - <!-- Fixed in trunk-1.4: r36050 --> - <!-- Fixed in trunk-1.2: r36051 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5661">Bug - 5661</ulink>) - </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3.</para> - <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0713">CVE-2011-0713</ulink> - </para> - </listitem> - - <listitem> - <para> - Paul Makowski working for SEI/CERT discovered that Wireshark on 32 - bit systems could crash while reading a malformed 6LoWPAN packet. - <!-- Fixed in trunk: r36037 --> - <!-- Fixed in trunk-1.4: r36036 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5661">Bug - 5661</ulink>) - </para> - <para>Versions affected: 1.4.0 to 1.4.3.</para> - <!-- + <para>Versions affected: 1.4.0 to 1.4.4.</para> +<!-- <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-????">CVE-2011-????</ulink> + <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink> </para> - --> +--> </listitem> <listitem> <para> - joernchen of Phenoelit discovered that the LDAP and SMB dissectors - could overflow the stack. - <!-- Fixed in trunk: r36029 --> - <!-- Fixed in trunk-1.4: r36053 --> - <!-- Fixed in trunk-1.2: r36054 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5717">Bug - 5717</ulink>) + The X.509if dissector could crash. + <!-- Fixed in trunk: r36608 --> + <!-- Fixed in trunk-1.4: r36611 --> + <!-- Fixed in trunk-1.2: r36612 --> + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5754">Bug + 5754</ulink>, + <ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5793">Bug + 5793</ulink>) </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior versions including 1.0.x are also affected.)</para> - <!-- + <para>Versions affected: 1.2.0 to 1.2.15 and 1.4.0 to 1.4.4.</para> +<!-- <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-????">CVE-2011-????</ulink> + <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink> </para> - --> +--> </listitem> <listitem> <para> - Xiaopeng Zhang of Fortinet's Fortiguard Labs discovered that large - LDAP Filter strings can consume excessive amounts of memory. - <!-- Fixed in trunk: r36101 --> - <!-- Fixed in trunk-1.4: r36102 --> - <!-- Fixed in trunk-1.2: r36103 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5732">Bug - 5732</ulink>) + Paul Makowski from SEI/CERT discovered that the DECT dissector could + overflow a buffer. He verified that this could allow remote code + execution on many platforms. + <!-- Fixed in trunk-1.4: r36644 --> </para> - <para>Versions affected: 1.2.0 to 1.2.14 and 1.4.0 to 1.4.3. (Prior versions including 1.0.x are also affected.)</para> - <!-- + <para>Versions affected: 1.4.0 to 1.4.4.</para> +<!-- <para> - <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-????">CVE-2011-????</ulink> + <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-????">CVE-2010-????</ulink> </para> - --> +--> </listitem> </itemizedlist> @@ -158,138 +105,87 @@ 0000</ulink>) </para></listitem> --> - <listitem><para> - A TCP stream would not always be recognized as the same stream. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907">Bug - 2907</ulink>) - </para></listitem> <listitem><para> - Wireshark Crashing by pressing 2 Buttons. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4645">Bug - 4645</ulink>) + Cygwin make fails after updating to bash v 4.1.9.2 </para></listitem> <listitem><para> - A crash can occur in the NTLMSSP dissector. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5157">Bug - 5157</ulink>) + Export HTTP > All - System Appears Hung (but isn't). + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1671">Bug + 1671</ulink>) </para></listitem> <listitem><para> - The column texts from a Lua dissector could be mangled. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5326">Bug - 5326</ulink>) - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5630">Bug - 5630</ulink>) + Some HTTP responses don't decode with TCP reassembly on. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785">Bug + 3785</ulink>) </para></listitem> <listitem><para> - Corrections to ANSI MAP ASN.1 specifications. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5584">Bug - 5584</ulink>) + Wireshark crashes when cancelling a large sort operation. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5189">Bug + 5189</ulink>) </para></listitem> <listitem><para> - When searching in packet bytes, the field and bytes are not immediately shown. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5585">Bug - 5585</ulink>) + Wireshark crashes if SSL preferences RSA key is actually a DSA key. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662">Bug + 5662</ulink>) </para></listitem> <listitem><para> - Malformed Packet: ULP reported when dissecting ULP SessionID PDU. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5593">Bug - 5593</ulink>) + tshark incorrectly calculates TCP stream for some syn packets. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5743">Bug + 5743</ulink>) </para></listitem> <listitem><para> - Wrong IEI in container of decode_gtp_mm_cntxt. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5598">Bug - 5598</ulink>) + Wireshark not able to decode the PPP frame in a sflow (RFC3176) flow sample packet because Wireshark incorrectly read the protocol in PPP frame header. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5746">Bug + 5746</ulink>) </para></listitem> <listitem><para> - Display filter does not work for expressions of type BASE_DEC, BASE_DEC_HEX and BASE_HEX_DEC. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5606">Bug - 5606</ulink>) + Mysql protocol dissector: all fields should be little endian. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5759">Bug + 5759</ulink>) </para></listitem> <listitem><para> - NTLMSSP dissector may fail to compile due to space embedded in C comment delimiters. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5614">Bug - 5614</ulink>) + Error when opening snoop from Juniper SSG-140. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5762">Bug + 5762</ulink>) </para></listitem> <listitem><para> - Allow for name resolution of link-scope and multicast IPv6 addresses from local host file. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5615">Bug - 5615</ulink>) + svnversion: command not found. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5798">Bug + 5798</ulink>) </para></listitem> <listitem><para> - DHCPv6 dissector formats DUID_LLT time incorrectly. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5627">Bug - 5627</ulink>) + capinfos: #ifdef HAVE_LIBGCRYPT block includes a line too many. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5803">Bug + 5803</ulink>) </para></listitem> <listitem><para> - Allow for IEEE 802.3bc-2009 style PoE TLVs. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5639">Bug - 5639</ulink>) + Value of TCP segment data cannot be copied. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5811">Bug + 5811</ulink>) </para></listitem> <listitem><para> - Various fixes to the HIP packet dissector. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5646">Bug - 5646</ulink>) + proto_field_is_referenced() is not exported in libwireshark.dll. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5816">Bug + 5816</ulink>) </para></listitem> <listitem><para> - Display "Day of Year" for January 1 as 1, not 0. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5653">Bug - 5653</ulink>) - </para></listitem> - - <listitem><para> - Accommodate the CMake build on Ubuntu 10.10. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5665">Bug - 5665</ulink>) - </para></listitem> - - <listitem><para> - E.212 MCC 260 Poland update according to local national regulatory. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5668">Bug - 5668</ulink>) - </para></listitem> - - <listitem><para> - IPP on ports other than 631 not recognized. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5677">Bug - 5677</ulink>) - </para></listitem> - - <listitem><para> - Potential access violation when writing to LANalyzer files. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5698">Bug - 5698</ulink>) - </para></listitem> - - <listitem><para> - IEEE 802.15.4 Superframe Specification - Final CAP Slot always 0. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5700">Bug - 5700</ulink>) - </para></listitem> - - <listitem><para> - Peer SRC and DST AS numbers are swapped for cflow. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5702">Bug - 5702</ulink>) - </para></listitem> - - <listitem><para> - dumpcap: -q option behavior doesn't match documentation. - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5716">Bug - 5716</ulink>) + Wireshark ver. 1.4.4 not displayed "Granted QoS" field in a A11 packet. + (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5822">Bug + 5822</ulink>) </para></listitem> </itemizedlist> @@ -318,28 +214,14 @@ <para> <!-- Sort alphabetically --> -ANSI MAP, -BitTorrent, -DCM, -DHCPv6, -DTAP, -DTPT, -E.212, -GSM Management, -GTP, -HIP, -IEEE 802.15.4, -IPP, + +HTTP, LDAP, -LLDP, -Netflow, -NTLMSSP, -P_Mul, -Quake, -Skinny, -SMB, -SNMP, -ULP +MySQL, +NFS, +sFlow, +SSL, +TCP </para> </section> @@ -347,7 +229,6 @@ <section id="NewCapture"><title>New and Updated Capture File Support</title> <para> -LANalyzer, Nokia DCT3, Pcap-ng </para> </section>
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/docbook/svn_version.xml ^
@@ -1 +1 @@ -<!ENTITY SvnVersion "36110"> +<!ENTITY SvnVersion "">
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-3g-a11.c ^
@@ -11,7 +11,7 @@ * Routines for Mobile IP dissection * Copyright 2000, Stefan Raab <sraab@cisco.com> * - * $Id: packet-3g-a11.c 32089 2010-03-03 13:52:17Z etxrab $ + * $Id: packet-3g-a11.c 36645 2011-04-14 18:07:36Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -32,7 +32,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Ref: - http://www.3gpp2.org/Public_html/specs/A.S0009-C_v1.0_070801.pdf + * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v3.0_100621.pdf * http://www.3gpp2.org/Public_html/specs/A.S0017-D_v1.0_070624.pdf (IOS 5.1) / @@ -102,7 +102,6 @@ static int hf_a11_ase_pcf_addr_key = -1; / Forward QoS Information / -static int hf_a11_fqi_length = -1; static int hf_a11_fqi_srid = -1; static int hf_a11_fqi_flags = -1; static int hf_a11_fqi_flowcount = -1; @@ -116,7 +115,6 @@ static int hf_a11_fqi_granted_qos = -1; / Reverse QoS Information / -static int hf_a11_rqi_length = -1; static int hf_a11_rqi_srid = -1; static int hf_a11_rqi_flowcount = -1; static int hf_a11_rqi_flowid = -1; @@ -883,13 +881,6 @@ guint8 flow_index; guint8 dscp_enabled = 0; - / - * Starts with a length field - * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v1.0_070801.pdf - / - proto_tree_add_item(ext_tree, hf_a11_fqi_length, tvb, offset+clen, 2, FALSE); - clen = clen + 2; - / SR Id / proto_tree_add_item(ext_tree, hf_a11_fqi_srid, tvb, offset+clen, 1, FALSE); clen++; @@ -967,13 +958,6 @@ guint8 flow_count; guint8 flow_index; - / - * Starts with a length field - * http://www.3gpp2.org/Public_html/specs/A.S0009-C_v1.0_070801.pdf - / - proto_tree_add_item(ext_tree, hf_a11_fqi_length, tvb, offset+clen, 2, FALSE); - clen = clen + 2; - / SR Id */ proto_tree_add_item(ext_tree, hf_a11_rqi_srid, tvb, offset+clen, 1, FALSE); clen++; @@ -1960,11 +1944,6 @@ FT_IPv4, BASE_NONE, NULL, 0, "PCF IP Address.", HFILL } }, - { &hf_a11_fqi_length, - { "Length", "a11.ext.fqi.length", - FT_UINT16, BASE_DEC, NULL, 0, - NULL, HFILL } - }, { &hf_a11_fqi_srid, { "SRID", "a11.ext.fqi.srid", FT_UINT8, BASE_DEC, NULL, 0, @@ -2020,11 +1999,6 @@ FT_BYTES, BASE_NONE, NULL, 0, "Forward Granted QoS.", HFILL } }, - { &hf_a11_rqi_length, - { "Length", "a11.ext.rqi.length", - FT_UINT16, BASE_DEC, NULL, 0, - NULL, HFILL } - }, { &hf_a11_rqi_srid, { "SRID", "a11.ext.rqi.srid", FT_UINT8, BASE_DEC, NULL, 0,
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-dect.c ^
@@ -3,7 +3,7 @@ * Dissector for the Digital Enhanced Cordless Telecommunications * protocol. * - * $Id: packet-dect.c 33406 2010-07-02 00:06:16Z gerald $ + * $Id: packet-dect.c 36644 2011-04-14 17:17:08Z gerald $ * * Copyright 2008-2009: * - Andreas Schuler <andreas (A) schulerdev.de> @@ -1882,10 +1882,13 @@ pkt_afield.RCRC=(((guint16)pkt_ptr[6])<<8)\|pkt_ptr[7]; /* fill B-Field / - if(pkt_len>DECT_PACKET_INFO_LEN+2) + if(pkt_len>DECT_PACKET_INFO_LEN+2) { + if (pkt_len > 128+5+8) + pkt_len = 128+5+8; / make these values into logical #defines / memcpy((char)(&(pkt_bfield.Data)), (char)(pkt_ptr+8), pkt_len-5-8); - else + } else { memset((char)(&(pkt_bfield.Data)), 0, 128); + } pkt_bfield.Length=pkt_len-DECT_PACKET_INFO_LEN-8; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT");
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-ldap.c ^
@@ -11,7 +11,7 @@ * * See RFC 1777 (LDAP v2), RFC 2251 (LDAP v3), and RFC 2222 (SASL). * - * $Id: packet-ldap.c 36102 2011-03-01 01:09:12Z gerald $ + * $Id: packet-ldap.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1219,7 +1219,7 @@ static int dissect_ldap_T_ntlmsspNegotiate(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 701 "ldap.cnf" +#line 705 "ldap.cnf" / make sure the protocol op comes first / ldap_do_protocolop(actx->pinfo); @@ -1235,7 +1235,7 @@ static int dissect_ldap_T_ntlmsspAuth(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 708 "ldap.cnf" +#line 712 "ldap.cnf" /* make sure the protocol op comes first / ldap_do_protocolop(actx->pinfo); @@ -1400,7 +1400,7 @@ static int dissect_ldap_T_bindResponse_matchedDN(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 715 "ldap.cnf" +#line 719 "ldap.cnf" tvbuff_t new_tvb=NULL; offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_ldap_matchedDN, &new_tvb); @@ -1675,7 +1675,7 @@ dissect_ldap_T_and_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 559 "ldap.cnf" +#line 563 "ldap.cnf" if(and_filter_string){ and_filter_string=ep_strdup_printf("(&%s%s)",and_filter_string,Filter_string); } else { @@ -1693,7 +1693,7 @@ static int dissect_ldap_T_and(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 566 "ldap.cnf" +#line 570 "ldap.cnf" proto_tree tr=NULL; proto_item it=NULL; const char old_and_filter_string=and_filter_string; @@ -1726,7 +1726,7 @@ dissect_ldap_T_or_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 586 "ldap.cnf" +#line 590 "ldap.cnf" if(or_filter_string){ or_filter_string=ep_strdup_printf("(\|%s%s)",or_filter_string,Filter_string); } else { @@ -1745,7 +1745,7 @@ static int dissect_ldap_T_or(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 594 "ldap.cnf" +#line 598 "ldap.cnf" proto_tree tr=NULL; proto_item it=NULL; const char old_or_filter_string=or_filter_string; @@ -1776,7 +1776,7 @@ dissect_ldap_T_not(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 615 "ldap.cnf" +#line 619 "ldap.cnf" Filter_string=ep_strdup_printf("(!%s)",string_or_null(Filter_string)); @@ -1814,7 +1814,7 @@ dissect_ldap_T_equalityMatch(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 536 "ldap.cnf" +#line 540 "ldap.cnf" Filter_string=ep_strdup_printf("(%s=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1845,7 +1845,7 @@ T_substringFilter_substrings_item_choice, hf_index, ett_ldap_T_substringFilter_substrings_item, NULL); -#line 641 "ldap.cnf" +#line 645 "ldap.cnf" if (substring_item_final) { substring_value=ep_strdup_printf("%s%s", (substring_value?substring_value:""), @@ -1885,7 +1885,7 @@ static int dissect_ldap_SubstringFilter(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 655 "ldap.cnf" +#line 659 "ldap.cnf" proto_tree tr=NULL; proto_item it=NULL; const char old_substring_value=substring_value; @@ -1920,7 +1920,7 @@ dissect_ldap_T_greaterOrEqual(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 542 "ldap.cnf" +#line 546 "ldap.cnf" Filter_string=ep_strdup_printf("(%s>=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1936,7 +1936,7 @@ dissect_ldap_T_lessOrEqual(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 548 "ldap.cnf" +#line 552 "ldap.cnf" Filter_string=ep_strdup_printf("(%s<=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1952,7 +1952,7 @@ dissect_ldap_T_present(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeDescription(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 612 "ldap.cnf" +#line 616 "ldap.cnf" Filter_string=ep_strdup_printf("(%s=)",string_or_null(Filter_string)); @@ -1965,7 +1965,7 @@ dissect_ldap_T_approxMatch(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { offset = dissect_ldap_AttributeValueAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 554 "ldap.cnf" +#line 558 "ldap.cnf" Filter_string=ep_strdup_printf("(%s~=%s)", string_or_null(attributedesc_string), string_or_null(ldapvalue_string)); @@ -1987,7 +1987,7 @@ static int dissect_ldap_T_dnAttributes(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 618 "ldap.cnf" +#line 622 "ldap.cnf" gboolean val; offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &val); @@ -2022,7 +2022,7 @@ static int dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 627 "ldap.cnf" +#line 631 "ldap.cnf" attr_type=NULL; matching_rule_string=NULL; ldapvalue_string=NULL; @@ -2031,7 +2031,7 @@ offset = dissect_ldap_MatchingRuleAssertion(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 633 "ldap.cnf" +#line 637 "ldap.cnf" Filter_string=ep_strdup_printf("(%s:%s%s%s=%s)", (attr_type?attr_type:""), (matching_rule_dnattr?"dn:":""), @@ -2074,7 +2074,7 @@ static int dissect_ldap_Filter(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 677 "ldap.cnf" +#line 681 "ldap.cnf" proto_tree tr=NULL; proto_item it=NULL; attributedesc_string=NULL; @@ -2112,13 +2112,17 @@ dissect_ldap_T_filter(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { #line 529 "ldap.cnf" Filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; offset = dissect_ldap_Filter(implicit_tag, tvb, offset, actx, tree, hf_index); -#line 532 "ldap.cnf" +#line 534 "ldap.cnf" Filter_string=NULL; and_filter_string=NULL; + Filter_elements = 0; + Filter_length = 0; return offset; @@ -2398,7 +2402,7 @@ static int dissect_ldap_SearchResultReference(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 775 "ldap.cnf" +#line 779 "ldap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 19, TRUE, dissect_ldap_SEQUENCE_OF_LDAPURL); @@ -2675,7 +2679,7 @@ static int dissect_ldap_AbandonRequest(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 782 "ldap.cnf" +#line 786 "ldap.cnf" offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 16, TRUE, dissect_ldap_MessageID); @@ -2747,7 +2751,7 @@ static int dissect_ldap_T_requestValue(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 750 "ldap.cnf" +#line 754 "ldap.cnf" if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) { offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2896,12 +2900,12 @@ static int dissect_ldap_T_intermediateResponse_responseValue(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 758 "ldap.cnf" +#line 762 "ldap.cnf" const gchar name; -#line 762 "ldap.cnf" +#line 766 "ldap.cnf" if(ldm_tree && object_identifier_id) { proto_item_set_text(ldm_tree, "%s %s", "IntermediateResponse", object_identifier_id); name = oid_resolved_from_string(object_identifier_id); @@ -3082,7 +3086,7 @@ static int dissect_ldap_T_controlValue(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 731 "ldap.cnf" +#line 735 "ldap.cnf" gint8 class; gboolean pc, ind; gint32 tag;
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-mysql.c ^
@@ -5,7 +5,7 @@ * * MySQL 4.1+ protocol by Axel Schwenke <axel@mysql.com> * - * $Id: packet-mysql.c 34439 2010-10-08 19:42:00Z gerald $ + * $Id: packet-mysql.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1198,10 +1198,10 @@ } if (tree) { - ti= proto_tree_add_item(tree, proto_mysql, tvb, offset, -1, FALSE); + ti= proto_tree_add_item(tree, proto_mysql, tvb, offset, -1, ENC_LITTLE_ENDIAN); mysql_tree= proto_item_add_subtree(ti, ett_mysql); proto_tree_add_item(mysql_tree, hf_mysql_packet_length, tvb, - offset, 3, TRUE); + offset, 3, ENC_LITTLE_ENDIAN); } offset+= 3; @@ -1316,7 +1316,7 @@ tvb_get_ptr(tvb, offset, strlen)); } proto_tree_add_item(greeting_tree, hf_mysql_version, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; /* 4 bytes little endian thread_id / @@ -1328,7 +1328,7 @@ / salt string / strlen= tvb_strsize(tvb,offset); proto_tree_add_item(greeting_tree, hf_mysql_salt, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+=strlen; / rest is optional / @@ -1347,14 +1347,14 @@ / 13 bytes unused / proto_tree_add_item(greeting_tree, hf_mysql_unused, tvb, - offset, 13, FALSE ); + offset, 13, ENC_LITTLE_ENDIAN); offset+= 13; / 4.1+ server: rest of salt / if (tvb_reported_length_remaining(tvb, offset)) { strlen= tvb_strsize(tvb,offset); proto_tree_add_item(greeting_tree, hf_mysql_salt2, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } @@ -1413,7 +1413,7 @@ tvb_get_ptr(tvb,offset,strlen)); } proto_tree_add_item(login_tree, hf_mysql_user, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; / rest is optional / @@ -1428,7 +1428,7 @@ } if (tree && strlen > 1) { proto_tree_add_item(login_tree, hf_mysql_passwd, - tvb, offset, strlen, FALSE); + tvb, offset, strlen, ENC_LITTLE_ENDIAN); } offset+= strlen; @@ -1450,7 +1450,7 @@ col_append_fstr(pinfo->cinfo, COL_INFO, " db=%s", buf); } proto_tree_add_item(login_tree, hf_mysql_schema, tvb, - offset, strlen, FALSE ); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } @@ -1512,7 +1512,7 @@ case MYSQL_DROP_DB: strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_schema, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; conn_data->state= RESPONSE_OK; break; @@ -1520,7 +1520,7 @@ case MYSQL_QUERY: strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_query, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); if (mysql_showquery) { if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " { %s } ", @@ -1533,7 +1533,7 @@ case MYSQL_STMT_PREPARE: strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_query, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; conn_data->state= RESPONSE_PREPARE; break; @@ -1544,14 +1544,14 @@ g_hash_table_remove(conn_data->stmts, &stmt); } proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= REQUEST; break; case MYSQL_STMT_RESET: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= RESPONSE_OK; break; @@ -1566,7 +1566,7 @@ case MYSQL_PROCESS_KILL: proto_tree_add_item(req_tree, hf_mysql_thd_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= RESPONSE_OK; break; @@ -1574,17 +1574,17 @@ case MYSQL_CHANGE_USER: strlen= tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_user, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; strlen= tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_passwd, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; strlen= my_tvb_strsize(tvb, offset); proto_tree_add_item(req_tree, hf_mysql_schema, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; conn_data->state= RESPONSE_OK; break; @@ -1632,29 +1632,29 @@ case MYSQL_STMT_FETCH: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; proto_tree_add_item(req_tree, hf_mysql_num_rows, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; conn_data->state= RESPONSE_TABULAR; break; case MYSQL_STMT_SEND_LONG_DATA: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; proto_tree_add_item(req_tree, hf_mysql_param, - tvb, offset, 2, TRUE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; / rest is data / strlen= tvb_reported_length_remaining(tvb, offset); if (tree && strlen > 0) { proto_tree_add_item(req_tree, hf_mysql_payload, - tvb, offset, strlen, FALSE); + tvb, offset, strlen, ENC_LITTLE_ENDIAN); } offset+= strlen; conn_data->state= REQUEST; @@ -1662,15 +1662,15 @@ case MYSQL_STMT_EXECUTE: proto_tree_add_item(req_tree, hf_mysql_stmt_id, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; proto_tree_add_item(req_tree, hf_mysql_exec_flags, - tvb, offset, 1, TRUE); + tvb, offset, 1, ENC_LITTLE_ENDIAN); offset+= 1; proto_tree_add_item(req_tree, hf_mysql_exec_iter, - tvb, offset, 4, TRUE); + tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+= 4; #if 0 @@ -1732,7 +1732,7 @@ / pre-4.1 packet ends here / if (tvb_reported_length_remaining(tvb, offset)) { proto_tree_add_item(tree, hf_mysql_num_warn, - tvb, offset, 2, FALSE); + tvb, offset, 2, ENC_LITTLE_ENDIAN); offset= mysql_dissect_server_status(tvb, offset+2, tree); } @@ -1759,7 +1759,7 @@ case RESPONSE_MESSAGE: if ((strlen= tvb_reported_length_remaining(tvb, offset))) { proto_tree_add_item(tree, hf_mysql_message, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } conn_data->state= REQUEST; @@ -1816,11 +1816,11 @@ if (tvb_get_guint8(tvb, offset) == '#') { offset+= 1; - proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, FALSE); + proto_tree_add_item(tree, hf_mysql_sqlstate, tvb, offset, 5, ENC_LITTLE_ENDIAN); offset+= 5; } - proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, FALSE); + proto_tree_add_item(tree, hf_mysql_error_string, tvb, offset, -1, ENC_LITTLE_ENDIAN); offset+= tvb_reported_length_remaining(tvb, offset); return offset; @@ -1856,7 +1856,7 @@ / 4.1+ protocol only: 2 bytes number of warnings / if (conn_data->clnt_caps & conn_data->srv_caps & MYSQL_CAPS_CU) { proto_tree_add_item(tree, hf_mysql_num_warn, tvb, - offset, 2, FALSE); + offset, 2, ENC_LITTLE_ENDIAN); offset+= 2; } } @@ -1864,7 +1864,7 @@ / optional: message string / if ((strlen= tvb_reported_length_remaining(tvb, offset))) { proto_tree_add_item(tree, hf_mysql_message, tvb, - offset, strlen, FALSE); + offset, strlen, ENC_LITTLE_ENDIAN); offset+= strlen; } @@ -2011,7 +2011,7 @@ else { proto_tree_add_item(tree, field, tvb, offset, - (int)lelen, FALSE); + (int)lelen, ENC_LITTLE_ENDIAN); offset += (int)lelen; } return offset; @@ -2035,9 +2035,9 @@ mysql_dissect_collation(tvb, offset, tree, conn_data->srv_caps, tvb_get_letohs(tvb, offset), hf_mysql_fld_charsetnr); offset += 2; / charset / - proto_tree_add_item(tree, hf_mysql_fld_length, tvb, offset, 4, TRUE); + proto_tree_add_item(tree, hf_mysql_fld_length, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; / length / - proto_tree_add_item(tree, hf_mysql_fld_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_mysql_fld_type, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; / type / flags = tvb_get_letohs(tvb, offset); @@ -2058,7 +2058,7 @@ proto_tree_add_boolean(flags_tree, hf_mysql_fld_set, tvb, offset, 2, flags); offset += 2; / flags / - proto_tree_add_item(tree, hf_mysql_fld_decimals, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_mysql_fld_decimals, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; / decimals / offset += 2; / filler */
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-nfs.c ^
@@ -3,7 +3,7 @@ * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de> * Copyright 2000-2004, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding) * - * $Id: packet-nfs.c 33665 2010-07-28 23:58:20Z gerald $ + * $Id: packet-nfs.c 36570 2011-04-11 23:18:27Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -7798,7 +7798,7 @@ { char universal_ip_address = NULL; char protocol = NULL; - guint8 b1, b2, b3, b4, b5, b6, b7, b8, b9, b10; + guint b1, b2, b3, b4, b5, b6, b7, b8, b9, b10; guint16 port; int addr_offset; @@ -7807,23 +7807,22 @@ offset = dissect_rpc_string(tvb, tree, hf_nfs_r_addr, offset, &universal_ip_address); if(strlen(protocol) == 3 && strncmp(protocol,"tcp",3) == 0) { - if (universal_ip_address && sscanf(universal_ip_address, "%hhu.%hhu.%hhu.%hhu.%hhu.%hhu", + if (universal_ip_address && sscanf(universal_ip_address, "%u.%u.%u.%u.%u.%u", &b1, &b2, &b3, &b4, &b5, &b6) == 6) { /* IPv4: h1.h2.h3.h4.p1.p2 / port = (b5<<8) \| b6; proto_tree_add_text(tree, tvb, addr_offset, offset, "[callback IPv4 address %u.%u.%u.%u, protocol=%s, port=%u]", b1, b2, b3, b4, protocol, port); - } else if (universal_ip_address && sscanf(universal_ip_address, "%hhu.%hhu", + } else if (universal_ip_address && sscanf(universal_ip_address, "%u.%u", &b1, &b2) == 2) { / Some clients (linux) sometimes send only the port. */ port = (b1<<8) \| b2; - proto_tree_add_text(tree, tvb, addr_offset, offset-addr_offset, "[callback ip address NOT SPECIFIED, protocol=%s, port=%u]", - protocol, - port); - } else if (universal_ip_address && sscanf(universal_ip_address, "%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx.%hhu.%hhu", + proto_tree_add_text(tree, tvb, addr_offset, offset-addr_offset, + "[callback ip address NOT SPECIFIED, protocol=%s, port=%u]", protocol, port); + } else if (universal_ip_address && sscanf(universal_ip_address, + "%2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x.%u.%u", &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &b9, &b10) == 10) { - port = (b9<<8) \| b10; proto_tree_add_text(tree, tvb, addr_offset, offset, "[callback IPv6 address %2x:%2x:%2x:%2x:%2x:%2x:%2x:%2x, protocol=%s, port=%u]", @@ -7832,7 +7831,6 @@ proto_tree_add_text(tree, tvb, addr_offset, offset-addr_offset, "[Invalid address]"); } } - return offset; }
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-sflow.c ^
@@ -7,7 +7,7 @@ * * By Yi Yu <yiyu.inbox@gmail.com> * - * $Id: packet-sflow.c 31900 2010-02-16 21:17:26Z wmeier $ + * $Id: packet-sflow.c 36571 2011-04-12 00:02:47Z gerald $ * * TODO: * 802.11 aggregation data dissection (sFlow v5) @@ -669,7 +669,7 @@ static dissector_handle_t fddi_handle; static dissector_handle_t fr_handle; static dissector_handle_t x25_handle; -static dissector_handle_t ppp_handle; +static dissector_handle_t ppp_hdlc_handle; static dissector_handle_t smds_handle; static dissector_handle_t aal5_handle; static dissector_handle_t ipv4_handle; @@ -786,7 +786,7 @@ call_dissector(x25_handle, next_tvb, pinfo, sflow_245_header_tree); break; case SFLOW_245_HEADER_PPP: - call_dissector(ppp_handle, next_tvb, pinfo, sflow_245_header_tree); + call_dissector(ppp_hdlc_handle, next_tvb, pinfo, sflow_245_header_tree); break; case SFLOW_245_HEADER_SMDS: call_dissector(smds_handle, next_tvb, pinfo, sflow_245_header_tree); @@ -3431,7 +3431,7 @@ fddi_handle = find_dissector("fddi"); fr_handle = find_dissector("fr"); x25_handle = find_dissector("x.25"); - ppp_handle = find_dissector("ppp"); + ppp_hdlc_handle = find_dissector("ppp_hdlc"); #if 0 smds_handle = find_dissector("smds"); #else @@ -3478,7 +3478,7 @@ fddi_handle = data_handle; fr_handle = data_handle; x25_handle = data_handle; - ppp_handle = data_handle; + ppp_hdlc_handle = data_handle; smds_handle = data_handle; aal5_handle = data_handle; ipv4_handle = data_handle;
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-ssl-utils.c ^
@@ -2,7 +2,7 @@ * ssl manipulation functions * By Paolo Abeni <paolo.abeni@email.com> * - * $Id: packet-ssl-utils.c 35416 2011-01-07 01:31:01Z gerald $ + * $Id: packet-ssl-utils.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -2391,6 +2391,14 @@ g_free(key.data); return NULL; } + + if (gnutls_x509_privkey_get_pk_algorithm(priv_key) != GNUTLS_PK_RSA) { + ssl_debug_printf("ssl_load_key: private key public key algorithm isn't RSA\n"); + g_free(private_key); + g_free(key.data); + return NULL; + } + g_free(key.data); private_key->x509_pkey = priv_key; @@ -2553,6 +2561,12 @@ g_free(private_key); return 0; } + + if (gnutls_x509_privkey_get_pk_algorithm(ssl_pkey) != GNUTLS_PK_RSA) { + ssl_debug_printf("ssl_load_pkcs12: private key public key algorithm isn't RSA\n"); + g_free(private_key); + return 0; + } private_key->x509_pkey = ssl_pkey; private_key->sexp_pkey = ssl_privkey_to_sexp(ssl_pkey);
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-tcp.c ^
@@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c 35462 2011-01-10 21:13:38Z gerald $ + * $Id: packet-tcp.c 36645 2011-04-14 18:07:36Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -172,6 +172,7 @@ static int hf_tcp_proc_dst_pid = -1; static int hf_tcp_proc_dst_uname = -1; static int hf_tcp_proc_dst_cmd = -1; +static int hf_tcp_data = -1; static gint ett_tcp = -1; static gint ett_tcp_flags = -1; @@ -1696,6 +1697,7 @@ * needs desegmentation). / fragment_set_partial_reassembly(pinfo,msp->first_frame,tcp_fragment_table); + / Update msp->nxtpdu to point to the new next * pdu boundary. / @@ -1710,6 +1712,8 @@ / msp->nxtpdu=seq+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; } else { msp->nxtpdu=seq + last_fragment_len + pinfo->desegment_len; } @@ -1730,8 +1734,8 @@ nbytes = another_pdu_follows > 0 ? another_pdu_follows : tvb_reported_length_remaining(tvb, offset); - proto_tree_add_text(tcp_tree, tvb, offset, nbytes, - "TCP segment data (%u byte%s)", nbytes, + proto_tree_add_bytes_format(tcp_tree, hf_tcp_data, tvb, offset, + nbytes, NULL, "TCP segment data (%u byte%s)", nbytes, plurality(nbytes, "", "s")); print_tcp_fragment_tree(ipfd_head, tree, tcp_tree, pinfo, next_tvb); @@ -1881,8 +1885,8 @@ * was, and report it as a continuation of that, instead? / nbytes = tvb_reported_length_remaining(tvb, deseg_offset); - proto_tree_add_text(tcp_tree, tvb, deseg_offset, -1, - "TCP segment data (%u byte%s)", nbytes, + 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")); } pinfo->can_desegment=0; @@ -3119,9 +3123,6 @@ conv=find_or_create_conversation(pinfo); tcpd=get_tcp_conversation_data(conv,pinfo); - item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, conv->index); - PROTO_ITEM_SET_GENERATED(item); - / If this is a SYN packet, then check if it's seq-nr is different * from the base_seq of the retrieved conversation. If this is the * case, create a new conversation with the same addresses and ports @@ -3141,6 +3142,9 @@ tcpd->ta->flags\|=TCP_A_REUSED_PORTS; } + item = proto_tree_add_uint(tcp_tree, hf_tcp_stream, tvb, offset, 0, conv->index); + PROTO_ITEM_SET_GENERATED(item); + /* Do we need to calculate timestamps relative to the tcp-stream? / if (tcp_calculate_ts) { @@ -4132,7 +4136,11 @@ { &hf_tcp_proc_dst_cmd, { "Destination process name", "tcp.proc.dstcmd", FT_STRING, BASE_NONE, NULL, 0x0, - "Destination process command name", HFILL}} + "Destination process command name", HFILL}}, + + { &hf_tcp_data, + { "TCP segment data", "tcp.data", FT_BYTES, BASE_NONE, NULL, 0x0, + NULL, HFILL}} }; static gint ett[] = {
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/dissectors/packet-x509if.c ^
@@ -10,7 +10,7 @@ * Routines for X.509 Information Framework packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-x509if.c 32748 2010-05-11 03:53:31Z morriss $ + * $Id: packet-x509if.c 36612 2011-04-12 21:21:31Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -45,6 +45,7 @@ #include "packet-x509if.h" #include "packet-x509sat.h" #include <epan/strutil.h> +#include <epan/dissectors/packet-frame.h> #define PNAME "X.509 Information Framework" #define PSNAME "X509IF" @@ -214,7 +215,7 @@ static int hf_x509if_AllowedSubset_wholeSubtree = -1; /--- End of included file: packet-x509if-hf.c ---/ -#line 50 "packet-x509if-template.c" +#line 51 "packet-x509if-template.c" /* Initialize the subtree pointers / @@ -295,15 +296,14 @@ static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /--- End of included file: packet-x509if-ett.c ---/ -#line 53 "packet-x509if-template.c" +#line 54 "packet-x509if-template.c" -static const char object_identifier_id; +static const char object_identifier_id = NULL; static proto_tree top_of_dn = NULL; static proto_tree top_of_rdn = NULL; static gboolean rdn_one_value = FALSE; / have we seen one value in an RDN yet / static gboolean dn_one_rdn = FALSE; / have we seen one RDN in a DN yet / -static gboolean doing_dn = TRUE; static gboolean doing_attr = FALSE; #define MAX_RDN_STR_LEN 64 @@ -318,6 +318,22 @@ #define MAX_AVA_STR_LEN 64 static char last_ava = NULL; +static void +x509if_frame_end(void) +{ + object_identifier_id = NULL; + top_of_dn = NULL; + top_of_rdn = NULL; + + rdn_one_value = FALSE; + dn_one_rdn = FALSE; + doing_attr = FALSE; + + last_dn = NULL; + last_rdn = NULL; + last_ava = NULL; +} + /--- Included file: packet-x509if-fn.c ---/ #line 1 "packet-x509if-fn.c" @@ -349,7 +365,7 @@ static int dissect_x509if_T_values_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 310 "x509if.cnf" +#line 315 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -374,7 +390,7 @@ static int dissect_x509if_T_value(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 280 "x509if.cnf" +#line 285 "x509if.cnf" offset=call_ber_oid_callback("unknown", tvb, offset, actx->pinfo, tree); @@ -395,7 +411,7 @@ static int dissect_x509if_T_contextValues_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 292 "x509if.cnf" +#line 297 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -492,15 +508,14 @@ int dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 411 "x509if.cnf" +#line 418 "x509if.cnf" doing_attr = TRUE; + register_frame_end_routine (x509if_frame_end); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, Attribute_sequence, hf_index, ett_x509if_Attribute); - doing_attr = FALSE; - return offset; } @@ -518,7 +533,7 @@ int dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 298 "x509if.cnf" +#line 303 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -539,7 +554,7 @@ static int dissect_x509if_T_assertion(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 304 "x509if.cnf" +#line 309 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -650,10 +665,11 @@ int dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 402 "x509if.cnf" +#line 408 "x509if.cnf" ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion); @@ -719,7 +735,7 @@ name = oid_resolved_from_string(object_identifier_id); if(!name) name = object_identifier_id; - if(doing_dn) { /* append it to the RDN / + if(last_rdn) { / append it to the RDN / g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); @@ -735,6 +751,7 @@ if((fmt = val_to_str(hf_index, fmt_vals, "")) && fmt) { /* we have a format / last_ava = ep_alloc(MAX_AVA_STR_LEN); last_ava = '\0'; + register_frame_end_routine (x509if_frame_end); g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s", name, fmt); @@ -752,7 +769,7 @@ static int dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 225 "x509if.cnf" +#line 226 "x509if.cnf" int old_offset = offset; tvbuff_t out_tvb; char value = NULL; @@ -776,7 +793,7 @@ / it was a string - format it / value = tvb_format_text(out_tvb, 0, tvb_length(out_tvb)); - if(doing_dn) { + if(last_rdn) { g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); / append it to the tree/ @@ -786,6 +803,10 @@ if((fmt = val_to_str(ava_hf_index, fmt_vals, "")) && fmt) { /* we have a format / + if (!last_ava) { + last_ava = ep_alloc(MAX_AVA_STR_LEN); + } + if(!(name = oid_resolved_from_string(object_identifier_id))) name = object_identifier_id; g_snprintf(last_ava, MAX_AVA_STR_LEN, "%s %s %s", name, fmt, value); @@ -804,7 +825,7 @@ static int dissect_x509if_T_distingAttrValue(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 325 "x509if.cnf" +#line 330 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -861,13 +882,13 @@ static int dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 356 "x509if.cnf" +#line 360 "x509if.cnf" if(!rdn_one_value) { top_of_rdn = tree; } else { - if(doing_dn) + if(last_rdn) / this is an additional value - delimit / g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -889,13 +910,13 @@ int dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 328 "x509if.cnf" +#line 333 "x509if.cnf" char temp_dn; rdn_one_value = FALSE; top_of_rdn = tree; last_rdn = ep_alloc(MAX_DN_STR_LEN); last_rdn = '\0'; - doing_dn = TRUE; + register_frame_end_routine (x509if_frame_end); offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset, RelativeDistinguishedName_set_of, hf_index, ett_x509if_RelativeDistinguishedName); @@ -916,7 +937,6 @@ } } - doing_dn = FALSE; last_rdn = NULL; /* it will get freed when the next packet is dissected / @@ -928,7 +948,7 @@ static int dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 391 "x509if.cnf" +#line 397 "x509if.cnf" if(!dn_one_rdn) { /* this is the first element - record the top / @@ -952,12 +972,14 @@ int dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 371 "x509if.cnf" +#line 375 "x509if.cnf" const char fmt; dn_one_rdn = FALSE; / reset / last_dn = ep_alloc(MAX_DN_STR_LEN); last_dn = '\0'; top_of_dn = NULL; + register_frame_end_routine (x509if_frame_end); + offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset, RDNSequence_sequence_of, hf_index, ett_x509if_RDNSequence); @@ -1362,7 +1384,7 @@ static int dissect_x509if_T_ra_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 271 "x509if.cnf" +#line 276 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1396,7 +1418,7 @@ static int dissect_x509if_T_ra_values_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 277 "x509if.cnf" +#line 282 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1458,7 +1480,7 @@ static int dissect_x509if_T_contextValue_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 316 "x509if.cnf" +#line 321 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1559,7 +1581,7 @@ static int dissect_x509if_T_restrictionValue(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 322 "x509if.cnf" +#line 327 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1680,7 +1702,7 @@ static int dissect_x509if_T_selectedValues_item(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree tree _U_, int hf_index _U_) { -#line 286 "x509if.cnf" +#line 291 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2080,7 +2102,7 @@ /--- End of included file: packet-x509if-fn.c ---/ -#line 76 "packet-x509if-template.c" +#line 92 "packet-x509if-template.c" const char x509if_get_last_dn(void) { @@ -2746,7 +2768,7 @@ NULL, HFILL }}, /--- End of included file: packet-x509if-hfarr.c ---/ -#line 121 "packet-x509if-template.c" +#line 137 "packet-x509if-template.c" }; /* List of subtrees / @@ -2829,7 +2851,7 @@ &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /--- End of included file: packet-x509if-ettarr.c ---/ -#line 126 "packet-x509if-template.c" +#line 142 "packet-x509if-template.c" }; / Register protocol / @@ -2885,6 +2907,6 @@ /--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 145 "packet-x509if-template.c" +#line 161 "packet-x509if-template.c" }
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/enterprise-numbers ^
@@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2011-02-26) +(last updated 2011-04-09) SMI Network Management Private Enterprise Codes: @@ -9414,9 +9414,9 @@ Ed Liu zliu&resonateinc.com 2352 - RedBack Networks - Jeff Johnson - jjohnson&redbacknetworks.com + Ericsson, Inc. (previous was 'RedBack Networks') + Michael Thatcher + michael.thatcher&ericsson.com 2353 Nexware Corporation Hunghsin Kuo @@ -10543,8 +10543,8 @@ jwilliams&cti.ca 2634 Western Telematic, Inc. - Srikanth Sherman - sri&westtel.com + Anthony Barrera + anthonyb&wti.com 2635 ADTX Chris Jan Cortes @@ -61988,8 +61988,8 @@ NKaczenski&ar-hannover.de 15609 Iskon Internet d.d. - Iva Cabric - ivac+iana&mail.iskon.hr + Jerko Klarica + jerko.klarica&iskon.hr 15610 Herbert Retail Ltd. Rowan Bradley @@ -62043,9 +62043,9 @@ Rick Clark rick&aptare.com 15623 - Darryl Ross + Bachblue Pty Ltd t/a AFOYI Darryl Ross - darryl&fuzzitech.net + darryl&afoyi.com 15624 Skopeo LLC Vanson Samuel @@ -73639,9 +73639,9 @@ Vinícius Augusto Sacramento Ferreira vinicius&takenet.com.br 18522 - Barmala - Christian Barmala - OID.Admin&barmala.com + Unassigned + Removed 2011-03-08 + ---none--- 18523 Liverton Limited Brendan Law @@ -90058,8 +90058,8 @@ equipe&excellent-rameur.com 22624 Source Technologies - Snehal Vashi - svashi&sourcetech.com + Frank Woods + mhitz&sourcetech.com 22625 ProcessClaims Joe Gomez @@ -93191,9 +93191,9 @@ Jamie M Vachon jamie.vachon&levelonenetworks.com 23407 - Bryant Broadcast and Data Communications + Bryant Unlimited Simon Quill - simon&bryant-broadcast.co.uk + simon&bryant-unlimited.co.uk 23408 Rhombus Systems Ltd. David Hartley @@ -99236,8 +99236,8 @@ support&essent.com 24917 Collaborative Fusion, Inc. - Brian A. Seklecki - bseklecki&collaborativefusion.com + Sean McAfee + smcafee&collaborativefusion.com 24918 Radmer Randy Radmer @@ -106296,9 +106296,9 @@ Jacek Drobiecki j.drobiecki&emcom.pl 26680 - General Dynamics UK Limited - Ron Smith - ron.smith&generaldynamics.uk.com + General Dynamics United Kingdom Limited + Jonathan Hansford + jonathan.hansford&generaldynamics.uk.com 26681 Phi Theta Kappa International Honor Society Larry Olin Horn @@ -107312,9 +107312,9 @@ Dominique LeBlond dominique.leblond&tridion.com 26934 - TattileS.r.l. - Paolo Boniotti - p.boniotti&tattile.com + Tattile S.r.l. + Livio Bonisoli + l.bonisoli&tattile.com 26935 Oseo Xavier de Broca @@ -124554,7 +124554,7 @@ Brian Foster brian&fosterhardware.com 31243 - Interhost ANS + Interhost AS Asbjørn Sannes asbjorn.sannes&interhost.no 31244 @@ -142392,9 +142392,9 @@ chunguo li lichunguo&ceopen.cn 35702 - Optical Components & Systems - Vlaznev Dmitry - soft&oco.ru + NTO IRE-Polus, Ltd. (previous was 'Optical Components & Systems') + Alexander Gutor + sanya.gutor&gmail.com 35703 JSC DevLab Kolesnyk Oleksij @@ -144432,7 +144432,7 @@ Daniel Foerst foerst&cua.edu 36212 - Higher Education Bridge Certification Authority, Inc. + Research and Education Bridge Certification Authority, Inc. Benjamin T. Wilson ben&digicert.com 36213 @@ -147797,7 +147797,7 @@ support&andone.co.jp 37053 MMR Network Management Science & Technology Co., Ltd - ShiHaoQing + HaoQing Shi mr_shq&163.com 37054 AirP Systems LLC @@ -149499,6 +149499,994 @@ The Karthikeyans Muruganand Karthikeyan muru&mkarthik.cz.cc +37479 + Warimax Ltd. + Michael Todd Peterson + support&warimax.com +37480 + SkySQL Ab + Kaj Arnö + kaj&skysql.com +37481 + Canyons School District + Scot McCombs + itmsengineers&canyonsdistrict.org +37482 + Stewart McKelvey + Scott Gorrill + sgorrill&smss.com +37483 + A.5 Security Consulting Group, SL + Sergi Gonzalez + sgonzalez&a5security.com +37484 + PT. Teknologi Multimedia Indonesia + Agastiya S. Mohammad + egi&pure-technology.net +37485 + Alico Graphic Web Designs + Sean Ali + sean&alicographics.com +37486 + OOO Verified Solutions + Alexander Ryzhov + admin&vs5.ru +37487 + Nicolas Ledez + Nicolas Ledez + iana&ledez.net +37488 + Ridgetop Group, Inc. + Robert Wagoner + rwagoner&ridgetopgroup.com +37489 + scality + Dos Santos Patrick + iana&scality.com +37490 + ENCO Systems, Inc. + Eugene Novacek, P.E. + research&enco.com +37491 + FTM Systems Kft. + Néher Márton + neher.marton&ftmsystems.hu +37492 + Mindstorm Networks + Nick Whalen + nickw&mindstorm-networks.net +37493 + Cyberlink AG + Thomas Bader + bader&cyberlink.ch +37494 + Vincent de Lau + Vincent de Lau + vincent&delau.nl +37495 + MARS Advanced Research Systems + Robert Leslie + pen.iana.org&mars.org +37496 + ZHEJIANG DAHUA TECHNOLOGY CO.,LTD + Wang Lingli + wang_lingli&dahuatech.com +37497 + Delphi Innovations + Marshall Reeske + mreeske&gmail.com +37498 + NasuTek Enterprises + Michael Manley + mmanley&nasutek.com +37499 + NetSoft Distributed Solutions Pty Ltd + Keith Willis + iana&netsoft.com.au +37500 + Schmid Industrieholding + Thomas Brandner + iana&sih.co.at +37501 + Progetto Archivio S.r.l. + Massimo Nuvoli + info&progettoarchivio.com +37502 + kyberna AG + Thomas Fritz + noc&kyberna.net +37503 + Seratel Technology SAL + John Hobdell + john&seratel.com +37504 + ONETASTIC S.r.l. + Visentin Sergio + onetastic&onetastic.com +37505 + WSO2 Inc. + Prabath Siriwardana + external-relations&wso2.com +37506 + Biodec s.r.l. + Mauro Amico + mauro&biodec.com +37507 + Freenet Liberec, o.s. + Jakub Petržílka + kubapet&lbcfree.net +37508 + AQUAPHOR + Nikolay Kartashev + kolq&aquaphor.ru +37509 + DirectorySelfService + Mohd EQbal. + DirectorySelfService&tashawour.com +37510 + SilentSystem + Shinichi Nakamoto + naka&silentsystem.jp +37511 + Future Dynamics Interstellar + Napoleon A. Courtney + napoleoncourtney&gmail.com +37512 + Systems Corps + Michael Carey + mike&systemscorps.com +37513 + Citkomm + Marc Risse + risse&citkomm.de +37514 + Raphael Frasch GmbH + Raphael Frasch + info&frasch.de +37515 + Avajadi Solutions + Eddie Olsson + ewt&avajadi.org +37516 + Software Integration Development + C.H.W. van Zon + c.v.zon&softint.nl +37517 + Sveriges Radio AB + Henrik Sörling + Henrik.sorling&sr.se +37518 + Firewall Services + Hervé Lardin + tech&firewall-services.com +37519 + Draexlmaier Group + Mario Lohner + Lohner.Mario&DRAEXLMAIER.DE +37520 + Kassenaerztliche Vereinigung Baden-Wuerttemberg + Eike Ott + NetzwerkeundSecurity&kvbawue.de +37521 + Network Pipeline Inc. + Brad J. Wilkus + bradwilkus&networkpipeline.com +37522 + Kousec Software, Inc. + Masato Kataoka + masato.kataoka&kousec.com +37523 + Alyrica Networks Inc + Joseph Sullivan + joseph.sullivan&alyrica.net +37524 + Com1 Communication Solutions B.V. + Bas Sanders + b.sanders&com1.nl +37525 + Infovide-Matrix + Pawel Biedronski + pbiedronski&ivmx.pl +37526 + WellCentive, LLC + Andre Thenot + agthenot&wellcentive.com +37527 + Signalsky Communication Co., Ltd. + Li Chunsheng + tom&signalsky.com +37528 + Crompton Greaves Limited + Yogendra Namjoshi + yogendra.namjoshi&cgglobal.com +37529 + A and A System Co., Ltd. + Shigetaka Furukawa + moroheiya&aa-sys.co.jp +37530 + WebRadar + Daniel Hart + daniel&hart.net +37531 + Frank Moeller + Frank Moeller + frank&nx01.de +37532 + BBT Technology Corp. + PanJie + pjie131&yahoo.com.cn +37533 + Delta Electronics (Thailand) Public Co.,Ltd + Phichej Cheevanantachai + Phichej&delta.co.th +37534 + uher.info + Marek Uher + marek&uher.info +37535 + microDATA GIS, Inc. + Jeremy Jackson + jjackson&md-911.com +37536 + NRG2 B.V. + B. Sanders + bsanders&nrg2.nl +37537 + JADE + Błażej Kukliński + bkuklinski&jade.pl +37538 + Big Switch Networks + Kanzhe Jiang + kanzhe.jiang&bigswitch.com +37539 + Code One GmbH + Arne Bönninghoff + ab&codeone.tv +37540 + N3 Labs Sdn. Bhd. + Ihsan Junaidi Ibrahim + ihsan&n3labs.my +37541 + COMPUTER HI-TECH INC. + Koji Suzue + suzue&cht.co.jp +37542 + Depelmaan Ltd + Alireza Khodaian + a.khodaian&depelmaan.com +37543 + Crowe Horwath LLP + Ted Dyck + ted.dyck&crowehorwath.com +37544 + UM Labs Ltd + Peter Cox + peter&um-labs.com +37545 + GFI Solutions Group inc. + Christophe Dupre + christophe.dupre&gfisolutions.com +37546 + BNP Paribas Fortis group + Bruno-Louis MATUZ + bruno-louis.matuz&bnpparibasfortis.com +37547 + Europapier International GmbH + Daniel Masek + it&europapier.cz +37548 + CenturyLink + Russell Petree + russell.petree&centurylink.com +37549 + C&T sas + Roberto Casalegno + roberto.casalegno&ct-sas.it +37550 + Flexenclosure AB + Magnus Persson + magnus.persson&flexenclosure.com +37551 + IFM Infomaster SpA + Giampaolo Sica + giampaolo.sica&ifminfomaster.com +37552 + RAYCORE TAIWAN CO., LTD. + Andrew Chang + ac&raycore.com.tw +37553 + FRDLWEB + Till Wehowski + till&webfan.de +37554 + Archbold Medical Center + Lou Ellen Parker, RN + lparker&archbold.org +37555 + Enabling Technologies Company, Inc. + Mark Mercer + markm&brailler.com +37556 + Brandwatch + Luke Alexander + luke&brandwatch.com +37557 + Pathology Associates Medical Laboratories, LLC + Sean Rowe + srowe&paml.com +37558 + VM-DG Hemmert & Schuster GbR + Marco Schuster + marco&vmsoft-gbr.de +37559 + Socialcast + Patrick Kile + patrick&socialcast.com +37560 + Simena, LLC + Sezen Uysal + suysal&simena.net +37561 + Beijing KEMACOM technologies Co., Ltd. + Yongjie Zhang + eddy.jhang&gmail.com +37562 + Hangzhou Yuwan Technology Co., Ltd. + Shuyun Guo + support&itmone.com +37563 + NNS - Nigl Network Solutions + NIGL Sascha + s.nigl&nns.at +37564 + Everest Display Inc. + Michael B. F. Wu + michaelbfwu&everestdisplay.com.tw +37565 + Struck Innovative Systeme GmbH + Thorsten Fritzke + thorsten.fritzke&struck.de +37566 + Discovery Reply S.r.l. + Andrea Ceciarelli + a.ceciarelli&reply.it +37567 + Alliant Techsystems Inc. + Darren Hibbard + darren.hibbard&atk.com +37568 + Commend International GmbH + Johannes Helminger + j.helminger&commend.com +37569 + Vocative Ltd. + Dmitry Glukhov + gludminick&vocative.ru +37570 + ELFF Tech + Lonny Fairfield + lfairfie&wyoming.com +37571 + KVUC + Mik Helmich + mik&kvuc.dk +37572 + Panini s.p.a. + Massimo Gullotto + Massimo.Gullotto&panini.com +37573 + LightSoft Research Ltd. + Alexey Leontev + alex&lightsoft.ru +37574 + Alberta Distance Learning Centre + Arlen Baker + abaker&adlc.ca +37575 + Infobip LTD + Izabel Jelenic + izabel.jelenic&infobip.com +37576 + NovelSat + Guy Cohen + guy.c&novelsat.com +37577 + Branch of LLC "Tabak-Invest" Trade Center "Korona" + Mikhail Koren + mike.it&korona.by +37578 + Samworth Brothers Ltd + thomas wing + helpdesk&ginsters.co.uk +37579 + Synetrix Holdings Limited + John Shaw-Miller + john.shaw-miller&synetrix.co.uk +37580 + Chao-Inn elementary school + Chia-Hui Chen + mis&cies.tyc.edu.tw +37581 + Mika timing GmbH + Joerg Mika + joerg.mika&mikatiming.de +37582 + Theobroma Systems Design und Consulting GmbH + Dr. Philipp Tomsich + oid-admin&theobroma-systems.com +37583 + Surescripts, LLC + Pete Palmer + pete.palmer&surescripts.com +37584 + Gary Hawkins + Gary Hawkins + gary.hawkins&garyhawkins.me.uk +37585 + QDIAGNOSTICA + Ayuda Imagen + ayuda.imagen&diagnosticorecoletas.com +37586 + E-sektionens Teletekniska Avdelning + Anton Landberg + anton.landberg&gmail.com +37587 + QualVu, Inc. + Rodney D. Holm + rholm&qualvu.com +37588 + QingDao Easytelecom Co., Ltd. + Lin Guo + easytelecom&public.qd.sd.cn +37589 + Institut de l'Ebre + Sergi Tur Badenas + stur&iesebre.com +37590 + Meyer Burger Technology AG + Jonas Reusser + j.reusser&meyerburger.ch +37591 + Reggiani + Andrea Pagni + support&reggiani.it +37592 + Ev.-Luth. Brüdergemeinde Enger e.V. + Alexander Gebel + alex&elb-enger.de +37593 + Platform-a Arastirma Gelistirme Koordinasyon Hizmetleri A. S. + Ilhan Uncuoglu + ilhan.uncuoglu&platform-a.org +37594 + Netmining LLC + Cristian Ferencz + cristian.ferencz&netmining.com +37595 + Geomarine Ltd + Ian Macdonald + ianmac51&gmail.com +37596 + Agri-hitech LLC + Shigeru Makino + mac&agri-hitech.com +37597 + Decatur Hospital Authority dba Wise Regional Health System + Joe Arispe + jarispe&wiseregional.com +37598 + CipherCloud, Inc. + Pravin Kothari + pkothari&ciphercloud.com +37599 + Meontrust Inc. + Markku Mehtälä + markku&meontrust.com +37600 + ledeuns.org + Denis FONDRAS + contact&ledeuns.org +37601 + Xech S.r.l. + Marco Tiraboschi + mtiraboschi&xech.it +37602 + Spider Software GmbH + Michael Becker + pen&spider-software.net +37603 + Meami.org + Martin Musatov + musatov&att.net +37604 + RMG Tech (Malaysia) Sdn Bhd + Jean-Yves Sireau + sysadmin&regentmarkets.com +37605 + MCX Telecom 2 Sp. z o.o. + Tomasz Sadowski + tomasz.sadowski&mcx.pl +37606 + "SM Finance",JSC + Vladimir V. Losev + losev&smfin.ru +37607 + Cascada Software & Consulting + Marcos Luna + marcos.luna&gmail.com +37608 + CareEvolution, Inc + Himabindu Bolisetty + bindu&careevolution.com +37609 + Dang Networks Inc. + Andrew Duffy + andrewd&dangnetworks.com +37610 + The TuxClan + Carel Lubbe + carel.lubbe&gmail.com +37611 + CJSC TSI Service + Ivan Yu. Malinin + miu&tsinet.ru +37612 + Kassenärztliche Vereinigung Niedersachsen + Christian Strassburg + christian.strassburg&kvn.de +37613 + ennovatis GmbH + Hartmut Freihofer + h.freihofer&ennovatis.de +37614 + Siqura + Peter de Konink + pkonink&siqura.com +37615 + V Labs Informatica Ltda + Andre Luiz de Senna + senna&igenesis.com.br +37616 + SATS Holding AB + Ludvig Nilsson + it&sats.com +37617 + Ventek Sistemas e Automação + Guilherme Namen Pimenta + guilherme&ventek.com.br +37618 + Tumblr + Fredrik Nylander + fredrik&tumblr.com +37619 + SCHIEx + Himabindu Bolisetty + bindu&careevolution.com +37620 + Alegent Health + Cathi Bishop + cathi.bishop&alegent.org +37621 + Ename, S.A. + Jose Lameira + oid&ename.pt +37622 + Chrysalis Utah, Inc. + Dustin Carroll + dustin.carroll&gochrysalis.com +37623 + Red Hound Software, Inc. + Carl Wallace + carl&redhoundsoftware.com +37624 + M & PI Software S.r.l. + Pierluigi Brugnone + pierluigi.brugnone&mpisoftware.it +37625 + Mike Johnson + Mike Johnson + m.d.johnson&durhamonline.org +37626 + STC AKTOR + Alexey Vorontsov + av&aktor.ru +37627 + ensemble + Mike Joe + mikej&ensemble.com +37628 + NETRATOR Andrzej Dopierala + Andrzej Dopierala + dopieralaa&netrator.pl +37629 + COMTEC NET + Diana Ioan + diana.ioan&tecnet.ro +37630 + Iron Technology Solutions Ltd + Regis Savry + regis&irontech.co.nz +37631 + Plasmatronics Pty Ltd + Brendan English + iana&plasmatronics.com.au +37632 + The Frontier Group + Matthew Lambie + mlambie&thefrontiergroup.com.au +37633 + Bolnisnica Golnik KOPA + Tomaz Knific + tomaz.knific&klinika-golnik.si +37634 + Achieve3000, Inc. + Yaakov Goldberg + yaakov.goldberg&achieve3000.com +37635 + Awarepoint + Brandon Gilmore + bgilmore&awarepoint.com +37636 + Catholic Health + Michael Brown + mbrown&chsbuffalo.org +37637 + Henry County Hospital + Louetta Dishman + ldishman&hcmhcares.org +37638 + Infinitrum Co., Ltd + David cheng + david.cheng&infinitrum.com +37639 + ECYS S.A. + Fernando Valenzuela + fdvalenzuela&ecyssa.com +37640 + Federal Cardiovascular surgery center + Nikulin Andrey + avn&krascor.ru +37641 + Neebula Systems + Shai Mohaban + shai&neebula.com +37642 + GK "SoftExpert" + Alexander Sentyurin + asentyurin&sfx-tula.ru +37643 + IBM BTO Business Consulting Services Sp. z o.o. + Lukasz Kozubal + lukasz.kozubal&pl.ibm.com +37644 + Fuzhou Ucore Information Technologies Co,.Ltd + Wensheng Hu + 13705084159&139.com +37645 + Medical Data Express + Alan Hagerman + alan.hagerman&medicaldataexpress.com +37646 + Wyoming Valley Health Care System + Luann Draht + ldraht&wvhcs.org +37647 + Ministry of Interior - UAE (Governmental Entity) + Major General Matar Salem Bin Msaeed Al Neyadi – ICT Director / Dr. Haider Khalid A.A. Al-Ameed – Senior ICT Advisor + hkameed&adpolice.gov.ae +37648 + Kalmia Technology Co, LLC + Alton Brantley + alton.brantley&gmail.com +37649 + Helium Inc. + Tracy Flynn + tflynn&helium.com +37650 + Shared Technology Services Group, Inc. + Venu Venugopal + vvenugopal&stsgi.com +37651 + JoyStem Web Services Private Limited + Chandra Sekhar Challapilla + sekhar&joystem.com +37652 + I-TECH + Alex McGee + camcgee&uw.edu +37653 + Lamby + Stefan Lamby + support&lamby.de +37654 + Moccu GmbH + Thomas Walter + admin&moccu.com +37655 + Far South Networks + Michael Walton + mike&farsouthnet.com +37656 + Broxtowe Borough Council + Stuart Chaffin + Stuart.Chaffin&broxtowe.gov.uk +37657 + Erskine Design + Phil Howell + dev&erskinedesign.com +37658 + Czech National Bank + Martin Podstata + certificateadmins&cnb.cz +37659 + ControlCircle Ltd. + Andy Coates + MonitoringTeam&ControlCircle.com +37660 + Unit of Research of Technologies of Information and Communication (UTIC) + Heithem Abbes + heithem.abbes&gmail.com +37661 + Transcon Electronic Systems spol. s r. o. + Martin Persich + persich&transcon.cz +37662 + Ablerex Electronic Co., Ltd. + Fred Hsu + fred&ablerex.com.tw +37663 + nGen - Niagara Interactive Media Generator + Thomas Madej + tmadej&ngen-niagara.com +37664 + Zone de Police Midi + Jacques Struelens + dir.tel&zpz5341.irisnet.be +37665 + R. W. Beckett Corporation + John Bohan + engineering&beckettenergy.com +37666 + Airebullas C.B. + Juan Gomez Melero + airebullas&airebullas.es +37667 + Office of the Auditor General of Norway + Stig Kristiansen + stig.kristiansen&riksrevisjonen.no +37668 + bit GmbH + M. Botzem + m.botzem&bit-germany.de +37669 + FONDEMI + Marco Saldivia + msaldivia&fondemi.gob.ve +37670 + Barling Bay LLC + Perry Minchew + pminchew&barlingbay.com +37671 + The Biostatistics Center - GWU + Aria Bamdad + aria&bsc.gwu.edu +37672 + VERSCOM INTERNATIONAL HOLDING UK LLP + Aydin Pirinccioglu + snmp.pen&verscom.com +37673 + Estech Systems, Inc. + Brian Berger + bberger&esi-estech.com +37674 + Heineken International + Jan den Otter + Jan.denotter&heineken.com +37675 + LoveBee + Phillip O'Donnell + admin.iana&lovebee.co.nz +37676 + Sutunam Co., Ltd. + Martin PANEL + network&sutunam.com +37677 + Linuxsoft s.r.o. + Ales Hakl + adh&linuxsoft.cz +37678 + Hall Research + Justin Ireland + justin&hallresearch.com +37679 + AGILiCOM + Frédéric BAHUAUD + f.bahuaud&agilicom.fr +37680 + Scott Ellis + Scott Ellis + mail&scottellis.com.au +37681 + Sinefa Pty Ltd + John Bothe + john&sinefa.com +37682 + AlexxHost + Alexey bogomolov + alexx.b84&gmail.com +37683 + TimoCom Soft- und Hardware GmbH + Marco Haack + hostmaster&timocom.com +37684 + Grupo Alsa + Pablo Alvarez Menendez + guardia&alsa.es +37685 + Online Marketing Solutions AG + Michael Junghans + notify&online-marketing-solutions.com +37686 + Lookout Mobile Security, Inc. + Ryan Dooley + ryan.dooley&mylookout.com +37687 + Bethesda Memorial Hospital + Leslie Durham + leslie.durham&bethesdahealthcare.com +37688 + ACE Computer bv + Stephen Day + stephen&ace.nl +37689 + unixtastic + Stephen Day + sd&unixtastic.com +37690 + JOTATEC + Julio Cesar Gomes da Silva + julio&jotatec.com.br +37691 + Broadcast Devices Inc. + Ron Kumetz + ron&broadcast-devices.com +37692 + StringIT + Jeroen Dekkers + iana&stringit.nl +37693 + Brattleboro Memorial Hospital + Jonathan Farina + jfarina&bmhvt.org +37694 + Tsubakimoto Chain Co. + Kohei Yamada + mitaro.sales&mitaro.gr.jp +37695 + Quantum Data Systems (HK) Ltd + Leonard Siu + info&quantum.com.hk +37696 + WIKA Polska S.A. + Maciej Czyznielewski + it&wikapolska.pl +37697 + Higher One + Ian Preston + ipreston&higherone.com +37698 + Customs and Border Protection + Thomas Lawson + Victor.T.Lawson&cbp.dhs.gov +37699 + BolzWachtel Dental Clinic + Christian Fohmann + edv&ipi-muc.de +37700 + Axed S.p.A. + Gennaro Coppola + sistemi&axed-technology.com +37701 + energie-m.de + Hans-Stefan Müller + mail&energie-m.de +37702 + Narodowy Fundusz Zdrowia - Centrala + Pawel Malara + informatyka&nfz.gov.pl +37703 + Mywindowslab.com + Laith Al Shamri + laith&live.it +37704 + Interconcept GmbH + Tobias Reibling + t.reibling&interconcept.de +37705 + CommSoft RMS LLC + Stewart Foote + sf&commsoft-rms.com +37706 + Netmedia Systems e. K. + Matthias Meinecke + info&nmsweb.de +37707 + Rocrail + Rob Versluis + info&rocrail.net +37708 + Systola Forwardingm GmbH + Roman Kuznetsov + rk&systola.de +37709 + S3 Satcom Ltd + John Kennett + john.kennett&s3sat.com +37710 + Dane E. Jones + Dane E. Jones + dane.jones&att.net +37711 + FileMaker Inc + Meena Rajvaidya + meena_rajvaidya&filemaker.com +37712 + Eurosistemi + Michael Lattari + michael&lattari.eu +37713 + Winextreme.org + Artem Pronichkin + artem&pronichkin.com +37714 + AppFolio, Inc. + Ross Harvey + noc&appfolio.com +37715 + FTN + Pascal Fontaine + pascal.fontaine&ftn.ch +37716 + Ville de Lausanne + Pascal Fontaine + securite.informatique&lausanne.ch +37717 + Herbert Smith LLP + Tom Maher + tom.maher&herbertsmith.com +37718 + Fresenius Vial + Franck Rakotonindrainy + franck.rakotonindrainy&fresenius-vial.fr +37719 + PT. Multi Structure + Muhammad Ibrahim Nurmansyah + muhammad.ibrahim&multistructure.co.id +37720 + CSR ZHUZHOU INSTITUTE CO LTD + xiaoyan jiang + jiangxy&teg.cn +37721 + OpenSys (M) Berhad + Zainun Romli + zromli&myopensys.com +37722 + Trusted Information Consulting Sp. z o.o. + Daniel Wachnik + daniel.wachnik&ticons.pl +37723 + ODIN technologies + Scott Barvick + sbarvick&odinrfid.com +37724 + Chalet Technologies Inc. + James Lin + jamesl&chalettech.com +37725 + Yupiq Corp + Paul Reimer + paul.reimer&yupiq.com End of Document
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/libwireshark.def ^
@@ -1,5 +1,5 @@ ; libwireshark.def -; $Id: libwireshark.def 34916 2010-11-16 21:18:03Z gerald $ +; $Id: libwireshark.def 36571 2011-04-12 00:02:47Z gerald $ ; Add symbols that should be exported out of libwireshark.dll, ; e.g. when used inside the GUI. @@ -705,6 +705,7 @@ proto_construct_match_selected_string proto_data DATA proto_enable_all +proto_field_is_referenced proto_find_field_from_offset proto_find_finfo proto_frame DATA
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/epan/sminmpec.c ^
@@ -2364,7 +2364,7 @@ { 2349, "Mission Critical Software, Inc." }, { 2350, "Data Research and Applications, Inc." }, { 2351, "Resonate Inc." }, - { 2352, "RedBack Networks" }, + { 2352, "Ericsson, Inc. (previous was 'RedBack Networks')" }, { 2353, "Nexware Corporation" }, { 2354, "ADC Wireless Systems" }, { 2355, "ITIS" }, @@ -15511,7 +15511,7 @@ { 15620, "Ceiva Logic" }, { 15621, "ZP Technologies" }, { 15622, "APTARE" }, - { 15623, "Darryl Ross" }, + { 15623, "Bachblue Pty Ltd t/a AFOYI" }, { 15624, "Skopeo LLC" }, { 15625, "Excedent Technologies" }, { 15626, "Campus Crusade Asia Ltd" }, @@ -18406,7 +18406,7 @@ { 18519, "Jahi Networks Inc." }, { 18520, "APSI Inc." }, { 18521, "TakeNET" }, - { 18522, "Barmala" }, + { 18522, "Unassigned" }, { 18523, "Liverton Limited" }, { 18524, "Empresa Metal\0303\0272rgica Central de Acero \"Jos\0303\0251 Valdes Reyes\"" }, { 18525, "robinbowes.com" }, @@ -23288,7 +23288,7 @@ { 23404, "DAVANTEL" }, { 23405, "JSC Sahalinmorsvjaz" }, { 23406, "LDAPtive Pty Ltd" }, - { 23407, "Bryant Broadcast and Data Communications" }, + { 23407, "Bryant Unlimited" }, { 23408, "Rhombus Systems Ltd." }, { 23409, "Torque.net inc." }, { 23410, "Hackstrike Ltd." }, @@ -26561,7 +26561,7 @@ { 26677, "Datactics Ltd." }, { 26678, "Canadian Space Agency" }, { 26679, "EMCom sp. z o.o." }, - { 26680, "General Dynamics UK Limited" }, + { 26680, "General Dynamics United Kingdom Limited" }, { 26681, "Phi Theta Kappa International Honor Society" }, { 26682, "lohnet.org" }, { 26683, "Vinci Consulting Corp" }, @@ -26815,7 +26815,7 @@ { 26931, "Reaktor Innovations Oy" }, { 26932, "Visma Software ASA" }, { 26933, "Tridion B.V." }, - { 26934, "TattileS.r.l." }, + { 26934, "Tattile S.r.l." }, { 26935, "Oseo" }, { 26936, "Ville de Marseille" }, { 26937, "Yahata Kosei Hospital" }, @@ -31123,7 +31123,7 @@ { 31240, "i-move internet gmbh" }, { 31241, "Cross Industries AG" }, { 31242, "Foster Link Inc." }, - { 31243, "Interhost ANS" }, + { 31243, "Interhost AS" }, { 31244, "Fresh Media Group" }, { 31245, "Brandon Werner" }, { 31246, "Realmagic Technology Ltd." }, @@ -35574,7 +35574,7 @@ { 35699, "Cummins Power Generation" }, { 35700, "Tyrian Technical Consulting" }, { 35701, "phpcoms" }, - { 35702, "Optical Components & Systems" }, + { 35702, "NTO IRE-Polus, Ltd. (previous was 'Optical Components & Systems')" }, { 35703, "JSC DevLab" }, { 35704, "SALUC" }, { 35705, "HWS Informationssysteme GmbH" }, @@ -36083,7 +36083,7 @@ { 36209, "RGazdi Kft." }, { 36210, "Centre hospitalier de l'Universit\0303\0251 de Montr\0303\0251al" }, { 36211, "The Catholic University of America" }, - { 36212, "Higher Education Bridge Certification Authority, Inc." }, + { 36212, "Research and Education Bridge Certification Authority, Inc." }, { 36213, "SIA \"INBOKSS\"" }, { 36214, "Galaxy Telecom Technologies Ltd" }, { 36215, "Greek Universities Network" }, @@ -37350,6 +37350,253 @@ { 37476, "ViaThinkSoft" }, { 37477, "SIGNALIS" }, { 37478, "The Karthikeyans" }, + { 37479, "Warimax Ltd." }, + { 37480, "SkySQL Ab" }, + { 37481, "Canyons School District" }, + { 37482, "Stewart McKelvey" }, + { 37483, "A.5 Security Consulting Group, SL" }, + { 37484, "PT. Teknologi Multimedia Indonesia" }, + { 37485, "Alico Graphic Web Designs" }, + { 37486, "OOO Verified Solutions" }, + { 37487, "Nicolas Ledez" }, + { 37488, "Ridgetop Group, Inc." }, + { 37489, "scality" }, + { 37490, "ENCO Systems, Inc." }, + { 37491, "FTM Systems Kft." }, + { 37492, "Mindstorm Networks" }, + { 37493, "Cyberlink AG" }, + { 37494, "Vincent de Lau" }, + { 37495, "MARS Advanced Research Systems" }, + { 37496, "ZHEJIANG DAHUA TECHNOLOGY CO.,LTD" }, + { 37497, "Delphi Innovations" }, + { 37498, "NasuTek Enterprises" }, + { 37499, "NetSoft Distributed Solutions Pty Ltd" }, + { 37500, "Schmid Industrieholding" }, + { 37501, "Progetto Archivio S.r.l." }, + { 37502, "kyberna AG" }, + { 37503, "Seratel Technology SAL" }, + { 37504, "ONETASTIC S.r.l." }, + { 37505, "WSO2 Inc." }, + { 37506, "Biodec s.r.l." }, + { 37507, "Freenet Liberec, o.s." }, + { 37508, "AQUAPHOR" }, + { 37509, "DirectorySelfService" }, + { 37510, "SilentSystem" }, + { 37511, "Future Dynamics Interstellar" }, + { 37512, "Systems Corps" }, + { 37513, "Citkomm" }, + { 37514, "Raphael Frasch GmbH" }, + { 37515, "Avajadi Solutions" }, + { 37516, "Software Integration Development" }, + { 37517, "Sveriges Radio AB" }, + { 37518, "Firewall Services" }, + { 37519, "Draexlmaier Group" }, + { 37520, "Kassenaerztliche Vereinigung Baden-Wuerttemberg" }, + { 37521, "Network Pipeline Inc." }, + { 37522, "Kousec Software, Inc." }, + { 37523, "Alyrica Networks Inc" }, + { 37524, "Com1 Communication Solutions B.V." }, + { 37525, "Infovide-Matrix" }, + { 37526, "WellCentive, LLC" }, + { 37527, "Signalsky Communication Co., Ltd." }, + { 37528, "Crompton Greaves Limited" }, + { 37529, "A and A System Co., Ltd." }, + { 37530, "WebRadar" }, + { 37531, "Frank Moeller" }, + { 37532, "BBT Technology Corp." }, + { 37533, "Delta Electronics (Thailand) Public Co.,Ltd" }, + { 37534, "uher.info" }, + { 37535, "microDATA GIS, Inc." }, + { 37536, "NRG2 B.V." }, + { 37537, "JADE" }, + { 37538, "Big Switch Networks" }, + { 37539, "Code One GmbH" }, + { 37540, "N3 Labs Sdn. Bhd." }, + { 37541, "COMPUTER HI-TECH INC." }, + { 37542, "Depelmaan Ltd" }, + { 37543, "Crowe Horwath LLP" }, + { 37544, "UM Labs Ltd" }, + { 37545, "GFI Solutions Group inc." }, + { 37546, "BNP Paribas Fortis group" }, + { 37547, "Europapier International GmbH" }, + { 37548, "CenturyLink" }, + { 37549, "C&T sas" }, + { 37550, "Flexenclosure AB" }, + { 37551, "IFM Infomaster SpA" }, + { 37552, "RAYCORE TAIWAN CO., LTD." }, + { 37553, "FRDLWEB" }, + { 37554, "Archbold Medical Center" }, + { 37555, "Enabling Technologies Company, Inc." }, + { 37556, "Brandwatch" }, + { 37557, "Pathology Associates Medical Laboratories, LLC" }, + { 37558, "VM-DG Hemmert & Schuster GbR" }, + { 37559, "Socialcast" }, + { 37560, "Simena, LLC" }, + { 37561, "Beijing KEMACOM technologies Co., Ltd." }, + { 37562, "Hangzhou Yuwan Technology Co., Ltd. " }, + { 37563, "NNS - Nigl Network Solutions" }, + { 37564, "Everest Display Inc." }, + { 37565, "Struck Innovative Systeme GmbH" }, + { 37566, "Discovery Reply S.r.l." }, + { 37567, "Alliant Techsystems Inc." }, + { 37568, "Commend International GmbH" }, + { 37569, "Vocative Ltd." }, + { 37570, "ELFF Tech" }, + { 37571, "KVUC" }, + { 37572, "Panini s.p.a." }, + { 37573, "LightSoft Research Ltd." }, + { 37574, "Alberta Distance Learning Centre" }, + { 37575, "Infobip LTD" }, + { 37576, "NovelSat" }, + { 37577, "Branch of LLC \"Tabak-Invest\" Trade Center \"Korona\"" }, + { 37578, "Samworth Brothers Ltd" }, + { 37579, "Synetrix Holdings Limited" }, + { 37580, "Chao-Inn elementary school" }, + { 37581, "Mika timing GmbH" }, + { 37582, "Theobroma Systems Design und Consulting GmbH" }, + { 37583, "Surescripts, LLC" }, + { 37584, "Gary Hawkins" }, + { 37585, "QDIAGNOSTICA" }, + { 37586, "E-sektionens Teletekniska Avdelning" }, + { 37587, "QualVu, Inc." }, + { 37588, "QingDao Easytelecom Co., Ltd." }, + { 37589, "Institut de l'Ebre" }, + { 37590, "Meyer Burger Technology AG" }, + { 37591, "Reggiani" }, + { 37592, "Ev.-Luth. Br\0303\0274dergemeinde Enger e.V." }, + { 37593, "Platform-a Arastirma Gelistirme Koordinasyon Hizmetleri A. S." }, + { 37594, "Netmining LLC" }, + { 37595, "Geomarine Ltd" }, + { 37596, "Agri-hitech LLC" }, + { 37597, "Decatur Hospital Authority dba Wise Regional Health System" }, + { 37598, "CipherCloud, Inc." }, + { 37599, "Meontrust Inc." }, + { 37600, "ledeuns.org" }, + { 37601, "Xech S.r.l." }, + { 37602, "Spider Software GmbH" }, + { 37603, "Meami.org" }, + { 37604, "RMG Tech (Malaysia) Sdn Bhd" }, + { 37605, "MCX Telecom 2 Sp. z o.o." }, + { 37606, "\"SM Finance\",JSC" }, + { 37607, "Cascada Software & Consulting" }, + { 37608, "CareEvolution, Inc" }, + { 37609, "Dang Networks Inc." }, + { 37610, "The TuxClan" }, + { 37611, "CJSC TSI Service" }, + { 37612, "Kassen\0303\0244rztliche Vereinigung Niedersachsen " }, + { 37613, "ennovatis GmbH" }, + { 37614, "Siqura" }, + { 37615, "V Labs Informatica Ltda" }, + { 37616, "SATS Holding AB" }, + { 37617, "Ventek Sistemas e Automa\0303\0247\0303\0243o" }, + { 37618, "Tumblr" }, + { 37619, "SCHIEx" }, + { 37620, "Alegent Health" }, + { 37621, "Ename, S.A." }, + { 37622, "Chrysalis Utah, Inc." }, + { 37623, "Red Hound Software, Inc." }, + { 37624, "M & PI Software S.r.l." }, + { 37625, "Mike Johnson" }, + { 37626, "STC AKTOR" }, + { 37627, "ensemble" }, + { 37628, "NETRATOR Andrzej Dopierala" }, + { 37629, "COMTEC NET" }, + { 37630, "Iron Technology Solutions Ltd" }, + { 37631, "Plasmatronics Pty Ltd" }, + { 37632, "The Frontier Group" }, + { 37633, "Bolnisnica Golnik KOPA" }, + { 37634, "Achieve3000, Inc." }, + { 37635, "Awarepoint" }, + { 37636, "Catholic Health" }, + { 37637, "Henry County Hospital" }, + { 37638, "Infinitrum Co., Ltd" }, + { 37639, "ECYS S.A." }, + { 37640, "Federal Cardiovascular surgery center" }, + { 37641, "Neebula Systems" }, + { 37642, "GK \"SoftExpert\"" }, + { 37643, "IBM BTO Business Consulting Services Sp. z o.o." }, + { 37644, "Fuzhou Ucore Information Technologies Co,.Ltd" }, + { 37645, "Medical Data Express" }, + { 37646, "Wyoming Valley Health Care System" }, + { 37647, "Ministry of Interior - UAE (Governmental Entity)" }, + { 37648, "Kalmia Technology Co, LLC" }, + { 37649, "Helium Inc." }, + { 37650, "Shared Technology Services Group, Inc." }, + { 37651, "JoyStem Web Services Private Limited" }, + { 37652, "I-TECH" }, + { 37653, "Lamby" }, + { 37654, "Moccu GmbH" }, + { 37655, "Far South Networks" }, + { 37656, "Broxtowe Borough Council" }, + { 37657, "Erskine Design" }, + { 37658, "Czech National Bank" }, + { 37659, "ControlCircle Ltd." }, + { 37660, "Unit of Research of Technologies of Information and Communication (UTIC)" }, + { 37661, "Transcon Electronic Systems spol. s r. o." }, + { 37662, "Ablerex Electronic Co., Ltd." }, + { 37663, "nGen - Niagara Interactive Media Generator" }, + { 37664, "Zone de Police Midi" }, + { 37665, "R. W. Beckett Corporation" }, + { 37666, "Airebullas C.B." }, + { 37667, "Office of the Auditor General of Norway" }, + { 37668, "bit GmbH" }, + { 37669, "FONDEMI" }, + { 37670, "Barling Bay LLC" }, + { 37671, "The Biostatistics Center - GWU" }, + { 37672, "VERSCOM INTERNATIONAL HOLDING UK LLP" }, + { 37673, "Estech Systems, Inc." }, + { 37674, "Heineken International" }, + { 37675, "LoveBee" }, + { 37676, "Sutunam Co., Ltd." }, + { 37677, "Linuxsoft s.r.o." }, + { 37678, "Hall Research" }, + { 37679, "AGILiCOM" }, + { 37680, "Scott Ellis" }, + { 37681, "Sinefa Pty Ltd" }, + { 37682, "AlexxHost" }, + { 37683, "TimoCom Soft- und Hardware GmbH" }, + { 37684, "Grupo Alsa" }, + { 37685, "Online Marketing Solutions AG" }, + { 37686, "Lookout Mobile Security, Inc." }, + { 37687, "Bethesda Memorial Hospital" }, + { 37688, "ACE Computer bv" }, + { 37689, "unixtastic" }, + { 37690, "JOTATEC" }, + { 37691, "Broadcast Devices Inc." }, + { 37692, "StringIT" }, + { 37693, "Brattleboro Memorial Hospital" }, + { 37694, "Tsubakimoto Chain Co." }, + { 37695, "Quantum Data Systems (HK) Ltd" }, + { 37696, "WIKA Polska S.A." }, + { 37697, "Higher One" }, + { 37698, "Customs and Border Protection" }, + { 37699, "BolzWachtel Dental Clinic" }, + { 37700, "Axed S.p.A." }, + { 37701, "energie-m.de" }, + { 37702, "Narodowy Fundusz Zdrowia - Centrala" }, + { 37703, "Mywindowslab.com" }, + { 37704, "Interconcept GmbH" }, + { 37705, "CommSoft RMS LLC" }, + { 37706, "Netmedia Systems e. K." }, + { 37707, "Rocrail" }, + { 37708, "Systola Forwardingm GmbH" }, + { 37709, "S3 Satcom Ltd" }, + { 37710, "Dane E. Jones" }, + { 37711, "FileMaker Inc" }, + { 37712, "Eurosistemi" }, + { 37713, "Winextreme.org" }, + { 37714, "AppFolio, Inc." }, + { 37715, "FTN" }, + { 37716, "Ville de Lausanne" }, + { 37717, "Herbert Smith LLP" }, + { 37718, "Fresenius Vial" }, + { 37719, "PT. Multi Structure" }, + { 37720, "CSR ZHUZHOU INSTITUTE CO LTD" }, + { 37721, "OpenSys (M) Berhad" }, + { 37722, "Trusted Information Consulting Sp. z o.o." }, + { 37723, "ODIN technologies" }, + { 37724, "Chalet Technologies Inc." }, + { 37725, "Yupiq Corp" }, { 0, NULL} };
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/gtk/compare_stat.c ^
@@ -3,7 +3,7 @@ * Copyright 2008 Vincenzo Condoleo, Christophe Dirac, Reto Ruoss * supported by HSR (Hochschule Rapperswil) * - * $Id: compare_stat.c 32545 2010-04-23 21:21:11Z gerald $ + * $Id: compare_stat.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -718,8 +718,11 @@ const char filter=NULL; GString error_string; - if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf,%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ + if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ if(pos){ + if(*(optarg+pos)==',') + filter=optarg+pos+1; + else filter=optarg+pos; } else { filter=NULL;
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/gtk/export_object.c ^
@@ -2,7 +2,7 @@ * Common routines for tracking & saving objects found in streams of data * Copyright 2007, Stephen Fisher (see AUTHORS file) * - * $Id: export_object.c 28645 2009-06-05 22:42:47Z guy $ + * $Id: export_object.c 36646 2011-04-14 21:26:25Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -53,6 +53,7 @@ #include <gtk/main.h> #include <gtk/stock_icons.h> #include "gtk/export_object.h" +#include <string.h> enum { EO_PKT_NUM_COLUMN, @@ -186,6 +187,78 @@ window_destroy(save_as_w); } +#define HINIBBLE(x) (((x) >> 4) & 0xf) +#define LONIBBLE(x) ((x) & 0xf) +#define HEXTOASCII(x) (((x) < 10) ? ((x) + '0') : ((x) - 10 + 'a')) +#define MAXFILELEN 255 + +static GString eo_rename(GString gstr, gchar dup) +{ + gchar tmp[4] = "( )"; + gchar tmp_ptr; + GString ext_str; + + tmp[1] = dup; + if ( (tmp_ptr = strrchr(gstr->str, '.')) != NULL ) { + /* Retain the extension / + ext_str = g_string_new(tmp_ptr); + gstr = g_string_truncate(gstr, gstr->len - ext_str->len); + if ( gstr->len >= (MAXFILELEN - (strlen(tmp) + ext_str->len)) ) + gstr = g_string_truncate(gstr, MAXFILELEN - (strlen(tmp) + ext_str->len)); + gstr = g_string_append(gstr, tmp); + gstr = g_string_append(gstr, ext_str->str); + g_string_free(ext_str, TRUE); + } + else { + if ( gstr->len >= (MAXFILELEN - strlen(tmp)) ) + gstr = g_string_truncate(gstr, MAXFILELEN - strlen(tmp)); + gstr = g_string_append(gstr, tmp); + } + return gstr; +} + +static GString +eo_massage_str(const gchar in_str, gsize maxlen, gchar dup) +{ + gchar tmp_ptr; + /* The characters in "reject" come from: + * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx. + * Add to the list as necessary for other OS's. + / + const gchar reject = "<>:\"/\\\|?" + "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a" + "\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14" + "\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"; + GString out_str; + GString ext_str; + + out_str = g_string_new(""); + + / Find all disallowed characters/bytes and replace them with %xx / + while ( (tmp_ptr = strpbrk(in_str, reject)) != NULL ) { + out_str = g_string_append_len(out_str, in_str, tmp_ptr - in_str); + out_str = g_string_append_c(out_str, '%'); + out_str = g_string_append_c(out_str, HEXTOASCII(HINIBBLE(tmp_ptr))); + out_str = g_string_append_c(out_str, HEXTOASCII(LONIBBLE(tmp_ptr))); + in_str = tmp_ptr + 1; + } + out_str = g_string_append(out_str, in_str); + if ( out_str->len > maxlen ) { + if ( (tmp_ptr = strrchr(out_str->str, '.')) != NULL ) { + / Retain the extension / + ext_str = g_string_new(tmp_ptr); + out_str = g_string_truncate(out_str, maxlen - ext_str->len); + out_str = g_string_append(out_str, ext_str->str); + g_string_free(ext_str, TRUE); + } + else + out_str = g_string_truncate(out_str, maxlen); + } + if ( dup != '0' ) + out_str = eo_rename(out_str, dup); + return out_str; +} + static void eo_save_all_clicked_cb(GtkWidget widget _U_, gpointer arg) { @@ -195,6 +268,9 @@ GtkWidget save_in_w; GSList slist = object_list->entries; gboolean all_saved = TRUE; + gchar save_in_path; + GString safe_filename; + int count = 0; save_in_w = file_selection_new("Wireshark: Save All Objects In ...", FILE_SELECTION_CREATE_FOLDER); @@ -206,9 +282,20 @@ while(slist) { entry = slist->data; - save_as_fullpath = g_build_filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_in_w)), entry->filename, NULL); - - if (!eo_save_entry(save_as_fullpath, entry, FALSE)) + save_in_path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(save_in_w)); + if ( strlen(save_in_path) < MAXFILELEN ) { + do { + safe_filename = eo_massage_str(entry->filename, + MAXFILELEN - strlen(save_in_path), count \| 0x30); + save_as_fullpath = g_build_filename( + save_in_path, safe_filename->str, NULL); + g_string_free(safe_filename, TRUE); + } while ( g_file_test(save_as_fullpath, G_FILE_TEST_EXISTS) && (++count < 10) ); + count = 0; + if (!eo_save_entry(save_as_fullpath, entry, TRUE)) + all_saved = FALSE; + } + else all_saved = FALSE; slist = slist->next;
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/gtk/new_packet_list.c ^
@@ -3,7 +3,7 @@ * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * Co-authors Anders Broman, Kovarththanan Rajaratnam and Stig Bjorlykke. * - * $Id: new_packet_list.c 34417 2010-10-08 00:28:43Z gerald $ + * $Id: new_packet_list.c 36191 2011-03-14 16:19:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -263,19 +263,37 @@ gtk_widget_show_all(win); } +/* Process sort request; + * order: GTK_SORT_ASCENDING or GTK_SORT_DESCENDING + * sort_indicator: TRUE: set sort_indicator on column; FALSE: don't set .... + * + * If necessary, columns are first "columnized" for all rows in the packet-list; If this + * is not completed (i.e., stopped), then the sort request is aborted. + / static void -new_packet_list_sort_column (gint col_id, GtkTreeViewColumn col, GtkSortType order) +new_packet_list_sort_column (gint col_id, GtkTreeViewColumn col, GtkSortType order, gboolean sort_indicator) { - GtkTreeViewColumn prev_col = (GtkTreeViewColumn ) + GtkTreeViewColumn prev_col; + + if (col == NULL) { + col = gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col_id); + } + g_assert(col); + + if (!packet_list_do_packet_list_dissect_and_cache_all(packetlist, col_id)) { + return; /* "stopped": do not try to sort / + } + + prev_col = (GtkTreeViewColumn ) g_object_get_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY); if (prev_col) { gtk_tree_view_column_set_sort_indicator(prev_col, FALSE); } - gtk_tree_view_column_set_sort_indicator(col, TRUE); + gtk_tree_view_column_set_sort_indicator(col, sort_indicator); gtk_tree_view_column_set_sort_order (col, order); g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY, col); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order); /* triggers sort callback / scroll_to_current (); } @@ -294,13 +312,11 @@ return; if (!gtk_tree_view_column_get_sort_indicator(col)) { - new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE); } else if (order == GTK_SORT_ASCENDING) { - new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE); } else { - gtk_tree_view_column_set_sort_indicator(col, FALSE); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING); - scroll_to_current (); + new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE); } } @@ -427,15 +443,13 @@ switch (action) { case COLUMN_SELECTED_SORT_ASCENDING: - new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE); break; case COLUMN_SELECTED_SORT_DESCENDING: - new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING); + new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE); break; case COLUMN_SELECTED_SORT_NONE: - gtk_tree_view_column_set_sort_indicator(col, FALSE); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING); - scroll_to_current (); + new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE); break; case COLUMN_SELECTED_ALIGN_LEFT: new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_LEFT); @@ -672,9 +686,7 @@ / XXX is this correct in all cases? * Reset the sort column, use packetlist as model in case the list is frozen. */ - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), - 0, GTK_SORT_ASCENDING); - + new_packet_list_sort_column(0, NULL, GTK_SORT_ASCENDING, FALSE); } void
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/gtk/packet_list_store.c ^
@@ -3,7 +3,7 @@ * Copyright 2008-2009, Stephen Fisher (see AUTHORS file) * * Co-authors Anders Broman and Kovarththanan Rajaratnam. * - * $Id: packet_list_store.c 33867 2010-08-20 23:04:06Z gerald $ + * $Id: packet_list_store.c 36191 2011-03-14 16:19:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -631,9 +631,9 @@ g_return_val_if_fail(PACKETLIST_IS_LIST(packet_list), -1); newrecord = se_alloc(sizeof(PacketListRecord)); - newrecord->columnized = FALSE; - newrecord->colorized = FALSE; - newrecord->fdata = fdata; + newrecord->columnized = FALSE; + newrecord->colorized = FALSE; + newrecord->fdata = fdata; newrecord->physical_pos = PACKET_LIST_RECORD_COUNT(packet_list->physical_rows); if (fdata->flags.passed_dfilter \|\| fdata->flags.ref_time) { @@ -645,14 +645,11 @@ PACKET_LIST_RECORD_APPEND(packet_list->physical_rows, newrecord); - if (packet_list->columnized) { - /* XXX, dissect? / - packet_list->columnized = FALSE; - } + packet_list->columnized = FALSE; / XXX, dissect? / - / + /* * Issue a row_inserted signal if the model is connected - * and the row is vissible. + * and the row is visible. / if((model)&&(newrecord->visible_pos!=-1)) packet_list_row_inserted(packet_list, newrecord->visible_pos); @@ -774,7 +771,15 @@ return FALSE; } -static void +/ packet_list_dissect_and_cache_all() + * returns: + * TRUE if columnization completed; + * packet_list->columnized set to TRUE; + * FALSE: columnization did not complete (i.e., was stopped by the user); + * packet_list->columnized unchanged (i.e., FALSE). + / + +static gboolean packet_list_dissect_and_cache_all(PacketList packet_list) { PacketListRecord record; @@ -807,47 +812,70 @@ main_window_update(); for (progbar_loop_var = 0; progbar_loop_var < progbar_loop_max; ++progbar_loop_var) { - record = PACKET_LIST_RECORD_GET(packet_list->physical_rows, progbar_loop_var); - packet_list_dissect_and_cache_record(packet_list, record, TRUE, FALSE); + record = PACKET_LIST_RECORD_GET(packet_list->physical_rows, progbar_loop_var); + packet_list_dissect_and_cache_record(packet_list, record, TRUE, FALSE); - / Create the progress bar if necessary. - We check on every iteration of the loop, so that it takes no - longer than the standard time to create it (otherwise, for a - large file, we might take considerably longer than that standard - time in order to get to the next progress bar step). / - if (progbar == NULL) - progbar = delayed_create_progress_dlg("Construct", "Columns", - TRUE, &progbar_stop_flag, - &progbar_start_time, progbar_val); - - if (progbar_loop_var >= progbar_nextstep) { - / let's not divide by zero. We should never be started - * with count == 0, so let's assert that / - g_assert(progbar_loop_max > 0); - - progbar_val = (gfloat) progbar_loop_var / progbar_loop_max; - - if (progbar != NULL) { - g_snprintf(progbar_status_str, sizeof(progbar_status_str), - "%u of %u frames", progbar_loop_var+1, progbar_loop_max); - update_progress_dlg(progbar, progbar_val, progbar_status_str); - } + / Create the progress bar if necessary. + We check on every iteration of the loop, so that it takes no + longer than the standard time to create it (otherwise, for a + large file, we might take considerably longer than that standard + time in order to get to the next progress bar step). / + if (progbar == NULL) + / Note: The following may call gtk_main_iteration() which will / + / allow certain "interupts" to happen during this code. / + / (Note that the progress_dlg window is set to "modal" / + / so that clicking on other windows is disabled). / + progbar = delayed_create_progress_dlg("Construct", "Columns", + TRUE, &progbar_stop_flag, + &progbar_start_time, progbar_val); + + if (progbar_loop_var >= progbar_nextstep) { + / let's not divide by zero. We should never be started + * with count == 0, so let's assert that / + g_assert(progbar_loop_max > 0); + + progbar_val = (gfloat) progbar_loop_var / progbar_loop_max; + + if (progbar != NULL) { + g_snprintf(progbar_status_str, sizeof(progbar_status_str), + "%u of %u frames", progbar_loop_var+1, progbar_loop_max); + / Note: See comment above re use of gtk_main_iteration() / + update_progress_dlg(progbar, progbar_val, progbar_status_str); + } - progbar_nextstep += progbar_quantum; - } + progbar_nextstep += progbar_quantum; + } - if (progbar_stop_flag) { - / Well, the user decided to abort the resizing... / - break; - } + if (progbar_stop_flag) { + / Well, the user decided to abort ... / + break; + } } - / We're done resizing the columns; destroy the progress bar if it - was created. / + / We're done; destroy the progress bar if it was created. / if (progbar != NULL) - destroy_progress_dlg(progbar); + destroy_progress_dlg(progbar); + + if (progbar_stop_flag) { + return FALSE; / user aborted before columnization completed / + } packet_list->columnized = TRUE; + return TRUE; +} + +/ packet_list_do_packet_list_dissect_and_cache_all() + * returns: + * TRUE: if columnization not needed or columnization completed; + * FALSE: columnization did not complete (i.e., stopped by the user) + / +gboolean +packet_list_do_packet_list_dissect_and_cache_all(PacketList packet_list, gint sort_col_id) +{ + if (!packet_list_column_contains_values(packet_list, sort_col_id)) { + return packet_list_dissect_and_cache_all(packet_list); + } + return TRUE; } static void @@ -872,9 +900,6 @@ if(PACKET_LIST_RECORD_COUNT(packet_list->physical_rows) == 0) return; - if (!packet_list_column_contains_values(packet_list, sort_col_id)) - packet_list_dissect_and_cache_all(packet_list); - packet_list_resort(packet_list); /* emit "sort-column-changed" signal to tell any tree views @@ -931,7 +956,7 @@ /* Attempt to convert to numbers / double num_a = atof(a->fdata->col_text[sort_id]); double num_b = atof(b->fdata->col_text[sort_id]); - + if (num_a < num_b) return -1; else if (num_a > num_b) @@ -956,17 +981,12 @@ g_assert(b->fdata->col_text[sort_id]); if(a->fdata->col_text[sort_id] == b->fdata->col_text[sort_id]) - return 0; / not always NULL, but anyway no need to call strcmp() / - - if((a->fdata->col_text[sort_id]) && (b->fdata->col_text[sort_id])) { - if (cfile.cinfo.col_fmt[sort_id] == COL_CUSTOM) { - return packet_list_compare_custom (sort_id, a, b); - } - return strcmp(a->fdata->col_text[sort_id], b->fdata->col_text[sort_id]); - } else - return (a->fdata->col_text[sort_id] == NULL) ? -1 : 1; + return 0; / no need to call strcmp() / - g_return_val_if_reached(0); + if (cfile.cinfo.col_fmt[sort_id] == COL_CUSTOM) { + return packet_list_compare_custom (sort_id, a, b); + } + return strcmp(a->fdata->col_text[sort_id], b->fdata->col_text[sort_id]); } static gint @@ -1089,7 +1109,13 @@ gboolean create_proto_tree; union wtap_pseudo_header pseudo_header; / Packet pseudo_header / guint8 pd[WTAP_MAX_PACKET_SIZE]; / Packet data / - + + / XXX: Does it work to check if the record is already columnized/colorized ? + * i.e.: test record->columnized and record->colorized and just return + * if they're both TRUE. + * Note: Part of the patch submitted with Bug #4273 had code to do this but it + * was commented out in the patch and was not included in SVN #33011. + / fdata = record->fdata; if (dissect_columns) @@ -1119,7 +1145,7 @@ if (dissect_columns) { / "Stringify" non frame_data vals / - epan_dissect_fill_in_columns(&edt, FALSE, FALSE / fill_fd_colums /); + epan_dissect_fill_in_columns(&edt, FALSE, FALSE / fill_fd_columns /); for(col = 0; col < cinfo->num_cols; ++col) { / Skip columns based om frame_data because we already store those. / @@ -1262,7 +1288,7 @@ guint widest_column_len = 0; if (!packet_list->columnized) - packet_list_dissect_and_cache_all(packet_list); + packet_list_dissect_and_cache_all(packet_list); / XXX: need to handle case of "incomplete" ? */ for(vis_idx = 0; vis_idx < PACKET_LIST_RECORD_COUNT(packet_list->visible_rows); ++vis_idx) { record = PACKET_LIST_RECORD_GET(packet_list->visible_rows, vis_idx);
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/gtk/packet_list_store.h ^
@@ -1,6 +1,6 @@ /* packet_list_store.h * - * $Id: packet_list_store.h 31083 2009-11-26 08:52:44Z stig $ + * $Id: packet_list_store.h 36191 2011-03-14 16:19:41Z wmeier $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -113,6 +113,7 @@ gint packet_list_append_record(PacketList packet_list, frame_data fdata); void packet_list_change_record(PacketList packet_list, guint row, gint col, column_info cinfo); void packet_list_dissect_and_cache_iter(PacketList packet_list, GtkTreeIter iter, gboolean dissect_columns, gboolean dissect_color); +gboolean packet_list_do_packet_list_dissect_and_cache_all(PacketList packet_list, gint sort_col_id); void packet_list_reset_colorized(PacketList packet_list); const char* packet_list_get_widest_column_string(PacketList *packet_list, gint col);
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/manuf ^
@@ -4,7 +4,7 @@ # # /etc/manuf - Ethernet vendor codes, and well-known MAC addresses # -# $Id: manuf 36081 2011-02-27 17:04:32Z gerald $ +# $Id: manuf 36535 2011-04-10 16:04:37Z gerald $ # # Laurent Deniel <laurent.deniel [AT] free.fr> # @@ -518,7 +518,7 @@ 00:01:CF AlphaDataP # Alpha Data Parallel Systems, Ltd. 00:01:D0 Vitalpoint # VitalPoint, Inc. 00:01:D1 ConetCommu # CoNet Communications, Inc. -00:01:D2 MacpowerPe # MacPower Peripherals, Ltd. +00:01:D2 Inxtron # inXtron, Inc. 00:01:D3 Paxcomm # PAXCOMM, Inc. 00:01:D4 LeisureTim # Leisure Time, Inc. 00:01:D5 HaedongInf # HAEDONG INFO & COMM CO., LTD @@ -1265,7 +1265,7 @@ 00:04:BA KddMediaWi # KDD Media Will Corporation 00:04:BB Bardac # Bardac Corporation 00:04:BC Giantec # Giantec, Inc. -00:04:BD MotorolaBc # Motorola BCS +00:04:BD MotorolaMo # Motorola Mobility, Inc. 00:04:BE Optxcon # OptXCon, Inc. 00:04:BF Versalogic # VersaLogic Corp. 00:04:C0 Cisco # Cisco Systems, Inc. @@ -1882,6 +1882,7 @@ 00:07:23 ElconSyste # ELCON Systemtechnik GmbH 00:07:24 Telemax # Telemax Co., Ltd. 00:07:25 BematechIn # Bematech International Corp. +00:07:26 ShenzhenGo # Shenzhen Gongjin Electronics Co., Ltd. 00:07:27 ZiHk # Zi Corporation (HK) Ltd. 00:07:28 NeoTelecom # Neo Telecom 00:07:29 KistlerIns # Kistler Instrumente AG @@ -2111,7 +2112,7 @@ 00:08:0B BirkaBpaIn # Birka BPA Informationssystem AB 00:08:0C VdaElettro # VDA Elettronica spa 00:08:0D Toshiba -00:08:0E MotorolaBc # Motorola, BCS +00:08:0E MotorolaMo # Motorola Mobility, Inc. 00:08:0F ProximionF # Proximion Fiber Optics AB 00:08:10 KeyTechnol # Key Technology, Inc. 00:08:11 Voix # VOIX Corporation @@ -2240,7 +2241,7 @@ 00:08:AB EnerlinxCo # EnerLinx.com, Inc. 00:08:AC Eltromat # Eltromat GmbH 00:08:AD Toyo-Linx # Toyo-Linx Co., Ltd. -00:08:AE Packetfron # PacketFront Sweden AB +00:08:AE Packetfron # PacketFront International AB 00:08:AF Novatec # Novatec Corporation 00:08:B0 BktelCommu # BKtel communications GmbH 00:08:B1 Proquent # ProQuent Systems @@ -2839,7 +2840,7 @@ 00:0B:03 TaekwangIn # Taekwang Industrial Co., Ltd 00:0B:04 Volktek # Volktek Corporation 00:0B:05 PacificBro # Pacific Broadband Networks -00:0B:06 MotorolaBc # Motorola BCS +00:0B:06 MotorolaMo # Motorola Mobility, Inc. 00:0B:07 VoxpathNet # Voxpath Networks 00:0B:08 PillarData # Pillar Data Systems 00:0B:09 IfoundrySi # Ifoundry Systems Singapore @@ -3318,7 +3319,7 @@ 00:0C:E2 Rolls-Royc # Rolls-Royce 00:0C:E3 OptionInte # Option International N.V. 00:0C:E4 NeurocomIn # NeuroCom International, Inc. -00:0C:E5 MotorolaBc # Motorola BCS +00:0C:E5 MotorolaMo # Motorola Mobility, Inc. 00:0C:E6 MeruNetwor # Meru Networks Inc 00:0C:E7 Mediatek # MediaTek Inc. 00:0C:E8 GuangzhouA # GuangZhou AnJuBao Co., Ltd @@ -3693,7 +3694,7 @@ 00:0E:59 SagemSa # SAGEM SA 00:0E:5A Telefield # TELEFIELD inc. 00:0E:5B Parkervisi # ParkerVision - Direct2Data -00:0E:5C MotorolaBc # Motorola BCS +00:0E:5C MotorolaMo # Motorola Mobility, Inc. 00:0E:5D TriplePlay # Triple Play Technologies A/S 00:0E:5E RaisecomTe # Raisecom Technology 00:0E:5F Activ-Net # activ-net GmbH & Co. KG @@ -3950,7 +3951,7 @@ 00:0F:5A PeribitNet # Peribit Networks 00:0F:5B DeltaInfor # Delta Information Systems, Inc. 00:0F:5C DayOneDigi # Day One Digital Media Limited -00:0F:5D 42networks # 42Networks AB +00:0F:5D Packetfron # PacketFront International AB 00:0F:5E Veo 00:0F:5F NicetyTech # Nicety Technologies Inc. (NTS) 00:0F:60 Lifetron # Lifetron Co.,Ltd @@ -4016,13 +4017,13 @@ 00:0F:9C Panduit # Panduit Corp 00:0F:9D Displaylin # DisplayLink (UK) Ltd 00:0F:9E Murrelektr # Murrelektronik GmbH -00:0F:9F MotorolaBc # Motorola BCS +00:0F:9F MotorolaMo # Motorola Mobility, Inc. 00:0F:A0 CanonKorea # CANON KOREA BUSINESS SOLUTIONS INC. 00:0F:A1 Gigabit # Gigabit Systems Inc. 00:0F:A2 DigitalPat # Digital Path Networks 00:0F:A3 AlphaNetwo # Alpha Networks Inc. 00:0F:A4 SprecherAu # Sprecher Automation GmbH -00:0F:A5 Smp/BwaTec # SMP / BWA Technology GmbH +00:0F:A5 BwaTechnol # BWA Technology GmbH 00:0F:A6 S2Security # S2 Security Corporation 00:0F:A7 RaptorNetw # Raptor Networks Technology 00:0F:A8 Photometri # Photometrics, Inc. @@ -4394,7 +4395,7 @@ 00:11:17 Cesnet 00:11:18 BlxIcDesig # BLX IC Design Corp., Ltd. 00:11:19 Solteras # Solteras, Inc. -00:11:1A MotorolaBc # Motorola BCS +00:11:1A MotorolaMo # Motorola Mobility, Inc. 00:11:1B TargaDivL- # Targa Systems Div L-3 Communications Canada 00:11:1C PleoraTech # Pleora Technologies Inc. 00:11:1D Hectrix # Hectrix Limited @@ -4496,7 +4497,7 @@ 00:11:7D ZmdAmerica # ZMD America, Inc. 00:11:7E Progeny # Progeny Inc. 00:11:7F NeotuneInf # Neotune Information Technology Corporation,.LTD -00:11:80 MotorolaBc # Motorola BCS +00:11:80 MotorolaMo # Motorola Mobility, Inc. 00:11:81 Interenerg # InterEnergy Co.Ltd, 00:11:82 ImiNorgren # IMI Norgren Ltd 00:11:83 DatalogicM # Datalogic Mobile, Inc. @@ -4542,7 +4543,7 @@ 00:11:AB TrustableT # TRUSTABLE TECHNOLOGY CO.,LTD. 00:11:AC SimtecElec # Simtec Electronics 00:11:AD ShanghaiRu # Shanghai Ruijie Technology -00:11:AE MotorolaBc # Motorola BCS +00:11:AE MotorolaMo # Motorola Mobility, Inc. 00:11:AF Medialink- # Medialink-i,Inc 00:11:B0 Fortelink # Fortelink Inc. 00:11:B1 Blueexpert # BlueExpert Technology Corp. @@ -4661,7 +4662,7 @@ 00:12:22 SkardinUk # Skardin (UK) Ltd 00:12:23 Pixim 00:12:24 Nexql # NexQL Corporation -00:12:25 MotorolaBc # Motorola BCS +00:12:25 MotorolaMo # Motorola Mobility, Inc. 00:12:26 JapanDirex # Japan Direx Corporation 00:12:27 FranklinEl # Franklin Electric Co., Inc. 00:12:28 Data # Data Ltd. @@ -4762,7 +4763,7 @@ 00:12:87 DigitalEve # Digital Everywhere Unterhaltungselektronik GmbH 00:12:88 2wire # 2Wire, Inc 00:12:89 AdvanceSte # Advance Sterilization Products -00:12:8A MotorolaBc # Motorola BCS +00:12:8A MotorolaMo # Motorola Mobility, Inc. 00:12:8B SensoryNet # Sensory Networks Inc 00:12:8C WoodwardGo # Woodward Governor 00:12:8D StbDatense # STB Datenservice GmbH @@ -4825,7 +4826,7 @@ 00:12:C6 TgcAmerica # TGC America, Inc 00:12:C7 SecurayTec # SECURAY Technologies Ltd.Co. 00:12:C8 PerfectTec # Perfect tech -00:12:C9 MotorolaBc # Motorola BCS +00:12:C9 MotorolaMo # Motorola Mobility, Inc. 00:12:CA Mechatroni # Mechatronic Brick Aps 00:12:CB Css # CSS Inc. 00:12:CC Bitatek # Bitatek CO., LTD @@ -4966,7 +4967,7 @@ 00:13:53 HydacFilte # HYDAC Filtertechnik GMBH 00:13:54 ZcomaxTech # Zcomax Technologies, Inc. 00:13:55 TomenCyber # TOMEN Cyber-business Solutions, Inc. -00:13:56 TargetSyst # target systemelectronic gmbh +00:13:56 FlirRadiat # FLIR Radiation GmbH 00:13:57 SoyalTechn # Soyal Technology Co., Ltd. 00:13:58 Realm # Realm Systems, Inc. 00:13:59 Protelevis # ProTelevision Technologies A/S @@ -4993,7 +4994,7 @@ 00:13:6E Techmetro # Techmetro Corp. 00:13:6F Packetmoti # PacketMotion, Inc. 00:13:70 NokiaDanma # Nokia Danmark A/S -00:13:71 MotorolaCh # Motorola CHS +00:13:71 MotorolaMo # Motorola Mobility, Inc. 00:13:72 Dell # Dell Inc. 00:13:73 BlwaveElec # BLwave Electronics Co., Ltd 00:13:74 AtherosCom # Atheros Communications, Inc. @@ -5140,7 +5141,7 @@ 00:14:01 RivertreeN # Rivertree Networks Corp. 00:14:02 Kk-Electro # kk-electronic a/s 00:14:03 RenasisLlc # Renasis, LLC -00:14:04 MotorolaCh # Motorola CHS +00:14:04 MotorolaMo # Motorola Mobility, Inc. 00:14:05 Openib # OpenIB, Inc. 00:14:06 GoNetworks # Go Networks 00:14:07 SperianPro # Sperian Protection Instrumentation @@ -5290,7 +5291,7 @@ 00:14:97 ZhiyuanEle # ZHIYUAN Eletronics co.,ltd. 00:14:98 VikingDesi # Viking Design Technology 00:14:99 Helicomm # Helicomm Inc -00:14:9A MotorolaMo # Motorola Mobile Devices Business +00:14:9A MotorolaMo # Motorola Mobility, Inc. 00:14:9B NokotaComm # Nokota Communications, LLC 00:14:9C Hf # HF Company 00:14:9D SoundId # Sound ID Inc. @@ -5368,7 +5369,7 @@ 00:14:E5 Alticast 00:14:E6 AimInfraro # AIM Infrarotmodule GmbH 00:14:E7 Stolinx # Stolinx,. Inc -00:14:E8 MotorolaCh # Motorola CHS +00:14:E8 MotorolaMo # Motorola Mobility, Inc. 00:14:E9 NortechInt # Nortech International 00:14:EA SDigmSafeP # S Digm Inc. (Safe Paradigm Inc.) 00:14:EB Awarepoint # AwarePoint Corporation @@ -5439,7 +5440,7 @@ 00:15:2C Cisco # Cisco Systems 00:15:2D TenxNetwor # TenX Networks, LLC 00:15:2E Packethop # PacketHop, Inc. -00:15:2F MotorolaCh # Motorola CHS +00:15:2F MotorolaMo # Motorola Mobility, Inc. 00:15:30 Bus-Tech # Bus-Tech, Inc. 00:15:31 Kocom 00:15:32 ConsumerTe # Consumer Technologies Group, LLC @@ -5546,7 +5547,7 @@ 00:15:97 AetaAudio # AETA AUDIO SYSTEMS 00:15:98 KolektorGr # Kolektor group 00:15:99 SamsungEle # Samsung Electronics Co., LTD -00:15:9A MotorolaCh # Motorola CHS +00:15:9A MotorolaMo # Motorola Mobility, Inc. 00:15:9B Nortel 00:15:9C B-KyungSys # B-KYUNG SYSTEM Co.,Ltd. 00:15:9D MinicomAdv # Minicom Advanced Systems ltd @@ -5560,7 +5561,7 @@ 00:15:A5 Dci # DCI Co., Ltd. 00:15:A6 DigitalEle # Digital Electronics Products Ltd. 00:15:A7 Robatech # Robatech AG -00:15:A8 MotorolaMo # Motorola Mobile Devices +00:15:A8 MotorolaMo # Motorola Mobility, Inc. 00:15:A9 KwangWooI& # KWANG WOO I&C CO.,LTD 00:15:AA Rextechnik # Rextechnik International Co., 00:15:AB ProSound # PRO CO SOUND INC @@ -5686,7 +5687,7 @@ 00:16:23 IntervalMe # Interval Media 00:16:24 Teneros # Teneros, Inc. 00:16:25 Impinj # Impinj, Inc. -00:16:26 MotorolaCh # Motorola CHS +00:16:26 MotorolaMo # Motorola Mobility, Inc. 00:16:27 Embedded-L # embedded-logic DESIGN AND MORE GmbH 00:16:28 UltraElect # Ultra Electronics Manufacturing and Card Systems 00:16:29 Nivus # Nivus GmbH @@ -5765,7 +5766,7 @@ 00:16:72 ZenwayEnte # Zenway enterprise ltd 00:16:73 Bury # Bury GmbH & Co. KG 00:16:74 EurocbPhil # EuroCB (Phils.), Inc. -00:16:75 MotorolaMd # Motorola MDb +00:16:75 MotorolaMo # Motorola Mobility, Inc. 00:16:76 Intel # Intel Corporation 00:16:77 Bihl+Wiede # Bihl+Wiedemann GmbH 00:16:78 ShenzhenBa # SHENZHEN BAOAN GAOKE ELECTRONICS CO., LTD @@ -5829,7 +5830,7 @@ 00:16:B2 Drivecam # DriveCam Inc 00:16:B3 Photonicbr # Photonicbridges (China) Co., Ltd. 00:16:B4 Private -00:16:B5 MotorolaCh # Motorola CHS +00:16:B5 MotorolaMo # Motorola Mobility, Inc. 00:16:B6 Cisco-Link # Cisco-Linksys 00:16:B7 SeoulCommt # Seoul Commtech 00:16:B8 SonyEricss # Sony Ericsson Mobile Communications @@ -5904,7 +5905,7 @@ 00:16:FD JatyElectr # Jaty Electronics 00:16:FE AlpsElectr # Alps Electric Co., Ltd 00:16:FF WaminOptoc # Wamin Optocomm Mfg Corp -00:17:00 MotorolaMd # Motorola MDb +00:17:00 MotorolaMo # Motorola Mobility, Inc. 00:17:01 Kde # KDE, Inc. 00:17:02 OsungMidic # Osung Midicom Co., Ltd 00:17:03 MosdanInte # MOSDAN Internation Co.,Ltd @@ -6036,7 +6037,7 @@ 00:17:81 GreystoneD # Greystone Data System, Inc. 00:17:82 Lobenn # LoBenn Inc. 00:17:83 TexasInstr # Texas Instruments -00:17:84 MotorolaMo # Motorola Mobile Devices +00:17:84 MotorolaMo # Motorola Mobility, Inc. 00:17:85 SparrElect # Sparr Electronics Ltd 00:17:86 Wisembed 00:17:87 BrotherBro # Brother, Brother & Sons ApS @@ -6130,7 +6131,7 @@ 00:17:DF Cisco # Cisco Systems 00:17:E0 Cisco # Cisco Systems 00:17:E1 DacosTechn # DACOS Technologies Co., Ltd. -00:17:E2 MotorolaMo # Motorola Mobile Devices +00:17:E2 MotorolaMo # Motorola Mobility, Inc. 00:17:E3 TexasInstr # Texas Instruments 00:17:E4 TexasInstr # Texas Instruments 00:17:E5 TexasInstr # Texas Instruments @@ -6142,7 +6143,7 @@ 00:17:EB TexasInstr # Texas Instruments 00:17:EC TexasInstr # Texas Instruments 00:17:ED Woojooit # WooJooIT Ltd. -00:17:EE MotorolaCh # Motorola CHS +00:17:EE MotorolaMo # Motorola Mobility, Inc. 00:17:EF BladeNetwo # Blade Network Technologies, Inc. 00:17:F0 SzcomBroad # SZCOM Broadband Network Technology Co.,Ltd 00:17:F1 RenuElectr # Renu Electronics Pvt Ltd @@ -6197,7 +6198,7 @@ 00:18:22 CecTelecom # CEC TELECOM CO.,LTD. 00:18:23 DeltaElect # Delta Electronics, Inc. 00:18:24 KimaldiEle # Kimaldi Electronics, S.L. -00:18:25 Wavion # Wavion LTD +00:18:25 Private 00:18:26 CaleAccess # Cale Access AB 00:18:27 NecUnified # NEC UNIFIED SOLUTIONS NEDERLAND B.V. 00:18:28 E2vTechnol # e2v technologies (UK) ltd. @@ -6352,7 +6353,7 @@ 00:18:BD ShenzhenDv # SHENZHEN DVBWORLD TECHNOLOGY CO., LTD. 00:18:BE Ansa # ANSA Corporation 00:18:BF EssenceTec # Essence Technology Solution, Inc. -00:18:C0 MotorolaCh # Motorola CHS +00:18:C0 MotorolaMo # Motorola Mobility, Inc. 00:18:C1 AlmitecInf # Almitec Informática e Comércio Ltda. 00:18:C2 Firetide # Firetide, Inc 00:18:C3 C&SMicrowa # C&S Microwave @@ -6460,7 +6461,7 @@ 00:19:29 2m2bMontad # 2M2B Montadora de Maquinas Bahia Brasil LTDA 00:19:2A AntiopeAss # Antiope Associates 00:19:2B AclaraRf # Aclara RF Systems Inc. -00:19:2C MotorolaMo # Motorola Mobile Devices +00:19:2C MotorolaMo # Motorola Mobility, Inc. 00:19:2D Nokia # Nokia Corporation 00:19:2E SpectralIn # Spectral Instruments, Inc. 00:19:2F Cisco # Cisco Systems @@ -6510,7 +6511,7 @@ 00:19:5B D-Link # D-Link Corporation 00:19:5C Innotech # Innotech Corporation 00:19:5D ShenzhenXi # ShenZhen XinHuaTong Opto Electronics Co.,Ltd -00:19:5E MotorolaCh # Motorola CHS +00:19:5E MotorolaMo # Motorola Mobility, Inc. 00:19:5F ValemountN # Valemount Networks Corporation 00:19:60 Docomo # DoCoMo Systems, Inc. 00:19:61 Blaupunkt # Blaupunkt GmbH @@ -6582,7 +6583,7 @@ 00:19:A3 AsteelElec # asteel electronique atlantique 00:19:A4 AustarTech # Austar Technology (hang zhou) Co.,Ltd 00:19:A5 Radarfind # RadarFind Corporation -00:19:A6 MotorolaCh # Motorola CHS +00:19:A6 MotorolaMo # Motorola Mobility, Inc. 00:19:A7 Itu-T 00:19:A8 WiquestCom # WiQuest Communications 00:19:A9 Cisco # Cisco Systems @@ -6608,7 +6609,7 @@ 00:19:BD NewMediaLi # New Media Life 00:19:BE AltaiTechn # Altai Technologies Limited 00:19:BF CitiwayTec # Citiway technology Co.,ltd -00:19:C0 MotorolaMo # Motorola Mobile Devices +00:19:C0 MotorolaMo # Motorola Mobility, Inc. 00:19:C1 AlpsElectr # Alps Electric Co., Ltd 00:19:C2 EquustekSo # Equustek Solutions, Inc. 00:19:C3 Qualitrol @@ -6699,7 +6700,7 @@ 00:1A:18 AdvancedSi # Advanced Simulation Technology inc. 00:1A:19 ComputerEn # Computer Engineering Limited 00:1A:1A GentexCorp # Gentex Corporation/Electro-Acoustic Products -00:1A:1B MotorolaMo # Motorola Mobile Devices +00:1A:1B MotorolaMo # Motorola Mobility, Inc. 00:1A:1C Gt&TEngine # GT&T Engineering Pte Ltd 00:1A:1D PchomeOnli # PChome Online Inc. 00:1A:1E ArubaNetwo # Aruba Networks @@ -6774,7 +6775,7 @@ 00:1A:63 ElsterSolu # Elster Solutions, LLC, 00:1A:64 Ibm # IBM Corp 00:1A:65 Seluxit -00:1A:66 MotorolaCh # Motorola CHS +00:1A:66 MotorolaMo # Motorola Mobility, Inc. 00:1A:67 InfiniteQl # Infinite QL Sdn Bhd 00:1A:68 WeltecEnte # Weltec Enterprise Co., Ltd. 00:1A:69 WuhanYangt # Wuhan Yangtze Optical Technology CO.,Ltd. @@ -6791,7 +6792,7 @@ 00:1A:74 ProcareInt # Procare International Co 00:1A:75 SonyEricss # Sony Ericsson Mobile Communications 00:1A:76 SdtInforma # SDT information Technology Co.,LTD. -00:1A:77 MotorolaMo # Motorola Mobile Devices +00:1A:77 MotorolaMo # Motorola Mobility, Inc. 00:1A:78 Ubtos 00:1A:79 Telecomuni # TELECOMUNICATION TECHNOLOGIES LTD. 00:1A:7A LismoreIns # Lismore Instruments Limited @@ -6845,7 +6846,7 @@ 00:1A:AA Analogic # Analogic Corp. 00:1A:AB EwingsSRL # eWings s.r.l. 00:1A:AC Corelatus # Corelatus AB -00:1A:AD MotorolaCh # Motorola CHS +00:1A:AD MotorolaMo # Motorola Mobility, Inc. 00:1A:AE SavantLlc # Savant Systems LLC 00:1A:AF BlusensTec # BLUSENS TECHNOLOGY 00:1A:B0 SignalNetw # Signal Networks Pvt. Ltd., @@ -6891,10 +6892,10 @@ 00:1A:D8 Alsteraero # AlsterAero GmbH 00:1A:D9 Internatio # International Broadband Electric Communications, Inc. 00:1A:DA Biz-2-Me # Biz-2-Me Inc. -00:1A:DB MotorolaMo # Motorola Mobile Devices +00:1A:DB MotorolaMo # Motorola Mobility, Inc. 00:1A:DC NokiaDanma # Nokia Danmark A/S 00:1A:DD Pepwave # PePWave Ltd -00:1A:DE MotorolaCh # Motorola CHS +00:1A:DE MotorolaMo # Motorola Mobility, Inc. 00:1A:DF Interactiv # Interactivetv Pty Limited 00:1A:E0 MythologyT # Mythology Tech Express Inc. 00:1A:E1 EdgeAccess # EDGE ACCESS INC @@ -7010,7 +7011,7 @@ 00:1B:4F Avaya # Avaya Inc. 00:1B:50 NizhnyNovg # Nizhny Novgorod Factory named after M.Frunze, FSUE (NZiF) 00:1B:51 VectorTech # Vector Technology Corp. -00:1B:52 MotorolaMo # Motorola Mobile Devices +00:1B:52 MotorolaMo # Motorola Mobility, Inc. 00:1B:53 Cisco # Cisco Systems 00:1B:54 Cisco # Cisco Systems 00:1B:55 HurcoAutom # Hurco Automation Ltd. @@ -7149,7 +7150,7 @@ 00:1B:DA Utstarcom # UTStarcom Inc 00:1B:DB ValeoVecs # Valeo VECS 00:1B:DC Vencer # Vencer Co., Ltd. -00:1B:DD MotorolaCh # Motorola CHS +00:1B:DD MotorolaMo # Motorola Mobility, Inc. 00:1B:DE Renkus-Hei # Renkus-Heinz, Inc. 00:1B:DF IskraMis # Iskra MIS 00:1B:E0 TelenotEle # TELENOT ELECTRONIC GmbH @@ -7202,7 +7203,7 @@ 00:1C:0F Cisco # Cisco Systems 00:1C:10 Cisco-Link # Cisco-Linksys, LLC 00:1C:11 MotorolaMo # Motorola Mobility, Inc. -00:1C:12 MotorolaMo # Motorola Mobile Devices +00:1C:12 MotorolaMo # Motorola Mobility, Inc. 00:1C:13 OptsysTech # OPTSYS TECHNOLOGY CO., LTD. 00:1C:14 Vmware # VMware, Inc 00:1C:15 Txp # TXP Corporation @@ -7377,7 +7378,7 @@ 00:1C:BE Nintendo # Nintendo Co., Ltd. 00:1C:BF IntelCorpo # Intel Corporate 00:1C:C0 IntelCorpo # Intel Corporate -00:1C:C1 MotorolaMo # Motorola Mobile Devices +00:1C:C1 MotorolaMo # Motorola Mobility, Inc. 00:1C:C2 PartIiRese # Part II Research, Inc. 00:1C:C3 Pace # Pace plc 00:1C:C4 HewlettPac # Hewlett Packard @@ -7521,7 +7522,7 @@ 00:1D:4E TcmMobileL # TCM Mobile LLC 00:1D:4F AppleCompu # Apple Computer Inc. 00:1D:50 SpinetixSa # SPINETIX SA -00:1D:51 GeEnergy # GE Energy +00:1D:51 BabcockWil # Babcock & Wilcox Power Generation Group, Inc 00:1D:52 DefzoneBV # Defzone B.V. 00:1D:53 S&OElectro # S&O Electronics (Malaysia) Sdn. Bhd. 00:1D:54 SunnicTech # Sunnic Technology & Merchandise INC. @@ -7630,7 +7631,7 @@ 00:1D:BB DynamicSys # Dynamic System Electronics Corp. 00:1D:BC Nintendo # Nintendo Co., Ltd. 00:1D:BD Versamed # Versamed Inc. -00:1D:BE MotorolaMo # Motorola Mobile Devices +00:1D:BE MotorolaMo # Motorola Mobility, Inc. 00:1D:BF RadiientTe # Radiient Technologies, Inc. 00:1D:C0 EnphaseEne # Enphase Energy 00:1D:C1 AudinatePt # Audinate Pty L @@ -7837,7 +7838,7 @@ 00:1E:8A Ecopy # eCopy, Inc 00:1E:8B InfraAcces # Infra Access Korea Co., Ltd. 00:1E:8C AsustekCom # ASUSTek COMPUTER INC. -00:1E:8D MotorolaMo # Motorola Mobile Devices +00:1E:8D MotorolaMo # Motorola Mobility, Inc. 00:1E:8E Hunkeler # Hunkeler AG 00:1E:8F Canon # CANON INC. 00:1E:90 Elitegroup # Elitegroup Computer Systems Co @@ -8078,7 +8079,7 @@ 00:1F:7B Technexion # TechNexion Ltd. 00:1F:7C WitelcomAs # Witelcom AS 00:1F:7D EmbeddedWi # embedded wireless GmbH -00:1F:7E MotorolaMo # Motorola Mobile Devices +00:1F:7E MotorolaMo # Motorola Mobility, Inc. 00:1F:7F Phabrix # Phabrix Limited 00:1F:80 LucasBv # Lucas Holding bv 00:1F:81 AccelSemic # Accel Semiconductor Corp @@ -8091,7 +8092,7 @@ 00:1F:88 FmsForceMe # FMS Force Measuring Systems AG 00:1F:89 Signalion # Signalion GmbH 00:1F:8A EllionDigi # Ellion Digital Inc. -00:1F:8B Storspeed # Storspeed, Inc. +00:1F:8B CacheIq # Cache IQ 00:1F:8C Ccs # CCS Inc. 00:1F:8D Ingenieurb # Ingenieurbuero Stark GmbH und Ko. KG 00:1F:8E MetrisUsa # Metris USA Inc. @@ -8518,7 +8519,7 @@ 00:21:33 BuildingB # Building B, Inc 00:21:34 Brandywine # Brandywine Communications 00:21:35 Alcatel-Lu # ALCATEL-LUCENT -00:21:36 MotorolaMo # Motorola Mobile Devices business (MDb) +00:21:36 MotorolaMo # Motorola Mobility, Inc. 00:21:37 BayControl # Bay Controls, LLC 00:21:38 Cepheid 00:21:39 Escherlogi # Escherlogic Inc. @@ -8900,7 +8901,7 @@ 00:22:B1 Elbit # Elbit Systems 00:22:B2 4rfCommuni # 4RF Communications Ltd 00:22:B3 SeiSPA # Sei S.p.A. -00:22:B4 MotorolaMo # Motorola Mobile Devices +00:22:B4 MotorolaMo # Motorola Mobility, Inc. 00:22:B5 Novita 00:22:B6 SuperflowT # Superflow Technologies Group 00:22:B7 GssGrundig # GSS Grundig SAT-Systems GmbH @@ -9151,7 +9152,7 @@ 00:23:AC Cisco # Cisco Systems 00:23:AD Xmark # Xmark Corporation 00:23:AE Dell # Dell Inc. -00:23:AF MotorolaMo # Motorola Mobile Devices +00:23:AF MotorolaMo # Motorola Mobility, Inc. 00:23:B0 ComxionTec # COMXION Technology Inc. 00:23:B1 LongcheerT # Longcheer Technology (Singapore) Pte Ltd 00:23:B2 Intelligen # Intelligent Mechatronic Systems Inc @@ -9378,7 +9379,7 @@ 00:24:92 MotorolaBr # Motorola, Broadband Solutions Group 00:24:93 Motorola # Motorola, Inc 00:24:94 ShenzhenBa # Shenzhen Baoxin Tech CO., Ltd. -00:24:95 MotorolaMo # Motorola Mobile Devices +00:24:95 MotorolaMo # Motorola Mobility, Inc. 00:24:96 GinzingerE # Ginzinger electronic systems 00:24:97 Cisco # Cisco Systems 00:24:98 Cisco # Cisco Systems @@ -9422,7 +9423,7 @@ 00:24:BE Sony # Sony Corporation 00:24:BF Ciat 00:24:C0 NtiComodo # NTI COMODO INC -00:24:C1 HangzhouMo # Hangzhou Motorola Technologies LTD. +00:24:C1 MotorolaMo # Motorola Mobility, Inc. 00:24:C2 Asumo # Asumo Co.,Ltd. 00:24:C3 Cisco # Cisco Systems 00:24:C4 Cisco # Cisco Systems @@ -9792,7 +9793,7 @@ 00:26:33 Mir-Medica # MIR - Medical International Research 00:26:34 Infineta # Infineta Systems, Inc 00:26:35 Bluetechni # Bluetechnix GmbH -00:26:36 MotorolaMo # Motorola Mobile Devices +00:26:36 MotorolaMo # Motorola Mobility, Inc. 00:26:37 SamsungEle # Samsung Electro-Mechanics 00:26:38 XiaMenJoya # Xia Men Joyatech Co., Ltd. 00:26:39 TMElectron # T.M. Electronics, Inc. @@ -9922,7 +9923,7 @@ 00:26:B7 KingstonTe # Kingston Technology Company, Inc. 00:26:B8 ActiontecE # Actiontec Electronics, Inc 00:26:B9 Dell # Dell Inc -00:26:BA MotorolaMo # Motorola Mobile Devices +00:26:BA MotorolaMo # Motorola Mobility, Inc. 00:26:BB Apple # Apple, Inc 00:26:BC GeneralJac # General Jack Technology Ltd. 00:26:BD JtecCardCo # JTEC Card & Communication Co., Ltd. @@ -10536,7 +10537,7 @@ 00:40:ED NetworkCon # NETWORK CONTROLS INT'NATL INC. 00:40:EE Optimem 00:40:EF Hypercom # HYPERCOM, INC. -00:40:F0 Micro # MICRO SYSTEMS, INC. +00:40:F0 Microbrain # MicroBrain,Inc. 00:40:F1 ChuoElectr # CHUO ELECTRONICS CO., LTD. 00:40:F2 JanichKlas # JANICH & KLASS COMPUTERTECHNIK 00:40:F3 Netcor @@ -11756,7 +11757,7 @@ 00:50:C2:40:00:00/36 Smartmotor # SmartMotor AS 00:50:C2:40:10:00/36 Promess # Promess Incorporated 00:50:C2:40:20:00/36 NumeronSpZ # Numeron Sp. z o.o. -00:50:C2:40:30:00/36 TopexSA # TOPEX S.A. +00:50:C2:40:30:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:40:40:00/36 Nanshanbri # NanShanBridge Co.Ltd 00:50:C2:40:50:00/36 Guralp # Guralp Systems Limited 00:50:C2:40:60:00/36 Corestreet # CoreStreet, Ltd @@ -12859,7 +12860,7 @@ 00:50:C2:85:20:00/36 Einfochips # eInfochips Ltd. 00:50:C2:85:30:00/36 EttusResea # Ettus Research LLC 00:50:C2:85:40:00/36 Ratioplast # Ratioplast-Optoelectronics GmbH -00:50:C2:85:50:00/36 TopexSa # TOPEX SA +00:50:C2:85:50:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:85:60:00/36 Ct # CT Company 00:50:C2:85:70:00/36 EpelIndust # EPEL INDUSTRIAL 00:50:C2:85:80:00/36 WirelessAc # Wireless Acquisition LLC @@ -13072,7 +13073,7 @@ 00:50:C2:92:70:00/36 AtisGroupS # ATIS group s.r.o. 00:50:C2:92:80:00/36 Cinetix # Cinetix GmbH 00:50:C2:92:90:00/36 FlightDeck # Flight Deck Resources -00:50:C2:92:A0:00/36 TopexSa # TOPEX SA +00:50:C2:92:A0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:92:B0:00/36 DspDesign # DSP DESIGN 00:50:C2:92:C0:00/36 Exatrol # Exatrol Corporation 00:50:C2:92:D0:00/36 Approsoftw # APProSoftware.com @@ -13266,7 +13267,7 @@ 00:50:C2:9E:90:00/36 CiemmeSist # Ciemme Sistemi Spa 00:50:C2:9E:A0:00/36 Sismodular # SISMODULAR - Engenharia, Lda 00:50:C2:9E:B0:00/36 AforeSolut # AFORE Solutions Inc. -00:50:C2:9E:C0:00/36 TopexSa # TOPEX SA +00:50:C2:9E:C0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:9E:D0:00/36 PicellBV # Picell B.V. 00:50:C2:9E:E0:00/36 MichaelSte # Michael Stevens & Partners Ltd 00:50:C2:9E:F0:00/36 Woka-Elekt # WoKa-Elektronik GmbH @@ -13788,7 +13789,7 @@ 00:50:C2:BF:70:00/36 PhytecMess # Phytec Messtechnik GmbH 00:50:C2:BF:80:00/36 CrtiicalLi # Crtiical Link 00:50:C2:BF:90:00/36 VitelNet # Vitel Net -00:50:C2:BF:A0:00/36 TopexSa # TOPEX SA +00:50:C2:BF:A0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:BF:B0:00/36 EcsSrl # ecs srl 00:50:C2:BF:C0:00/36 Altronix # Altronix Corporation 00:50:C2:BF:D0:00/36 ErnemannCi # Ernemann Cine Tec GmbH @@ -13949,7 +13950,7 @@ 00:50:C2:C9:B0:00/36 SmElectron # Sm electronic co. 00:50:C2:C9:C0:00/36 Saia-Burge # Saia-Burgess Controls AG 00:50:C2:C9:D0:00/36 RadiusSwed # Radius Sweden AB -00:50:C2:C9:E0:00/36 TopexSa # TOPEX SA +00:50:C2:C9:E0:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:C9:F0:00/36 Etherhome 00:50:C2:CA:00:00/36 KieferTech # Kiefer technic GmbH 00:50:C2:CA:10:00/36 WayneKerrE # Wayne Kerr Electronics @@ -14083,7 +14084,7 @@ 00:50:C2:D2:50:00/36 VafInstrum # VAF Instruments BV 00:50:C2:D2:60:00/36 Rch 00:50:C2:D2:70:00/36 FrSauter # Fr.Sauter AG -00:50:C2:D2:80:00/36 Digitale-A # Digitale-Analoge COMponenten West Electronic Vertriebs GmbH +00:50:C2:D2:80:00/36 DigitaleAn # Digitale Analoge COMponenten West Electronic Vertriebs GmbH 00:50:C2:D2:90:00/36 AxibleTech # Axible Technologies 00:50:C2:D2:A0:00/36 Millennium # Millennium Electronics Pty.Ltd. 00:50:C2:D2:B0:00/36 VideoTechL # Video Tech Laboratories, Inc. @@ -14114,7 +14115,7 @@ 00:50:C2:D4:40:00/36 Saia-Burge # Saia-Burgess Controls AG 00:50:C2:D4:50:00/36 Technagon # Technagon GmbH 00:50:C2:D4:60:00/36 ThalesNede # Thales Nederland BV -00:50:C2:D4:70:00/36 TopexSa # TOPEX SA +00:50:C2:D4:70:00/36 RohdeSchwa # Rohde & Schwarz Topex SA 00:50:C2:D4:80:00/36 WatermarkE # Watermark Estate Management Services, LLC 00:50:C2:D4:90:00/36 SmithMeter # Smith Meter, Inc 00:50:C2:D4:A0:00/36 AthSystem # ATH system @@ -14259,6 +14260,42 @@ 00:50:C2:DD:60:00/36 TransasMar # Transas Marine International AB 00:50:C2:DD:70:00/36 TornadoMod # Tornado Modular Systems 00:50:C2:DD:80:00/36 SelexInteg # Selex Systems Integration Inc +00:50:C2:DD:90:00/36 Metraware +00:50:C2:DD:A0:00/36 RbzRobotDe # rbz robot design s.l. +00:50:C2:DD:B0:00/36 Edixia +00:50:C2:DD:C0:00/36 VisionCont # Vision & Control GmbH +00:50:C2:DD:D0:00/36 A&AGeneral # A&A GENERAL SRL +00:50:C2:DD:E0:00/36 DrsRsta # DRS RSTA +00:50:C2:DD:F0:00/36 Device # Device GmbH +00:50:C2:DE:00:00/36 InternetPr # INTERNET PROTOCOLO LOGICA SL +00:50:C2:DE:10:00/36 AbbTransmi # ABB Transmission and Distribution Auto Eqip(Xiamen.China) +00:50:C2:DE:20:00/36 Sequtec # SEQUTEC INC +00:50:C2:DE:30:00/36 BreakawayL # Breakaway Systems LLC +00:50:C2:DE:40:00/36 EgsTechnol # EGS Technologies Ltd +00:50:C2:DE:50:00/36 Neets +00:50:C2:DE:60:00/36 FrSauter # Fr. Sauter AG +00:50:C2:DE:70:00/36 Elan # Elan Systems +00:50:C2:DE:80:00/36 VisualProd # Visual Productions +00:50:C2:DE:90:00/36 DigataleAn # Digatale Analoge COMponenten West Electronic Vertrieb GmbH +00:50:C2:DE:A0:00/36 Cerner # Cerner Corporation +00:50:C2:DE:B0:00/36 RuwischKol # Ruwisch & Kollegen GmbH +00:50:C2:DE:C0:00/36 Vendnovati # VendNovation LLC +00:50:C2:DE:D0:00/36 LeeLaser # Lee Laser +00:50:C2:DE:F0:00/36 Powersense # Powersense A/S +00:50:C2:DF:00:00/36 KoncarElec # Koncar Electrical Engineering Institute +00:50:C2:DF:10:00/36 Saia-Burge # Saia-Burgess Controls AG +00:50:C2:DF:20:00/36 Instrument # Instrument Concepts +00:50:C2:DF:30:00/36 Insevis # INSEVIS GmbH +00:50:C2:DF:40:00/36 PotterElec # Potter Electric Signal +00:50:C2:DF:50:00/36 Etherlight +00:50:C2:DF:60:00/36 HinoEngine # HINO ENGINEERING, INC +00:50:C2:DF:70:00/36 Combilent +00:50:C2:DF:80:00/36 TommotekWa # Tommotek (WA) Pty Ltd. +00:50:C2:DF:90:00/36 JennyScien # Jenny Science AG +00:50:C2:DF:A0:00/36 MacValves # MAC Valves, Inc. +00:50:C2:DF:B0:00/36 BettiniSrl # BETTINI SRL +00:50:C2:DF:C0:00/36 I-Evo # I-Evo Ltd +00:50:C2:DF:D0:00/36 Wotbox # Wotbox ltd 00:50:C4 Imd 00:50:C5 AdsTechnol # ADS Technologies, Inc 00:50:C6 LoopTeleco # LOOP TELECOMMUNICATION INTERNATIONAL, INC. @@ -14578,6 +14615,7 @@ 00:70:B0 M/A-ComCom # M/A-COM INC. COMPANIES 00:70:B3 DataRecall # DATA RECALL LTD. 00:72:98 KaonMedia # KAON MEDIA Co., Ltd. +00:78:9E Sagemcom 00:80:00 Multitech # MULTITECH SYSTEMS, INC. 00:80:01 Periphonic # PERIPHONICS CORPORATION 00:80:02 SatelcomUk # SATELCOM (UK) LTD @@ -14836,6 +14874,7 @@ 00:80:FF SocDeTelei # SOC. DE TELEINFORMATIQUE RTC 00:8C:10 BlackBox # Black Box Corp. 00:8C:FA Inventec # Inventec Corporation +00:8D:4E CjscNiiStt # CJSC NII STT 00:90:00 DiamondMul # DIAMOND MULTIMEDIA 00:90:01 NishimuEle # NISHIMU ELECTRONICS INDUSTRIES CO., LTD. 00:90:02 Allgon # ALLGON AB @@ -15302,7 +15341,7 @@ 00:A0:CB ArkTelecom # ARK TELECOMMUNICATIONS, INC. 00:A0:CC Lite-OnCom # LITE-ON COMMUNICATIONS, INC. 00:A0:CD DrJohannes # DR. JOHANNES HEIDENHAIN GmbH -00:A0:CE Astrocom # ASTROCOM CORPORATION +00:A0:CE Ecessa 00:A0:CF Sotas # SOTAS, INC. 00:A0:D0 TenXTechno # TEN X TECHNOLOGY, INC. 00:A0:D1 Inventec # INVENTEC CORPORATION @@ -15352,6 +15391,7 @@ 00:A0:FD ScitexDigi # SCITEX DIGITAL PRINTING, INC. 00:A0:FE BostonTech # BOSTON TECHNOLOGY, INC. 00:A0:FF TellabsOpe # TELLABS OPERATIONS, INC. +00:A1:DE ShenzhenSh # ShenZhen ShiHua Technology CO.,LTD 00:A2:DA Inat # INAT GmbH 00:AA:00 Intel # INTEL CORPORATION 00:AA:01 Intel # INTEL CORPORATION @@ -16192,6 +16232,7 @@ 00:E0:FF SecurityDy # SECURITY DYNAMICS TECHNOLOGIES, Inc. 00:E6:D3 NixdorfCom # NIXDORF COMPUTER CORP. 00:F8:60 PtPanggung # PT. Panggung Electric Citrabuana +00:FC:70 IntrepidCo # Intrepid Control Systems, Inc. 01:0E:CF PN-MC # PROFINET Multicast 02:04:06 BbnInterna # BBN internal usage (not registered) 02:07:01 Racal-Data # RACAL-DATACOM @@ -16214,6 +16255,7 @@ 02:E6:D3 NixdorfCom # NIXDORF COMPUTER CORPORATION 04:0A:83 Alcatel-Lu # Alcatel-Lucent 04:0A:E0 XmitComput # XMIT AG COMPUTER NETWORKS +04:0C:CE Apple # Apple, Inc. 04:0E:C2 ViewsonicM # ViewSonic Mobile China Limited 04:18:0F SamsungEle # Samsung Electronics Co.,Ltd 04:1D:10 DreamWare # Dream Ware Inc. @@ -16223,7 +16265,9 @@ 04:26:05 GfrGesells # GFR Gesellschaft fï¿½r Regelungstechnik und Energieeinsparung mbH 04:2B:BB Picocela # PicoCELA, Inc. 04:2F:56 AtocsShenz # ATOCS (Shenzhen) LTD +04:32:F4 Partron 04:36:04 GyeyoungI& # Gyeyoung I&T +04:46:65 MurataManu # Murata Manufacturing Co., Ltd. 04:4F:AA RuckusWire # Ruckus Wireless 04:55:CA BriviewXia # BriView (Xiamen) Corp. 04:5D:56 CamtronInd # camtron industrial inc. @@ -16244,6 +16288,7 @@ 04:C8:80 Samtec # Samtec Inc 04:DD:4C Ipblaze 04:E0:C4 Triumph-Ad # TRIUMPH-ADLER AG +04:E1:C8 ImsSoluï¿½ # IMS Soluï¿½ï¿½es em Energia Ltda. 04:E2:F8 AepSrl # AEP srl 04:E5:48 CohdaWirel # Cohda Wireless Pty Ltd 04:E6:62 Acroname # Acroname Inc. @@ -16425,9 +16470,12 @@ 0C:17:F1 Telecsys 0C:1D:C2 SeahNetwor # SeAH Networks 0C:27:55 ValuableTe # Valuable Techologies Limited +0C:39:56 Observator # Observator instruments 0C:3C:65 DomeImagin # Dome Imaging Inc 0C:46:9D MsSedco # MS Sedco 0C:60:76 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +0C:6E:4F Primevolt # PrimeVOLT Co., Ltd. +0C:74:C2 Apple # Apple Inc 0C:7D:7C KexiangInf # Kexiang Information Technology Co, Ltd. 0C:81:12 Private 0C:82:30 ShenzhenMa # SHENZHEN MAGNUS TECHNOLOGIES CO.,LTD @@ -16477,6 +16525,7 @@ 10:62:C9 Adatis # Adatis GmbH & Co. KG 10:64:E2 AdfwebComS # ADFweb.com s.r.l. 10:65:A3 Panamax # Panamax Inc. +10:76:8A Eocell 10:78:D2 Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD. 10:83:D2 Microseven # Microseven Systems, LLC 10:88:0F DarumaTele # DARUMA TELECOMUNICAÇÕES E INFORMÁTICA S/A @@ -16486,6 +16535,7 @@ 10:A1:3B FujikuraRu # FUJIKURA RUBBER LTD. 10:B7:F6 Plastoform # Plastoform Industries Ltd. 10:BA:A5 GanaI&C # GANA I&C CO., LTD +10:C5:86 BioSoundLa # BIO SOUND LAB CO., LTD. 10:C7:3F MidasKlark # Midas Klark Teknik Ltd 10:CA:81 Precia 10:CC:DB AximumProd # AXIMUM PRODUITS ELECTRONIQUES @@ -16494,6 +16544,8 @@ 10:E6:AE SourceTech # Source Technologies, LLC 10:E8:EE Phasespace 11:00:AA Private +14:07:08 Private +14:07:E0 Abrantix # Abrantix AG 14:14:4B FujianStar # FUJIAN STAR-NET COMMUNICATION CO.,LTD 14:1B:BD Volex # Volex Inc. 14:35:B3 FutureDesi # Future Designs, Inc. @@ -16541,6 +16593,8 @@ 18:B4:30 NestLabs # Nest Labs Inc. 18:B7:9E Invoxia 18:C0:86 Broadcom # Broadcom Corporation +18:D0:71 DasanSmc # DASAN SMC, Inc. +18:E2:88 SttCondigi # STT Condigi 18:E7:F4 Apple 18:EF:63 Cisco # Cisco Systems 18:F4:6A HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. @@ -16548,8 +16602,9 @@ 1C:06:56 Idy # IDY Corporation 1C:0F:CF SyproOptic # Sypro Optics GmbH 1C:12:9D IeeePesPsr # IEEE PES PSRC/SUB -1C:14:48 MotorolaCh # Motorola CHS +1C:14:48 MotorolaMo # Motorola Mobility, Inc. 1C:17:D3 Cisco # Cisco Systems +1C:18:4A ShenzhenRi # ShenZhen RicherLink Technologies Co.,LTD 1C:19:DE Eyevis # eyevis GmbH 1C:1D:67 HuaweiDevi # Huawei Device Co., Ltd 1C:33:4D ItsTelecom # ITS Telecom @@ -16561,9 +16616,11 @@ 1C:6F:65 Giga-ByteT # GIGA-BYTE TECHNOLOGY CO.,LTD. 1C:75:08 CompalInfo # COMPAL INFORMATION (KUNSHAN) CO., LTD. 1C:7C:11 Eid # EID +1C:7E:E5 D-LinkInte # D-Link International 1C:83:B0 LinkedIp # Linked IP GmbH 1C:8F:8A PhaseMotio # Phase Motion Control SpA 1C:95:5D I-LaxElect # I-LAX ELECTRONICS INC. +1C:AA:07 Cisco # Cisco Systems 1C:AF:F7 D-LinkInte # D-LINK INTERNATIONAL PTE LIMITED 1C:BD:0E AmplifiedE # Amplified Engineering Pty Ltd 1C:BD:B9 D-LinkInte # D-LINK INTERNATIONAL PTE LIMITED @@ -16576,6 +16633,7 @@ 20:05:E8 Ooo"Inprom # OOO "InProMedia" 20:0A:5E XiangshanG # Xiangshan Giant Eagle Technology Developing co.,LTD 20:12:57 MostLuckyT # Most Lucky Trading Ltd +20:13:E0 SamsungEle # Samsung Electronics Co.,Ltd 20:21:A5 LgElectron # LG Electronics Inc 20:2B:C1 HuaweiDevi # Huawei Device Co., Ltd 20:2C:B7 KongYueEle # Kong Yue Electronics & Information Industry (Xinhui) Ltd. @@ -16584,6 +16642,7 @@ 20:46:F9 AdvancedNe # Advanced Network Devices (dba:AND) 20:4A:AA HanscanSpa # Hanscan Spain S.A. 20:4E:6B AxxanaIsra # Axxana(israel) ltd +20:4E:7F Netgear 20:59:A0 ParagonTec # Paragon Technologies Inc. 20:5B:2A Private 20:6A:8A WistronInf # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd. @@ -16594,6 +16653,7 @@ 20:AA:25 Ip-NetLlc # IP-NET LLC 20:B0:F7 Enclustra # Enclustra GmbH 20:B3:99 Enterasys +20:B7:C0 OmicronEle # Omicron electronics GmbH 20:BF:DB Dvl 20:CF:30 AsustekCom # ASUSTek COMPUTER INC. 20:D5:AB KoreaInfoc # Korea Infocom Co.,Ltd. @@ -16608,6 +16668,7 @@ 24:21:AB SonyEricss # Sony Ericsson Mobile Communications 24:3C:20 DynamodeGr # Dynamode Group 24:45:97 GemueGebrM # GEMUE Gebr. Mueller Apparatebau +24:47:0E Pentronica # PentronicAB 24:77:03 IntelCorpo # Intel Corporate 24:82:8A ProwaveTec # Prowave Technologies Ltd. 24:94:42 OpenRoadSo # OPEN ROAD SOLUTIONS , INC. @@ -16617,16 +16678,20 @@ 24:AF:4A Alcatel-Lu # Alcatel-Lucent-IPD 24:AF:54 NexgenMedi # NEXGEN Mediatech Inc. 24:B6:B8 Friem # FRIEM SPA +24:B8:D2 OpzoonTech # Opzoon Technology Co.,Ltd. 24:BA:30 TechnicalC # Technical Consumer Products, Inc. 24:BF:74 Private 24:C8:6E ChaneyInst # Chaney Instrument Co. 24:C9:DE Genoray +24:CB:E7 Myk # MYK, Inc. 24:CF:21 ShenzhenSt # Shenzhen State Micro Technology Co., Ltd 24:D2:CC Smartdrive # SmartDrive Systems Inc. +24:DB:AC HuaweiDevi # Huawei Device Co., Ltd 24:DB:AD Shoppertra # ShopperTrak RCT Corporation 24:F0:FF Ght # GHT Co., Ltd. 28:06:1E NingboGlob # NINGBO GLOBAL USEFUL ELECTRIC CO.,LTD 28:06:8D ItlLlc # ITL, LLC +28:14:71 Lantis # Lantis co., LTD. 28:26:A6 PbrElectro # PBR electronics GmbH 28:34:10 EnigmaDiag # Enigma Diagnostics Limited 28:48:46 Gridcentri # GridCentric Inc. @@ -16640,6 +16705,7 @@ 28:85:2D TouchNetwo # Touch Networks 28:89:15 CashguardS # CashGuard Sverige AB 28:93:FE Cisco # Cisco Systems +28:A5:74 MillerElec # Miller Electric Mfg. Co. 28:C0:DA JuniperNet # Juniper Networks 28:CC:FF Corporacio # Corporacion Empresarial Altra SL 28:CD:4C Individual # Individual Computers GmbH @@ -16651,8 +16717,10 @@ 28:EF:01 Private 28:F3:58 2c-Trifono # 2C - Trifonov & Co 28:FB:D3 ShanghaiRa # Shanghai RagenTek Communication Technology Co.,Ltd. +2C:00:33 EcontrolsL # EControls, LLC 2C:06:23 WinLeader # Win Leader Inc. 2C:19:84 IdnTelecom # IDN Telecom, Inc. +2C:21:72 JuniperNet # Juniper Networks 2C:27:D7 HewlettPac # Hewlett Packard 2C:30:68 Pantech # Pantech Co.,Ltd 2C:34:27 Erco&Amp;G # ERCO & GENER @@ -16663,6 +16731,7 @@ 2C:7E:CF Onzo # Onzo Ltd 2C:80:65 HartingOfN # HARTING Inc. of North America 2C:81:58 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd +2C:8B:F2 HitachiMet # Hitachi Metals America Ltd 2C:91:27 Eintechno # Eintechno Corporation 2C:9E:5F MotorolaMo # Motorola Mobility, Inc. 2C:A1:57 Acromate # ACROMATE, INC. @@ -16697,12 +16766,14 @@ 30:69:4B Rim 30:7C:30 Rim 30:87:30 HuaweiDevi # Huawei Device Co., Ltd +30:8C:FB Dropcam 30:E4:8E VodafoneUk # Vodafone UK 30:EB:25 IntekDigit # INTEK DIGITAL 30:EF:D1 AlstomStro # Alstom Strongwish (Shenzhen) Co., Ltd. 34:08:04 D-Link # D-Link Corporation 34:15:9E Apple # Apple, Inc 34:21:09 JensenScan # Jensen Scandinavia AS +34:29:EA McdElectro # MCD ELECTRONICS SP. Z O.O. 34:68:4A Teraworks # Teraworks Co., Ltd. 34:6F:92 WhiteRodge # White Rodgers Division 34:78:77 O-NetCommu # O-NET Communications(Shenzhen) Limited @@ -16711,6 +16782,7 @@ 34:86:2A HeinzLackm # Heinz Lackmann GmbH & Co KG 34:9A:0D ZbdDisplay # ZBD Displays Ltd 34:A1:83 Aware # AWare, Inc +34:A7:09 TrevilSrl # Trevil srl 34:AA:EE Mikrovisat # Mikrovisatos Servisas UAB 34:B5:71 Plds 34:BA:51 Se-KureCon # Se-Kure Controls, Inc. @@ -16731,9 +16803,11 @@ 38:16:D1 SamsungEle # Samsung Electronics Co.,Ltd 38:22:9D PirelliBro # PIRELLI BROADBAND SOLUTIONS 38:22:D6 H3cTechnol # H3C Technologies Co., Limited +38:26:CD Andtek # ANDTEK 38:31:AC Weg 38:52:1A Alcatel-Lu # Alcatel-Lucent 7705 38:58:0C Panaccess # Panaccess Systems GmbH +38:59:F9 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. 38:5F:C3 YuJeongSys # Yu Jeong System, Co.Ltd 38:63:F6 3nodMultim # 3NOD MULTIMEDIA(SHENZHEN)CO.,LTD 38:6E:21 WasionGrou # Wasion Group Ltd. @@ -16768,6 +16842,7 @@ 3C:5F:01 Synerchip # Synerchip Co., Ltd. 3C:62:00 SamsungEle # Samsung electronics CO., LTD 3C:62:78 ShenzhenJe # SHENZHEN JETNET TECHNOLOGY CO.,LTD. +3C:67:2C Sciovid # Sciovid Inc. 3C:74:37 Rim 3C:75:4A MotorolaMo # Motorola Mobility, Inc. 3C:8B:FE SamsungEle # Samsung Electronics @@ -16777,6 +16852,7 @@ 3C:B1:5B Avaya # Avaya, Inc 3C:B1:7F Wattwatche # Wattwatchers Pty Ld 3C:C0:C6 D&Amp;BAud # d&b audiotechnik GmbH +3C:D9:2B HewlettPac # Hewlett Packard 3C:DF:1E Cisco # Cisco Systems 3C:E5:A6 HangzhouH3 # Hangzhou H3C Technologies Co., Ltd. 3C:EA:4F 2wire @@ -16787,6 +16863,7 @@ 40:12:E4 Compass-Eo # Compass-EOS 40:13:D9 GlobalEs # Global ES 40:15:97 ProtectAme # Protect America, Inc. +40:16:9F Tp-LinkTec # TP-LINK TECHNOLOGIES CO., LTD. 40:18:D7 WyleTeleme # Wyle Telemetry and Data Systems 40:1D:59 BiometricA # Biometric Associates, LP 40:22:ED DigitalPro # Digital Projection Ltd @@ -16801,6 +16878,7 @@ 40:55:39 Cisco # Cisco Systems 40:5A:9B Anovo 40:5F:BE Rim +40:5F:C2 TexasInstr # Texas Instruments 40:61:86 Micro-Star # MICRO-STAR INT'L CO.,LTD 40:61:8E Hort-Plan 40:83:DE Motorola @@ -16813,6 +16891,7 @@ 40:A6:A4 Passivsyst # PassivSystems Ltd 40:A6:D9 Apple 40:B2:C8 NortelNetw # Nortel Networks +40:B3:FC Logital # Logital Co. Limited 40:C2:45 ShenzhenHe # Shenzhen Hexicom Technology Co., Ltd. 40:C7:C9 Naviit # Naviit Inc. 40:CD:3A Z3Technolo # Z3 Technology @@ -16822,7 +16901,7 @@ 40:EF:4C FihonestCo # Fihonest communication co.,Ltd 40:F4:EC Cisco # Cisco Systems 40:F5:2E LeicaMicro # Leica Microsystems (Schweiz) AG -40:FC:89 MotorolaMo # Motorola Mobile Devices +40:FC:89 MotorolaMo # Motorola Mobility, Inc. 44:25:BB BambooEnte # Bamboo Entertainment Corporation 44:2A:60 Apple # Apple, Inc. 44:37:19 2SaveEnerg # 2 Save Energy Ltd @@ -16832,6 +16911,7 @@ 44:45:53 Microsoft 44:46:49 DfiDiamond # DFI (Diamond Flower Industries) 44:4E:1A SamsungEle # Samsung Electronics Co.,Ltd +44:4F:5E PanStudios # Pan Studios Co.,Ltd. 44:51:DB RaytheonBb # Raytheon BBN Technologies 44:54:C0 ThompsonAe # Thompson Aerospace 44:56:8D PncTechnol # PNC Technologies Co., Ltd. @@ -16844,6 +16924,7 @@ 44:6C:24 ReallinEle # Reallin Electronic Co.,Ltd 44:7C:7F InnolightT # Innolight Technology Corporation 44:7D:A5 VtionInfor # VTION INFORMATION TECHNOLOGY (FUJIAN) CO.,LTD +44:7E:95 AlphaAndOm # Alpha and Omega, Inc 44:83:12 Star-Net 44:85:00 Intel # Intel Corporation 44:87:FC Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD. @@ -16899,7 +16980,7 @@ 4C:1A:3A PrimaResea # PRIMA Research And Production Enterprise Ltd. 4C:1F:CC HuaweiTech # HUAWEI TECHNOLOGIES CO.,LTD 4C:2C:80 BeijingSky # Beijing Skyway Technologies Co.,Ltd -4C:30:89 ThalesRail # Thales Rail Signalling Solutions GmbH +4C:30:89 ThalesTran # Thales Transportation Systems GmbH 4C:32:2D TeledataNe # TELEDATA NETWORKS 4C:3B:74 VogtecHK # VOGTEC(H.K.) Co., Ltd 4C:42:4C Informatio # Information Modes software modified addresses (not registered?) @@ -16912,6 +16993,7 @@ 4C:73:A5 Kove 4C:80:93 IntelCorpo # Intel Corporate 4C:8B:55 GrupoDigic # Grupo Digicon +4C:98:EF Zeo 4C:9E:E4 HanyangNav # Hanyang Navicom Co.,Ltd. 4C:B4:EA HrdSPte # HRD (S) PTE., LTD. 4C:B9:C8 Conet # CONET CO., LTD. @@ -16940,7 +17022,9 @@ 50:A6:E3 DavidClark # David Clark Company 50:AF:73 ShenzhenBi # Shenzhen Bitland Information Technology Co., Ltd. 50:C5:8D JuniperNet # Juniper Networks +50:C9:71 GnNetcom # GN Netcom A/S 50:CE:75 MeasyElect # Measy Electronics Ltd +50:D6:D7 TakahataPr # Takahata Precision 50:E5:49 Giga-ByteT # GIGA-BYTE TECHNOLOGY CO.,LTD. 50:EB:1A BrocadeCom # Brocade Communications Systems, Inc 50:F0:03 OpenStack # Open Stack, Inc. @@ -16962,6 +17046,7 @@ 54:89:98 HuaweiTech # HUAWEI TECHNOLOGIES CO.,LTD 54:92:BE SamsungEle # Samsung Electronics Co.,Ltd 54:9A:16 UzushioEle # Uzushio Electric Co.,Ltd. +54:9B:12 SamsungEle # Samsung Electronics 54:A5:1B HuaweiDevi # Huawei Device Co., Ltd 54:B6:20 SuhdolE&C # SUHDOL E&C Co.Ltd. 54:D4:6F CiscoSpvtg # Cisco SPVTG @@ -16985,15 +17070,19 @@ 58:67:1A Barnes&Nob # BARNES&NOBLE.COM 58:6D:8F Cisco-Link # Cisco-Linksys, LLC 58:6E:D6 Private +58:75:21 CjscRtsoft # CJSC RTSoft 58:8D:09 Cisco # Cisco Systems 58:94:6B IntelCorpo # Intel Corporate +58:98:35 Technicolo # Technicolor 58:A7:6F Id # iD corporation 58:B0:35 Apple # Apple, Inc 58:B9:E1 Crystalfon # Crystalfontz America, Inc. 58:BC:27 Cisco # Cisco Systems 58:D0:8F Ieee19041W # IEEE 1904.1 Working Group 58:DB:8D Fast # Fast Co., Ltd. +58:E4:76 CentronCom # CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD 58:E7:47 Deltanet # Deltanet AG +58:E8:08 Autonics # AUTONICS CORPORATION 58:EE:CE IconTime # Icon Time Systems 58:F6:7B XiaMenUnio # Xia Men UnionCore Technology LTD. 58:F6:BF KyotoUnive # Kyoto University @@ -17034,6 +17123,7 @@ 60:11:99 Data-Teste # Data-Tester Inc. 60:12:83 Soluciones # Soluciones Tecnologicas para la Salud y el Bienestar SA 60:15:C7 Idatech +60:19:0C Rramac 60:1D:0F MidniteSol # Midnite Solar 60:2A:54 CardiotekB # CardioTek B.V. 60:2A:D0 CiscoSpvtg # Cisco SPVTG @@ -17080,6 +17170,7 @@ 64:68:0C Comtrend 64:69:BC HyteraComm # Hytera Communications Co .,ltd 64:6E:6C RadioDatac # Radio Datacom LLC +64:73:E2 Arbiter # Arbiter Systems, Inc. 64:7B:D4 TexasInstr # Texas Instruments 64:7D:81 YokotaIndu # YOKOTA INDUSTRIAL CO,.LTD 64:7F:DA TektelicCo # TEKTELIC Communications Inc. @@ -17104,7 +17195,7 @@ 64:DC:01 StaticGrou # Static Systems Group PLC 64:DE:1C KingneticP # Kingnetic Pte Ltd 64:E8:E6 GlobalMois # global moisture management system -64:ED:57 MotorolaMd # Motorola MDb/Broadband +64:ED:57 MotorolaMo # Motorola Mobility, Inc. 64:F9:70 KenadeElec # Kenade Electronics Technology Co.,LTD. 64:F9:87 Avvasi # Avvasi Inc. 64:FC:8C Zonar # Zonar Systems @@ -17115,6 +17206,7 @@ 68:4B:88 Galtronics # Galtronics Telemetry Inc. 68:54:F5 Enlighted # enLighted Inc 68:59:7F AlcatelLuc # Alcatel Lucent +68:5B:36 PowertechI # POWERTECH INDUSTRIAL CO., LTD. 68:5D:43 IntelCorpo # Intel Corporate 68:63:59 AdvancedDi # Advanced Digital Broadcast SA 68:78:4C NortelNetw # Nortel Networks @@ -17122,6 +17214,7 @@ 68:79:ED Sharp # SHARP Corporation 68:7F:74 Cisco-Link # Cisco-Linksys, LLC 68:85:40 IgiMobile # IGI Mobile, Inc. +68:87:6B InqMobile # INQ Mobile Limited 68:92:34 RuckusWire # Ruckus Wireless 68:A1:B7 HonghaoMin # Honghao Mingchuan Technology (Beijing) CO.,Ltd. 68:A3:C4 LiteonTech # Liteon Technology Corporation @@ -17136,6 +17229,7 @@ 68:EB:AE SamsungEle # Samsung Electronics Co.,Ltd 68:EB:C5 AngstremTe # Angstrem Telecom 68:EF:BD Cisco # Cisco Systems +68:F8:95 Redflow # Redflow Limited 6C:04:60 RbhAccessT # RBH Access Technologies Inc. 6C:0E:0D SonyEricss # Sony Ericsson Mobile Communications AB 6C:0F:6A JdcTech # JDC Tech Co., Ltd. @@ -17173,13 +17267,15 @@ 6C:FD:B9 ProwareTec # Proware Technologies Co Ltd. 6C:FF:BE MpbCommuni # MPB Communications Inc. 70:02:58 01db-Metra # 01DB-METRAVIB -70:14:04 Liability& # Limited Liability Company "Research Center "Bresler" +70:14:04 Liability" # Limited Liability Company "Research Center "Bresler" 70:1A:04 LiteonTech # Liteon Tech Corp. 70:1A:ED Advas # ADVAS CO., LTD. 70:2B:1D E-DomusInt # E-Domus International Limited 70:2F:97 AavaMobile # Aava Mobile Oy 70:32:D5 AthenaWire # Athena Wireless Communications Inc +70:3A:D8 ShenzhenAf # Shenzhen Afoundry Electronic Co., Ltd 70:3C:39 SeawingKft # SEAWING Kft +70:4A:AE XstreamFlo # Xstream Flow (Pty) Ltd 70:58:12 PanasonicA # Panasonic AVC Networks Company 70:5A:B6 CompalInfo # COMPAL INFORMATION (KUNSHAN) CO., LTD. 70:5E:AA ActionTarg # Action Target, Inc. @@ -17210,6 +17306,7 @@ 74:32:56 Nt-WareSys # NT-ware Systemprg GmbH 74:38:89 AnnaxAnzei # ANNAX Anzeigesysteme GmbH 74:56:12 MotorolaMo # Motorola Mobility, Inc. +74:5E:1C Pioneer # PIONEER CORPORATION 74:65:D1 Atlinks 74:6B:82 Movek # MOVEK 74:72:F2 ChipsipTec # Chipsip Technology Co., Ltd. @@ -17275,6 +17372,7 @@ 78:B8:1A InterSales # INTER SALES A/S 78:C4:0E H&DWireles # H&D Wireless 78:C6:BB Innovasic # Innovasic, Inc. +78:CA:04 Nokia # Nokia Corporation 78:CA:39 Apple 78:CD:8E SmcNetwork # SMC Networks Inc 78:D0:04 NeousysTec # Neousys Technology Inc. @@ -17297,6 +17395,7 @@ 7C:39:20 SsomaSecur # SSOMA SECURITY 7C:3B:D5 ImagoGroup # Imago Group 7C:3E:9D Patech +7C:4A:82 PortsmithL # Portsmith LLC 7C:4A:A8 MindtreeWi # MindTree Wireless PVT Ltd 7C:4F:B5 ArcadyanTe # Arcadyan Technology Corporation 7C:55:E7 Ysi # YSI, Inc. @@ -17336,8 +17435,11 @@ 80:3B:9A Ghe-CesEle # ghe-ces electronic ag 80:4F:58 Thinkeco # ThinkEco, Inc. 80:50:1B Nokia # Nokia Corporation +80:58:C5 NovatecKom # NovaTec Kommunikationstechnik GmbH +80:64:59 Nimbus # Nimbus Inc. 80:65:E9 Benq # BenQ Corporation 80:66:29 PrescopeTe # Prescope Technologies CO.,LTD. +80:6C:BC NetNewElec # NET New Electronic Technology GmbH 80:71:1F JuniperNet # Juniper Networks 80:7D:1B Neosystem # Neosystem Co. Ltd. 80:81:A5 TongqingCo # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd @@ -17398,13 +17500,17 @@ 88:B1:68 DeltaContr # Delta Control GmbH 88:B6:27 GembirdEur # Gembird Europe BV 88:BA:7F Qfiednet # Qfiednet Co., Ltd. +88:BF:D5 SimpleAudi # Simple Audio Ltd 88:C6:63 Apple # Apple Inc 88:DD:79 Voltaire 88:E0:A0 ShenzhenVi # Shenzhen VisionSTOR Technologies Co., Ltd 88:ED:1C CudoCommun # Cudo Communication Co., Ltd. +88:F0:77 Cisco # Cisco Systems 88:FD:15 Lineeye # LINEEYE CO., LTD +8C:11:CB AbusSecuri # ABUS Security-Center GmbH & Co. KG 8C:1F:94 RfSurgical # RF Surgical System Inc. 8C:27:8A Vocollect # Vocollect Inc +8C:44:35 ShanghaiBr # Shanghai BroadMobi Communication Technology Co., Ltd. 8C:4D:EA Cerio # Cerio Corporation 8C:51:05 ShenzhenIr # Shenzhen ireadygo Information Technology CO.,LTD. 8C:53:F7 A&DEnginee # A&D ENGINEERING CO., LTD. @@ -17412,6 +17518,7 @@ 8C:56:C5 Nintendo # Nintendo Co., Ltd. 8C:58:77 Apple # Apple, Inc. 8C:59:8B CTechnolog # C Technologies AB +8C:5C:A1 D-Broad # d-broad,INC 8C:5F:DF BeijingRai # Beijing Railway Signal Factory 8C:64:0B BsStoritve # BS Storitve d.o.o. 8C:64:22 SonyEricss # Sony Ericsson Mobile Communications AB @@ -17420,7 +17527,9 @@ 8C:7B:9D Apple 8C:7C:B5 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. 8C:7C:FF BrocadeCom # Brocade Communications Systems, Inc. +8C:82:A8 InsigmaTec # Insigma Technology Co.,Ltd 8C:84:01 Private +8C:89:A5 Micro-Star # Micro-Star INT'L CO., LTD 8C:90:D3 AlcatelLuc # Alcatel Lucent 8C:92:36 AusLinxTec # Aus.Linx Technology Co., Ltd. 8C:A0:48 BeijingNet # Beijing NeTopChip Technology Co.,LTD @@ -17432,6 +17541,7 @@ 8C:E7:B3 SonardyneI # Sonardyne International Ltd 8C:F9:C9 MesadaTech # MESADA Technology Co.,Ltd. 90:00:4E HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +90:09:17 Far-Sighte # Far-sighted mobile 90:18:AE ShanghaiMe # Shanghai Meridian Technologies, Co. Ltd. 90:19:00 ScsSa # SCS SA 90:21:55 Htc # HTC Corporation @@ -17452,10 +17562,14 @@ 90:7F:61 ChiconyEle # Chicony Electronics Co., Ltd. 90:84:0D Apple # Apple, Inc 90:88:A2 IonicsTech # IONICS TECHNOLOGY ME LTDA +90:8D:1D GhTechnolo # GH Technologies 90:90:3C TrisonTech # TRISON TECHNOLOGY CORPORATION +90:90:60 RsiVideoTe # RSI VIDEO TECHNOLOGIES 90:A2:DA GheoSa # GHEO SA 90:A4:DE WistronNew # Wistron Neweb Corp. 90:A7:C1 PakedgeDev # Pakedge Device and Software Inc. +90:B8:D0 Joyent # Joyent, Inc. +90:CF:15 Nokia # Nokia Corporation 90:D7:EB TexasInstr # Texas Instruments 90:D8:52 Comtec # Comtec Co., Ltd. 90:D9:2C Hug-Witsch # HUG-WITSCHI AG @@ -17477,7 +17591,10 @@ 94:5B:7E TrilobitLt # TRILOBIT LTDA. 94:81:A4 AzurayTech # Azuray Technologies 94:85:7A EvantageIn # Evantage Industries Corp +94:88:54 TexasInstr # Texas Instruments +94:8B:03 EagetInnov # EAGET Innovation and Technology Co., Ltd. 94:8D:50 BeamexOy # Beamex Oy Ab +94:8F:EE HughesTele # Hughes Telematics, Inc. 94:9C:55 AltaDataTe # Alta Data Technologies 94:A7:BC Bodymedia # BodyMedia, Inc. 94:AA:B8 JoviewBeij # Joview(Beijing) Technology Co. Ltd. @@ -17490,6 +17607,7 @@ 94:DD:3F A+VLinkTec # A+V Link Technologies, Corp. 94:E2:26 DOrtizCons # D. ORtiz Consulting, LLC 94:E7:11 XirkaDamaP # Xirka Dama Persada PT +94:E8:48 FyldeMicro # FYLDE MICRO LTD 94:F6:92 Geminico # Geminico co.,Ltd. 94:F7:20 TianjinDev # Tianjin Deviser Electronics Instrument Co., Ltd 94:FD:1D Wherewhen # WhereWhen Corp @@ -17499,11 +17617,15 @@ 98:0E:E4 Private 98:2C:BE 2wire 98:2D:56 Resolution # Resolution Audio +98:30:00 BeijingKem # Beijing KEMACOM Technologies Co., Ltd. 98:35:B8 AssembledP # Assembled Products Corporation +98:42:46 GemtekTech # Gemtek Technology Co., Ltd. +98:4B:4A MotorolaMo # Motorola Mobility Inc. 98:4B:E1 HewlettPac # Hewlett Packard 98:4E:97 StarlightM # Starlight Marketing (H. K.) Ltd. 98:59:45 TexasInstr # Texas Instruments 98:60:22 Emw # EMW Co., Ltd. +98:66:EA Industrial # Industrial Control Communications, Inc. 98:6D:C8 ToshibaMit # TOSHIBA MITSUBISHI-ELECTRIC INDUSTRIAL SYSTEMS CORPORATION 98:73:C4 SageElectr # Sage Electronic Engineering LLC 98:89:ED AnademInfo # Anadem Information Inc. @@ -17515,11 +17637,15 @@ 98:D8:8C NortelNetw # Nortel Networks 98:DC:D9 Unitec # UNITEC Co., Ltd. 98:E1:65 Accutome +98:EC:65 CosesyAps # Cosesy ApS 98:F5:37 Zte # zte corporation +98:F8:DB MariniImpi # Marini Impianti Industriali s.r.l. 98:FC:11 Cisco-Link # Cisco-Linksys, LLC 9C:18:74 NokiaDanma # Nokia Danmark A/S 9C:22:0E TascanServ # TASCAN Service GmbH 9C:28:BF Continenta # Continental Automotive Czech Republic s.r.o. +9C:31:B6 KuliteSemi # Kulite Semiconductor Products Inc +9C:41:7C HameTechno # Hame Technology Co., Limited 9C:45:63 DimepSiste # DIMEP Sistemas 9C:4A:7B Nokia # Nokia Corporation 9C:4E:20 Cisco # Cisco Systems @@ -17529,9 +17655,12 @@ 9C:5D:95 VtcElectro # VTC Electronics Corp. 9C:5E:73 CalibreUk # Calibre UK Ltd 9C:64:5E HarmanCons # Harman Consumer Group +9C:6A:BE QeesAps # QEES ApS. 9C:75:14 WildixSrl # Wildix srl 9C:77:AA Nadasnv 9C:80:7D SyscableKo # SYSCABLE Korea Inc. +9C:8E:99 HewlettPac # Hewlett Packard +9C:93:4E Xerox # Xerox Corporation 9C:95:F8 SmartdoorL # SmartDoor Systems, LLC 9C:AD:EF ObihaiTech # Obihai Technology, Inc. 9C:AF:CA Cisco # Cisco Systems @@ -17579,6 +17708,7 @@ A0:DE:05 Jsc"Irbis- # JSC "Irbis-T" A0:F2:17 GeMedicalS # GE Medical System(China) Co., Ltd. A4:0C:C3 Cisco # Cisco Systems +A4:13:4E LuxulWirel # Luxul Wireless A4:1B:C0 FastecImag # Fastec Imaging Corporation A4:21:8A NortelNetw # Nortel Networks A4:24:B3 FlatfrogLa # FlatFrog Laboratories AB @@ -17586,18 +17716,21 @@ A4:38:FC PlasticLog # Plastic Logic A4:50:55 BuswareDe # busware.de A4:56:1B Mcot # MCOT Corporation +A4:5A:1C Smart-Elec # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:67:06 Apple # Apple Inc A4:79:E4 Klinfo # KLINFO Corp A4:7A:A4 MotorolaMo # Motorola Mobility, Inc. A4:7C:1F GlobalMicr # Global Microwave Systems Inc. A4:85:6B QElectroni # Q Electronics Ltd +A4:99:81 FujianElit # FuJian Elite Power Tech CO.,LTD. A4:9B:13 BurroughsP # Burroughs Payment Systems, Inc. A4:A8:0F ShenzhenCo # Shenzhen Coship Electronics Co., Ltd. A4:AD:00 RagsdaleTe # Ragsdale Technology A4:AD:B8 VitecGroup # Vitec Group, Camera Dynamics Ltd A4:AE:9A MaestroWir # Maestro Wireless Solutions ltd. A4:B1:21 Arantia201 # Arantia 2010 S.L. +A4:B1:97 Apple # Apple, Inc. A4:B1:EE HZander # H. ZANDER GmbH & Co. KG A4:B2:A7 AdaxysSolu # Adaxys Solutions AG A4:BA:DB Dell # Dell Inc. @@ -17606,10 +17739,12 @@ A4:C2:AB HangzhouLe # Hangzhou LEAD-IT Information & Technology Co.,Ltd A4:D1:D1 EcotalityN # ECOtality North America A4:DA:3F Bionics # Bionics Corp. +A4:DB:2E KingspanEn # Kingspan Environmental Ltd A4:DE:50 TotalWalth # Total Walther GmbH A4:E3:2E Silicon&Am # Silicon & Software Systems Ltd. A4:E7:E4 Connex # Connex GmbH -A4:ED:4E MotorolaMo # Motorola Mobile Devices +A4:ED:4E MotorolaMo # Motorola Mobility, Inc. +A4:EE:57 SeikoEpson # SEIKO EPSON CORPORATION A8:1B:18 Xts # XTS CORP A8:39:44 ActiontecE # Actiontec Electronics, Inc A8:55:6A PocketnetT # Pocketnet Technology Inc. @@ -17645,13 +17780,16 @@ AA:00:04 DigitalEqu # DIGITAL EQUIPMENT CORPORATION AC:02:CF RwTecnolog # RW Tecnologia Industria e Comercio Ltda AC:06:13 Senselogix # Senselogix Ltd +AC:19:9F SungrowPow # SUNGROW POWER SUPPLY CO.,LTD. AC:20:AA Dmatek # DMATEK Co., Ltd. AC:2F:A8 Humannix # Humannix Co.,Ltd. AC:34:CB ShanhaiGbc # Shanhai GBCOM Communication Technology Co. Ltd AC:44:F2 Revolabs # Revolabs Inc +AC:47:23 Genelec AC:4F:FC Svs-Vistek # SVS-VISTEK GmbH AC:51:35 MpiTech # MPI TECH AC:58:3B HumanAssem # Human Assembler, Inc. +AC:5E:8C Utillink AC:61:23 Drivven # Drivven, Inc. AC:67:06 RuckusWire # Ruckus Wireless AC:6F:4F Enspert # Enspert Inc @@ -17662,6 +17800,7 @@ AC:83:F0 MagentaVid # Magenta Video Networks AC:86:74 OpenMesh # Open Mesh, Inc. AC:86:7E CreateNewT # Create New Technology (HK) Limited Company +AC:8A:CD RogerDWens # ROGER D.Wensker, G.Wensker sp.j. AC:93:2F Nokia # Nokia Corporation AC:9A:96 LantiqDeut # Lantiq Deutschland GmbH AC:9B:84 SmakTecnol # Smak Tecnologia e Automacao @@ -17669,6 +17808,7 @@ AC:AB:8D LyngsoMari # Lyngso Marine A/S AC:BE:75 UfineTechn # Ufine Technologies Co.,Ltd. AC:BE:B6 Visualedge # Visualedge Technology Co., Ltd. +AC:C9:35 Ness # Ness Corporation AC:CA:54 TelldusTec # Telldus Technologies AB AC:CA:BA Midokura # Midokura Co., Ltd. AC:CE:8F HwaYaoTech # HWA YAO TECHNOLOGIES CO., LTD @@ -17680,6 +17820,7 @@ AC:F9:7E Elesys # ELESYS INC. B0:1B:7C OntrolAS # Ontrol A.S. B0:38:29 Siliconwar # Siliconware Precision Industries Co., Ltd. +B0:48:7A Tp-LinkTec # TP-LINK TECHNOLOGIES CO., LTD. B0:51:8E HollTechno # Holl technology CO.Ltd. B0:5B:1F ThermoFish # THERMO FISHER SCIENTIFIC S.P.A. B0:65:63 ShanghaiRa # Shanghai Railway Communication Factory @@ -17688,6 +17829,7 @@ B0:90:74 FulanElect # Fulan Electronics Limited B0:91:34 Taleo B0:97:3A E-Fuel # E-Fuel Corporation +B0:99:28 Fujitsu # Fujitsu Limited B0:9A:E2 StemmerIma # STEMMER IMAGING GmbH B0:A1:0A Pivotal # Pivotal Systems Corporation B0:A7:2A EnsembleDe # Ensemble Designs, Inc. @@ -17708,6 +17850,7 @@ B4:28:F1 E-Prime # E-Prime Co., Ltd. B4:2A:39 OrbitMerre # ORBIT MERRET, spol. s r. o. B4:2C:BE DirectPaym # Direct Payment Solutions Limited +B4:35:F7 ZhejiangPe # Zhejiang Pearmain Electronics Co.ltd. B4:37:41 Consert # Consert, Inc. B4:39:D6 ProcurveNe # ProCurve Networking by HP B4:3D:B2 DegreaneHo # Degreane Horizon @@ -17715,10 +17858,12 @@ B4:4C:C2 NrElectric # NR ELECTRIC CO., LTD B4:52:53 SeagateTec # Seagate Technology B4:58:61 CremoteLlc # CRemote, LLC +B4:5C:A4 Thing-Talk # Thing-talk Wireless Communication Technologies Corporation Limited B4:74:9F AskeyCompu # askey computer corp B4:82:FE AskeyCompu # Askey Computer Corp B4:99:BA HewlettPac # Hewlett Packard B4:A4:E3 Cisco # Cisco Systems +B4:A5:A9 Modi # MODI GmbH B4:AA:4D Ensequence # Ensequence, Inc. B4:B0:17 Avaya # Avaya, Inc B4:B5:AF MinsungEle # Minsung Electronics @@ -17732,6 +17877,7 @@ B4:EE:D4 TexasInstr # Texas Instruments B4:F3:23 Petatel # PETATEL INC. B8:0B:9D RopexIndus # ROPEX Industrie-Elektronik GmbH +B8:3A:7B WorldplayC # Worldplay (Canada) Inc. B8:3D:4E ShenzhenCu # Shenzhen Cultraview Digital Technology Co.,Ltd Shanghai Branch B8:41:5F Asp # ASP AG B8:61:6F AcctonWire # Accton Wireless Broadband(AWB), Corp. @@ -17746,11 +17892,15 @@ B8:A3:E0 BenruiTech # BenRui Technology Co.,Ltd B8:A8:AF LogicSPA # Logic S.p.A. B8:AC:6F Dell # Dell Inc +B8:AF:67 HewlettPac # Hewlett Packard B8:B1:C7 Bt&Com # BT&COM CO.,LTD B8:BA:68 XiAnJizhon # Xi'an Jizhong Digital Communication Co.,Ltd B8:BA:72 Cynove B8:BE:BF Cisco # Cisco Systems +B8:C7:16 FiberhomeT # Fiberhome Telecommunication Technologies Co.,LTD +B8:C7:5D Apple # Apple Inc B8:D0:6F GuangzhouH # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE +B8:D4:9D MSevenSyst # M Seven System Ltd. B8:E5:89 PayterBv # Payter BV B8:E7:79 Private B8:EE:79 YwireTechn # YWire Technologies, Inc. @@ -17778,8 +17928,10 @@ BC:6A:16 Tdvine BC:6E:76 GreenEnerg # Green Energy Options Ltd BC:71:C1 Xtrillion # XTrillion, Inc. +BC:76:70 HuaweiDevi # Huawei Device Co., Ltd BC:77:37 IntelCorpo # Intel Corporate BC:7D:D1 RadioDataC # Radio Data Comms +BC:81:99 Basic # BASIC Co.,Ltd. BC:83:A7 ShenzhenCh # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT BC:99:BC FonseeTech # FonSee Technology Inc. BC:9D:A5 DascomEuro # DASCOM Europe GmbH @@ -17821,6 +17973,7 @@ C0:E4:22 TexasInstr # Texas Instruments C0:EA:E4 Sonicwall C0:F8:DA HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +C4:0F:09 HermesElec # Hermes electronic GmbH C4:10:8A RuckusWire # Ruckus Wireless C4:16:FA Prysm # Prysm Inc C4:17:FE HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. @@ -17828,6 +17981,7 @@ C4:1E:CE HmiSources # HMI Sources Ltd. C4:24:2E GalvanicAp # Galvanic Applied Sciences Inc C4:2C:03 Apple +C4:36:DA Rusteletec # Rusteletech Ltd. C4:3D:C7 Netgear C4:46:19 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. C4:4A:D0 FirefliesR # FIREFLIES RTLS @@ -17873,6 +18027,7 @@ C8:93:83 EmbeddedAu # Embedded Automation, Inc. C8:97:9F Nokia # Nokia Corporation C8:9C:1D Cisco # Cisco Systems +C8:9C:DC Elitegroup # ELITEGROUP COMPUTER SYSTEM CO., LTD. C8:A1:B6 ShenzhenLo # Shenzhen Longway Technologies Co., Ltd C8:A7:0A VerizonBus # Verizon Business C8:A7:29 Systronics # SYStronics Co., Ltd. @@ -17907,9 +18062,12 @@ CC:76:69 Seetech CC:7A:30 CmaxWirele # CMAX Wireless Co., Ltd. CC:7D:37 MotorolaMo # Motorola Mobility, Inc. +CC:7E:E7 PanasonicA # Panasonic AVC Networks Company CC:8C:E3 TexasInstr # Texas Instruments CC:96:A0 HuaweiDevi # Huawei Device Co., Ltd CC:9E:00 Nintendo # Nintendo Co., Ltd. +CC:AF:78 HonHaiPrec # Hon Hai Precision Ind. Co.,Ltd. +CC:B5:5A Fraunhofer # Fraunhofer ITWM CC:B8:88 AnbSecurit # AnB Securite s.a. CC:BE:71 OptilogixB # OptiLogix BV CC:C6:2B Tri-System # Tri-Systems Corporation @@ -17917,23 +18075,29 @@ CC:CD:64 Sm-Electro # SM-Electronic GmbH CC:CE:40 Janteq # Janteq Corp CC:D8:11 AiconnTech # Aiconn Technology Corporation +CC:D9:E9 ScrEnginee # SCR Engineers Ltd. CC:EA:1C Dconworks # DCONWORKS Co., Ltd CC:F3:A5 ChiMeiComm # Chi Mei Communication Systems, Inc CC:F6:7A AyeckaComm # Ayecka Communication Systems LTD CC:F8:41 Lumewave CC:FC:6D RizTransmi # RIZ TRANSMITTERS CC:FC:B1 WirelessTe # Wireless Technology, Inc. +D0:13:1E SunrexTech # Sunrex Technology Corp D0:15:4A Zte # zte corporation D0:1C:BB BeijingCti # Beijing Ctimes Digital Technology Co., Ltd. D0:27:88 HonHaiPrec # Hon Hai Precision Ind.Co.Ltd D0:37:61 TexasInstr # Texas Instruments D0:57:4C Cisco # Cisco Systems D0:58:75 ActiveCont # Active Control Technology Inc. +D0:5F:CE HitachiDat # Hitachi Data Systems +D0:66:7B SamsungEle # Samsung Electronics Co., LTD D0:75:BE RenoA&Amp; # Reno A&E D0:7D:E5 ForwardPay # Forward Pay Systems, Inc. D0:89:99 Apcon # APCON, Inc. D0:93:F8 Stonestree # Stonestreet One LLC +D0:9B:05 Emtronix D0:A3:11 NeubergerG # Neuberger Gebï¿½udeautomation GmbH +D0:AF:B6 LinktopTec # Linktop Technology Co., LTD D0:B3:3F ShenzhenTi # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD. D0:B5:3D SeproRobot # SEPRO ROBOTIQUE D0:BB:80 ShlTelemed # SHL Telemedicine International Ltd. @@ -17950,6 +18114,8 @@ D4:12:96 AnobitTech # Anobit Technologies Ltd. D4:1F:0C TviVisionO # TVI Vision Oy D4:28:B2 Iobridge # ioBridge, Inc. +D4:2C:3D SkyLightDi # Sky Light Digital Limited +D4:3A:E9 DongguanIp # DONGGUAN ipt INDUSTRIAL CO., LTD D4:3D:67 CarmaIndus # Carma Industries Inc. D4:4C:24 Vuppalamri # Vuppalamritha Magnetic Components LTD D4:4C:A7 Informtekh # Informtekhnika & Communication, LLC @@ -17973,6 +18139,7 @@ D4:9C:28 JaybirdGea # JayBird Gear LLC D4:9C:8E University # University of FUKUI D4:9E:6D WuhanZhong # Wuhan Zhongyuan Huadian Science & Technology Co., +D4:A4:25 SmaxTechno # SMAX Technology Co., Ltd. D4:A9:28 GreenwaveR # GreenWave Reality Inc D4:AA:FF MicroWorld # MICRO WORLD D4:C7:66 Acentic # Acentic GmbH @@ -17982,6 +18149,7 @@ D4:E3:2C SSiedleSoh # S. Siedle & Sohne D4:E8:B2 SamsungEle # Samsung Electronics D4:F0:27 NavetasEne # Navetas Energy Management +D4:F0:B4 NapcoSecur # Napco Security Technologies D4:F1:43 Iproad # IPROAD.,Inc D8:1B:FE Twinlinx # TWINLINX CORPORATION D8:1C:14 CompactaIn # Compacta International, Ltd. @@ -18001,7 +18169,9 @@ D8:76:0A Escort # Escort, Inc. D8:79:88 HonHaiPrec # Hon Hai Precision Ind. Co., Ltd. D8:95:2F TexasInstr # Texas Instruments +D8:97:3B EmersonNet # Emerson Network Power Embedded Power D8:9D:B9 EmegatechI # eMegatech International Corp. +D8:9E:3F Apple # Apple, Inc. D8:A2:5E Apple D8:AE:90 ItibiaTech # Itibia Technologies D8:B1:2A PanasonicM # Panasonic Mobile Communications Co., Ltd. @@ -18017,21 +18187,26 @@ D8:E7:2B OnpathTech # OnPATH Technologies D8:FE:8F Idfone # IDFone Co., Ltd. DC:02:65 MeditechKf # Meditech Kft +DC:05:ED Nabtesco # Nabtesco Corporation DC:07:C1 HangzhouQi # HangZhou QiYang Technology Co.,Ltd. +DC:16:A2 MedtronicD # Medtronic Diabetes DC:1D:9F UBTech # U & B tech DC:20:08 AsdElectro # ASD Electronics Ltd DC:2B:61 Apple DC:2B:66 Infoblock DC:2C:26 ItonTechno # Iton Technology Limited DC:33:50 Techsat # TechSAT GmbH +DC:3C:84 TicomGeoma # Ticom Geomatics, Inc. DC:49:C9 CascoSigna # CASCO SIGNAL LTD DC:4E:DE ShinyeiTec # SHINYEI TECHNOLOGY CO., LTD. DC:7B:94 Cisco # Cisco Systems DC:9B:1E Intercom # Intercom, Inc. DC:9C:52 SapphireTe # Sapphire Technology Limited. +DC:A6:BD BeijingLan # Beijing Lanbo Technology Co., Ltd. DC:A7:D9 Compressor # Compressor Controls Corp DC:A9:71 IntelCorpo # Intel Corporate DC:CB:A8 ExploraTec # Explora Technologies Inc +DC:CF:94 BeijingRon # Beijing Rongcheng Hutong Technology Co., Ltd. DC:D0:F7 Bentek # Bentek Systems Ltd. DC:D3:21 HumaxTld # HUMAX co.,tld DC:D8:7F ShenzhenJo # Shenzhen JoinCyber Telecom Equipment Ltd @@ -18078,9 +18253,11 @@ E0:E7:51 Nintendo # Nintendo Co., Ltd. E0:E8:E8 OliveTelec # Olive Telecommunication Pvt. Ltd E0:EE:1B PanasonicA # Panasonic Automotive Systems Company of America +E0:F2:11 Digitalwat # Digitalwatt E0:F3:79 Vaddio E0:F8:47 Apple # Apple Inc E2:0C:0F KingstonTe # Kingston Technologies +E4:12:89 TopsystemS # topsystem Systemhaus GmbH E4:1C:4B V2Technolo # V2 TECHNOLOGY, INC. E4:1F:13 Ibm # IBM Corp E4:27:71 Smartlabs @@ -18103,9 +18280,11 @@ E4:AD:7D SclElement # SCL Elements E4:CE:8F Apple # Apple Inc E4:D7:1D OrayaThera # Oraya Therapeutics +E4:DD:79 En-VisionA # En-Vision America, Inc. E4:E0:C5 SamsungEle # Samsung Electronics Co., LTD E4:EC:10 Nokia # Nokia Corporation E4:FF:DD ElectronIn # ELECTRON INDIA +E8:04:0B Apple # Apple Inc E8:04:62 Cisco # Cisco Systems E8:05:6D NortelNetw # Nortel Networks E8:06:88 Apple # Apple Inc. @@ -18129,8 +18308,12 @@ E8:9D:87 Toshiba E8:A4:C1 DeepSeaEle # Deep Sea Electronics PLC E8:B4:AE ShenzhenC& # Shenzhen C&D Electronics Co.,Ltd +E8:B7:48 Cisco # Cisco Systems +E8:BA:70 Cisco # Cisco Systems E8:BE:81 Sagemcom E8:C2:29 H-Displays # H-Displays (MSC) Bhd +E8:C3:20 AustcoComm # Austco Communication Systems Pty Ltd +E8:CC:32 Micronet # Micronet LTD E8:DA:AA VideohomeT # VideoHome Technology Corp. E8:DF:F2 Prf # PRF Co., Ltd. E8:E0:8F GravotechM # GRAVOTECH MARKING SAS @@ -18207,6 +18390,7 @@ F0:C2:7C MianyangNe # Mianyang Netop Telecom Equipment Co.,Ltd. F0:C8:8C Leddartech # LeddarTech Inc. F0:D7:67 AxemaPassa # Axema Passagekontroll AB +F0:DB:30 Yottabyte F0:DE:71 ShanghaiEd # Shanghai EDO Technologies Co.,Ltd. F0:DE:F1 WistronInf # Wistron InfoComm (Kunshan)Co F0:E5:C3 Draegerwer # Draegerwerk AG &amp; Co. KG aA @@ -18224,14 +18408,17 @@ F4:3E:9D BenuNetwor # Benu Networks, Inc. F4:42:27 SSResearch # S & S Research Inc. F4:45:ED PortableIn # Portable Innovation Technology Ltd. +F4:4E:FD ActionsSem # Actions Semiconductor Co.,Ltd.(Cayman Islands) F4:50:EB Telechips # Telechips Inc F4:55:95 Hengbao # HENGBAO Corporation LTD. F4:55:E0 NicewayCnc # Niceway CNC Technology Co.,Ltd.Hunan Province +F4:5F:D4 CiscoSpvtg # Cisco SPVTG F4:5F:F7 DqTechnolo # DQ Technology Inc. F4:63:49 Diffon # Diffon Corporation F4:6D:04 AsustekCom # ASUSTek COMPUTER INC. F4:76:26 Viltechmed # Viltechmeda UAB F4:9F:54 SamsungEle # Samsung Electronics +F4:A5:2A HawaTechno # Hawa Technologies Inc F4:AC:C1 Cisco # Cisco Systems F4:B5:49 YeastarTec # Yeastar Technology Co., Ltd. F4:C7:14 HuaweiDevi # Huawei Device Co., Ltd @@ -18243,9 +18430,11 @@ F4:E1:42 DeltaElekt # Delta Elektronika BV F4:EC:38 Tp-LinkTec # TP-LINK TECHNOLOGIES CO., LTD. F4:FC:32 TexasInstr # Texas Instruments +F8:03:32 Khomp F8:0F:41 WistronInf # Wistron InfoComm(ZhongShan) Corporation F8:0F:84 NaturalSec # Natural Security SAS F8:10:37 AtopiaLp # Atopia Systems, LP +F8:1D:93 LongdhuaBe # Longdhua(Beijing) Controls Technology Co.,Ltd F8:1E:DF Apple # Apple, Inc F8:47:2D X2genDigit # X2gen Digital Corp. Ltd F8:52:DF VnlEurope # VNL Europe AB @@ -18254,7 +18443,7 @@ F8:6E:CF Arcx # Arcx Inc F8:71:FE GoldmanSac # The Goldman Sachs Group, Inc. F8:76:9B Neopis # Neopis Co., Ltd. -F8:7B:7A MotorolaMo # Motorola Mobile Devices +F8:7B:7A MotorolaMo # Motorola Mobility, Inc. F8:7B:8C AmpedWirel # Amped Wireless F8:81:1A Overkiz F8:8D:EF Tenebraex @@ -18287,6 +18476,7 @@ FC:68:3E DirectedPe # Directed Perception, Inc FC:75:E6 Handreamne # Handreamnet FC:7C:E7 FciUsaLlc # FCI USA LLC +FC:83:29 TreiTechni # Trei technics FC:8E:7E PaceFrance # Pace France FC:A1:3E SamsungEle # Samsung Electronics FC:A8:41 Avaya # Avaya, Inc @@ -18306,7 +18496,7 @@ # # Well-known addresses. # -# $Id: manuf 36081 2011-02-27 17:04:32Z gerald $ +# $Id: manuf 36535 2011-04-10 16:04:37Z gerald $ # # Wireshark - Network traffic analyzer # By Gerald Combs <gerald [AT] wireshark.org>
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/packaging/macosx/Info.plist ^
@@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.4.4, Copyright 1998-2011 Wireshark Development Team</string> + <string>1.4.5, Copyright 1998-2011 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Wireshark.icns</string> <key>CFBundleIdentifier</key> @@ -42,11 +42,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.4.4</string> + <string>1.4.5</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.4.4</string> + <string>1.4.5</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2011 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/packaging/nsis/wireshark.nsi ^
@@ -1,7 +1,7 @@ ; ; wireshark.nsi ; -; $Id: wireshark.nsi 33496 2010-07-13 00:31:44Z gerald $ +; $Id: wireshark.nsi 36572 2011-04-12 00:10:16Z gerald $ ; Set the compression mechanism first. @@ -393,6 +393,9 @@ File "${GNUTLS_DIR}\bin\libgnutls-openssl-26.dll" File "${GNUTLS_DIR}\bin\libgpg-error-0.dll" File "${GNUTLS_DIR}\bin\libtasn1-3.dll" +StrCmp "${INTL_DLL}" "libintl-8.dll" SkipLibIntl8 +File "${GNUTLS_DIR}\bin\libintl-8.dll" +SkipLibIntl8: !endif !ifdef LUA_DIR File "${LUA_DIR}\lua5.1.dll"
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/pcapio.c ^
@@ -16,7 +16,7 @@ * * Libpcap's pcap_dump() also doesn't return any error indications. * - * $Id: pcapio.c 28174 2009-04-27 09:58:09Z tuexen $ + * $Id: pcapio.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -182,7 +182,6 @@ } else { \ *error_pointer = 0; \ } \ - fclose(file_pointer); \ return FALSE; \ } \ written_length += (long)nwritten; \
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/services ^
@@ -14,7 +14,7 @@ PORT NUMBERS -(last updated 2011-02-24) +(last updated 2011-04-06) The port numbers are divided into three ranges: the Well Known Ports, the Registered Ports, and the Dynamic and/or Private Ports. @@ -2087,7 +2087,7 @@ # Carlisle Adams <Cadams&entrust.com> netconf-ssh 830/tcp NETCONF over SSH netconf-ssh 830/udp NETCONF over SSH -# [RFC4742] +# [RFC-ietf-netconf-rfc4742bis-08.txt] netconf-beep 831/tcp NETCONF over BEEP netconf-beep 831/udp NETCONF over BEEP # [RFC4744] @@ -2603,7 +2603,7 @@ # Vitali Fomine <info&winpopup-lan-messenger.com> November 2005 c1222-acse 1153/tcp ANSI C12.22 Port c1222-acse 1153/udp ANSI C12.22 Port -# [RFC-c1222-transport-over-ip-07.txt] +# [RFC6142] resacommunity 1154/tcp Community Service resacommunity 1154/udp Community Service # StÈphane MONS <stephane.mons&free.fr> September 2005 @@ -7594,7 +7594,7 @@ tksocket 2915/tcp TK Socket tksocket 2915/udp TK Socket # Previous contact: Alan Fahrner <alan&protix.com> -# Current contact: Alan Fahrner <afahrner&tickets.com> 13 March 2009 +# Current contact: Dino Ciano <DCiano&tickets.com> 02 March 2011 elvin_server 2916/tcp Elvin Server elvin_server 2916/udp Elvin Server elvin_client 2917/tcp Elvin Client @@ -11196,7 +11196,10 @@ pcoip 4172/tcp PC over IP pcoip 4172/udp PC over IP # Ken Unger <kunger&teradici.com> 23 December 2009 -# 4173-4174 Unassigned +# 4173 Unassigned +smcluster 4174/tcp StorMagic Cluster Services +# Chris Farey <chris_farey&stormagic.com> 09 March 2011 +# 4174/udp Reserved bccp 4175/tcp Brocade Cluster Communication Protocol # Norival Figueira <nfigueir&brocade.com> 07 April 2010 # 4175/udp Reserved @@ -12461,7 +12464,7 @@ # Bill Rettig <WRettig&efji.com> 19 May 2010 # 5221/udp Reserved xmpp-client 5222/tcp XMPP Client Connection -# [RFC-ietf-xmpp-3920bis-22.txt] +# [RFC6120] # 5222/udp Reserved hpvirtgrp 5223/tcp HP Virtual Machine Group Management hpvirtgrp 5223/udp HP Virtual Machine Group Management @@ -12480,7 +12483,13 @@ hpvroom 5228/tcp HP Virtual Room Service # Scott Levin <scott.levin&hp.com> 19 March 2009 # 5228/udp Reserved -# 5229-5233 Unassigned +# 5229-5231 Unassigned +csedaemon 5232/tcp Cruse Scanning System Service +# Christof J. Reetz <cjr&netplan.de> 09 March 2011 +# 5232/udp Reserved +enfs 5233/tcp Etinnae Network File Service +# Chris Peel <chrispeel.gsi&googlemail.com> 09 March 2011 +# 5233/udp Reserved eenet 5234/tcp EEnet communications eenet 5234/udp EEnet communications # Helmut Giritzer <helmut.giritzer&epluse.at> November 2005 @@ -12529,12 +12538,12 @@ # Abhay Rajaram <Abhay_Rajaram&3Com.com> March 2003 # 5266-5268 Unassigned xmpp-server 5269/tcp XMPP Server Connection -# [RFC-ietf-xmpp-3920bis-22.txt] +# [RFC6120] # 5269/udp Reserved xmp 5270/tcp Cartographer XMP xmp 5270/udp Cartographer XMP # Bobby Krupczak <rdk&krupczak.org> 03 April 2008 -cuelink 5271/tdp StageSoft CueLink messaging +cuelink 5271/tcp StageSoft CueLink messaging cuelink-disc 5271/udp StageSoft CueLink discovery # Todd Pichler <todd.pichler&stagesoft.com> 26 March 2010 pk 5272/tcp PK @@ -13150,7 +13159,7 @@ rfb 5900/tcp Remote Framebuffer rfb 5900/udp Remote Framebuffer # Tristan Richardson <iana&realvnc.com> March 2006 -# [RFC-levine-rfb-03.txt] +# [RFC6143] # 5901-5909 Unassigned cm 5910/tcp Context Management cm 5910/udp Context Management @@ -13713,7 +13722,14 @@ vision_elmd 6673/tcp vision_elmd vision_elmd 6673/udp vision_elmd # Chris Kramer <CKramer&gis.shl.com> -# 6674-6686 Unassigned +# 6674-6677 Unassigned +vfbp 6678/tcp Viscount Freedom Bridge Protocol +vfbp-disc 6678/udp Viscount Freedom Bridge Discovery +# Chris MacDonald <chris&viscount.com> 16 March 2011 +osaut 6679/tcp Osorno Automation +osaut 6679/udp Osorno Automation +# Peter Hombach <p.hombach&osorno.ca> 16 March 2011 +# 6680-6686 Unassigned clever-ctrace 6687/tcp CleverView for cTrace Message Service # David Cheng <davec&aesclever.com> 01 February 2010 # 6687/udp Reserved @@ -13726,7 +13742,7 @@ # 6690-6696 Unassigned # 6697/tcp Reserved babel 6697/udp Babel Routing Protocol -# [RFC-chroboczek-babel-routing-protocol-05.txt] +# [RFC6126] # 6698-6699 Unassigned # 6700 Unassigned (Removed 2010-01-26) kti-icad-srvr 6701/tcp KTI/ICAD Nameserver @@ -14018,7 +14034,11 @@ citrixuppg 7229/tcp Citrix UPP Gateway # Gary Barton <gary.barton&citrix.com> 24 February 2011 # 7229/udp Reserved -# 7230-7261 Unassigned +# 7230-7236 Unassigned +pads 7237/tcp PADS (Public Area Display System) Server +# Willie Jan Bons <WillieJan.Bons&nds.eu> 10 March 2011 +# 7237/udp Reserved +# 7238-7261 Unassigned cnap 7262/tcp Calypso Network Access Protocol cnap 7262/udp Calypso Network Access Protocol # Scott Halberg <eng&calypsosystems.com> 02 June 2009 @@ -14170,7 +14190,11 @@ sncp 7560/tcp Sniffer Command Protocol sncp 7560/udp Sniffer Command Protocol # Dominick Cafarelli <dominick.cafarelli&networkgeneral.com> August 2005 -# 7561-7565 Unassigned +# 7561-7562 Unassigned +cfw 7563/tcp Control Framework +# 7563/udp Reserved +# [RFC-ietf-mediactrl-sip-control-framework-12.txt] +# 7564-7565 Unassigned vsi-omega 7566/tcp VSI Omega vsi-omega 7566/udp VSI Omega # Curtis Smith <curtis.smith&vsin.com> @@ -15203,7 +15227,11 @@ ismserver 9500/tcp ismserver ismserver 9500/udp ismserver # Ian Gordon <iang&micromuse.co.uk> -# 9501-9534 Unassigned +# 9501-9521 Unassigned +# 9522/tcp Reserved +sma-spw 9522/udp SMA Speedwire +# SMA Solar Techology AG <thomas.weber&sma.de> 08 March 2011 +# 9523-9534 Unassigned mngsuite 9535/tcp Management Suite Remote Control mngsuite 9535/udp Management Suite Remote Control # Previous contact: Alan Butt <alan.butt&landesk.com> @@ -15571,7 +15599,8 @@ # 10809/udp Reserved # 10810/tcp Reserved nmc-disc 10810/udp Nuance Mobile Care Discovery -# Tim Shelton <tim.shelton&nuance.com> 02 August 2010 +# Previous contact: Tim Shelton <tim.shelton&nuance.com> 02 August 2010 +# Current contact: Gordon Waddell <gordon.waddell&nuance.com> 21 March 2011 # 10811-10859 Unassigned helix 10860/tcp Helix Client/Server helix 10860/udp Helix Client/Server @@ -15823,7 +15852,10 @@ dsmcc-ccp 13822/udp DSMCC Channel Change Protocol # Tim Addington <Tim.Addington&sciatl.com> # ISO/IEC 13818-6 MPEG-2 DSM-CC -# 13823-13928 Unassigned +bmdss 13823/tcp Blackmagic Design Streaming Server +# Sam Vaughan <samv&blackmagic-design.com> 01 March 2011 +# 13823/udp Reserved +# 13824-13928 Unassigned dta-systems 13929/tcp D-TA SYSTEMS dta-systems 13929/udp D-TA SYSTEMS # Alexis Bose <abose&d-ta.com> 08 December 2008 @@ -15884,7 +15916,11 @@ hydap 15000/tcp Hypack Data Aquisition hydap 15000/udp Hypack Data Aquisition # Mircea Neacsu <mircea&videotron.ca> -# 15001-15344 Unassigned +# 15001-15117 Unassigned +# 15118/tcp Reserved +v2g-secc 15118/udp v2g Supply Equipment Communication Controller Discovery Protocol +# Holger Lochner <holger.lochner&daimler.com> 06 April 2011 +# 15119-15344 Unassigned xpilot 15345/tcp XPilot Contact Port xpilot 15345/udp XPilot Contact Port # Bert Gijsbers <bert&xpilot.org> @@ -17011,15 +17047,12 @@ Transfer Part 3 (MTP3) - User Adaptation Layer (M3UA)", RFC 4666, September 2006. -[RFC4744] E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible - Exchange Protocol (BEEP)", RFC 4744, December 2006. - -[RFC4742] M. Wasserman and T. Goddard, "Using the NETCONF Configuration Protocol over - Secure Shell (SSH)", RFC 4742, December 2006. - [RFC4743] T. Goddard, "Using the Network Configuration Protocol (NETCONF) Over the Simple Object Access Protocol (SOAP)", RFC 4743, December 2006. +[RFC4744] E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible + Exchange Protocol (BEEP)", RFC 4744, December 2006. + [RFC4727] B. Fenner, "Experimental values In IPv4, IPv6, ICMPv4, ICMPv6, UDP and TCP Headers", RFC 4727, November 2006. @@ -17144,21 +17177,26 @@ [RFC6046] K. Moriarty and B. Trammell, "Transport of Real-time Inter-network Defense (RID) Messages", RFC 6045, November 2010. + +[RFC6120] P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", + RFC 6120, March 2011. -[RFC-c1222-transport-over-ip-07.txt] - A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", - RFC XXXX, Month Year. - -[RFC-levine-rfb-03.txt] - T. Richardson, J. Levine, "The Remote Framebuffer Protocol", RFC XXXX, - Month Year. +[RFC6142] A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", + RFC 6142, March 2011. + +[RFC6143] T. Richardson, J. Levine, "The Remote Framebuffer Protocol", RFC 6143, + March 2011. -[RFC-chroboczek-babel-routing-protocol-05.txt] - J. Chroboczek, "The Babel Routing Protocol", RFC XXXX, Month Year. +[RFC6126] J. Chroboczek, "The Babel Routing Protocol", RFC 6126, April 2011. -[RFC-ietf-xmpp-3920bis-22.txt] - P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", + +[RFC-ietf-mediactrl-sip-control-framework-12.txt] + C. Boulton, T. Melanchuk, S. McGlashan, "Media Control Channel Framework", RFC XXXX, Month Year. +[RFC-ietf-netconf-rfc4742bis-08.txt] + M. Wasserman, T. Goddard, "Using the NETCONF Configuration Protocol over + Secure Shell (SSH)", RFC XXXX, Month Year. + []
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/svnversion.h ^
@@ -1,2 +1,2 @@ -#define SVNVERSION "SVN Rev 36110" +#define SVNVERSION "SVN Rev 36650" #define SVNPATH "/trunk-1.4"
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/tap-comparestat.c ^
@@ -3,7 +3,7 @@ * Copyright 2008 Vincenzo Condoleo, Christophe Dirac, Reto Ruoss * supported by HSR (Hochschule Rapperswil) * - * $Id: tap-comparestat.c 30176 2009-09-27 21:26:29Z stig $ + * $Id: tap-comparestat.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -516,8 +516,11 @@ gint start, stop,ttl, order, pos=0; gdouble variance; - if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf,%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ + if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ if(pos){ + if(*(optarg+pos)==',') + filter=optarg+pos+1; + else filter=optarg+pos; } else { filter=NULL;
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/text2pcap.c ^
@@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com> * - * $Id: text2pcap.c 33012 2010-05-28 20:19:55Z morriss $ + * $Id: text2pcap.c 36571 2011-04-12 00:02:47Z gerald $ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -1075,7 +1075,7 @@ " -u <srcp>,<destp> prepend dummy UDP header with specified\n" " dest and source ports (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n" - " Example: -u 1000 69 to make the packets look like TFTP/UDP packets.\n" + " Example: -u 1000,69 to make the packets look like TFTP/UDP packets.\n" " -T <srcp>,<destp> prepend dummy TCP header with specified\n" " dest and source ports (in DECIMAL).\n" " Automatically prepends Ethernet & IP headers as well.\n"
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/tools/win-setup.sh ^
@@ -1,8 +1,8 @@ #!/bin/bash -(shopt -s igncr) 2>/dev/null && shopt -s igncr; # hack to force this file to be processed by cygwin bash with -o igncr - # needed when this file is exec'd from win32-set.sh & win64-setup.sh +(set -o igncr) 2>/dev/null && set -o igncr; # hack to force this file to be processed by cygwin bash with -o igncr + # needed when this file is exec'd from win32-set.sh & win64-setup.sh # -# $Id: win-setup.sh 32614 2010-04-30 20:15:27Z wmeier $ +# $Id: win-setup.sh 36192 2011-03-14 16:49:01Z wmeier $ # This MUST be in the form # http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/tools/win32-setup.sh ^
@@ -1,10 +1,10 @@ #!/bin/bash # -# $Id: win32-setup.sh 36076 2011-02-26 11:02:41Z jake $ +# $Id: win32-setup.sh 36572 2011-04-12 00:10:16Z gerald $ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-02-25-1.4" +export DOWNLOAD_TAG="2011-04-11-1.4" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 \| sed -e s/win32/win/`
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/tools/win64-setup.sh ^
@@ -1,10 +1,10 @@ #!/bin/bash # -# $Id: win64-setup.sh 36076 2011-02-26 11:02:41Z jake $ +# $Id: win64-setup.sh 36572 2011-04-12 00:10:16Z gerald $ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2011-02-25-1.4" +export DOWNLOAD_TAG="2011-04-11-1.4" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 \| sed -e s/win64/win/`
[-] [+]	Changed	wireshark-1.4.5.tar.bz2/wiretap/netscreen.c ^
@@ -1,6 +1,6 @@ /* netscreen.c * - * $Id: netscreen.c 28471 2009-05-25 19:59:17Z sake $ + * $Id: netscreen.c 36571 2011-04-12 00:02:47Z gerald $ * * Juniper NetScreen snoop output parser * Created by re-using a lot of code from cosine.c @@ -322,7 +322,7 @@ return FALSE; } - return parse_netscreen_hex_dump(wth->random_fh, len, pd, err, err_info); + return (parse_netscreen_hex_dump(wth->random_fh, len, pd, err, err_info) != -1); } /* Parses a packet record header. There are a few possible formats:

Changes of Revision 6