Changes - j0ke.net Open Build Service

@@ -1,48 +0,0 @@ -As with other systems using BPF, Mac OS X allows users with read access -to the BPF devices to capture packets with libpcap and allows users with -write access to the BPF devices to send packets with libpcap. - -On some systems that use BPF, the BPF devices live on the root file -system, and the permissions and/or ownership on those devices can be -changed to give users other than root permission to read or write those -devices. - -On newer versions of FreeBSD, the BPF devices live on devfs, and devfs -can be configured to set the permissions and/or ownership of those -devices to give users other than root permission to read or write those -devices. - -On Mac OS X, the BPF devices live on devfs, but the OS X version of -devfs is based on an older (non-default) FreeBSD devfs, and that version -of devfs cannot be configured to set the permissions and/or ownership of -those devices. - -Therefore, we supply a "startup item" for OS X that will change the -ownership of the BPF devices so that the "admin" group owns them, and -will change the permission of the BPF devices to rw-rw----, so that all -users in the "admin" group - i.e., all users with "Allow user to -administer this computer" turned on - have both read and write access to -them. - -The startup item is in the ChmodBPF directory in the source tree. A -/Library/StartupItems directory should be created if it doesn't already -exist, and the ChmodBPF directory should be copied to the -/Library/StartupItems directory (copy the entire directory, so that -there's a /Library/StartupItems/ChmodBPF directory, containing all the -files in the source tree's ChmodBPF directory; don't copy the individual -items in that directory to /Library/StartupItems). - -If you want to give a particular user permission to access the BPF -devices, rather than giving all administrative users permission to -access them, you can have the ChmodBPF/ChmodBPF script change the -ownership of /dev/bpf* without changing the permissions. If you want to -give a particular user permission to read and write the BPF devices and -give the administrative users permission to read but not write the BPF -devices, you can have the script change the owner to that user, the -group to "admin", and the permissions to rw-r-----. Other possibilities -are left as an exercise for the reader. - -(NOTE: due to a bug in Snow Leopard, if you change the permissions not -to grant write permission to everybody who should be allowed to capture -traffic, non-root users who cannot open the BPF devices for writing will -not be able to capture outgoing packets.)

@@ -1,4 +0,0 @@ -{ - Description = "Change BPF permissions"; - Provides = ("ChmodBPF"); -}

@@ -1,1101 +1,649 @@ -commit 94d9b3d0e52d8b2234a0c3c73c8132d3055a4d7b -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 13:49:51 2014 -0800 - - Add a CVE ID and attribution. - - Change-Id: If3359fb1c73446747c6be4ab1f8b05f2697dba6f - Reviewed-on: https://code.wireshark.org/review/541 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9e4f943e12405079b7edcddd52ee5ccd580948d1 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 12:34:27 2014 -0800 - - Add wnpa-sec-2014-04. - - Change-Id: I3ca3843bf7f25aeafb35c4352367e36ba3f9c41a - Reviewed-on: https://code.wireshark.org/review/540 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 34144b8d4da141e8aa9b99221855edc9f4c73ad8 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 11:27:45 2014 -0800 - - Add a check for an oversized record. - - For now we declare the file corrupt and give up. We may want to handle - this more gracefully. Fixes a vulnerability discovered by Wesley Neelen - (bug 9843). - - Remove the RCS ID and add modelines. - - Change-Id: I418938d7d6485b27cc51cf1dde50bc42dabf8c85 - Reviewed-on: https://code.wireshark.org/review/533 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 69bf1a988a6629497ccf5feaf358413885d89a2d -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Mar 5 17:08:39 2014 -0800 - - Add CVE IDs. - - Change-Id: Iff81dd013812e79d4c70018cae48b3c16495a3af - Reviewed-on: https://code.wireshark.org/review/523 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 116c8da958fcc8ecc3b629350572bad40a1746c8 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Mar 5 00:33:52 2014 -0500 - - Fix another case of a missing BASE_EXT_STRING (which may cause a crash). - - Change-Id: Ibe690826747b47d8b9a5e93f1ad3e96f2f18e7ef - Reviewed-on: https://code.wireshark.org/review/514 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit 983f5f9366e0b6f015de80cd1596b3367be1ab6a +commit 7c3e02668f4da537296cf3e2cc089b9d2b851a5d Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Mar 4 20:58:01 2014 -0800 +Date: Wed Jun 11 16:56:55 2014 -0700 - Fix some cases of value_string_ext without BASE_EXT_STRING. - - This fixes bug 9834. + Some more SVN->Git. - Change-Id: Ida6034fd4149b647545ed314eb10819e71553f85 - Reviewed-on: https://code.wireshark.org/review/512 + Change-Id: Iba5274ab5e653a0a3c0a56e62ee168ac957daf27 + Reviewed-on: https://code.wireshark.org/review/2152 Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 95065da33d2d22cad046219e291e54cb2fce33be) + Reviewed-on: https://code.wireshark.org/review/2153 + (cherry picked from commit 85fb7dc807a7a423b59ccba351add7e29f56a694) + Reviewed-on: https://code.wireshark.org/review/2154 -commit 4fc99f885a3df4abf84279308064a059f64e02fa -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Mar 4 19:41:27 2014 -0500 - - Fix 2 instances of "Warning: Extended value string ... forced to fall back to linear search". - - Note: This issue was fixed in dev Wireshark as part of a much more extensive set - of changes. - - Change-Id: Iadca7e7813f42029e62c922ed183b6535a9c2a77 - Reviewed-on: https://code.wireshark.org/review/510 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit 5abc15ffcf967968ba4afacfb3f0a65f51e93697 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Mar 4 16:43:54 2014 -0500 - - Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10 - - Another Fix for part 2 of Bug #9834 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834 - - ============ - commit 2336eb9919e20de306b29ab34d1ca12550930f4a - Author: Gerald Combs <gerald@wireshark.org> - Date: Fri Aug 2 00:22:51 2013 +0000 - - Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5, - 2.7, and 3.3. - - svn path=/trunk/; revision=51106 - /tools/make-tap-reg.py - - Change-Id: I2a7aca979c596b4d06e91490aaf42126bb9da211 - Reviewed-on: https://code.wireshark.org/review/509 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit c7c59771e6a217ac68546374e676fa2d33708d6d -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Mar 4 14:31:44 2014 -0500 - - Backport g97c9a9b from git/master to git/master-1.10 - - Fix for part 2 of Bug #9834 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834 - - ======== - commit 97c9a9b9ba3c29f394c306d6ba9bd1916d06c430 - Author: Gerald Combs <gerald@wireshark.org> - Date: Fri Aug 2 16:34:31 2013 +0000 - - Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5, - 2.7, and 3.3. The contents of packet-ncp2222.c are different after the - changes (e.g. some array contents are in a different order) but the - output of running 'tshark -nVxr' on the NCP files in the menagerie are - identical. - - svn path=/trunk/; revision=51123 - - Change-Id: Ib500bade79d65b97a57eeb4dd497228a6eb85c19 - Reviewed-on: https://code.wireshark.org/review/508 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit d58a92fc6fd936083196c044b91ab2607a9fe2f4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Mar 4 11:16:44 2014 -0800 - - Update the release notes. - - Change-Id: Iec747ea0f92142a81a88b6ff92d9dd3ec1818e7e - Reviewed-on: https://code.wireshark.org/review/506 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 447c45a341124f091543cbe7ad6d6872a041f6ba -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Feb 27 15:31:10 2014 -0800 +commit 70c8cafcd1e95ce7627aaea5a75648225947260e +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Jun 11 16:49:05 2014 -0700 - Disable IPv4 checksum verfification to match TCP and UDP. - - Offloading seems to be very common nowadays and having this option - enabled by default generates a lot of false positives. Suggested by - Laura Chappell. + A Subversion->Git change that we missed. - Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff - Reviewed-on: https://code.wireshark.org/review/426 - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit 104a6edd1fb703c5c2319c893720df86f8c9a9e7) - Reviewed-on: https://code.wireshark.org/review/470 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I651d25cb0a59f9ec350d4c482062077833c8f278 + Reviewed-on: https://code.wireshark.org/review/2149 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 7db2135069b03b9dcbfa12a244969246b938443d) + Reviewed-on: https://code.wireshark.org/review/2150 + (cherry picked from commit b0c0b33a86473fa6411add002729b6f76062704d) + Reviewed-on: https://code.wireshark.org/review/2151 -commit 31187b1c5d863e2338f0050ff897512b92ebf774 +commit 42b9bf0dcae7aa579c6bae616128e0928ebf0fbc Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 15:03:41 2014 -0800 +Date: Wed Jun 11 10:35:58 2014 -0400 - Switch to "rc" instead of "pre" to match our tags. + Add a CVE ID. - Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e - Reviewed-on: https://code.wireshark.org/review/489 + Change-Id: I789e4738aff3016fba1b56950e051c324bc0ae59 + Reviewed-on: https://code.wireshark.org/review/2136 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 65f3fea66842838faf49f322de66e84be78e1f0b -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 14:49:00 2014 -0800 +commit 3aea41d507502daef7a73db237c13895b9954c7e +Author: Jeff Morriss <morriss@ulticom.com> +Date: Tue Jun 10 15:21:13 2014 -0400 - More version stamp fixes. + Fix unused-variable warning. - Change-Id: I80601db962734364575c989ecd64983ef5a493a2 - Reviewed-on: https://code.wireshark.org/review/487 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 75bc4fd32ce2c3856f5f369b609c29743097690d -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 14:26:15 2014 -0800 - - Don't append "-dirty" to the version string. + (Followup to I7b291892b041055fe4165abcbb2962a295aedce4) - Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301 - Reviewed-on: https://code.wireshark.org/review/485 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit 7bb4ec81a7912a785758cd63570dab1d00da2647) - Reviewed-on: https://code.wireshark.org/review/486 + Change-Id: I6a58f2b90c41fa3ce8ac521ebc04db4ae1f9758d + Reviewed-on: https://code.wireshark.org/review/2114 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 59c96b89eb214546093c7acd925eedcbadb920a3 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 13:52:57 2014 -0800 +commit b850e6c3e47123daf2b3b929657302588a3fc9e2 +Author: Jeff Morriss <morriss@ulticom.com> +Date: Tue Jun 10 15:30:03 2014 -0400 - Strip out carriage returns when reading version.conf. - - The input record separator ($/) under Cygwin's Perl appears to be "\n" - which means that chomp() won't strip out carriage returns. Make sure - we do that when reading version.conf, otherwise we can end up with - unexpected behavior. + Squelch compiler warnings. - Check pkg_enable using an integer comparison as an extra level of - protection. + Some are legitimate warnings - get_node_field_value() now returns a + value that the callers are expected to g_free(), so we'd better not + return a string constant. - (We need to handle CRs better in general but for now we need to get - version stamping working for the next release.) + Manually applied from I937254316119044691c1d9a3da8c9615763e2e5a (2 of the + 4 chunks of that patch needed to be applied to this branch). - Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b - Reviewed-on: https://code.wireshark.org/review/483 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0) - Reviewed-on: https://code.wireshark.org/review/484 + Change-Id: I2fa4e3bba37f0cf908d8afcfb437de877181ce52 + Reviewed-on: https://code.wireshark.org/review/2115 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit b8c1cc09466cf436104de9d0eb52f563eca5c0cd +commit 627d5830dd259de9d8dc06662fee8bd8d8803f51 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jun 29 21:58:46 2013 +0000 +Date: Tue Jun 10 08:48:27 2014 +0200 - Update .gitignore to add some Windows specific build stuff to ignore list. + CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data Rate - svn path=/trunk/; revision=50231 - (cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b) + * Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative. + * Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10. - Change-Id: I41fd7ba5ce96055928d65fb5de4252750692078e - Reviewed-on: https://code.wireshark.org/review/481 - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f58c4cdef2e4aa3f5107601d4968568ab1112f8c -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Mar 2 08:08:42 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-02] + Issue found by Massimo Vellucci (SmartCAPWAP) - Change-Id: Ifd0cc536cc7b532f61aaae3aa9e9642f1299405b - Reviewed-on: https://code.wireshark.org/review/445 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809 + Reviewed-on: https://code.wireshark.org/review/2094 + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 2f13ccc64c6e38336674d1fd6d13e9ece9efec84) + Reviewed-on: https://code.wireshark.org/review/2104 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 4ac46b6c1103a28397630634ca2042839653df17) + Reviewed-on: https://code.wireshark.org/review/2105 -commit e635d3f0f2bc1f1909553294a6488b6bd947f82d +commit 05d09fcb86d389a91ccc0c71eef1c171b4e2a07b Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Feb 28 16:34:19 2014 -0800 +Date: Mon Jun 9 15:54:28 2014 -0700 - Have git-compare-abis build in a sub-sub-subdirectory. - - We have a lot of relative includes which apparently weren't updated - correctly when we moved the gtk directory to ui/gtk. For example, - ui/gtk/about_dlg.c has - - The Autotools Makefile adds "-I../.." to the include path, which means - we end up including the current, top-level version_info.h instead of the - one in the compare-abis build directory. + Release note updates for 1.10.8. - Change-Id: I9df83857fc9f7d87a3b79d5b4da08d5e41625e4c - Reviewed-on: https://code.wireshark.org/review/436 + Change-Id: I492bcdccb0f59d8d1385d92c746900a890f70c88 + Reviewed-on: https://code.wireshark.org/review/2091 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit d8075e79f7dc435d68b942695d3d1604f3e166b7 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Feb 26 12:47:35 2014 -0500 - - Don't mix emem and glib memory and init routines. - - The seasonal memory is freed before the init routine is called, leading to a - whole bunch of use-after-free errors. - - Fixes bug #9802 (and duplicates). - - This introduces a few minor leaks but I can't find an easy way to add additional - free calls that doesn't lead to double-free errors. - - Change-Id: Idda79cb643d46d29253165cdeefeed189db6b078 - Reviewed-on: https://code.wireshark.org/review/406 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 9201ee0d484227722a9a5c325e12129336b9d283 +commit cab89dca31e5d5785326e9048dbefc4418fb3324 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 25 09:18:41 2014 -0800 - - Release note updates for 1.10.6. - - Change-Id: I1a921df33d317a87ca1de6257c3783f0bfd3505f - Reviewed-on: https://code.wireshark.org/review/374 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit bfd4ba95c8365e1e92774e0398215e6b8cca7f66 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 15 02:09:11 2014 +0000 - - Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many - heuristic cases broken in r49999 when we permitted packets > 64KB, since that - relaxed so severely the definition of a valid packet header. - - 64MB is an arbitrary and perhaps suboptimal number, but it seems to do the right - thing in all the examples I have handy. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 - - svn path=/trunk/; revision=54812 - (cherry picked from commit dae86605b61bbbabd54749e6bde7c0c10b031ca8 with - release note updates) - - Change-Id: Id3a9b413113148c8072bdd6c221246a56d0df2cb - Reviewed-on: https://code.wireshark.org/review/349 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 246ef6a981714cfd97adf3884b6888be81fd9cf6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 21 18:16:07 2013 +0000 - - If Gtk >= 3.10, allow use of deprecated Gtk features (and prevent 'deprecated' warnings); - - Given that Wireshark is moving to QT, the Wireshark changes required to - fix the features deprecated in Gtk 3.10 will not be done. - - svn path=/trunk/; revision=54337 - (cherry picked from commit 6ec4ba58a18298d443d87de2cd8bd64dc97464e1 with - release note updates) - - Change-Id: Ic6e8f44e201a1e487ed969bbdcfaa3f40c00e682 - Reviewed-on: https://code.wireshark.org/review/347 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 76c8bfa9a3b3fb672549fbb313be21db4c08f873 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 29 18:45:09 2013 +0000 - - From stcook - clear the temporary buffer after each DXM channel data line - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - - svn path=/trunk/; revision=54488 - (cherry picked from commit 745c8660be2707df41d7cea3cd2725d18b9d6ff0) - - Change-Id: I420ca616a6c19489214100d86446450905c4234d - Reviewed-on: https://code.wireshark.org/review/346 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit ff3c3a37991536980ec7bdf0b5549f95d12fd743 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Dec 26 14:10:26 2013 +0000 - - "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) - - From Roland Knall - - This fix is on top of/in conjunction with r54193 and both need to be backported. - - svn path=/trunk/; revision=54463 - (cherry picked from commit 6697a94ba55934a132154439dc44b378cbf991e3 with - release note updates) - - Change-Id: I0fa9fbf6f7429fb6d8ad53731d7760f62edb1b02 - Reviewed-on: https://code.wireshark.org/review/345 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d7d110415cdeb84a726c11cd47fd3269ff6144f7 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Dec 17 20:06:03 2013 +0000 +Date: Mon Jun 9 10:07:10 2014 -0700 - Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) - - Also removed tree check in Modbus dissector because dissector_try_string() is being called under it. - - svn path=/trunk/; revision=54193 - cherry-picked from 6db9eb0b73b4bb02864ab389c74f5a17a9da50e2. Added - release note entry. + Add back Balint's copyright. - Change-Id: I9bad5846d08cbf8b9c40c6a17a7f88712451794e - Reviewed-on: https://code.wireshark.org/review/344 + Change-Id: Ib7a3789c95c4651beec76ab318410b1b7a3aaa2b + Reviewed-on: https://code.wireshark.org/review/2082 Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 174cd47ab3416e670cccc81e86ecb5188b5bb521) + Reviewed-on: https://code.wireshark.org/review/2083 -commit 551423110b94730ed25a4193df5e30fbb5998b95 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Fri May 31 02:27:40 2013 +0000 - - Don't intentionally use -1 as an hfindex: while only naughty before, with the - changes from r49644 you'll get complaints about the hf being unregistered... - - Note that this code also intentionally passes -1 as an ett_index. It doesn't - currently complain so I'm leaving it alone for now... - - svn path=/trunk/; revision=49648 - (cherry picked from commit 813dcf79a15d6527cce8a6a7bac4234de6ab577f) - Change-Id: I2bca70df606397264df54e88ce6fa85815aaf1b9 - Reviewed-on: https://code.wireshark.org/review/338 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit e45b0954fd182c6ac07a7c9ab1557ec9d23f2aaa +commit 8c900b4cd93da6578ca7c20877b4d0fcdf0b474a Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Feb 23 23:36:11 2014 +0100 +Date: Sun Jun 8 22:46:45 2014 +0200 - NAS EPS: fix dissection of CS service notification message - - Fixes bug 9789 - - Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee - Reviewed-on: https://code.wireshark.org/review/330 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - - (cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682) + IEEE 80211: fix dissection of HT Capabilities - Change-Id: Ia2d3cbdeda7935cec07fbfbb2c0d6b7cb2841288 - Reviewed-on: https://code.wireshark.org/review/333 + Bug: 10166 + Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9 + Reviewed-on: https://code.wireshark.org/review/2046 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> + (cherry picked from commit 89960510e30b9b96a0d0b84619df099fd8a707f1) + Reviewed-on: https://code.wireshark.org/review/2053 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit d1eaa9325a8e943310168e79f45849a89d8d3596 +commit d88fb71c1fbff17ef15b6eca086b0a2f5e64a172 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 23 08:08:19 2014 -0800 +Date: Sun Jun 8 08:09:31 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-23] + [Automatic manuf, services and enterprise-numbers update for 2014-06-08] - Change-Id: Ida5492e584bea365c0c9ec1b3a449c253b251122 - Reviewed-on: https://code.wireshark.org/review/317 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I389a2be2a4e4465cf5d62db437759b5b54e7ebef + Reviewed-on: https://code.wireshark.org/review/2038 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 1fe82ae65685c75c01b89bacdfe5b1659bef7573 +commit 348942c0f0f240ddca469c016d6f0698e47e99c8 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Feb 21 16:47:55 2014 -0800 +Date: Sat Jun 7 12:00:31 2014 -0700 - Add bug 9492. + PEEKREMOTE packets don't appear to have Atheros padding. - Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 - Reviewed-on: https://code.wireshark.org/review/306 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/308 - -commit 953684ce31e8d302921c23ab662331ce9814d11e -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 1 13:47:11 2013 +0000 - - Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) - - From Peter Paluch + Call the without-Atheros-padding dissector for the payload. - svn path=/trunk/; revision=53694 + Fixes bug 10139. - Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204 - Reviewed-on: https://code.wireshark.org/review/304 + Change-Id: I3b5dd25953113fe30b9278e4533561933304ae5b + Reviewed-on: https://code.wireshark.org/review/2030 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit a4382fc3acbfd90eb69febdafcc77a638d868eea -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Feb 18 14:21:25 2014 +0100 - - Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information) - - Found by Massimo Vellucci - - Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d - Reviewed-on: https://code.wireshark.org/review/246 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit 8a1cead94713f0c7c6e2f5cc58aa1d0f6c8f2a60) - Reviewed-on: https://code.wireshark.org/review/289 - -commit c49165098a47dbd9610cd21d77a2edc69e492cf9 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Feb 12 08:32:27 2014 +0100 +commit 9afa5d6166790661ddc5b44e1e8cb0c2f18fa83e +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Jun 7 10:44:17 2014 -0700 - Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages - - Issue found by Massimo Vellucci (SmartCAPWAP) + Only nuke the startup item once we've installed the launch daemon. - Partial-Bug: 9752 + That way, if we crash in the middle, there's still something installed + that will try to set the permissions on the BPF devices. - Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a - Reviewed-on: https://code.wireshark.org/review/193 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit a9dc8016e9d37663c3d09f1563f993182a979554) - Reviewed-on: https://code.wireshark.org/review/290 + Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 + Reviewed-on: https://code.wireshark.org/review/2023 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 39ca18d71b85d0b99c0fd3c5edab48fa217d7d34) + Reviewed-on: https://code.wireshark.org/review/2024 + (cherry picked from commit 9cf44c19d00e1072e28e353a4c8fcdd22e01e554) + Reviewed-on: https://code.wireshark.org/review/2025 -commit 2ba9a20dd132b92b2b567948be2fc5389f40fe93 -Author: Andreas Schultz <aschultz@tpip.net> -Date: Thu Oct 17 02:13:23 2013 +0000 +commit 648766952bf188c3a77c2482d25041694a0dd423 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Jun 6 23:41:51 2014 -0700 - Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165) + When installing the launch daemon, get rid of the old startup item. - From Andreas Schultz + Only one is necessary; get rid of the startup item. - From me: Use expert API instead of throwing exception for a bad length. - - svn path=/trunk/; revision=52657 - - Manual Backport to 1.10 (Use old expert API) - - Change-Id: Iab31aeb9521630d3ad69bb8b7fe5f10d4d95cee7 - Reviewed-on: https://code.wireshark.org/review/288 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 + Reviewed-on: https://code.wireshark.org/review/2016 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit b319a67bfb23a93a7f15076a94be3fe6adb9983d) + Reviewed-on: https://code.wireshark.org/review/2017 + (cherry picked from commit 003746cf120366bb8be4764506eda1c1fdb78504) + Reviewed-on: https://code.wireshark.org/review/2018 -commit 63b3a9dfd3d2d12be127e9358a05a4eced9f6c4b +commit 540f061d5499f9135bb74178fe3cd0bbf26176ea Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Feb 20 17:50:52 2014 -0800 +Date: Fri Jun 6 12:14:27 2014 -0700 - Force "printing" if -T is specified, even if -w is also specified. + Switch to a launch daemon for ChmodBPF. - Just as "tshark ... -P -w xxx" writes raw packets to xxx *and* writes - text packet summaries to the standard output, and just as "tshark ... - -V -w xxx" writes raw packets to xxx *and* writes text packet details to - the standard output, so should "tshark ... -T fff -w xxx" write raw - packets to xxx *and* write whatever "-T fff" (and any "-e" options) - specifies to the standard output. + "Ah finally blew that varmint to Kingdom Come!" - Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885 - Reviewed-on: https://code.wireshark.org/review/278 + Change-Id: If935d87dd487f7463261379d76e953396a3ea5e5 + Reviewed-on: https://code.wireshark.org/review/2007 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/279 - -commit 78dae7c43f6512cd411dcfb4f20bc3363fc6ddf6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 17:09:05 2014 -0800 - - More SVN → Git conversion. - - Change-Id: Iddb56a54befd187f87f7a250f1fb38c4d2cc59b2 - Reviewed-on: https://code.wireshark.org/review/265 - Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 83640307e7538fd9586076c9e708b252c410977e -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 23 22:18:49 2013 +0000 +commit 460db8ac53df696058184b729d4446904fab1e6f +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 16:49:12 2014 -0400 - Add NSIS path discovery to config.nmake. - - Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try - to locate makensis automatically, similar to the way we locate Python. + tshark.c: Backport 68a1b55 (with change) from Dev; Also: backport dc02627 - svn path=/trunk/; revision=51497 - (cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c) + 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991. + Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format" - Change-Id: I42d6084e3699275d8212c6e37f8f776f12b343f3 - Reviewed-on: https://code.wireshark.org/review/262 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I469682f24c0cc592cf4111ac8e516b5595807907 + Reviewed-on: https://code.wireshark.org/review/1961 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 5086c0e21d734612e12173acbee6a98b1a5df2ed -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 15:16:44 2014 -0800 +commit 451796d9998b4f70c7f81650b125ca5c1b9cae33 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 20:23:31 2014 +0000 - Replace "svn" with "git" all over the place. - - Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. - Rename "svnversion.h" to "version.h" as Evan suggested. Update some - URLs. In make-version.pl, make sure we don't set an improper upstream - branch name. Use the number of commits + short hash from `git describe` - for package names by default. + Revert "tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991." - Cherry-picked from gf966980 with a lot of manual intervention. + This reverts commit eab9d6b11ae8fa0fd7bf2f44435453a04fb6a472. - Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102 - Reviewed-on: https://code.wireshark.org/review/261 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 84e3498349e202262857985a29549ac93b1beff8 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 16 08:08:09 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-16] - - Change-Id: Id8a7fe6a64184a121c945c8cd281863b96dd233e - Reviewed-on: https://code.wireshark.org/review/230 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ia4a38ba726a0778dfd704dea18887ac36c5b2861 + Reviewed-on: https://code.wireshark.org/review/1960 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 8e4e30f615293b42d14a687ae0db986458942d10 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Fri Feb 14 02:06:03 2014 -0500 +commit eab9d6b11ae8fa0fd7bf2f44435453a04fb6a472 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 15:18:16 2014 -0400 - Fix Bug 9728 'Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be' - - Similar to bug 9725 and ProtoField.new(), the way the VALUESTRING argument is being checked - in the code for ProtoField.bool() ends up making it non-optional. This patch fixes that, - along with some minor API documentation fixes (text). + tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991. - This is a backport for change-id Iadb9a8ace9c5514fc623d882301fe16b637fe4ce - - Change-Id: Ic60375f3e0ad7c7a8887dce7ffbd946f0a9d80b5 - Reviewed-on: https://code.wireshark.org/review/209 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit b826cb9da886d135fdb07439e31dc1ea496911ab -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Feb 5 01:23:25 2014 -0500 - - Fix Bug 9725 'Lua: ProtoField.new() is buggy' - - Using ProtoField.new() is dicey. Many of the optional arguments don't properly check the lua stack - they call lua_isnil() for their index number, instead of lua_gettop() to see the stack size. lua_isnil() may return false in such cases. - - Change-Id: I83ca1e5fc34e71ec35899adbedabcee69571b9fe - Reviewed-on: https://code.wireshark.org/review/118 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-on: https://code.wireshark.org/review/207 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I182357fc57d6e57033319afc762549d805c2c10c + Reviewed-on: https://code.wireshark.org/review/1954 + Reviewed-by: Bill Meier <wmeier@newsguy.com> + (cherry picked from commit 68a1b552f74152a4da39097e8ae5e463518bbb28) + Reviewed-on: https://code.wireshark.org/review/1959 -commit 00caebf4170f88ed02f7712c8c133d9efc364a76 +commit 0be6fee6bc69093cbd22328667e4bc30171e127f Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 11 08:56:15 2014 -0800 +Date: Sun Jun 1 08:09:38 2014 -0700 - Fix the host entry. + [Automatic manuf, services and enterprise-numbers update for 2014-06-01] - Change-Id: Ia76b5585c38eebdec6c275c6e1aadabb3862cf2b - Reviewed-on: https://code.wireshark.org/review/172 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit bed30b8a94b645361a00d70ee2db0ec184cae103) - Reviewed-on: https://code.wireshark.org/review/174 + Change-Id: I71e1941d213f57e5b1b0ae3b52e88c6991814608 + Reviewed-on: https://code.wireshark.org/review/1909 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 0522f62f34214099247aa50bf28c74e75625a80f -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 9 08:07:53 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-09] - - Change-Id: Ia3c3a4e113028e601e074c7ae9005fb532089ecb - Reviewed-on: https://code.wireshark.org/review/152 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b62a8961c7adecc8405ad838bd659b6da8ae8d0d -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Tue Feb 4 00:45:45 2014 -0500 - - Fix bug 9720 'Lua: bitop library is missing in Lua 5.2' - - In Lua 5.2 the bitop library is missing - it's not getting loaded into - the lua global table as "bit", or anything else for that matter. Lua - 5.2 has its own bit-operations library ("bit32") which is there, but - that one's not as good as bitop and would break back/forward - compatibility for lua scripts anyway. - - Change-Id: I94b7d45bbeb2f637d1c76b0b5c9d8472eebfcaea - Reviewed-on: https://code.wireshark.org/review/100 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-on: https://code.wireshark.org/review/141 -commit b921379e087e4fa5a4e9894ee21ae15af6305bb9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Feb 6 16:49:40 2014 -0800 +commit be1f44bd08026a8f854c151691d06611cfe9ac9c +Author: Michael Mann <mmann78@netscape.net> +Date: Tue May 27 19:33:59 2014 -0400 - Pass the caplen from the struct wtap_pkthdr to pcap_read_post_process(). + bugfix address handling - That makes it clearer what the argument should be and, in the case of an - SPB, passes the correct length (the length *after* any pseudo-header we - convert to a union wtap_pseudo_header and remove from the raw packet - data we hand to our caller). + Also update some encoding arguments caught by pre-commit script that we're backported. - Change-Id: Ia360cd7c971ae1e1635bdef8f7e17a8d9e2495f8 - Reviewed-on: https://code.wireshark.org/review/134 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I9791c1e0a2c6348286d16830cf3703d105b038f3 + Reviewed-on: https://code.wireshark.org/review/1828 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6ed5bab8d5e4d59eaaf01c3d4122ee6610a99d4f -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Feb 4 22:27:07 2014 +0100 - - Introduce end-of-line normalization - - Change-Id: I543039935aec3715cf9887708ca74966fa106571 - Reviewed-on: https://code.wireshark.org/review/115 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 1de44d769cd205a49446ac1fd09ddd196fedb6a8 +commit 9008494ed690c0be833c2373c433bd973311f656 Author: Evan Huus <eapache@gmail.com> -Date: Tue Feb 4 10:28:06 2014 -0500 +Date: Tue May 20 23:22:26 2014 -0400 - Fix dissection of GTP MM Context RAND field. + Permit "jumbo" allocations in emem - As suggested by Lükő Bálint to fix bug #9722. + (potentially) masterful hack to fix bug 10115 without backporting 3/4 of wmem or + doing any real work - Change-Id: Ie6b801a9660716c2c6efa6fd09b50a2481f5acd7 - Reviewed-on: https://code.wireshark.org/review/110 + Bug:10115 + Change-Id: Id7de4fd8bc9340d4ca8e98ba33c68b2c4793a65c + Reviewed-on: https://code.wireshark.org/review/1710 Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - -commit 037db78dbdf5ce3a4b2b66f769db8dbc01fbe9c7 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Fri Jan 10 08:48:38 2014 +0000 - - correct a typo in a filter string - - svn path=/trunk/; revision=54687 - - Change-Id: Ie9ca9fbffdfe83b74f38ab314ba4403d2f17ee8e - Reviewed-on: https://code.wireshark.org/review/104 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 194dafbc0c707fea6f451e06e0848c3d31c63550 -Author: Anders Broman <anders.broman@ericsson.com> -Date: Tue Sep 10 06:06:55 2013 +0000 +commit 783d06d108c5b37acf06c7ce5975de0ad433c40e +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun May 25 18:01:31 2014 +0200 - Freom Dennis: - - As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by - oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui)) - The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key. + GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 + While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent - svn path=/trunk/; revision=51918 + Bug: 10120 + Change-Id: I3fe113279c779a9d8143d07489747a67d7351664 + Reviewed-on: https://code.wireshark.org/review/1794 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Conflicts: - epan/dissectors/packet-ieee802a.c + epan/dissectors/packet-gsm_rlcmac.c + + (cherry picked from commit c4ead251da7199cfd746d378c51eb8c30d09a6ba) - Change-Id: I659b8eee2bff74d8741d67546a1d7959fc40a113 - Reviewed-on: https://code.wireshark.org/review/101 + Change-Id: I3e022eea6acdc5606c39da53e5c4da956d4ef89c + Reviewed-on: https://code.wireshark.org/review/1797 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6c4d8cbf7d5850a1c731558b6db47f96f93b7528 +commit 6fda9c812f7169e0d471c79e6c5fb9af1f8c92c1 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 2 08:08:14 2014 -0800 +Date: Sun May 25 08:09:06 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-02] + [Automatic manuf, services and enterprise-numbers update for 2014-05-25] - Change-Id: I9e016b004a305d86521ebe6065fd7f6cc9805a89 - Reviewed-on: https://code.wireshark.org/review/76 + Change-Id: I4925f981b73305da591363a01cdcd5700ef968d1 + Reviewed-on: https://code.wireshark.org/review/1791 Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> -commit fba07cd7503a45065fe19bb3717c7472f56fb809 -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 31 18:51:39 2014 -0500 +commit 177affe2ce7c9727147847c71c44874da44f0f24 +Author: Michael Mann <mmann78@netscape.net> +Date: Thu May 22 22:54:28 2014 -0400 - Add gitreview file for master-1.10 + tvb parameter should not be NULL as the lengths are nonzero. - Change-Id: I951f5ad9c121b63d1f075710b0f5e566516c5cca - Reviewed-on: https://code.wireshark.org/review/67 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> + Change-Id: If085a9fc69bbbf28a7c801930a664c412a4a5b7a + Reviewed-on: https://code.wireshark.org/review/1734 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-on: https://code.wireshark.org/review/1735 -commit 0b6bb297545c4da1cee747464834cd7242799a70 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Dec 20 13:33:48 2013 +0000 +commit 45e901d44fb790d72b23cffb80bf4e47844462fc +Author: Michael Mann <mmann78@netscape.net> +Date: Sun May 18 14:21:31 2014 -0400 - Rewrote ProtoField_new to: - - Allow both string and integer for type and base (improve usability). - - Check valid base and mask for different types (avoid crashes). - - Remove ftypes.PROTOCOL from valid types. + Use g_ alloced memory (instead of emem) when printing fields. emem shouldn't be used for GUI functions anyway. - This should fix bug #9549. + emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. - svn path=/trunk/; revision=54292 + When converting from proto_construct_match_selected_string to fvalue_to_string_repr remember proto_construct_match_selected_string includes fieldname + value, not just value - Conflicts: - epan/wslua/wslua_proto.c + Manually applied from I4fc6ea7fd1f63cff410207c8b30562771af40ada - Change-Id: I6e925933b178deb9784340e03d72a4252b498b9c + bug:10081 + Change-Id: Ie45f19a81fad25ae144e3bc5b5ad7d21b1f9c68c + Reviewed-on: https://code.wireshark.org/review/1733 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit d3bd3965e8df79d63ae6a4ae0f7529db49fd906e -Author: Evan Huus <eapache@gmail.com> -Date: Sat Aug 31 02:50:32 2013 +0000 +commit 3057ffc4a2998a504154f703977e5df0a4ed9aff +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Apr 5 07:46:26 2014 -0400 - Convert m3ua to wmem and use the pinfo pool for a variable that might be used - for an address. Fixes the recent valgrind fuzz failure. - - Fixes bug #9699 + Rework debug_print_hash logic so that it's supported by older versions of perl. - svn path=/trunk/; revision=51608 - - Change-Id: Ibbe8018509f8c74c0c70d6f64397fc0c8084d44c - -commit 69c740352a1bf2fec5bf501dad2ee2729f4666d2 -Merge: 892eb72 63d4c99 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 29 11:17:54 2014 +0000 - - Merge "Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded" into master-1.10 - -commit 892eb72ef92c9d56c4f1b1846da20028c7cbdd0b -Merge: aa977c7 312f7e1 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 29 02:13:46 2014 +0000 - - Merge "Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe Kaplan for the report." into master-1.10 - -commit aa977c77b3ef902fe9fa9ceebc84afcc86093871 -Merge: 4d16e9b 3eb9b1c -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 29 00:17:14 2014 +0000 - - Merge "Fix bug 9649: SMPP: source_telematics_id value length is 1 byte" into master-1.10 - -commit 4d16e9b9f0c0b05d495354d5a0b61d535f1bf23c -Merge: 7bb25ec 2efc732 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Jan 28 22:44:06 2014 +0000 + Change-Id: I1720681dc367e01268ffbb1f31035464fa642496 + Reviewed-on: https://code.wireshark.org/review/971 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Tested-by: Michael Mann <mmann78@netscape.net> + Reviewed-on: https://code.wireshark.org/review/1732 - Merge "Add missing gitignore entries" into master-1.10 - -commit 7bb25ecfe4c95dee6186b8c81463c76fbbd78de0 -Merge: e7d6aee 7c8d960 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Jan 28 20:26:28 2014 +0000 - - Merge "Renamed new_TvbRange to push_TvbRange and use this when creating a new TvbRange from a FieldInfo." into master-1.10 - -commit e7d6aee85ca723d65d72a219ec93c51f5d5a7b37 +commit 828466ca500b33f05d52888814c4b1b1414ea97b Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 26 09:08:42 2014 -0800 +Date: Sun May 18 08:06:59 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-26] + [Automatic manuf, services and enterprise-numbers update for 2014-05-18] - Change-Id: I1dbd8bdeed0afb95951f9d10363b4ac1f8713f77 + Change-Id: If0bde72fd6023b26baa040cfab68c35a7cb2f344 + Reviewed-on: https://code.wireshark.org/review/1680 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 2efc732f7fd26ba4d3fa2eb907e8e33a77249ee3 -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 26 09:11:53 2014 -0500 +commit 6a77ad9ea439cb0d3d212a345f9c3cac30e084d4 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Tue Apr 22 22:18:35 2014 -0400 - Add missing gitignore entries + Manually apply https://code.wireshark.org/review/1289 to master-1.10: - Change-Id: I6bc9bbe885d6d68d2545d1d0f7010cd939af4407 - -commit 9e61436165177098c7d526e8f1d9b59204cd7e3a -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 26 14:05:30 2014 +0000 - - Backport r54295 and part of r54296 - g_memmove is deprecated, so just use - memmove instead to permit building with recent glib versions. + Fix up get_hfi_and_length(): - svn path=/trunk-1.10/; revision=54966 - -commit f37b929a48571217e6063ff299cff80bdf53c800 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 24 07:56:15 2014 +0000 - - Copy over r54938 from trunk: - - ------------------------------------------------------------------------ - r54938 | guy | 2014-01-23 23:55:03 -0800 (Thu, 23 Jan 2014) | 5 lines + Treat FT_BYTES and a few others the same as FT_PROTOCOL: allow a zero length + but throw an exception if the offset is already beyond the end of the TVB + (prior to this change it would assert out). This (when manually applied to + master-1.10) fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9999 . - Check for a zero offset in the "get status" reply *before* adding the - offset in the tvbuff of the beginning of the packet to it. Otherwise, - it will never be zero, and the tests will always think the field pointed - to by the offset is present. + Use tvb_ensure_captured_length_remaining() to throw an exception if the offset + is bad. - svn path=/trunk-1.10/; revision=54939 + Change-Id: Ibc61cc9ac331b669c688611ee9f23d36479378ef + Reviewed-on: https://code.wireshark.org/review/1290 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 7c8d9609fb8539b97bacfcd05d8909d2ed0ab7fe -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Dec 19 15:26:31 2013 +0000 +commit 5cdb0c35aa3ca7ec5a3af9c166c42c9a01f9eefc +Author: Evan Huus <eapache@gmail.com> +Date: Sun May 11 20:33:58 2014 -0400 - Renamed new_TvbRange to push_TvbRange and use this when creating a new - TvbRange from a FieldInfo. + Don't use -1 as length in frame dissector. - This should fix the crash in bug #9483. + Additional belated followup to gfe195c0c9 per conversation on -dev about the use + of -1 and when we should throw exceptions. See also g867a1827e7. - svn path=/trunk/; revision=54247 + Should (in theory) permit reverting gfe195c0c9 (which was not in 1.10) - Change-Id: I0eaa87a5c95f486e2fb259f437e1ed9727d560d8 - -commit cadc31c42a21d2edfb77de8357d4aca337ca5e5c -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 22 02:17:04 2014 +0000 - - Copy over r54884 from trunk, with manual intervention: + Bug:9999 + Bug:10030 + Change-Id: I56e5f4e5dc12fe82268243d0b113cfc9ff5fdd17 + Reviewed-on: https://code.wireshark.org/review/1603 + Reviewed-by: Anders Broman <a.broman58@gmail.com> - ------------------------------------------------------------------------ - r54884 | guy | 2014-01-21 17:22:01 -0800 (Tue, 21 Jan 2014) | 4 lines + Conflicts: + epan/dissectors/packet-frame.c - It's not a string, it's a byte array (bit array, really). + Change-Id: Ibeb119f911a698d44f4baa06d888bb1e775983bc + Reviewed-on: https://code.wireshark.org/review/1640 + Reviewed-by: Evan Huus <eapache@gmail.com> + +commit 40fe99a372df5297d3b19588875b9f2802fe00e6 +Author: AndersBroman <a.broman@bredband.net> +Date: Fri Mar 28 06:45:01 2014 +0100 + + Deleted one line to much in previous chgange. + + Change-Id: I19d1153558130356286bac55f6cb321d30a767b1 + Reviewed-on: https://code.wireshark.org/review/852 + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit b2509f67b8d64ecb5de902b9954c7659605c4395) + Reviewed-on: https://code.wireshark.org/review/1638 + +commit 1283e76ff338aa4fab34819f3e41caed58d6b984 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Mon Mar 24 13:41:49 2014 +0100 + + Get rid of the background pixmap, set the background color directly. + + Change-Id: I7b291892b041055fe4165abcbb2962a295aedce4 + Reviewed-on: https://code.wireshark.org/review/811 + Reviewed-by: Anders Broman <a.broman58@gmail.com> - Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. + Conflicts: + ui/gtk/graph_analysis.c - As part of the manual intervention, use ep allocation, so we don't leak - memory. (In the trunk, we used wmem packet scope when allocating even - before the fix.) + This fixes the crash happening when opening flow graph. - svn path=/trunk-1.10/; revision=54887 + Bug: 9179 + Change-Id: I70108eae7c11aa4bdb5b61dfeaa1cea1e602652a + Reviewed-on: https://code.wireshark.org/review/1635 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 312f7e18098177b6098878de33d555aae39ab815 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Jan 21 18:48:01 2014 +0000 +commit f6b86a46974b803de01ab4ffff19fdf46a91cfc7 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun May 11 15:07:25 2014 +0200 - Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe - Kaplan for the report. + Identify client/server by their IP address and port number in follow streams dialog box - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some - other cases in the same vein. + This allows to properly identify hosts that use the same port number - svn path=/trunk/; revision=54875 + Change-Id: I93bf5b53e4df1d339fb06b372b90f88fce6785a0 + Reviewed-on: https://code.wireshark.org/review/1588 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Conflicts: - epan/dissectors/packet-nfs.c + ui/gtk/follow_ssl.c + ui/gtk/follow_tcp.c + ui/gtk/follow_udp.c + ui/qt/follow_stream_dialog.cpp + + (cherry picked from commit 98f608cc0ddd5493a18e87ffe09ed551969b8ae3) - Change-Id: I73714f5c0df608785b0bd96666e0dcf7a9d7ca3a + Change-Id: I6c984dc4e6e68ce74c619980777602fcd1b25cba + Reviewed-on: https://code.wireshark.org/review/1612 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 63d4c995d0b207c101611ec1168616e99e11b4ff +commit b765985eeb706e83b24c4d8d32462aa3f34665b4 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 12 20:52:19 2014 +0000 +Date: Sat May 10 17:02:24 2014 +0200 - Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded + Small fixes to Follow Streams dialog box: + - get the right IPv6 client address + - display the right client to server string for UDP/SSL in Qt port - svn path=/trunk/; revision=54707 + Change-Id: I399cc38b8a32321198deccdd8e2ecd05b54e14db + Reviewed-on: https://code.wireshark.org/review/1586 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Conflicts: - epan/dissectors/packet-h264.c + ui/gtk/follow_ssl.c + ui/gtk/follow_udp.c + ui/qt/follow_stream_dialog.cpp - (cherry picked from commit 527071fb0dba0b8cae5ed8baa58b19ebf1996b89) + (cherry picked from commit e2eea89698b7109d5271186200ab95d97ebc7981) - Change-Id: I572506ad6be63c7243d7b8181c6c79a75d1af04c + Change-Id: Ifac6625ceb3103e1c82a9ca485a26a842a395aec + Reviewed-on: https://code.wireshark.org/review/1611 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 3eb9b1c839910823a4779a6eaf92cf2e9665a749 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 17 22:18:50 2014 +0000 +commit ccce29a936d15dfdfea4f81df90f99150b189ad9 +Author: Gerald Combs <gerald@zing.org> +Date: Sun May 11 09:47:09 2014 -0700 - Fix bug 9649: SMPP: source_telematics_id value length is 1 byte - - svn path=/trunk/; revision=54837 + Don't build update-sminmpec by default when using CMake. - (cherry picked from commit 642949701501d313059c3e7de888af266e00d0d1) - - Change-Id: Ib389f8f9b898492b69240cbf0674fe74bc0e1ca4 + Change-Id: Iccce783eeef23a90ca23900cf18e2d3d2620c767 + Reviewed-on: https://code.wireshark.org/review/1592 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 44d83c2f4f9256f7436e43dee940c922d864d57d) + Reviewed-on: https://code.wireshark.org/review/1593 -commit bc178a12738f03bb5e64edb0e91d14de9960f39d +commit 0bd3ab12e3b28253a21df12dbf5e5691d169380f Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 19 15:19:29 2014 +0000 +Date: Sun May 11 08:07:07 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-19] + [Automatic manuf, services and enterprise-numbers update for 2014-05-11] - svn path=/trunk-1.10/; revision=54845 + Change-Id: Iabdbf1459b32d684cd811be94d22e8cb1e459b20 + Reviewed-on: https://code.wireshark.org/review/1590 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit e57d7a63a05aa7e69c9a3e61f92c1eabf55f48c0 +commit 9f6a83447a9076f29910ccc33196db7c3b14b03a Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 15 00:39:25 2014 +0000 +Date: Mon May 5 11:50:24 2014 -0700 - Copy over recent changes from trunk-1.8 along with some local - modifications. + Be less aggressive about rebuilding sminmpec.c. - ------------------------------------------------------------------------ - r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines + Instead of forcing developers to generate sminmpec.c (which will have + different results depending on the presence or absence of a working + Internet connection) add sminmpec.c back to the repository. I'll add + it to the weekly update-numbers script so that it will be updated at + the same time as manuf, services, enterprise-numbers, and usb.c. - Start using the output of 'git describe'. - ------------------------------------------------------------------------ - r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines + Change the Autotools, CMake, and Nmake sminmpec.c target name to + "update-sminmpec". - Start adding support for plain git. - ------------------------------------------------------------------------ + Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers + and sminmpec.c while we're here. + Tested with an in-tree Autotools build and an out-of-tree CMake build. - svn path=/trunk-1.10/; revision=54808 + Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 + Reviewed-on: https://code.wireshark.org/review/1516 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 3f247a5cee61d8f2139ade94cd9840b100337b05 with manual fixes) + Reviewed-on: https://code.wireshark.org/review/1576 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f3b6ddbc2729b26e91672942c633056af707e1fb -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 13 19:56:48 2014 +0000 +commit efd7ec4f255981f1a4a2ad1f49580233d522af7a +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu May 8 12:38:34 2014 +0200 - Copy over r54714 from trunk: - - ------------------------------------------------------------------------ - r54714 | guy | 2014-01-13 11:49:12 -0800 (Mon, 13 Jan 2014) | 17 lines + TCAP: set a fence on info column after calling sub dissector - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. + Bug: 10091 + Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 + Reviewed-on: https://code.wireshark.org/review/1555 + Reviewed-by: Anders Broman <a.broman58@gmail.com> - They *didn't* match; fix that. - - Do *not* use 16-bit tvbuff offsets; there is no advantage to that (and, - in fact, 32-bit arithmetic may be easier on some platforms), and it has - the disadvantage that you're more likely to have the offset overflow. - - dissect_cbs_serial_number() returns the new offset, not the length of - the item it dissected; don't add its return value to the offset, set the - offset to its return value. + Conflicts: + asn1/tcap/packet-tcap-template.c + epan/dissectors/packet-tcap.c - Make dissect_cbs_message_identifier() return the new offset as well, for - consistency, and don't add *its* return value to the offset. + (cherry picked from commit 54be3eaaec057c44a4b42e4cf538cd07ee247bce) - svn path=/trunk-1.10/; revision=54715 + Change-Id: I37f554d284bdbe45979ec4ccea3d12198023ba53 + Reviewed-on: https://code.wireshark.org/review/1558 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 80489e7c688904319f8fa143fec0ea69bb85f2cb -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 12 15:19:31 2014 +0000 +commit b76f8c7d4698d4dd174beb8714e31489d8173ea1 +Author: Jakub Zawadzki <darkjames@darkjames.pl> +Date: Sun May 4 23:06:54 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2014-01-12] + Fix possible buffer overflow in col_append_sep_fstr() - svn path=/trunk-1.10/; revision=54703 - -commit 11ef00df3e94a5499d3863ff9ac2370be6d37530 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 7 21:24:22 2014 +0000 - - Copy over r54630 from trunk: + After appending separator it might happen that len > max_len, in such case + g_vsnprintf() will overflow the col_buf buffer. - ------------------------------------------------------------------------ - r54630 | guy | 2014-01-07 13:21:20 -0800 (Tue, 07 Jan 2014) | 6 lines - - The capabilities for dumpcap don't need to be inheritable. - - See - - https://bugzilla.redhat.com/show_bug.cgi?id=1022377 - - svn path=/trunk-1.10/; revision=54631 + Change-Id: Ic5ff49d30e30509e835165c4cc7e72e31f92fd5f + Reviewed-on: https://code.wireshark.org/review/1493 + Reviewed-by: Evan Huus <eapache@gmail.com> + (cherry picked from commit 984e52244f08d344a6979bf1405b3d730a388702) + Reviewed-on: https://code.wireshark.org/review/1514 -commit 65a9164e08c0e152c7ce2a2586f0b417b1c263a4 +commit a1df6a4adc72e7f24c2be6f73e5a1de5e78bd01c Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 5 15:19:24 2014 +0000 +Date: Sun May 4 08:06:56 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-05] + [Automatic manuf, services and enterprise-numbers update for 2014-05-04] - svn path=/trunk-1.10/; revision=54602 + Change-Id: Ie2afbbb081e3815470be82d3dcec0166baaf9a7b + Reviewed-on: https://code.wireshark.org/review/1489 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 7fdea48ff9d44de1117a7d52555eb17adb000beb -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 2 09:41:50 2014 +0000 +commit 2ad067c54b349274ae83a9b0827bd475967fdcc8 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Apr 30 13:16:31 2014 -0400 - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54529 | stig | 2014-01-01 13:20:27 +0100 (mer. 01 janv. 2014) | 2 lignes - Chemins modifiés : - M /trunk/packaging/macosx/Info.plist.in - M /trunk/version_info.c - - Happy new year! + Copy make-sminmpec.pl from master. - ------------------------------------------------------------------------ + The previous cherry-pick didn't have the desired effect. - svn path=/trunk-1.10/; revision=54550 + Change-Id: I52b6bd7f33ffe090680e578ae6be8518fbd27022 + Reviewed-on: https://code.wireshark.org/review/1443 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 96d5a4760395b7a6c5a64f243de728fe2b3f0a92 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 1 23:24:27 2014 +0000 +commit e4e5bc3194ebfbb42759ca7e3ce4cc9d5f1fb1a8 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Apr 27 13:26:17 2014 -0700 - Copy over r54544 from trunk: - - ------------------------------------------------------------------------ - r54544 | guy | 2014-01-01 15:22:53 -0800 (Wed, 01 Jan 2014) | 11 lines + make-sminmpec.pl fixups. - If the uncompression buffers are empty, they have no data; set the count - of bytes in them to 0, as there's no data in them, and set the offset in - that buffer of the stream's current position, to 0, as we're currently - at the beginning of the file in both streams. + Enforce a minimum number of entries and do our work in the epan + directory. - This fixes some tricky-to-reproduce errors (which show up only if the - ngsniffer_t structure is allocated from data that's been allocated, - written to in those variables, and freed). - - svn path=/trunk-1.10/; revision=54545 + Change-Id: I69cc6ae3255b23706a2e67db890a9718e10568b2 + Reviewed-on: https://code.wireshark.org/review/1398 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 002cefc721e5fe01ba6ecb9ec7261f549f4f1459) + Reviewed-on: https://code.wireshark.org/review/1441 -commit cddbba2b1bc2ec846d7fa70130686ac286dcb2c6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 17:30:27 2013 +0000 +commit 26dd11dec3b600b09f76bc7000ceae04241ee607 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Apr 27 15:33:13 2014 -0400 - Manually copy over r54485: - - ------------------------------------------------------------------------ - r54485 | gerald | 2013-12-29 09:28:12 -0800 (Sun, 29 Dec 2013) | 9 lines - Changed paths: - M /trunk/manuf - M /trunk/tools/make-manuf - - The IEEE OUI, IAB, and OUI-36 lists currently redirect to - http://standards.ieee.org/regauthmaint.html, which says - - IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th + Remove support for SHIM6 on protocol 61 - As a result the manuf file got clobbered. Revert the manuf file to - its non-clobbered state and add sanity checks to make-manuf. Add a - note about the impending addition of OUI-28. - ------------------------------------------------------------------------ - - svn path=/trunk-1.10/; revision=54486 + bug:9995 + Change-Id: I3c6ff189c4f9cca83b18ea2f057a1bca0c6809c4 + Reviewed-on: https://code.wireshark.org/review/1390 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit fb147728833becb86736162f4a3b6d56db820677 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 15:19:23 2013 +0000 +commit d76e07f5ba94f579c9e81fdab40ab7e83d65d632 +Author: Jaap Keuter <jaap.keuter@xs4all.nl> +Date: Wed Apr 23 23:59:19 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2013-12-29] + Adding two well known OAM related multicast address ranges. - svn path=/trunk-1.10/; revision=54481 + Change-Id: I8fb840e7422b5fe7cd3072d8332de659598ebd3d + Reviewed-on: https://code.wireshark.org/review/1313 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 560b5d9e0c9e4a2ad3e4e930f8ed9dc5b2966756) + Reviewed-on: https://code.wireshark.org/review/1331 + Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> -commit 6e69a1798c5c4de2877b13f5b32e8db86ecc47b7 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Thu Dec 26 23:01:13 2013 +0000 +commit 7aaaf15a12812e7ab6dd03bb122c4ed2bb79fff3 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Apr 25 10:44:11 2014 -0700 - Remove a (presumably debug) fprintf of the default filter value. + Don't fail if a pcap-NG PB or EPB has caplen > actual len. + + We don't fail for other file types; there's no point in failing for + pcap-NG. wtap_read() and wtap_seek_read() will ensure that + caplen <= len. + + Fixes bug 10037. - svn path=/trunk-1.10/; revision=54471 + Change-Id: If8fe0c21ff4a3a57fbd0575d43306fa892d31a6a + Reviewed-on: https://code.wireshark.org/review/1356 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5d329247198b60502bbd295013660936d175d822 +commit 2515bbe055e84b2b610385bbca9a1d246de20c4c Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 22 15:19:28 2013 +0000 +Date: Tue Apr 22 11:58:40 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2013-12-22] + 1.10.7 → 1.10.8. - svn path=/trunk-1.10/; revision=54360 + Change-Id: Icc8695bbc102ee5f827a17fcced9db475fdb9621 + Reviewed-on: https://code.wireshark.org/review/1281 + Reviewed-by: Gerald Combs <gerald@wireshark.org>

@@ -1,12 +1,13 @@ $Id$ NOTE: this document applies to the Wireshark source releases and -buildbot source tarballs. It does not apply to source code checked -out directly from Subversion, as files such as the configuration -script are not checked into Subversion, but need to be generated -from the autoconf and automake files. -See http://wiki.wireshark.org/Development if you would like to build -the source code checked out directly from Subversion. +buildbot source tarballs. It does not apply to source code checked out +directly from Git, as files such as the configuration script are not +checked into Git, but need to be generated from the autoconf and +automake files. + +See http://wiki.wireshark.org/Development if you would like to build the +source code checked out directly from Git. Installation ============

@@ -1,4 +1,4 @@ - Wireshark 1.10.6 Release Notes + Wireshark 1.10.8 Release Notes __________________________________________________________ What is Wireshark? @@ -13,59 +13,31 @@ Bug Fixes The following vulnerabilities have been fixed. - * [1]wnpa-sec-2014-01 - The NFS dissector could crash. Discovered by Moshe Kaplan. - ([2]Bug 9672) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [3]CVE-2014-2281 - * [4]wnpa-sec-2014-02 - The M3UA dissector could crash. Discovered by Laurent - Butti. ([5]Bug 9699) - Versions affected: 1.10.0 to 1.10.5 - [6]CVE-2014-2282 - * [7]wnpa-sec-2014-03 - The RLC dissector could crash. ([8]Bug 9730) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [9]CVE-2014-2283 - * [10]wnpa-sec-2014-04 - The MPEG file parser could overflow a buffer. Discovered by - Wesley Neelen. ([11]Bug 9843) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [12]CVE-2014-2299 + * [1]wnpa-sec-2014-07 + The frame metadissector could crash. ([2]Bug 9999, [3]Bug + 10030) + Versions affected: 1.10.0 to 1.10.7 + [4]CVE-2014-4020 The following bugs have been fixed: - * Customized OUI is not recognized correctly during - dissection. ([13]Bug 9122) - * Properly decode CAPWAP Data Keep-Alives. ([14]Bug 9165) - * Build failure with GTK 3.10 - GTK developers have gone - insane. ([15]Bug 9340) - * SIGSEGV/SIGABRT during free of TvbRange using a chained - dissector in lua. ([16]Bug 9483) - * MPLS dissector no longer registers itself in "ppp.protocol" - table. ([17]Bug 9492) - * Tshark doesn't display the longer data fields (mbtcp). - ([18]Bug 9572) - * DMX-CHAN disector does not clear strbuf between rows. - ([19]Bug 9598) - * Dissector bug, protocol SDP: proto.c:4214: failed assertion - "length >= 0". ([20]Bug 9633) - * False error: capture file appears to be damaged or corrupt. - ([21]Bug 9634) - * SMPP field source_telematics_id field length different from - spec. ([22]Bug 9649) - * Lua: bitop library is missing in Lua 5.2. ([23]Bug 9720) - * GTPv1-C / MM Context / Authentication quintuplet / RAND is - not correct. ([24]Bug 9722) - * Lua: ProtoField.new() is buggy. ([25]Bug 9725) - * Lua: ProtoField.bool() VALUESTRING argument is not optional - but was supposed to be. ([26]Bug 9728) - * Problem with CAPWAP Wireshark Dissector. ([27]Bug 9752) - * nas-eps dissector: CS Service notification dissection stops - after Paging identity IE. ([28]Bug 9789) + * VoIP flow graph crash upon opening. ([5]Bug 9179) + * Tshark with "-F pcap" still generates a pcapng file. + ([6]Bug 9991) + * IPv6 Next Header 0x3d recognized as SHIM6. ([7]Bug 9995) + * Failed to export pdml on large pcap. ([8]Bug 10081) + * TCAP: set a fence on info column after calling sub + dissector ([9]Bug 10091) + * Dissector bug in JSON protocol. ([10]Bug 10115) + * GSM RLC MAC: do not skip too many lines of the CSN_DESCR + when the field is missing ([11]Bug 10120) + * Wireshark PEEKREMOTE incorrectly decoding QoS data packets + from Cisco Sniffer APs. ([12]Bug 10139) + * IEEE 802.11: fix dissection of HT Capabilities ([13]Bug + 10166) New and Updated Features - IPv4 checksum verfification is now disabled by default. + There are no new features in this release. New Protocol Support @@ -73,25 +45,24 @@ Updated Protocol Support - AppleTalk, CAPWAP, DMX-CHAN, DSI, DVB-CI, ESS, GTPv1, IEEE - 802a, M3UA, Modbus/TCP, NAS-EPS, NFS, OpenSafety, SDP, and SMPP + CIP, EtherNet/IP, GSM RLC MAC, IEEE 802.11, IPv6, and TCAP New and Updated Capture File Support - libpcap, MPEG, and pcap-ng + pcap-ng, and PEEKREMOTE __________________________________________________________ Getting Wireshark Wireshark source code and installation packages are available - from [29]http://www.wireshark.org/download.html. + from [14]http://www.wireshark.org/download.html. Vendor-supplied Packages Most Linux and Unix vendors supply their own Wireshark packages. You can usually install or upgrade Wireshark using the package management system specific to that platform. A list - of third-party packages can be found on the [30]download page + of third-party packages can be found on the [15]download page on the Wireshark web site. __________________________________________________________ @@ -105,101 +76,86 @@ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([31]Bug + Dumpcap might not quit if Wireshark or TShark crashes. ([16]Bug 1419) - The BER dissector might infinitely loop. ([32]Bug 1516) + The BER dissector might infinitely loop. ([17]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([33]Bug 1814) + ([18]Bug 1814) Filtering tshark captures with read filters (-R) no longer - works. ([34]Bug 2234) + works. ([19]Bug 2234) The 64-bit Windows installer does not support Kerberos - decryption. ([35]Win64 development page) + decryption. ([20]Win64 development page) - Resolving ([36]Bug 9044) reopens ([37]Bug 3528) so that + Resolving ([21]Bug 9044) reopens ([22]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([38]Bug + Application crash when changing real-time option. ([23]Bug 4035) - Hex pane display issue after startup. ([39]Bug 4056) + Hex pane display issue after startup. ([24]Bug 4056) - Packet list rows are oversized. ([40]Bug 4357) + Packet list rows are oversized. ([25]Bug 4357) Summary pane selected frame highlighting not maintained. - ([41]Bug 4445) + ([26]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. ([42]Bug 4985) + cases. ([27]Bug 4985) __________________________________________________________ Getting Help - Community support is available on [43]Wireshark's Q&A site and + Community support is available on [28]Wireshark's Q&A site and on the wireshark-users mailing list. Subscription information and archives for all of Wireshark's mailing lists can be found - on [44]the web site. + on [29]the web site. Official Wireshark training and certification are available - from [45]Wireshark University. + from [30]Wireshark University. __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [46]Wireshark web site. + A complete FAQ is available on the [31]Wireshark web site. __________________________________________________________ - Last updated 2014-03-06 13:50:43 PST + Last updated 2014-06-12 12:06:58 PDT References - 1. https://www.wireshark.org/security/wnpa-sec-2014-01.html - 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 - 3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2281 - 4. https://www.wireshark.org/security/wnpa-sec-2014-02.html - 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9699 - 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2282 - 7. https://www.wireshark.org/security/wnpa-sec-2014-03.html - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9730 - 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2283 - 10. https://www.wireshark.org/security/wnpa-sec-2014-04.html - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9843 - 12. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2299 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165 - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9340 - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9483 - 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492 - 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572 - 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - 20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 - 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 - 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 - 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9720 - 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9722 - 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9725 - 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9728 - 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9752 - 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9789 - 29. http://www.wireshark.org/download.html - 30. http://www.wireshark.org/download.html#thirdparty - 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 35. https://wiki.wireshark.org/Development/Win64 - 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 - 42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 43. http://ask.wireshark.org/ - 44. http://www.wireshark.org/lists/ - 45. http://www.wiresharktraining.com/ - 46. http://www.wireshark.org/faq.html + 1. https://www.wireshark.org/security/wnpa-sec-2014-07.html + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9999 + 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10030 + 4. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-4020 + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9179 + 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9991 + 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9995 + 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10081 + 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10091 + 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10115 + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10120 + 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10139 + 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10166 + 14. http://www.wireshark.org/download.html + 15. http://www.wireshark.org/download.html#thirdparty + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 20. https://wiki.wireshark.org/Development/Win64 + 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 28. http://ask.wireshark.org/ + 29. http://www.wireshark.org/lists/ + 30. http://www.wiresharktraining.com/ + 31. http://www.wireshark.org/faq.html

@@ -38,7 +38,7 @@ After you have installed those libraries: -If you are building from a Subversion tree, rather than from a source +If you are building from a Git tree, rather than from a source distribution tarball, run the autogen.sh script. This should not be necessary if you're building from a source distribution tarball, unless you've added new source files to the Wireshark source. @@ -52,7 +52,7 @@ If you are building from a release tarball: make distclean - If you are building from SVN: + If you are building from Git: make maintainer-clean ./autogen.sh

@@ -148,8 +148,7 @@ { 0x01, "Attempted successfully: results not used to generate location - not used." }, { 0x02, "Attempted successfully: results used to verify but not generate location - not used." }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" }, @@ -184,8 +183,7 @@ { 0x01, "Attempted successfully: results not used to generate location" }, { 0x02, "Attempted successfully: results used to verify but not generate location" }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" },

@@ -305,7 +305,16 @@ case SI_OrPSI_GERAN_si: /* SI message */ if (gsm_a_dtap_handle) { - call_dissector(gsm_a_dtap_handle, sys_info_list_tvb, actx->pinfo, subtree); + tvbuff_t *si_tvb = tvb_new_composite(); + guint8 *pd = (guint8 *)g_malloc(1); + tvbuff_t *pd_tvb = tvb_new_child_real_data(sys_info_list_tvb, pd, 1, 1); + tvb_set_free_cb(pd_tvb, g_free); + pd[0] = 0x06; + tvb_composite_append(si_tvb, pd_tvb); + tvb_composite_append(si_tvb, sys_info_list_tvb); + tvb_composite_finalize(si_tvb); + add_new_data_source(actx->pinfo, si_tvb, "System Information"); + call_dissector(gsm_a_dtap_handle, si_tvb, actx->pinfo, subtree); } break; case SI_OrPSI_GERAN_psi:

@@ -633,8 +633,10 @@ } /* Call the sub dissector if present, and not already called */ - if (is_subdissector) + if (is_subdissector) { call_dissector(subdissector_handle, tvb, actx->pinfo, tree); + col_set_fence(actx->pinfo->cinfo, COL_INFO); + } return offset; }

@@ -23,13 +23,13 @@ ##### Versions ##### # The Git description of our build. Updated by make-version.pl -GIT_REVISION=2253 +GIT_REVISION=2 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=10 -VERSION_MICRO=6 +VERSION_MICRO=8 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your

@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for wireshark 1.10.6. +# Generated by GNU Autoconf 2.68 for wireshark 1.10.8. # # Report bugs to <http://bugs.wireshark.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.10.6' -PACKAGE_STRING='wireshark 1.10.6' +PACKAGE_VERSION='1.10.8' +PACKAGE_STRING='wireshark 1.10.8' PACKAGE_BUGREPORT='http://bugs.wireshark.org/' PACKAGE_URL='http://www.wireshark.org/' @@ -1553,7 +1553,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.10.6 to adapt to many kinds of systems. +\`configure' configures wireshark 1.10.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1624,7 +1624,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wireshark 1.10.6:";; + short | recursive ) echo "Configuration of wireshark 1.10.8:";; esac cat <<\_ACEOF @@ -1832,7 +1832,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.10.6 +wireshark configure 1.10.8 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2376,7 +2376,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.10.6, which was +It was created by wireshark $as_me 1.10.8, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3310,7 +3310,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.10.6' + VERSION='1.10.8' cat >>confdefs.h <<_ACEOF @@ -3440,7 +3440,7 @@ $as_echo "#define VERSION_MINOR 10" >>confdefs.h -$as_echo "#define VERSION_MICRO 6" >>confdefs.h +$as_echo "#define VERSION_MICRO 8" >>confdefs.h # Check whether --enable-static was given. @@ -34973,7 +34973,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.10.6, which was +This file was extended by wireshark $as_me 1.10.8, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35040,7 +35040,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.10.6 +wireshark config.status 1.10.8 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"

@@ -3,7 +3,7 @@ m4_define([version_major], [1]) m4_define([version_minor], [10]) -m4_define([version_micro], [6]) +m4_define([version_micro], [8]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], [])

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

@@ -8,7 +8,7 @@ "IPX only" ipx "TCP only" tcp "UDP only" udp -"UDP port isn't 53 (not DNS), don't use != for this!" !(tcp.port == 53) +"Non-DNS" !(udp.port == 53 || tcp.port == 53) "TCP or UDP port is 80 (HTTP)" tcp.port == 80 || udp.port == 80 "HTTP" http "No ARP and no DNS" not arp and !(udp.port == 53)

@@ -23,7 +23,7 @@ Logo and icon artwork can be found in the "image" directory in the distribution. This is available online at - http://anonsvn.wireshark.org/wireshark/trunk/image/ + https://code.wireshark.org/review/gitweb?p=wireshark.git;a=tree;f=image;hb=HEAD 2. Licensing.

@@ -4,7 +4,7 @@ [replacements] # Yes, this is a fake macro. -wireshark-version:\[\]=1.10.6 +wireshark-version:\[\]=1.10.8 [macros]

@@ -28,7 +28,7 @@ --> <!ENTITY DocumentTitle "<application>Wireshark</application> Developer's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &WiresharkCurrentVersion;"> + <!ENTITY DocumentSubTitle "&GitVersion; for Wireshark &WiresharkCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "WSDG"> <!ENTITY DocumentCopyrightHolder "Ulf Lamping"> @@ -37,8 +37,8 @@ <!ENTITY DocumentEdition "Draft"> <!ENTITY DocumentVersion "Draft 0.0.3"> <!ENTITY DocumentPubDate "2008"> - <!ENTITY % SvnVersionFile SYSTEM "git_version.xml"> - %SvnVersionFile; + <!ENTITY % GitVersionFile SYSTEM "git_version.xml"> + %GitVersionFile; <!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">

@@ -1 +1 @@ -<!ENTITY GitVersion "wireshark-1.10.6-dirty"> +<!ENTITY GitVersion "wireshark-1.10.8-2-g52a5244-dirty">

@@ -16,78 +16,35 @@ //* ws-salink:2013-11[] //* cve-idlink:2013-2486[] -* ws-salink:2014-01[] +* ws-salink:2014-07[] + -The NFS dissector could crash. Discovered by Moshe Kaplan. -// Fixed in trunk: r54875 / gf4ab2b2 -// Fixed in trunk-1.10: g312f7e1 -// Fixed in trunk-1.8: g2fb9848 -(ws-buglink:9672[]) +The frame metadissector could crash. +// Fixed in master: gbeb119f +// Fixed in master-1.10: g5cdb0c3 +(ws-buglink:9999[], ws-buglink:10030[]) + -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 +Versions affected: 1.10.0 to 1.10.7 + -cve-idlink:2014-2281[] - -* ws-salink:2014-02[] -+ -The M3UA dissector could crash. Discovered by Laurent Butti. -// Fixed in master: r51608 / ga8f4327 -// Fixed in master-1.10: gd3bd396 -(ws-buglink:9699[]) -+ -Versions affected: 1.10.0 to 1.10.5 -+ -cve-idlink:2014-2282[] - -* ws-salink:2014-03[] -+ -The RLC dissector could crash. -// Fixed in trunk: n/a -// Fixed in trunk-1.10: gd8075e7 -// Fixed in trunk-1.8: g217293b -(ws-buglink:9730[]) -+ -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -+ -cve-idlink:2014-2283[] - -* ws-salink:2014-04[] -+ -The MPEG file parser could overflow a buffer. Discovered by Wesley -Neelen. -// Fixed in trunk: n/a -// Fixed in trunk-1.10: g34144b8 -// Fixed in trunk-1.8: gf567435 -(ws-buglink:9843[]) -+ -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -+ -cve-idlink:2014-2299[] +cve-idlink:2014-4020[] The following bugs have been fixed: +// Should be sorted numerically. //* Wireshark will practice the jazz flute for hours on end when you're trying to sleep. (ws-buglink:0000[]) -* Customized OUI is not recognized correctly during dissection. (ws-buglink:9122[]) -* Properly decode CAPWAP Data Keep-Alives. (ws-buglink:9165[]) -* Build failure with GTK 3.10 - GTK developers have gone insane. (ws-buglink:9340[]) -* SIGSEGV/SIGABRT during free of TvbRange using a chained dissector in lua. (ws-buglink:9483[]) -* MPLS dissector no longer registers itself in "ppp.protocol" table. (ws-buglink:9492[]) -* Tshark doesn't display the longer data fields (mbtcp). (ws-buglink:9572[]) -* DMX-CHAN disector does not clear strbuf between rows. (ws-buglink:9598[]) -* Dissector bug, protocol SDP: proto.c:4214: failed assertion "length >= 0". (ws-buglink:9633[]) -* False error: capture file appears to be damaged or corrupt. (ws-buglink:9634[]) -* SMPP field source_telematics_id field length different from spec. (ws-buglink:9649[]) -* Lua: bitop library is missing in Lua 5.2. (ws-buglink:9720[]) -* GTPv1-C / MM Context / Authentication quintuplet / RAND is not correct. (ws-buglink:9722[]) -* Lua: ProtoField.new() is buggy. (ws-buglink:9725[]) -* Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be. (ws-buglink:9728[]) -* Problem with CAPWAP Wireshark Dissector. (ws-buglink:9752[]) -* nas-eps dissector: CS Service notification dissection stops after Paging identity IE. (ws-buglink:9789[]) +* VoIP flow graph crash upon opening. (ws-buglink:9179[]) +* Tshark with "-F pcap" still generates a pcapng file. (ws-buglink:9991[]) +* IPv6 Next Header 0x3d recognized as SHIM6. (ws-buglink:9995[]) +* Failed to export pdml on large pcap. (ws-buglink:10081[]) +* TCAP: set a fence on info column after calling sub dissector (ws-buglink:10091[]) +* Dissector bug in JSON protocol. (ws-buglink:10115[]) +* GSM RLC MAC: do not skip too many lines of the CSN_DESCR when the field is missing (ws-buglink:10120[]) +* Wireshark PEEKREMOTE incorrectly decoding QoS data packets from Cisco Sniffer APs. (ws-buglink:10139[]) +* IEEE 802.11: fix dissection of HT Capabilities (ws-buglink:10166[]) === New and Updated Features -IPv4 checksum verfification is now disabled by default. +There are no new features in this release. === New Protocol Support @@ -97,21 +54,12 @@ --sort-and-group-- -AppleTalk -CAPWAP -GTPv1 -DMX-CHAN -DSI -DVB-CI -ESS -IEEE 802a -M3UA -Modbus/TCP -NAS-EPS -NFS -OpenSafety -SDP -SMPP +CIP +EtherNet/IP +GSM RLC MAC +IEEE 802.11 +IPv6 +TCAP --sort-and-group-- @@ -119,8 +67,7 @@ --sort-and-group-- -libpcap -MPEG +PEEKREMOTE pcap-ng --sort-and-group--

@@ -61,7 +61,7 @@ --> <!ENTITY DocumentTitle "<application>Wireshark</application> User's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &WiresharkCurrentVersion;"> + <!ENTITY DocumentSubTitle "&GitVersion; for Wireshark &WiresharkCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "WSUG"> <!ENTITY DocumentCopyrightHolder1 "Ulf Lamping "> @@ -73,8 +73,8 @@ <!ENTITY DocumentVersion "V3.0.2"> <!ENTITY DocumentPubDate "2008"> - <!ENTITY % SvnVersionFile SYSTEM "git_version.xml"> - %SvnVersionFile; + <!ENTITY % GitVersionFile SYSTEM "git_version.xml"> + %GitVersionFile; <!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.</para><para>All logos and trademarks in this document are property of their respective owner.</para>"> <!--

@@ -1381,13 +1381,10 @@ wmem/wmem_strutl.c ) -ADD_CUSTOM_COMMAND( - OUTPUT - sminmpec.c +ADD_CUSTOM_TARGET( + update-sminmpec COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl - ${CMAKE_CURRENT_SOURCE_DIR}/enterprise-numbers - sminmpec.c DEPENDS enterprise-numbers ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl

@@ -56,7 +56,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 4:6:1 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 4:8:1 @LDFLAGS_SHAREDLIB@ include Makefile.common @@ -129,8 +129,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - Makefile.in \ - sminmpec.c + Makefile.in # # Add the object files for missing routines, if any. @@ -187,8 +186,8 @@ tvbtest.o exntest.o: exceptions.h -sminmpec.c: enterprise-numbers ../tools/make-sminmpec.pl - $(PERL) $(srcdir)/../tools/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c +update-sminmpec: + $(PERL) $(srcdir)/../tools/make-sminmpec.pl if HAVE_PLUGINS @@ -223,16 +222,10 @@ ../plugins/docsis/packet-uccreq.c \ ../plugins/docsis/packet-uccrsp.c \ ../plugins/docsis/packet-ucd.c \ - ../plugins/giop/packet-cosnaming.c \ - ../plugins/giop/packet-coseventcomm.c \ ../plugins/gryphon/packet-gryphon.c \ - ../plugins/interlink/packet-interlink.c \ ../plugins/irda/packet-irda.c \ ../plugins/m2m/packet-m2m.c \ ../plugins/m2m/wimax_tlv.c \ - ../plugins/mgcp/packet-mgcp.c \ - ../plugins/rdm/packet-rdm.c \ - ../plugins/sercosiii/packet-sercosiii.c \ ../plugins/wimax/crc.c \ ../plugins/wimax/crc_data.c \ ../plugins/wimax/mac_hd_generic_decoder.c \

@@ -595,7 +595,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 4:6:1 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 4:8:1 @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ @@ -890,8 +890,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - Makefile.in \ - sminmpec.c + Makefile.in # @@ -951,16 +950,10 @@ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/docsis/packet-uccreq.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/docsis/packet-uccrsp.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/docsis/packet-ucd.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/giop/packet-cosnaming.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/giop/packet-coseventcomm.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/gryphon/packet-gryphon.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/interlink/packet-interlink.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/irda/packet-irda.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/m2m/packet-m2m.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/m2m/wimax_tlv.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/mgcp/packet-mgcp.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/rdm/packet-rdm.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/sercosiii/packet-sercosiii.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/wimax/crc.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/wimax/crc_data.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/wimax/mac_hd_generic_decoder.c \ @@ -2068,8 +2061,8 @@ tvbtest.o exntest.o: exceptions.h -sminmpec.c: enterprise-numbers ../tools/make-sminmpec.pl - $(PERL) $(srcdir)/../tools/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c +update-sminmpec: + $(PERL) $(srcdir)/../tools/make-sminmpec.pl @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@-include ../plugins/Custom.make

@@ -170,7 +170,7 @@ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - dtd_grammar.out sminmpec.c + dtd_grammar.out distclean: distclean-local cd crypt @@ -337,8 +337,8 @@ $(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $? !ENDIF -sminmpec.c: enterprise-numbers ..\tools\make-sminmpec.pl - $(PERL) ../tools/make-sminmpec.pl enterprise-numbers sminmpec.c +update-sminmpec: + $(PERL) ../tools/make-sminmpec.pl RUNLEX=..\tools\runlex.sh

@@ -382,9 +382,11 @@ len += sep_len; } } - va_start(ap, format); - g_vsnprintf(&cinfo->col_buf[i][len], max_len - len, format, ap); - va_end(ap); + if (len < max_len) { + va_start(ap, format); + g_vsnprintf(&cinfo->col_buf[i][len], max_len - len, format, ap); + va_end(ap); + } } } }

@@ -951,7 +951,7 @@ } #define NO_MORE_DATA_CHECK(nmdc_len) \ - if ((nmdc_len) == (curr_offset - offset)) return(nmdc_len); + if ((nmdc_len) <= (curr_offset - offset)) return(nmdc_len); /*

@@ -359,8 +359,8 @@ offset += 2; proto_tree_add_item(st, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if( tvb_length_remaining(tvb, offset) > 0) - proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x07: /* Find By Type Value Response */ @@ -438,6 +438,7 @@ case 0x0d: /* Read Blob Response */ case 0x0f: /* Multiple Read Response */ proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x0c: /* Read Blob Request */ @@ -500,6 +501,7 @@ proto_tree_add_item(st, hf_btatt_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x16: /* Prepare Write Request */ @@ -511,6 +513,7 @@ proto_tree_add_item(st, hf_btatt_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x18: /* Execute Write Request */

@@ -717,20 +717,23 @@ static void dissect_capwap_data_message_bindings_ieee80211(tvbuff_t *tvb, proto_tree *data_message_binding_tree, guint offset, packet_info *pinfo) { - proto_item *data_message_binding_item; + proto_item *data_message_binding_item, *ti; proto_tree *sub_data_message_binding_tree; if (global_capwap_data_udp_port == pinfo->destport) { + guint16 data_rate; /* (WTP -> AC) IEEE 802.11 Frame Info */ - data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi,tvb, offset, 4, ENC_NA); + data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi, tvb, offset, 4, ENC_NA); sub_data_message_binding_tree = proto_item_add_subtree(data_message_binding_item, ett_capwap); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_rssi,tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_snr,tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_snr, tvb, offset+1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_data_rate,tvb, offset+2, 2, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_data_rate, tvb, offset+2, 2, ENC_BIG_ENDIAN); + data_rate = tvb_get_ntohs(tvb, offset+2); + proto_item_append_text(ti, " (%.1f Mb/s)", ((float)data_rate / 10)); } else { @@ -738,9 +741,9 @@ data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dest_wlan,tvb, offset, 4, ENC_NA); sub_data_message_binding_tree = proto_item_add_subtree(data_message_binding_item, ett_capwap); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_reserved,tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_reserved, tvb, offset+2, 2, ENC_BIG_ENDIAN); } } @@ -1699,7 +1702,7 @@ NULL, HFILL }}, { &hf_capwap_header_wireless_data_ieee80211_fi_rssi, { "Wireless data ieee80211 RSSI (dBm)", "capwap.header.wireless.data.ieee80211.fi.rssi", - FT_UINT8, BASE_DEC, NULL, 0x00, + FT_INT8, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_capwap_header_wireless_data_ieee80211_fi_snr, { "Wireless data ieee80211 SNR (dB)", "capwap.header.wireless.data.ieee80211.fi.snr",

@@ -2638,7 +2638,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_state_info); proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_state, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN); @@ -2671,7 +2671,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_enable_cfg); proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_enable, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN); @@ -2704,7 +2704,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_log_announce); proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_interval, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN); @@ -2737,7 +2737,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_log_sync); proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_log_sync_interval, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN); @@ -2897,7 +2897,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*10, 10, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*10, 10, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_profile_id_info); proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_port_num, tvb, offset+2+i*10, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_profile_id, tvb, offset+4+i*10, 8, ENC_NA); @@ -2930,7 +2930,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*36, 36, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*36, 36, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_phys_addr_info); proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_port_num, tvb, offset+2+i*36, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+4+i*36, 16, ENC_NA); @@ -2965,7 +2965,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i*22, 22, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i*22, 22, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_proto_addr_info); proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_port_num, tvb, offset+2+i*22, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_network_proto, tvb, offset+4+i*22, 2, ENC_LITTLE_ENDIAN);

@@ -1983,7 +1983,7 @@ { int key_string_len; int i, j; - char input[2]; + char input[3]; if (!key_string || !key_bin) return -1; @@ -1991,6 +1991,7 @@ if (key_string_len != 2*AES_KEY_LEN) return -1; *key_bin = (unsigned char*)g_malloc(key_string_len/2); + input[2] = '\0'; j=0; for (i=0; i<key_string_len-1; i+=2) {

@@ -943,7 +943,7 @@ /* Check if separate T->O conversation is necessary. If either side is multicast or ports aren't equal, a separate conversation must be generated */ - dest_address.data = &connInfo->T2O.ipaddress; + dest_address.data = connInfo->T2O.ipaddress.data; if((conversationTO = find_conversation(pinfo->fd->num, &pinfo->src, &dest_address, PT_UDP, connInfo->T2O.port, 0, NO_PORT_B)) == NULL) { @@ -1268,10 +1268,10 @@ } proto_tree_add_item(tree, hf_tcpip_lcd_acd_activity, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_tcpip_lcd_remote_mac, tvb, offset+1, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_tcpip_lcd_remote_mac, tvb, offset+1, 6, ENC_NA); if( tvb_get_guint8(tvb, offset) == 0 ) - proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_NA); else { /* Dissect ARP PDU, but don't have it change column info */ @@ -1413,7 +1413,7 @@ } proto_tree_add_item(tree, hf_dlr_lanp1_dev_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_lanp1_dev_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_lanp1_dev_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1428,7 +1428,7 @@ } proto_tree_add_item(tree, hf_dlr_lanp2_dev_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_lanp2_dev_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_lanp2_dev_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1448,7 +1448,7 @@ while( pos < total_len) { proto_tree_add_item(tree, hf_dlr_rppl_dev_ip_addr, tvb, offset+pos, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_rppl_dev_physical_address, tvb, offset+pos+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_rppl_dev_physical_address, tvb, offset+pos+4, 6, ENC_NA); pos+=10; } return total_len; @@ -1465,7 +1465,7 @@ } proto_tree_add_item(tree, hf_dlr_asa_supervisor_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_asa_supervisor_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_asa_supervisor_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1524,7 +1524,7 @@ } proto_tree_add_item(tree, hf_dlr_aga_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_aga_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_aga_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -2293,7 +2293,7 @@ proto_tree_add_item( dlr_tree, hf_dlr_supervisorprecedence, tvb, DLR_BE_SUPERVISOR_PRECEDENCE, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_beaconinterval, tvb, DLR_BE_BEACON_INTERVAL, 4, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_beacontimeout, tvb, DLR_BE_BEACON_TIMEOUT, 4, ENC_BIG_ENDIAN ); - proto_tree_add_item( dlr_tree, hf_dlr_beaconreserved, tvb, DLR_BE_RESERVED, 20, ENC_BIG_ENDIAN ); + proto_tree_add_item( dlr_tree, hf_dlr_beaconreserved, tvb, DLR_BE_RESERVED, 20, ENC_NA); } else if( dlr_frametype == DLR_FT_NEIGHBOR_REQ ) {

@@ -228,9 +228,9 @@ } if(pinfo->fd->opt_comment){ - item = proto_tree_add_item(tree, proto_pkt_comment, tvb, 0, -1, ENC_NA); + item = proto_tree_add_item(tree, proto_pkt_comment, tvb, 0, 0, ENC_NA); comments_tree = proto_item_add_subtree(item, ett_comments); - comment_item = proto_tree_add_string_format(comments_tree, hf_comments_text, tvb, 0, -1, + comment_item = proto_tree_add_string_format(comments_tree, hf_comments_text, tvb, 0, 0, pinfo->fd->opt_comment, "%s", pinfo->fd->opt_comment); expert_add_info_format(pinfo, comment_item, PI_COMMENTS_GROUP, PI_COMMENT, @@ -259,7 +259,7 @@ cap_plurality = plurality(cap_len, "", "s"); frame_plurality = plurality(frame_len, "", "s"); - ti = proto_tree_add_protocol_format(tree, proto_frame, tvb, 0, -1, + ti = proto_tree_add_protocol_format(tree, proto_frame, tvb, 0, tvb_length(tvb), "Frame %u: %u byte%s on wire", pinfo->fd->num, frame_len, frame_plurality); if (generate_bits_field) @@ -458,7 +458,7 @@ if (pinfo->fd->flags.ignored) { /* Ignored package, stop handling here */ col_set_str(pinfo->cinfo, COL_INFO, "<Ignored>"); - proto_tree_add_text (tree, tvb, 0, -1, "This frame is marked as ignored"); + proto_tree_add_text (tree, tvb, 0, 0, "This frame is marked as ignored"); return; }

@@ -259,7 +259,7 @@ } #define NO_MORE_DATA_CHECK(nmdc_len) \ - if ((nmdc_len) == (curr_offset - offset)) return(nmdc_len); + if ((nmdc_len) <= (curr_offset - offset)) return(nmdc_len); #define SET_ELEM_VARS(SEV_pdu_type, SEV_elem_names_ext, SEV_elem_ett, SEV_elem_funcs) \ switch (SEV_pdu_type) \

@@ -463,7 +463,6 @@ static int hf_change_mark_change_mark_2 = -1; static int hf_indirect_encoding_ma_number = -1; static int hf_packet_request_reference_random_access_information = -1; -static int hf_timeslot_allocation_usf_tn = -1; static int hf_extended_dynamic_allocation = -1; static int hf_rlc_data_blocks_granted = -1; static int hf_single_block_allocation_timeslot_number = -1; @@ -2594,7 +2593,7 @@ static const CSN_DESCR_BEGIN(Timeslot_Allocation_t) M_NEXT_EXIST (Timeslot_Allocation_t, Exist, 1), - M_UINT (Timeslot_Allocation_t, USF_TN, 3, &hf_timeslot_allocation_usf_tn), + M_UINT (Timeslot_Allocation_t, USF_TN, 3, &hf_usf), CSN_DESCR_END (Timeslot_Allocation_t) static const @@ -5207,7 +5206,7 @@ static const CSN_DESCR_BEGIN (GlobalTimeslotDescription_UA_t) M_TYPE (GlobalTimeslotDescription_UA_t, GlobalTimeslotDescription, GlobalTimeslotDescription_t), - M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 3), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 2), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ M_TYPE (GlobalTimeslotDescription_UA_t, PHO_UA, PHO_UplinkAssignment_t), M_FIXED (GlobalTimeslotDescription_UA_t, 1, 0x0), /* Escape recursive */ @@ -5260,7 +5259,7 @@ M_NEXT_EXIST (PHO_EGPRS_t, Exist_GlobalTimeslotDescription_UA, 1), M_TYPE (PHO_EGPRS_t, GTD_UA, GlobalTimeslotDescription_UA_t), - M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 2), + M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 1), M_TYPE (PHO_EGPRS_t, DownlinkTBF, DownlinkTBF_t), CSN_DESCR_END (PHO_EGPRS_t)

@@ -260,6 +260,24 @@ capture_ieee80211(pd, offset, len, ld); } +static guint16 +tvb_get_enctohs(tvbuff_t *tvb, int offset, guint encoding) +{ + if (encoding == ENC_BIG_ENDIAN) + return tvb_get_ntohs(tvb, offset); + else + return tvb_get_letohs(tvb, offset); +} + +static guint32 +tvb_get_enctohl(tvbuff_t *tvb, int offset, guint encoding) +{ + if (encoding == ENC_BIG_ENDIAN) + return tvb_get_ntohl(tvb, offset); + else + return tvb_get_letohl(tvb, offset); +} + static void dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -268,6 +286,7 @@ tvbuff_t *next_tvb; int offset; guint32 msgcode, msglen, did; + guint byte_order; guint16 status; guint8 *devname_p; @@ -288,12 +307,18 @@ * at least one capture has AVS headers on some packets and no * radio headers on others (incoming vs. outgoing?). * - * XXX - check for both byte orders and use that to determine - * the byte order of the fields in the Prism header? + * Check for both byte orders and use that to determine + * the byte order of the fields in the Prism header. */ - msgcode = tvb_get_letohl(tvb, offset); - if ((msgcode != PRISM_TYPE1_MSGCODE) && - (msgcode != PRISM_TYPE2_MSGCODE)) { + if ((msgcode == PRISM_TYPE1_MSGCODE) || (msgcode == PRISM_TYPE2_MSGCODE)) { + /* big-endian fetch matched */ + byte_order = ENC_BIG_ENDIAN; + } else if (((msgcode = tvb_get_letohl(tvb, offset)) == PRISM_TYPE1_MSGCODE) || + (msgcode == PRISM_TYPE2_MSGCODE)) { + /* little-endian fetch matched */ + byte_order = ENC_LITTLE_ENDIAN; + } else { + /* neither matched - try it as just 802.11 with no Prism header */ call_dissector(ieee80211_handle, tvb, pinfo, tree); return; } @@ -308,16 +333,16 @@ /* Message Code */ if(tree) { - proto_tree_add_item(prism_tree, hf_ieee80211_prism_msgcode, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_tree, hf_ieee80211_prism_msgcode, tvb, offset, 4, byte_order); } - msgcode = tvb_get_letohl(tvb, offset); + msgcode = tvb_get_enctohl(tvb, offset, byte_order); offset += 4; /* Message Length */ if(tree) { - proto_tree_add_item(prism_tree, hf_ieee80211_prism_msglen, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_tree, hf_ieee80211_prism_msglen, tvb, offset, 4, byte_order); } - msglen = tvb_get_letohl(tvb, offset); + msglen = tvb_get_enctohl(tvb, offset, byte_order); offset += 4; /* Device Name */ @@ -329,7 +354,6 @@ col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname_p, msgcode, msglen); - while(offset < PRISM_HEADER_LENGTH) { /* DID */ @@ -337,23 +361,23 @@ ti_did = proto_tree_add_item(prism_tree, hf_ieee80211_prism_did, tvb, offset, 12, ENC_NA); prism_did_tree = proto_item_add_subtree(ti_did, ett_prism_did); - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); - did = tvb_get_letohl(tvb, offset); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_type, tvb, offset, 4, byte_order); + did = tvb_get_enctohl(tvb, offset, byte_order); proto_item_append_text(ti_did, " %s", val_to_str(did, prism_did_vals, "Unknown %x") ); } offset += 4; /* Status */ - status = tvb_get_letohs(tvb, offset); + status = tvb_get_enctohs(tvb, offset, byte_order); if(tree) { - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, byte_order); } offset += 2; /* Length */ if(tree) { - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_length, tvb, offset, 2, byte_order); } offset += 2; @@ -363,89 +387,89 @@ case PRISM_TYPE1_HOSTTIME: case PRISM_TYPE2_HOSTTIME: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_MACTIME: case PRISM_TYPE2_MACTIME: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_CHANNEL: case PRISM_TYPE2_CHANNEL: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) ); } - col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_letohl(tvb, offset)); + col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_enctohl(tvb, offset, byte_order)); break; case PRISM_TYPE1_RSSI: case PRISM_TYPE2_RSSI: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } - col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_letohl(tvb, offset)); + col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_enctohl(tvb, offset, byte_order)); break; case PRISM_TYPE1_SQ: case PRISM_TYPE2_SQ: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_SIGNAL: case PRISM_TYPE2_SIGNAL: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_NOISE: case PRISM_TYPE2_NOISE: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_RATE: case PRISM_TYPE2_RATE: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_letohl(tvb, offset)) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_enctohl(tvb, offset, byte_order)) ); } - col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_letohl(tvb, offset)) ); + col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_enctohl(tvb, offset, byte_order)) ); break; case PRISM_TYPE1_ISTX: case PRISM_TYPE2_ISTX: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_FRMLEN: case PRISM_TYPE2_FRMLEN: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order)); } break; default: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, byte_order); } break; }

@@ -644,7 +644,7 @@ #define TAG_BEACON_TIMING 120 #define TAG_MCCAOP_SETUP_REQUEST 121 #define TAG_MCCAOP_SETUP_REPLY 122 -#define TAG_MCCAOP_ADVERTISSEMENT 123 +#define TAG_MCCAOP_ADVERTISEMENT 123 #define TAG_MCCAOP_TEARDOWN 124 #define TAG_GANN 125 #define TAG_RANN 126 /* IEEE Std 802.11s-2011 */ @@ -664,9 +664,9 @@ #define TAG_CISCO_CCX3 149 /* Cisco Compatible eXtensions v3 */ #define TAG_CISCO_UNKNOWN_96 150 /* Cisco Compatible eXtensions */ #define TAG_SYMBOL_PROPRIETARY 173 -#define TAG_MCCAOP_ADVERTISSEMENT_OV 174 -#define TAG_VHT_CAPABILITY 191 /* IEEE Stc 802.11ac/D3.1 */ -#define TAG_VHT_OPERATION 192 /* IEEE Stc 802.11ac/D3.1 */ +#define TAG_MCCAOP_ADVERTISEMENT_OV 174 +#define TAG_VHT_CAPABILITY 191 /* IEEE Std 802.11ac/D3.1 */ +#define TAG_VHT_OPERATION 192 /* IEEE Std 802.11ac/D3.1 */ #define TAG_VENDOR_SPECIFIC_IE 221 static const value_string tag_num_vals[] = { @@ -775,9 +775,9 @@ { TAG_BEACON_TIMING, "Beacon Timing" }, { TAG_MCCAOP_SETUP_REQUEST, "MCCAOP Setup Request" }, { TAG_MCCAOP_SETUP_REPLY, "MCCAOP SETUP Reply" }, - { TAG_MCCAOP_ADVERTISSEMENT, "MCCAOP Advertissement" }, + { TAG_MCCAOP_ADVERTISEMENT, "MCCAOP Advertisement" }, { TAG_MCCAOP_TEARDOWN, "MCCAOP Teardown" }, - { TAG_GANN, "Gate Announcemen" }, + { TAG_GANN, "Gate Announcement" }, { TAG_RANN, "Root Announcement" }, { TAG_EXTENDED_CAPABILITIES, "Extended Capabilities" }, { TAG_AGERE_PROPRIETARY, "Agere Proprietary" }, @@ -795,9 +795,9 @@ { TAG_CISCO_CCX3, "Cisco Unknown 95" }, { TAG_CISCO_UNKNOWN_96, "Cisco Unknown 96" }, { TAG_SYMBOL_PROPRIETARY, "Symbol Proprietary" }, - { TAG_MCCAOP_ADVERTISSEMENT_OV, "MCCAOP Advertissement Overviw" }, - { TAG_VHT_CAPABILITY, "VHT Capabilities (IEEE Stc 802.11ac/D3.1)" }, - { TAG_VHT_OPERATION, "VHT Operation (IEEE Stc 802.11ac/D3.1)" }, + { TAG_MCCAOP_ADVERTISEMENT_OV, "MCCAOP Advertisement Overview" }, + { TAG_VHT_CAPABILITY, "VHT Capabilities (IEEE Std 802.11ac/D3.1)" }, + { TAG_VHT_OPERATION, "VHT Operation (IEEE Std 802.11ac/D3.1)" }, { TAG_VENDOR_SPECIFIC_IE, "Vendor Specific" }, { 0, NULL } }; @@ -1097,7 +1097,7 @@ { 4, "Controlled Load (Video)" }, { 5, "Video (Video)" }, { 6, "Voice (Voice)" }, - { 7, "Netowrk Control (Voice)" }, + { 7, "Network Control (Voice)" }, { 0, NULL } }; @@ -10196,13 +10196,13 @@ cap_item = proto_tree_add_item(tree, hf_ieee80211_htex_cap, tvb, offset, 2, ENC_LITTLE_ENDIAN); } cap_tree = proto_item_add_subtree(cap_item, ett_htex_cap_tree); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_pco, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_transtime, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; - proto_tree_add_item(cap_tree, hf_ieee80211_htex_mcs, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_htc_support, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_rd_responder, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; + proto_tree_add_item(cap_tree, hf_ieee80211_htex_pco, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_htex_transtime, tvb, offset, 2, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_htex_mcs, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_htex_htc_support, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_htex_rd_responder, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; /* 4 byte TxBF capabilities */ @@ -10213,33 +10213,30 @@ cap_item = proto_tree_add_item(tree, hf_ieee80211_txbf, tvb, offset, 4, ENC_LITTLE_ENDIAN); } cap_tree = proto_item_add_subtree(cap_item, ett_txbf_tree); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_cap, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ssc, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ssc, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ndp, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ndp, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_impl_txbf, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_calib, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; - - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_csi, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_bf_csi, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm_feed, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm_feed, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 1; - - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_min_group, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_num_bf_ant, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_uncomp_sm_bf_ant, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_comp_sm_bf_ant, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 1; - - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_max_rows_bf, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_chan_est, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_resrv, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_cap, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ssc, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ssc, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ndp, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ndp, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_impl_txbf, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_calib, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_csi, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_bf_csi, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm_feed, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm_feed, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_min_group, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_num_bf_ant, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_uncomp_sm_bf_ant, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_comp_sm_bf_ant, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_max_rows_bf, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_chan_est, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_resrv, tvb, offset, 4, ENC_LITTLE_ENDIAN); + offset += 4; /* 1 byte Antenna Selection (ASEL) capabilities */ if (vs) @@ -11692,6 +11689,12 @@ /* TODO */ case 9: /* Transmit Stream Measurement Request */ /* TODO */ + case 10: /* Multicast diagnostics request */ + /* TODO */ + case 11: /* Location Civic request */ + /* TODO */ + case 12: /* Location Identifier request */ + /* TODO */ case 255: /* Measurement Pause Request*/ /* TODO */ default: /* unknown */ @@ -11939,6 +11942,12 @@ /* TODO */ case 9: /* Transmit Stream Measurement Report */ /* TODO */ + case 10: /* Multicast diagnostics Report */ + /* TODO */ + case 11: /* Location Civic Report */ + /* TODO */ + case 12: /* Location Identifier Report */ + /* TODO */ default: /* unknown */ break; } @@ -17320,12 +17329,12 @@ {&hf_ieee80211_txbf, {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", - FT_UINT16, BASE_HEX, NULL, 0, + FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, {&hf_ieee80211_txbf_vs, {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf", - FT_UINT16, BASE_HEX, NULL, 0, + FT_UINT32, BASE_HEX, NULL, 0, "Vendor Specific Transmit Beam Forming (TxBF) Capabilities", HFILL }}, {&hf_ieee80211_txbf_cap, @@ -20700,18 +20709,18 @@ }; module_t *wlan_module; - memset (&wlan_stats, 0, sizeof wlan_stats); + memset(&wlan_stats, 0, sizeof wlan_stats); proto_aggregate = proto_register_protocol("IEEE 802.11 wireless LAN aggregate frame", "IEEE 802.11 Aggregate Data", "wlan_aggregate"); proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields)); - proto_wlan = proto_register_protocol ("IEEE 802.11 wireless LAN", + proto_wlan = proto_register_protocol("IEEE 802.11 wireless LAN", "IEEE 802.11", "wlan"); - proto_register_field_array (proto_wlan, hf, array_length (hf)); + proto_register_field_array(proto_wlan, hf, array_length (hf)); - proto_wlan_mgt = proto_register_protocol ("IEEE 802.11 wireless LAN management frame", - "802.11 MGT", "wlan_mgt"); + proto_wlan_mgt = proto_register_protocol("IEEE 802.11 wireless LAN management frame", + "IEEE 802.11 MGT", "wlan_mgt"); proto_register_field_array (proto_wlan_mgt, ff, array_length (ff)); proto_register_subtree_array (tree_array, array_length (tree_array));

@@ -99,9 +99,6 @@ static gint ett_eoib = -1; static gint ett_link = -1; -/* Global ref to highest level tree should we find other protocols encapsulated in IB */ -static proto_tree *top_tree = NULL; - /* Dissector Declarations */ static dissector_handle_t ipv6_handle; static dissector_handle_t data_handle; @@ -136,7 +133,7 @@ /* Parsing Methods for specific IB headers. */ static void parse_VENDOR(proto_tree *, tvbuff_t *, gint *); -static void parse_PAYLOAD(proto_tree *, packet_info *, tvbuff_t *, gint *, gint length); +static void parse_PAYLOAD(proto_tree *, packet_info *, tvbuff_t *, gint *, gint length, proto_tree *); static void parse_IETH(proto_tree *, tvbuff_t *, gint *); static void parse_IMMDT(proto_tree *, tvbuff_t *, gint *offset); static void parse_ATOMICACKETH(proto_tree *, tvbuff_t *, gint *offset); @@ -146,8 +143,8 @@ static void parse_DETH(proto_tree *, packet_info *, tvbuff_t *, gint *offset); static void parse_RDETH(proto_tree *, tvbuff_t *, gint *offset); static void parse_IPvSix(proto_tree *, tvbuff_t *, gint *offset, packet_info *); -static void parse_RWH(proto_tree *, tvbuff_t *, gint *offset, packet_info *); -static gboolean parse_EoIB(proto_tree *, tvbuff_t *, gint offset, packet_info *); +static void parse_RWH(proto_tree *, tvbuff_t *, gint *offset, packet_info *, proto_tree *); +static gboolean parse_EoIB(proto_tree *, tvbuff_t *, gint offset, packet_info *, proto_tree *); static void parse_SUBN_LID_ROUTED(proto_tree *, packet_info *, tvbuff_t *, gint *offset); static void parse_SUBN_DIRECTED_ROUTE(proto_tree *, packet_info *, tvbuff_t *, gint *offset); @@ -309,14 +306,14 @@ /* RMPP Types */ -#define RMPP_ILLEGAL 0 +#define RMPP_NOT_USED 0 #define RMPP_DATA 1 #define RMPP_ACK 2 #define RMPP_STOP 3 #define RMPP_ABORT 4 static const value_string RMPP_Packet_Types[] = { - { RMPP_ILLEGAL, " Illegal RMPP Type (0)! " }, + { RMPP_NOT_USED, " Not an RMPP Packet " }, { RMPP_DATA, "RMPP (DATA)" }, { RMPP_ACK, "RMPP (ACK)" }, { RMPP_STOP, "RMPP (STOP)" }, @@ -1634,28 +1631,6 @@ col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand"); col_clear(pinfo->cinfo, COL_INFO); - /* Get the parent tree from the ERF dissector. We don't want to nest under ERF */ - if (tree && tree->parent) - { - /* Set the normal tree outside of ERF */ - tree = tree->parent; - /* Set a global reference for nested protocols */ - top_tree = tree; - } - - /* The "quick-dissection" code in dissect_general_info skips lots of the recently-added code - for saving context etc. It is no longer viable to maintain two code branches, so we have - (temporarily?) disabled the second one. All dissection now goes through the full branch, - using a NULL tree pointer if this is not a full dissection call. Take care not to dereference - the tree pointer or any subtree pointers you create using it and you'll be fine. */ - if (0 && !tree) - { - /* If no packet details are being dissected, extract some high level info for the packet view */ - /* Assigns column values rather than full tree population */ - dissect_general_info(tvb, offset, pinfo, starts_with_grh); - return; - } - /* Top Level Packet */ infiniband_packet = proto_tree_add_item(tree, proto_infiniband, tvb, offset, -1, ENC_NA); @@ -1804,7 +1779,7 @@ parse_IPvSix(all_headers_tree, tvb, &offset, pinfo); break; case RAW: - parse_RWH(all_headers_tree, tvb, &offset, pinfo); + parse_RWH(all_headers_tree, tvb, &offset, pinfo, tree); break; default: /* Unknown Packet */ @@ -1836,7 +1811,7 @@ packetLength -= 4; /* RDETH */ packetLength -= 8; /* DETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_RETH_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1847,7 +1822,7 @@ packetLength -= 8; /* DETH */ packetLength -= 16; /* RETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_IMMDT_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1858,7 +1833,7 @@ packetLength -= 8; /* DETH */ packetLength -= 4; /* IMMDT */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_RETH_IMMDT_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1871,7 +1846,7 @@ packetLength -= 16; /* RETH */ packetLength -= 4; /* IMMDT */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_RETH: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1890,14 +1865,14 @@ packetLength -= 4; /* RDETH */ packetLength -= 4; /* AETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); packetLength -= 4; /* RDETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_AETH: parse_AETH(all_headers_tree, tvb, &offset); @@ -1941,25 +1916,25 @@ packetLength -= 8; /* DETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case PAYLD: - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case IMMDT_PAYLD: parse_IMMDT(all_headers_tree, tvb, &offset); packetLength -= 4; /* IMMDT */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RETH_PAYLD: parse_RETH(all_headers_tree, tvb, &offset); packetLength -= 16; /* RETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RETH: parse_RETH(all_headers_tree, tvb, &offset); @@ -1972,7 +1947,7 @@ packetLength -= 4; /* AETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case AETH: parse_AETH(all_headers_tree, tvb, &offset); @@ -1999,7 +1974,7 @@ packetLength -= 4; /* IETH */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case DETH_IMMDT_PAYLD: parse_DETH(all_headers_tree, pinfo, tvb, &offset); @@ -2008,7 +1983,7 @@ packetLength -= 8; /* DETH */ packetLength -= 4; /* IMMDT */ - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; default: parse_VENDOR(all_headers_tree, tvb, &offset); @@ -2067,22 +2042,9 @@ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(operand, Operand_Description, "Unknown (0x%1x)")); - /* Get the parent tree from the ERF dissector. We don't want to nest under ERF */ - if (tree && tree->parent) - { - /* Set the normal tree outside of ERF */ - tree = tree->parent; - /* Set a global reference for nested protocols */ - top_tree = tree; - } - - if (!tree) - { - /* If no packet details are being dissected, extract some high level info for the packet view */ - /* Assigns column values rather than full tree population */ - dissect_general_info(tvb, offset, pinfo, FALSE); - return; - } + /* If no packet details are being dissected, extract some high level info for the packet view */ + /* Assigns column values rather than full tree population */ + dissect_general_info(tvb, offset, pinfo, FALSE); /* Top Level Packet */ infiniband_link_packet = proto_tree_add_item(tree, proto_infiniband_link, tvb, offset, -1, ENC_NA); @@ -2385,8 +2347,9 @@ * IN: pinfo - packet info from wireshark * IN: tvb - the data buffer from wireshark * IN/OUT: offset - The current and updated offset -* IN: length - Length of Payload */ -static void parse_PAYLOAD(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offset, gint length) +* IN: length - Length of Payload +* IN: top_tree - parent tree of Infiniband dissector */ +static void parse_PAYLOAD(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offset, gint length, proto_tree *top_tree) { gint local_offset = *offset; /* Payload - Packet Payload */ @@ -2485,7 +2448,7 @@ if (pref_dissect_eoib && (transport_type == TRANSPORT_UD) && (tvb_get_bits8(tvb, local_offset*8, 4) == 0xC)) { - dissector_found = parse_EoIB(parentTree, tvb, local_offset, pinfo); + dissector_found = parse_EoIB(parentTree, tvb, local_offset, pinfo, top_tree); } /* IBA packet data could be anything in principle, however it is common @@ -2588,7 +2551,7 @@ } - /*parse_RWH(parentTree, tvb, &local_offset, pinfo);*/ + /*parse_RWH(parentTree, tvb, &local_offset, pinfo, top_tree);*/ /* Will contain ICRC and VCRC = 4+2 */ local_offset = tvb_reported_length(tvb) - 6; @@ -2638,8 +2601,9 @@ * IN: parentTree to add the dissection to - in this code the all_headers_tree * IN: tvb - the data buffer from wireshark * IN/OUT: The current and updated offset -* IN: pinfo - packet info from wireshark */ -static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_info *pinfo) +* IN: pinfo - packet info from wireshark +* IN: top_tree - parent tree of Infiniband dissector */ +static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_tree *top_tree) { guint16 ether_type; tvbuff_t *next_tvb; @@ -2693,8 +2657,9 @@ * IN: parentTree to add the dissection to - in this code the all_headers_tree * IN: tvb - the data buffer from wireshark * IN: The current offset -* IN: pinfo - packet info from wireshark */ -static gboolean parse_EoIB(proto_tree *tree, tvbuff_t *tvb, gint offset, packet_info *pinfo) +* IN: pinfo - packet info from wireshark +* IN: top_tree - parent tree of Infiniband dissector */ +static gboolean parse_EoIB(proto_tree *tree, tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *top_tree) { proto_item *header_item; proto_tree *header_subtree; @@ -2861,8 +2826,8 @@ SUBNADMN_header_tree = proto_item_add_subtree(SUBNADMN_header_item, ett_subnadmin); proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_sm_key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 4; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_component_mask, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; label_SUBA_Method(SUBNADMN_header_item, &MadData, pinfo); @@ -3381,7 +3346,7 @@ proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_status, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; switch (RMPP_Type) { - case RMPP_ILLEGAL: + case RMPP_NOT_USED: proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data1, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data2, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; break;

@@ -403,7 +403,6 @@ offset += advance; goto again; case IP_PROTO_SHIM6: - case IP_PROTO_SHIM6_OLD: if (!BYTES_ARE_IN_FRAME(offset, len, 2)) { ld->other++; return; @@ -1992,7 +1991,6 @@ goto again; case IP_PROTO_SHIM6: - case IP_PROTO_SHIM6_OLD: shim6 = TRUE; advance = dissect_shim6(tvb, offset, ipv6_tree, pinfo); nxt = tvb_get_guint8(tvb, offset);

@@ -363,8 +363,7 @@ { 0x01, "Attempted successfully: results not used to generate location - not used." }, { 0x02, "Attempted successfully: results used to verify but not generate location - not used." }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" }, @@ -399,8 +398,7 @@ { 0x01, "Attempted successfully: results not used to generate location" }, { 0x02, "Attempted successfully: results used to verify but not generate location" }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" }, @@ -2220,7 +2218,7 @@ /*--- End of included file: packet-lcsap-fn.c ---*/ -#line 197 "../../asn1/lcsap/packet-lcsap-template.c" +#line 195 "../../asn1/lcsap/packet-lcsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -2320,7 +2318,7 @@ /*--- End of included file: packet-lcsap-dis-tab.c ---*/ -#line 258 "../../asn1/lcsap/packet-lcsap-template.c" +#line 256 "../../asn1/lcsap/packet-lcsap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, lcsap_handle); @@ -2802,7 +2800,7 @@ "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-lcsap-hfarr.c ---*/ -#line 303 "../../asn1/lcsap/packet-lcsap-template.c" +#line 301 "../../asn1/lcsap/packet-lcsap-template.c" }; /* List of subtrees */ @@ -2858,7 +2856,7 @@ &ett_lcsap_UnsuccessfulOutcome, /*--- End of included file: packet-lcsap-ettarr.c ---*/ -#line 309 "../../asn1/lcsap/packet-lcsap-template.c" +#line 307 "../../asn1/lcsap/packet-lcsap-template.c" }; module_t *lcsap_module;

@@ -18688,7 +18688,16 @@ case SI_OrPSI_GERAN_si: /* SI message */ if (gsm_a_dtap_handle) { - call_dissector(gsm_a_dtap_handle, sys_info_list_tvb, actx->pinfo, subtree); + tvbuff_t *si_tvb = tvb_new_composite(); + guint8 *pd = (guint8 *)g_malloc(1); + tvbuff_t *pd_tvb = tvb_new_child_real_data(sys_info_list_tvb, pd, 1, 1); + tvb_set_free_cb(pd_tvb, g_free); + pd[0] = 0x06; + tvb_composite_append(si_tvb, pd_tvb); + tvb_composite_append(si_tvb, sys_info_list_tvb); + tvb_composite_finalize(si_tvb); + add_new_data_source(actx->pinfo, si_tvb, "System Information"); + call_dissector(gsm_a_dtap_handle, si_tvb, actx->pinfo, subtree); } break; case SI_OrPSI_GERAN_psi:

@@ -513,7 +513,7 @@ { 10, "36 < BS <= 42"}, { 11, "42 < BS <= 49"}, { 12, "49 < BS <= 57"}, - { 13, "47 < BS <= 67"}, + { 13, "57 < BS <= 67"}, { 14, "67 < BS <= 78"}, { 15, "78 < BS <= 91"}, { 16, "91 < BS <= 107"},

@@ -147,7 +147,7 @@ { dissector_handle_t peekremote_handle; - ieee80211_handle = find_dissector("wlan_datapad"); + ieee80211_handle = find_dissector("wlan"); peekremote_handle = create_dissector_handle(dissect_peekremote, proto_peekremote); dissector_add_uint("udp.port", 5000, peekremote_handle);

@@ -879,8 +879,9 @@ /* * Update the conversation data. */ - /* Free the hash if already exists */ - rtp_free_hash_dyn_payload(p_conv_data->rtp_dyn_payload); + /* Free the hash if a different one already exists */ + if (p_conv_data->rtp_dyn_payload != rtp_dyn_payload) + rtp_free_hash_dyn_payload(p_conv_data->rtp_dyn_payload); g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_data->frame_number = setup_frame_number;

@@ -239,6 +239,8 @@ * We should probably handle offer/answer and session updates etc(SIP) quite possibly the whole handling of * seting up the RTP conversations should be done by the signaling protocol(s) calling the SDP dissector * and the SDP dissector just provide the relevant data. + * YES! packet-sdp.c should be about SDP parsing... SDP *state* needs to be maintained by upper + * protocols, because each one has different rules/semantics. */ guint encryption_algorithm; guint auth_algorithm; @@ -248,9 +250,10 @@ /* Data that is retrieved from a packet, but does not need to be kept */ typedef struct { - char *connection_address; + char *connection_address; /* there should actually be SDP_MAX_RTP_CHANNELS of these too */ char *connection_type; - char *media_type; + /* media_type is for 'audio', 'video', etc, so per-stream */ + char *media_type[SDP_MAX_RTP_CHANNELS]; char *media_port[SDP_MAX_RTP_CHANNELS]; char *media_proto[SDP_MAX_RTP_CHANNELS]; guint8 media_count; @@ -710,7 +713,7 @@ proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, offset, tokenlen, ENC_ASCII|ENC_NA); - media_info->media_type = (char*)tvb_get_ephemeral_string(tvb, offset, tokenlen); + media_info->media_type[media_info->media_count] = (char*)tvb_get_ephemeral_string(tvb, offset, tokenlen); offset = next_offset + 1; @@ -1601,7 +1604,7 @@ convert_disposable_media(transport_info_t* transport_info, disposable_media_info_t* media_info, gint start_transport_info_count) { - gint8 n, i, transport_index; + gint8 n, transport_index; guint proto_bitmask; for (n = 0; (n < media_info->media_count) && (n+start_transport_info_count < SDP_MAX_RTP_CHANNELS); n++) @@ -1619,6 +1622,7 @@ proto_bitmask = 0; /* Check if media protocol is RTP */ + /* XXX: what about 'RTP/AVPF' or RTP/SAVPF'? */ if (!strcmp(media_info->media_proto[n],"RTP/AVP")) { transport_info->proto_bitmask[transport_index] |= SDP_RTP_PROTO; proto_bitmask |= SDP_RTP_PROTO; @@ -1646,12 +1650,15 @@ proto_bitmask |= SDP_SPRT_PROTO; } + /* now check if this stream's port==0, in which case we need to disable its paired stream */ if (transport_info->media_port[transport_index] == 0) { - /* This will disable any ports that share the media */ - for (i = 0; i < transport_index; i++) { - if (proto_bitmask & transport_info->proto_bitmask[i]) { - transport_info->media_port[i] = 0; - } + /* This should disable the matching media session in the offer - it's a bit of a hack though, + basically start_transport_info_count is 0 for the offer, and >0 for the answer, so we + check that and if this is the answer, then we go set the offer's paired stream to 0. + If it turns out we got a port=0 in the offer, we don't care and it's ok to let the + answer have a non-port=0 (though that would be illegal per the RFCs). */ + if (start_transport_info_count > 0 && (proto_bitmask & transport_info->proto_bitmask[n])) { + transport_info->media_port[n] = 0; } } } @@ -1689,14 +1696,16 @@ transport_info->media_port[transport_index] = media_info->msrp_port_number; } - if ((media_info->media_type != NULL) && (strcmp(media_info->media_type, "video") == 0)) { + if ((media_info->media_type[transport_index] != NULL) && + (strcmp(media_info->media_type[transport_index], "video") == 0)) { transport_info->proto_bitmask[transport_index] |= SDP_VIDEO; } } } void -setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type exchange_type, int request_frame) +setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type exchange_type, + int request_frame, const gboolean delay) { gint offset = 0, next_offset, n; int linelen; @@ -1748,6 +1757,18 @@ if (transport_info->media_count > 0) start_transport_info_count = transport_info->media_count; + /* if we don't delay, and this is an answer after a previous offer, then + we free'd the unused media rtp_dyn_payload last time while processing + the offer, so we need to re-create them this time in case we need them. + If they don't get used they'll get free'd again later */ + if (!delay && (exchange_type == SDP_EXCHANGE_ANSWER_ACCEPT) && + (transport_info->sdp_status == SDP_EXCHANGE_OFFER)) { + for (n = start_transport_info_count; n < SDP_MAX_RTP_CHANNELS; n++) { + if (!transport_info->media[n].rtp_dyn_payload) + transport_info->media[n].rtp_dyn_payload = g_hash_table_new(g_int_hash, g_int_equal); + } + } + /* * Show the SDP message a line at a time. */ @@ -1815,6 +1836,18 @@ if (in_media_description) { /* Increase the count of media channels, but don't walk off the end of the arrays. */ + /* XXX: I don't know why this was done here - I'm keeping it here in case + * removing it causes problems, but it's wrong. transport_info->media_count + * is already incremented in the while() loop above. Incrementing it + * again here will cause bugs. The name of this is misleading, because + * 'transport_info->media_count' is actually an index, not count. + * In other words, it's a 0-based number, of the current rtp channel. + * So debug printing shows bogus rtp channels get created and then later + * removed because luckily it knows they were bogus. But it will cause bugs + * because if we're not delaying, then for the SDP_EXCHANGE_ANSWER_ACCEPT + * run through this function, it will add new RTP channels at a +1 index, + * which will likely cause problems. + */ if (transport_info->media_count < (SDP_MAX_RTP_CHANNELS-1)) transport_info->media_count++; if (media_info.media_count < (SDP_MAX_RTP_CHANNELS-1)) @@ -1827,8 +1860,8 @@ convert_disposable_media(transport_info, &media_info, start_transport_info_count); /* We have a successful negotiation, apply data to their respective protocols */ - if ((exchange_type == SDP_EXCHANGE_ANSWER_ACCEPT) && - (transport_info->sdp_status == SDP_EXCHANGE_OFFER)) { + if (!delay || ((exchange_type == SDP_EXCHANGE_ANSWER_ACCEPT) && + (transport_info->sdp_status == SDP_EXCHANGE_OFFER))) { for (n = 0; n <= transport_info->media_count; n++) { /* Add (s)rtp and (s)rtcp conversation, if available (overrides t38 if conversation already set) */ @@ -1845,11 +1878,13 @@ srtp_info->auth_tag_len = transport_info->auth_tag_len; } - srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, + /* srtp_add_address and rtp_add_address are given the request_frame's not this frame's number, + because that's where the RTP flow started, and thus conversation needs to check against */ + srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", request_frame, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload, srtp_info); } else { - rtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, + rtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", request_frame, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload); } @@ -1859,9 +1894,9 @@ } if (rtcp_handle) { if (transport_info->proto_bitmask[n] & SDP_SRTP_PROTO) { - srtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->fd->num, srtp_info); + srtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", request_frame, srtp_info); } else { - rtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->fd->num); + rtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", request_frame); } } } @@ -1930,7 +1965,7 @@ } } } - transport_info->sdp_status = SDP_EXCHANGE_ANSWER_ACCEPT; + transport_info->sdp_status = exchange_type; } else if ((exchange_type == SDP_EXCHANGE_ANSWER_REJECT) && (transport_info->sdp_status != SDP_EXCHANGE_ANSWER_REJECT)){ @@ -2186,7 +2221,7 @@ srtp_info->auth_algorithm = transport_info->auth_algorithm; srtp_info->mki_len = transport_info->mki_len; srtp_info->auth_tag_len = transport_info->auth_tag_len; - } + } srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload, srtp_info);

@@ -37,7 +37,7 @@ SDP_EXCHANGE_ANSWER_REJECT, }; -extern void setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type type, int request_frame); +extern void setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type type, int request_frame, const gboolean delay); /* Handles duplicate OFFER packets so they don't end up processed by dissect_sdp(). This can probably * be removed when all higher layer dissectors properly handle SDP themselves with setup_sdp_transport() */

@@ -794,6 +794,9 @@ */ static gboolean sip_retrans_the_same_sport = TRUE; +/* whether we hold off tracking RTP conversations until an SDP answer is received */ +static gboolean sip_delay_sdp_changes = FALSE; + /* Extension header subdissectors */ static dissector_table_t ext_hdr_subdissector_table; @@ -3184,15 +3187,15 @@ /* Resends don't count */ if (resend_for_packet == 0) { if (line_type == REQUEST_LINE) { - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->fd->num); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->fd->num, sip_delay_sdp_changes); } else if (line_type == STATUS_LINE) { if (stat_info->response_code >= 400) { /* SIP client request failed, so SDP offer should fail */ - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response, sip_delay_sdp_changes); } else if ((stat_info->response_code >= 200) && (stat_info->response_code <= 299)) { /* SIP success request, so SDP offer should be accepted */ - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response, sip_delay_sdp_changes); } } } else { @@ -3200,6 +3203,8 @@ } } + /* XXX: why is this called even if setup_sdp_transport() was called before? That will + parse the SDP a second time, for 'application/sdp' media MIME bodies */ found_match = dissector_try_string(media_type_dissector_table, media_type_str_lower_case, next_tvb, pinfo, @@ -5219,6 +5224,13 @@ "Retransmissions always use the same source port", "Whether retransmissions are detected coming from the same source port only.", &sip_retrans_the_same_sport); + prefs_register_bool_preference(sip_module, "delay_sdp_changes", + "Delay SDP changes for tracking media", + "Whether SIP should delay tracking the media (e.g., RTP/RTCP) until an SDP offer " + "is answered. If enabled, mid-dialog changes to SDP and media state only take " + "effect if and when an SDP offer is successfully answered; however enabling this " + "prevents tracking media in early-media call scenarios", + &sip_delay_sdp_changes); prefs_register_obsolete_preference(sip_module, "tcp.port");

@@ -2235,8 +2235,10 @@ } /* Call the sub dissector if present, and not already called */ - if (is_subdissector) + if (is_subdissector) { call_dissector(subdissector_handle, tvb, actx->pinfo, tree); + col_set_fence(actx->pinfo->cinfo, COL_INFO); + } return offset; }

@@ -3994,7 +3994,7 @@ } tb_bit_off = (2+p_conv_data->num_dch_in_flow)*8; /*Point to the C/T of first TB*/ /*Set configuration for individual blocks*/ - for(j=0; j < num_tbs; j++){ + for(j=0; j < num_tbs && j+chan < MAX_MAC_FRAMES; j++){ /*Set transport channel id (useful for debugging)*/ macinf->trchid[j+chan] = p_conv_data->dchs_in_flow_list[chan];

@@ -37,6 +37,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* + * XXX We should probably parse a USB ID file at program start instead + * of generating this file. + */ + #include "config.h" #include <epan/packet.h> @@ -45,7 +50,7 @@ { 0x0002, "Ingram" }, { 0x0003, "Club Mac" }, { 0x0004, "Nebraska Furniture Mart" }, - { 0x0011, "Unknown manufacturer" }, + { 0x0011, "Unknown" }, { 0x0053, "Planex" }, { 0x0079, "DragonRise Inc." }, { 0x0105, "Trust International B.V." }, @@ -982,6 +987,7 @@ { 0x088c, "Swecoin AB" }, { 0x088e, "iLok" }, { 0x0892, "DioGraphy, Inc." }, + { 0x0894, "TSI Incorporated" }, { 0x0897, "Lauterbach" }, { 0x089c, "United Technologies Research Cntr." }, { 0x089d, "Icron Technologies Corp." }, @@ -992,6 +998,7 @@ { 0x08a8, "Andrea Electronics" }, { 0x08a9, "CWAV Inc." }, { 0x08ae, "Macally (Mace Group, Inc.)" }, + { 0x08b0, "Metrohm" }, { 0x08b4, "Sorenson Vision, Inc." }, { 0x08b7, "NATSU" }, { 0x08b8, "J. Gordon Electronic Design, Inc." }, @@ -1103,7 +1110,7 @@ { 0x095b, "Medialogic Corp." }, { 0x095c, "K-Tec Electronics" }, { 0x095d, "Polycom, Inc." }, - { 0x0967, "Acer (?)" }, + { 0x0967, "Acer NeWeb Corp." }, { 0x0968, "Catalyst Enterprises, Inc." }, { 0x096e, "Feitian Technologies, Inc." }, { 0x0971, "Gretag-Macbeth AG" }, @@ -1190,6 +1197,7 @@ { 0x0a05, "Unknown Manufacturer" }, { 0x0a07, "Ontrak Control Systems Inc." }, { 0x0a0b, "Cybex Computer Products Co." }, + { 0x0a0d, "Servergy, Inc" }, { 0x0a11, "Xentec, Inc." }, { 0x0a12, "Cambridge Silicon Radio, Ltd" }, { 0x0a13, "Telebyte, Inc." }, @@ -1214,6 +1222,7 @@ { 0x0a46, "Davicom Semiconductor, Inc." }, { 0x0a47, "Hirose Electric" }, { 0x0a48, "I/O Interconnect" }, + { 0x0a4a, "Ploytec GmbH" }, { 0x0a4b, "Fujitsu Media Devices, Ltd" }, { 0x0a4c, "Computex Co., Ltd" }, { 0x0a4d, "Evolution Electronics, Ltd" }, @@ -1304,6 +1313,7 @@ { 0x0af6, "Silver I Co., Ltd" }, { 0x0af7, "B2C2, Inc." }, { 0x0af9, "Hama, Inc." }, + { 0x0afa, "DMC Co., Ltd." }, { 0x0afc, "Zaptronix Ltd" }, { 0x0afd, "Tateno Dennou, Inc." }, { 0x0afe, "Cummins Engine Co." }, @@ -1684,6 +1694,7 @@ { 0x0db3, "Tekram Technology Co., Ltd" }, { 0x0db4, "Chung Fu Chen Yeh Enterprise Corp." }, { 0x0db7, "ELCON Systemtechnik" }, + { 0x0dba, "Digidesign" }, { 0x0dbc, "A&D Medical" }, { 0x0dbe, "Jiuh Shiuh Precision Industry Co., Ltd" }, { 0x0dbf, "Jess-Link International" }, @@ -1794,6 +1805,7 @@ { 0x0eb3, "Saint Technology Corp." }, { 0x0eb7, "Endor AG" }, { 0x0eb8, "Mettler Toledo" }, + { 0x0ebb, "Thermo Fisher Scientific" }, { 0x0ebe, "VWeb Corp." }, { 0x0ebf, "Omega Technology of Taiwan, Inc." }, { 0x0ec0, "LHI Technology (China) Co., Ltd" }, @@ -1839,6 +1851,7 @@ { 0x0f11, "LD Didactic GmbH" }, { 0x0f12, "Mars Engineering Corp." }, { 0x0f13, "Acetek Technology Co., Ltd" }, + { 0x0f14, "Ingenico" }, { 0x0f18, "Finger Lakes Instrumentation" }, { 0x0f19, "Oracom Co., Ltd" }, { 0x0f1b, "Onset Computer Corp." }, @@ -1856,6 +1869,7 @@ { 0x0f32, "YFC-BonEagle Electric Co., Ltd" }, { 0x0f37, "Kokuyo Co., Ltd" }, { 0x0f38, "Nien-Yi Industrial Corp." }, + { 0x0f39, "TG3 Electronics" }, { 0x0f3d, "Airprime, Incorporated" }, { 0x0f41, "RDC Semiconductor Co., Ltd" }, { 0x0f42, "Nital Consulting Services, Inc." }, @@ -1880,6 +1894,7 @@ { 0x0f6a, "Vibren Technologies, Inc." }, { 0x0f6e, "INTELLIGENT SYSTEMS" }, { 0x0f73, "DFI" }, + { 0x0f78, "Guntermann & Drunck GmbH" }, { 0x0f7c, "DQ Technology, Inc." }, { 0x0f7d, "NetBotz, Inc." }, { 0x0f7e, "Fluke Corp." }, @@ -1922,6 +1937,7 @@ { 0x0fd9, "Elgato Systems GmbH" }, { 0x0fda, "Quantec Networks GmbH" }, { 0x0fdc, "Micro Plus" }, + { 0x0fde, "Oregon Scientific" }, { 0x0fe0, "Osterhout Design Group" }, { 0x0fe4, "IN-Tech Electronics, Ltd" }, { 0x0fe5, "Greenconn (U.S.A.), Inc." }, @@ -1971,7 +1987,7 @@ { 0x1031, "Comax Technology, Inc." }, { 0x1032, "C-One Technology Corp." }, { 0x1033, "Nucam Corp." }, - { 0x1038, "Ideazon, Inc." }, + { 0x1038, "SteelSeries ApS" }, { 0x1039, "devolo AG" }, { 0x103d, "Stanton" }, { 0x1043, "iCreate Technologies Corp." }, @@ -2016,6 +2032,7 @@ { 0x108e, "Lotes Co., Ltd." }, { 0x1099, "Surface Optics Corp." }, { 0x109a, "DATASOFT Systems GmbH" }, + { 0x109b, "Hisense" }, { 0x109f, "eSOL Co., Ltd" }, { 0x10a0, "Hirotech, Inc." }, { 0x10a3, "Mitsubishi Materials Corp." }, @@ -2031,6 +2048,7 @@ { 0x10bc, "Dinging Technology Co., Ltd" }, { 0x10bd, "TMT Technology, Inc." }, { 0x10bf, "SmartHome" }, + { 0x10c3, "Universal Laser Systems, Inc." }, { 0x10c4, "Cygnal Integrated Products, Inc." }, { 0x10c5, "Sanei Electric, Inc." }, { 0x10c6, "Intec, Inc." }, @@ -2115,7 +2133,9 @@ { 0x11ab, "Exito Electronics Co., Ltd" }, { 0x11ac, "Nike" }, { 0x11b0, "ATECH FLASH TECHNOLOGY" }, + { 0x11be, "R&D International NV" }, { 0x11c5, "Inmax" }, + { 0x11ca, "VeriFone Inc" }, { 0x11db, "Topfield Co., Ltd." }, { 0x11e6, "K.I. Technology Co. Ltd." }, { 0x11f5, "Siemens AG" }, @@ -2132,7 +2152,7 @@ { 0x1230, "Chipidea-Microelectronica, S.A." }, { 0x1233, "Denver Electronics" }, { 0x1234, "Brain Actuated Technologies" }, - { 0x1235, "Novation EMS" }, + { 0x1235, "Focusrite-Novation" }, { 0x1241, "Belkin" }, { 0x124a, "AirVast" }, { 0x124b, "Nyko (Honey Bee)" }, @@ -2163,10 +2183,12 @@ { 0x12b9, "E28" }, { 0x12ba, "Licensed by Sony Computer Entertainment America" }, { 0x12c4, "Autocue Group Ltd" }, + { 0x12cf, "DEXIN" }, { 0x12d1, "Huawei Technologies Co., Ltd." }, { 0x12d2, "LINE TECH INDUSTRIAL CO., LTD." }, { 0x12d6, "EMS Dr. Thomas Wuensche" }, { 0x12d7, "BETTER WIRE FACTORY CO., LTD." }, + { 0x12d8, "Araneus Information Systems Oy" }, { 0x12e6, "Waldorf Music GmbH" }, { 0x12ef, "Tapwave, Inc." }, { 0x12f5, "Dynamic System Electronics Corp." }, @@ -2182,6 +2204,7 @@ { 0x132a, "Envara Inc." }, { 0x132b, "Konica Minolta" }, { 0x1342, "Mobility" }, + { 0x1343, "Citizen Systems" }, { 0x1345, "Sino Lite Technology Corp." }, { 0x1347, "Moravian Instruments" }, { 0x1348, "Katsuragawa Electric Co., Ltd." }, @@ -2233,6 +2256,7 @@ { 0x1410, "Novatel Wireless" }, { 0x1415, "Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc." }, { 0x1419, "ABILITY ENTERPRISE CO., LTD." }, + { 0x1421, "Sensor Technology" }, { 0x1429, "Vega Technologies Industrial (Austria) Co." }, { 0x142a, "Thales E-Transactions" }, { 0x142b, "Arbiter Systems, Inc." }, @@ -2279,6 +2303,7 @@ { 0x14dd, "Raritan Computer, Inc." }, { 0x14e0, "WiNRADiO Communications" }, { 0x14e1, "Dialogue Technology Corp." }, + { 0x14e4, "Broadcom Corp." }, { 0x14e5, "SAIN Information & Communications Co., Ltd." }, { 0x14ea, "Planex Communications" }, { 0x14ed, "Shure Inc." }, @@ -2290,6 +2315,7 @@ { 0x1514, "Actel" }, { 0x1516, "CompUSA" }, { 0x1518, "Cheshire Engineering Corp." }, + { 0x1519, "Comneon" }, { 0x1520, "Bitwire Corp." }, { 0x1524, "ENE Technology Inc" }, { 0x1527, "Silicon Portals" }, @@ -2298,6 +2324,7 @@ { 0x152d, "JMicron Technology Corp. / JMicron USA Technology Corp." }, { 0x152e, "LG (HLDS)" }, { 0x1532, "Razer USA, Ltd" }, + { 0x153b, "TerraTec Electronic GmbH" }, { 0x1546, "U-Blox AG" }, { 0x1547, "SG Intec Ltd & Co KG" }, { 0x154a, "Celectronic GmbH" }, @@ -2390,6 +2417,7 @@ { 0x16ca, "Wireless Cables, Inc." }, { 0x16cc, "silex technology, Inc." }, { 0x16d0, "MCS" }, + { 0x16d1, "Suprema Inc." }, { 0x16d3, "Frontline Test Equipment, Inc." }, { 0x16d5, "AnyDATA Corporation" }, { 0x16d6, "JABLOCOM s.r.o." }, @@ -2402,14 +2430,18 @@ { 0x1707, "ARTIMI" }, { 0x170b, "Swissonic" }, { 0x170d, "Avnera" }, + { 0x1711, "Leica Microsystems" }, + { 0x1724, "Meyer Instruments (MIS)" }, { 0x1725, "Vitesse Semiconductor" }, { 0x1726, "Axesstel, Inc." }, { 0x172f, "Waltop International Corp." }, { 0x1733, "Cellink Technology Co., Ltd" }, { 0x1736, "CANON IMAGING SYSTEM TECHNOLOGIES INC." }, { 0x1737, "Linksys" }, + { 0x173d, "QSENN" }, { 0x1740, "Senao" }, { 0x1743, "General Atomics" }, + { 0x1748, "MQP Electronics" }, { 0x174c, "ASMedia Technology Inc." }, { 0x174f, "Syntek" }, { 0x1753, "GERTEC Telecomunicacoes Ltda." }, @@ -2669,7 +2701,7 @@ { 0x1c79, "Unigen Corporation" }, { 0x1c7a, "LighTuning Technology Inc." }, { 0x1c7b, "LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD." }, - { 0x1c83, "Schom\\xc3\\xa4cker GmbH" }, + { 0x1c83, "Schomaecker GmbH" }, { 0x1c87, "2N TELEKOMUNIKACE a.s." }, { 0x1c88, "Somagic, Inc." }, { 0x1c89, "HONGKONG WEIDIDA ELECTRON LIMITED" }, @@ -2964,6 +2996,7 @@ { 0x03eb210d, "XPLAIN evaluation kit (CDC ACM)" }, { 0x03eb2110, "AVR JTAGICE3 Debugger and Programmer" }, { 0x03eb2122, "XMEGA-A1 Explained evaluation kit" }, + { 0x03eb2141, "ICE debugger" }, { 0x03eb2310, "EVK11xx evaluation board" }, { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" }, { 0x03eb2ff0, "atmega32u2 DFU bootloader" }, @@ -3020,6 +3053,7 @@ { 0x03f0011d, "Bluetooth 1.2 Interface [Broadcom BCM2035]" }, { 0x03f00121, "HP49g+ Calculator" }, { 0x03f00122, "HID Internet Keyboard" }, + { 0x03f00139, "Barcode Scanner 4430" }, { 0x03f00201, "ScanJet 6200c" }, { 0x03f00202, "PhotoSmart S20" }, { 0x03f00204, "DeskJet 815c" }, @@ -3129,6 +3163,7 @@ { 0x03f01512, "Printing Support" }, { 0x03f01517, "color LaserJet 3500" }, { 0x03f01524, "Smart Card Keyboard - KR" }, + { 0x03f01539, "Mini Magnetic Stripe Reader" }, { 0x03f01602, "PhotoSmart 330 series" }, { 0x03f01604, "DeskJet 940c" }, { 0x03f01605, "ScanJet 5530C PhotoSmart" }, @@ -3166,6 +3201,7 @@ { 0x03f01c17, "Color LaserJet 2550l" }, { 0x03f01d02, "PhotoSmart A310 series" }, { 0x03f01d17, "LaserJet 1320" }, + { 0x03f01d24, "Barcode scanner" }, { 0x03f01e02, "PhotoSmart A320 Printer series" }, { 0x03f01e11, "PSC-950" }, { 0x03f01e17, "LaserJet 1160 series" }, @@ -3180,6 +3216,7 @@ { 0x03f02005, "ScanJet 3570c" }, { 0x03f02012, "OfficeJet Pro K5400" }, { 0x03f0201d, "un2400 Gobi Wireless Modem (QDL mode)" }, + { 0x03f02039, "Cashdrawer" }, { 0x03f02102, "PhotoSmart 7345" }, { 0x03f02104, "DeskJet 630c" }, { 0x03f02112, "OfficeJet Pro L7500" }, @@ -3204,7 +3241,7 @@ { 0x03f02502, "PhotoSmart 7700 series" }, { 0x03f02504, "DeskJet F4200 series" }, { 0x03f02505, "ScanJet 3770" }, - { 0x03f02512, "OfficeJet Pro L7300" }, + { 0x03f02512, "OfficeJet Pro L7300 / Compaq LA2405 series monitor" }, { 0x03f02514, "4-port hub" }, { 0x03f02517, "LaserJet 2410" }, { 0x03f0251d, "Gobi 2000 Wireless Modem" }, @@ -3217,6 +3254,7 @@ { 0x03f02702, "PhotoSmart A620 series" }, { 0x03f02704, "DeskJet 915" }, { 0x03f02717, "Color LaserJet 2830" }, + { 0x03f02724, "Magnetic Stripe Reader IDRA-334133-HP" }, { 0x03f02811, "PSC-2100" }, { 0x03f02817, "Color LaserJet 2840" }, { 0x03f02902, "PhotoSmart A820 series" }, @@ -3343,6 +3381,7 @@ { 0x03f05811, "PhotoSmart C5100 series" }, { 0x03f05817, "LaserJet M1319f MFP" }, { 0x03f05911, "PhotoSmart C6180" }, + { 0x03f05912, "Officejet Pro 8600" }, { 0x03f05a11, "PhotoSmart C7100 series" }, { 0x03f05b11, "OfficeJet J2100 series" }, { 0x03f05c11, "PhotoSmart C4200 Printer series" }, @@ -3381,6 +3420,7 @@ { 0x03f06b02, "HP PhotoSmart 707" }, { 0x03f06b11, "Photosmart C4500 series" }, { 0x03f06c02, "HP PhotoSmart 733" }, + { 0x03f06c11, "Photosmart C4480" }, { 0x03f06c17, "Color LaserJet 4610" }, { 0x03f06d02, "HP PhotoSmart 607" }, { 0x03f06e02, "HP PhotoSmart 507" }, @@ -3517,6 +3557,7 @@ { 0x03f90100, "KT-2001 Keyboard" }, { 0x03f90101, "Keyboard" }, { 0x03f90102, "Keyboard Mouse" }, + { 0x03fd0008, "Platform Cable USB II" }, { 0x040005dc, "Rigol Technologies DS1000USB Oscilloscope" }, { 0x04000807, "Bluetooth Dongle" }, { 0x0400080a, "Bluetooth Device" }, @@ -3547,6 +3588,7 @@ { 0x04030000, "H4SMK 7 Port Hub" }, { 0x04030232, "Serial Converter" }, { 0x04031060, "JTAG adapter" }, + { 0x04031234, "IronLogic RFID Adapter [Z-2 USB]" }, { 0x04036001, "FT232 USB-Serial (UART) IC" }, { 0x04036002, "Lumel PD12" }, { 0x04036007, "Serial Converter" }, @@ -3571,8 +3613,10 @@ { 0x04038b2a, "Alpermann+Velte Rubidium Q1" }, { 0x04038b2b, "Alpermann+Velte TCD" }, { 0x04038b2c, "Alpermann+Velte TCC70" }, + { 0x04039132, "LCD and Temperature Interface" }, { 0x04039133, "CallerID" }, { 0x04039135, "Rotary Pub alarm" }, + { 0x04039136, "Pulsecounter" }, { 0x04039e90, "Marvell OpenRD Base/Client" }, { 0x04039f80, "Ewert Energy Systems CANdapter" }, { 0x0403a6d0, "Texas Instruments XDS100v2 JTAG / BeagleBone A3" }, @@ -3640,6 +3684,7 @@ { 0x0403ed74, "HAMEG HO820 Serial Port" }, { 0x0403ef10, "FT1245BL" }, { 0x0403f070, "Serial Converter 422/485 [Vardaan VEUSB422R3]" }, + { 0x0403f0e9, "Tagsys L-P101" }, { 0x0403f1a0, "Asix PRESTO Programmer" }, { 0x0403f208, "Papenmeier Braille-Display" }, { 0x0403f3c0, "4N-GALAXY Serial Converter" }, @@ -3878,6 +3923,7 @@ { 0x040a4000, "InkJet Color Printer" }, { 0x040a4021, "Photo Printer 6800" }, { 0x040a4022, "1400 Digital Photo Printer" }, + { 0x040a402b, "Photo Printer 6850" }, { 0x040a402e, "605 Photo Printer" }, { 0x040a4034, "805 Photo Printer" }, { 0x040a4056, "ESP 7200 Series AiO" }, @@ -4368,6 +4414,7 @@ { 0x04244064, "Ultra Fast Media Reader" }, { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" }, { 0x04249512, "SMC9512/9514 USB Hub" }, + { 0x04249514, "SMC9514 Hub" }, { 0x0424a700, "2 Port Hub" }, { 0x0424ec00, "SMSC9512/9514 Fast Ethernet Adapter" }, { 0x04250101, "G-Tech Wireless Mouse & Keyboard" }, @@ -4611,6 +4658,7 @@ { 0x04512036, "TUSB2036 Hub" }, { 0x04512046, "TUSB2046 Hub" }, { 0x04512077, "TUSB2077 Hub" }, + { 0x04512f90, "SM-USB-DIG" }, { 0x04513410, "TUSB3410 Microcontroller" }, { 0x04513f00, "OMAP1610" }, { 0x04513f02, "SMC WSKP100 Wi-Fi Phone" }, @@ -4709,6 +4757,7 @@ { 0x04584012, "TVGo DVB-T03 [AF9015]" }, { 0x04585003, "G-pen 560 Tablet" }, { 0x04585004, "G-pen Tablet" }, + { 0x0458505e, "Genius iSlim 330" }, { 0x04586001, "GF3000F Ethernet Adapter" }, { 0x04587004, "VideoCAM Express V2" }, { 0x04587006, "Dsc 1.3 Smart Camera Device" }, @@ -4731,9 +4780,17 @@ { 0x04587055, "Slim 2020AF camera" }, { 0x0458705a, "Asus USB2.0 Webcam" }, { 0x0458705c, "Genius iSlim 1300AF" }, + { 0x04587061, "Genius iLook 1321 V2" }, + { 0x04587066, "Acer Crystal Eye Webcam" }, + { 0x04587067, "Genius iSlim 1300AF V2" }, + { 0x04587068, "Genius eFace 1325R" }, + { 0x0458706d, "Genius iSlim 2000AF V2" }, + { 0x04587076, "Genius FaceCam 312" }, { 0x04587079, "FaceCam 2025R" }, { 0x0458707f, "TVGo DVB-T03 [RTL2832]" }, { 0x04587088, "WideCam 1050" }, + { 0x04587089, "Genius FaceCam 320" }, + { 0x0458708c, "Genius WideCam F100" }, { 0x045a07da, "Supra Express 56K modem" }, { 0x045a0b4a, "SupraMax 2890 56K Modem [Lucent Atlas]" }, { 0x045a0b68, "SupraMax 56K Modem" }, @@ -4865,6 +4922,9 @@ { 0x045e02ae, "Xbox NUI Camera" }, { 0x045e02b0, "Xbox NUI Motor" }, { 0x045e02b6, "Xbox 360 / Bluetooth Wireless Headset" }, + { 0x045e02be, "Kinect for Windows NUI Audio" }, + { 0x045e02bf, "Kinect for Windows NUI Camera" }, + { 0x045e02c2, "Kinect for Windows NUI Motor" }, { 0x045e0400, "Windows Powered Pocket PC 2002" }, { 0x045e0401, "Windows Powered Pocket PC 2002" }, { 0x045e0402, "Windows Powered Pocket PC 2002" }, @@ -5139,6 +5199,7 @@ { 0x046d082d, "HD Pro Webcam C920" }, { 0x046d0830, "QuickClip" }, { 0x046d0840, "QuickCam Express" }, + { 0x046d0843, "Webcam C930e" }, { 0x046d0850, "QuickCam Web" }, { 0x046d0870, "QuickCam Express" }, { 0x046d0890, "QuickCam Traveler" }, @@ -5240,6 +5301,8 @@ { 0x046d0a17, "G330 Headset" }, { 0x046d0a1f, "G930" }, { 0x046d0a29, "H600 [Wireless Headset]" }, + { 0x046d0a38, "Headset H340" }, + { 0x046d0a4d, "G430 Surround Sound Gaming Headset" }, { 0x046d0b02, "C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)" }, { 0x046d8801, "Video Camera" }, { 0x046db305, "BT Mini-Receiver" }, @@ -5400,7 +5463,7 @@ { 0x046dc318, "Illuminated Keyboard" }, { 0x046dc31a, "Comfort Wave 450" }, { 0x046dc31b, "Compact Keyboard K300" }, - { 0x046dc31c, "Keyboard K120 for Business" }, + { 0x046dc31c, "Keyboard K120" }, { 0x046dc31d, "Media Keyboard K200" }, { 0x046dc401, "TrackMan Marble Wheel" }, { 0x046dc402, "Marble Mouse (2-button)" }, @@ -5434,14 +5497,22 @@ { 0x046dc526, "Nano Receiver" }, { 0x046dc529, "Logitech Keyboard + Mice" }, { 0x046dc52b, "Unifying Receiver" }, + { 0x046dc52d, "R700 Remote Presenter receiver" }, { 0x046dc52e, "MK260 Wireless Combo Receiver" }, { 0x046dc52f, "Unifying Receiver" }, { 0x046dc532, "Unifying Receiver" }, + { 0x046dc603, "3Dconnexion Spacemouse Plus XT" }, + { 0x046dc605, "3Dconnexion CADman" }, + { 0x046dc606, "3Dconnexion Spacemouse Classic" }, + { 0x046dc621, "3Dconnexion Spaceball 5000" }, { 0x046dc623, "3Dconnexion Space Traveller 3D Mouse" }, { 0x046dc625, "3Dconnexion Space Pilot 3D Mouse" }, { 0x046dc626, "3Dconnexion Space Navigator 3D Mouse" }, { 0x046dc627, "3Dconnexion Space Explorer 3D Mouse" }, + { 0x046dc628, "3Dconnexion Space Navigator for Notebooks" }, { 0x046dc629, "3Dconnexion SpacePilot Pro 3D Mouse" }, + { 0x046dc62b, "3Dconnexion Space Mouse Pro" }, + { 0x046dc640, "NuLOOQ navigator" }, { 0x046dc702, "Cordless Presenter" }, { 0x046dc703, "Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)" }, { 0x046dc704, "diNovo Wireless Desktop" }, @@ -5720,6 +5791,7 @@ { 0x04800004, "InTouch Module" }, { 0x04800011, "InTouch Module" }, { 0x04800014, "InTouch Module" }, + { 0x04800100, "Stor.E Slim USB 3.0" }, { 0x0480a006, "External Disk 1.5TB" }, { 0x0480a007, "External Disk USB 3.0" }, { 0x0480a009, "Stor.E Basics" }, @@ -6162,6 +6234,7 @@ { 0x04a92224, "CanoScan LiDE 600F" }, { 0x04a92225, "CanoScan LiDE 70" }, { 0x04a92228, "CanoScan 4400F" }, + { 0x04a92229, "CanoScan 8600F" }, { 0x04a92602, "MultiPASS C555" }, { 0x04a92603, "MultiPASS C755" }, { 0x04a9260a, "CAPT Printer" }, @@ -6489,6 +6562,7 @@ { 0x04a9322c, "Canon PowerShot SX220HS" }, { 0x04a93233, "Canon PowerShot G1 X" }, { 0x04a93234, "PowerShot SX150 IS" }, + { 0x04a93235, "PowerShot ELPH 510 HS / IXUS 1100 HS" }, { 0x04a93236, "PowerShot S100" }, { 0x04a93237, "PowerShot ELPH 310 HS / IXUS 230 HS" }, { 0x04a93238, "Canon PowerShot SX40HS" }, @@ -6515,8 +6589,10 @@ { 0x04a9325a, "PowerShot SX160 IS" }, { 0x04a9325b, "Canon PowerShot S110" }, { 0x04a9325c, "Canon PowerShot SX500IS" }, + { 0x04a9325e, "PowerShot N" }, { 0x04a9325f, "PowerShot SX280 HS" }, { 0x04a93260, "PowerShot SX270 HS" }, + { 0x04a93261, "PowerShot A3500 IS" }, { 0x04a93262, "PowerShot A2600" }, { 0x04a93264, "PowerShot A1400" }, { 0x04a93265, "Powershot ELPH 130 IS / IXUS 140" }, @@ -6525,6 +6601,9 @@ { 0x04a93276, "PowerShot SX170 IS" }, { 0x04a93277, "PowerShot SX510 HS" }, { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" }, + { 0x04a93288, "Powershot ELPH 135 / IXUS 145" }, + { 0x04a93289, "PowerShot ELPH 340 HS / IXUS 265 HS" }, + { 0x04a9328a, "PowerShot ELPH 150 IS / IXUS 155" }, { 0x04ad2501, "Bluetooth Device" }, { 0x04b00102, "Coolpix 990" }, { 0x04b00103, "Coolpix 880" }, @@ -6706,6 +6785,7 @@ { 0x04b41006, "Human Interface Device" }, { 0x04b42050, "hub" }, { 0x04b42830, "Opera1 DVB-S (cold state)" }, + { 0x04b44235, "Monitor 02 Driver" }, { 0x04b44381, "SCAPS USC-1 Scanner Controller" }, { 0x04b44611, "Storage Adapter FX2 (CY)" }, { 0x04b44616, "Flash Disk (TPP)" }, @@ -7003,6 +7083,7 @@ { 0x04c51097, "fi-5110C" }, { 0x04c510ae, "fi-4120C2" }, { 0x04c510af, "fi-4220C2" }, + { 0x04c510c7, "fi-60f scanner" }, { 0x04c510e0, "fi-5120c Scanner" }, { 0x04c510e1, "fi-5220C" }, { 0x04c510e7, "fi-5900C" }, @@ -7198,7 +7279,7 @@ { 0x04d92221, "Keyboard" }, { 0x04d92323, "Keyboard" }, { 0x04d92519, "Shenzhen LogoTech 2.4GHz receiver" }, - { 0x04d92832, "1channel Telephone line recorder" }, + { 0x04d92832, "HT82A832R Audio MCU" }, { 0x04d92834, "HT82A834R Audio MCU" }, { 0x04d9a055, "Keyboard" }, { 0x04da0901, "LS-120 Camera" }, @@ -7230,6 +7311,7 @@ { 0x04da2374, "Panasonic DMC-GF1" }, { 0x04da2375, "Leica D-LUX 2" }, { 0x04da2451, "HDC-SD9" }, + { 0x04da245b, "HC-X920K (3MOS Full HD video camcorder)" }, { 0x04da2497, "HDC-TM700" }, { 0x04da250c, "Gobi Wireless Modem (QDL mode)" }, { 0x04da250d, "Gobi Wireless Modem" }, @@ -7374,6 +7456,7 @@ { 0x04e81003, "MP3 Player and Recorder" }, { 0x04e81006, "SDC-200Z" }, { 0x04e8130c, "NX100" }, + { 0x04e81f05, "S2 Portable [JMicron] (500GB)" }, { 0x04e81f06, "HX-MU064DA portable harddisk" }, { 0x04e82018, "WIS09ABGN LinkStick Wireless LAN Adapter" }, { 0x04e82035, "Digital Photo Frame Mass Storage" }, @@ -7419,6 +7502,7 @@ { 0x04e8330c, "ML-1865" }, { 0x04e83310, "ML-331x Series Laser Printer" }, { 0x04e83315, "ML-2540 Series Laser Printer" }, + { 0x04e8331e, "M262x/M282x Xpress Series Laser Printer" }, { 0x04e83409, "SCX-4216F Scanner" }, { 0x04e8340c, "SCX-5x15 series" }, { 0x04e8340d, "SCX-6x20 series" }, @@ -7435,6 +7519,7 @@ { 0x04e8341f, "Composite Device" }, { 0x04e83420, "Composite Device" }, { 0x04e83426, "SCX-4500 Laser Printer" }, + { 0x04e8342d, "SCX-4x28 Series" }, { 0x04e8344f, "SCX-3400 Series" }, { 0x04e83605, "InkJet Color Printer" }, { 0x04e83606, "InkJet Color Printer" }, @@ -7572,12 +7657,14 @@ { 0x04e8684a, "Samsung S5620" }, { 0x04e8684e, "Wave (GT-S8500)" }, { 0x04e8685b, "GT-I9100 Phone [Galaxy S II] (mass storage mode)" }, - { 0x04e8685c, "GT-I9250 Phone [Galaxy Nexus]" }, + { 0x04e8685c, "GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)" }, { 0x04e8685d, "GT-I9100 Phone [Galaxy S II] (Download mode)" }, { 0x04e8685e, "Samsung Galaxy Y" }, - { 0x04e86860, "GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1]" }, + { 0x04e86860, "GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]" }, + { 0x04e86863, "GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)" }, { 0x04e86865, "GT-I9300 Phone [Galaxy S III] (PTP mode)" }, { 0x04e86866, "GT-I9300 Phone [Galaxy S III] (debugging mode)" }, + { 0x04e86868, "Escape Composite driver for Android Phones: Modem+Diagnostic+ADB" }, { 0x04e86875, "GT-B3710 Standalone LTE device (Commercial)" }, { 0x04e86876, "GT-B3710 LTE Modem" }, { 0x04e86877, "Samsung Galaxy models Kies mode" }, @@ -7662,6 +7749,8 @@ { 0x04f2b044, "Acer CrystalEye Webcam" }, { 0x04f2b057, "integrated USB webcam" }, { 0x04f2b059, "CKF7037 HP webcam" }, + { 0x04f2b064, "CNA7137 Integrated Webcam" }, + { 0x04f2b070, "Camera" }, { 0x04f2b071, "2.0M UVC Webcam / CNF7129" }, { 0x04f2b083, "CKF7063 Webcam (HP)" }, { 0x04f2b091, "Webcam" }, @@ -7685,9 +7774,11 @@ { 0x04f2b272, "Lenovo EasyCamera" }, { 0x04f2b2b0, "Camera" }, { 0x04f2b2b9, "Lenovo Integrated Camera UVC" }, + { 0x04f2b2da, "thinkpad t430s camera" }, { 0x04f2b2ea, "Integrated Camera [ThinkPad]" }, { 0x04f2b330, "Asus 720p CMOS webcam" }, { 0x04f2b354, "UVC 1.00 device HD UVC WebCam" }, + { 0x04f2b394, "Integrated Camera" }, { 0x04f3000a, "Touchscreen" }, { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" }, { 0x04f301a4, "Wireless Keyboard" }, @@ -7887,6 +7978,7 @@ { 0x04f901ea, "DCP-7030" }, { 0x04f901eb, "MFC-7320" }, { 0x04f901f4, "MFC-5890CN" }, + { 0x04f90217, "MFC-8480DN" }, { 0x04f90223, "DCP-365CN" }, { 0x04f90248, "DCP-7055 scanner/printer" }, { 0x04f91000, "Printer" }, @@ -7924,7 +8016,9 @@ { 0x04fc5330, "Digitrex 2110" }, { 0x04fc5331, "Vivitar Vivicam 10" }, { 0x04fc5360, "Sunplus Generic Digital Camera" }, + { 0x04fc5563, "Digital Media Player MP3/WMA [The Sharper Image]" }, { 0x04fc5720, "Card Reader Driver" }, + { 0x04fc6333, "Siri A9 UVC chipset" }, { 0x04fc7333, "Finet Technology Palmpix DC-85" }, { 0x04fc757a, "Aiptek, MP315 MP3 Player" }, { 0x04fcffff, "PureDigital Ritz Disposable" }, @@ -7953,6 +8047,9 @@ { 0x0502337d, "Acer Iconia TAB A200 (ID2)" }, { 0x0502338a, "Acer Iconia TAB A510" }, { 0x050233c3, "Acer E350 Liquid Gallant Duo" }, + { 0x050233c4, "Liquid Gallant Duo E350 (debug mode)" }, + { 0x050233c7, "Liquid Gallant Duo E350 (USB tethering)" }, + { 0x050233c8, "Liquid Gallant Duo E350 (debug mode, USB tethering)" }, { 0x0502d001, "Divio NW801/DVC-V6+ Digital Camera" }, { 0x0506009d, "HomeConnect Camera" }, { 0x050600a0, "3CREB96 Bluetooth Adapter" }, @@ -8012,6 +8109,7 @@ { 0x050d0409, "F5U409 Serial" }, { 0x050d0416, "Staples 12416 7 port desktop hub" }, { 0x050d0551, "F6C550-AVR UPS" }, + { 0x050d065a, "F8T065BF Mini Bluetooth 4.0 Adapter" }, { 0x050d0706, "2-N-1 7-Port Hub (Lower half)" }, { 0x050d0802, "Nostromo n40 Gamepad" }, { 0x050d0803, "Nostromo 1745 GamePad" }, @@ -8029,6 +8127,7 @@ { 0x050d1203, "F5U120-PC Serial Port" }, { 0x050d2103, "F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]" }, { 0x050d21f1, "N300 WLAN N Adapter [ISY]" }, + { 0x050d21f2, "RTL8192CU 802.11n WLAN Adapter [ISY IWL 4000]" }, { 0x050d258a, "F5U258 Host to Host cable" }, { 0x050d3101, "F1DF102U/F1DG102U Flip Hub" }, { 0x050d3201, "F1DF102U/F1DG102U Flip KVM" }, @@ -8082,6 +8181,7 @@ { 0x05251080, "NET1080 USB-USB Bridge" }, { 0x05251200, "SSDC Adapter II" }, { 0x05251265, "File-backed Storage Gadget" }, + { 0x05253424, "Lumidigm Venus fingerprint sensor" }, { 0x0525a0f0, "Cambridge Electronic Devices Power1401 mk 2" }, { 0x0525a140, "USB Clik! 40" }, { 0x0525a141, "(OME) PocketZip 40 MP3 Player Driver" }, @@ -8361,6 +8461,7 @@ { 0x054c035a, "Sony Walkman NWZ-S716F" }, { 0x054c035b, "Sony Walkman NWZ-A826/NWZ-A828/NWZ-A829" }, { 0x054c035c, "Sony Walkman NWZ-A726/NWZ-A728/NWZ-A768" }, + { 0x054c035f, "UP-DR200 Photo Printer" }, { 0x054c036e, "Sony Walkman NWZ-B135" }, { 0x054c0382, "Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)" }, { 0x054c0385, "Sony Walkman NWZ-E436F" }, @@ -8390,6 +8491,7 @@ { 0x054c04d1, "Sony Sony Tablet P1" }, { 0x054c052a, "Sony DSC-RX100" }, { 0x054c052b, "Sony DSC-RX1" }, + { 0x054c0541, "DSC-HX100V [Cybershot Digital Still Camera]" }, { 0x054c0543, "Sony DSC-HX100V" }, { 0x054c0574, "Sony SLT-A65V" }, { 0x054c059a, "Sony NWZ-B163F" }, @@ -8398,12 +8500,16 @@ { 0x054c05b3, "Sony Sony Tablet S" }, { 0x054c05b4, "Sony Sony Tablet S1" }, { 0x054c061f, "Sony DSC-HX200V" }, + { 0x054c0689, "Walkman NWZ-B173F" }, { 0x054c06bb, "WALKMAN NWZ-F805" }, + { 0x054c088c, "Portable Headphone Amplifier" }, { 0x054c1000, "Wireless Buzz! Receiver" }, { 0x054c1294, "Sony DCR-SR75" }, { 0x05500002, "InkJet Color Printer" }, { 0x05500004, "InkJet Color Printer" }, { 0x05500005, "InkJet Color Printer" }, + { 0x0550000b, "Workcentre 24" }, + { 0x0550014e, "CM215b Printer" }, { 0x05530001, "TerraCAM" }, { 0x05530002, "CPiA Webcam" }, { 0x05530100, "STV0672 Camera" }, @@ -8573,6 +8679,7 @@ { 0x056a0065, "Bamboo" }, { 0x056a0069, "Bamboo One" }, { 0x056a0081, "Graphire Wireless 6x8" }, + { 0x056a0084, "Wireless adapter for Bamboo tablets" }, { 0x056a0090, "TPC90" }, { 0x056a0093, "TPC93" }, { 0x056a009a, "TPC9A" }, @@ -8595,12 +8702,15 @@ { 0x056a00cc, "Cintiq 21UX (DTK-2100)" }, { 0x056a00d1, "Bamboo Pen & Touch (CTH-460-DE)" }, { 0x056a00d3, "Bamboo Fun (CTH-661)" }, + { 0x056a00d4, "Bamboo Pen (CTL-460)" }, { 0x056a00d6, "Bamboo Pen & Touch (CTH-460)" }, { 0x056a00db, "Bamboo Fun (CTH-661SE-NL)" }, { 0x056a00dd, "Bamboo Pen (CTL-470)" }, { 0x056a00de, "CTH-470 [Bamboo Fun Pen & Touch]" }, { 0x056a00f6, "Cintiq 24HD touch (DTH-2400) touchscreen" }, { 0x056a00f8, "Cintiq 24HD touch (DTH-2400) tablet" }, + { 0x056a0307, "Cintiq Companion Hybrid 13HD (DTH-A1300) tablet" }, + { 0x056a0309, "Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen" }, { 0x056a0400, "PenPartner 4x5" }, { 0x056a4850, "PenPartner 6x8" }, { 0x056c0006, "KwikLink Host-Host Connector" }, @@ -9016,8 +9126,11 @@ { 0x0586341a, "NWD-270N Wireless N-lite USB Adapter" }, { 0x0586341e, "NWD2105 802.11bgn Wireless Adapter [Ralink RT3070]" }, { 0x0586341f, "NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]" }, + { 0x05863425, "NWD6505 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]" }, { 0x0586343e, "N220 802.11bgn Wireless Adapter" }, + { 0x058b0015, "Flash Loader utility" }, { 0x058b001c, "Flash Drive" }, + { 0x058b0041, "Flash Loader utility" }, { 0x058c0007, "Flash" }, { 0x058c0008, "LP130" }, { 0x058c000a, "LP530" }, @@ -9052,7 +9165,7 @@ { 0x058f6362, "Flash Card Reader/Writer" }, { 0x058f6364, "AU6477 Card Reader Controller" }, { 0x058f6366, "Multi Flash Reader" }, - { 0x058f6377, "Multimedia Card Reader" }, + { 0x058f6377, "AU6375 4-LUN card reader" }, { 0x058f6386, "Memory Card" }, { 0x058f6387, "Flash Drive" }, { 0x058f6390, "USB 2.0-IDE bridge" }, @@ -9076,8 +9189,10 @@ { 0x058f9472, "Keyboard Hub" }, { 0x058f9510, "ChunghwaTL USB02 Smartcard Reader" }, { 0x058f9520, "EMV Certified Smart Card Reader" }, + { 0x058f9540, "AU9540 Smartcard Reader" }, { 0x058f9720, "USB-Serial Adapter" }, { 0x058fa014, "Asus Integrated Webcam" }, + { 0x058fb002, "Acer Integrated Webcam" }, { 0x05900004, "Cable Modem" }, { 0x0590000b, "MR56SVS" }, { 0x05900028, "HJ-720IT / HEM-7080IT-E / HEM-790IT" }, @@ -9088,6 +9203,7 @@ { 0x05960001, "Touchscreen" }, { 0x05960002, "Touch Screen Controller" }, { 0x05960500, "PCT Multitouch HID Controller" }, + { 0x05960543, "DELL XPS touchscreen" }, { 0x059b0001, "Zip 100 (Type 1)" }, { 0x059b000b, "Zip 100 (Type 2)" }, { 0x059b0021, "Win98 Disk Controller" }, @@ -9107,6 +9223,7 @@ { 0x059b0060, "PCMCIA PocketZip Dock" }, { 0x059b0061, "Varo PocketZip 40 MP3 Player" }, { 0x059b006d, "HipZip MP3 Player" }, + { 0x059b0070, "eGo Portable Hard Drive" }, { 0x059b007c, "Ultra Max USB/1394" }, { 0x059b007d, "HTC42606 0G9AT00 [Iomega HDD]" }, { 0x059b007e, "Mini 256MB/512MB Flash Drive [IOM2D5]" }, @@ -9139,7 +9256,9 @@ { 0x059f0213, "PocketDrive USB2" }, { 0x059f0323, "LaCie d2 Drive USB2" }, { 0x059f0421, "Big Disk G465" }, + { 0x059f0525, "BigDisk Extreme 500" }, { 0x059f0641, "Mobile Hard Drive" }, + { 0x059f0829, "BigDisk Extreme+" }, { 0x059f100c, "Rugged Triple Interface Mobile Hard Drive" }, { 0x059f1010, "Desktop Hard Drive" }, { 0x059f1019, "Desktop Hard Drive" }, @@ -9148,6 +9267,7 @@ { 0x059f102a, "Rikiki Hard Drive" }, { 0x059f1049, "rikiki Harddrive" }, { 0x059f1052, "P'9220 Mobile Drive" }, + { 0x059f1064, "Rugged 16 and 32 GB" }, { 0x059fa601, "HardDrive" }, { 0x059fa602, "CD R/W" }, { 0x05a38388, "Marvell 88W8388 802.11a/b/g WLAN" }, @@ -9226,7 +9346,7 @@ { 0x05ac0223, "Internal Keyboard/Trackpad (ANSI)" }, { 0x05ac0224, "Internal Keyboard/Trackpad (ISO)" }, { 0x05ac0225, "Internal Keyboard/Trackpad (JIS)" }, - { 0x05ac0229, "Internal Keyboard/Trackpad (MacBook Pro) (ANSI)" }, + { 0x05ac0229, "Internal Keyboard/Trackpad (ANSI)" }, { 0x05ac022a, "Internal Keyboard/Trackpad (MacBook Pro) (ISO)" }, { 0x05ac022b, "Internal Keyboard/Trackpad (MacBook Pro) (JIS)" }, { 0x05ac0230, "Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI)" }, @@ -9253,7 +9373,7 @@ { 0x05ac0263, "Apple Internal Keyboard / Trackpad (MacBook Retina)" }, { 0x05ac0301, "USB Mouse [Mitsumi, M4848]" }, { 0x05ac0302, "Optical Mouse [Fujitsu]" }, - { 0x05ac0304, "Optical USB Mouse [Mitsumi]" }, + { 0x05ac0304, "Mighty Mouse [Mitsumi, M1152]" }, { 0x05ac0306, "Optical USB Mouse [Fujitsu]" }, { 0x05ac030a, "Internal Trackpad" }, { 0x05ac030b, "Internal Trackpad" }, @@ -9264,6 +9384,7 @@ { 0x05ac1002, "Extended Keyboard Hub [Mitsumi]" }, { 0x05ac1003, "Hub in Pro Keyboard [Mitsumi, A1048]" }, { 0x05ac1006, "Hub in Aluminum Keyboard" }, + { 0x05ac1008, "Mini DisplayPort to Dual-Link DVI Adapter" }, { 0x05ac1101, "Speakers" }, { 0x05ac1105, "Audio in LED Cinema Display" }, { 0x05ac1107, "Thunderbolt Display Audio" }, @@ -9295,6 +9416,7 @@ { 0x05ac1263, "iPod Nano 4.Gen" }, { 0x05ac1265, "iPod Nano 5.Gen" }, { 0x05ac1266, "iPod Nano 6.Gen" }, + { 0x05ac1267, "iPod Nano 7.Gen" }, { 0x05ac1281, "Apple Mobile Device [Recovery Mode]" }, { 0x05ac1290, "Apple iPhone" }, { 0x05ac1291, "Apple iPod Touch" }, @@ -9305,13 +9427,19 @@ { 0x05ac1297, "Apple iPhone 4" }, { 0x05ac1299, "Apple iPod Touch 3rd Gen" }, { 0x05ac129a, "Apple iPad" }, + { 0x05ac129c, "iPhone 4(CDMA)" }, { 0x05ac129e, "iPod Touch 4.Gen" }, { 0x05ac129f, "iPad 2" }, { 0x05ac12a0, "Apple iPhone 4S" }, { 0x05ac12a2, "iPad 2 (3G; 64GB)" }, + { 0x05ac12a3, "iPad 2 (CDMA)" }, + { 0x05ac12a4, "iPad 3 (wifi)" }, + { 0x05ac12a5, "iPad 3 (CDMA)" }, { 0x05ac12a6, "iPad 3 (3G, 16 GB)" }, + { 0x05ac12a8, "iPhone5/5C/5S" }, { 0x05ac12a9, "iPad 2" }, { 0x05ac12aa, "iPod Touch 5.Gen [A1421]" }, + { 0x05ac12ab, "iPad 4 (WiFi, 32GB)" }, { 0x05ac1300, "iPod Shuffle" }, { 0x05ac1301, "iPod Shuffle 2.Gen" }, { 0x05ac1302, "iPod Shuffle 3.Gen" }, @@ -9319,6 +9447,9 @@ { 0x05ac1401, "Modem" }, { 0x05ac1402, "Ethernet Adapter [A1277]" }, { 0x05ac1500, "SuperDrive [A1379]" }, + { 0x05ac8005, "OHCI Root Hub Simulation" }, + { 0x05ac8006, "EHCI Root Hub Simulation" }, + { 0x05ac8007, "XHCI Root Hub USB 2.0 Simulation" }, { 0x05ac8202, "HCF V.90 Data/Fax Modem" }, { 0x05ac8203, "Bluetooth HCI" }, { 0x05ac8204, "Built-in Bluetooth 2.0+EDR HCI" }, @@ -9351,6 +9482,7 @@ { 0x05ac850a, "FaceTime Camera" }, { 0x05ac8510, "FaceTime HD Camera (Built-in)" }, { 0x05ac911c, "Hub in A1082 [Cinema HD Display 23\"]" }, + { 0x05ac9127, "Hub in Thunderbolt Display" }, { 0x05ac912f, "Hub in 30\" Cinema Display" }, { 0x05ac9215, "Studio Display 15\"" }, { 0x05ac9217, "Studio Display 17\"" }, @@ -9398,6 +9530,7 @@ { 0x05c69201, "Gobi Wireless Modem (QDL mode)" }, { 0x05c69202, "Gobi Wireless Modem" }, { 0x05c69203, "Gobi Wireless Modem" }, + { 0x05c69205, "Gobi 2000" }, { 0x05c69211, "Acer Gobi Wireless Modem (QDL mode)" }, { 0x05c69212, "Acer Gobi Wireless Modem" }, { 0x05c69214, "Acer Gobi 2000 Wireless Modem (QDL mode)" }, @@ -9423,7 +9556,10 @@ { 0x05c80103, "FO13FF-65 PC-CAM" }, { 0x05c8021a, "HP Webcam" }, { 0x05c80318, "Webcam" }, + { 0x05c80361, "SunplusIT INC. HP Truevision HD Webcam" }, + { 0x05c8036e, "Webcam" }, { 0x05c80403, "Webcam" }, + { 0x05c8041b, "HP 2.0MP High Definition Webcam" }, { 0x05ca0101, "RDC-5300 Camera" }, { 0x05ca0110, "Ricoh Caplio R5" }, { 0x05ca0325, "Ricoh Caplio GX" }, @@ -9655,6 +9791,7 @@ { 0x05dc4d02, "MP3 Player" }, { 0x05dc4d12, "MP3 Player" }, { 0x05dc4d30, "MP3 Player" }, + { 0x05dca209, "JumpDrive S70" }, { 0x05dca300, "JumpDrive2" }, { 0x05dca400, "JumpDrive trade; Pro 40-501" }, { 0x05dca410, "JumpDrive 128MB/256MB" }, @@ -9675,12 +9812,15 @@ { 0x05dca560, "JumpDrive FireFly" }, { 0x05dca701, "JumpDrive FireFly" }, { 0x05dca731, "JumpDrive FireFly" }, + { 0x05dca768, "JumpDrive Retrax" }, { 0x05dca790, "JumpDrive 2GB" }, { 0x05dca811, "16GB Gizmo!" }, { 0x05dca813, "16gB flash thumb drive" }, + { 0x05dca815, "JumpDrive V10" }, { 0x05dcb002, "USB CF Reader" }, { 0x05dcb018, "Multi-Card Reader" }, { 0x05dcb047, "SDHC Reader [RW047-7000]" }, + { 0x05dcba02, "Workflow CFR1" }, { 0x05dcc753, "JumpDrive TwistTurn" }, { 0x05ddff31, "AWU-120" }, { 0x05ddff32, "FriendlyNET AeroLAN AL2011" }, @@ -9723,7 +9863,7 @@ { 0x05e30605, "USB 2.0 Hub" }, { 0x05e30606, "USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub" }, { 0x05e30607, "Logitech G110 Hub" }, - { 0x05e30608, "USB-2.0 4-Port HUB" }, + { 0x05e30608, "Hub" }, { 0x05e30610, "4-port hub" }, { 0x05e30660, "USB 2.0 Hub" }, { 0x05e30700, "SIIG US2256 CompactFlash Card Reader" }, @@ -9748,11 +9888,15 @@ { 0x05e30717, "All-in-1 Card Reader" }, { 0x05e30718, "IDE/SATA Adapter" }, { 0x05e30719, "SATA adapter" }, + { 0x05e30722, "SD/MMC card reader" }, { 0x05e30723, "GL827L SD/MMC/MS Flash Card Reader" }, { 0x05e30726, "SD Card Reader" }, { 0x05e30727, "microSD Reader/Writer" }, { 0x05e30731, "GL3310 SATA 3Gb/s Bridge Controller" }, + { 0x05e30732, "All-in-One Cardreader" }, { 0x05e30736, "microSD Reader/Writer" }, + { 0x05e30741, "microSD Card Reader" }, + { 0x05e30743, "SDXC and microSDXC CardReader" }, { 0x05e30760, "USB 2.0 Card Reader/Writer" }, { 0x05e30761, "Genesys Mass Storage Device" }, { 0x05e30780, "USBFS DFU Adapter" }, @@ -9781,6 +9925,7 @@ { 0x05f30007, "Kinesis Advantage PRO MPC/USB Keyboard" }, { 0x05f30081, "Kinesis Integrated Hub" }, { 0x05f300ff, "VEC Footpedal" }, + { 0x05f30203, "Y-mouse Keyboard & Mouse Adapter" }, { 0x05f3020b, "PS2 Adapter" }, { 0x05f30232, "X-Keys Switch Interface, Programming Mode" }, { 0x05f30261, "X-Keys Switch Interface, SPLAT Mode" }, @@ -9811,9 +9956,11 @@ { 0x05fe0011, "Browser Mouse" }, { 0x05fe0014, "Gamepad" }, { 0x05fe1010, "Optical Wireless" }, + { 0x05fe2001, "Microsoft Wireless Receiver 700" }, { 0x06010003, "Internet Security Co., Ltd. SecureKey" }, { 0x06021001, "ViCam Webcam" }, { 0x060300f1, "Keyboard" }, + { 0x060300f2, "Keyboard (Labtec Ultra Flat Keyboard)" }, { 0x06036871, "Mouse" }, { 0x0609031d, "eHome Infrared Receiver" }, { 0x06090322, "eHome Infrared Receiver" }, @@ -9825,6 +9972,7 @@ { 0x060b2101, "Keyboard" }, { 0x060b2231, "KSK-6001 UELX Keyboard" }, { 0x060b2270, "Gigabyte K8100 Aivia Gaming Keyboard" }, + { 0x060b5253, "Thermaltake MEKA G-Unit Gaming Keyboard" }, { 0x060b5811, "ACK-571U Wireless Keyboard" }, { 0x060b5903, "Japanese Keyboard - 595U" }, { 0x060b6001, "SolidTek USB 2p HUB" }, @@ -9905,6 +10053,7 @@ { 0x064ea103, "Acer/HP Integrated Webcam [CN0314]" }, { 0x064ea110, "HP Webcam" }, { 0x064ea114, "Lemote Webcam" }, + { 0x064ea116, "UVC 1.3MPixel WebCam" }, { 0x064ea136, "Asus Integrated Webcam [CN031B]" }, { 0x064ea219, "1.3M WebCam (notebook emachines E730, Acer sub-brand)" }, { 0x064ec107, "HP webcam [dv6-1190en]" }, @@ -10186,7 +10335,7 @@ { 0x068e00f2, "Flight Sim Pedals" }, { 0x068e00f3, "Fighterstick" }, { 0x068e00f4, "Combatstick" }, - { 0x068e00fa, "Flight Sim Pedals" }, + { 0x068e00fa, "Ch Throttle Quadrant" }, { 0x068e00ff, "Flight Sim Yoke" }, { 0x068e0500, "GameStick 3D" }, { 0x068e0501, "CH Pro Pedals" }, @@ -10202,6 +10351,7 @@ { 0x06981786, "1300ex Monitor" }, { 0x06982003, "CTX M730V built in Camera" }, { 0x06989999, "VLxxxx Monitor+Hub" }, + { 0x06990347, "AFG 3022B" }, { 0x069a0001, "VC010 Webcam [pwc]" }, { 0x069a0303, "Cable Modem" }, { 0x069a0311, "ADSL Router Remote NDIS Device" }, @@ -10359,6 +10509,7 @@ { 0x06be1005, "Dazzle DPVM! (1005)" }, { 0x06bed001, "P35U Camera Capture" }, { 0x06c20030, "PhidgetRFID" }, + { 0x06c20031, "RFID reader" }, { 0x06c20038, "4-Motor PhidgetServo v3.0" }, { 0x06c20039, "1-Motor PhidgetServo v3.0" }, { 0x06c2003a, "8-Motor PhidgetAvancedServo" }, @@ -10447,6 +10598,8 @@ { 0x06d30394, "CP9000D/DW Port" }, { 0x06d303a1, "CP9550D/DW Port" }, { 0x06d321ba, "FOMA D905i" }, + { 0x06d33b30, "CP-D70DW / CP-D707DW" }, + { 0x06d33b31, "CP-K60DW-S" }, { 0x06d54000, "Japanese Keyboard" }, { 0x06d60025, "Gamepad" }, { 0x06d60026, "Predator TH 400 Gamepad" }, @@ -10656,6 +10809,7 @@ { 0x072f0008, "ACR 80 Smart Card Reader" }, { 0x072f1000, "PLDT Drive" }, { 0x072f1001, "PLDT Drive" }, + { 0x072f2200, "ACR122U" }, { 0x072f8002, "AET63 BioTRUSTKey" }, { 0x072f8003, "ACR120" }, { 0x072f8103, "ACR120" }, @@ -10785,6 +10939,8 @@ { 0x07640005, "Cyber Power UPS" }, { 0x07640501, "CP1500 AVR UPS" }, { 0x07655001, "Huey PRO Colorimeter" }, + { 0x07655020, "i1 Display Pro" }, + { 0x07656003, "ColorMunki Smile" }, { 0x0765d094, "X-Rite DTP94 [Quato Silver Haze Pro]" }, { 0x0766001b, "Packard Bell Go" }, { 0x07660204, "TopSpeed Cyberlink Remote Control" }, @@ -10852,8 +11008,12 @@ { 0x0781540e, "Cruzer Contour Flash Drive" }, { 0x07815530, "Cruzer" }, { 0x07815567, "Cruzer Blade" }, + { 0x0781556c, "Ultra" }, + { 0x0781556d, "Memory Vault" }, { 0x07815571, "Cruzer Fit" }, + { 0x07815576, "Cruzer Facet" }, { 0x07815580, "SDCZ80 Flash Drive" }, + { 0x07815581, "Ultra" }, { 0x07815e10, "Encrypted" }, { 0x07816100, "Ultra II SD Plus 2GB" }, { 0x07817100, "Cruzer Mini" }, @@ -10998,7 +11158,7 @@ { 0x07aa0017, "FEther USB2-TX" }, { 0x07aa0018, "Wireless LAN USB-11 mini 2" }, { 0x07aa001a, "ULUSB-11 Key" }, - { 0x07aa001c, "CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]" }, + { 0x07aa001c, "CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]" }, { 0x07aa002e, "CG-WLUSB2GPX [Ralink RT2571W]" }, { 0x07aa002f, "CG-WLUSB2GNL" }, { 0x07aa0031, "CG-WLUSB2GS 802.11bg [Atheros AR5523]" }, @@ -11088,6 +11248,7 @@ { 0x07b40114, "Olympus IR-300" }, { 0x07b40116, "Olympus X925" }, { 0x07b40118, "Olympus E-410" }, + { 0x07b40125, "Tough TG-1 Camera" }, { 0x07b4012f, "Olympus E-PL5" }, { 0x07b40184, "P-S100 port" }, { 0x07b40202, "Foot Switch RS-26" }, @@ -11188,6 +11349,7 @@ { 0x07c4a200, "DF-UT-06 Hama MMC/SD Reader" }, { 0x07c4a400, "CompactFlash & Microdrive Reader" }, { 0x07c4a600, "Card Reader" }, + { 0x07c4a604, "12-in-1 Card Reader" }, { 0x07c4ad01, "Mass Storage Device" }, { 0x07c4ae01, "Mass Storage Device" }, { 0x07c4af01, "Mass Storage Device" }, @@ -11198,6 +11360,7 @@ { 0x07c4b00a, "USB to CF+SD Drive(LC1)" }, { 0x07c4b00b, "USB to Memory Stick(LC1)" }, { 0x07c4c010, "Kingston FCR-HS2/ATA Card Reader" }, + { 0x07c50500, "Cash Drawer" }, { 0x07c60002, "Bodega Wireless Access Point" }, { 0x07c60003, "Bodega Wireless Network Adapter" }, { 0x07c80202, "MN128-SOHO PAL" }, @@ -11383,6 +11546,7 @@ { 0x08010002, "Mini Swipe Reader" }, { 0x08010003, "Magstripe Insert Reader" }, { 0x08031300, "V92 Faxmodem" }, + { 0x08033095, "V.92 56K Mini External Modem Model 3095" }, { 0x08034310, "4410a Wireless-G Adapter [Intersil ISL3887]" }, { 0x08034410, "4410b Wireless-G Adapter [ZyDAS ZD1211B]" }, { 0x08035241, "Cable Modem" }, @@ -11543,10 +11707,15 @@ { 0x08469012, "WNDA4100 802.11abgn 3x3:3 [Ralink RT3573]" }, { 0x08469018, "WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]" }, { 0x08469020, "WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]" }, + { 0x08469021, "WNA3100M(v1) Wireless-N 300 [Realtek RTL8192CU]" }, { 0x08469030, "WNA1100 Wireless-N 150 [Atheros AR9271]" }, { 0x08469040, "WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]" }, { 0x08469041, "WNA1000M 802.11bgn [Realtek RTL8188CUS]" }, + { 0x08469042, "On Networks N150MA 802.11bgn [Realtek RTL8188CUS]" }, + { 0x08469050, "A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" }, + { 0x08469052, "A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]" }, { 0x0846a001, "PA101 10 Mbps HPNA Home Phoneline RJ-1" }, + { 0x0846f001, "On Networks N300MA 802.11bgn [Realtek RTL8192CU]" }, { 0x084d0001, "Jenoptik JD800i" }, { 0x084d0003, "S-Cam F5/D-Link DSC-350 Digital Camera" }, { 0x084d0011, "Argus DC3500 Digital Camera" }, @@ -11584,7 +11753,10 @@ { 0x085a8021, "1 port to Serial" }, { 0x085a8023, "2 port to Serial" }, { 0x085a8027, "PGSDB9 Serial Port" }, - { 0x085c0200, "Monitor Spyder" }, + { 0x085c0100, "Spyder 1" }, + { 0x085c0200, "Spyder 2" }, + { 0x085c0300, "Spyder 3" }, + { 0x085c0400, "Spyder 4" }, { 0x08644100, "MA101 802.11b Adapter" }, { 0x08644102, "MA101 802.11b Adapter" }, { 0x08679812, "ECON Data acquisition unit" }, @@ -11641,6 +11813,7 @@ { 0x088c2030, "Ticket Printer TTP 2030" }, { 0x088e5036, "Portable secure storage for software licenses" }, { 0x08920101, "Smartdio Reader/Writer" }, + { 0x08940010, "Remote NDIS Network Device" }, { 0x08970002, "Power Debug/Power Debug II" }, { 0x08a60051, "B-SV4" }, { 0x08a90005, "USBee ZX" }, @@ -11649,6 +11822,9 @@ { 0x08a90013, "USBee AX-Plus" }, { 0x08a90014, "USBee AX-Pro" }, { 0x08a90015, "USBee DX" }, + { 0x08b00006, "814 Sample Processor" }, + { 0x08b00015, "857 Titrando" }, + { 0x08b0001a, "852 Titrando" }, { 0x08b70001, "Playstation adapter" }, { 0x08b801f4, "USBSIMM1" }, { 0x08bb2702, "Speakers" }, @@ -11885,6 +12061,8 @@ { 0x08ffffff, "Sensor (Emulator)" }, { 0x09010001, "Hard Drive Adapter (TPP)" }, { 0x09010002, "SigmaDrive Adapter (TPP)" }, + { 0x090801f4, "SIMATIC NET CP 5711" }, + { 0x090801fe, "SIMATIC NET PC Adapter A2" }, { 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" }, { 0x090a1001, "T33520 Flash Card Controller" }, { 0x090a1100, "Comotron C3310 MP3 player" }, @@ -11954,15 +12132,19 @@ { 0x091e2380, "Oregon series" }, { 0x091e23cc, "n\\xc3\\xbcvi 1350" }, { 0x091e2459, "GPSmap 62/78 series" }, + { 0x091e2491, "Edge 800" }, { 0x091e2519, "eTrex 30" }, { 0x091e2535, "Edge 800" }, + { 0x091e253c, "GPSmap 62sc" }, { 0x091e255b, "Nuvi 2505LM" }, { 0x09207500, "Network Interface" }, { 0x09211001, "GoCOM232 Serial" }, { 0x09220007, "LabelWriter 330" }, { 0x09220009, "LabelWriter 310" }, + { 0x09220019, "LabelWriter 400" }, { 0x0922001a, "LabelWriter 400 Turbo" }, { 0x09220020, "LabelWriter 450" }, + { 0x09221001, "LabelManager PnP" }, { 0x0923010f, "SIIG MobileCam" }, { 0x092423dd, "DocuPrint M760 (X760_USB)" }, { 0x09243ce8, "Phaser 3428 Printer" }, @@ -11974,6 +12156,7 @@ { 0x0924ffef, "WorkCenter M15" }, { 0x0924fffb, "DocuPrint M750 (X750_USB)" }, { 0x09250005, "Gamtec.,Ltd SmartJoy PLUS Adapter" }, + { 0x092503e8, "Wii Classic Controller Adapter" }, { 0x09253881, "Saleae Logic" }, { 0x09258101, "Phidgets, Inc., 1-Motor PhidgetServo v2.0" }, { 0x09258104, "Phidgets, Inc., 4-Motor PhidgetServo v2.0" }, @@ -11993,6 +12176,7 @@ { 0x09300019, "Toshiba Gigabeat T" }, { 0x0930001a, "Toshiba Gigabeat MEU201" }, { 0x0930001d, "Toshiba Gigabeat MET401" }, + { 0x09300200, "Integrated Bluetooth (Taiyo Yuden)" }, { 0x09300301, "PCX1100U Cable Modem (WDM)" }, { 0x09300302, "PCX2000 Cable Modem (WDM)" }, { 0x09300305, "Cable Modem PCX3000" }, @@ -12016,6 +12200,7 @@ { 0x0930070b, "Pocket PC e800 Series" }, { 0x09300963, "Toshiba Excite AT300" }, { 0x09300a07, "WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]" }, + { 0x09300a13, "AX88179 Gigabit Ethernet [Toshiba]" }, { 0x09300b05, "PX1220E-1G25 External hard drive" }, { 0x09300b09, "PX1396E-3T01 External hard drive" }, { 0x09300b1a, "STOR.E ALU 2S" }, @@ -12080,7 +12265,7 @@ { 0x0936000c, "Rhythmedics 6 BioData Integrator" }, { 0x09360030, "Composite Device, Mass Storage Device (Flash Drive) amd HID" }, { 0x0936003c, "Rhythmedics HID Bootloader" }, - { 0x09390b15, "Toshiba Stor.E Alu 2 1TB (PX1710E-1HJ0)" }, + { 0x09390b15, "Toshiba Stor.E Alu 2" }, { 0x093a0007, "CMOS 100K-R Rev. 1.90" }, { 0x093a010e, "Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A" }, { 0x093a010f, "Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55" }, @@ -12100,6 +12285,7 @@ { 0x093a260e, "PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350" }, { 0x093a260f, "PAC7311 SnakeCam" }, { 0x093a2621, "PAC731x Trust Webcam" }, + { 0x093a2622, "Webcam Genius" }, { 0x093a2624, "Webcam" }, { 0x093b0010, "Storage Adapter" }, { 0x093b0011, "PlexWriter 40/12/40U" }, @@ -12150,6 +12336,7 @@ { 0x09511643, "DataTraveler G3" }, { 0x09511653, "Data Traveler 100 G2 8 GiB" }, { 0x09511656, "DataTraveler Ultimate G2" }, + { 0x09511665, "Digital DataTraveler SE9 64GB" }, { 0x09511689, "DataTraveler SE9" }, { 0x0951168a, "DataTraveler Micro" }, { 0x0951168c, "DT Elite 3.0" }, @@ -12161,6 +12348,7 @@ { 0x0955b401, "SHIELD" }, { 0x09570200, "E-Video DC-350 Camera" }, { 0x09570202, "E-Video DC-350 Camera" }, + { 0x09570407, "33220A Waveform Generator" }, { 0x09570518, "82357B GPIB Interface" }, { 0x09570a07, "34411A Multimeter" }, { 0x09571745, "Test and Measurement Device (IVI)" }, @@ -12172,9 +12360,11 @@ { 0x096e0120, "Microcosm Ltd Dinkey" }, { 0x096e0802, "ePass2000 (G&D STARCOS SPK 2.4)" }, { 0x096e0807, "ePass2003" }, + { 0x09712000, "i1 Pro" }, + { 0x09712001, "i1 Monitor" }, { 0x09712003, "Eye-One display" }, { 0x09712005, "Huey" }, - { 0x09712007, "ColorMunki" }, + { 0x09712007, "ColorMunki Photo" }, { 0x09730001, "e-gate Smart Card" }, { 0x09790222, "Keychain Display" }, { 0x09790224, "JL2005A Toy Camera" }, @@ -12190,6 +12380,7 @@ { 0x09930002, "eBook" }, { 0x099a0638, "Sanwa Supply Inc. Small Keyboard" }, { 0x099a610c, "EL-610 Super Mini Electron luminescent Keyboard" }, + { 0x099a713a, "WK-713 Multimedia Keyboard" }, { 0x099a7160, "Hyper Slim Keyboard" }, { 0x09a68001, "Mass Storage Device" }, { 0x09aa1000, "Prism GT 802.11b/g Adapter" }, @@ -12224,7 +12415,8 @@ { 0x09c40011, "ACT-IR2000U IrDA Dongle" }, { 0x09cc0404, "BAFO USB-ATA/ATAPI Bridge Controller" }, { 0x09cd2001, "Psion WaveFinder DAB radio receiver" }, - { 0x09d30001, "ISDN TA" }, + { 0x09d30001, "ISDN TA / Light Rider 128K" }, + { 0x09d3000b, "Bluetooth Adapter class 1 [BlueLight]" }, { 0x09d70100, "NovAtel FlexPack GPS receiver" }, { 0x09da0006, "Optical Mouse WOP-35 / Trust 450L Optical Mouse" }, { 0x09da000a, "Optical Mouse Opto 510D" }, @@ -12269,6 +12461,7 @@ { 0x0a0700c8, "ADU200 Relay I/O Interface" }, { 0x0a0700d0, "ADU208 Relay I/O Interface" }, { 0x0a0700da, "ADU218 Solid-State Relay I/O Interface" }, + { 0x0a0d2514, "CTS-1000 Internal Hub" }, { 0x0a120001, "Bluetooth Dongle (HCI mode)" }, { 0x0a120002, "Frontline Test Equipment Bluetooth Device" }, { 0x0a120003, "Nanosira" }, @@ -12441,6 +12634,7 @@ { 0x0a5c6300, "Pirelli Remote NDIS Device" }, { 0x0a5cbd11, "TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]" }, { 0x0a5cbd13, "BCM4323 802.11abgn Wireless Adapter" }, + { 0x0a5cbd16, "BCM4319 802.11bgn Wireless Adapter" }, { 0x0a5cbd17, "BCM43236 802.11abgn Wireless Adapter" }, { 0x0a5cd11b, "Eminent EM4045 [Broadcom 4320 USB]" }, { 0x0a5f0009, "LP2844 Printer" }, @@ -12575,6 +12769,7 @@ { 0x0ac8c326, "Namuga 1.3M Webcam" }, { 0x0ac8c33f, "Webcam" }, { 0x0ac8c429, "Lenovo ThinkCentre Web Camera" }, + { 0x0ac8c42d, "Lenovo IdeaCentre Web Camera" }, { 0x0ac90000, "Backpack CD-ReWriter" }, { 0x0ac90001, "BACKPACK 2 Cable" }, { 0x0ac90010, "BACKPACK" }, @@ -12587,6 +12782,7 @@ { 0x0acd0401, "Spectrum III Hybrid Smartcard Reader" }, { 0x0acd0630, "Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC" }, { 0x0acd0810, "SecurePIN (IDPA-506100Y) PIN Pad" }, + { 0x0acd2030, "ValueMag Magnetic Stripe Reader" }, { 0x0ace1201, "ZD1201 802.11b" }, { 0x0ace1211, "ZD1211 802.11g" }, { 0x0ace1215, "ZD1211B 802.11g" }, @@ -12636,6 +12832,8 @@ { 0x0af70101, "Digital TV USB Receiver (DVB-S/T/C / ATSC)" }, { 0x0af90010, "USB SightCam 100" }, { 0x0af90011, "Micro Innovations IC50C Webcam" }, + { 0x0afa07d2, "Controller Board for Projected Capacitive Touch Screen DUS3000" }, + { 0x0b050001, "MeMO Pad HD 7 (CD-ROM mode)" }, { 0x0b051101, "Mass Storage (UISDMC4S)" }, { 0x0b051706, "WL-167G v1 802.11g Adapter [Ralink RT2571]" }, { 0x0b051707, "WL-167G v1 802.11g Adapter [Ralink RT2571]" }, @@ -12671,12 +12869,15 @@ { 0x0b051779, "My Cinema U3100 Mini Plus [AF9035A]" }, { 0x0b051784, "USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072]" }, { 0x0b051786, "USB-N10 802.11n Network Adapter [Realtek RTL8188SU]" }, + { 0x0b051788, "BT-270 Bluetooth Adapter" }, { 0x0b051791, "WL-167G v3 802.11n Adapter [Realtek RTL8188SU]" }, { 0x0b05179d, "USB-N53 802.11abgn Network Adapter [Ralink RT3572]" }, { 0x0b05179e, "Eee Note EA800 (network mode)" }, { 0x0b05179f, "Eee Note EA800 (tablet mode)" }, + { 0x0b0517a0, "Xonar U3 sound card" }, { 0x0b0517a1, "Eee Note EA800 (mass storage mode)" }, { 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" }, + { 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" }, { 0x0b054c80, "Asus TF300 Transformer" }, { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" }, { 0x0b054c90, "Asus TF700 Transformer" }, @@ -12688,6 +12889,8 @@ { 0x0b054e01, "Asus TF101 Eeepad Slider" }, { 0x0b054e0f, "Asus TF101 Eeepad Transformer" }, { 0x0b054e1f, "Asus TF101 Eeepad Transformer (debug mode)" }, + { 0x0b055410, "MeMO Pad HD 7 (MTP mode)" }, + { 0x0b055412, "MeMO Pad HD 7 (PTP mode)" }, { 0x0b056101, "Cable Modem" }, { 0x0b05620a, "Remote NDIS Device" }, { 0x0b05b700, "Broadcom Bluetooth 2.1" }, @@ -12699,7 +12902,9 @@ { 0x0b0c0050, "Argos Mini II Smart Card Reader (CCID)" }, { 0x0b0d0000, "CenturyCD" }, { 0x0b0e0420, "Jabra SPEAK 510" }, + { 0x0b0e094d, "GN Netcom / Jabra REVO Wireless" }, { 0x0b0e1022, "Jabra PRO 9450, Type 9400BS (DECT Headset)" }, + { 0x0b0e2007, "GN 2000 Stereo Corded Headset" }, { 0x0b0e620c, "Jabra BT620s" }, { 0x0b0e9330, "Jabra GN9330 Headset" }, { 0x0b1e8007, "Blackhawk USB560-BP JTAG Emulator" }, @@ -12707,6 +12912,7 @@ { 0x0b28100c, "Kenwood Media Keg HD10GB7 Sport Player" }, { 0x0b300006, "SM Media-Shuttle Card Reader" }, { 0x0b330020, "ShuttleXpress" }, + { 0x0b330700, "RollerMouse Pro" }, { 0x0b380003, "Keyboard" }, { 0x0b380010, "107-Key Keyboard" }, { 0x0b390001, "Composite USB PS2 Converter" }, @@ -12785,6 +12991,7 @@ { 0x0b8c00c3, "Sympodium ID350" }, { 0x0b951720, "10/100 Ethernet" }, { 0x0b951780, "AX88178" }, + { 0x0b951790, "AX88179 Gigabit Ethernet" }, { 0x0b957720, "AX88772" }, { 0x0b95772a, "AX88772A Fast Ethernet" }, { 0x0b95772b, "AX88772B" }, @@ -12810,6 +13017,7 @@ { 0x0baf0118, "U5 802.11g Adapter" }, { 0x0baf011b, "Wireless MAXg Adapter [Broadcom 4320]" }, { 0x0baf0121, "USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B]" }, + { 0x0baf0303, "USR5637 56K Faxmodem" }, { 0x0baf6112, "FaxModem Model 5633" }, { 0x0bb00100, "Sound Vision Stream" }, { 0x0bb05007, "3340z/Rollei DC3100" }, @@ -12987,6 +13195,7 @@ { 0x0bb40bce, "Vario MDA" }, { 0x0bb40c01, "Dream / ADP1 / G1 / Magic / Tattoo" }, { 0x0bb40c02, "HTC Zopo ZP100 (ID1)" }, + { 0x0bb40c03, "Android Phone [Fairphone First Edition (FP1)]" }, { 0x0bb40c13, "Diamond" }, { 0x0bb40c1f, "Sony Ericsson XPERIA X1" }, { 0x0bb40c5f, "Snap" }, @@ -13002,6 +13211,8 @@ { 0x0bb40ca2, "Desire HD (debug mode)" }, { 0x0bb40ca5, "Android Phone [Evo Shift 4G]" }, { 0x0bb40ca8, "HTC EVO 4G LTE (second ID)" }, + { 0x0bb40cae, "T-Mobile MyTouch 4G Slide [Doubleshot]" }, + { 0x0bb40dea, "M7_UL [HTC One]" }, { 0x0bb40ff8, "Desire HD (Tethering Mode)" }, { 0x0bb40ff9, "Desire / Desire HD / Hero / Thunderbolt (Charge Mode)" }, { 0x0bb40ffe, "Desire HD (modem mode)" }, @@ -13016,10 +13227,15 @@ { 0x0bc22300, "Expansion Portable" }, { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" }, { 0x0bc23008, "FreeAgent Desk 1TB" }, + { 0x0bc23101, "FreeAgent XTreme 640GB" }, + { 0x0bc23312, "SRD00F2 [Expansion Desktop Drive 2TB]" }, { 0x0bc23320, "SRD00F2 [Expansion Desktop Drive]" }, { 0x0bc23332, "Expansion" }, + { 0x0bc25020, "FreeAgent GoFlex" }, { 0x0bc25021, "FreeAgent GoFlex USB 2.0" }, + { 0x0bc25030, "FreeAgent GoFlex Upgrade Cable STAE104" }, { 0x0bc25031, "FreeAgent GoFlex USB 3.0" }, + { 0x0bc25070, "FreeAgent GoFlex Desk" }, { 0x0bc250a1, "FreeAgent GoFlex Desk" }, { 0x0bc250a5, "FreeAgent GoFlex Desk USB 3.0" }, { 0x0bc25121, "FreeAgent GoFlex" }, @@ -13027,6 +13243,7 @@ { 0x0bc2a003, "Backup Plus" }, { 0x0bc2a0a1, "Backup Plus Desktop" }, { 0x0bc2a0a4, "Backup Plus Desktop Drive" }, + { 0x0bc2ab00, "Slim Portable Drive" }, { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" }, { 0x0bc70001, "ActiveHome (ACPI-compliant)" }, { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" }, @@ -13074,6 +13291,8 @@ { 0x0bda0178, "Mass Storage Device" }, { 0x0bda0184, "RTS5182 Card Reader" }, { 0x0bda0186, "Card Reader" }, + { 0x0bda0301, "multicard reader" }, + { 0x0bda1724, "RTL8723AU 802.11n WLAN Adapter" }, { 0x0bda2831, "RTL2831U DVB-T" }, { 0x0bda2832, "RTL2832U DVB-T" }, { 0x0bda2838, "RTL2838 DVB-T" }, @@ -13093,6 +13312,7 @@ { 0x0bda8197, "RTL8187B Wireless Adapter" }, { 0x0bda8198, "RTL8187B Wireless Adapter" }, { 0x0bda8199, "RTL8187SU 802.11g WLAN Adapter" }, + { 0x0bda8812, "RTL8812AU 802.11a/b/g/n/ac WLAN Adapter" }, { 0x0bdb1000, "BV Bluetooth Device" }, { 0x0bdb1002, "Bluetooth Device 1.2" }, { 0x0bdb1049, "C3607w Mobile Broadband Module" }, @@ -13165,7 +13385,7 @@ { 0x0c240012, "Bluetooth Device(BC04-External)" }, { 0x0c240018, "Bluetooth Device(BC04-External)" }, { 0x0c240019, "Bluetooth Device" }, - { 0x0c240021, "Bluetooth Device" }, + { 0x0c240021, "Bluetooth Device (V2.1+EDR)" }, { 0x0c240c24, "Bluetooth Device(SAMPLE)" }, { 0x0c24ffff, "Bluetooth module with BlueCore in DFU mode" }, { 0x0c250310, "Scream Cam" }, @@ -13184,6 +13404,7 @@ { 0x0c4403a2, "iDEN Smartphone" }, { 0x0c4441d9, "i1 phone" }, { 0x0c450011, "EBUDDY" }, + { 0x0c450520, "MaxTrack Wireless Mouse" }, { 0x0c451018, "Compact Flash storage memory card reader" }, { 0x0c451020, "Mass Storage Reader" }, { 0x0c451028, "Mass Storage Reader" }, @@ -13302,7 +13523,9 @@ { 0x0c4562be, "PC Camera with Microphone (SN9C202 + OV7663)" }, { 0x0c4562c0, "Sonix USB 2.0 Camera" }, { 0x0c4562e0, "MSI Starcam Racer" }, + { 0x0c456300, "PC Microscope camera" }, { 0x0c456310, "Sonix USB 2.0 Camera" }, + { 0x0c456340, "Camera" }, { 0x0c456341, "Defender G-Lens 2577 HD720p Camera" }, { 0x0c4563e0, "Sonix Integrated Webcam" }, { 0x0c4563f1, "Integrated Webcam" }, @@ -13312,9 +13535,12 @@ { 0x0c456417, "Integrated Webcam" }, { 0x0c456419, "Integrated Webcam" }, { 0x0c45641d, "1.3 MPixel Integrated Webcam" }, + { 0x0c45643f, "Dell Integrated HD Webcam" }, + { 0x0c45644d, "1.3 MPixel Integrated Webcam" }, { 0x0c456480, "Sonix 1.3 MP Laptop Integrated Webcam" }, { 0x0c45648b, "Integrated Webcam" }, { 0x0c4564bd, "Sony Visual Communication Camera" }, + { 0x0c457401, "TEMPer Temperature Sensor" }, { 0x0c457402, "TEMPerHUM Temperature & Humidity Sensor" }, { 0x0c457403, "Foot Switch" }, { 0x0c458000, "DC31VC" }, @@ -13509,6 +13735,7 @@ { 0x0cf320ff, "AR7010 (no firmware)" }, { 0x0cf33000, "AR3011 Bluetooth (no firmware)" }, { 0x0cf33002, "AR3011 Bluetooth" }, + { 0x0cf33004, "AR3012 Bluetooth 4.0" }, { 0x0cf33005, "AR3011 Bluetooth" }, { 0x0cf33008, "Bluetooth (AR3011)" }, { 0x0cf37015, "TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]" }, @@ -13535,7 +13762,11 @@ { 0x0d160105, "Photo Printer 64xPS" }, { 0x0d160200, "Photo Printer 64xDL" }, { 0x0d280204, "LPC1768" }, + { 0x0d3a0206, "Series 3xxx Cash Drawer" }, + { 0x0d3a0207, "Series 3xxx Cash Drawer" }, + { 0x0d3a0500, "Magnetic Stripe Reader" }, { 0x0d3d0001, "HID Keyboard" }, + { 0x0d3d0040, "PS/2 Adapter" }, { 0x0d462012, "KAAN Standard Plus (Smartcard reader)" }, { 0x0d463003, "mIDentity Light / KAAN SIM III" }, { 0x0d464000, "mIDentity (mass storage)" }, @@ -13554,6 +13785,7 @@ { 0x0d497000, "OneTouch" }, { 0x0d497010, "OneTouch" }, { 0x0d497100, "OneTouch II 300GB External Hard Disk" }, + { 0x0d497310, "OneTouch 4" }, { 0x0d497410, "Mobile Hard Disk Drive (1TB)" }, { 0x0d497450, "Basics Portable USB Device" }, { 0x0d4e047a, "WLAN Card" }, @@ -13587,6 +13819,7 @@ { 0x0d642208, "Mass Storage" }, { 0x0d643105, "Dual Mode Digital Camera Disk" }, { 0x0d643108, "Digicam Mass Storage Device" }, + { 0x0d7a0001, "CrypToken" }, { 0x0d7d0100, "PS1001/1011/1006/1026 Flash Disk" }, { 0x0d7d0110, "Gigabyte FlexDrive" }, { 0x0d7d0120, "Disk Pro 64MB" }, @@ -13728,6 +13961,7 @@ { 0x0db0b970, "Bluetooth EDR Device" }, { 0x0db0b97a, "Bluetooth EDR Device" }, { 0x0db70002, "Goldpfeil P-LAN" }, + { 0x0dba3000, "Mbox 2" }, { 0x0dbc0003, "AND Serial Cable [AND Smart Cable]" }, { 0x0dbf0002, "SmartDongle Security Key" }, { 0x0dbf0200, "HDD Storage Solution" }, @@ -13820,6 +14054,7 @@ { 0x0df6005d, "WLA-2000 v1.001 WLAN [RTL8191SU]" }, { 0x0df60060, "WLA-4000 802.11bgn [Ralink RT3072]" }, { 0x0df60062, "WLA-5000 802.11abgn [Ralink RT3572]" }, + { 0x0df60072, "AX88179 Gigabit Ethernet [Sitecom]" }, { 0x0df6061c, "LN-028 Network USB 2.0 Adapter" }, { 0x0df621f4, "44 St Bluetooth Device" }, { 0x0df62200, "Sitecom bluetooth2.0 class 2 dongle CN-512" }, @@ -13979,6 +14214,7 @@ { 0x0e791539, "Archos 101 G9 Turbo" }, { 0x0e791568, "Archos 70it2 (mode 1)" }, { 0x0e791569, "Archos 70it2 (mode 2)" }, + { 0x0e793001, "40 Titanium" }, { 0x0e7e0001, "Yopy 3000 PDA" }, { 0x0e7e1001, "YP3X00 PDA" }, { 0x0e8d0003, "MT6227 phone" }, @@ -13986,9 +14222,11 @@ { 0x0e8d0023, "S103" }, { 0x0e8d1806, "Samsung SE-208AB Slim Portable DVD Writer" }, { 0x0e8d1836, "Samsung SE-S084 Super WriteMaster Slim External DVD writer" }, + { 0x0e8d2000, "MT65xx Preloader" }, { 0x0e8d3329, "Qstarz BT-Q1000XT" }, + { 0x0e8d763e, "MT7630e Bluetooth Adapter" }, { 0x0e8f0003, "MaxFire Blaze2" }, - { 0x0e8f0012, "USB Wireless 2.4GHz Gamepad" }, + { 0x0e8f0012, "Joystick/Gamepad" }, { 0x0e8f0016, "4 port USB 1.1 hub UH-174" }, { 0x0e8f0020, "USB to PS/2 Adapter" }, { 0x0e8f0021, "Multimedia Keyboard Controller" }, @@ -14009,7 +14247,9 @@ { 0x0eb16666, "WinFast WalkieTV TV Loader" }, { 0x0eb16668, "WinFast WalkieTV TV Loader" }, { 0x0eb17007, "WinFast WalkieTV WDM Capture" }, + { 0x0eb82200, "Ariva Scale" }, { 0x0eb8f000, "PS60 Scale" }, + { 0x0ebb0002, "FT-IR Spectrometer" }, { 0x0ec71008, "So., Show 301 Digital Camera" }, { 0x0ecd1400, "CD\\\\RW 40X" }, { 0x0ecda100, "LDW-411SX DVD/CD Rewritable Drive" }, @@ -14024,6 +14264,8 @@ { 0x0eee8810, "Mass Storage Drive" }, { 0x0eef0001, "eGalax TouchScreen" }, { 0x0eef0002, "Touchscreen Controller(Professional)" }, + { 0x0eef7200, "Touchscreen Controller" }, + { 0x0eefa802, "eGalaxTouch EXC7920" }, { 0x0ef52202, "Flash Disk" }, { 0x0ef52366, "Flash Disk" }, { 0x0f030001, "Alpha 1200Sx" }, @@ -14042,6 +14284,7 @@ { 0x0f112020, "Network Analyser" }, { 0x0f112030, "Converter Control Unit" }, { 0x0f112040, "Machine Test System" }, + { 0x0f140012, "Vital'Act 3S" }, { 0x0f180002, "CCD" }, { 0x0f180006, "Focuser" }, { 0x0f180007, "Filter Wheel" }, @@ -14053,6 +14296,7 @@ { 0x0f300110, "Dual Analog Rumble Pad" }, { 0x0f300111, "Colour Rumble Pad" }, { 0x0f300208, "Xbox & PC Gamepad" }, + { 0x0f390876, "Keyboard [87 Francium Pro]" }, { 0x0f3d0112, "CDMA 1xEVDO PC Card, PC 5220" }, { 0x0f44ef11, "Patriot (firmware not loaded)" }, { 0x0f44ef12, "Patriot" }, @@ -14063,6 +14307,7 @@ { 0x0f5d9455, "Compact Drive" }, { 0x0f621001, "Targus Mini Trackball Optical Mouse" }, { 0x0f630010, "Leapster Explorer" }, + { 0x0f630022, "Leap Reader" }, { 0x0f630500, "Fly Fusion" }, { 0x0f630600, "Leap Port Turbo" }, { 0x0f630700, "POGO" }, @@ -14100,7 +14345,7 @@ { 0x0fca0006, "Blackberry Pearl" }, { 0x0fca0008, "Blackberry Pearl" }, { 0x0fca8001, "Blackberry Handheld" }, - { 0x0fca8004, "Blackberry Handheld" }, + { 0x0fca8004, "Blackberry" }, { 0x0fca8007, "RIM BlackBerry Storm/9650" }, { 0x0fca8010, "Blackberry Playbook (Connect to Windows mode)" }, { 0x0fca8011, "Blackberry Playbook (Connect to Mac mode)" }, @@ -14255,10 +14500,12 @@ { 0x0fcee161, "Xperia Ray" }, { 0x0fcee166, "Xperia Mini Pro" }, { 0x0fcee167, "XPERIA mini" }, + { 0x0fcef0fa, "Liveview micro display MN800 in DFU mode" }, { 0x0fcf1003, "ANT Development Board" }, - { 0x0fcf1004, "ANT2USB" }, + { 0x0fcf1004, "ANTUSB Stick" }, { 0x0fcf1006, "ANT Development Board" }, - { 0x0fcf1008, "Mini stick Suunto" }, + { 0x0fcf1008, "ANTUSB2 Stick" }, + { 0x0fcf1009, "ANTUSB-m Stick" }, { 0x0fd20001, "RDS 6000" }, { 0x0fd90011, "EyeTV Diversity" }, { 0x0fd90018, "EyeTV Hybrid" }, @@ -14269,6 +14516,7 @@ { 0x0fd90033, "Video Capture" }, { 0x0fd90037, "Video Capture v2" }, { 0x0fda0100, "quanton flight control" }, + { 0x0fdeca01, "WMRS200 weather station" }, { 0x0fe00100, "Bluetooth Mouse" }, { 0x0fe00101, "Bluetooth IMU" }, { 0x0fe00200, "Bluetooth Keypad" }, @@ -14283,6 +14531,7 @@ { 0x0fe9db78, "FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized)" }, { 0x0ffc0021, "Nord Stage 2" }, { 0x0ffdff00, "OEM" }, + { 0x1000153b, "TerraTec Electronic GmbH" }, { 0x10030003, "SD14" }, { 0x10030100, "SD9/SD10" }, { 0x10041fae, "U8120 3G Cellphone" }, @@ -14296,6 +14545,7 @@ { 0x1004618e, "Ally/Optimus One/Vortex (debug mode)" }, { 0x1004618f, "Ally/Optimus One" }, { 0x1004619a, "LG Electronics Inc. LG8575" }, + { 0x100461c5, "P880 / Charge only" }, { 0x100461c6, "Vortex (msc)" }, { 0x100461cc, "Optimus S" }, { 0x100461f1, "Optimus Android Phone [LG Software mode]" }, @@ -14304,10 +14554,13 @@ { 0x100461fe, "Optimus Android Phone [USB tethering mode]" }, { 0x10046300, "Optimus Android Phone" }, { 0x1004631c, "LG Electronics Inc. LG-E617G/P700" }, + { 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" }, { 0x1004631e, "Optimus Android Phone [Camera/PTP mode]" }, + { 0x1004631f, "Optimus Android Phone (Charge Mode)" }, { 0x10046356, "Optimus Android Phone [Virtual CD mode]" }, { 0x10046800, "CDMA Modem" }, { 0x10047000, "LG LDP-7024D(LD)USB" }, + { 0x100491c8, "P880 / USB tethering" }, { 0x1004a400, "Renoir (KC910)" }, { 0x10051001, "MP3 Player" }, { 0x10051004, "MP3 Player" }, @@ -14348,8 +14601,8 @@ { 0x102c6151, "Q-Cam Sangha CIF" }, { 0x102c6251, "Q-Cam VGA" }, { 0x10330068, "3,5'' HDD case MD-231" }, - { 0x10380100, "Zboard" }, - { 0x10381361, "Sensei" }, + { 0x10380100, "Ideazon Zboard" }, + { 0x10381361, "Ideazon Sensei" }, { 0x10390824, "1866 802.11bg [Texas Instruments TNETW1450]" }, { 0x10392140, "dsl+ 1100 duo" }, { 0x103d0100, "ScratchAmp" }, @@ -14399,21 +14652,28 @@ { 0x10580500, "hub" }, { 0x10580702, "Passport External HDD" }, { 0x10580704, "Passport External HDD" }, - { 0x1058070a, "My Passport Essential SE" }, + { 0x1058070a, "My Passport Essential SE, My Passport for Mac (WDBAAB)" }, { 0x1058071a, "My Passport" }, - { 0x10580730, "My Passport" }, + { 0x10580730, "My Passport Essential (WDBACY)" }, { 0x10580740, "My Passport" }, + { 0x10580741, "My Passport Ultra" }, { 0x10580742, "My Passport Essential SE" }, - { 0x10580748, "My Passport 1TB USB 3.0" }, + { 0x10580748, "My Passport (WDBKXH)" }, + { 0x10580810, "My Passport Ultra" }, { 0x10580900, "MyBook Essential External HDD" }, - { 0x10580901, "MyBook External HDD" }, + { 0x10580901, "My Book Essential Edition (Green Ring)" }, + { 0x10580902, "My Book Pro Edition" }, { 0x10580903, "My Book Premium Edition" }, { 0x10580910, "MyBook Essential External HDD" }, - { 0x10581001, "External Hard Disk [Elements]" }, + { 0x10581001, "Elements Desktop (WDE1U)" }, { 0x10581003, "Elements 1000 GB" }, - { 0x10581010, "Elements External HDD" }, - { 0x10581021, "Elements 2TB" }, + { 0x10581010, "Elements Portable (WDBAAR)" }, + { 0x10581021, "Elements Desktop (WDBAAU)" }, { 0x10581023, "Elements SE" }, + { 0x10581048, "Elements Portable (WDBU6Y)" }, + { 0x105810a2, "Elements SE Portable (WDBPCK)" }, + { 0x105810a8, "Elements Portable (WDBUZG)" }, + { 0x10581100, "My Book Essential Edition 2.0 (WDH1U)" }, { 0x10581103, "My Book Studio" }, { 0x10581104, "MyBook Mirror Edition External HDD" }, { 0x10581105, "My Book Studio II" }, @@ -14496,6 +14756,7 @@ { 0x106cf003, "Pantech Crux" }, { 0x106f0009, "CT10x Coin Transaction" }, { 0x106f000a, "CR10x Coin Recycler" }, + { 0x106f000c, "Xchange" }, { 0x10760031, "Bluetooth Device" }, { 0x10760032, "Bluetooth Device" }, { 0x107b3009, "eHome Infrared Transceiver" }, @@ -14503,6 +14764,7 @@ { 0x107b55f2, "WGU-210 802.11g Adapter [Intersil ISL3886]" }, { 0x1083161b, "DR-2010C Scanner" }, { 0x1083162c, "P-150 Scanner" }, + { 0x109b9118, "Medion P4013 Mobile" }, { 0x109f3163, "Trigem Mobile SmartDisplay84" }, { 0x109f3164, "Trigem Mobile SmartDisplay121" }, { 0x10a91102, "Sky Love Actually IM-U460K" }, @@ -14529,6 +14791,8 @@ { 0x10b80bc7, "DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm)" }, { 0x10bd1427, "Ethernet" }, { 0x10bf0001, "SmartHome PowerLinc" }, + { 0x10c300a4, "ULS PLS Series Laser Engraver Firmware Loader" }, + { 0x10c300a5, "ULS Print Support" }, { 0x10c40002, "F32x USBXpress Device" }, { 0x10c40003, "CommandIR" }, { 0x10c48030, "K4JRG Ham Radio devices" }, @@ -14545,12 +14809,15 @@ { 0x10c48460, "Sangoma Wanpipe VoiceTime" }, { 0x10c48461, "Sangoma U100" }, { 0x10c48477, "Balluff RFID Reader" }, + { 0x10c48496, "SiLabs Cypress FW downloader" }, + { 0x10c48497, "SiLabs Cypress EVB" }, { 0x10c48605, "dilitronics ESoLUX solar lighting controller" }, { 0x10c486bc, "C8051F34x AudioDelay [AD-340]" }, { 0x10c48789, "C8051F34x Extender & EDID MGR [EMX-DVI]" }, { 0x10c487be, "C8051F34x HDMI Audio Extractor [EMX-HD-AUD]" }, { 0x10c48863, "C8051F34x Bootloader" }, { 0x10c48897, "C8051F38x HDMI Splitter [UHBX]" }, + { 0x10c48918, "C8051F38x HDMI Audio Extractor [VSA-HA-DP]" }, { 0x10c4ea60, "CP210x UART Bridge / myAVR mySmartUSB light" }, { 0x10c4ea61, "CP210x UART Bridge" }, { 0x10c4ea70, "CP210x UART Bridge" }, @@ -14636,9 +14903,11 @@ { 0x11324337, "PDR-M11" }, { 0x11324338, "PDR-M25" }, { 0x11363131, "CTS LS515" }, + { 0x11420709, "Cyberview High Speed Scanner" }, { 0x11450001, "AirH PHONE AH-J3001V/J3002V" }, { 0x114b0110, "Turbolink UB801R WLAN Adapter" }, { 0x114b0150, "Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187]" }, + { 0x114f1234, "Fastrack Xtend FXT001 Modem" }, { 0x11630100, "Earthmate GPS (orig)" }, { 0x11630200, "Earthmate GPS (LT-20, LT-40)" }, { 0x11632020, "Earthmate GPS (PN-40)" }, @@ -14677,7 +14946,7 @@ { 0x11996832, "MC8780 Device" }, { 0x11996833, "MC8781 Device" }, { 0x1199683a, "MC8785 Device" }, - { 0x1199683c, "MC8790 Device" }, + { 0x1199683c, "Mobile Broadband 3G/UMTS (MC8790 Device)" }, { 0x11996850, "AirCard 880 Device" }, { 0x11996851, "AirCard 881 Device" }, { 0x11996852, "AirCard 880E Device" }, @@ -14700,13 +14969,19 @@ { 0x11999008, "Gobi 2000 Wireless Modem" }, { 0x11999009, "Gobi 2000 Wireless Modem" }, { 0x1199900a, "Gobi 2000 Wireless Modem" }, + { 0x11999055, "Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode)" }, + { 0x11999057, "Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode)" }, { 0x119b0400, "Infrared Keyboard V2.01" }, { 0x11a0eb11, "CC2400EB 2.0 ZigBee Sniffer" }, { 0x11a38031, "MP3 Player" }, { 0x11a38032, "MP3 Player" }, { 0x11aa1518, "iREZ K2" }, { 0x11ac6565, "FuelBand" }, + { 0x11b06208, "PRO-28U" }, + { 0x11bef0a0, "Martin Maxxyz DMX" }, { 0x11c50521, "IMT-0521 Smartcard Reader" }, + { 0x11ca0207, "PIN Pad VX 810" }, + { 0x11ca0220, "PIN Pad VX 805" }, { 0x11db1000, "PVR" }, { 0x11db1100, "PVR" }, { 0x11f50001, "SX1" }, @@ -14714,8 +14989,9 @@ { 0x11f50004, "X75" }, { 0x11f50005, "SXG75/EF81" }, { 0x11f50008, "UMTS/HSDPA Data Card" }, + { 0x11f50101, "RCU Connect" }, { 0x11f62001, "Willcom WSIM" }, - { 0x11f702df, "TD10 Mobile phone USB cable" }, + { 0x11f702df, "Serial cable (v2) for TD-10 Mobile Phone" }, { 0x12030140, "TTP-245C" }, { 0x12091001, "USB Hub" }, { 0x12091002, "USB Relais" }, @@ -14730,21 +15006,52 @@ { 0x121e3403, "Muzio JM250 Audio Player" }, { 0x12280012, "Q18 Data Logger" }, { 0x12280015, "TPaq21/MPaq21 Datalogger" }, + { 0x1228584c, "XL2 Logger" }, { 0x12335677, "FUSB200 mp3 player" }, { 0x12340000, "Neural Impulse Actuator Prototype 1.0 [NIA]" }, { 0x12344321, "Human Interface Device" }, { 0x1234ed02, "Emotiv EPOC Developer Headset Wireless Dongle" }, - { 0x12350001, "ReMOTE Audio/XStation" }, + { 0x12350001, "ReMOTE Audio/XStation First Edition" }, { 0x12350002, "Speedio" }, - { 0x12350003, "ReMOTE ZeRO SL" }, + { 0x12350003, "RemoteSL + ZeroSL" }, + { 0x12350004, "ReMOTE LE" }, + { 0x12350005, "XIOSynth [First Edition]" }, + { 0x12350006, "XStation" }, + { 0x12350007, "XIOSynth" }, + { 0x12350008, "ReMOTE SL Compact" }, + { 0x12350009, "nIO" }, + { 0x1235000a, "Nocturn" }, + { 0x1235000b, "ReMOTE SL MkII" }, + { 0x1235000c, "ZeRO MkII" }, + { 0x1235000e, "Launchpad" }, + { 0x12350010, "Saffire 6" }, + { 0x12350011, "Ultranova" }, + { 0x12350012, "Nocturn Keyboard" }, + { 0x12350013, "VRM Box" }, + { 0x12350014, "VRM Box Audio Class (2-out)" }, + { 0x12350015, "Dicer" }, + { 0x12350016, "Ultranova" }, + { 0x12350018, "Twitch" }, + { 0x12350019, "Impulse 25" }, + { 0x1235001a, "Impulse 49" }, + { 0x1235001b, "Impulse 61" }, { 0x12354661, "ReMOTE25" }, + { 0x12358000, "Scarlett 18i6" }, + { 0x12358002, "Scarlett 8i6" }, { 0x12358006, "Focusrite Scarlett 2i2" }, + { 0x12358008, "Saffire 6" }, + { 0x1235800a, "Scarlett 2i4" }, + { 0x1235800c, "Scarlett 18i20" }, + { 0x1235800e, "iTrack Solo" }, + { 0x12358010, "Forte" }, + { 0x12358012, "Scarlett 6i6" }, + { 0x12358014, "Scarlett 18i8" }, { 0x12410504, "Wireless Trackball Keyboard" }, { 0x12411111, "Mouse" }, { 0x12411122, "Typhoon Stream Optical Mouse USB+PS/2" }, { 0x12411155, "PS2/USB Browser Combo Mouse" }, { 0x12411166, "MI-2150 Trust Mouse" }, - { 0x12411177, "F8E842-DL Mouse" }, + { 0x12411177, "Mouse [HT82M21A]" }, { 0x12411503, "Keyboard" }, { 0x12411603, "Keyboard" }, { 0x1241f767, "Keyboard" }, @@ -14757,11 +15064,13 @@ { 0x125c0010, "Alta series CCD" }, { 0x125f312a, "Superior S102" }, { 0x125f312b, "Superior S102 Pro" }, + { 0x125fa22a, "DashDrive Elite HE720 500GB" }, { 0x125fa91a, "Portable HDD CH91" }, { 0x125fc08a, "C008 Flash Drive" }, { 0x125fc81a, "Flash drive" }, { 0x125fc93a, "4GB Pen Drive" }, { 0x125fc96a, "C906 Flash Drive" }, + { 0x125fcb10, "Dash Drive UV100" }, { 0x1260ee22, "SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]" }, { 0x12666302, "Fastweb DRG A226M ADSL Router" }, { 0x12670103, "G-720 Keyboard" }, @@ -14802,6 +15111,7 @@ { 0x12830121, "emed-AT" }, { 0x12830130, "PDM" }, { 0x12830150, "CMS10GI (Golf)" }, + { 0x128600bc, "Marvell JTAG Probe" }, { 0x12861fab, "88W8338 [Libertas] 802.11g" }, { 0x12862001, "88W8388 802.11a/b/g WLAN" }, { 0x12862006, "88W8362 802.11n WLAN" }, @@ -14823,6 +15133,7 @@ { 0x12ba0210, "Harmonix Drum Kit for PlayStation(R)3" }, { 0x12c40006, "Teleprompter Two-button Hand Control (v1)" }, { 0x12c40008, "Teleprompter Foot Control (v1)" }, + { 0x12cf0170, "Tt eSPORTS BLACK Gaming mouse" }, { 0x12d11001, "E169/E620/E800 HSDPA Modem" }, { 0x12d11003, "E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem" }, { 0x12d11004, "E220 (bis)" }, @@ -14846,7 +15157,9 @@ { 0x12d114c9, "K3770 3G Modem" }, { 0x12d114cf, "K3772" }, { 0x12d114d1, "K3770 3G Modem (Mass Storage Mode)" }, + { 0x12d114db, "E353/E3131" }, { 0x12d114f1, "Gobi 3000 HSPA+ Modem" }, + { 0x12d114fe, "Modem (Mass Storage Mode)" }, { 0x12d11501, "Pulse" }, { 0x12d11505, "E398 LTE/UMTS/GSM Modem/Networkcard" }, { 0x12d11506, "Modem/Networkcard" }, @@ -14854,16 +15167,21 @@ { 0x12d11520, "K3765 HSPA" }, { 0x12d11521, "K4505 HSPA+" }, { 0x12d1155a, "R205 Mobile WiFi (CD-ROM mode)" }, + { 0x12d11575, "K5150 LTE modem" }, + { 0x12d115ca, "E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)" }, { 0x12d11805, "AT&T Go Phone U2800A phone" }, { 0x12d11c05, "E173s 3G broadband stick (modem on)" }, { 0x12d11c0b, "E173s 3G broadband stick (modem off)" }, { 0x12d11c20, "R205 Mobile WiFi (Charging)" }, { 0x12d11d50, "ET302s TD-SCDMA/TD-HSDPA Mobile Broadband" }, + { 0x12d11f01, "E353/E3131 (Mass storage mode)" }, + { 0x12d11f16, "K5150 LTE modem (Mass Storage Mode)" }, { 0x12d1360f, "Huawei Mediapad (mode 0)" }, { 0x12d1361f, "Huawei Mediapad (mode 1)" }, { 0x12d1380b, "WiMAX USB modem(s)" }, { 0x12d60444, "CPC-USB/ARM7" }, { 0x12d60888, "CPC-USB/M16C" }, + { 0x12d80001, "Alea I True Random Number Generator" }, { 0x12e60013, "Blofeld" }, { 0x12ef0100, "Tapwave Handheld [Tapwave Zodiac]" }, { 0x12f71a00, "TD Classic 003B" }, @@ -14873,7 +15191,7 @@ { 0x13021016, "Haier Ibiza Rhapsody" }, { 0x13021017, "Haier Ibiza Rhapsody" }, { 0x13070163, "256MB/512MB/1GB Flash Drive" }, - { 0x13070165, "2GB/4GB Flash Drive" }, + { 0x13070165, "2GB/4GB/8GB Flash Drive" }, { 0x13070190, "Ut190 8 GB Flash Drive with MicroSD reader" }, { 0x13070310, "SD/MicroSD CardReader [hama]" }, { 0x13070330, "63-in-1 Multi-Card Reader/Writer" }, @@ -14883,6 +15201,21 @@ { 0x13080003, "VFD Module" }, { 0x1308c001, "eHome Infrared Transceiver" }, { 0x13100001, "Class 1 Bluetooth Dongle" }, + { 0x13130010, "LC1 Linear Camera (Jungo)" }, + { 0x13130011, "SP1 Spectrometer (Jungo)" }, + { 0x13130012, "SP2 Spectrometer (Jungo)" }, + { 0x13130110, "LC1 Linear Camera (VISA)" }, + { 0x13130111, "SP1 Spectrometer (VISA)" }, + { 0x13130112, "SP2 Spectrometer (VISA)" }, + { 0x13138001, "TXP-Series Slot (TXP5001, TXP5004)" }, + { 0x13138012, "BC106 Camera Beam Profiler" }, + { 0x13138013, "WFS10 Wavefront Sensor" }, + { 0x13138017, "BC206 Camera Beam Profiler" }, + { 0x13138019, "BP2 Multi Slit Beam Profiler" }, + { 0x13138020, "PM300 Optical Power Meter" }, + { 0x13138021, "PM300E Optical Power and Energy Meter" }, + { 0x13138022, "PM320E Optical Power and Energy Meter" }, + { 0x13138030, "ER100 Extinction Ratio Meter" }, { 0x13138070, "PM100D" }, { 0x131d0155, "TrackIR 3 Pro Head Tracker" }, { 0x131d0156, "TrackIR 4 Pro Head Tracker" }, @@ -14923,6 +15256,9 @@ { 0x13420203, "EasiDock 200 Printer Port" }, { 0x13420204, "Ethernet" }, { 0x13420304, "EasiDock Ethernet" }, + { 0x13430003, "CX / DNP DS40" }, + { 0x13430004, "CX-W / DNP DS80" }, + { 0x13430005, "CY / DNP DSRX" }, { 0x1345001c, "Xbox Controller Hub" }, { 0x13456006, "Defender Wireless Controller" }, { 0x13470400, "G2CCD USB 1.1 obsolete" }, @@ -14930,6 +15266,8 @@ { 0x13470402, "G2CCD2" }, { 0x13470403, "G2/G3CCD-I KAI CCD" }, { 0x13470404, "G2/G3/G4 CCD-F KAF CCD" }, + { 0x13470405, "Gx CCD-I CCD" }, + { 0x13470406, "Gx CCD-F CCD" }, { 0x13470410, "G1-0400 CCD" }, { 0x13470411, "G1-0800 CCD" }, { 0x13470412, "G1-0300 CCD" }, @@ -14967,8 +15305,10 @@ { 0x138a0018, "Fingerprint scanner" }, { 0x138a003c, "VFS471 Fingerprint Reader" }, { 0x138a003d, "VFS491" }, + { 0x138a0050, "Swipe Fingerprint Sensor" }, { 0x138e9000, "Raisonance S.A. STM32 ARM evaluation board" }, { 0x13900001, "GO 520 T/GO 630/ONE XL (v9)" }, + { 0x13905454, "Blue & Me 2" }, { 0x13911000, "URTC-1000" }, { 0x13953556, "USB Headset" }, { 0x139700bc, "BCF2000" }, @@ -14996,9 +15336,12 @@ { 0x13b10031, "AM10 v1 802.11n [Ralink RT3072]" }, { 0x13b10039, "AE1200 802.11bgn Wireless Adapter [Broadcom BCM43235]" }, { 0x13b1003a, "AE2500 802.11abgn Wireless Adapter [Broadcom BCM43236]" }, + { 0x13b1003b, "AE3000 802.11abgn (3x3) Wireless Adapter [Ralink RT3573]" }, + { 0x13b1003e, "AE6000 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]" }, + { 0x13b1003f, "WUSB6300 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]" }, { 0x13b113b1, "WUSB200: Wireless-G Business Network Adapter with Rangebooster" }, { 0x13b20030, "Multimix 8" }, - { 0x13ba0001, "K\\xc3\\xb6nig Electronic CMP-KEYPAD12 Numeric Keypad" }, + { 0x13ba0001, "Konig Electronic CMP-KEYPAD12 Numeric Keypad" }, { 0x13ba0017, "PS/2 Keyboard+Mouse Adapter" }, { 0x13ba0018, "Barcode PCP-BCG4209" }, { 0x13cf1200, "Olidata Wireless Multimedia Adapter" }, @@ -15049,10 +15392,13 @@ { 0x13d33306, "Mediao 802.11n WLAN [Realtek RTL8191SU]" }, { 0x13d33315, "Bluetooth module" }, { 0x13d33375, "Atheros AR3012 Bluetooth 4.0 Adapter" }, + { 0x13d33392, "Azurewave 43228+20702" }, + { 0x13d33394, "Bluetooth" }, { 0x13d35070, "Webcam" }, { 0x13d35111, "Integrated Webcam" }, { 0x13d35115, "Integrated Webcam" }, { 0x13d35116, "Integrated Webcam" }, + { 0x13d35122, "2M Integrated Webcam" }, { 0x13d35126, "PC Cam" }, { 0x13d35702, "UVC VGA Webcam" }, { 0x13d35710, "UVC VGA Webcam" }, @@ -15066,22 +15412,27 @@ { 0x13ee0003, "Optical Mouse" }, { 0x13fd0840, "INIC-1618L SATA" }, { 0x13fd0841, "Samsung SE-T084M DVD-RW" }, + { 0x13fd1040, "INIC-1511L PATA Bridge" }, { 0x13fd1340, "Hi-Speed USB to SATA Bridge" }, { 0x13fd160f, "RocketFish SATA Bridge [INIC-1611]" }, { 0x13fd1640, "INIC-1610L SATA Bridge" }, + { 0x13fd1669, "INIC-1609PN" }, { 0x13fd1840, "INIC-1608 SATA bridge" }, + { 0x13fd1e40, "INIC-1610P SATA bridge" }, { 0x13fe1a00, "512MB/1GB Flash Drive" }, { 0x13fe1a23, "512MB Flash Drive" }, { 0x13fe1d00, "DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive" }, { 0x13fe1e00, "Flash Drive 2 GB [ICIDU 2 GB]" }, { 0x13fe1e50, "U3 Smart Drive" }, - { 0x13fe1f00, "DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive" }, - { 0x13fe1f23, "2Gb" }, + { 0x13fe1f00, "Kingston DataTraveler / Patriot Xporter" }, + { 0x13fe1f23, "PS2232 flash drive controller" }, { 0x13fe2240, "microSD card reader" }, { 0x13fe3100, "2/4 GB stick" }, { 0x13fe3123, "Verbatim STORE N GO 4GB" }, + { 0x13fe3600, "flash drive (4GB, EMTEC)" }, { 0x13fe3800, "Rage XT Flash Drive" }, { 0x13fe3e00, "Flash Drive" }, + { 0x13fe5000, "USB flash drive (32 GB SHARKOON Accelerate)" }, { 0x13fe5100, "Flash Drive" }, { 0x14030001, "Digital Photo Frame" }, { 0x14091000, "generic (firmware not loaded yet)" }, @@ -15107,6 +15458,7 @@ { 0x14150000, "Sony SingStar USBMIC" }, { 0x14150020, "Sony Wireless SingStar" }, { 0x14152000, "Sony Playstation Eye" }, + { 0x14210605, "Sentech Camera" }, { 0x142a0003, "Artema Hybrid" }, { 0x142a0005, "Artema Modular" }, { 0x142a0043, "medCompact" }, @@ -15128,6 +15480,10 @@ { 0x14575117, "OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode" }, { 0x14575118, "OpenMoko Neo1973 Debug board (V2+)" }, { 0x14575119, "OpenMoko Neo1973 u-boot cdc_acm serial port" }, + { 0x1457511a, "HXD8 u-boot usbtty CDC ACM Mode" }, + { 0x1457511b, "SMDK2440 u-boot usbtty CDC ACM mode" }, + { 0x1457511c, "SMDK2443 u-boot usbtty CDC ACM mode" }, + { 0x1457511d, "QT2410 u-boot usbtty CDC ACM mode" }, { 0x14575120, "OpenMoko Neo1973 u-boot usbtty generic serial" }, { 0x14575121, "OpenMoko Neo1973 kernel mass storage (g_storage) mode" }, { 0x14575122, "OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network" }, @@ -15167,6 +15523,7 @@ { 0x14847616, "Elsa Hub" }, { 0x14850001, "U2E" }, { 0x14850002, "Psion Gold Port Ethernet" }, + { 0x148f1000, "Motorola BC4 Bluetooth 3.0+HS Adapter" }, { 0x148f1706, "RT2500USB Wireless Adapter" }, { 0x148f2070, "RT2070 Wireless Adapter" }, { 0x148f2570, "RT2570 Wireless Adapter" }, @@ -15183,9 +15540,13 @@ { 0x148f5370, "RT5370 Wireless Adapter" }, { 0x148f5372, "RT5372 Wireless Adapter" }, { 0x148f5572, "RT5572 Wireless Adapter" }, + { 0x148f7601, "MT7601U Wireless Adapter" }, { 0x148f9020, "RT2500USB Wireless Adapter" }, { 0x148f9021, "RT2501USB Wireless Adapter" }, { 0x14910020, "FS81 Fingerprint Scanner Module" }, + { 0x14930010, "Bluebird [Ambit]" }, + { 0x14930019, "Duck [Ambit2]" }, + { 0x1493001a, "Colibri [Ambit2 S]" }, { 0x1498a090, "DVB-T Tuner" }, { 0x149a2107, "DBX1 DSP core" }, { 0x14aa0001, "Avermedia AverTV DVBT USB1.1 (cold)" }, @@ -15213,11 +15574,12 @@ { 0x14c20250, "Storage Adapter V2" }, { 0x14c20350, "Storage Adapter V2" }, { 0x14cd121c, "microSD card reader" }, + { 0x14cd121f, "microSD CardReader SY-T18" }, { 0x14cd123a, "SD/MMC/RS-MMC Card Reader" }, { 0x14cd125c, "SD card reader" }, { 0x14cd127b, "SDXC Reader" }, { 0x14cd6116, "M6116 SATA Bridge" }, - { 0x14cd6600, "USB 2.0 IDE DEVICE" }, + { 0x14cd6600, "M110E PATA bridge" }, { 0x14cd6700, "Card Reader" }, { 0x14cd6900, "Card Reader" }, { 0x14cd8123, "SD MMC Reader" }, @@ -15234,6 +15596,9 @@ { 0x14f70003, "CableStar Combo HD CI" }, { 0x14f70004, "AirStar TeleStick 2" }, { 0x14f70500, "DVB-PC TV Star HD" }, + { 0x15090a01, "LI-3100 Area Meter" }, + { 0x15090a02, "LI-7000 CO2/H2O Gas Analyzer" }, + { 0x15090a03, "C-DiGit Blot Scanner" }, { 0x15099242, "eHome Infrared Transceiver" }, { 0x15130444, "medMobile" }, { 0x15142003, "FlashPro3 Programmer" }, @@ -15243,10 +15608,14 @@ { 0x15168628, "Pen Drive" }, { 0x15180001, "HDReye High Dynamic Range Camera" }, { 0x15180002, "HDReye (before firmware loads)" }, + { 0x15190020, "HSIC Device" }, { 0x15246680, "UTS 6680" }, { 0x15270200, "YAP Phone (no firmware)" }, { 0x15270201, "YAP Phone" }, { 0x15293100, "CDMA 1xRTT USB Modem (U-100/105/200/300/520)" }, + { 0x152a8400, "INI DVS128" }, + { 0x152a840d, "INI DAViS" }, + { 0x152a841a, "INI DAViS FX3" }, { 0x152d0539, "JMS539 SuperSpeed SATA II 3.0G Bridge" }, { 0x152d0770, "Alienware Integrated Webcam" }, { 0x152d2329, "JM20329 SATA Bridge" }, @@ -15263,6 +15632,7 @@ { 0x15320003, "Krait Mouse" }, { 0x15320007, "DeathAdder Mouse" }, { 0x15320013, "Orochi mouse" }, + { 0x15320015, "Naga Mouse" }, { 0x15320016, "DeathAdder Mouse" }, { 0x15320017, "RZ01-0035 Laser Gaming Mouse [Imperator]" }, { 0x1532001c, "RZ01-0036 Optical Gaming Mouse [Abyssus]" }, @@ -15272,12 +15642,17 @@ { 0x15320101, "Copperhead Mouse" }, { 0x15320102, "Tarantula Keyboard" }, { 0x15320109, "Lycosa Keyboard" }, + { 0x15320113, "RZ07-0074 Gaming Keypad [Orbweaver]" }, { 0x15320300, "RZ06-0063 Motion Sensing Controllers [Hydra]" }, + { 0x153b1181, "Cinergy S2 PCIe Dual Port 1" }, + { 0x153b1182, "Cinergy S2 PCIe Dual Port 2" }, { 0x15471000, "SG-Lock[U2]" }, { 0x154a8180, "CARD STAR/medic2" }, { 0x154b0010, "USB 2.0 Flash Drive" }, + { 0x154b0048, "Flash Drive" }, { 0x154b004d, "8 GB Flash Drive" }, { 0x154b0057, "32GB Micro Slide Attache Flash Drive" }, + { 0x154b007a, "8GB Classic Attache Flash Drive" }, { 0x154b6545, "FD Device" }, { 0x154e3000, "Marantz RC9001 Remote Control" }, { 0x15545010, "PV-D231U(RN)-F [PixelView PlayTV SBTVD Full-Seg]" }, @@ -15307,7 +15682,8 @@ { 0x15a20042, "OSBDM - Debug Port" }, { 0x15a2004f, "i.MX28 SystemOnChip in RecoveryMode" }, { 0x15a20052, "i.MX50 SystemOnChip in RecoveryMode" }, - { 0x15a20054, "i.MX6Q SystemOnChip in RecoveryMode" }, + { 0x15a20054, "i.MX 6Dual/6Quad SystemOnChip in RecoveryMode" }, + { 0x15a20061, "i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode" }, { 0x15a41000, "AF9015/AF9035 DVB-T stick" }, { 0x15a41001, "AF9015/AF9035 DVB-T stick" }, { 0x15a41336, "SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader" }, @@ -15336,6 +15712,7 @@ { 0x15c00101, "3M pixel Microscope Camera" }, { 0x15c20036, "LC16M VFD Display/IR Receiver" }, { 0x15c20038, "GD01 MX LCD Display/IR Receiver" }, + { 0x15c20042, "Antec Veris Multimedia Station E-Z IR Receiver" }, { 0x15c2ffda, "iMON PAD Remote Controller" }, { 0x15c2ffdc, "iMON PAD Remote Controller" }, { 0x15c50008, "WL532U 802.11g Adapter" }, @@ -15357,6 +15734,7 @@ { 0x15d90a41, "MI-2540D [Optical mouse]" }, { 0x15d90a4c, "USB+PS/2 Optical Mouse" }, { 0x15d90a4d, "Optical Mouse" }, + { 0x15d90a4f, "Optical Mouse" }, { 0x15e12007, "RSA SecurID (R) Authenticator" }, { 0x15e40024, "Mixtrack" }, { 0x15e40140, "ION VCR 2 PC / Video 2 PC" }, @@ -15573,6 +15951,9 @@ { 0x16900726, "Wi-Fi Wireless LAN Adapter" }, { 0x16900740, "802.11n Wireless LAN Card" }, { 0x16900901, "Voyager 205 ADSL Router" }, + { 0x16902000, "naturaSign Pad Standard" }, + { 0x16902001, "naturaSign Pad Standard" }, + { 0x1690fe12, "Bootloader" }, { 0x16a63000, "VTG-3xxx Video Test Generator family" }, { 0x16a64000, "VTG-4xxx Video Test Generator family" }, { 0x16a65000, "VTG-5xxx Video Test Generator family" }, @@ -15618,6 +15999,7 @@ { 0x16c005e4, "Free shared USB VID/PID pair for MIDI devices" }, { 0x16c006b4, "USB2LPT with 2 interfaces" }, { 0x16c006b5, "USB2LPT with 3 interfaces (native, HID, printer)" }, + { 0x16c00762, "Osmocom SIMtrace" }, { 0x16c0076b, "OpenPCD 13.56MHz RFID Reader" }, { 0x16c0076c, "OpenPICC 13.56MHz RFID Simulator (native)" }, { 0x16c008ac, "OpenBeacon USB stick" }, @@ -15645,9 +16027,12 @@ { 0x16d0075c, "AB-1.x UAC1 [Audio Widget]" }, { 0x16d0075d, "AB-1.x UAC2 [Audio Widget]" }, { 0x16d0080a, "S2E1 Interface" }, + { 0x16d00870, "Kaufmann Automotive GmbH, RKS+CAN Interface" }, + { 0x16d10401, "SUP-SFR400(A) BioMini Fingerprint Reader" }, { 0x16d56202, "CDMA/UMTS/GPRS modem" }, { 0x16d56501, "CDMA 2000 1xRTT/EV-DO Modem" }, { 0x16d56502, "CDMA/UMTS/GPRS modem" }, + { 0x16d56603, "ADU-890WH modem" }, { 0x16d68000, "GDP-04 desktop phone" }, { 0x16d68001, "EYE-02" }, { 0x16d68003, "GDP-04 modem" }, @@ -15672,6 +16057,8 @@ { 0x17030001, "NormSoft, Inc. Pocket Tunes" }, { 0x17030002, "NormSoft, Inc. Pocket Tunes 4" }, { 0x170b0011, "MIDI-USB 1x1" }, + { 0x17113020, "IC80 HD Camera" }, + { 0x17240115, "PAXcam5" }, { 0x17261000, "wireless modem" }, { 0x17262000, "wireless modem" }, { 0x17263000, "wireless modem" }, @@ -15695,6 +16082,9 @@ { 0x17370077, "WUSB54GC v3 802.11g Adapter [Ralink RT2070L]" }, { 0x17370078, "WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070]" }, { 0x17370079, "WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572]" }, + { 0x173d0002, "GP-K7000 keyboard" }, + { 0x17400100, "EUB1200AC AC1200 DB Wireless Adapter [Realtek RTL8812AU]" }, + { 0x17400600, "EUB600v1 802.11abgn Wireless Adapter [Ralink RT3572]" }, { 0x17400605, "LevelOne WUA-0605 N_Max Wireless USB Adapter" }, { 0x17400615, "LevelOne WUA-0615 N_Max Wireless USB Adapter" }, { 0x17401000, "NUB-350 802.11g Wireless Adapter [Intersil ISL3887]" }, @@ -15707,8 +16097,10 @@ { 0x17409705, "EnGenius 802.11n Wireless USB Adapter" }, { 0x17409706, "EUB9706 802.11n Wireless Adapter [Ralink RT3072]" }, { 0x17409801, "EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]" }, + { 0x17480101, "Packet-Master USB12" }, { 0x174c5106, "Transcend StoreJet 25M3" }, - { 0x174c55aa, "ASMedia 2105 SATA bridge" }, + { 0x174c5136, "ASM1053 SATA 6Gb/s bridge" }, + { 0x174c55aa, "ASM1051 SATA 3Gb/s bridge" }, { 0x174f1105, "SM-MS/Pro-MMC-XD Card Reader" }, { 0x174f110b, "HP Webcam" }, { 0x174f1403, "Integrated Webcam" }, @@ -15742,6 +16134,7 @@ { 0x17810c30, "Telldus TellStick" }, { 0x17810c31, "Telldus TellStick Duo" }, { 0x17810c9f, "USBtiny" }, + { 0x17811eef, "OpenAPC SecuKey" }, { 0x17840001, "eHome Infrared Transceiver" }, { 0x17840004, "RF Combo Device" }, { 0x17840006, "eHome Infrared Transceiver" }, @@ -15756,11 +16149,13 @@ { 0x17a00002, "Q1U dynamic microphone" }, { 0x17a00100, "C03U multi-pattern microphone" }, { 0x17a00101, "UB1 boundary microphone" }, + { 0x17a00120, "Meteorite condenser microphone" }, { 0x17a00200, "StudioDock monitors (internal hub)" }, { 0x17a00201, "StudioDock monitors (audio)" }, { 0x17a00210, "StudioGT monitors" }, { 0x17a00301, "Q2U handheld microphone with XLR" }, { 0x17a00302, "GoMic compact condenser microphone" }, + { 0x17a00303, "C01U Pro condenser microphone" }, { 0x17a00304, "Q2U handheld mic with XLR" }, { 0x17a00305, "GoMic compact condenser mic" }, { 0x17a00310, "Meteor condenser microphone" }, @@ -15798,12 +16193,15 @@ { 0x17e9037b, "Plugable USB-VGA-165" }, { 0x17e9037c, "Plugable DC-125" }, { 0x17e9037d, "Plugable USB2-HDMI-165" }, + { 0x17e9410a, "HDMI Adapter" }, { 0x17e9430a, "HP Port Replicator (Composite Device)" }, { 0x17e94312, "S2340T" }, + { 0x17ef1000, "Hub" }, { 0x17ef1003, "Integrated Smart Card Reader" }, { 0x17ef1004, "Integrated Webcam" }, { 0x17ef1008, "Hub" }, { 0x17ef100a, "ThinkPad Mini Dock Plus Series 3" }, + { 0x17ef304b, "AX88179 Gigabit Ethernet [ThinkPad OneLink GigaLAN]" }, { 0x17ef3815, "ChipsBnk 2GB USB Stick" }, { 0x17ef4802, "Lenovo Vc0323+MI1310_SOC Camera" }, { 0x17ef4807, "UVC Camera" }, @@ -15824,6 +16222,8 @@ { 0x17ef6007, "Smartcard Keyboard" }, { 0x17ef6009, "ThinkPad Keyboard with TrackPoint" }, { 0x17ef6014, "Mini Wireless Keyboard N5901" }, + { 0x17ef6025, "ThinkPad Travel Mouse" }, + { 0x17ef7203, "Ethernet adapter [U2L 100P-Y1]" }, { 0x17ef740a, "Lenovo K1" }, { 0x17ef741c, "Lenovo ThinkPad Tablet" }, { 0x17ef7423, "IdeaPad A1 Tablet" }, @@ -16569,6 +16969,8 @@ { 0x2040c000, "Windham" }, { 0x2040c010, "Windham" }, { 0x20470200, "MSP430 USB HID Bootstrap Loader" }, + { 0x20470855, "Invensense Embedded MotionApp HID Sensor" }, + { 0x20470964, "Inventio Software MSP430" }, { 0x20800001, "nook" }, { 0x20800002, "NOOKcolor" }, { 0x20800003, "NOOK Simple Touch" },

@@ -781,7 +781,9 @@ #endif /* make sure we dont try to allocate too much (arbitrary limit) */ - DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2)); + if (size >= (EMEM_PACKET_CHUNK_SIZE>>2)) { + return emem_alloc_glib(size, mem); + } if (!mem->free_list) mem->free_list = emem_create_chunk_gp(EMEM_PACKET_CHUNK_SIZE);

@@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2014-03-01) +(last updated 2014-06-08) SMI Network Management Private Enterprise Codes: @@ -1903,8 +1903,8 @@ harley&premisys.com 472 Bell South Telecommunications - - Johnny Walker 205-988-7105 + Johnny Walker + 205-988-7105 473 J. Stainsbury PLC Steve Parker @@ -2103,8 +2103,8 @@ DIA-DMS&DDN-CONUS.DDN.MIL 522 Telesystems SLW Inc. - - Joe Magony 416-441-9966 + Joe Magony + 416-441-9966 523 APT Communications David Kloper @@ -2338,9 +2338,9 @@ nigelc&lna.oz.au ---none--- 581 - Intec Telecom Systems + CSG Systems International (previous was 'Intec Telecom Systems') David Meibusch - david.meibusch&intecbilling.com + David.Meibusch&csgi.com 582 Newport Systems Solutions, Inc. Pauline Chen @@ -3646,9 +3646,9 @@ Yu Chin 76500,3160&compuserve.com 908 - Elsag Bailey Incorporated - Ron Kupiec - Ron.Kupiec&bailey.com + ABB Inc. (previous was 'Elsag Bailey Incorporated') + Matthew Miller + Matthew.Miller&us.abb.com 909 J.P. Morgan Chung Szeto @@ -3939,8 +3939,8 @@ alan&arktel.com 981 National Security Agency (NSA) - - Cynthia Beighley maedeen&romulus.ncsc.mil + Cynthia Beighley + maedeen&romulus.ncsc.mil 982 Southwestern Bell Corporation Brian Bearden @@ -4862,9 +4862,9 @@ Dominique Ambach Dominique_Ambach&stortek.com 1212 - Tadiran Telecomunications L.T.D - Meir Barack - Meirb&Telecomm.Tadiran.co.il + Tadiran Telecom TTL. + Gal Ben-Yair + Gal.ben-yair&tadirantele.com 1213 NCP Reiner Walter @@ -5714,9 +5714,9 @@ Lewis Donzis lew&perftech.com 1425 - CXR Telecom - Nick Charles - 7511.1047&CompuServe.com + CXR + Didier ANA + didier.ana&cxr.fr 1426 Amir Technology Labs Derek Palma @@ -7266,20 +7266,20 @@ (33) 51 41 41 89decision&calva.net 1813 - VTEL CorporationBill Black - + VTEL Corporation + Bill Black bblack&vtel.com 1814 - Bloomberg, L.P.Franko Rahimi - + Bloomberg, L.P. + Franko Rahimi frahimi&bny18.bloomberg.com 1815 Witness Systems, Inc Joe Watson jwatson&witness.com 1816 - Rose-Hulman Institute of TechnologyLans H. Carstensen - + Rose-Hulman Institute of Technology + Lans H. Carstensen Lans.H.Carstensen&rose-hulman.edu 1817 Aether Technologies @@ -7298,16 +7298,16 @@ lmreseau&calva.net 1821 - Total Entertainment NetworkWill Coertnik - + Total Entertainment Network + Will Coertnik will&tenetwork.com 1822 - Open Port TechnologyJeffrey Nowland - 312 867 5050 + Open Port Technology + Jeffrey Nowland jnowland&openport.com 1823 - Mikroelektronik Anwendungszentrum Hamburg GmbHZbynek Bazanowski - + Mikroelektronik Anwendungszentrum Hamburg GmbHZ + bynek Bazanowski ba&maz-hh.de 1824 International Management Consulting, Inc. @@ -7574,9 +7574,9 @@ Francois Gauthie metfgar&met.fr 1890 - JBM Electronics - Kevin Morris - jbmelect&mo.net + Red Lion Controls (JBM Electronics) + Denis Aull + Engineering&RedLion.net 1891 OPTIM Systems, Inc. Mr. Sunil Meht @@ -8626,9 +8626,9 @@ Ed Bernosky eddy&dlcmhc.com 2153 - Insider Technologies Ltd Paul Hancock 706001.1542 compuserv.com - - ---none--- + Insider Technologies Ltd Paul Hancock + Paul Hancock + 706001.1542 compuserv.com 2154 Berkeley Networks Bob Thomas @@ -9474,7 +9474,7 @@ Randy Maas randym&xiotech.com 2367 - IMS Gesellschaft f|r Informations- und Managementsysteme mbH + IMS Gesellschaft fuer Informations- und Managementsysteme mbH Mr. Arndt Hoppe infoserv&ims.wes.eunet.de 2368 @@ -11756,7 +11756,7 @@ 2937 Deutsche Telekom AG Peter Krupp - Peter.Krupp&t-com.net + Peter.Krupp&telekom.de 2938 Proginet Corporation Thomas Bauer @@ -12130,7 +12130,7 @@ Dennis Oszuscik denniso&cninews.com 3031 - daoCon + dao Consulting, LLC David Osborn david.osborn&daoConsulting.com 3032 @@ -22130,9 +22130,9 @@ Buyle You ybl&cybertek.co.kr 5540 - Aachen University of Technology (RWTH) + RWTH Aachen University Guido Bunsen - Bunsen&rz.RWTH-Aachen.DE + Bunsen&itc.RWTH-Aachen.DE 5541 Paragea Communications, Inc Laique Ahmed @@ -23722,9 +23722,9 @@ Miran Bohak miran.bohak&halcom.si 5940 - JBM Electronics Co., Inc. - Art Surgant - asurgant&jbmelectronics.com + Red Lion Controls (JBM Electronics Co., Inc.) + Denis Aull + Engineering&RedLion.net 5941 Cosmocom Inc. Rick Marlborough @@ -30038,9 +30038,9 @@ Harris Corp SNMP Harris-SNMP&harris.com 7521 - NetStar Networks + Logicalis Australia Pty Ltd (previous was 'NetStar Networks') Garry Thomas - gthomas&netstarnetworks.com + gthomas&au.logicalis.com 7522 Brains Corp Takehito Horiuchi @@ -34063,8 +34063,8 @@ webmaster&notariato.it 8527 Harvard MIT Data Center - Micah Altman - Micah_Altman&harvard.edu + Leonard Wisniewski + linux&lists.hmdc.harvard.edu 8528 HeyAnita Inc. Mandar Wadekar @@ -45027,8 +45027,8 @@ dissc&dissc.presidencia.gob.es 11268 Aastra - Dr. Wolfgang Perlich - wperlich&aastra.com + Mario Giacometto + mgiacometto&aastra.com 11269 Aculab plc Chris Brown @@ -45174,7 +45174,7 @@ Jeremy Finn jfinn&printeron.net 11305 - Research Institute for Particle and Nuclear Physics, Department ofBiophysics + Research Institute for Particle and Nuclear Physics, Department of Biophysics Csardi Gabor csardi&rmki.kfki.hu 11306 @@ -47872,7 +47872,7 @@ 12079 dotmaudot Maurizio Codogno - puntomaupunto&tiscalinet.it + dot.maudot&gmail.com 12080 e-peopleserve Neal Brett @@ -48359,8 +48359,8 @@ rabakker&seneca.nl 12201 University Health Network - John Waldron - john.waldron&uhn.on.ca + Geoff Hallford + geoff.hallford&uhn.ca 12202 UP3I Christian Sack @@ -51428,7 +51428,7 @@ 12968 Menno Pieters (previously Stelvio) Menno Pieters - iana-assigned-numbers&mwpieter.dds.nl + iana-assigned-numbers&menno.pieters.cx 12969 The Rockefeller University Lawry Persaud @@ -59856,8 +59856,8 @@ rdefalco&icominfo.fr 15076 Fresenius AG - Frank Wagner - frank.wagner&fresenius-netcare.com + Hendrik Stahl + ad.support&fresenius-netcare.com 15077 Thermeon Corporation Scott Nelson @@ -63571,9 +63571,9 @@ David Meltzer djm&intrusec.com 16005 - University of Durham - Barry Cornelius - barry.cornelius&durham.ac.uk + Durham University + David Griffith + d.e.griffith&durham.ac.uk 16006 CodeFab Inc Charles Swiger @@ -63628,8 +63628,8 @@ max&punker.org 16019 Reitek - Federico Pinna - fpinna&reitek.com + Giovanni Carbone + itadmin&reitek.com 16020 Wasadata System AB Tor Borrhed @@ -72507,9 +72507,9 @@ Ryan Hodgson ryan&skylinkdesign.com 18239 - Digital Theater Systems, Inc - Brian Berg - bberg&dtsonline.com + DTS, Inc. (previous was 'Digital Theater Systems, Inc') + Phil Maness + phillip.maness&dts.com 18240 berger.de Thomas Berger @@ -72979,9 +72979,9 @@ Kevin Stevens contact&kevinstevens.info 18357 - Leathern Apron Incorporated + Full Frontal Ingenuity LLC (previous was 'Leathern Apron Incorporated') Paul Talbot - support&leathernapron.us + paul&fullfrontalingenuity.com 18358 EPITECH Notre RN nationnal @@ -81715,9 +81715,9 @@ Tilman Reiff chinchilla&fursr.com 20540 - SIXNET - Dave Ellis - dge&sixnetio.com + Red Lion Controls (SIXNET) + Denis Aull + Engineering&RedLion.net 20541 CITTIO, Inc. Ross Fujii @@ -90430,8 +90430,8 @@ leigh&modern-world.net 22717 VRT - Van de Kauter Marnix - marnix.vandekauter&vrt.be + Lieven Troch + lieven.troch&vrt.be 22718 Centre Reseau Communication Pierre David @@ -92811,8 +92811,8 @@ markus&macab.se 23312 IntelliCom Innovation AB - Lars-Ake Ekstrand - laek&intellicom.se + Jens Jakobsen + ianacontact&hms.se 23313 Tesla a.s. ing. Zdenek Kotalik @@ -94352,9 +94352,9 @@ Joe Teoh Chin Hor joe_teoh&nilai.edu.my 23697 - aspector GmbH + hoi-polloi.org (previous was 'aspector GmbH') Bernd R. Fix - Bernd.Fix&aspector.com + brf&hoi-polloi.org 23698 RELDATA Inc. Yann Livis @@ -94697,9 +94697,9 @@ Michal Wrobel mwrobel&asn.pl 23783 - Tellurian Networks, Inc. + iTellus Holdings, Inc. (previous was 'Tellurian Networks, Inc.') Robert Boyle - robert&tellurian.net + robert&itellus.com 23784 StrataLight Communications Roberto Marcoccia @@ -98134,9 +98134,9 @@ Del Miller del&allodialsolutions.com 24642 - University in Sarajevo - Faculty of Electrical Engineering + University of Sarajevo - Faculty of Electrical Engineering Ernedin Zajko - oid.admin&etf.unsa.ba + ezajko&etf.unsa.ba 24643 Cedval Info inc. Francois Meehan @@ -99203,9 +99203,9 @@ Janos Haide iana&storediq.com 24909 - Secure-24, Inc. - Joshua M. Thompson - joshua.thompson&secure-24.com + Secure-24, LLC + Sean E. Millichamp + sean.millichamp&secure-24.com 24910 OOO "ElitStudio" Alex Unigovsky @@ -105069,8 +105069,8 @@ geile&oekonet-bremen.de 26374 University of Illinois - Michael Corn - security&uiuc.edu + Joseph Barnes + security&illinois.edu 26375 Ockan Roberto Costa Filho @@ -108235,9 +108235,9 @@ Nikk Eh nikk.eh&cnet.com 27165 - UTFPR - Daniel Mealha Cabrita - dancab&utfpr.edu.br + Universidade Tecnológica Federal do Paraná (UTFPR) + Thiago Herek + therek&utfpr.edu.br 27166 Checchia.NET IT Consulting Daniel Checchia @@ -109174,8 +109174,8 @@ bernd.haug&gmail.com 27399 Ross Video Limited - Glenn Greig - ggreig&rossvideo.com + Jeff Allen + administrator&rossvideo.com 27400 Randolph-Macon College Jeff Hague @@ -113104,9 +113104,9 @@ chandra nath nath&01edge.com 28381 - N-Tron Corp. - Warren Nicholson - warren.nicholson&n-tron.com + Red Lion Controls (N-Tron) + Denis Aull + Engineering&RedLion.net 28382 AirCell LLC Brad Schnair @@ -115406,7 +115406,7 @@ 28956 Allen Martin Ltd Paul Davies - help&allen-martin.co.uk + box2&allen-martin.co.uk 28957 Institut für Graphische und Parallele Datenverarbeitung, Universität Linz Roland Hopferwieser @@ -118736,9 +118736,9 @@ Krzysztof Czajka iptv&telmor.pl 29789 - BlueTree Wireless Data, Inc. - Fadi Bachaalani - fbachaalani&bluetreewireless.com + Red Lion Controls (BlueTree Wireless Data, Inc.) + Denis Aull + Engineering&RedLion.net 29790 Yelp Inc. Sean Plaice @@ -119433,8 +119433,8 @@ pen-admin&tagsystems.fi 29963 Iron Council - Joseph Harrison - jharrison&ironcouncil.net + Amelia Wilhelm + awilhelm&ironcouncil.net 29964 Tribunal de Contas dos Municipios do Estado do Pará Sérgio Cunha @@ -119461,7 +119461,6 @@ root&morishima.net 29970 Zervina Technologies LLC - Rich Vaughn rvaughn&zervina.com 29971 @@ -119726,8 +119725,8 @@ joy&tw-wireless.com 30036 Nomad Digital Ltd - Erik Haagsman - erik.haagsman&nomadrail.com + Paul Herring + paul.herring&nomadrail.com 30037 Company Extrim pro, Ltd. Maxim A. Serebrov @@ -124314,8 +124313,8 @@ slamberty&vdl.lu 31183 The Logic Group Enterprises Ltd - Paul Milliken - paul.milliken&the-logic-group.com + Mohammad Rahin + mohammad.rahin&the-logic-group.com 31184 EWE AG Stephan Backhaus @@ -127797,9 +127796,9 @@ Jamie Chen jamie.chen&3ypower.com 32054 - IPSL/CETP + IPSL (previous was 'IPSL/CETP') Elisabeth Porteneuve - elisabeth.porteneuve&cetp.ipsl.fr + elisabeth.porteneuve&latmos.ipsl.fr 32055 Service to Youth Council Inc Information and Communication Technology @@ -127826,8 +127825,8 @@ mathieu.pasture&babelway.com 32061 VAS Latvijas Valsts radio un televizijas centrs - Zane Silgale - silgale&lvrtc.lv + Dmitrijs Telnovs + dmitrijs.telnovs&lvrtc.lv 32062 Endersys Omer Faruk Sen @@ -130390,7 +130389,6 @@ dominik.pekarek&loyaltypartner.com 32702 Joint Stock Company "NPO RusBITech" - Vladimir Podobaev rusbitech_cct&mail.ru 32703 @@ -131502,7 +131500,7 @@ Markus Juenemann markus&juenemann.net 32980 - Hitachi Systems Engineering and Solutions, Ltd. (previous was 'Computer System Engineering Co., Ltd.') + Hitachi Systems Engineering Services, Ltd. (previous was 'Hitachi Systems Engineering and Solutions, Ltd.') Yasumasa Ichioka wiseaudit.rm&ml.hitachi-systems.com 32981 @@ -136010,9 +136008,9 @@ Petr Absolon iana&tescoma.com 34107 - SELEX GALILEO + SELEX ES LTD (previous was 'SELEX GALILEO') Davina Forster - davina.forster&selexgalileo.com + davina.forster&selex-es.com 34108 IAM Solutions GmbH & Co. KG Michael Raunft @@ -144443,9 +144441,9 @@ Dawei Qi dqi&galaxytelecomms.com 36215 - Greek Universities Network + Greek Academic Network - GUnet Nikos Voutsinas - nvoutsin&noc.uoa.gr + nvoutsin&gunet.gr 36216 GoliathDNS ENK Atle Solbakken @@ -145480,8 +145478,8 @@ support&directone.ro 36474 Lifespan Corporation - Christopher Logan - clogan&lifespan.org + Paul Howard + pdhoward&lifespan.org 36475 Fujian Etim Information & Technology Co,.Ltd. yangxiaoyan @@ -151309,7 +151307,7 @@ 37931 Bob Greene Bob Greene - bobg&liquidnetworx.com + onms.bg&gmail.com 37932 Jack Storm Jack Storm @@ -152036,8 +152034,8 @@ yedaoliang&163.com 38113 Red Lion Controls Inc. - Paul Marsh - paulm&redlion.net + Denis Aull + Engineering&RedLion.net 38114 Merseytravel Mark Evans @@ -152117,7 +152115,7 @@ 38133 Ingnitia http://www.ingnitia.com Mikel Mugarza - mmugarza&gmail.com + mmugarza&ingnitia.com 38134 National Document Custodians, LLC Albert Wheeler @@ -153015,9 +153013,9 @@ Rafael Forcada rafael.forcada&actualmed.com 38358 - Western Electricity Coordinating Council + Peak Reliability (previous was 'Western Electricity Coordinating Council') Lyonell Keplar - lkeplar&wecc.biz + lkeplar&peakrc.com 38359 Meissner Oliver Meissner @@ -155359,9 +155357,9 @@ Steffen Jeschke s.jeschke&kittner.de 38944 - Kamstrup SVM AB - Ann-Sofie Erdenvik - ase&kamstrup.se + Kamstrup A/S + Erik B. Pedersen + ebp&kamstrup.dk 38945 NASA Center for Climate Simulation (NCCS) Bennett Samowich @@ -156720,8 +156718,8 @@ David.Hodgson&teleware.com 39284 Mountain States Health Alliance - Kimberly Trent - trentkk&msha.com + Kevin Bowes + boweskj&msha.com 39285 Prime Engineering Ltd Jeff Johnson @@ -162316,7 +162314,7 @@ differential.karma&gmail.com 40683 Open Grid Europe GmbH - Norbert Holtkamp + Holger Kayser pen-admin&open-grid-europe.com 40684 Appdynamics @@ -164104,7 +164102,7 @@ l.rizzi&wide-net.org 41130 Mint Medical GmbH - Daniel Maleike + Johannes Kast support&mint-medical.de 41131 LUGO TERMINAL SPA @@ -169087,9 +169085,9 @@ Removed 2013-09-06 ---none--- 42376 - Xyne GmbH + Ocedo GmbH (previous was 'Xyne GmbH') Ulrich Weber - uw&xyne.com + uw&ocedo.com 42377 MBD Consulting, LLC Timothy Sawyer @@ -170992,8 +170990,8 @@ robm&fidelityvoice.com 42852 Bank Gospodarstwa Krajowego - Przemyslaw Wasaznik - przemyslaw.wasaznik&BGK.com.pl + Dorota Remiszewska-Gajek + pwasa&BGK.com.pl 42853 DunnCox Ryan Dunbar @@ -172990,6 +172988,2082 @@ Advania Aki Barkarson aki&advania.is +43352 + Hangzhou Huaxing Chuangye Communication Technology CO.,LTD. + Wang Ke + yujiangang&hxcy.com.cn +43353 + Beijing Certificate Authority + Lanfang Yang + yanglanfang&bjca.org.cn +43354 + OBI Smart Technologies GmbH + Dirk Proepper + dirk.proepper&obi.de +43355 + VTI Instruments Corporation + Dale P. Smith + dsmith&vtiinstruments.com +43356 + Mimosa Networks, Inc + Alexander Gostrer + alex&mimosa.co +43357 + Thomas Fagart (Brozs) + Thomas Fagart + tfagart&brozs.net +43358 + candiansolar.com + wei.yang + wei.yang&canadiansolar.com +43359 + China Guodian Corporation + ChengChuan + ChengChuan&cgdc.com.cn +43360 + Binhai Online Information Technology Company Limited + Sun Yajiang + info&binhai.com +43361 + IT Voimala Oy + Topias Airaksinen + topias.airaksinen&itvoimala.fi +43362 + Zakład Automatyki i Urządzeń Pomiarowych AREX Sp. z o.o. + Marcin Garski + marcin.garski&arex.pl +43363 + B2B.CZ, s.r.o. + Richard Kotal + richard.kotal&b2b.cz +43364 + Vision Box, S.A. + Roger Davies + rdavies&vision-box.com +43365 + Qi ict + Martijn Ebben + martijn.ebben&qi.nl +43366 + N-Tools.de + Dirk Nenninger + iana&n-tools.de +43367 + Suedzucker AG + Wolfgang Junker + wolfgang.junker&suedzucker.de +43368 + Oradian d.o.o. + Dražen Kačar + drazen.kacar&oradian.com +43369 + BrightSign LLC + Mike Crowe + mcrowe&brightsign.biz +43370 + Giordano Bruno Stiftung + Dr. Michael Schmidt-Salomon + it-ops&giordano-bruno-stiftung.de +43371 + Moegui S.p.A + Luciano Giacchetta + admin&moegui.com +43372 + Embedded Access Inc + Craig Honegger + craig.honegger&embedded-access.com +43373 + Associação dos Registradores Imobiliários de São Paulo + walter de oliveira + walter&arisp.com.br +43374 + Belton IT + Thomas Matysik + noc&belton.co.nz +43375 + Baer & Karrer AG + Forgiarini Gabriele + gabriele.forgiarini&baerkarrer.ch +43376 + Ladybird Cranes Ltd. + Karl Knibbs + it&ladybirdcranes.co.uk +43377 + GDV-IT + Christian Graichen + info&gdv-it.de +43378 + Holger Genth (HGD) + Holger Genth + kontakt&holger-genth.de +43379 + R.J. O'Brien and Associates + Matthew Wulk + MWulk&rjobrien.com +43380 + Counterpoint Networking, Inc. + John Hudson + ipadmin&cpoint.net +43381 + GEMATICA SRL + Enrico Ciotola + snmp&gematica.com +43382 + Dreamket Co., Ltd. + Jae Young Lee + duri&dreamket.co.kr +43383 + Commercial Bank “Severo-Vostochny Alliance” (Joint-Stock сompany) + Vasily Rusakov + sb&svabank.ru +43384 + Pelle Olsson (Raholmen) + Pelle Olsson + pelle_olsson&swipnet.se +43385 + Proyectos-IP + Jose Antonio Perez + japerez&proyectos-ip.com +43386 + Expkits + Göktuğ ÇAKMAK + info&expkits.com +43387 + city of Sioux City, IA + Daniel Middleton + dmiddleton&sioux-city.org +43388 + aeworld.co.uk + ian sutherland + isutherland1&hotmail.co.uk +43389 + Eko-konnect Research and Education Initiative + Cletus Okolie + okoliec&eko-konnect.net.ng +43390 + BEIJING FOREVER COMMUNICATION ELECTRONICS CO.,LTD + Jin Cancan + jcc&xinxunxintong.com +43391 + UTT Co., Ltd. + Cho Yoon Sik + yscho&uttsys.com +43392 + Agile Digital Engineering Pty Ltd + Justin Smith + infrastructure&agiledigital.com.au +43393 + S-Net + Henrik. Schröter + registrierung&snet-it.de +43394 + Intrinium, Inc + Nolan Garrett + internalit&intrinium.com +43395 + The City of Amsterdam + Niels de Groot + N.de.Groot&amsterdam.nl +43396 + earthlab (daichi makino) + daichi makino + makino.daichi&earthlab.info +43397 + NET MEDIA SERVICES a.s. + Marek Lukács + marek.lukacs&netmedia.as +43398 + WILDIX + Stefano Osler + stefano.osler&wildix.com +43399 + Tiscali Italia SpA + Anselmo Canfora + acanfora&it.tiscali.com +43400 + IT storitve, Gregor Jerše, s.p. + Gregor Jerše + gregor&jerse.info +43401 + TRData Limited + Anton Pasiechnikov + anton&trdata.com +43402 + Layer-7 Technologies + Michael Rommel + rommel&layer-7.net +43403 + CareerHub Pty Ltd + Dee Hughes + dee&careerhub.com.au +43404 + SOCIEDAD ESTATAL CORREOS Y TELEGRAFOS SA + David Matesanz + asei&correos.com +43405 + SA Water Corporation + Andrew Commons + issecurity&sawater.com.au +43406 + Universiti Putra Malaysia + Norhayti Mustafa + ldap&upm.edu.my +43407 + David Martin (ReaperLegion) + David Martin + ReaperLegion&gmail.com +43408 + HDmessaging Inc + Juho-Pekka Virolainen + ops&hdmessaging.com +43409 + Reith IT-Lösungen GmbH + Nico Reith + info&reith.it +43410 + Joseph Williams + Joseph Williams + williams.joe&gmail.com +43411 + Graeser Development + Patrik Gräser + mib-mgr&graeser.se +43412 + Genius Digital Limited + Alex Dick + registry&geniusdigital.tv +43413 + Fairview Health Services + Coral Lindahl + codell1&fairview.org +43414 + Molson Coors Brewing Company + Jackie Halewood + jackie.halewood&molsoncoors.com +43415 + Deepblue Informatikai Kft + Attila Kuti + attila.kuti&deepblue.hu +43416 + Multigenregameworld LLC + Mikhail Kuznetsov + mikhail.kuznetsov&mggworld.com +43417 + South Side Hackerspace Chicago, NFP + Christopher Swingler + cto&sshchicago.org +43418 + Khakham Sayavong (Nticks) + Khakham Sayavong + contact&nticks.net +43419 + Microsoft Unified Communications and Collaboration User Group + Yves Frédéric N´Soussoula + info&msuccug.de +43420 + Proximic Inc + Paul Armstrong + iana&proximic.com +43421 + SysMa.cz + Tomas Krejcik + tomas.krejcikz&gmail.com +43422 + ADTEC Communications + Jon Bolton + engineering&adtec.com.au +43423 + KeyONet + Kim Cheol Kee + firstpw&keyonet.com +43424 + Securitas FINLAND + Juha Miettinen + juha.miettinen&securitas.fi +43425 + Aduno Gruppe + Boris Bellorini + boris.bellorini&aduno-gruppe.ch +43426 + Noction + Eugeniu Ceglov + eceglov&noction.com +43427 + Altus Sistemas de Automação S.A + Rafael Morello + rd&altus.com.br +43428 + The William and Flora Hewlett Foundation + Boris Decout + bdecout&hewlett.org +43429 + Strata Information Technology, Inc + Keith Stark + keith&stratait.com +43430 + Systems Definition, Inc. + Frank Briese + briesef&systemsdefinition.com +43431 + Tate, Inc. + Peter Strapp + pstrapp&tateinc.com +43432 + MICROMED BIOTECNOLOGIA LTDA + FRANCISCO DUARTE MOREIRA NETO + neto&micromed.ind.br +43433 + Sreevidya Aravind + Sreevidya Aravind + sv.vidyaaravind&gmail.com +43434 + Metacom Pty Ltd + Stefan Reinke + stefan&metacom.co.za +43435 + Nutsrange Technologies + James Gu + nutsrange&gmail.com +43436 + Accumuli PLC + Paul Maskelyne + paul.maskelyne&accumuli.com +43437 + City of Montclair + Robert Castillo + rcastillo&cityofmontclair.org +43438 + County Of Bruce + Jaron Kerr + jkerr&brucecounty.on.ca +43439 + J.J. Downs Industrial Plastics Inc. + Dani Cela + dcela&jjdowns.com +43440 + royal holloway, university of london + roger matthews + roger.matthews&rhul.ac.uk +43441 + royal holloway, university of london + roger matthews + roger.matthews&rhul.ac.uk +43442 + Niles Radio Communications + John Lindsey + john&nilesradio.com +43443 + Transacciones y Servicios Mobile + Fernando Bas + ferbas&transermobile.com +43444 + Inspire Living, Inc. + Michael Script + mscript&inspirelivinginc.com +43445 + 4th Layer Integrated Solutions S.r.l. + Enrico Milani + enrico.milani&4lis.it +43446 + Hartmann Electronic GmbH + Fedor Minich + fedor.minich&hartmann-electronic.com +43447 + LoadFront, S.L. + Víctor Román Archidona + vroman&loadfront.com +43448 + THEFEINERS.COM + Amnon Feiner + Amnon.Feiner&hotmail.com +43449 + mobilcom-debitel GmbH + Jan Singer + jan.singer&md.de +43450 + Agencja Restrukturyzacji i Modernizacji Rolnictwa + Marek Michnowicz + PKI&arimr.gov.pl +43451 + Australian Customs and Border Protection Service + Chris Sherlock + chris.sherlock&customs.gov.au +43452 + Pragtec inc. + Jean-Francois Savard + jf.savard&pragtec.com +43453 + Visiometrics S.L. + Tony Rueda Roselló + tony.rueda&visiometrics.com +43454 + Wiccess + Jean-Paul Mallet + jp.mallet&wiccess.com +43455 + LFT Solutions + Angel Manchado + angel.manchado&lftsolutions.com +43456 + KHS GmbH + Frank Jaenecke + frank.jaenecke&khs.com +43457 + Warp Software Ltda. + Luiz Imbroisi Filho + luiz&imbroisi.com +43458 + Nvizible Ltd + Mr Andrew Kingston + licenses&nvizible.com +43459 + Virsae Group Ltd + Matthew Bagley + matthew.bagley&virsae.com +43460 + university college Leuven Limburg (UCLL) + Noe Gunther + gunther.noe&khleuven.be +43461 + DGIT INTERNATIONAL PTE. LTD + Allan Randall + engineering&dgit.biz +43462 + Universidade Federal Rural de Pernambuco + Carlos Frederico Medeiros de Souza + coord.suporte&nti.ufrpe.br +43463 + Kyoto-University Microcomputer Club + Kasumi Hanazuki + hanazuki&kmc.gr.jp +43464 + Ten Cities Media + Greg Foster + greg.foster&tencitiesmedia.com +43465 + Communication Federal Credit Union + Travis Llewellyn + travisll&comfedcu.org +43466 + CMS Central Media Solutions GmbH + Lablack, Stefan + stefan.lablack&centralmedia-solutions.de +43467 + Evolv, Inc. + Haam Tham + pencontact&evolv.net +43468 + Cacto Internet Ltda + Daniel Farias + daniel&cacto.me +43469 + Sysnove + Guillaume Subiron + guillaume&sysnove.fr +43470 + G + H Netzwerk-Design Gesellschaft für IT-Consulting mbH + Tobias Schröder + t.schroeder&netzwerk-design.de +43471 + Sun Trading Solutions + Jason Conley + jconley&suntradingllc.com +43472 + APC Integrated Services Group, Inc. + Matt Lehmann + mlehmann&apcisg.com +43473 + YHGfL Foundation + Andrew Yoward + support&yhgfl.net +43474 + Coca-Cola Hellenic Bottling Company + Martin Mirov + martin.mirov&cchellenic.com +43475 + XNX Sàrl + Cyril Christin + iana-pen&xnx.ch +43476 + LeanDev + Robert Pettersson + robert.pettersson&leandev.se +43477 + Bioss Consulting SRL + Giovanni Tirino + info&biossconsulting.com +43478 + Jonathon Anderson (civilfritz) + Jonathon Anderson + anderbubble&gmail.com +43479 + Ecole nationale Supérieure d'Informatique + MEDABIS BILAL + b_medabis&esi.dz +43480 + Canine Creche + Alanna Marquis + info&caninecreche.co.za +43481 + Innovaatik Grupp OÜ + Jargo Kõster + jargo&inno.ee +43482 + GlobalSensing Technologies + Olivier BROUSSE + r_et_d&globalsensing.eu +43483 + AIPHONE CO., LTD. + Hirokazu Harima + soft_snmp&aiphone.co.jp +43484 + Fundación Fulgor + Juan Vercellone + jvercellone&fundacionfulgor.org.ar +43485 + Trillium Teamologies, Inc. + Robert Morris + helpdesk&trilliumteam.com +43486 + Fuse Networks, LLC + Garan Williams + garanwilliams&fusenetworks.com +43487 + Guangzhou Woxiang Information Technology Co., Ltd + Difan Zhang + tifan&ifanr.com +43488 + Schletter GmbH + Markus Burgstaller + markus.burgstaller&schletter.de +43489 + GOOD FIRST GROUP . + HongDe + 59295152&qq.com +43490 + Rite-Tech Industrial Co., Ltd. + Sam Huang + sam&ritetech.com.tw +43491 + ITR Service GmbH + Stephan Schumann + stephan.schumann&itr-service.de +43492 + Bernhard Trinnes (microdots) + Bernhard Trinnes + bernhard.trinnes&microdots.de +43493 + Online Linjeforening + Kristian Ekle + kristian.ekle&gmail.com +43494 + Clarity Ltd + Robert Stiles + b06&gmx.com +43495 + Taide Enterprise Co.,Ltd. + Luo Xinheng + luo&tai-de.com +43496 + QSC AG + Thore Bunde + thore.bunde&qsc.de +43497 + Weavesys UK + Elliott Clark + elliott.clark&weavesys.com +43498 + SENSORBOX DO BRASIL LTDA + Carlos Eduardo Padua Sarcinelli + c.eduardo&sensorbox.com.br +43499 + Youncta + Luigi Russo + luigi.russo&youncta.com +43500 + 4D Security Solutions + Ken Robinson + kenneth_robinson&4-dsecurity.com +43501 + Boston Financial Data Services Inc + Rob Forand + rforand&bostonfinancial.com +43502 + HighRes Biosolutions + Ian Locke + ilocke&highresbio.com +43503 + Jay Ridgeway (beekling.com) + Jay Ridgeway + jayridge&gmail.com +43504 + Judd Storrs + Judd Storrs + jstorrs&gmail.com +43505 + Plugh Studios Ltd + Randy Beiter + iana&plughstudios.com +43506 + Beats by Dre + Brannon Means + brannon.means&beatsbydre.com +43507 + ti&m AG + Harald Böttcher + harald.boettcher&ti8m.ch +43508 + EDT SAS - Electronic Data Transfer + Stéphane CHANVILLARD + schanvillard&edt.fr +43509 + BITPRO AS + André Nordstokke + an&bitpro.no +43510 + Juan Jose Rodriguez Ponce + Juan Jose Rodriguez Ponce + mail&juan-jose.com +43511 + E7 Solutions + Brandon Opfermann + brandon.opfermann&e7solutions.com +43512 + BEIJING SIFANG AUTOMATION CO., LTD + youtao + youtao&sf-auto.com +43513 + SDIS68 + Nicolas Riss + nicolas.riss&sdis68.fr +43514 + kt telecop + Park, Sang Yeon + itsmeda.park&kt.com +43515 + NISCOM,Inc. + Kaoru Miyazaki + k-miyazaki&niscom.co.jp +43516 + Auvik Networks Inc. + Marc Morin + mmorin&auvik.com +43517 + CoolMinds Technologies (P) Ltd + Abraham Jacob + abraham&coolmindsinc.com +43518 + Smartconnect NV / SA + Mark Tetrode + mark.tetrode&smartconnect.eu +43519 + Tranwall + Aurelien Duarte + aurelien.duarte&tranwall.com +43520 + pteam gmbh + Markus Gruetter + office&pteam.ch +43521 + RSE Informationstechnologie GmbH + Dipl.Ing. Alfred Darmann + darmann&rse.at +43522 + VoltServer, Inc. + Dan Lowe + dan.lowe&voltserver.com +43523 + Alberta Investment Management Corporation + Nathanael Law + nathanael.law&aimco.alberta.ca +43524 + Vanteon Corp. + Matt Healy + mhealy&vanteon.com +43525 + Wavecon GmbH + Cemil Degirmenci + info&wavecon.de +43526 + Signal Bredbånd AS + Lars Erik Utsi Gullerud + lerik&signal.no +43527 + Presidio Networked Solutions + Robert Shade + rshade&presidio.com +43528 + SHODEN CORPORATION + Yoshito Yagi + yagi&sdn.co.jp +43529 + Istituto Radiologico e Fisioradioterapico Valdarno + Andrea Venanzi + andrea.venanzi&centromedicovaldarno.it +43530 + HYTEC INTER Co.,Ltd. + Takashi Nishihara + net_admin&hytec.co.jp +43531 + Atomic Object LLC + Justin Kulesza + admin&atomicobject.com +43532 + Yafeng Shan (kokonur) + Yafeng Shan + yafeng.shan&gmail.com +43533 + Beijing National Railway Research & Design Institude of Signal & Communication Co, Ltd. (CRSCD) + Yafeng Shan + yafeng.shan&gmail.com +43534 + Alstom Grid + Zhi Shi + zhi.shi&alstom.com +43535 + Luxottica North America Distribution LLC + David Reasoner + dreasone&luxotticaretail.com +43536 + AO K-Dorstroy + Alex Chernyavskiy + support&k-dorstroy.kz +43537 + Solumed + Saul Jankelow + Saulj&solumed.co.za +43538 + EXA-TMR + Tülin Yaman + tulin.yaman&exa-tmr.com +43539 + Dwarf Animation Studio + Yann VOTÉ + it&dwarf-labs.com +43540 + Federal Agricultural Marketing Authority + Sharifah Khairun Nisa Habib Elias + ldap&fama.gov.my +43541 + LSY Inc + Brian Grey + brian.grey&lsyinc.com +43542 + DENT Instruments + Jesse Laird + jlaird&dentinstruments.com +43543 + ID Business Solutions Ltd + Simon Diaz + snmp-admin&idbs.com +43544 + DigiComm GmbH + Theo Bongartz + tbongartz&digicomm.de +43545 + Omnitracs, LLC + Pete Patron + ppatron&omnitracs.com +43546 + Tariox Limited + Martyn Van Berkel + hostmaster&tariox.com +43547 + SCOOP Software GmbH + Jürgen Link + juergen.link&scoop-software.de +43548 + Trasis sa + Gauthier Philippart + info&trasis.com +43549 + IT Competence Group SE + Karl Gerber + support&neton.ag +43550 + CAMEA spol. s r. o. + Fučík Otto + camea&camea.cz +43551 + Mavari-IT bvba + Peter Maeseele + peter&mavari.be +43552 + Whitesky Communications + Spencer Thomason + spencer&whiteskycommunications.com +43553 + Rapid Focus Security, Inc. + Sam Stelfox + sam&pwnieexpress.com +43554 + IGC + Didier Houdas + didier.houdas&igc-erp.com +43555 + LayeredDefense + Deral Heiland + dh&layereddefense.com +43556 + Rigas domes Informacijas tehnologiju centrs + Juris Persins + Juris.Persins&riga.lv +43557 + Nick Fender + Nick Fender + net.admin&nickfender.com +43558 + GitHub, Inc + Hugh Bawt + ops&github.com +43559 + ENKOM AG + Patrick Bruegger + info&enkom.com +43560 + New Orleans East Hospital + Kimberly Jones-Williams + Kim.JWilliams&NOEHospital.org +43561 + Micro-Research Finland Oy + Jukka Pietarinen + jukka.pietarinen&mrf.fi +43562 + ZepMed, LLC + Nathan White + natewhite44&gmail.com +43563 + pedro paulo medeiros + Pedro Paulo Medeiros + ppmedeiros&ig.com.br +43564 + TSC AUTO ID Technology Co., Ltd. + Phil Liu + phil&tscprinters.com +43565 + Reliance Jio Infocomm Limited + Sudhanshu Purwar + sudhanshu.purwar&ril.com +43566 + Engineering Center REGIONAL SYSTEMS, Limited + Alexey Gordichuk + a.gordichuk&ec-rs.ru +43567 + Yongjia County Board of Education + Li Chengdao + lcd&yje.cn +43568 + EMICON + Rifat Abdulkaumov + rifat&emicon.ru +43569 + Hong Yun Technology + Hong Yun + hongyuntech&gmail.com +43570 + Coopérative Forestière Bourgogne Limousin (CFBL) + Chantal BRODIN PREVOSTO + chantal.prevosto&cfbl.fr +43571 + SOCIETE DES TRANSPORTS ROCHATTE + Rose-Marie ROCHATTE + str&transports-rochatte.com +43572 + Foundation for Research and Technology Hellas + Panagiotis Sikas + sikas&ics.forth.gr +43573 + VSAT-SERVICE + Shishkov Alexey + shan&vsat-s.ru +43574 + Lansing Makers Network + Michael Johnson + itstaff&lansingmakersnetwork.org +43575 + OpenPeak + Dustin Oprea + dustin&openpeak.com +43576 + IntSec.NET + Alessio Bravi + alessio&bravi.org +43577 + CNPC Beijing Richfit Information Technology Co.,LTD. + Songjiajia + songphd&hotmail.com +43578 + 42technology AG + Stephan Koch + sw-development&42technology.ch +43579 + EASYPROTO di Giacomo Cesari + giacomo cesari + info&easyproto.it +43580 + SutherlandGlobalServices + Arunbabu Rajmohan + Arunbabu.r&sutherlandglobal.com +43581 + Ooyala Inc. + Bao Nguyen + ngqbao&gmail.com +43582 + Document Centric Solutions Ltd + David Randall + sysadmin&doccentrics.com +43583 + ReMake Electric + Karl Palsson + developers&remake-electric.com +43584 + Trizetto Provider Solutions + Kyle Pott + kyle.pott&trizetto.com +43585 + SAMSON AG + Axel Goettmann + agoettmann&samson.de +43586 + SVS TELEKOMÜNİKASYON HİZ. TİC. SAN. A.Ş. + Muhammet Fatih OKUTAN + fatih.okutan&svstelekom.com.tr +43587 + Roave, LLC. + Evan Coury + info&roave.com +43588 + SAA Topnet GmbH + Suzanne Epp + epp&saatopnet.de +43589 + KEKLOLWTF AS + Jan Egil Vestbø + iana&keklolw.tf +43590 + HAL9k hackerspace + Georg Sluyterman + bestyrelse&lists.hal9k.dk +43591 + Erlang Solutions LTD + Michal Tomczuk + sysadmin&erlang-solutions.com +43592 + Campbell Scientific, Incorporated + Sam Utley + sutley&campbellsci.com +43593 + Crimson Innovative + Sudhakara Rao + sudhakarmurala03&gmail.com +43594 + Interhyp AG + Norman Bauer + _IT_Windows_Services&interhyp.de +43595 + MolinoSoft (Julian Bourne) + Julian Bourne + julian&britesc.com +43596 + Carnegie Fitness + Clark Chiu + clark&carnegie-fitness.com +43597 + Comprehensive Health Management, Inc. + Oscar Galdona + oscar.galdona&wellcare.com +43598 + STORM + Sernin van de Krol + chip&storm.vu +43599 + Paneidos Desu + Sernin van de Krol + sernin&paneidosdesu.com +43600 + Beijing Easesky Netcom Technology Co.,Ltd + David Xu + davidxu&easeskytech.com +43601 + Nuri Technology Co., Ltd. + Kwang-Wook, Lee + nuritec&nuritec.co.kr +43602 + Rossiya Segodnya + Andrey Belokurov + postmaster&rian.ru +43603 + The Twelve Tribes + Patrick McCourt + patrick.mccourt&twelvetribes.org +43604 + Arkansas Educational Television Network (AETN) + Greg Barber + gbarber&aetn.org +43605 + Metatrust + Jorge Rocha + jorge.rocha&metatrust.com.mx +43606 + nobaq.net + Nikolaus Hammler + noc&nobaq.net +43607 + Funda Real Estate B.V. + Remie Bolte + beheer&funda.nl +43608 + Raben Group + Marcin Piotrowski + it.admin&raben-group.com +43609 + NetCracker Technology Corp. + Nikita Sizykh + ldap.snmp.oids.group&netcracker.com +43610 + ColosseoEAS, a.s. + Miroslav Petrak + miroslav.petrak&colosseoeas.com +43611 + Power Ethernet + James Gardiner + james.gardiner&powerethernet.com +43612 + IOLAN + Ernst Lemm + e.lemm&iolan.com +43613 + Skylife Engineering + Antonio Rodriguez + itadmin&skylife-eng.com +43614 + phaenovum Schülerforschungszentrum Lörrach-Dreiländereck e.V. + Lars Möllendorf + it-robotik&phaenovum.eu +43615 + VonRoll + Bilal Karaagac + bilal.karaagac&vonroll.com +43616 + Aventura Technologies Inc. + Michael Wangner + info&aventuratechnologies.com +43617 + Vidant Health + Kirk Davis + kirk.davis&vidanthealth.com +43618 + Camtrace + Alain Dumouchel + alcodu1812&gmail.com +43619 + LianYunGang E-Port Information Development Co.,Ltd + Yaokun Zhang + postmaster&lygeport.gov.cn +43620 + Shenzhen Headsun Technology + Bo Liu + 18929378839&189.cn +43621 + Medical Effect + Dr. Roman Zolow + zolow&medical-effect.com +43622 + WebPerative LLC + Alan McCluney + alan&webperative.com +43623 + Umensis - Guillaume Pannatier + Guillaume Pannatier + guillaume.pannatier&gmail.com +43624 + Jaroslav Sendler (xsendl00) + Jaroslav Sendler + sendler.jaroslav&gmail.com +43625 + Core Technology + Krzysztof Kielak + contact&moosefs.com +43626 + NewB + Catherine Blancquaert + info&newb.coop +43627 + Devani Creative + Sernin van de Krol + sernin&devani.nl +43628 + The Rubicon Project + Sean Michael Byron + poc&rubiconproject.com +43629 + PSITEX, LLC + Jack D. Pond + jack.pond&psitex.com +43630 + Duxoft, Inc. + Gennadiy Bezkorovayniy + gb&duxoft.com +43631 + Heijmans N.V. + Edwin van de Burgt + eburgt2&heijmans.nl +43632 + Celtex Works + Davey Robertson + d.robertson&celtexworks.com +43633 + AIES Advanced Industrial Electronic Systems + Dariusz Makowski + dariusz.makowski&aies.pl +43634 + Metrellis, Inc. + Walter Sujansky + wsujansky&sujansky.com +43635 + Practice Velocity, LLC + Gregory J Wentz + gwentz&practicevelocity.com +43636 + LES.NET + Leslie Bester + sales&les.net +43637 + Zymer Inc. + Peter Yoo + pryoo&zymerinc.com +43638 + ITS Korea + Sanghyun Lee + shleego&itskorea.kr +43639 + Evoluta Interactive + Schalk Snyman + schalks&evoluta.biz +43640 + through.other.eyes (Jonathan Platzer) + Jonathan Platzer + jonathan1996&gmx.at +43641 + netplus.ch SA + Jean-Blaise Rey + jean-blaise.rey&netplus.pro +43642 + Linde Engineering + Walter Werther + walter.werther&linde-le.com +43643 + TEQ SA + Alessandro Prioglio + tech-admin&teq.ch +43644 + Infra Services + Arjen Barnhard + pen.iana&infra-services.net +43645 + FEIG ELECTRONIC GmbH + Sascha Brueck + sascha.brueck&feig.de +43646 + Datatal AB + Thomas Persson + thomas&datatal.se +43647 + Rimbach IT Systems UG + Rene M. Rimbach + info&rimbach-it-systems.de +43648 + Naudit High Performance Computing and Networking S.L. + Eduardo Magaña + eduardo.magana&naudit.es +43649 + Raritan Bay Medical Center + Susan Landow + slandow&rbmc.org +43650 + United Health Services + Kevin Rymer + kevin_rymer&uhs.org +43651 + INTTRA Inc + Michael Lunny + michael.lunny&inttra.com +43652 + GoBICS + Rasmus Steinkamp + iana.pen.6kUL4EWH2w&gobics.de +43653 + UNIVERSITAT OBERTA DE CATALUNYA + Carles Cortada i Hortalà + ccortada&uoc.edu +43654 + marcsi.ch + Marc Siegenthaler + shin&marcsi.ch +43655 + University Ecclesiastical Academy of Thessaloniki + Telemachos Stamkopoulos + telem&aeath.gr +43656 + Consortium + Samsun Kang + sammy-kang&nate.com +43657 + Kanton St.Gallen + Robert Schneider + Robert.Schneider&sg.ch +43658 + Seacloud + Bong Dae Kim + bd.kim&sea-cloud.co.kr +43659 + Hochschule für Technik und Wirtschaft des Saarlandes (htw saar) + Niclas Wolniak + niclas.wolniak&htwsaar.de +43660 + Zadara Storage Ltd + Yair Hershko + yair&zadarastorage.com +43661 + Columbus Business Solutions + Johnny Mejias + jmejias17&gmail.com +43662 + Simpson Housing LLLP + Gene Pinson + gene.pinson&simpsonhousing.com +43663 + eTouch Federal Systems + Benjamin Stassart + iana&etouchfederal.com +43664 + Unzane + Gerald Turner + gturner&unzane.com +43665 + rioxo GmbH + Rudolf Rohr + rudolf.rohr&rioxo.net +43666 + Hackerspace Brussels + Frederic Pasteleurs + askarel&hackerspace.be +43667 + Sunwire Inc + Jason Legault + support&sunwire.ca +43668 + Andreas Kreisel + Andreas Kreisel + akreisel&duck-edv.de +43669 + The Institute of Mathematical Sciences + B. Raveendra Reddy + ravi&imsc.res.in +43670 + Epic Code Pty. Ltd. + Michael Slade + mslade&knobbits.org +43671 + EMSEAS Teknik AB + Jonathan Petersson + jonathan.petersson&cxense.com +43672 + INTELLECT MODULE + Ivan Fedotov + ivan&intellect-module.ru +43673 + Federal State Unitary Enterprise CentrInform + Aleksey Gvozdev + a.gvozdev&center-inform.ru +43674 + Robonect + Mikhail Sokolov + robot&robonect.com +43675 + Accenture CAS GmbH + Carsten Mueller + carsten.mueller&accenture.com +43676 + 57North Hacklab + Iain Learmonth + irl&fsfe.org +43677 + ICT Plus srl + Alessandro Barsotti + alessandro.barsotti&ictplus.it +43678 + Michael Kramer + Michael Kramer + verwaltung&turkeyfish.de +43679 + SETTE + Sotir Gramosli + sotir.gramosli&sette.com.mk +43680 + Chorus Limited + David Vink + chorusopsnotify&chorus.co.nz +43681 + ELESTER-PKP Sp. z o.o. + Robert Bojara + robert.bojara&elester-pkp.com.pl +43682 + ITSA Consulting, LLC + Joshua M Miller + joshua&itsecureadmin.com +43683 + ALDEIS + Damien guigue + damien&yooda.com +43684 + NOVASIB GmbH + René Carl + rene.carl&novasib.de +43685 + biz:Consult Unternehmensberatung GmbH + Gregor Kralik + gregor.kralik&bizconsult.at +43686 + Jefferson County + David Olsen + itstaff&co.jefferson.wa.us +43687 + Christoph Knott - IT-Sicherheitstechnik + Christoph Knott + info&it-sicher.com +43688 + GERMEN ELEKTRONIK LTD + MURAT GERMEN + mgermen&germen.com.tr +43689 + schugart + Dimitri Fagart + raspberry&schugart.net +43690 + The Active Network + Heather Tillman + heather.tillman&activenetwork.com +43691 + Michael Kettner + Michael Kettner + mikettner&gmx.de +43692 + haberberger.com + Andreas Haberberger + admin&haberberger.com +43693 + Fotolia LLC + Renaud Chaput + renaud&fotolia.com +43694 + Omega Intelligence Systems Ltd + Martin Adamczyk + martin&omegahq.biz +43695 + 5nine Software + Dr. Konstantin Malkov + kmalkov&5nine.com +43696 + LLC Info-Kontent + Sergey Mudrak + sergey.mudrak&beeper.ru +43697 + JSC Bryansk Supply Company + Ivan Toporkov + Ivan&elektro-32.ru +43698 + Joint Electronic Teller Services Ltd. + Ricky Man + rickyman&jetco.com.hk +43699 + EasyData, LLC + Vladimir Baranov + info&easydata.ru +43700 + PathCore + Dan Hosseinzadeh + iana.org&pathcore.ca +43701 + HySecurity, Inc. + Chuck Davidson + cdavidson&hysecurity.com +43702 + Dom-Daniel + Artashes Kalantarian + artashes&dom-daniel.com +43703 + Wacom Company Ltd. + Daniel Dietz + daniel.dietz&wacom.eu +43704 + Accutron Instruments Inc + Mike Sharkey + mike&accutroninstruments.com +43705 + F!nTcH.org + Vincent BECHON + fintch&fintch.org +43706 + Statnett SF + Roar Håkonsen + roar.hakonsen&statnett.no +43707 + Australian Rail Tecchnology + Thomas George + t.george&ar-tech.com.au +43708 + SimonMed Imaging + Chris Diehn + cdiehn&simonmed.com +43709 + AirDSL (Pty) Ltd + Iliyan Dobrev + iliyan&airdsl.co.za +43710 + GAMESA + Jose Antonio Contreras Caballero + jacontreras&gamesacorp.com +43711 + mySupply ApS + Peter Freiberg + peter.schmidt.freiberg&mySupply.dk +43712 + Universidad Central de Venezuela + Alberto Bellorin + alberto.bellorin&ucv.ve +43713 + Code 42 + Ethan J Sommer + ethan&code42.com +43714 + Mega Soft Computación, C.A. + Jose E. Delgado + infra&megasoft.com.ve +43715 + Data Infrastructure Technologies Ltd. + Chris Ianculovici + crs5tx&gmail.com +43716 + Veterinary Nurse Solutions Pty Ltd + Deane Klaer + deane&vetnurse.com.au +43717 + imensup + makan jooyani + info&imensup.com +43718 + Österreichisches Weltraum Forum + Sebastian Sams + sebastian.sams&oewf.org +43719 + Telvio LLC + Andrew Kolchoogin + gadm&telvio.ru +43720 + Creat0r.pro + Sergey A. Prokofyev + s-proff&creat0r.pro +43721 + Cyberoam Technologies Pvt. Ltd. + Sanket Handa + pen.iana&cyberoam.com +43722 + DAC Systems, Inc. + Mark Nickson + mnickson&dacsystems.com +43723 + Stancil Corporation + Simon Farrow + simon.farrow&stancilcorp.com +43724 + Japan Prime Computing + daisuke watanabe + watanabe.daisuke&j-pc.jp +43725 + Casair, Inc + Mike Sturdee + mike.sturdee&casair.net +43726 + GO! Express & Logistics Deutschland GmbH + Uwe Rehorst + uwe.rehorst&general-overnight.com +43727 + Valeo Comfort ans Driving assitance + Etter Stephan + stephan.etter&valeo.com +43728 + Sinergise Ltd. + Primoz Kolaric + primoz.kolaric&sinergise.com +43729 + Teckids e.V. + Dominik George + dominik.george&teckids.org +43730 + Ernst Klett AG + Horst Lehmacher + hostmaster&klett-gruppe.de +43731 + FooxTek Co., LTD. + David Chu + david&foox.cc +43732 + Netmag Technology Corporation + Joyce Chen + joycechen&netmag-tech.com +43733 + East Photonics, Inc. + Yong-Seung Jeong + tech&eastphotonics.com +43734 + IQUO Ltd + Peter Reynolds + peter&iquo.co.uk +43735 + STI-Tassimco + Patrick Lauziere + patrick.lauziere&sti-tassimco.com +43736 + Standard Imaging, Inc. + Mark Mackenzie + mmackenzie&standardimaging.com +43737 + MedAllies + Devin Kusek + dkusek&medallies.com +43738 + Doshisha University + TANAKA, Yasuhiro + donetmgr&mail.doshisha.ac.jp +43739 + Concept Smoke screen Ltd + Matt Gilmartin + Matt&smoke-screen.co.uk +43740 + ASB-Technology Sp. z o.o. + Tomasz Cholewiński + t.cholewinski&asb.nl +43741 + Cerqueira & Marcos, Lda + Luis Martins + luis.fcm&netcabo.pt +43742 + Microx Computer GmbH + Adam Jaskowiec + adam.jaskowiec&microx-computer.de +43743 + Open Systems Technology, Pty. + Louis Rodriguez + itt&ost.com.au +43744 + airberlin + Peter Jaremenko + peter.jaremenko&airberlin.com +43745 + CONSEJO DE LA JUDICATURA + David Moncayo + entidad.certificacion&funcionjudicial.gob.ec +43746 + Ulterius Technologies, LLC + Alex Cavgalar + alex.cavgalar&ulteriustech.com +43747 + MaterialApps + Andreas Werder + andreas.werder&yahoo.com +43748 + ARES Conocimiento de Negocio, SL + Andres Escribano de Mingo + AEscribano&ares-cn.es +43749 + Country Bright Company Ltd. + Terence Ho + it&countrybright.com +43750 + Jabil Circuit, Inc + Thomas Cetta + domains-administrator&jabil.com +43751 + Shenzhen TG-NET Botone Technology CO. Ltd. + Shine Zhang + xian.zhang&tg-net.cn +43752 + China Film Equipment Co. Ltd. + linxiaofei + linxiaofei&cfec.com.cn +43753 + Kyriasis + Johannes Löthberg + johannes&kyriasis.com +43754 + Philipp Wagner Softwareentwicklung + Philipp Wagner + mail&philipp-wagner.com +43755 + BG-Phoenics GmbH + David Feindel + david.feindel&bg-phoenics.de +43756 + Schwarz Dienstleistung KG + Max Killinger + gtld&sbg.de +43757 + QOSIT AG + Uwe Schneider + uwe.schneider&qosit.com +43758 + Clique Intelligence Inc. + Art Leondires + art.leondires&cliqueintelligence.com +43759 + Big White Network Technologies,Ltd. + Tuhongchao + tuhongchao&bigwhitenet.com +43760 + Atlas Networks + Nathan Eisenberg + nathan&atlasnetworks.us +43761 + Our School Ltd + Brett Merrick + support&ourschool.co.nz +43762 + PlazaLotusGroup + Pavel Chikovani + admin&plazalotus.com +43763 + ChinaFilm Global (Beijing) Technology limited + wang heng + heng.wang&cfgdc.net +43764 + Tallac Networks + Matthew Davy + mpd&tallac.com +43765 + Color Print + Torben Vingborg + TV&colorprint.dk +43766 + MBSys LLC Azerbaijan + Mehdi Kamran Mammadov + mehdi&mbsys.tv +43767 + Eastern Long Island Hospital + Susan Apicello + sapicello&elih.org +43768 + GatesAir, Inc. + Bradley Thomson + brad.thomson&gatesair.com +43769 + Vezea + Sebastian Wetzel + iana.admin&vezea.com +43770 + Addat s.r.o. + Ing. Jiri Kubias + jiri.kubias&addat.cz +43771 + Behlman Electronics + Heather Savage + hsavage&behlman.com +43772 + K+S IT-Services GmbH + Regina Böhm + regina.boehm&k-plus-s.com +43773 + The Vancouver Clinic Inc. + Tim Morris + netadmins&tvc.org +43774 + Hortonworks Inc + Jesse Lesperance + jlesperance&hortonworks.com +43775 + Quotepro Inc + Brian Marquis + brian&quotepro.com +43776 + Symbiotic System Design + Manuel Deschambault + themactech&me.com +43777 + Maikel de Boer + Maikel de Boer + maikel&loopodoopo.nl +43778 + Hampshire Controls Corporation + Diane D. Rush + drush&hampshirecontrols.com +43779 + Finnova AG + Alexander Berger + alexander.berger&finnova.ch +43780 + Paradox Networks, Inc + Jackie Bates + iana-pen&paradoxnetworks.net +43781 + Moshel Kamadu Records + Markus Szumovski + markus.szumovski&moshel-kamadu.at +43782 + UPS Solutions INC. + Mitsunari Tomosaka + sdb-develop&ups-sol.com +43783 + WaveNet Communications Private Limited + MUSUNURU SRIDHAR + ms&wavenet.co +43784 + IFOM + Ivan Lago + ivan.lago&ifom.eu +43785 + Magellium + Romain Cabassot + romain.cabassot&magellium.fr +43786 + Factual Inc + Philip Marcus + sysops&factual.com +43787 + Leviathan Security Technologies + Falcon Darkstar Momot + falcon.momot&leviathansecurity.com +43788 + Comita d.d. + Bojan Oresnik + bojan.oresnik&comita.net +43789 + Trading & Consulting `H.P.C.´ GmbH + Robert Gierzinger + rg&hpc.at +43790 + becker-aero + Roger Becker + roger.becker&becker-aero.de +43791 + Cine Digital Service + Ronan SALMON + snmp&cinedigitalservice.fr +43792 + Now Wireless Limited + Brett Warthen + brett&nowsms.com +43793 + Tom Gundersen (systemd) + Tom Gundersen + teg&jklm.no +43794 + Chris Thomson + Chris Thomson + chris&chris-thomson.co.uk +43795 + Guangzhou Andea Electronics Technology Co.,Ltd + ZhenSong Li + lzs6401948&163.com +43796 + Rasing IT Solutions + Bastiaan Rasing + bastiaan&rasing.me +43797 + Croz d.o.o. + Neven Biruski + nbiruski&croz.net +43798 + NANJING SAND TECHNOLOGY CO., LTD + Wang Kai Jiang + tech&sandkj.com +43799 + TRUMPF GmbH + Co. KG + Andreas Reinmoeller + andreas.reinmoeller&de.trumpf.com +43800 + OraSentry + Raphaël Tiran + raphael&orasentry.com +43801 + Dolphin Systems AG + Peter Honegger + peter.honegger&dolphin.ch +43802 + Avaloq Evolution AG + Jukka Salmi + jukka.salmi&avaloq.com +43803 + University of South Wales + Jeremy Thomas + sysadmin&southwales.ac.uk +43804 + Bombardier Aerospace + Marc Rinfret + marc.rinfret&aero.bombardier.com +43805 + Metalogix International GmbH + Anna DeGiorgio + adegiorgio&metalogix.com +43806 + Shape Security, Inc + Judy Karp + judy&shapesecurity.com +43807 + CENTRI Technology, Inc. + Lance Lu + lance&centritechnology.com +43808 + Spincat Studios + Bob Bregant II + bob&spincats.com +43809 + University of the Philippines + Rommel Feria + admin&up.edu.ph +43810 + Li Hongnan (LiHN) + Li Hongnan + mail&lihn.cn +43811 + University of the Philippines Mindanao + Krishna Hernandez + krishnahernandez&upmin.edu.ph +43812 + Corscience GmbH & Co. KG + Florian Kasper + edv&corscience.de +43813 + Centraal Justitieel Incassobureau + C.M. Eyzenga + informatiebeveiliging&cjib.minjus.nl +43814 + GNU Networks Ltd. + Kenneth Peiruza + kenneth&gnun.net +43815 + The University of Texas M.D. Anderson Cancer Center + Sean Walker + swalker&mdanderson.org +43816 + Tran Industries LLC + Duc Tran + info&tranindustries.com +43817 + Vertex Business Services + Pat Sagers + pat.sagers&vertexgroup.com +43818 + Featurespace Limited + Andy Whitell + sysadmin&featurespace.co.uk +43819 + pulse technologies + Ronnie Gilkey + ronnie&pulsetechofla.com +43820 + Mozy, Inc. + Thor Sigurjonsson + thor.sigurjonsson&mozy.com +43821 + Suwannee County School Board + Adam Boatright + adam.boatright&suwannee.k12.fl.us +43822 + Nok Nok Labs, Inc. + John Westien + jw-iana&noknok.com +43823 + VAS Experts + Dmitriy Moldavanov + dmoldavanov&vasexperts.ru +43824 + ConectaIP Tecnologia S.L. + Jordi Corpas + jordi.corpas&conectaip.es +43825 + Earnest Products, Inc. dba Southern Manufacturing + Anjanett Exum + aexum&southernmfg.com +43826 + TEXKA LABS + Carlos Visser + cvisser&texka.com +43827 + Ideosoft C.B. + Juan Gomez Melero + jgomez&ideosoft.es +43828 + Bosoft + Karol Klos + karol.r.klos&gmail.com +43829 + Ifield School + Andrew Mudamai + amudamai&ifield.kent.sch.uk +43830 + eWater Pty Ltd + Erick Tomaliwan + support&ewater.com.au +43831 + Ezvoicetek Co., Ltd. + Samuel Sung + samuel&ezvoicetek.com +43832 + Beijing D&S FieldBus Technology Co.,Ltd + Biao Wang + wangbiao&c-profibus.com.cn +43833 + LIVECREATION + Navas Chakkiyamparimble Hydrose + navas&livecreation.in +43834 + Urban Systems Design Institute + Bugarev Ivan + support&ecocity.ru +43835 + HOCHTIEF CZ, a.s. + Vladimir Bouchal + vladimir.bouchal&hochtief.cz +43836 + C Tech Bilisim Teknolojileri San.ve Tic. A.S + Mahmut Bulut + mahmut.bulut&ctech.com.tr +43837 + DTI Group Ltd + Jean-Michel Florent + jean-michel.florent&dti.com.au +43838 + Genex Hellas L.T.D + Dimitrios Papadopoulos + ts&genex.gr +43839 + RailComm LLC + Tim Myers + tmyers&railcomm.com +43840 + Sumitomo Mitsui Banking Corporation + Sean Boyd + SBoyd&JRI-America.com +43841 + Eatel + Duane Wylie + duane.wylie&eatel.com +43842 + Zero Waste Scotland + Chris Meikle + chris.meikle&zerowastescotland.org.uk +43843 + Alter Trading Corporation, LLC + Jason Hitt + isapps&altertrading.com +43844 + GuangDong Big Banian Info Tech Co., Ltd. + Jack Peng + bigbanian&gd3n.com +43845 + Toshiba Tec Solution Services Corporation + Syo Koyanagi + syou_koyanagi&toshibatec.co.jp +43846 + University of the Philippines - Baguio + Dominic S. Dulay + sysnet&upb.edu.ph +43847 + A Hagedoorn Electronics + Arend Hagedoorn + ah&ah-electronics.com +43848 + INoTHINGS GmbH + Andreas Brodmann + andreas.brodmann&inothings.com +43849 + LiiON, LLC + Thomas Lynn + applications&liionllc.com +43850 + Doxcelerate Corporation + Thierry Thelliez + tt&doxcelerate.com +43851 + danieLLegal.Net - Rechtsanwälte + Dr. Andreas Daniel + daniel&daniellegal.net +43852 + Truseco, s.r.o. + Jakub Horak + info&truseco.com +43853 + Academy of Economic Studies of Moldova + Constantin Sclifos + sclifcon&ase.md +43854 + TU Investment Club e.V. + Mathias Burger + mathias.burger&tuinvest.de +43855 + ezIX.org + Lyonel Vincent + lyonel&ezix.org +43856 + UNIT4 Business Software Spain S.L.U. + Ezequiel Parra Mestre + ezequiel.parra&unit4.com +43857 + mITra data + Supriya Mitra + sm&mitradata.com +43858 + Grigorivska International School + Vadim Baglikov + vadim&grigorivska.com +43859 + Harbor Freight Tools + Garrett Scott + InfoSec&harborfreight.com +43860 + Groenewoud + Frank Groenewoud + snmp&groenewoud.me +43861 + New York Genome Center + Fred Parks + fparks&priveon.com +43862 + Drei Banken EDV Ges.m.b.H. + Lothar Handl + lothar.handl&3beg.at +43863 + Valour Security Ltd + Dave Shaw + dave&val-sec.com +43864 + Breeze Innovations Private Limited + Seenivasan Balaji + balaji_blr&yahoo.com +43865 + Matthias Krause (spectre-net) + Matthias Krause + matthias.krause&hotmail.de +43866 + beijing huafei technology co.,ltd + wukuang + wukuang&huafeitech.com +43867 + Rename it + Rien Broekstra + rien&rename-it.nl +43868 + Conjur Inc + Kevin Gilpin + kgilpin&conjur.net +43869 + Yatharth Gupta + Yatharth Gupta + yatharth.gupta&gmail.com +43870 + Precyse Technologies + Yaniv Shneiderman + yanivs&precysetech.com End of Document

@@ -68,14 +68,14 @@ void follow_stats(follow_stats_t* stats) { - int i; + int i; - for (i = 0; i < 2 ; i++) { - memcpy(stats->ip_address[i], ip_address[i], MAX_IPADDR_LEN); - stats->port[i] = port[i]; - stats->bytes_written[i] = bytes_written[i]; - stats->is_ipv6 = is_ipv6; - } + for (i = 0; i < 2 ; i++) { + memcpy(stats->ip_address[i], ip_address[i], MAX_IPADDR_LEN); + stats->port[i] = port[i]; + stats->bytes_written[i] = bytes_written[i]; + stats->is_ipv6 = is_ipv6; + } } /* this will build libpcap filter text that will only @@ -91,7 +91,7 @@ if( ((pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4) || (pi->net_src.type == AT_IPv6 && pi->net_dst.type == AT_IPv6)) - && pi->ipproto == IP_PROTO_TCP + && pi->ipproto == IP_PROTO_TCP && (conv=find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype, pi->srcport, pi->destport, 0)) != NULL ) { /* TCP over IPv4 */ @@ -111,24 +111,24 @@ } } else if( pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4 - && pi->ipproto == IP_PROTO_UDP ) { + && pi->ipproto == IP_PROTO_UDP ) { /* UDP over IPv4 */ buf = g_strdup_printf( - "(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", - ip_to_str((guint8 *)pi->net_src.data), - ip_to_str((guint8 *)pi->net_dst.data), - pi->srcport, pi->destport ); + "(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", + ip_to_str((guint8 *)pi->net_src.data), + ip_to_str((guint8 *)pi->net_dst.data), + pi->srcport, pi->destport ); len = 4; is_ipv6 = FALSE; } else if( pi->net_src.type == AT_IPv6 && pi->net_dst.type == AT_IPv6 - && pi->ipproto == IP_PROTO_UDP ) { + && pi->ipproto == IP_PROTO_UDP ) { /* UDP over IPv6 */ buf = g_strdup_printf( - "(ipv6.addr eq %s and ipv6.addr eq %s) and (udp.port eq %d and udp.port eq %d)", - ip6_to_str((const struct e_in6_addr *)pi->net_src.data), - ip6_to_str((const struct e_in6_addr *)pi->net_dst.data), - pi->srcport, pi->destport ); + "(ipv6.addr eq %s and ipv6.addr eq %s) and (udp.port eq %d and udp.port eq %d)", + ip6_to_str((const struct e_in6_addr *)pi->net_src.data), + ip6_to_str((const struct e_in6_addr *)pi->net_dst.data), + pi->srcport, pi->destport ); len = 16; is_ipv6 = TRUE; } @@ -273,11 +273,11 @@ /* assign it to a src_index and get going */ for( j=0; j<2; j++ ) { if( src_port[j] == 0 ) { - memcpy(src_addr[j], srcx, len); - src_port[j] = srcport; - src_index = j; - first = 1; - break; + memcpy(src_addr[j], srcx, len); + src_port[j] = srcport; + src_index = j; + first = 1; + break; } } } @@ -322,26 +322,26 @@ } /* if we are here, we have already seen this src, let's try and figure out if this packet is in the right place */ - if( sequence < seq[src_index] ) { + if( LT_SEQ(sequence, seq[src_index]) ) { /* this sequence number seems dated, but check the end to make sure it has no more info than we have already seen */ newseq = sequence + length; - if( newseq > seq[src_index] ) { + if( GT_SEQ(newseq, seq[src_index]) ) { guint32 new_len; /* this one has more than we have seen. let's get the - payload that we have not seen. */ + payload that we have not seen. */ new_len = seq[src_index] - sequence; if ( data_length <= new_len ) { - data = NULL; - data_length = 0; - incomplete_tcp_stream = TRUE; + data = NULL; + data_length = 0; + incomplete_tcp_stream = TRUE; } else { - data += new_len; - data_length -= new_len; + data += new_len; + data_length -= new_len; } sc.dlen = data_length; sequence = seq[src_index]; @@ -350,7 +350,7 @@ /* this will now appear to be right on time :) */ } } - if ( sequence == seq[src_index] ) { + if ( EQ_SEQ(sequence, seq[src_index]) ) { /* right on time */ seq[src_index] += length; if( synflag ) seq[src_index]++; @@ -371,9 +371,9 @@ tmp_frag->data_len = data_length; memcpy( tmp_frag->data, data, data_length ); if( frags[src_index] ) { - tmp_frag->next = frags[src_index]; + tmp_frag->next = frags[src_index]; } else { - tmp_frag->next = NULL; + tmp_frag->next = NULL; } frags[src_index] = tmp_frag; } @@ -397,13 +397,13 @@ lowest_seq = current->seq; } - if( current->seq < seq[idx] ) { + if( LT_SEQ(current->seq, seq[idx]) ) { guint32 newseq; /* this sequence number seems dated, but check the end to make sure it has no more info than we have already seen */ newseq = current->seq + current->len; - if( newseq > seq[idx] ) { + if( GT_SEQ(newseq, seq[idx]) ) { guint32 new_pos; /* this one has more than we have seen. let's get the @@ -433,7 +433,7 @@ return 1; } - if( current->seq == seq[idx] ) { + if( EQ_SEQ(current->seq, seq[idx]) ) { /* this fragment fits the stream */ if( current->data ) { sc->dlen = current->data_len;

@@ -101,7 +101,7 @@ { IP_PROTO_ICMPV6, "ICMPv6" }, /* 58 IPv6-ICMP ICMP for IPv6 [RFC1883] */ { IP_PROTO_NONE, "IPv6 no next header" }, /* 59 IPv6-NoNxt No Next Header for IPv6 [RFC1883] */ { IP_PROTO_DSTOPTS, "IPv6 destination option" },/* 60 IPv6-Opts Destination Options for IPv6 [RFC1883] */ - { IP_PROTO_SHIM6_OLD, "SHIM6 header" }, /* 61 any host internal protocol [Internet_Assigned_Numbers_Authority] */ + { 61, "any host internal protocol" }, /* 61 any host internal protocol [Internet_Assigned_Numbers_Authority] */ { IP_PROTO_MIPV6_OLD, "Mobile IPv6 (old)" }, /* 62 CFTP CFTP [Forsdick, H., "CFTP", Network Message, Bolt Beranek and Newman, January 1982.][Harry_Forsdick] */ { 63, "any local network" }, /* 63 any local network [Internet_Assigned_Numbers_Authority] */ { IP_PROTO_SATEXPAK,"SATNET EXPAK" }, /* 64 SAT-EXPAK SATNET and Backroom EXPAK [Steven_Blumenthal] */

@@ -98,8 +98,6 @@ #define IP_PROTO_NONE 59 /* IP6 no next header - RFC1883 */ #define IP_PROTO_DSTOPTS 60 /* IP6 destination options - RFC1883 */ /* 61 is reserved by IANA for any host internal protocol */ -/* 61 is used by UCL's SHIM6 implementation as Next Header for SHIM6 */ -#define IP_PROTO_SHIM6_OLD 61 /* SHIM6 */ /* * The current Protocol Numbers list says that the IP protocol number for

@@ -3525,32 +3525,24 @@ switch (hfinfo->type) { case FT_PROTOCOL: + case FT_NONE: + case FT_BYTES: + case FT_STRING: /* - * We allow this to be zero-length - for - * example, an ONC RPC NULL procedure has + * We allow FT_PROTOCOLs to be zero-length - + * for example, an ONC RPC NULL procedure has * neither arguments nor reply, so the * payload for that protocol is empty. * - * However, if the length is negative, the - * start offset is *past* the byte past the - * end of the tvbuff, so we throw an - * exception. + * We also allow the others to be zero-length - + * because that's the way the code has been for a + * long, long time. + * + * However, we want to ensure that the start + * offset is not *past* the byte past the end + * of the tvbuff: we throw an exception in that + * case. */ - *length = tvb_length_remaining(tvb, start); - if (*length < 0) { - /* - * Use "tvb_ensure_bytes_exist()" - * to force the appropriate exception - * to be thrown. - */ - tvb_ensure_bytes_exist(tvb, start, 0); - } - DISSECTOR_ASSERT(*length >= 0); - break; - - case FT_NONE: - case FT_BYTES: - case FT_STRING: *length = tvb_ensure_length_remaining(tvb, start); DISSECTOR_ASSERT(*length >= 0); break;

@@ -1,13 +1,14 @@ /* - * $Id$ - * * THIS FILE IS AUTOGENERATED, DO NOT EDIT * generated from http://www.iana.org/assignments/enterprise-numbers - * run "tools/make-sminmspec <infile> <outfile>" to regenerate + * run "tools/make-sminmpec.pl <infile> <outfile>" to regenerate + * + * Note 1: "Gaps" in the iana enterprise-numbers list have been "filled in" + * with "(Unknown)" as the name so that direct (indexed) access to + * the list is possible. * - * Note: "Gaps" in the iana enterprise-numbers list have been "filled in" - * with "(Unknown)" as the name so that direct (indexed) access - * to the list is possible. + * Note 2: We should probably parse "enterprise-numbers" at program start + * instead of generating this file. */ #include "config.h" @@ -600,7 +601,7 @@ { 578, "Interlink Computer Sciences, Inc." }, { 579, "Bridge Information Systems, Inc." }, { 580, "Leeds and Northrup Australia (LNA) Nigel Cook" }, - { 581, "Intec Telecom Systems" }, + { 581, "CSG Systems International (previous was 'Intec Telecom Systems')" }, { 582, "Newport Systems Solutions, Inc." }, { 583, "azel Corporation" }, { 584, "ROBOTIKER" }, @@ -927,7 +928,7 @@ { 905, "Scorpion Logic" }, { 906, "Inotech Inc.Eric Jacobs" }, { 907, "Controlled Power Co." }, - { 908, "Elsag Bailey Incorporated" }, + { 908, "ABB Inc. (previous was 'Elsag Bailey Incorporated')" }, { 909, "J.P. Morgan" }, { 910, "Clear Communications Corp." }, { 911, "General Technology Inc." }, @@ -1231,7 +1232,7 @@ { 1209, "timonWare Inc." }, { 1210, "Capital Resources Computer Corporation" }, { 1211, "Storage Technology Corporation" }, - { 1212, "Tadiran Telecomunications L.T.D" }, + { 1212, "Tadiran Telecom TTL." }, { 1213, "NCP" }, { 1214, "Operations Control Systems (OCS)" }, { 1215, "The NASDAQ Stock Market Inc." }, @@ -1444,7 +1445,7 @@ { 1422, "Syntax" }, { 1423, "LIGHT-INFOCON" }, { 1424, "Performance Technology, Inc." }, - { 1425, "CXR Telecom" }, + { 1425, "CXR" }, { 1426, "Amir Technology Labs" }, { 1427, "ISOCOR" }, { 1428, "Array Technology Corportion" }, @@ -1832,17 +1833,17 @@ { 1810, "Czech Railways s.o. CITJaroslav Militky" }, { 1811, "Scan-Matic A/S" }, { 1812, "DECISION Europe Joel CHOTARD" }, - { 1813, "VTEL CorporationBill Black" }, - { 1814, "Bloomberg, L.P.Franko Rahimi" }, + { 1813, "VTEL Corporation" }, + { 1814, "Bloomberg, L.P." }, { 1815, "Witness Systems, Inc" }, - { 1816, "Rose-Hulman Institute of TechnologyLans H. Carstensen" }, + { 1816, "Rose-Hulman Institute of Technology" }, { 1817, "Aether Technologies" }, { 1818, "Infonet Software SolutionsDavid Hauck" }, { 1819, "CSTI (Compagnie des Signaux / Technologies Informatiques)Mr Camille Breeus" }, { 1820, "LEROY MERLINRIGAULT Alain" }, - { 1821, "Total Entertainment NetworkWill Coertnik" }, - { 1822, "Open Port TechnologyJeffrey Nowland" }, - { 1823, "Mikroelektronik Anwendungszentrum Hamburg GmbHZbynek Bazanowski" }, + { 1821, "Total Entertainment Network" }, + { 1822, "Open Port Technology" }, + { 1823, "Mikroelektronik Anwendungszentrum Hamburg GmbHZ" }, { 1824, "International Management Consulting, Inc." }, { 1825, "Fore Systems, Inc." }, { 1826, "MTech Systems" }, @@ -1909,7 +1910,7 @@ { 1887, "Albis Technologies Ltd. (previously was 'Siemens Switzerland Ltd.')" }, { 1888, "GigaLabs, Inc." }, { 1889, "MET Matra-Ericsson" }, - { 1890, "JBM Electronics" }, + { 1890, "Red Lion Controls (JBM Electronics)" }, { 1891, "OPTIM Systems, Inc." }, { 1892, "Software Brewery" }, { 1893, "WaveLinQ" }, @@ -2172,7 +2173,7 @@ { 2150, "SDS Ltd." }, { 2151, "Promus Hotel Corporation Oscar Pearce" }, { 2152, "Cavid Lawrence Center" }, - { 2153, "Insider Technologies Ltd Paul Hancock 706001.1542 compuserv.com" }, + { 2153, "Insider Technologies Ltd Paul Hancock" }, { 2154, "Berkeley Networks" }, { 2155, "Infonautics Corporation" }, { 2156, "Easy Software" }, @@ -2386,7 +2387,7 @@ { 2364, "Konica Corporation" }, { 2365, "Viacom" }, { 2366, "XIOtech Corporation" }, - { 2367, "IMS Gesellschaft f|r Informations- und Managementsysteme mbH" }, + { 2367, "IMS Gesellschaft fuer Informations- und Managementsysteme mbH" }, { 2368, "Softworks" }, { 2369, "MobileWare Corporation" }, { 2370, "Memco Software Ltd." }, @@ -3050,7 +3051,7 @@ { 3028, "Dialogic Corporation" }, { 3029, "Digital Data Security" }, { 3030, "ISCNI" }, - { 3031, "daoCon" }, + { 3031, "dao Consulting, LLC" }, { 3032, "Beaufort Memorial Hospital" }, { 3033, "Informationstechnik Dr. Hansmeyer" }, { 3034, "URMET SUD s.p.a." }, @@ -5559,7 +5560,7 @@ { 5537, "Comdial Corporation" }, { 5538, "Micron Tech. Information co. kr" }, { 5539, "Cybertek Holdings" }, - { 5540, "Aachen University of Technology (RWTH)" }, + { 5540, "RWTH Aachen University" }, { 5541, "Paragea Communications, Inc" }, { 5542, "eOn Communications Corporation" }, { 5543, "INIEMP HOLDINGS CORPORATION S.L." }, @@ -5959,7 +5960,7 @@ { 5937, "HypoVereinsbank" }, { 5938, "Macfarlane TeleSystems Ltd." }, { 5939, "HALCOM Informatika, d.o.o." }, - { 5940, "JBM Electronics Co., Inc." }, + { 5940, "Red Lion Controls (JBM Electronics Co., Inc.)" }, { 5941, "Cosmocom Inc." }, { 5942, "ThoughtShare Communications" }, { 5943, "MatchCraft, Inc." }, @@ -7540,7 +7541,7 @@ { 7518, "Chicago Mercantile Exchange" }, { 7519, "RateIntegration, Inc." }, { 7520, "Harris Corporation (previous was 'M/A-COM Private Radio Systems, Inc.')" }, - { 7521, "NetStar Networks" }, + { 7521, "Logicalis Australia Pty Ltd (previous was 'NetStar Networks')" }, { 7522, "Brains Corp" }, { 7523, "AccessNet" }, { 7524, "RapidSolution Software GmbH" }, @@ -11324,7 +11325,7 @@ { 11302, "Perimeter Technology" }, { 11303, "PhotoniXnet Corporation" }, { 11304, "PrinterOn Corporation" }, - { 11305, "Research Institute for Particle and Nuclear Physics, Department ofBiophysics" }, + { 11305, "Research Institute for Particle and Nuclear Physics, Department of Biophysics" }, { 11306, "Robarts Research Institute" }, { 11307, "Solarwinds.net" }, { 11308, "SWAPCOM" }, @@ -16024,7 +16025,7 @@ { 16002, "Glyphix" }, { 16003, "Zschimmer GmbH" }, { 16004, "Intrusec, Inc." }, - { 16005, "University of Durham" }, + { 16005, "Durham University" }, { 16006, "CodeFab Inc" }, { 16007, "Native Instruments" }, { 16008, "Consolidated Communications Inc" }, @@ -18258,7 +18259,7 @@ { 18236, "McGill University" }, { 18237, "IntelliVid Corporation" }, { 18238, "SkyLink Design" }, - { 18239, "Digital Theater Systems, Inc" }, + { 18239, "DTS, Inc. (previous was 'Digital Theater Systems, Inc')" }, { 18240, "berger.de" }, { 18241, "w3design" }, { 18242, "Wyyzzk, Inc." }, @@ -18376,7 +18377,7 @@ { 18354, "Calyptech Pty Ltd" }, { 18355, "Avitech International Corp." }, { 18356, "kevinstevens.info" }, - { 18357, "Leathern Apron Incorporated" }, + { 18357, "Full Frontal Ingenuity LLC (previous was 'Leathern Apron Incorporated')" }, { 18358, "EPITECH" }, { 18359, "Intransa, Inc." }, { 18360, "INTEC Web and Genome Informatics Corporation" }, @@ -20559,7 +20560,7 @@ { 20537, "NIPPON EXPRESS CO.,LTD" }, { 20538, "FIBRENETIX" }, { 20539, "//////////fur////" }, - { 20540, "SIXNET" }, + { 20540, "Red Lion Controls (SIXNET)" }, { 20541, "CITTIO, Inc." }, { 20542, "AirLink Communications, Inc." }, { 20543, "Optovia Corporation" }, @@ -23716,7 +23717,7 @@ { 23694, "PMX NETWORKS, INC" }, { 23695, "PePLink Ltd." }, { 23696, "Nilai International College" }, - { 23697, "aspector GmbH" }, + { 23697, "hoi-polloi.org (previous was 'aspector GmbH')" }, { 23698, "RELDATA Inc." }, { 23699, "Zyden Software" }, { 23700, "Internews 98 Ltd." }, @@ -23802,7 +23803,7 @@ { 23780, "Freedomware UK" }, { 23781, "Albertslund Ungdomsboliger" }, { 23782, "ASN" }, - { 23783, "Tellurian Networks, Inc." }, + { 23783, "iTellus Holdings, Inc. (previous was 'Tellurian Networks, Inc.')" }, { 23784, "StrataLight Communications" }, { 23785, "CIC/CAFMICRO" }, { 23786, "DS DATA SYSTEMS GmbH" }, @@ -24661,7 +24662,7 @@ { 24639, "Elecom scsi" }, { 24640, "Nova Technologies" }, { 24641, "Allodial Solutions, Inc." }, - { 24642, "University in Sarajevo - Faculty of Electrical Engineering" }, + { 24642, "University of Sarajevo - Faculty of Electrical Engineering" }, { 24643, "Cedval Info inc." }, { 24644, "Applied Broadband, Inc." }, { 24645, "e-DMZ Security, LLC." }, @@ -24928,7 +24929,7 @@ { 24906, "Electronic Solutions Ltd." }, { 24907, "Infopact Netwerkdiensten B.V." }, { 24908, "Stored IQ, Inc." }, - { 24909, "Secure-24, Inc." }, + { 24909, "Secure-24, LLC" }, { 24910, "OOO \"ElitStudio\"" }, { 24911, "Foxbyte Ltd" }, { 24912, "Aselsan" }, @@ -27184,7 +27185,7 @@ { 27162, "Serveis de Salut Integrats Baix Empord\0303\0240" }, { 27163, "Dolphin Technology Inc" }, { 27164, "CNET Networks Asia Pacific Pte Ltd" }, - { 27165, "UTFPR" }, + { 27165, "Universidade Tecnol\0303\0263gica Federal do Paran\0303\0241 (UTFPR)" }, { 27166, "Checchia.NET IT Consulting" }, { 27167, "NIPPON ANTENNA CO.,LTD." }, { 27168, "Edward Roper" }, @@ -28400,7 +28401,7 @@ { 28378, "Pulsewidth" }, { 28379, "Open Systems International, Inc." }, { 28380, "01edge technologies" }, - { 28381, "N-Tron Corp." }, + { 28381, "Red Lion Controls (N-Tron)" }, { 28382, "AirCell LLC" }, { 28383, "Open1X" }, { 28384, "PConRails, LLC" }, @@ -29808,7 +29809,7 @@ { 29786, "Mediterrum SARL" }, { 29787, "T-Systems MMS Dresden" }, { 29788, "GZT Telkom-Telmor Sp. z o.o." }, - { 29789, "BlueTree Wireless Data, Inc." }, + { 29789, "Red Lion Controls (BlueTree Wireless Data, Inc.)" }, { 29790, "Yelp Inc." }, { 29791, "Quality Nighthawk" }, { 29792, "IPercom" }, @@ -32073,7 +32074,7 @@ { 32051, "SAMsystems GmbH" }, { 32052, "Toronto Hydro Corporation" }, { 32053, "3Y Power Technology, Inc." }, - { 32054, "IPSL/CETP" }, + { 32054, "IPSL (previous was 'IPSL/CETP')" }, { 32055, "Service to Youth Council Inc" }, { 32056, "Vietnam Datacommunication Company (VDC)" }, { 32057, "Mercury Brain Systems" }, @@ -32999,7 +33000,7 @@ { 32977, "TELoIP" }, { 32978, "IntelliDOT Corporation" }, { 32979, "XIX" }, - { 32980, "Hitachi Systems Engineering and Solutions, Ltd. (previous was 'Computer System Engineering Co., Ltd.')" }, + { 32980, "Hitachi Systems Engineering Services, Ltd. (previous was 'Hitachi Systems Engineering and Solutions, Ltd.')" }, { 32981, "Arcadyan Technology Corporation" }, { 32982, "Trends Telematics BV" }, { 32983, "Open Computing Solutions" }, @@ -34126,7 +34127,7 @@ { 34104, "Ceton Corp" }, { 34105, "Local Website Consulting" }, { 34106, "TESCOMA s.r.o." }, - { 34107, "SELEX GALILEO" }, + { 34107, "SELEX ES LTD (previous was 'SELEX GALILEO')" }, { 34108, "IAM Solutions GmbH & Co. KG" }, { 34109, "G&G Fitness Equipment Inc." }, { 34110, "Code Blue Corporation" }, @@ -36234,7 +36235,7 @@ { 36212, "Research and Education Bridge Certification Authority, Inc." }, { 36213, "SIA \"INBOKSS\"" }, { 36214, "Galaxy Telecom Technologies Ltd" }, - { 36215, "Greek Universities Network" }, + { 36215, "Greek Academic Network - GUnet" }, { 36216, "GoliathDNS ENK" }, { 36217, "Ladela Interactive" }, { 36218, "Open Cloud Consultants, Inc" }, @@ -38377,7 +38378,7 @@ { 38355, "TTTech Computertechnik AG" }, { 38356, "Mike Becker" }, { 38357, "ActualMed" }, - { 38358, "Western Electricity Coordinating Council" }, + { 38358, "Peak Reliability (previous was 'Western Electricity Coordinating Council')" }, { 38359, "Meissner" }, { 38360, "Delled Company Ltd" }, { 38361, "Exabre Ltd" }, @@ -38963,7 +38964,7 @@ { 38941, "D. E. Shaw & Co, L.P." }, { 38942, "Coca-Cola Enterprises, Inc." }, { 38943, "Edgar Kittner GmbH & Co.KG" }, - { 38944, "Kamstrup SVM AB" }, + { 38944, "Kamstrup A/S" }, { 38945, "NASA Center for Climate Simulation (NCCS)" }, { 38946, "Raja Consulting Ltd" }, { 38947, "IREQ (Institut de recherche d'Hydro-Quebec)" }, @@ -42395,7 +42396,7 @@ { 42373, "Kliniken des MTK GmbH" }, { 42374, "Inmar Enterprises" }, { 42375, "Unassigned" }, - { 42376, "Xyne GmbH" }, + { 42376, "Ocedo GmbH (previous was 'Xyne GmbH')" }, { 42377, "MBD Consulting, LLC" }, { 42378, "FOSS-Group GmbH" }, { 42379, "Danske Fragtm\0303\0246nd A/S" }, @@ -43371,6 +43372,525 @@ { 43349, "Nigerian Research and Education Network (NgREN)" }, { 43350, "Arikel.net Enterprises, LLC" }, { 43351, "Advania" }, + { 43352, "Hangzhou Huaxing Chuangye Communication Technology CO.,LTD." }, + { 43353, "Beijing Certificate Authority" }, + { 43354, "OBI Smart Technologies GmbH" }, + { 43355, "VTI Instruments Corporation" }, + { 43356, "Mimosa Networks, Inc" }, + { 43357, "Thomas Fagart (Brozs)" }, + { 43358, "candiansolar.com" }, + { 43359, "China Guodian Corporation" }, + { 43360, "Binhai Online Information Technology Company Limited" }, + { 43361, "IT Voimala Oy" }, + { 43362, "Zak\0305\0202ad Automatyki i Urz\0304\0205dze\0305\0204 Pomiarowych AREX Sp. z o.o." }, + { 43363, "B2B.CZ, s.r.o." }, + { 43364, "Vision Box, S.A." }, + { 43365, "Qi ict" }, + { 43366, "N-Tools.de" }, + { 43367, "Suedzucker AG" }, + { 43368, "Oradian d.o.o." }, + { 43369, "BrightSign LLC" }, + { 43370, "Giordano Bruno Stiftung" }, + { 43371, "Moegui S.p.A" }, + { 43372, "Embedded Access Inc" }, + { 43373, "Associa\0303\0247\0303\0243o dos Registradores Imobili\0303\0241rios de S\0303\0243o Paulo " }, + { 43374, "Belton IT" }, + { 43375, "Baer & Karrer AG" }, + { 43376, "Ladybird Cranes Ltd." }, + { 43377, "GDV-IT" }, + { 43378, "Holger Genth (HGD)" }, + { 43379, "R.J. O'Brien and Associates" }, + { 43380, "Counterpoint Networking, Inc." }, + { 43381, "GEMATICA SRL" }, + { 43382, "Dreamket Co., Ltd." }, + { 43383, "Commercial Bank \0342\0200\0234Severo-Vostochny Alliance\0342\0200\0235 (Joint-Stock \0321\0201ompany)" }, + { 43384, "Pelle Olsson (Raholmen)" }, + { 43385, "Proyectos-IP" }, + { 43386, "Expkits" }, + { 43387, "city of Sioux City, IA " }, + { 43388, "aeworld.co.uk" }, + { 43389, "Eko-konnect Research and Education Initiative" }, + { 43390, "BEIJING FOREVER COMMUNICATION ELECTRONICS CO.,LTD" }, + { 43391, "UTT Co., Ltd." }, + { 43392, "Agile Digital Engineering Pty Ltd" }, + { 43393, "S-Net" }, + { 43394, "Intrinium, Inc" }, + { 43395, "The City of Amsterdam" }, + { 43396, "earthlab (daichi makino)" }, + { 43397, "NET MEDIA SERVICES a.s." }, + { 43398, "WILDIX" }, + { 43399, "Tiscali Italia SpA" }, + { 43400, "IT storitve, Gregor Jer\0305\0241e, s.p." }, + { 43401, "TRData Limited" }, + { 43402, "Layer-7 Technologies" }, + { 43403, "CareerHub Pty Ltd" }, + { 43404, "SOCIEDAD ESTATAL CORREOS Y TELEGRAFOS SA" }, + { 43405, "SA Water Corporation" }, + { 43406, "Universiti Putra Malaysia" }, + { 43407, "David Martin (ReaperLegion)" }, + { 43408, "HDmessaging Inc" }, + { 43409, "Reith IT-L\0303\0266sungen GmbH" }, + { 43410, "Joseph Williams" }, + { 43411, "Graeser Development" }, + { 43412, "Genius Digital Limited" }, + { 43413, "Fairview Health Services" }, + { 43414, "Molson Coors Brewing Company" }, + { 43415, "Deepblue Informatikai Kft" }, + { 43416, "Multigenregameworld LLC" }, + { 43417, "South Side Hackerspace Chicago, NFP" }, + { 43418, "Khakham Sayavong (Nticks)" }, + { 43419, "Microsoft Unified Communications and Collaboration User Group" }, + { 43420, "Proximic Inc" }, + { 43421, "SysMa.cz" }, + { 43422, "ADTEC Communications" }, + { 43423, "KeyONet" }, + { 43424, "Securitas FINLAND" }, + { 43425, "Aduno Gruppe" }, + { 43426, "Noction" }, + { 43427, sminmpec_unknown }, /* (Added by Wireshark) */ + { 43428, "The William and Flora Hewlett Foundation" }, + { 43429, "Strata Information Technology, Inc" }, + { 43430, "Systems Definition, Inc." }, + { 43431, "Tate, Inc." }, + { 43432, "MICROMED BIOTECNOLOGIA LTDA" }, + { 43433, "Sreevidya Aravind" }, + { 43434, "Metacom Pty Ltd" }, + { 43435, "Nutsrange Technologies" }, + { 43436, "Accumuli PLC" }, + { 43437, "City of Montclair" }, + { 43438, "County Of Bruce" }, + { 43439, "J.J. Downs Industrial Plastics Inc." }, + { 43440, "royal holloway, university of london" }, + { 43441, "royal holloway, university of london" }, + { 43442, "Niles Radio Communications" }, + { 43443, "Transacciones y Servicios Mobile" }, + { 43444, "Inspire Living, Inc." }, + { 43445, "4th Layer Integrated Solutions S.r.l." }, + { 43446, "Hartmann Electronic GmbH" }, + { 43447, "LoadFront, S.L." }, + { 43448, "THEFEINERS.COM" }, + { 43449, "mobilcom-debitel GmbH" }, + { 43450, "Agencja Restrukturyzacji i Modernizacji Rolnictwa" }, + { 43451, "Australian Customs and Border Protection Service" }, + { 43452, "Pragtec inc." }, + { 43453, "Visiometrics S.L." }, + { 43454, "Wiccess" }, + { 43455, "LFT Solutions" }, + { 43456, "KHS GmbH" }, + { 43457, "Warp Software Ltda." }, + { 43458, "Nvizible Ltd" }, + { 43459, "Virsae Group Ltd" }, + { 43460, "university college Leuven Limburg (UCLL)" }, + { 43461, "DGIT INTERNATIONAL PTE. LTD" }, + { 43462, "Universidade Federal Rural de Pernambuco" }, + { 43463, "Kyoto-University Microcomputer Club" }, + { 43464, "Ten Cities Media" }, + { 43465, "Communication Federal Credit Union" }, + { 43466, "CMS Central Media Solutions GmbH" }, + { 43467, "Evolv, Inc." }, + { 43468, "Cacto Internet Ltda" }, + { 43469, "Sysnove" }, + { 43470, "G + H Netzwerk-Design Gesellschaft f\0303\0274r IT-Consulting mbH" }, + { 43471, "Sun Trading Solutions" }, + { 43472, "APC Integrated Services Group, Inc." }, + { 43473, "YHGfL Foundation" }, + { 43474, "Coca-Cola Hellenic Bottling Company" }, + { 43475, "XNX S\0303\0240rl" }, + { 43476, "LeanDev" }, + { 43477, "Bioss Consulting SRL" }, + { 43478, "Jonathon Anderson (civilfritz)" }, + { 43479, "Ecole nationale Sup\0303\0251rieure d'Informatique" }, + { 43480, "Canine Creche" }, + { 43481, "Innovaatik Grupp O\0303\0234" }, + { 43482, "GlobalSensing Technologies" }, + { 43483, "AIPHONE CO., LTD." }, + { 43484, "Fundaci\0303\0263n Fulgor" }, + { 43485, "Trillium Teamologies, Inc." }, + { 43486, "Fuse Networks, LLC" }, + { 43487, "Guangzhou Woxiang Information Technology Co., Ltd" }, + { 43488, "Schletter GmbH" }, + { 43489, "GOOD FIRST GROUP . " }, + { 43490, "Rite-Tech Industrial Co., Ltd." }, + { 43491, "ITR Service GmbH" }, + { 43492, "Bernhard Trinnes (microdots)" }, + { 43493, "Online Linjeforening" }, + { 43494, "Clarity Ltd" }, + { 43495, "Taide Enterprise Co.,Ltd." }, + { 43496, "QSC AG" }, + { 43497, "Weavesys UK" }, + { 43498, "SENSORBOX DO BRASIL LTDA" }, + { 43499, "Youncta" }, + { 43500, "4D Security Solutions" }, + { 43501, "Boston Financial Data Services Inc" }, + { 43502, "HighRes Biosolutions" }, + { 43503, "Jay Ridgeway (beekling.com)" }, + { 43504, "Judd Storrs" }, + { 43505, "Plugh Studios Ltd" }, + { 43506, "Beats by Dre" }, + { 43507, "ti&m AG" }, + { 43508, "EDT SAS - Electronic Data Transfer" }, + { 43509, "BITPRO AS" }, + { 43510, "Juan Jose Rodriguez Ponce" }, + { 43511, "E7 Solutions" }, + { 43512, "BEIJING SIFANG AUTOMATION CO., LTD" }, + { 43513, "SDIS68" }, + { 43514, "kt telecop" }, + { 43515, "NISCOM,Inc." }, + { 43516, "Auvik Networks Inc." }, + { 43517, "CoolMinds Technologies (P) Ltd" }, + { 43518, "Smartconnect NV / SA" }, + { 43519, "Tranwall" }, + { 43520, "pteam gmbh" }, + { 43521, "RSE Informationstechnologie GmbH" }, + { 43522, "VoltServer, Inc." }, + { 43523, "Alberta Investment Management Corporation" }, + { 43524, "Vanteon Corp." }, + { 43525, "Wavecon GmbH" }, + { 43526, "Signal Bredb\0303\0245nd AS" }, + { 43527, "Presidio Networked Solutions" }, + { 43528, "SHODEN CORPORATION" }, + { 43529, "Istituto Radiologico e Fisioradioterapico Valdarno" }, + { 43530, "HYTEC INTER Co.,Ltd." }, + { 43531, "Atomic Object LLC" }, + { 43532, "Yafeng Shan (kokonur)" }, + { 43533, "Beijing National Railway Research & Design Institude of Signal & Communication Co, Ltd. (CRSCD)" }, + { 43534, "Alstom Grid" }, + { 43535, "Luxottica North America Distribution LLC" }, + { 43536, "AO K-Dorstroy" }, + { 43537, "Solumed" }, + { 43538, "EXA-TMR" }, + { 43539, "Dwarf Animation Studio" }, + { 43540, "Federal Agricultural Marketing Authority" }, + { 43541, "LSY Inc" }, + { 43542, "DENT Instruments" }, + { 43543, "ID Business Solutions Ltd" }, + { 43544, "DigiComm GmbH" }, + { 43545, "Omnitracs, LLC" }, + { 43546, "Tariox Limited" }, + { 43547, "SCOOP Software GmbH" }, + { 43548, "Trasis sa" }, + { 43549, "IT Competence Group SE" }, + { 43550, "CAMEA spol. s r. o." }, + { 43551, "Mavari-IT bvba" }, + { 43552, "Whitesky Communications" }, + { 43553, "Rapid Focus Security, Inc." }, + { 43554, "IGC" }, + { 43555, "LayeredDefense" }, + { 43556, "Rigas domes Informacijas tehnologiju centrs" }, + { 43557, "Nick Fender" }, + { 43558, "GitHub, Inc" }, + { 43559, "ENKOM AG" }, + { 43560, "New Orleans East Hospital" }, + { 43561, "Micro-Research Finland Oy" }, + { 43562, "ZepMed, LLC" }, + { 43563, "pedro paulo medeiros" }, + { 43564, "TSC AUTO ID Technology Co., Ltd." }, + { 43565, "Reliance Jio Infocomm Limited" }, + { 43566, "Engineering Center REGIONAL SYSTEMS, Limited" }, + { 43567, "Yongjia County Board of Education" }, + { 43568, "EMICON" }, + { 43569, "Hong Yun Technology" }, + { 43570, "Coop\0303\0251rative Foresti\0303\0250re Bourgogne Limousin (CFBL)" }, + { 43571, "SOCIETE DES TRANSPORTS ROCHATTE" }, + { 43572, "Foundation for Research and Technology Hellas" }, + { 43573, "VSAT-SERVICE" }, + { 43574, "Lansing Makers Network" }, + { 43575, "OpenPeak" }, + { 43576, "IntSec.NET" }, + { 43577, "CNPC Beijing Richfit Information Technology Co.,LTD." }, + { 43578, "42technology AG" }, + { 43579, "EASYPROTO di Giacomo Cesari" }, + { 43580, "SutherlandGlobalServices" }, + { 43581, "Ooyala Inc." }, + { 43582, "Document Centric Solutions Ltd" }, + { 43583, "ReMake Electric" }, + { 43584, "Trizetto Provider Solutions" }, + { 43585, "SAMSON AG" }, + { 43586, "SVS TELEKOM\0303\0234N\0304\0260KASYON H\0304\0260Z. T\0304\0260C. SAN. A.\0305\0236. " }, + { 43587, "Roave, LLC." }, + { 43588, "SAA Topnet GmbH" }, + { 43589, "KEKLOLWTF AS" }, + { 43590, "HAL9k hackerspace" }, + { 43591, "Erlang Solutions LTD" }, + { 43592, "Campbell Scientific, Incorporated" }, + { 43593, "Crimson Innovative" }, + { 43594, "Interhyp AG" }, + { 43595, "MolinoSoft (Julian Bourne)" }, + { 43596, "Carnegie Fitness " }, + { 43597, "Comprehensive Health Management, Inc." }, + { 43598, "STORM" }, + { 43599, "Paneidos Desu" }, + { 43600, "Beijing Easesky Netcom Technology Co.,Ltd" }, + { 43601, "Nuri Technology Co., Ltd." }, + { 43602, "Rossiya Segodnya" }, + { 43603, "The Twelve Tribes" }, + { 43604, "Arkansas Educational Television Network (AETN)" }, + { 43605, "Metatrust" }, + { 43606, "nobaq.net" }, + { 43607, "Funda Real Estate B.V." }, + { 43608, "Raben Group" }, + { 43609, "NetCracker Technology Corp." }, + { 43610, "ColosseoEAS, a.s." }, + { 43611, "Power Ethernet" }, + { 43612, "IOLAN" }, + { 43613, "Skylife Engineering" }, + { 43614, "phaenovum Sch\0303\0274lerforschungszentrum L\0303\0266rrach-Dreil\0303\0244ndereck e.V." }, + { 43615, "VonRoll" }, + { 43616, "Aventura Technologies Inc." }, + { 43617, "Vidant Health" }, + { 43618, "Camtrace" }, + { 43619, "LianYunGang E-Port Information Development Co.,Ltd" }, + { 43620, "Shenzhen Headsun Technology" }, + { 43621, "Medical Effect" }, + { 43622, "WebPerative LLC" }, + { 43623, "Umensis - Guillaume Pannatier" }, + { 43624, "Jaroslav Sendler (xsendl00)" }, + { 43625, "Core Technology" }, + { 43626, "NewB" }, + { 43627, "Devani Creative" }, + { 43628, "The Rubicon Project" }, + { 43629, "PSITEX, LLC" }, + { 43630, "Duxoft, Inc." }, + { 43631, "Heijmans N.V." }, + { 43632, "Celtex Works" }, + { 43633, "AIES Advanced Industrial Electronic Systems" }, + { 43634, "Metrellis, Inc." }, + { 43635, "Practice Velocity, LLC" }, + { 43636, "LES.NET" }, + { 43637, "Zymer Inc." }, + { 43638, "ITS Korea" }, + { 43639, "Evoluta Interactive" }, + { 43640, "through.other.eyes (Jonathan Platzer)" }, + { 43641, "netplus.ch SA" }, + { 43642, "Linde Engineering" }, + { 43643, "TEQ SA" }, + { 43644, "Infra Services" }, + { 43645, "FEIG ELECTRONIC GmbH" }, + { 43646, "Datatal AB" }, + { 43647, "Rimbach IT Systems UG" }, + { 43648, "Naudit High Performance Computing and Networking S.L." }, + { 43649, "Raritan Bay Medical Center" }, + { 43650, "United Health Services" }, + { 43651, "INTTRA Inc" }, + { 43652, "GoBICS" }, + { 43653, "UNIVERSITAT OBERTA DE CATALUNYA" }, + { 43654, "marcsi.ch" }, + { 43655, "University Ecclesiastical Academy of Thessaloniki" }, + { 43656, "Consortium" }, + { 43657, "Kanton St.Gallen" }, + { 43658, "Seacloud" }, + { 43659, "Hochschule f\0303\0274r Technik und Wirtschaft des Saarlandes (htw saar)" }, + { 43660, "Zadara Storage Ltd" }, + { 43661, "Columbus Business Solutions" }, + { 43662, "Simpson Housing LLLP" }, + { 43663, "eTouch Federal Systems" }, + { 43664, "Unzane" }, + { 43665, "rioxo GmbH" }, + { 43666, "Hackerspace Brussels" }, + { 43667, "Sunwire Inc" }, + { 43668, "Andreas Kreisel" }, + { 43669, "The Institute of Mathematical Sciences" }, + { 43670, "Epic Code Pty. Ltd." }, + { 43671, "EMSEAS Teknik AB" }, + { 43672, "INTELLECT MODULE" }, + { 43673, "Federal State Unitary Enterprise CentrInform" }, + { 43674, "Robonect" }, + { 43675, "Accenture CAS GmbH" }, + { 43676, "57North Hacklab" }, + { 43677, "ICT Plus srl" }, + { 43678, "Michael Kramer" }, + { 43679, "SETTE" }, + { 43680, "Chorus Limited" }, + { 43681, "ELESTER-PKP Sp. z o.o." }, + { 43682, "ITSA Consulting, LLC" }, + { 43683, "ALDEIS" }, + { 43684, "NOVASIB GmbH" }, + { 43685, "biz:Consult Unternehmensberatung GmbH" }, + { 43686, "Jefferson County" }, + { 43687, "Christoph Knott - IT-Sicherheitstechnik" }, + { 43688, "GERMEN ELEKTRONIK LTD" }, + { 43689, "schugart" }, + { 43690, "The Active Network" }, + { 43691, "Michael Kettner" }, + { 43692, "haberberger.com" }, + { 43693, "Fotolia LLC" }, + { 43694, "Omega Intelligence Systems Ltd" }, + { 43695, "5nine Software" }, + { 43696, "LLC Info-Kontent" }, + { 43697, "JSC Bryansk Supply Company" }, + { 43698, "Joint Electronic Teller Services Ltd." }, + { 43699, "EasyData, LLC" }, + { 43700, "PathCore" }, + { 43701, "HySecurity, Inc." }, + { 43702, "Dom-Daniel" }, + { 43703, "Wacom Company Ltd." }, + { 43704, "Accutron Instruments Inc" }, + { 43705, "F!nTcH.org" }, + { 43706, "Statnett SF" }, + { 43707, "Australian Rail Tecchnology" }, + { 43708, "SimonMed Imaging" }, + { 43709, "AirDSL (Pty) Ltd" }, + { 43710, "GAMESA" }, + { 43711, "mySupply ApS" }, + { 43712, "Universidad Central de Venezuela" }, + { 43713, "Code 42" }, + { 43714, "Mega Soft Computaci\0303\0263n, C.A." }, + { 43715, "Data Infrastructure Technologies Ltd. " }, + { 43716, "Veterinary Nurse Solutions Pty Ltd" }, + { 43717, "imensup" }, + { 43718, "\0303\0226sterreichisches Weltraum Forum" }, + { 43719, "Telvio LLC" }, + { 43720, "Creat0r.pro" }, + { 43721, "Cyberoam Technologies Pvt. Ltd." }, + { 43722, "DAC Systems, Inc." }, + { 43723, "Stancil Corporation" }, + { 43724, "Japan Prime Computing" }, + { 43725, "Casair, Inc" }, + { 43726, "GO! Express & Logistics Deutschland GmbH" }, + { 43727, "Valeo Comfort ans Driving assitance" }, + { 43728, "Sinergise Ltd." }, + { 43729, "Teckids e.V." }, + { 43730, "Ernst Klett AG" }, + { 43731, "FooxTek Co., LTD." }, + { 43732, "Netmag Technology Corporation" }, + { 43733, "East Photonics, Inc." }, + { 43734, "IQUO Ltd" }, + { 43735, "STI-Tassimco" }, + { 43736, "Standard Imaging, Inc." }, + { 43737, "MedAllies" }, + { 43738, "Doshisha University" }, + { 43739, "Concept Smoke screen Ltd" }, + { 43740, "ASB-Technology Sp. z o.o." }, + { 43741, "Cerqueira & Marcos, Lda" }, + { 43742, "Microx Computer GmbH" }, + { 43743, "Open Systems Technology, Pty." }, + { 43744, "airberlin" }, + { 43745, "CONSEJO DE LA JUDICATURA" }, + { 43746, "Ulterius Technologies, LLC" }, + { 43747, "MaterialApps" }, + { 43748, "ARES Conocimiento de Negocio, SL" }, + { 43749, "Country Bright Company Ltd." }, + { 43750, "Jabil Circuit, Inc" }, + { 43751, "Shenzhen TG-NET Botone Technology CO. Ltd." }, + { 43752, "China Film Equipment Co. Ltd." }, + { 43753, "Kyriasis" }, + { 43754, "Philipp Wagner Softwareentwicklung" }, + { 43755, "BG-Phoenics GmbH" }, + { 43756, "Schwarz Dienstleistung KG" }, + { 43757, "QOSIT AG" }, + { 43758, "Clique Intelligence Inc." }, + { 43759, "Big White Network Technologies,Ltd." }, + { 43760, "Atlas Networks" }, + { 43761, "Our School Ltd" }, + { 43762, "PlazaLotusGroup" }, + { 43763, "ChinaFilm Global (Beijing) Technology limited" }, + { 43764, "Tallac Networks" }, + { 43765, "Color Print" }, + { 43766, "MBSys LLC Azerbaijan" }, + { 43767, "Eastern Long Island Hospital" }, + { 43768, "GatesAir, Inc." }, + { 43769, "Vezea" }, + { 43770, "Addat s.r.o." }, + { 43771, "Behlman Electronics" }, + { 43772, "K+S IT-Services GmbH" }, + { 43773, "The Vancouver Clinic Inc." }, + { 43774, "Hortonworks Inc" }, + { 43775, "Quotepro Inc" }, + { 43776, "Symbiotic System Design" }, + { 43777, "Maikel de Boer" }, + { 43778, "Hampshire Controls Corporation" }, + { 43779, "Finnova AG" }, + { 43780, "Paradox Networks, Inc" }, + { 43781, "Moshel Kamadu Records" }, + { 43782, "UPS Solutions INC." }, + { 43783, "WaveNet Communications Private Limited" }, + { 43784, "IFOM" }, + { 43785, "Magellium" }, + { 43786, "Factual Inc" }, + { 43787, "Leviathan Security Technologies" }, + { 43788, "Comita d.d." }, + { 43789, "Trading & Consulting `H.P.C.\0302\0264 GmbH" }, + { 43790, "becker-aero" }, + { 43791, "Cine Digital Service" }, + { 43792, "Now Wireless Limited" }, + { 43793, "Tom Gundersen (systemd)" }, + { 43794, "Chris Thomson" }, + { 43795, "Guangzhou Andea Electronics Technology Co.,Ltd" }, + { 43796, "Rasing IT Solutions" }, + { 43797, "Croz d.o.o." }, + { 43798, "NANJING SAND TECHNOLOGY CO., LTD" }, + { 43799, "TRUMPF GmbH + Co. KG" }, + { 43800, "OraSentry" }, + { 43801, "Dolphin Systems AG" }, + { 43802, "Avaloq Evolution AG" }, + { 43803, "University of South Wales" }, + { 43804, "Bombardier Aerospace" }, + { 43805, "Metalogix International GmbH" }, + { 43806, "Shape Security, Inc" }, + { 43807, "CENTRI Technology, Inc." }, + { 43808, "Spincat Studios" }, + { 43809, "University of the Philippines" }, + { 43810, "Li Hongnan (LiHN)" }, + { 43811, "University of the Philippines Mindanao" }, + { 43812, "Corscience GmbH & Co. KG" }, + { 43813, "Centraal Justitieel Incassobureau" }, + { 43814, "GNU Networks Ltd." }, + { 43815, "The University of Texas M.D. Anderson Cancer Center" }, + { 43816, "Tran Industries LLC" }, + { 43817, "Vertex Business Services" }, + { 43818, "Featurespace Limited" }, + { 43819, "pulse technologies" }, + { 43820, "Mozy, Inc." }, + { 43821, "Suwannee County School Board" }, + { 43822, "Nok Nok Labs, Inc." }, + { 43823, "VAS Experts" }, + { 43824, "ConectaIP Tecnologia S.L." }, + { 43825, "Earnest Products, Inc. dba Southern Manufacturing" }, + { 43826, "TEXKA LABS" }, + { 43827, "Ideosoft C.B." }, + { 43828, "Bosoft" }, + { 43829, "Ifield School" }, + { 43830, "eWater Pty Ltd" }, + { 43831, "Ezvoicetek Co., Ltd." }, + { 43832, "Beijing D&S FieldBus Technology Co.,Ltd" }, + { 43833, "LIVECREATION" }, + { 43834, "Urban Systems Design Institute" }, + { 43835, "HOCHTIEF CZ, a.s." }, + { 43836, "C Tech Bilisim Teknolojileri San.ve Tic. A.S" }, + { 43837, "DTI Group Ltd" }, + { 43838, "Genex Hellas L.T.D" }, + { 43839, "RailComm LLC" }, + { 43840, "Sumitomo Mitsui Banking Corporation" }, + { 43841, "Eatel" }, + { 43842, "Zero Waste Scotland" }, + { 43843, "Alter Trading Corporation, LLC" }, + { 43844, "GuangDong Big Banian Info Tech Co., Ltd. " }, + { 43845, "Toshiba Tec Solution Services Corporation" }, + { 43846, "University of the Philippines - Baguio" }, + { 43847, "A Hagedoorn Electronics" }, + { 43848, "INoTHINGS GmbH" }, + { 43849, "LiiON, LLC" }, + { 43850, "Doxcelerate Corporation" }, + { 43851, "danieLLegal.Net - Rechtsanw\0303\0244lte" }, + { 43852, "Truseco, s.r.o." }, + { 43853, "Academy of Economic Studies of Moldova" }, + { 43854, "TU Investment Club e.V." }, + { 43855, "ezIX.org" }, + { 43856, "UNIT4 Business Software Spain S.L.U." }, + { 43857, "mITra data" }, + { 43858, "Grigorivska International School" }, + { 43859, "Harbor Freight Tools" }, + { 43860, "Groenewoud" }, + { 43861, "New York Genome Center" }, + { 43862, "Drei Banken EDV Ges.m.b.H." }, + { 43863, "Valour Security Ltd" }, + { 43864, "Breeze Innovations Private Limited" }, + { 43865, "Matthias Krause (spectre-net)" }, + { 43866, "beijing huafei technology co.,ltd" }, + { 43867, "Rename it" }, + { 43868, "Conjur Inc" }, + { 43869, "Yatharth Gupta" }, + { 43870, "Precyse Technologies" }, { 0, NULL} };

@@ -297,18 +297,18 @@ luaL_error(L,"a preference named %s exists already",name); return 0; } - /* + /* * Make sure that only lower-case ASCII letters, numbers, * underscores, and dots appear in the preference name. - */ - for (c = name; *c != '\0'; c++) { - if (!isascii((guchar)*c) || - (!islower((guchar)*c) && !isdigit((guchar)*c) && *c != '_' && *c != '.')) - { - luaL_error(L,"illegal preference name \"%s\", only lower-case ASCII letters, numbers, underscores and dots may be used",name); - return 0; + */ + for (c = name; *c != '\0'; c++) { + if (!isascii((guchar)*c) || + (!islower((guchar)*c) && !isdigit((guchar)*c) && *c != '_' && *c != '.')) + { + luaL_error(L,"illegal preference name \"%s\", only lower-case ASCII letters, numbers, underscores and dots may be used",name); + return 0; + } } - } if ( ! p->next) { p->next = pref; @@ -391,6 +391,11 @@ if (! ( name && prefs_p ) ) return 0; + if (!prefs_p->next) { + luaL_error(L,"No preference is registered yet"); + return 0; + } + prefs_p = prefs_p->next; do { @@ -640,7 +645,7 @@ const gchar *blob = luaL_optstring(L,WSLUA_OPTARG_ProtoField_new_DESCR,NULL); if (lua_isnumber(L,WSLUA_ARG_ProtoField_new_TYPE)) { - type = luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE); + type = (enum ftenum)luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE); } else { type = get_ftenum(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_TYPE)); }

@@ -78,7 +78,7 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 10, - "version_micro" => 6, + "version_micro" => 8, "version_build" => 0, "enable" => 1, @@ -166,11 +166,11 @@ $last_change = $line; } - # Commits in current (master-1.10) branch. We may want to use - # a different number. - chomp($line = qx{git --git-dir=$srcdir/.git describe --long --match v1.10.0-rc1}); + # Commits since last annotated tag. + chomp($line = qx{git --git-dir=$srcdir/.git describe --long --always --match "v*"}); if ($? == 0 && length($line) > 1) { my @parts = split(/-/, $line); + $git_description = $line; $num_commits = $parts[-2]; $commit_id = $parts[-1]; } @@ -187,11 +187,6 @@ $repo_branch = basename($line); } - chomp($line = qx{git --git-dir=$srcdir/.git describe --match "v*"}); - if (defined($line)) { - $git_description = $line; - } - 1; };

@@ -152,7 +152,7 @@ 00:00:61 GatewayC # GATEWAY COMMUNICATIONS 00:00:62 Hneywell # Honeywell 00:00:63 HP -00:00:64 Yokogawa # YOKOGAWA DIGITAL COMPUTER CORP +00:00:64 Yokogawa # Yokogawa Electric Corporation 00:00:65 NetworkG # Network General Corporation 00:00:66 Talaris # TALARIS SYSTEMS, INC. 00:00:67 Soft*Rit # SOFT * RITE, INC. @@ -483,7 +483,7 @@ 00:01:AC SitaraNe # Sitara Networks, Inc. 00:01:AD CoachMas # Coach Master International d.b.a. CMI Worldwide, Inc. 00:01:AE TrexEnte # Trex Enterprises -00:01:AF EmersonN # Emerson Network Power +00:01:AF ArtesynE # Artesyn Embedded Technologies 00:01:B0 FulltekT # Fulltek Technology Co., Ltd. 00:01:B1 GeneralB # General Bandwidth 00:01:B2 DigitalP # Digital Processing Systems, Inc. @@ -821,7 +821,7 @@ 00:02:FE Viditec # Viditec, Inc. 00:02:FF HandanBr # Handan BroadInfoCom 00:03:00 Barracud # Barracuda Networks, Inc. -00:03:01 AvantasN # Avantas Networks Corporation +00:03:01 Exfo 00:03:02 CharlesI # Charles Industries, Ltd. 00:03:03 JamaElec # JAMA Electronics Co., Ltd. 00:03:04 PacificB # Pacific Broadband Communications @@ -1599,7 +1599,7 @@ 00:06:08 At-SkySa # At-Sky SAS 00:06:09 Crosspor # Crossport Systems 00:06:0A Blue2spa # Blue2space -00:06:0B EmersonN # Emerson Network Power +00:06:0B ArtesynE # Artesyn Embedded Technologies 00:06:0C MelcoInd # Melco Industries, Inc. 00:06:0D Wave7Opt # Wave7 Optics 00:06:0E Igys # IGYS Systems, Inc. @@ -2049,7 +2049,7 @@ 00:07:CA CreatixP # Creatix Polymedia Ges Fur Kommunikaitonssysteme 00:07:CB FreeboxS # Freebox SA 00:07:CC KabaBenz # Kaba Benzing GmbH -00:07:CD Nmtel # NMTEL Co., Ltd. +00:07:CD KumohEle # Kumoh Electronic Co, Ltd 00:07:CE Cabletim # Cabletime Limited 00:07:CF Anoto # Anoto AB 00:07:D0 AutomatE # Automat Engenharia de Automação Ltda. @@ -2322,7 +2322,7 @@ 00:08:F6 Sumitomo # Sumitomo Electric System Solutions Co., Ltd. 00:08:F7 HitachiS # Hitachi Ltd, Semiconductor & Integrated Circuits Gr 00:08:F8 UtcCcs # UTC CCS -00:08:F9 EmersonN # Emerson Network Power +00:08:F9 ArtesynE # Artesyn Embedded Technologies 00:08:FA KarlEBri # Karl E.Brinkmann GmbH 00:08:FB Sonosite # SonoSite, Inc. 00:08:FC Gigaphot # Gigaphoton Inc. @@ -3710,7 +3710,7 @@ 00:0E:63 LemkeDia # Lemke Diagnostics GmbH 00:0E:64 Elphel # Elphel, Inc 00:0E:65 Transcor # TransCore -00:0E:66 HitachiA # Hitachi Advanced Digital, Inc. +00:0E:66 HitachiI # Hitachi Industry & Control Solutions, Ltd. 00:0E:67 EltisMic # Eltis Microelectronics Ltd. 00:0E:68 E-TopNet # E-TOP Network Technology Inc. 00:0E:69 ChinaEle # China Electric Power Research Institute @@ -3834,7 +3834,7 @@ 00:0E:DF PlxTechn # PLX Technology 00:0E:E0 Mcharge 00:0E:E1 Extremes # ExtremeSpeed Inc. -00:0E:E2 CustomEn # Custom Engineering S.p.A. +00:0E:E2 CustomEn # Custom Engineering 00:0E:E3 ChiyuTec # Chiyu Technology Co.,Ltd 00:0E:E4 BoeTechn # BOE TECHNOLOGY GROUP CO.,LTD 00:0E:E5 Bitwalle # bitWallet, Inc. @@ -5557,7 +5557,7 @@ 00:15:9A ArrisGro # ARRIS Group, Inc. 00:15:9B Nortel 00:15:9C B-KyungS # B-KYUNG SYSTEM Co.,Ltd. -00:15:9D MinicomA # Minicom Advanced Systems ltd +00:15:9D TrippLit # Tripp Lite 00:15:9E MadCatzI # Mad Catz Interactive Inc 00:15:9F Terascal # Terascala, Inc. 00:15:A0 NokiaDan # Nokia Danmark A/S @@ -8097,30 +8097,30 @@ 00:1E:C5 MiddleAt # Middle Atlantic Products Inc 00:1E:C6 ObviusHo # Obvius Holdings LLC 00:1E:C7 2wire # 2Wire, Inc. -00:1E:C8 2wire # 2Wire, Inc. -00:1E:C9 2wire # 2Wire, Inc. -00:1E:CA 2wire # 2Wire, Inc. -00:1E:CB 2wire # 2Wire, Inc. -00:1E:CC 2wire # 2Wire, Inc. +00:1E:C8 RapidMob # Rapid Mobile (Pty) Ltd +00:1E:C9 Dell # Dell Inc +00:1E:CA Nortel +00:1E:CB "Rpc"Ene # "RPC "Energoautomatika" Ltd +00:1E:CC Cdvi 00:1E:CD KylandTe # KYLAND Technology Co. LTD -00:1E:CE 2wire # 2Wire, Inc. -00:1E:CF 2wire # 2Wire, Inc. -00:1E:D0 2wire # 2Wire, Inc. -00:1E:D1 2wire # 2Wire, Inc. -00:1E:D2 2wire # 2Wire, Inc. -00:1E:D3 2wire # 2Wire, Inc. -00:1E:D4 2wire # 2Wire, Inc. -00:1E:D5 2wire # 2Wire, Inc. -00:1E:D6 2wire # 2Wire, Inc. -00:1E:D7 2wire # 2Wire, Inc. -00:1E:D8 2wire # 2Wire, Inc. -00:1E:D9 2wire # 2Wire, Inc. -00:1E:DA 2wire # 2Wire, Inc. -00:1E:DB 2wire # 2Wire, Inc. -00:1E:DC 2wire # 2Wire, Inc. -00:1E:DD 2wire # 2Wire, Inc. -00:1E:DE 2wire # 2Wire, Inc. -00:1E:DF 2wire # 2Wire, Inc. +00:1E:CE BisaTech # BISA Technologies (Hong Kong) Limited +00:1E:CF PhilipsE # PHILIPS ELECTRONICS UK LTD +00:1E:D0 Ingespac # Ingespace +00:1E:D1 Keyproce # Keyprocessor B.V. +00:1E:D2 RayShine # Ray Shine Video Technology Inc +00:1E:D3 DotTechn # Dot Technology Int'l Co., Ltd. +00:1E:D4 DobleEng # Doble Engineering +00:1E:D5 Tekon-Au # Tekon-Automatics +00:1E:D6 AlentecO # Alentec & Orion AB +00:1E:D7 H-Stream # H-Stream Wireless, Inc. +00:1E:D8 DigitalU # Digital United Inc. +00:1E:D9 Mitsubis # Mitsubishi Precision Co.,LTd. +00:1E:DA Wesemann # Wesemann Elektrotechniek B.V. +00:1E:DB GikenTra # Giken Trastem Co., Ltd. +00:1E:DC SonyEric # Sony Ericsson Mobile Communications AB +00:1E:DD WaskoSA # WASKO S.A. +00:1E:DE Byd # BYD COMPANY LIMITED +00:1E:DF MasterIn # Master Industrialization Center Kista 00:1E:E0 UrmetDom # Urmet Domus SpA 00:1E:E1 SamsungE # Samsung Electronics Co.,Ltd 00:1E:E2 SamsungE # Samsung Electronics Co.,Ltd @@ -9479,7 +9479,7 @@ 00:24:2B HonHaiPr # Hon Hai Precision Ind.Co.,Ltd. 00:24:2C HonHaiPr # Hon Hai Precision Ind. Co., Ltd. 00:24:2E Datastri # Datastrip Inc. -00:24:2F Virtensy # VirtenSys Inc +00:24:2F Micron 00:24:30 RubyTech # Ruby Tech Corp. 00:24:31 Uni-V # Uni-v co.,ltd 00:24:32 NeostarT # Neostar Technology Co.,LTD @@ -13100,7 +13100,7 @@ 00:50:C2:86:F0:00/36 B-Plus # b-plus GmbH 00:50:C2:87:00:00/36 LogelSRL # LOGEL S.R.L. 00:50:C2:87:10:00/36 R-S-IEle # R-S-I Elektrotechnik GmbH & Co. KG -00:50:C2:87:20:00/36 Oliotalo # Oliotalo - Objecthouse Oy +00:50:C2:87:20:00/36 Oliotalo # Oliotalo Oy 00:50:C2:87:30:00/36 Xronet # XRONET Corporation 00:50:C2:87:40:00/36 ArcosTec # Arcos Technologies Ltd. 00:50:C2:87:50:00/36 PhytecMe # Phytec Messtechnik GmbH @@ -13261,7 +13261,7 @@ 00:50:C2:91:00:00/36 Autotank # Autotank AB 00:50:C2:91:10:00/36 VaporRai # Vapor Rail 00:50:C2:91:20:00/36 AssetInt # ASSET InterTech, Inc. -00:50:C2:91:30:00/36 SelexSen # Selex Sensors & Airborne Systems +00:50:C2:91:30:00/36 SelexEx # Selex Ex Ltd 00:50:C2:91:40:00/36 Io-Conne # IO-Connect 00:50:C2:91:50:00/36 Verint # Verint Systems Ltd. 00:50:C2:91:60:00/36 ChkGrids # CHK GridSense P/L @@ -15075,6 +15075,7 @@ 00:54:AF Continen # Continental Automotive Systems Inc. 00:55:00 Xerox 00:59:07 Lenovoem # LenovoEMC Products USA, LLC +00:5A:39 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO., LTD. 00:5C:B1 GospellD # Gospell DIGITAL TECHNOLOGY CO., LTD 00:5D:03 Xilinx # Xilinx, Inc 00:60:00 Xycom # XYCOM INC. @@ -15336,11 +15337,13 @@ 00:64:40 Cisco # CISCO SYSTEMS, INC. 00:64:A6 MaquetCa # Maquet CardioVascular 00:66:4B HuaweiTe # Huawei Technologies Co., Ltd +00:6B:8E Shanghai # Shanghai Feixun Communication Co.,Ltd. 00:6B:9E Vizio # VIZIO Inc 00:6B:A0 Shenzhen # SHENZHEN UNIVERSAL INTELLISYS PTE LTD 00:6D:FB VutrixUk # Vutrix (UK) Ltd 00:70:B0 M/A-ComC # M/A-COM INC. COMPANIES 00:70:B3 DataReca # DATA RECALL LTD. +00:71:CC HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 00:73:8D TinnoMob # Tinno Mobile Technology Corp 00:73:E0 SamsungE # Samsung Electronics Co.,Ltd 00:75:32 InidBv # INID BV @@ -15414,7 +15417,7 @@ 00:80:3F Tatung # TATUNG COMPANY 00:80:40 JohnFluk # JOHN FLUKE MANUFACTURING CO. 00:80:41 VebKombi # VEB KOMBINAT ROBOTRON -00:80:42 EmersonN # Emerson Network Power +00:80:42 ArtesynE # Artesyn Embedded Technologies 00:80:43 Networld # NETWORLD, INC. 00:80:44 SystechC # SYSTECH COMPUTER CORP. 00:80:45 Matsushi # MATSUSHITA ELECTRIC IND. CO @@ -15877,6 +15880,7 @@ 00:97:FF HeimannS # Heimann Sensor GmbH 00:9C:02 Hewlett- # Hewlett-Packard Company 00:9D:8E CardiacR # CARDIAC RECORDERS, INC. +00:9E:C8 BeijingX # Beijing Xiaomi Electronic Products Co., Ltd. 00:A0:00 Centilli # CENTILLION NETWORKS, INC. 00:A0:01 DrsSigna # DRS Signal Solutions 00:A0:02 LeedsNor # LEEDS & NORTHRUP AUSTRALIA PTY LTD @@ -16441,7 +16445,7 @@ 00:C0:F6 CelanTec # CELAN TECHNOLOGY INC. 00:C0:F7 EngageCo # ENGAGE COMMUNICATION, INC. 00:C0:F8 AboutCom # ABOUT COMPUTING INC. -00:C0:F9 EmersonN # Emerson Network Power +00:C0:F9 ArtesynE # Artesyn Embedded Technologies 00:C0:FA CanaryCo # CANARY COMMUNICATIONS, INC. 00:C0:FB Advanced # ADVANCED TECHNOLOGY LABS 00:C0:FC ElasticR # ELASTIC REALITY, INC. @@ -16714,6 +16718,7 @@ 00:D1:1C Acetel 00:D3:8D HotelTec # Hotel Technology Next Generation 00:D6:32 GeEnergy # GE Energy +00:D9:D1 SonyComp # Sony Computer Entertainment Inc. 00:DB:1E AlbedoTe # Albedo Telecom SL 00:DB:45 Thamway # THAMWAY CO.,LTD. 00:DB:DF IntelCor # Intel Corporate @@ -16787,7 +16792,7 @@ 00:E0:32 MisysFin # MISYS FINANCIAL SYSTEMS, LTD. 00:E0:33 EEPD # E.E.P.D. GmbH 00:E0:34 Cisco # CISCO SYSTEMS, INC. -00:E0:35 EmersonN # Emerson Network Power +00:E0:35 ArtesynE # Artesyn Embedded Technologies 00:E0:36 Pioneer # PIONEER CORPORATION 00:E0:37 Century # CENTURY CORPORATION 00:E0:38 Proxima # PROXIMA CORPORATION @@ -16990,6 +16995,7 @@ 00:E0:FD A-TrendT # A-TREND TECHNOLOGY CO., LTD. 00:E0:FE Cisco # CISCO SYSTEMS, INC. 00:E0:FF Security # SECURITY DYNAMICS TECHNOLOGIES, Inc. +00:E1:6D Cisco 00:E1:75 Ak-Syste # AK-Systems Ltd 00:E3:B2 SamsungE # Samsung Electronics Co.,Ltd 00:E6:66 ArimaCom # ARIMA Communications Corp. @@ -17062,10 +17068,12 @@ 04:58:6F SichuanW # Sichuan Whayer information industry Co.,LTD 04:5A:95 Nokia # Nokia Corporation 04:5C:06 ZmodoTec # Zmodo Technology Corporation +04:5C:8E GosundGr # gosund GROUP CO.,LTD 04:5D:56 CamtronI # camtron industrial inc. 04:5F:A7 Shenzhen # Shenzhen Yichen Technology Development Co.,LTD 04:62:D7 AlstomHy # ALSTOM HYDRO FRANCE 04:63:E0 NomeOy # Nome Oy +04:67:85 ScemtecH # scemtec Hard- und Software fuer Mess- und Steuerungstechnik GmbH 04:6D:42 Bryston # Bryston Ltd. 04:6E:49 TaiyearE # TaiYear Electronic Technology (Suzhou) Co., Ltd 04:70:BC Globalst # Globalstar Inc. @@ -17098,6 +17106,7 @@ 04:C1:B9 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 04:C5:A4 Cisco # CISCO SYSTEMS, INC. 04:C8:80 Samtec # Samtec Inc +04:C9:91 Phistek # Phistek INC. 04:CB:1D Traka # Traka plc 04:CE:14 Wilocity # Wilocity LTD. 04:CF:25 Manycolo # MANYCOLORS, INC. @@ -17107,6 +17116,7 @@ 04:DB:56 Apple # Apple, Inc. 04:DB:8A SuntechI # Suntech International Ltd. 04:DD:4C Velocyte # Velocytech +04:DE:DB Rockport # Rockport Networks Inc 04:DF:69 CarConne # Car Connectivity Consortium 04:E0:C4 Triumph- # TRIUMPH-ADLER AG 04:E1:C8 ImsSoluç # IMS Soluções em Energia Ltda. @@ -17299,13 +17309,13 @@ 08:37:9C Topaz # Topaz Co. LTD. 08:38:A5 Funkwerk # Funkwerk plettac electronic GmbH 08:3A:B8 ShinodaP # Shinoda Plasma Co., Ltd. +08:3D:88 SamsungE # Samsung Electronics Co.,Ltd 08:3E:0C ArrisGro # ARRIS Group, Inc. 08:3E:8E HonHaiPr # Hon Hai Precision Ind.Co.Ltd 08:3F:3E Wsh # WSH GmbH 08:3F:76 Intellia # Intellian Technologies, Inc. 08:40:27 Gridstor # Gridstore Inc. 08:48:2C RaycoreT # Raycore Taiwan Co., LTD. -08:49:29 Cybati 08:4E:1C H2aLlc # H2A Systems, LLC 08:4E:BF BroadNet # Broad Net Mux Corporation 08:51:2E OrionDia # Orion Diagnostica Oy @@ -17353,6 +17363,7 @@ 08:BE:09 AstrolEl # Astrol Electronic AG 08:CA:45 ToyouFei # Toyou Feiji Electronics Co., Ltd. 08:CC:68 Cisco +08:CD:9B SamtecAu # samtec automotive electronics & software GmbH 08:D0:9F Cisco # CISCO SYSTEMS, INC. 08:D2:9A Proforma # Proformatique 08:D4:0C IntelCor # Intel Corporate @@ -17370,6 +17381,7 @@ 08:F1:B7 Towerstr # Towerstream Corpration 08:F2:F4 NetOnePa # Net One Partners Co.,Ltd. 08:F6:F8 GetEngin # GET Engineering +08:F7:28 GloboMul # GLOBO Multimedia Sp. z o.o. Sp.k. 08:FA:E0 FohhnAud # Fohhn Audio AG 08:FC:52 OpenxsBv # OpenXS BV 08:FC:88 SamsungE # Samsung Electronics Co.,Ltd @@ -17393,6 +17405,7 @@ 0C:2D:89 QiiqComm # QiiQ Communications Inc. 0C:30:21 Apple 0C:37:DC HuaweiTe # Huawei Technologies Co., Ltd +0C:38:3E FanvilTe # Fanvil Technology Co., Ltd. 0C:39:56 Observat # Observator instruments 0C:3C:65 DomeImag # Dome Imaging Inc 0C:3E:9F Apple # Apple, Inc @@ -17428,6 +17441,7 @@ 0C:85:25 Cisco # CISCO SYSTEMS, INC. 0C:89:10 SamsungE # Samsung Electronics Co.,LTD 0C:8B:FD IntelCor # Intel Corporate +0C:8C:8F KamoTech # Kamo Technology Limited 0C:8C:DC SuuntoOy # Suunto Oy 0C:8D:98 TopEight # TOP EIGHT IND CORP 0C:92:4E RiceLake # Rice Lake Weighing Systems @@ -17442,6 +17456,7 @@ 0C:A4:02 AlcatelL # Alcatel Lucent IPD 0C:A4:2A ObTeleco # OB Telecom Electronic Technology Co., Ltd 0C:A6:94 SunitecE # Sunitec Enterprise Co.,Ltd +0C:AC:05 UnitendT # Unitend Technologies Inc. 0C:AF:5A GenusPow # GENUS POWER INFRASTRUCTURES LIMITED 0C:B4:EF Digience # Digience Co.,Ltd. 0C:BD:51 TctMobil # TCT Mobile Limited @@ -17491,6 +17506,7 @@ 10:00:E8 National # NATIONAL SEMICONDUCTOR 10:00:FD Laonpeop # LaonPeople 10:01:CA AshleyBu # Ashley Butterworth +10:05:CA Cisco 10:09:0C JanomeSe # Janome Sewing Machine Co., Ltd. 10:0B:A9 IntelCor # Intel Corporate 10:0C:24 Pomdevic # pomdevices, LLC @@ -17515,6 +17531,8 @@ 10:28:31 Morion # Morion Inc. 10:2D:96 Looxcie # Looxcie Inc. 10:2E:AF TexasIns # Texas Instruments +10:2F:6B Microsof # Microsoft Corporation +10:30:47 SamsungE # Samsung Electronics Co.,Ltd 10:33:78 Flectron # FLECTRON Co., LTD 10:37:11 SimlinkA # Simlink AS 10:3B:59 SamsungE # Samsung Electronics Co.,Ltd @@ -17527,6 +17545,7 @@ 10:47:80 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 10:48:B1 BeijingD # Beijing Duokan Technology Limited 10:4D:77 Innovati # Innovative Computer Engineering +10:51:72 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 10:56:CA PeplinkI # Peplink International Ltd. 10:5C:3B Perma-Pi # Perma-Pipe, Inc. 10:5C:BF Durobyte # DuroByte Inc @@ -17552,6 +17571,7 @@ 10:88:0F DarumaTe # Daruma Telecomunicações e Informática S.A. 10:88:CE Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 10:8C:CF Cisco # CISCO SYSTEMS, INC. +10:92:66 SamsungE # Samsung Electronics Co.,Ltd 10:93:E9 Apple 10:9A:B9 TosiboxO # Tosibox Oy 10:9A:DD Apple @@ -17569,6 +17589,7 @@ 10:BD:18 Cisco # CISCO SYSTEMS, INC. 10:BF:48 AsustekC # ASUSTEK COMPUTER INC. 10:C2:BA Utt # UTT Co., Ltd. +10:C3:7B AsustekC # ASUSTek COMPUTER INC. 10:C5:86 BioSound # BIO SOUND LAB CO., LTD. 10:C6:1F HuaweiTe # Huawei Technologies Co., Ltd 10:C6:FC GarminIn # Garmin International @@ -17606,6 +17627,7 @@ 14:1A:51 Treetech # Treetech Sistemas Digitais 14:1B:BD Volex # Volex Inc. 14:1B:F0 Intellim # Intellimedia Systems Ltd +14:1F:BA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 14:23:D7 Eutronix # EUTRONIX CO., LTD. 14:2B:D2 Armtel # Armtel Ltd. 14:2B:D6 Guangdon # Guangdong Appscomm Co.,Ltd @@ -17613,6 +17635,7 @@ 14:2D:8B IncipioT # Incipio Technologies, Inc 14:2D:F5 Amphitec # Amphitech 14:30:7A Avermetr # Avermetrics +14:30:C6 Motorola # Motorola Mobility LLC 14:35:8B Mediabri # Mediabridge Products, LLC. 14:35:B3 FutureDe # Future Designs, Inc. 14:36:05 Nokia # Nokia Corporation @@ -17628,6 +17651,7 @@ 14:4C:1A MaxCommu # Max Communication GmbH 14:54:12 Entis # Entis Co., Ltd. 14:56:45 Savitech # Savitech Corp. +14:58:D0 HewlettP # Hewlett Packard 14:5A:05 Apple 14:5B:D1 ArrisGro # ARRIS Group, Inc. 14:60:80 Zte # zte corporation @@ -17636,6 +17660,7 @@ 14:6E:0A Private 14:73:73 TubitakU # TUBITAK UEKAE 14:74:11 Rim +14:75:90 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 14:7D:B3 JoaTelec # JOA TELECOM.CO.,LTD 14:7D:C5 MurataMa # Murata Manufacturing Co., Ltd. 14:82:5B HefeiRad # Hefei Radio Communication Technology Co., Ltd @@ -17647,6 +17672,7 @@ 14:94:48 BluCastl # BLU CASTLE S.A. 14:99:E2 Apple # Apple, Inc 14:9F:E8 LenovoMo # Lenovo Mobile Communication Technology Ltd. +14:A3:64 SamsungE # Samsung Electronics Co.,Ltd 14:A6:2C SMDezacS # S.M. Dezac S.A. 14:A8:6B Shenzhen # ShenZhen Telacom Science&Technology Co., Ltd 14:A9:E3 Mst # MST CORPORATION @@ -17657,6 +17683,7 @@ 14:B7:3D ArcheanT # ARCHEAN Technologies 14:B9:68 HuaweiTe # Huawei Technologies Co., Ltd 14:C0:89 DuneHd # DUNE HD LTD +14:C1:26 Nokia # Nokia Corporation 14:C2:1D SabtechI # Sabtech Industries 14:CC:20 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD 14:CF:8D OhsungEl # OHSUNG ELECTRONICS CO., LTD. @@ -17675,6 +17702,7 @@ 14:F0:C5 Xtremio # Xtremio Ltd. 14:F2:8E Shenyang # ShenYang ZhongKe-Allwin Technology Co.LTD 14:F4:2A SamsungE # Samsung Electronics +14:F6:5A Xiaomi # Xiaomi inc. 14:FE:AF Sagittar # SAGITTAR LIMITED 14:FE:B5 Dell # Dell Inc 18:00:2D SonyMobi # Sony Mobile Communications AB @@ -17704,6 +17732,7 @@ 18:2A:7B Nintendo # Nintendo Co., Ltd. 18:2B:05 8dTechno # 8D Technologies 18:2C:91 ConceptD # Concept Development, Inc. +18:30:09 WoojinIn # Woojin Industrial Systems Co., Ltd. 18:32:A2 LaonTech # LAON TECHNOLOGY CO., LTD. 18:33:9D Cisco # CISCO SYSTEMS, INC. 18:34:51 Apple @@ -17718,6 +17747,7 @@ 18:44:62 RiavaNet # Riava Networks, Inc. 18:46:17 SamsungE # Samsung Electronics 18:48:D8 Fastback # Fastback Networks +18:4A:6F Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd 18:4E:94 MessoaTe # MESSOA TECHNOLOGIES INC. 18:52:53 Pixord # Pixord Corporation 18:53:E0 HanyangD # Hanyang Digitech Co.Ltd @@ -17737,7 +17767,9 @@ 18:7E:D5 Shenzhen # shenzhen kaism technology Co. Ltd 18:80:CE Barberry # Barberry Solutions Ltd 18:80:F5 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd +18:82:19 AlibabaC # Alibaba Cloud Computing Ltd. 18:83:31 SamsungE # Samsung Electronics Co.,Ltd +18:83:BF Arcadyan # Arcadyan Technology Corporation 18:84:10 Coretrus # CoreTrust Inc. 18:86:3A DigitalA # DIGITAL ART SYSTEM 18:86:AC NokiaDan # Nokia Danmark A/S @@ -17768,7 +17800,9 @@ 18:C4:51 TucsonEm # Tucson Embedded Systems 18:C8:E7 Shenzhen # Shenzhen Hualistone Technology Co.,Ltd 18:CC:23 PhilioTe # Philio Technology Corporation +18:CF:5E LiteonTe # Liteon Technology Corporation 18:D0:71 DasanSmc # DASAN SMC, Inc. +18:D5:B6 SmgHoldi # SMG Holdings LLC 18:D6:6A Inmarsat 18:D6:CF KurthEle # Kurth Electronic GmbH 18:D9:49 QvisLabs # Qvis Labs, LLC @@ -17813,6 +17847,7 @@ 1C:41:58 GemaltoM # Gemalto M2M GmbH 1C:43:EC JapanCir # JAPAN CIRCUIT CO.,LTD 1C:45:93 TexasIns # Texas Instruments +1C:48:40 ImsMesss # IMS Messsysteme GmbH 1C:48:F9 GnNetcom # GN Netcom A/S 1C:4A:F7 Amon # AMON INC 1C:4B:B9 SmgEnter # SMG ENTERPRISE, LLC @@ -17830,6 +17865,7 @@ 1C:66:6D HonHaiPr # Hon Hai Precision Ind.Co.Ltd 1C:66:AA SamsungE # Samsung Electronics 1C:69:A5 Research # Research In Motion +1C:6A:7A Cisco 1C:6B:CA Mitsunam # Mitsunami Co., Ltd. 1C:6F:65 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 1C:75:08 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. @@ -17851,6 +17887,7 @@ 1C:95:9F Veethree # Veethree Electronics And Marine LLC 1C:97:3D PricomDe # PRICOM Design 1C:99:4C MurataMa # Murata Manufactuaring Co.,Ltd. +1C:9C:26 ZoovelTe # Zoovel Technologies 1C:A7:70 Shenzhen # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT 1C:AA:07 Cisco # CISCO SYSTEMS, INC. 1C:AB:01 Innovolt @@ -17869,6 +17906,7 @@ 1C:C3:16 Milesigh # MileSight Technology Co., Ltd. 1C:C6:3C Arcadyan # Arcadyan Technology Corporation 1C:D4:0C KriwanIn # Kriwan Industrie-Elektronik GmbH +1C:DE:A7 Cisco 1C:DF:0F Cisco # CISCO SYSTEMS, INC. 1C:E1:65 Marshal # Marshal Corporation 1C:E1:92 Qisda # Qisda Corporation @@ -17893,6 +17931,7 @@ 20:0E:95 Iec–Tc9W # IEC – TC9 WG43 20:10:7A GemtekTe # Gemtek Technology Co., Ltd. 20:12:57 MostLuck # Most Lucky Trading Ltd +20:12:D5 Scientec # Scientech Materials Corporation 20:13:E0 SamsungE # Samsung Electronics Co.,Ltd 20:16:D8 LiteonTe # Liteon Technology Corporation 20:18:0E Shenzhen # Shenzhen Sunchip Technology Co., Ltd @@ -17927,6 +17966,7 @@ 20:68:9D LiteonTe # Liteon Technology Corporation 20:6A:8A WistronI # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd. 20:6A:FF AtlasEle # Atlas Elektronik UK Limited +20:6E:9C SamsungE # Samsung Electronics Co.,Ltd 20:6F:EC BraemacC # Braemac CA LLC 20:73:55 ArrisGro # ARRIS Group, Inc. 20:74:CF Shenzhen # Shenzhen Voxtech Co.,Ltd @@ -17939,10 +17979,12 @@ 20:89:86 Zte # zte corporation 20:91:8A Profalux 20:91:D9 IM # I'M SPA +20:93:4D FujianSt # Fujian Star-net Communication Co., Ltd 20:9A:E9 Volacomm # Volacomm Co., Ltd 20:9B:A5 JiaxingG # JIAXING GLEAD Electronics Co.,Ltd 20:A2:E7 Lee-Dick # Lee-Dickens Ltd 20:A7:87 BointecT # Bointec Taiwan Corporation Limited +20:A9:9B Microsof # Microsoft Corporation 20:AA:25 Ip-NetLl # IP-NET LLC 20:AA:4B Cisco-Li # Cisco-Linksys, LLC 20:B0:F7 Enclustr # Enclustra GmbH @@ -17953,6 +17995,7 @@ 20:BB:C6 JabilCir # Jabil Circuit Hungary Ltd. 20:BF:DB Dvl 20:C1:AF IWitDigi # i Wit Digital Co., Limited +20:C3:8F TexasIns # Texas Instruments Inc 20:C6:0D Shanghai # Shanghai annijie Information technology Co.,LTD 20:C6:EB Panasoni # Panasonic Corporation AVC Networks Company 20:C8:B3 Shenzhen # SHENZHEN BUL-TECH CO.,LTD. @@ -17973,6 +18016,7 @@ 20:E5:64 ArrisGro # ARRIS Group, Inc. 20:E7:91 SiemensH # Siemens Healthcare Diagnostics, Inc 20:EA:C7 Shenzhen # SHENZHEN RIOPINE ELECTRONICS CO., LTD +20:ED:74 AbilityE # Ability enterprise co.,Ltd. 20:EE:C6 Elefirst # Elefirst Science & Tech Co ., ltd 20:F0:02 MtdataDe # MTData Developments Pty. Ltd. 20:F3:A3 HuaweiTe # Huawei Technologies Co., Ltd @@ -18005,6 +18049,7 @@ 24:45:97 GemueGeb # GEMUE Gebr. Mueller Apparatebau 24:47:0E Pentroni # PentronicAB 24:49:7B Innovati # Innovative Converged Devices Inc +24:4F:1D IruleLlc # iRule LLC 24:5F:DF Kyocera # KYOCERA Corporation 24:62:78 Sysmocom # sysmocom - systems for mobile communications GmbH 24:64:EF CygSunri # CYG SUNRI CO.,LTD. @@ -18049,6 +18094,7 @@ 24:C9:DE Genoray 24:CB:E7 Myk # MYK, Inc. 24:CF:21 Shenzhen # Shenzhen State Micro Technology Co., Ltd +24:D1:3F Mexus # MEXUS CO.,LTD 24:D2:CC Smartdri # SmartDrive Systems Inc. 24:D9:21 Avaya # Avaya, Inc 24:DA:B6 Sistemas # Sistemas de Gestión Energética S.A. de C.V @@ -18057,6 +18103,7 @@ 24:DB:ED SamsungE # Samsung Electronics Co.,Ltd 24:DE:C6 ArubaNet # Aruba Networks 24:E2:71 QingdaoH # Qingdao Hisense Communications Co.,Ltd +24:E3:14 Apple 24:E6:BA JscZavod # JSC Zavod im. Kozitsky 24:E9:B3 Cisco 24:EA:40 SystemeH # Systeme Helmholz GmbH @@ -18083,6 +18130,7 @@ 28:22:46 BeijingS # Beijing Sinoix Communication Co., LTD 28:26:A6 PbrElect # PBR electronics GmbH 28:28:5D ZyxelCom # ZyXEL Communications Corporation +28:29:CC CorsaTec # Corsa Technology Incorporated 28:29:D9 Globalbe # GlobalBeiMing technology (Beijing)Co. Ltd 28:2C:B2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 28:31:52 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -18101,6 +18149,7 @@ 28:48:46 Gridcent # GridCentric Inc. 28:4C:53 IntuneNe # Intune Networks 28:4D:92 Luminato # Luminator +28:4E:D7 Outsmart # OutSmart Power Systems, Inc. 28:4F:CE Liaoning # Liaoning Wontel Science and Technology Development Co.,Ltd. 28:51:32 Shenzhen # Shenzhen Prayfly Technology Co.,Ltd 28:57:67 Echostar # Echostar Technologies Corp @@ -18135,6 +18184,7 @@ 28:A1:EB EtekTech # ETEK TECHNOLOGY (SHENZHEN) CO.,LTD 28:A2:41 Exlar # exlar corp 28:A5:74 MillerEl # Miller Electric Mfg. Co. +28:A5:EE Shenzhen # Shenzhen SDGI CATV Co., Ltd 28:AF:0A SiriusXm # Sirius XM Radio Inc 28:B0:CC XenyaDOO # Xenya d.o.o. 28:B2:BD IntelCor # Intel Corporate @@ -18147,6 +18197,7 @@ 28:C6:71 YotaDevi # Yota Devices OY 28:C6:8E Netgear # NETGEAR INC., 28:C7:18 Altierre +28:C7:CE Cisco 28:C8:25 Dellking # DellKing Industrial Co., Ltd 28:C9:14 Taimag # Taimag Corporation 28:CB:EB One @@ -18167,8 +18218,10 @@ 28:E0:2C Apple 28:E1:4C Apple # Apple, Inc. 28:E2:97 Shanghai # Shanghai InfoTM Microelectronics Co.,Ltd. +28:E3:1F Xiaomi # Xiaomi inc. 28:E3:47 LiteonTe # Liteon Technology Corporation 28:E6:08 Tokheim +28:E6:E9 SisSatIn # SIS Sat Internet Services GmbH 28:E7:94 Microtim # Microtime Computer Inc. 28:E7:CF Apple 28:ED:58 JagJakob # JAG Jakob AG @@ -18179,14 +18232,17 @@ 28:F6:06 SyesSrl # Syes srl 28:FB:D3 Ragentek # Ragentek Technology Group 28:FC:51 Electric # The Electric Controller and Manufacturing Co., LLC +28:FC:F6 Shenzhen # Shenzhen Xin KingBrand enterprises Co.,Ltd 2C:00:2C Unowhy 2C:00:33 Econtrol # EControls, LLC 2C:00:F7 Xos +2C:01:0B NascentT # NASCENT Technology, LLC - RemKon 2C:06:23 WinLeade # Win Leader Inc. 2C:07:3C Devline # DEVLINE LIMITED 2C:10:C1 Nintendo # Nintendo Co., Ltd. 2C:18:AE TrendEle # Trend Electronics Co., Ltd. 2C:19:84 IdnTelec # IDN Telecom, Inc. +2C:1A:31 Electron # Electronics Company Limited 2C:1E:EA Aerodev 2C:21:72 JuniperN # Juniper Networks 2C:24:5F BabolatV # Babolat VS @@ -18213,6 +18269,7 @@ 2C:44:FD HewlettP # Hewlett Packard 2C:53:4A Shenzhen # Shenzhen Winyao Electronic Limited 2C:54:2D Cisco # CISCO SYSTEMS, INC. +2C:54:CF LgElectr # LG Electronics 2C:55:3C Gainspee # Gainspeed, Inc. 2C:59:E5 HewlettP # Hewlett Packard 2C:5A:05 Nokia # Nokia Corporation @@ -18248,11 +18305,13 @@ 2C:A7:80 TrueTech # True Technologies Inc. 2C:A8:35 Rim 2C:AB:25 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd +2C:AB:A4 CiscoSpv # Cisco SPVTG 2C:B0:5D Netgear 2C:B0:DF SolitonT # Soliton Technologies Pvt Ltd 2C:B4:3A Apple 2C:B6:93 Radware 2C:B6:9D RedDigit # RED Digital Cinema +2C:BE:08 Apple 2C:BE:97 Ingenieu # Ingenieurbuero Bickele und Buehler GmbH 2C:C2:60 Ravello # Ravello Systems 2C:CC:15 Nokia # Nokia Corporation @@ -18272,9 +18331,11 @@ 2C:EE:26 Petroleu # Petroleum Geo-Services 2C:F2:03 EmkoElek # EMKO ELEKTRONIK SAN VE TIC AS 2C:F4:C5 Avaya # Avaya, Inc +2C:FA:A2 Alcatel- # Alcatel-Lucent 2E:2E:2E LaaLocal # LAA (Locally Administered Address) for Meditech Systems 30:05:5C BrotherI # Brother industries, LTD. 30:0B:9C DeltaMob # Delta Mobile Systems, Inc. +30:0D:2A Zhejiang # Zhejiang Wellcom Technology Co.,Ltd. 30:0E:D5 HonHaiPr # Hon Hai Precision Ind.Co.Ltd 30:10:E4 Apple # Apple, Inc. 30:14:2D Piciorgr # Piciorgros GmbH @@ -18289,6 +18350,7 @@ 30:2D:E8 JdaLlcJd # JDA, LLC (JDA Systems) 30:32:94 W-Ie-Ne- # W-IE-NE-R Plein & Baus GmbH 30:32:D4 Hanilstm # Hanilstm Co., Ltd. +30:33:35 Boosty 30:37:A6 Cisco # CISCO SYSTEMS, INC. 30:38:55 Nokia # Nokia Corporation 30:39:26 SonyEric # Sony Ericsson Mobile Communications AB @@ -18298,6 +18360,7 @@ 30:3D:08 GlinttTe # GLINTT TES S.A. 30:3E:AD SonavoxC # Sonavox Canada Inc 30:41:74 AltecLan # ALTEC LANSING LLC +30:42:25 Burg-Wäc # BURG-WÄCHTER KG 30:44:49 Plath # PLATH GmbH 30:46:9A Netgear 30:49:3B NanjingZ # Nanjing Z-Com Wireless Co.,Ltd @@ -18307,6 +18370,7 @@ 30:52:5A Nst # NST Co., LTD 30:55:ED TrexNetw # Trex Network LLC 30:57:AC Irlab # IRLAB LTD. +30:59:5B Streamno # streamnow AG 30:59:B7 Microsof # Microsoft 30:5D:38 Beissbar # Beissbarth 30:60:23 ArrisGro # ARRIS Group, Inc. @@ -18338,6 +18402,7 @@ 30:B2:16 HytecGer # Hytec Geraetebau GmbH 30:B3:A2 Shenzhen # Shenzhen Heguang Measurement & Control Technology Co.,Ltd 30:B5:C2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +30:B5:F1 AitexinT # Aitexin Technology Co., Ltd 30:C7:50 MicTechn # MIC Technology Group 30:C7:AE SamsungE # Samsung Electronics Co.,Ltd 30:C8:2A Wi-NextS # Wi-Next s.r.l. @@ -18356,10 +18421,15 @@ 30:F4:2F Esp 30:F7:0D Cisco # Cisco Systems 30:F7:C5 Apple +30:F7:D7 ThreadTe # Thread Technology Co., Ltd 30:F9:ED Sony # Sony Corporation 30:FD:11 Macrotec # MACROTECH (USA) INC. +34:00:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +34:02:86 IntelCor # Intel Corporate +34:02:9B Cloudber # CloudBerry Technologies Private Limited 34:07:FB Ericsson # Ericsson AB 34:08:04 D-Link # D-Link Corporation +34:0A:FF QingdaoH # Qingdao Hisense Communications Co.,Ltd 34:13:A8 Mediplan # Mediplan Limited 34:13:E8 IntelCor # Intel Corporate 34:15:9E Apple @@ -18373,10 +18443,12 @@ 34:29:EA McdElect # MCD ELECTRONICS SP. Z O.O. 34:2F:6E Anywire # Anywire corporation 34:31:11 SamsungE # Samsung Electronics Co.,Ltd +34:31:C4 Avm # AVM GmbH 34:40:B5 Ibm 34:46:6F HitemEng # HiTEM Engineering 34:4B:3D Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 34:4B:50 Zte # ZTE Corporation +34:4D:F7 LgElectr # LG Electronics 34:4F:3F Io-Power # IO-Power Technology Co., Ltd. 34:4F:5C R&Amp;M # R&M AG 34:4F:69 EkinopsS # EKINOPS SAS @@ -18427,6 +18499,7 @@ 34:BA:51 Se-KureC # Se-Kure Controls, Inc. 34:BA:9A Asiatelc # Asiatelco Technologies Co. 34:BB:1F Research # Research In Motion +34:BB:26 Motorola # Motorola Mobility LLC 34:BC:A6 BeijingD # Beijing Ding Qing Technology, Ltd. 34:BD:C8 Cisco # Cisco Systems 34:BD:F9 Shanghai # Shanghai WDK Industrial Co.,Ltd. @@ -18435,6 +18508,7 @@ 34:BF:90 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 34:C0:59 Apple 34:C3:AC SamsungE # Samsung Electronics +34:C5:D0 Hagleitn # Hagleitner Hygiene International GmbH 34:C6:9A Enecsys # Enecsys Ltd 34:C7:31 Alps # ALPS Co,. Ltd. 34:C8:03 Nokia # Nokia Corporation @@ -18455,6 +18529,7 @@ 34:E4:2A Automati # Automatic Bar Controls Inc. 34:EF:44 2wire 34:EF:8B NttCommu # NTT Communications Corporation +34:F0:CA Shenzhen # Shenzhen Linghangyuan Digital Technology Co.,Ltd. 34:F3:9B Wizlan # WizLAN Ltd. 34:F6:2D Sharp # SHARP Corporation 34:F9:68 AtekProd # ATEK Products, LLC @@ -18462,6 +18537,7 @@ 34:FC:6F Alcea 38:01:97 ToshibaS # Toshiba Samsung Storage Technolgoy Korea Corporation 38:06:B4 ADC # A.D.C. GmbH +38:08:FD Silca # Silca Spa 38:0A:0A Sky-City # Sky-City Communication and Electronics Limited Company 38:0A:94 SamsungE # Samsung Electronics Co.,Ltd 38:0B:40 SamsungE # Samsung Electronics Co.,Ltd @@ -18471,11 +18547,14 @@ 38:16:D1 SamsungE # Samsung Electronics Co.,Ltd 38:17:66 Promzaka # PROMZAKAZ LTD. 38:19:2F Nokia # Nokia Corporation +38:1C:1A Cisco 38:1C:4A SimcomWi # SIMCom Wireless Solutions Co.,Ltd. 38:22:9D PirelliT # Pirelli Tyre S.p.A. 38:22:D6 H3cTechn # H3C Technologies Co., Limited +38:26:2B UtranTec # UTran Technology 38:26:CD Andtek 38:28:EA FujianNe # Fujian Netcom Technology Co., LTD +38:2D:D1 SamsungE # Samsung Electronics Co.,Ltd 38:31:AC Weg 38:3F:10 DblTechn # DBL Technology Ltd. 38:42:33 Wildeboe # Wildeboer Bauteile GmbH @@ -18539,8 +18618,10 @@ 38:EC:E4 SamsungE # Samsung Electronics 38:EE:9D Anedo # Anedo Ltd. 38:F0:98 VaporSto # Vapor Stone Rail Systems +38:F3:3F Tatsuno # TATSUNO CORPORATION 38:F5:97 Home2net # home2net GmbH 38:F7:08 National # National Resource Management, Inc. +38:F8:89 HuaweiTe # Huawei Technologies Co., Ltd 38:F8:B7 V2comPar # V2COM PARTICIPACOES S.A. 38:FE:C5 EllipsBV # Ellips B.V. 3C:00:00 3Com @@ -18559,6 +18640,7 @@ 3C:10:6F Albahith # ALBAHITH TECHNOLOGIES 3C:15:C2 Apple 3C:15:EA Tescom # TESCOM CO., LTD. +3C:18:9F Nokia # Nokia Corporation 3C:18:A0 Luxshare # Luxshare Precision Industry Co.,Ltd. 3C:19:15 GfiChron # GFI Chrono Time 3C:19:7D Ericsson # Ericsson AB @@ -18578,6 +18660,7 @@ 3C:3A:73 Avaya # Avaya, Inc 3C:40:4F Guangdon # Guangdong Pisen Electronics Co. Ltd. 3C:43:8E ArrisGro # ARRIS Group, Inc. +3C:46:D8 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 3C:4A:92 Hewlett- # Hewlett-Packard Company 3C:4C:69 Infinity # Infinity System S.L. 3C:4E:47 Etronic # Etronic A/S @@ -18613,9 +18696,11 @@ 3C:98:BF QuestCon # Quest Controls, Inc. 3C:99:F7 Lansente # Lansentechnology AB 3C:9F:81 Shenzhen # Shenzhen CATIC Bit Communications Technology Co.,Ltd +3C:A1:0D SamsungE # Samsung Electronics Co.,Ltd 3C:A3:15 BlessInf # Bless Information & Communications Co., Ltd 3C:A7:2B MrvCommu # MRV Communications (Networks) LTD 3C:A9:F4 IntelCor # Intel Corporate +3C:AA:3F Ikey # iKey, Ltd. 3C:AB:8E Apple 3C:B1:5B Avaya # Avaya, Inc 3C:B1:7F Wattwatc # Wattwatchers Pty Ld @@ -18628,6 +18713,7 @@ 3C:C2:43 Nokia # Nokia Corporation 3C:C9:9E HuiyangT # Huiyang Technology Co., Ltd 3C:CA:87 Iders # Iders Incorporated +3C:CD:5A Technisc # Technische Alternative GmbH 3C:CD:93 LgElectr # LG ELECTRONICS INC 3C:CE:73 Cisco # CISCO SYSTEMS, INC. 3C:D0:F8 Apple @@ -18635,6 +18721,7 @@ 3C:D4:D6 Wireless # WirelessWERX, Inc 3C:D7:DA SkMtekMi # SK Mtek microelectronics(shenzhen)limited 3C:D9:2B Hewlett- # Hewlett-Packard Company +3C:D9:CE EclipseW # Eclipse WiFi 3C:DF:1E Cisco # CISCO SYSTEMS, INC. 3C:DF:BD HuaweiTe # Huawei Technologies Co., Ltd 3C:E0:72 Apple @@ -18681,6 +18768,7 @@ 40:4A:03 ZyxelCom # ZyXEL Communications Corporation 40:4A:18 AddrekSm # Addrek Smart Solutions 40:4D:8E Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd +40:4E:EB HigherWa # Higher Way Electronic Co., Ltd. 40:50:E0 MiltonSe # Milton Security Group LLC 40:51:6C GrandexI # Grandex International Corporation 40:52:0D PicoTech # Pico Technology @@ -18701,9 +18789,11 @@ 40:70:4A PowerIde # Power Idea Technology Limited 40:70:74 LifeTech # Life Technology (China) Co., Ltd 40:74:96 AfunTech # aFUN TECHNOLOGY INC. +40:78:6A Motorola # Motorola Mobility LLC 40:78:75 Imbel-In # IMBEL - Industria de Material Belico do Brasil 40:7A:80 Nokia # Nokia Corporation 40:7B:1B MettleNe # Mettle Networks Inc. +40:82:56 Continen # Continental Automotive GmbH 40:83:DE Motorola 40:84:93 Claviste # Clavister AB 40:88:E0 BeijingE # Beijing Ereneben Information Technology Limited Shenzhen Branch @@ -18735,6 +18825,7 @@ 40:BF:17 Digistar # Digistar Telecom. SA 40:C2:45 Shenzhen # Shenzhen Hexicom Technology Co., Ltd. 40:C4:D6 Chongqin # ChongQing Camyu Technology Development Co.,Ltd. +40:C6:2A Shanghai # Shanghai Jing Ren Electronic Technology Co., Ltd. 40:C7:C9 Naviit # Naviit Inc. 40:CB:A8 HuaweiTe # Huawei Technologies Co., Ltd 40:CD:3A Z3Techno # Z3 Technology @@ -19230,6 +19321,7 @@ 40:EF:4C Fihonest # Fihonest communication co.,Ltd 40:F0:2F LiteonTe # Liteon Technology Corporation 40:F1:4C IseEurop # ISE Europe SPRL +40:F2:01 Sagemcom 40:F2:E9 Ibm 40:F3:08 MurataMa # Murata Manufactuaring Co.,Ltd. 40:F4:07 Nintendo # Nintendo Co., Ltd. @@ -19280,12 +19372,14 @@ 44:5F:7A ShihlinE # Shihlin Electric & Engineering Corp. 44:61:32 Ecobee # ecobee inc 44:61:9C Fonsyste # FONsystem co. ltd. +44:66:6E Ip-Line 44:67:55 OrbitIrr # Orbit Irrigation 44:68:AB Juin # JUIN COMPANY, LIMITED 44:6C:24 ReallinE # Reallin Electronic Co.,Ltd 44:6D:57 LiteonTe # Liteon Technology Corporation 44:70:0B Iffu 44:70:98 MingHong # MING HONG TECHNOLOGY (SHEN ZHEN) LIMITED +44:74:6C SonyMobi # Sony Mobile Communications AB 44:7B:C4 Dualshin # DualShine Technology(SZ)Co.,Ltd 44:7C:7F Innoligh # Innolight Technology Corporation 44:7D:A5 VtionInf # VTION INFORMATION TECHNOLOGY (FUJIAN) CO.,LTD @@ -19306,6 +19400,7 @@ 44:9C:B5 Alcomp # Alcomp, Inc 44:A4:2D TctMobil # TCT Mobile Limited 44:A6:89 PromaxEl # PROMAX ELECTRONICA SA +44:A6:E5 Thinking # THINKING TECHNOLOGY CO.,LTD 44:A7:CF MurataMa # Murata Manufacturing Co., Ltd. 44:A8:C2 SewooTec # SEWOO TECH CO., LTD 44:AA:27 Udworks # udworks Co., Ltd. @@ -19340,12 +19435,14 @@ 47:54:43 GtcNotRe # GTC (Not registered!) (This number is a multicast!) 48:02:2A B-LinkEl # B-Link Electronic Limited 48:03:62 DesayEle # DESAY ELECTRONICS(HUIZHOU)CO.,LTD +48:0C:49 NakayoTe # NAKAYO TELECOMMUNICATIONS,INC 48:12:49 LuxcomTe # Luxcom Technologies Inc. 48:13:F3 BbkElect # BBK Electronics Corp., Ltd. 48:17:4C Micropow # MicroPower technologies 48:18:42 Shanghai # Shanghai Winaas Co. Equipment Co. Ltd. 48:1A:84 PointerT # Pointer Telocation Ltd 48:1B:D2 IntronSc # Intron Scientific co., ltd. +48:26:E8 Tek-Air # Tek-Air Systems, Inc. 48:28:2F Zte # ZTE Corporation 48:2C:EA Motorola # Motorola Inc Business Light Radios 48:33:DD ZennioAv # ZENNIO AVANCE Y TECNOLOGIA, S.L. @@ -19357,8 +19454,10 @@ 48:46:F1 UrosOy # Uros Oy 48:46:FB HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 48:4C:00 NetworkS # Network Solutions +48:51:B7 IntelCor # Intel Corporate 48:52:61 Soreel 48:54:E8 Winbond? +48:59:29 LgElectr # LG Electronics 48:5A:3F Wisol 48:5A:B6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 48:5B:39 AsustekC # ASUSTek COMPUTER INC. @@ -19377,6 +19476,7 @@ 48:91:53 Weinmann # Weinmann Geräte für Medizin GmbH + Co. KG 48:91:F6 Shenzhen # Shenzhen Reach software technology CO.,LTD 48:9B:E2 SciInnov # SCI Innovations Ltd +48:9D:18 Flashbay # Flashbay Limited 48:9D:24 Research # Research In Motion 48:A2:2D Shenzhen # Shenzhen Huaxuchang Telecom Technology Co.,Ltd 48:A2:B7 KodofonJ # Kodofon JSC @@ -19396,7 +19496,9 @@ 48:D1:8E MetisCom # Metis Communication Co.,Ltd 48:D2:24 LiteonTe # Liteon Technology Corporation 48:D5:4C JedaNetw # Jeda Networks +48:D7:05 Apple 48:D7:FF BlankomA # BLANKOM Antennentechnik GmbH +48:D8:55 Telvent 48:D8:FE ClaridyS # ClarIDy Solutions, Inc. 48:DC:FB Nokia # Nokia Corporation 48:DF:1C WuhanNec # Wuhan NEC Fibre Optic Communications industry Co. Ltd @@ -19425,6 +19527,7 @@ 4C:0D:EE JabilCir # JABIL CIRCUIT (SHANGHAI) LTD. 4C:0F:6E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 4C:0F:C7 EardaEle # Earda Electronics Co.,Ltd +4C:11:BF Zhejiang # ZHEJIANG DAHUA TECHNOLOGY CO.,LTD. 4C:14:80 Noregon # NOREGON SYSTEMS, INC 4C:14:A3 TclTechn # TCL Technoly Electronics (Huizhou) Co., Ltd. 4C:17:EB Sagemcom @@ -19434,6 +19537,7 @@ 4C:21:D0 SonyMobi # Sony Mobile Communications AB 4C:22:58 Cozybit # cozybit, Inc. 4C:25:78 Nokia # Nokia Corporation +4C:26:E7 Welgate # Welgate Co., Ltd. 4C:2C:80 BeijingS # Beijing Skyway Technologies Co.,Ltd 4C:2F:9D IcmContr # ICM Controls 4C:30:89 ThalesTr # Thales Transportation Systems GmbH @@ -19459,6 +19563,7 @@ 4C:62:55 Sanmina- # SANMINA-SCI SYSTEM DE MEXICO S.A. DE C.V. 4C:63:EB Applicat # Application Solutions (Electronics and Vision) Ltd 4C:64:D9 Guangdon # Guangdong Leawin Group Co., Ltd +4C:6E:6E ComnectT # Comnect Technology CO.,LTD 4C:72:B9 Pegatron # Pegatron Corporation 4C:73:67 GeniusBy # Genius Bytes Software Solutions GmbH 4C:73:A5 Kove @@ -19469,6 +19574,7 @@ 4C:80:4F Armstron # Armstrong Monitoring Corp 4C:80:93 IntelCor # Intel Corporate 4C:82:CF Echostar # Echostar Technologies +4C:83:DE CiscoSpv # Cisco SPVTG 4C:8B:30 Actionte # Actiontec Electronics, Inc 4C:8B:55 GrupoDig # Grupo Digicon 4C:8B:EF HuaweiTe # Huawei Technologies Co., Ltd @@ -19478,6 +19584,7 @@ 4C:98:EF Zeo 4C:9E:80 KyokkoEl # KYOKKO ELECTRIC Co., Ltd. 4C:9E:E4 HanyangN # Hanyang Navicom Co.,Ltd. +4C:9E:FF ZyxelCom # ZyXEL Communications Corp 4C:A5:6D SamsungE # Samsung Electronics Co.,Ltd 4C:A7:4B AlcatelL # Alcatel Lucent 4C:AA:16 Azurewav # AzureWave Technologies (Shanghai) Inc. @@ -19489,6 +19596,8 @@ 4C:B8:1C SamElect # SAM Electronics GmbH 4C:B9:C8 Conet # CONET CO., LTD. 4C:BA:A3 BisonEle # Bison Electronics Inc. +4C:BB:58 ChiconyE # Chicony Electronics Co., Ltd. +4C:BC:42 Shenzhen # Shenzhen Hangsheng Electronics Co.,Ltd. 4C:BC:A5 SamsungE # Samsung Electronics Co.,Ltd 4C:C4:52 ShangHai # Shang Hai Tyd. Electon Technology Ltd. 4C:C6:02 Radios # Radios, Inc. @@ -19502,9 +19611,11 @@ 4C:DF:3D TeamEngi # TEAM ENGINEERS ADVANCE TECHNOLOGIES INDIA PVT LTD 4C:E1:BB ZhuhaiHi # Zhuhai HiFocus Technology Co., Ltd. 4C:E6:76 Buffalo # Buffalo Inc. +4C:E9:33 Railcomm # RailComm, LLC 4C:EB:42 IntelCor # Intel Corporate 4C:ED:DE AskeyCom # Askey Computer Corp 4C:F0:2E VifaDenm # Vifa Denmark A/S +4C:F2:BF Cambridg # Cambridge Industries(Group) Co.,Ltd. 4C:F4:5B BlueClov # Blue Clover Devices 4C:F7:37 SamjiEle # SamJi Electronics Co., Ltd 50:00:8C HongKong # Hong Kong Telecommunications (HKT) Limited @@ -19539,6 +19650,7 @@ 50:4A:5E Masimo # Masimo Corporation 50:4A:6E Netgear # NETGEAR INC., 50:4F:94 LoxoneEl # Loxone Electronics GmbH +50:50:65 Takt # TAKT Corporation 50:56:63 TexasIns # Texas Instruments 50:56:A8 Jolla # Jolla Ltd 50:56:BF SamsungE # Samsung Electronics Co.,LTD @@ -19550,6 +19662,7 @@ 50:61:D6 Indu-Sol # Indu-Sol GmbH 50:63:13 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 50:64:41 Greenlee +50:67:87 Itellus 50:67:F0 ZyxelCom # ZyXEL Communications Corporation 50:6F:9A Wi-FiAll # Wi-Fi Alliance 50:70:E5 HeShanWo # He Shan World Fair Electronics Technology Limited @@ -19560,6 +19673,7 @@ 50:7D:02 Biodit 50:7E:5D Arcadyan # Arcadyan Technology Corporation 50:85:69 SamsungE # Samsung Electronics Co.,LTD +50:87:89 Cisco 50:87:B8 Nuvyyo # Nuvyyo Inc 50:8A:42 UptmateT # Uptmate Technology Co., LTD 50:8A:CB Shenzhen # SHENZHEN MAXMADE TECHNOLOGY CO., LTD. @@ -19581,6 +19695,7 @@ 50:B7:C3 SamsungE # Samsung Electronics CO., LTD 50:B8:88 Wi2beTec # wi2be Tecnologia S/A 50:B8:A2 ImtechTe # ImTech Technologies LLC, +50:BD:5F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 50:C0:06 Carmanah # Carmanah Signs 50:C2:71 Securete # SECURETECH INC 50:C5:8D JuniperN # Juniper Networks @@ -19605,6 +19720,7 @@ 50:FA:AB L-TekDOO # L-tek d.o.o. 50:FC:30 Treehous # Treehouse Labs 50:FC:9F SamsungE # Samsung Electronics Co.,Ltd +50:FE:F2 SifyTech # Sify Technologies Ltd 52:54:00 RealtekU # Realtek (UpTech? also reported) 52:54:4C Novell20 # Novell 2000 52:54:AB RealtekA # REALTEK (a Realtek 8029 based PCI Card) @@ -19672,6 +19788,7 @@ 54:A9:D4 Minibar # Minibar Systems 54:AE:27 Apple 54:B6:20 SuhdolE& # SUHDOL E&C Co.Ltd. +54:B7:53 HunanFen # Hunan Fenghui Yinjia Science And Technology Co.,Ltd 54:BE:F7 Pegatron # PEGATRON CORPORATION 54:C8:0F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 54:CD:A7 FujianSh # Fujian Shenzhou Electronic Co.,Ltd @@ -19680,6 +19797,7 @@ 54:D1:63 Max-Tech # MAX-TECH,INC 54:D1:B0 Universa # Universal Laser Systems, Inc 54:D4:6F CiscoSpv # Cisco SPVTG +54:DF:00 Ulterius # Ulterius Technologies, LLC 54:DF:63 Intrakey # Intrakey technologies GmbH 54:E0:32 JuniperN # Juniper Networks 54:E2:E0 Pace # Pace plc @@ -19692,8 +19810,10 @@ 54:EF:92 Shenzhen # Shenzhen Elink Technology Co., LTD 54:F5:B6 Oriental # ORIENTAL PACIFIC INTERNATIONAL LIMITED 54:F6:66 Berthold # Berthold Technologies GmbH and Co.KG +54:FA:3E SamsungE # Samsung Electronics Co.,LTD 54:FB:58 Wiseware # WISEWARE, Lda 54:FD:BF ScheidtB # Scheidt & Bachmann GmbH +54:FF:CF MopriaAl # Mopria Alliance 56:58:57 AculabPl # Aculab plc audio bridges 58:05:28 LabrisNe # LABRIS NETWORKS 58:05:56 Elettron # Elettronica GF S.r.L. @@ -19706,6 +19826,7 @@ 58:17:0C SonyEric # Sony Ericsson Mobile Communications AB 58:1C:BD Affinegy 58:1D:91 Advanced # Advanced Mobile Telecom co.,ltd. +58:1F:67 Open-MTe # Open-m technology limited 58:1F:AA Apple 58:1F:EF Tuttnaer # Tuttnaer LTD 58:23:8C Technico # Technicolor CH USA @@ -19785,6 +19906,7 @@ 58:F6:7B XiaMenUn # Xia Men UnionCore Technology LTD. 58:F6:BF KyotoUni # Kyoto University 58:F9:8E Secudos # SECUDOS GmbH +58:FC:DB IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 58:FD:20 BravidaS # Bravida Sakerhet AB 5C:02:6A AppliedV # Applied Vision Corporation 5C:07:6F ThoughtC # Thought Creator @@ -19793,6 +19915,7 @@ 5C:0E:8B Motorola 5C:11:93 SealOne # Seal One AG 5C:14:37 Thyssenk # Thyssenkrupp Aufzugswerke GmbH +5C:15:15 Advan 5C:15:E1 AidcTech # AIDC TECHNOLOGY (S) PTE LTD 5C:16:C7 BigSwitc # Big Switch Networks 5C:17:37 I-ViewNo # I-View Now, LLC. @@ -19804,6 +19927,7 @@ 5C:25:4C AvireGlo # Avire Global Pte Ltd 5C:26:0A Dell # Dell Inc. 5C:2A:EF OpenAcce # Open Access Pty Ltd +5C:2E:59 SamsungE # Samsung Electronics Co.,Ltd 5C:31:3E TexasIns # Texas Instruments 5C:33:27 SpazioIt # Spazio Italia srl 5C:33:5C Swisspho # Swissphone Telecom AG @@ -19823,6 +19947,7 @@ 5C:57:1A ArrisGro # ARRIS Group, Inc. 5C:57:C8 Nokia # Nokia Corporation 5C:59:48 Apple +5C:5B:C2 Yik # YIK Corporation 5C:5E:AB JuniperN # Juniper Networks 5C:63:BF Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 5C:69:84 Nuvico @@ -19836,6 +19961,8 @@ 5C:86:4A SecretLa # Secret Labs LLC 5C:87:78 Cybertel # Cybertelbridge co.,ltd 5C:89:D4 BeijingB # Beijing Banner Electric Co.,Ltd +5C:8D:4E Apple +5C:93:A2 LiteonTe # Liteon Technology Corporation 5C:95:AE Apple 5C:96:9D Apple 5C:9A:D8 Fujitsu # Fujitsu Limited @@ -19844,6 +19971,8 @@ 5C:A4:8A Cisco 5C:AC:4C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 5C:B5:24 SonyEric # Sony Ericsson Mobile Communications AB +5C:B6:CC Novacomm # NovaComm Technologies Inc. +5C:B8:CB AllisCom # Allis Communications 5C:BD:9E Hongkong # HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED 5C:C2:13 FrSauter # Fr. Sauter AG 5C:C5:D4 IntelCor # Intel Corporate @@ -19876,9 +20005,12 @@ 5C:F6:DC SamsungE # Samsung Electronics Co.,LTD 5C:F8:A1 MurataMa # Murata Manufactuaring Co.,Ltd. 5C:F9:38 Apple # Apple, Inc +5C:F9:6A HuaweiTe # Huawei Technologies Co., Ltd 5C:F9:DD Dell # Dell Inc +5C:F9:F0 AtomosEn # Atomos Engineering P/L 5C:FF:35 Wistron # Wistron Corporation 5C:FF:FF Shenzhen # Shenzhen Kezhonglong Optoelectronic Technology Co., Ltd +60:02:92 Pegatron # PEGATRON CORPORATION 60:02:B4 WistronN # Wistron NeWeb Corp. 60:03:08 Apple 60:03:47 BillionE # Billion Electric Co. Ltd. @@ -19898,6 +20030,7 @@ 60:32:F0 MplusTec # Mplus technology 60:33:4B Apple 60:35:53 BuwonTec # Buwon Technology +60:36:96 Sapling # The Sapling Company 60:36:DD IntelCor # Intel Corporate 60:38:0E AlpsElec # Alps Electric Co., 60:39:1F Abb # ABB Ltd @@ -19907,7 +20040,10 @@ 60:45:BD Microsof # Microsoft 60:46:16 XiamenVa # XIAMEN VANN INTELLIGENT CO., LTD 60:47:D4 ForicsEl # FORICS Electronic Technology Co., Ltd. +60:48:26 Newbridg # Newbridge Technologies Int. Ltd. 60:4A:1C Suyin # SUYIN Corporation +60:50:C1 KinetekS # Kinetek Sports +60:51:2C TctMobil # TCT mobile limited 60:52:D0 FactsEng # FACTS Engineering 60:54:64 EyedroGr # Eyedro Green Solutions Inc. 60:57:18 IntelCor # Intel Corporate @@ -19922,7 +20058,9 @@ 60:73:5C Cisco 60:74:8D AtmacaEl # Atmaca Elektronik 60:76:88 Velodyne +60:77:E2 SamsungE # Samsung Electronics Co.,Ltd 60:81:2B CustomCo # Custom Control Concepts +60:81:F9 Helium # Helium Systems, Inc 60:83:B2 GkwareEK # GkWare e.K. 60:84:3B Soladigm # Soladigm, Inc. 60:86:45 AveryWei # Avery Weigh-Tronix, LLC @@ -19940,6 +20078,7 @@ 60:9F:9D Cloudswi # CloudSwitch 60:A1:0A SamsungE # Samsung Electronics Co.,Ltd 60:A4:4C AsustekC # ASUSTek COMPUTER INC. +60:A8:FE NokiaSol # Nokia Solutions and Networks 60:A9:B0 Merchand # Merchandising Technologies, Inc 60:B1:85 AthSyste # ATH system 60:B3:C4 ElberSrl # Elber Srl @@ -19951,11 +20090,13 @@ 60:BC:4C EwmHight # EWM Hightec Welding GmbH 60:BD:91 MoveInno # Move Innovation 60:BE:B5 Motorola # Motorola Mobility LLC +60:C1:CB FujianGr # Fujian Great Power PLC Equipment Co.,Ltd 60:C3:97 2wire # 2Wire Inc 60:C5:47 Apple 60:C5:A8 BeijingL # Beijing LT Honway Technology Co.,Ltd 60:C9:80 Trymus 60:CB:FB Airscape # AirScape Inc. +60:CD:A9 Abloomy 60:CD:C5 TaiwanCa # Taiwan Carol Electronics., Ltd 60:D0:A9 SamsungE # Samsung Electronics Co.,Ltd 60:D1:AA VishalTe # Vishal Telecommunications Pvt Ltd @@ -19968,6 +20109,7 @@ 60:DE:44 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 60:E0:0E ShinseiE # SHINSEI ELECTRONICS CO LTD 60:E3:27 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +60:E7:01 HuaweiTe # Huawei Technologies Co., Ltd 60:E9:56 AylaNetw # Ayla Networks, Inc 60:EB:69 QuantaCo # Quanta computer Inc. 60:F1:3D Jablocom # JABLOCOM s.r.o. @@ -19987,6 +20129,7 @@ 64:00:F1 Cisco # CISCO SYSTEMS, INC. 64:05:BE NewLight # NEW LIGHT LED 64:09:4C BeijingS # Beijing Superbee Wireless Technology Co.,Ltd +64:09:80 XiaomiEl # XIAOMI Electronics,CO.,LTD 64:0B:4A DigitalT # Digital Telecom Technology Limited 64:0E:36 Taztag 64:0E:94 Pluribus # Pluribus Networks, Inc. @@ -20014,6 +20157,8 @@ 64:4B:F0 Caldigit # CalDigit, Inc 64:4D:70 Dspace # dSPACE GmbH 64:4F:74 Lenus # LENUS Co., Ltd. +64:4F:B0 HyunjinC # Hyunjin.com +64:51:06 HewlettP # Hewlett Packard 64:51:7E LongBenD # LONG BEN (DONGGUAN) ELECTRONIC TECHNOLOGY CO.,LTD. 64:52:99 Chamberl # The Chamberlain Group, Inc 64:53:5D Frausche # Frauscher Sensortechnik @@ -20027,11 +20172,13 @@ 64:5E:BE Yahoo!Ja # Yahoo! JAPAN 64:5F:FF NicoletN # Nicolet Neuro 64:62:23 Cellient # Cellient Co., Ltd. +64:64:9B JuniperN # juniper networks 64:65:C0 Nuvon # Nuvon, Inc 64:66:B3 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 64:67:07 BeijingO # Beijing Omnific Technology, Ltd. 64:68:0C Comtrend 64:69:BC HyteraCo # Hytera Communications Co .,ltd +64:6C:B2 SamsungE # Samsung Electronics Co.,Ltd 64:6E:6C RadioDat # Radio Datacom LLC 64:6E:EA Iskratel # Iskratel d.o.o. 64:70:02 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. @@ -20070,6 +20217,7 @@ 64:AE:88 Polytec # Polytec GmbH 64:B3:10 SamsungE # Samsung Electronics Co.,Ltd 64:B3:70 Powercom # PowerComm Solutons LLC +64:B4:73 Xiaomi # Xiaomi inc. 64:B6:4A Vivotech # ViVOtech, Inc. 64:B9:E8 Apple 64:BA:BD SdjTechn # SDJ Technologies, Inc. @@ -20085,6 +20233,7 @@ 64:D4:DA IntelCor # Intel Corporate 64:D8:14 Cisco # CISCO SYSTEMS, INC. 64:D9:12 Solidica # Solidica, Inc. +64:D9:54 TaicangA # TAICANG AND W ELECTRONICS CO LTD 64:D9:89 Cisco # CISCO SYSTEMS, INC. 64:DB:18 Openpatt # OpenPattern 64:DC:01 StaticGr # Static Systems Group PLC @@ -20097,6 +20246,7 @@ 64:E8:92 MorioDen # Morio Denki Co., Ltd. 64:E8:E6 GlobalMo # global moisture management system 64:E9:50 Cisco +64:EA:C5 Sibotech # SiboTech Automation Co., Ltd. 64:EB:8C SeikoEps # Seiko Epson Corporation 64:ED:57 ArrisGro # ARRIS Group, Inc. 64:ED:62 Woori # WOORI SYSTEMS Co., Ltd @@ -20105,6 +20255,7 @@ 64:F9:70 KenadeEl # Kenade Electronics Technology Co.,LTD. 64:F9:87 Avvasi # Avvasi Inc. 64:FC:8C Zonar # Zonar Systems +68:05:71 SamsungE # Samsung Electronics Co.,Ltd 68:05:CA IntelCor # Intel Corporate 68:09:27 Apple 68:0A:D7 Yancheng # Yancheng Kecheng Optoelectronic Technology Co., Ltd @@ -20140,6 +20291,7 @@ 68:69:2E Zycoo # Zycoo Co.,Ltd 68:69:F2 ComapSRO # ComAp s.r.o. 68:6E:23 Wi3 # Wi3 Inc. +68:6E:48 ProphetE # Prophet Electronic Technology Corp.,Ltd 68:72:51 Ubiquiti # Ubiquiti Networks 68:76:4F SonyMobi # Sony Mobile Communications AB 68:78:48 Westunit # Westunitis Co., Ltd. @@ -20164,6 +20316,7 @@ 68:97:E8 SocietyO # Society of Motion Picture & Television Engineers 68:9C:5E AcsipTec # AcSiP Technology Corp. 68:9C:70 Apple +68:A0:F6 HuaweiTe # Huawei Technologies Co., Ltd 68:A1:B7 HonghaoM # Honghao Mingchuan Technology (Beijing) CO.,Ltd. 68:A3:C4 LiteonTe # Liteon Technology Corporation 68:A4:0E BshBosch # BSH Bosch and Siemens Home Appliances GmbH @@ -20201,6 +20354,7 @@ 68:F8:95 Redflow # Redflow Limited 68:FB:95 Generalp # Generalplus Technology Inc. 68:FC:B3 NextLeve # Next Level Security Systems, Inc. +6C:02:73 Shenzhen # Shenzhen Jin Yun Video Equipment Co., Ltd. 6C:04:60 RbhAcces # RBH Access Technologies Inc. 6C:09:D6 Digiques # Digiquest Electronics LTD 6C:0E:0D SonyEric # Sony Ericsson Mobile Communications AB @@ -20208,6 +20362,7 @@ 6C:14:F7 Erhardt+ # Erhardt+Leimer GmbH 6C:15:F9 Nautroni # Nautronix Limited 6C:18:11 DecaturE # Decatur Electronics +6C:19:8F D-LinkIn # D-Link International 6C:20:56 Cisco 6C:22:AB Ainswort # Ainsworth Game Technology 6C:23:B9 SonyEric # Sony Ericsson Mobile Communications AB @@ -20215,6 +20370,7 @@ 6C:2C:06 OooNppSy # OOO NPP Systemotechnika-NN 6C:2E:33 Accelink # Accelink Technologies Co.,Ltd. 6C:2E:85 Sagemcom +6C:2F:2C SamsungE # Samsung Electronics Co.,Ltd 6C:32:DE IndieonT # Indieon Technologies Pvt. Ltd. 6C:33:A9 Magicjac # Magicjack LP 6C:39:1D BeijingZ # Beijing ZhongHuaHun Network Information center @@ -20237,10 +20393,12 @@ 6C:61:26 RinicomH # Rinicom Holdings 6C:62:6D Micro-St # Micro-Star INT'L CO., LTD 6C:64:1A PenguinC # Penguin Computing +6C:6E:FE CoreLogi # Core Logic Inc. 6C:6F:18 Stereota # Stereotaxis, Inc. 6C:70:39 Novar # Novar GmbH 6C:70:9F Apple 6C:71:D9 Azurewav # AzureWave Technologies, Inc +6C:76:60 Kyocera # KYOCERA Corporation 6C:81:FE Mitsuba # Mitsuba Corporation 6C:83:36 SamsungE # Samsung Electronics Co.,Ltd 6C:83:66 NanjingS # Nanjing SAC Power Grid Automation Co., Ltd. @@ -20268,11 +20426,14 @@ 6C:AD:EF KzBroadb # KZ Broadband Technologies, Ltd. 6C:AD:F8 Azurewav # Azurewave Technologies, Inc. 6C:AE:8B Ibm # IBM Corporation +6C:B0:CE Netgear 6C:B3:11 Shenzhen # Shenzhen Lianrui Electronics Co.,Ltd 6C:B3:50 AnhuiCom # Anhui comhigher tech co.,ltd 6C:B7:F4 SamsungE # Samsung Electronics Co.,Ltd 6C:BE:E9 Alcatel- # Alcatel-Lucent-IPD +6C:BF:B5 NoonTech # Noon Technology Co., Ltd 6C:C1:D2 ArrisGro # ARRIS Group, Inc. +6C:C2:17 HewlettP # Hewlett Packard 6C:C2:6B Apple 6C:D0:32 LgElectr # LG Electronics 6C:D1:46 SmartekD # Smartek d.o.o. @@ -20291,6 +20452,7 @@ 6C:F3:7F ArubaNet # Aruba Networks 6C:F9:7C Nanoptix # Nanoptix Inc. 6C:FA:58 Avaya # Avaya, Inc +6C:FA:89 Cisco 6C:FA:A7 AmpakTec # AMPAK Technology Inc. 6C:FD:B9 ProwareT # Proware Technologies Co Ltd. 6C:FF:BE MpbCommu # MPB Communications Inc. @@ -20310,6 +20472,7 @@ 70:25:59 Cybertan # CyberTAN Technology, Inc. 70:2B:1D E-DomusI # E-Domus International Limited 70:2C:1F Wisol +70:2D:D1 NewingsC # Newings Communication CO., LTD. 70:2F:4B Polyvisi # PolyVision Inc. 70:2F:97 AavaMobi # Aava Mobile Oy 70:30:18 Avaya # Avaya, Inc @@ -20337,6 +20500,7 @@ 70:59:57 Medallio # Medallion Instrumentation Systems 70:59:86 OooTtv # OOO TTV 70:5A:B6 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. +70:5B:2E M2commun # M2Communication Inc. 70:5C:AD KonamiGa # Konami Gaming Inc 70:5E:AA ActionTa # Action Target, Inc. 70:60:DE Lavision # LaVision GmbH @@ -20348,6 +20512,7 @@ 70:70:4C PurpleCo # Purple Communications, Inc 70:71:B3 Brain # Brain Corporation 70:71:BC Pegatron # PEGATRON CORPORATION +70:72:0D LenovoMo # Lenovo Mobile Communication Technology Ltd. 70:72:3C HuaweiTe # Huawei Technologies Co., Ltd 70:72:CF Edgecore # EdgeCore Networks 70:73:CB Apple @@ -20377,17 +20542,29 @@ 70:A6:6A ProxDyna # Prox Dynamics AS 70:A8:E3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 70:AA:B2 Research # Research In Motion +70:AF:25 Nishiyam # Nishiyama Industry Co.,LTD. 70:B0:35 Shenzhen # Shenzhen Zowee Technology Co., Ltd 70:B0:8C ShenouCo # Shenou Communication Equipment Co.,Ltd 70:B1:4E Pace # Pace plc 70:B2:65 HiltronS # Hiltron s.r.l. 70:B3:D5 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see OUI36 public listing for more information. +70:B3:D5:01:00:00/36 HanwaEle # Hanwa Electronic Ind.Co.,Ltd. +70:B3:D5:01:60:00/36 Guardian # Guardian Controls International Ltd +70:B3:D5:01:D0:00/36 WeiglEle # Weigl Elektronik & Mediaprojekte +70:B3:D5:02:50:00/36 ElsuhdNe # Elsuhd Net Ltd Co. +70:B3:D5:02:90:00/36 MarimoEl # Marimo electronics Co.,Ltd. +70:B3:D5:03:B0:00/36 Ssl-Elec # SSL - Electrical Aerospace Ground Equipment Section 70:B3:D5:04:40:00/36 DonElect # Don Electronics Ltd 70:B3:D5:05:20:00/36 SudoPrem # Sudo Premium Engineering +70:B3:D5:05:80:00/36 TelinkSe # Telink Semiconductor CO, Limtied, Taiwan 70:B3:D5:07:70:00/36 Inaccess # InAccess Networks SA 70:B3:D5:09:00:00/36 Powercra # POWERCRAFT ELECTRONICS PVT. LTD. +70:B3:D5:09:90:00/36 Schwer+K # Schwer+Kopka GmbH 70:B3:D5:0A:90:00/36 Proconne # ProConnections, Inc. 70:B3:D5:0A:A0:00/36 Wanco # Wanco Inc +70:B3:D5:0B:30:00/36 ReonixAu # Reonix Automation +70:B3:D5:0C:00:00/36 MoluTech # Molu Technology Inc., LTD. +70:B3:D5:0D:60:00/36 TattileS # TATTILE SRL 70:B3:D5:0E:00:00/36 Plcis 70:B3:D5:0F:00:00/36 Avionica 70:B3:D5:0F:B0:00/36 CygnusLl # Cygnus LLC @@ -20396,73 +20573,206 @@ 70:B3:D5:18:30:00/36 EvcoSPA # Evco S.p.a. 70:B3:D5:18:40:00/36 Xv360Opt # XV360 Optical Information Systems Ltd. 70:B3:D5:19:00:00/36 FantomWi # Fantom Wireless, Inc. +70:B3:D5:19:C0:00/36 Kubu # Kubu, Inc. 70:B3:D5:1A:C0:00/36 SvpBroad # SVP Broadcast Microwave S.L. +70:B3:D5:20:40:00/36 Twc +70:B3:D5:20:C0:00/36 SiemensH # Siemens Healthcare Diagnostics +70:B3:D5:23:C0:00/36 Quasonix # Quasonix, LLC +70:B3:D5:25:00:00/36 DatumEle # Datum Electronics Limited +70:B3:D5:28:E0:00/36 TexCompu # TEX COMPUTER SRL 70:B3:D5:28:F0:00/36 Overline # Overline Systems 70:B3:D5:29:D0:00/36 Xtech2Si # XTech2 SIA +70:B3:D5:2A:50:00/36 Taitotek # Taitotekniikka +70:B3:D5:2D:40:00/36 Ct # CT Company +70:B3:D5:2D:A0:00/36 SkywaveN # Skywave Networks Private Limited +70:B3:D5:2E:30:00/36 Meiknolo # Meiknologic GmbH +70:B3:D5:2F:00:00/36 Clock-O- # Clock-O-Matic +70:B3:D5:2F:D0:00/36 SpecialP # Special Projects Group, Inc +70:B3:D5:30:50:00/36 CaitronI # CAITRON Industrial Solutions GmbH 70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC. +70:B3:D5:32:30:00/36 TattileS # TATTILE SRL +70:B3:D5:33:C0:00/36 Videri # Videri Inc. +70:B3:D5:34:60:00/36 Ultamati # Ultamation Limited +70:B3:D5:34:A0:00/36 PavoTasa # PAVO TASARIM ÜRETİM TİC A.Ş. 70:B3:D5:35:C0:00/36 AcsElect # ACS electronics srl 70:B3:D5:35:F0:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:36:20:00/36 Asiga +70:B3:D5:36:D0:00/36 Cybertea # Cyberteam Sp z o o +70:B3:D5:39:B0:00/36 Iroc # IROC AB 70:B3:D5:3A:80:00/36 Jamhub # JamHub Corp. 70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc. +70:B3:D5:3C:E0:00/36 Aditec # Aditec GmbH 70:B3:D5:3D:E0:00/36 ElomacEl # ELOMAC Elektronik GmbH +70:B3:D5:3D:F0:00/36 Multidyn # MultiDyne +70:B3:D5:3E:10:00/36 Barnstor # Barnstormer Softworks +70:B3:D5:3E:50:00/36 Ateme 70:B3:D5:3E:D0:00/36 UltraEle # Ultra Electronics Sonar System Division +70:B3:D5:3E:F0:00/36 VtronPty # Vtron Pty Ltd 70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada 70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc. 70:B3:D5:42:F0:00/36 Sintokog # SINTOKOGIO, LTD 70:B3:D5:43:30:00/36 Flexsolu # Flexsolution APS +70:B3:D5:43:D0:00/36 VeryxTec # Veryx Technologies Private Limited +70:B3:D5:45:E0:00/36 Esol # eSOL Co.,Ltd. 70:B3:D5:4C:10:00/36 QuercusT # QUERCUS TECHNOLOGIES, S. L. 70:B3:D5:4C:80:00/36 Hosokawa # Hosokawa Micron Powder Systems +70:B3:D5:50:10:00/36 PeekTraf # PEEK TRAFFIC +70:B3:D5:50:70:00/36 HumanOri # Human Oriented Technology, Inc. 70:B3:D5:51:D0:00/36 TecnintH # Tecnint HTE Srl 70:B3:D5:51:E0:00/36 Fundació # Fundación Cardiovascular de Colombia +70:B3:D5:54:D0:00/36 QingdaoH # Qingdao Haitian Weiye Automation Control System Co., Ltd +70:B3:D5:54:E0:00/36 RflElect # RFL Electronics, Inc. +70:B3:D5:55:90:00/36 EagleMou # Eagle Mountain Technology +70:B3:D5:55:D0:00/36 Lunanexu # LunaNexus Inc +70:B3:D5:56:40:00/36 Christma # christmann informationstechnik + medien GmbH & Co. KG +70:B3:D5:57:B0:00/36 Elamakat # ELAMAKATO GmbH +70:B3:D5:58:70:00/36 IncaaCom # INCAA Computers 70:B3:D5:5A:80:00/36 Farmobil # Farmobile +70:B3:D5:5A:A0:00/36 ChugokuE # Chugoku Electric Manufacturing Co.,Inc +70:B3:D5:5B:50:00/36 LehighEl # Lehigh Electric Products Co 70:B3:D5:5E:80:00/36 Vitec +70:B3:D5:5F:00:00/36 Managee # managee GmbH & Co KG +70:B3:D5:60:B0:00/36 Edgeware # Edgeware AB +70:B3:D5:60:C0:00/36 IstElekt # IST ElektronikgesmbH 70:B3:D5:61:F0:00/36 Labotect # Labotect Labor-Technik-Göttingen GmbH 70:B3:D5:62:50:00/36 VxInstru # VX Instruments GmbH +70:B3:D5:63:40:00/36 Idaqs # idaqs Co.,Ltd. +70:B3:D5:65:50:00/36 AotSyste # AOT System GmbH +70:B3:D5:68:20:00/36 Rosslare # Rosslare Enterprises Limited 70:B3:D5:6B:60:00/36 Inradios # INRADIOS GmbH 70:B3:D5:6D:30:00/36 Deuta-We # DEUTA-WERKE GmbH +70:B3:D5:6D:90:00/36 Vectare # VECTARE Inc +70:B3:D5:6E:50:00/36 Deuta-We # DEUTA-WERKE GmbH +70:B3:D5:6F:20:00/36 P&CMicro # P&C Micro's Pty Ltd +70:B3:D5:6F:60:00/36 AccoBran # Acco Brands Europe 70:B3:D5:70:20:00/36 SensorHi # Sensor Highway Ltd +70:B3:D5:70:80:00/36 IbmResea # IBM Research GmbH +70:B3:D5:70:90:00/36 Aml +70:B3:D5:71:00:00/36 Guardian # Guardian Controls International Ltd +70:B3:D5:73:10:00/36 Phoniro # Phoniro Systems AB +70:B3:D5:75:10:00/36 Gnf +70:B3:D5:75:50:00/36 Landmark # LandmarkTech Systems Technology Co.,Ltd. 70:B3:D5:79:A0:00/36 Innerspe # Innerspec Technologies Inc. +70:B3:D5:7A:90:00/36 Adidas # adidas AG +70:B3:D5:7E:70:00/36 Atessa # Atessa, Inc. 70:B3:D5:80:F0:00/36 Quickwar # Quickware Eng & Des LLC 70:B3:D5:81:40:00/36 Ingenieu # Ingenieurbuero SOMTRONIK +70:B3:D5:81:90:00/36 «Intelle # «Intellect module» LLC +70:B3:D5:82:C0:00/36 Nels # NELS Ltd. +70:B3:D5:83:B0:00/36 Telefoni # Telefonix Incorporated +70:B3:D5:86:D0:00/36 CensusDi # Census Digital Incorporated 70:B3:D5:87:10:00/36 OsoTechn # Oso Technologies +70:B3:D5:8A:B0:00/36 Emac # EMAC, Inc. 70:B3:D5:8B:10:00/36 M-TechIn # M-Tech Innovations Ltd +70:B3:D5:8C:E0:00/36 Cores # CORES Corporation +70:B3:D5:8D:C0:00/36 NiveoInt # Niveo International BV +70:B3:D5:8F:50:00/36 Stmovic 70:B3:D5:90:80:00/36 Accusoni # Accusonic 70:B3:D5:91:80:00/36 GlovaRai # Glova Rail A/S +70:B3:D5:93:60:00/36 FaroTech # FARO TECHNOLOGIES, INC. +70:B3:D5:94:10:00/36 Triax # Triax A/S +70:B3:D5:95:60:00/36 Aerovisi # AeroVision Avionics, Inc. +70:B3:D5:95:A0:00/36 SigmannE # Sigmann Elektronik GmbH +70:B3:D5:96:F0:00/36 4cam # 4CAM GmbH +70:B3:D5:98:60:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:99:40:00/36 KeffNetw # KeFF Networks 70:B3:D5:9A:70:00/36 Honeywel # Honeywell 70:B3:D5:9F:40:00/36 TbandSrl # Tband srl 70:B3:D5:A0:B0:00/36 Ambihome # ambiHome GmbH 70:B3:D5:A0:E0:00/36 Vetaphon # Vetaphone A/S +70:B3:D5:A1:50:00/36 Intercor # Intercore GmbH 70:B3:D5:A2:F0:00/36 Botek # Botek Systems AB +70:B3:D5:A4:00:00/36 StrackLi # STRACK LIFT AUTOMATION GmbH +70:B3:D5:A5:70:00/36 Pcsc +70:B3:D5:A6:20:00/36 Environe # Environexus +70:B3:D5:A7:A0:00/36 FluidMan # Fluid Management Technology +70:B3:D5:AA:00:00/36 SimpleWo # Simple Works, Inc. +70:B3:D5:AB:70:00/36 Siglead # SIGLEAD INC +70:B3:D5:AB:C0:00/36 Bkm-Micr # BKM-Micronic Richtfunkanlagen GmbH +70:B3:D5:AB:F0:00/36 AgrInter # AGR International +70:B3:D5:AC:80:00/36 Heartlan # Heartland.Data Inc. +70:B3:D5:AD:D0:00/36 GhlBerha # GHL Systems Berhad +70:B3:D5:AE:20:00/36 TransasM # Transas Marine International 70:B3:D5:AE:90:00/36 CariElec # Cari Electronic +70:B3:D5:AE:E0:00/36 DitestFa # DiTEST Fahrzeugdiagnose GmbH +70:B3:D5:B0:80:00/36 Secuinfo # Secuinfo Co. Ltd 70:B3:D5:B1:50:00/36 EtaBetaS # Eta Beta Srl +70:B3:D5:B1:60:00/36 XiAnShen # XI'AN SHENMING ELECTRON TECHNOLOGY CO.,LTD 70:B3:D5:B2:A0:00/36 MyroCont # Myro Control, LLC +70:B3:D5:B3:30:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:B3:90:00/36 MbConnec # MB Connect Line GmbH +70:B3:D5:B3:C0:00/36 DorletSa # DORLET SAU 70:B3:D5:B3:D0:00/36 Inras # Inras GmbH +70:B3:D5:B8:80:00/36 Arp # ARP Corporation 70:B3:D5:B8:A0:00/36 NexusTec # Nexus Tech. VN +70:B3:D5:B8:C0:00/36 EpointEm # ePOINT Embedded Computing Limited 70:B3:D5:BB:20:00/36 Mettler- # Mettler-Toledo Hi-Speed +70:B3:D5:BB:D0:00/36 Providiu # Providius Corp +70:B3:D5:BB:E0:00/36 SunriseE # Sunrise Systems Electronics Co. Inc. +70:B3:D5:BC:60:00/36 Hattelan # Hatteland Display AS +70:B3:D5:BC:A0:00/36 DeymedDi # Deymed Diagnostic +70:B3:D5:BD:A0:00/36 5-D # 5-D Systems, Inc. +70:B3:D5:C2:40:00/36 ElbitOfA # Elbit Systems of America 70:B3:D5:C2:70:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS 70:B3:D5:C2:C0:00/36 DromontS # Dromont S.p.A. +70:B3:D5:C4:30:00/36 FutureSk # Future Skies +70:B3:D5:C5:80:00/36 RmiLaser # RMI Laser LLC +70:B3:D5:C6:D0:00/36 CyvizAs # Cyviz AS +70:B3:D5:C7:80:00/36 NetaElek # NETA Elektronik AS +70:B3:D5:C8:10:00/36 DspDesig # DSP DESIGN 70:B3:D5:C8:D0:00/36 KstTechn # KST Technology +70:B3:D5:C9:60:00/36 UniDimen # UNI DIMENXI SDN BHD +70:B3:D5:CB:70:00/36 Hkc # HKC Limited +70:B3:D5:CB:C0:00/36 ProconEl # Procon Electronics Pty Ltd 70:B3:D5:CE:90:00/36 Kinemetr # KINEMETRICS +70:B3:D5:CF:10:00/36 Lightdec # LightDec GmbH & Co. KG +70:B3:D5:D1:E0:00/36 HoustonR # Houston Radar LLC 70:B3:D5:D4:70:00/36 Yotascop # YotaScope Technologies Co., Ltd. 70:B3:D5:D4:E0:00/36 Flsmidth 70:B3:D5:D8:60:00/36 WpgsysPt # WPGSYS Pte Ltd 70:B3:D5:D8:B0:00/36 LenoxiAu # Lenoxi Automation s.r.o. +70:B3:D5:D8:F0:00/36 MoluTech # Molu Technology Inc., LTD. 70:B3:D5:D9:E0:00/36 GrupoEpe # GRUPO EPELSA S.L. +70:B3:D5:DA:10:00/36 QprelSrl # Qprel srl +70:B3:D5:DC:50:00/36 ExcelMed # Excel Medical Electronics LLC 70:B3:D5:DD:D0:00/36 BioRadLa # BIO RAD LABORATORIES +70:B3:D5:DE:C0:00/36 Condev-A # Condev-Automation GmbH +70:B3:D5:DF:30:00/36 SpcBiocl # SPC Bioclinicum +70:B3:D5:E0:70:00/36 BaaderPl # Baader Planetarium GmbH 70:B3:D5:E0:80:00/36 Olssen +70:B3:D5:E2:60:00/36 Feitian # FEITIAN CO.,LTD. +70:B3:D5:E2:70:00/36 Woodside # Woodside Electronics +70:B3:D5:E4:A0:00/36 IcpNewte # ICP NewTech Ltd +70:B3:D5:E4:C0:00/36 Iai-Isra # IAI-Israel Aerospace Industries MBT +70:B3:D5:E5:30:00/36 Mi # MI INC. +70:B3:D5:E7:40:00/36 Exfronti # Exfrontier Co., Ltd. +70:B3:D5:E9:90:00/36 Advitron # Advitronics telecom bv +70:B3:D5:E9:A0:00/36 MetaComp # Meta Computing Services, Corp 70:B3:D5:EB:00:00/36 NautelLi # Nautel Limted +70:B3:D5:EB:20:00/36 ShooterD # Shooter Detection Systems 70:B3:D5:EC:D0:00/36 Sbs-Fein # SBS-Feintechnik GmbH & Co. KG +70:B3:D5:EC:F0:00/36 Ipitek 70:B3:D5:ED:C0:00/36 JDKoftin # J.D. Koftinoff Software, Ltd. 70:B3:D5:ED:D0:00/36 SolarNet # Solar Network & Partners +70:B3:D5:EE:40:00/36 O-NetAut # O-Net Automation Technology (Shenzhen)Limited +70:B3:D5:EF:20:00/36 Kongsber # Kongsberg Intergrated Tactical Systems +70:B3:D5:EF:30:00/36 Octoscop # octoScope 70:B3:D5:EF:90:00/36 Critical # Critical Link +70:B3:D5:EF:A0:00/36 NexteraE # NextEra Energy Resources, LLC +70:B3:D5:F2:A0:00/36 WibondIn # WIBOND Informationssysteme GmbH +70:B3:D5:F2:B0:00/36 Sensys # SENSYS GmbH 70:B3:D5:F3:40:00/36 MacgrayS # MacGray Services 70:B3:D5:F3:80:00/36 Scanvaeg # Scanvaegt Nordic A/S 70:B3:D5:F6:10:00/36 PowerDia # Power Diagnostic Service 70:B3:D5:F6:20:00/36 Frs # FRS GmbH & Co. KG 70:B3:D5:F6:30:00/36 ArsProdu # Ars Products +70:B3:D5:F6:80:00/36 AlZajelM # AL ZAJEL MODERN TELECOMM +70:B3:D5:FA:10:00/36 BbiEngin # BBI Engineering, Inc. 70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA +70:B3:D5:FC:50:00/36 Eltwin # Eltwin A/S 70:B3:D5:FD:10:00/36 Redrat # RedRat Ltd +70:B3:D5:FD:30:00/36 AkisTech # AKIS technologies +70:B3:D5:FD:A0:00/36 AcdElekt # ACD Elektronik GmbH 70:B5:99 Embedded # Embedded Technologies s.r.o. 70:B9:21 Fiberhom # FiberHome Telecommunication Technologies CO.,LTD 70:C6:AC BoschAut # Bosch Automotive Aftermarket @@ -20482,6 +20792,7 @@ 70:E8:43 BeijingC # Beijing C&W Optical Communication Technology Co.,Ltd. 70:EE:50 Netatmo 70:F1:76 DataModu # Data Modul AG +70:F1:96 Actionte # Actiontec Electronics, Inc 70:F1:A1 LiteonTe # Liteon Technology Corporation 70:F1:E5 Xetawave # Xetawave LLC 70:F3:95 Universa # Universal Global Scientific Industrial Co., Ltd. @@ -20537,6 +20848,7 @@ 74:8E:08 Bestek # Bestek Corp. 74:8E:F8 BrocadeC # Brocade Communications Systems, Inc. 74:8F:1B Masterim # MasterImage 3D +74:8F:4D MenMikro # MEN Mikro Elektronik GmbH 74:90:50 RenesasE # Renesas Electronics Corporation 74:91:1A RuckusWi # Ruckus Wireless 74:93:A4 ZebraTec # Zebra Technologies Corp. @@ -20563,6 +20875,8 @@ 74:D4:35 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 74:D6:75 WymaTecn # WYMA Tecnologia 74:D8:50 Evrisko # Evrisko Systems +74:DA:38 EdimaxTe # Edimax Technology Co. Ltd. +74:DB:D1 Ebay # Ebay Inc 74:DE:2B LiteonTe # Liteon Technology Corporation 74:E0:6E Ergophon # Ergophone GmbH 74:E1:B6 Apple @@ -20577,6 +20891,7 @@ 74:F0:6D Azurewav # AzureWave Technologies, Inc. 74:F0:7D Bncom # BnCOM Co.,Ltd 74:F1:02 BeijingH # Beijing HCHCOM Technology Co., Ltd +74:F4:13 MaxwellF # Maxwell Forest 74:F6:12 ArrisGro # ARRIS Group, Inc. 74:F7:26 NeuronRo # Neuron Robotics 74:F8:5D Berkeley # Berkeley Nucleonics Corp @@ -20595,6 +20910,7 @@ 78:1D:FD Jabil # Jabil Inc 78:1F:DB SamsungE # Samsung Electronics Co.,Ltd 78:22:3D Affirmed # Affirmed Networks +78:24:AF AsustekC # ASUSTek COMPUTER INC. 78:25:44 Omnima # Omnima Limited 78:25:AD SamsungE # SAMSUNG ELECTRONICS CO., LTD. 78:2B:CB Dell # Dell Inc @@ -20603,12 +20919,14 @@ 78:30:E1 Ultracle # UltraClenz, LLC 78:31:C1 Apple 78:32:4F Millenni # Millennium Group, Inc. +78:3A:84 Apple 78:3C:E3 Kai-Ee 78:3D:5B TelnetRe # TELNET Redes Inteligentes S.A. 78:3E:53 Bskyb # BSkyB Ltd 78:3F:15 Easysync # EasySYNC Ltd. 78:44:05 FujituHo # FUJITU(HONG KONG) ELECTRONIC Co.,LTD. 78:44:76 ZioncomT # Zioncom technology co.,ltd +78:45:61 Cybertan # CyberTAN Technology Inc. 78:45:C4 Dell # Dell Inc 78:46:C4 DaehapHy # DAEHAP HYPER-TECH 78:47:1D SamsungE # Samsung Electronics Co.,Ltd @@ -20639,10 +20957,12 @@ 78:8D:F7 HitronTe # Hitron Technologies. Inc 78:92:3E Nokia # Nokia Corporation 78:92:9C IntelCor # Intel Corporate +78:96:84 ArrisGro # ARRIS Group, Inc. 78:98:FD Q9Networ # Q9 Networks Inc. 78:99:5C NationzT # Nationz Technologies Inc 78:99:66 MusilabE # Musilab Electronics (DongGuan)Co.,Ltd. 78:99:8F Mediline # MEDILINE ITALIA SRL +78:9C:E7 Shenzhen # Shenzhen Aikede Technology Co., Ltd 78:9E:D0 SamsungE # Samsung Electronics 78:9F:4C Hoerbige # HOERBIGER Elektronik GmbH 78:9F:87 SiemensI # Siemens AG I IA PP PRM @@ -20702,6 +21022,7 @@ 78:F5:FD HuaweiTe # Huawei Technologies Co., Ltd 78:F7:BE SamsungE # Samsung Electronics Co.,Ltd 78:F7:D0 Silverbr # Silverbrook Research +78:FD:94 Apple 78:FE:3D JuniperN # Juniper Networks 78:FE:41 SocusNet # Socus networks 78:FE:E2 Shanghai # Shanghai Diveo Technology Co., Ltd @@ -20725,6 +21046,7 @@ 7C:1E:B3 2nTeleko # 2N TELEKOMUNIKACE a.s. 7C:20:48 Koamtac 7C:20:64 AlcatelL # Alcatel Lucent IPD +7C:25:87 Chaowifi # chaowifi.com 7C:2C:F3 SecureEl # Secure Electrans Ltd 7C:2E:0D Blackmag # Blackmagic Design 7C:2F:80 GigasetC # Gigaset Communications GmbH @@ -20748,14 +21070,17 @@ 7C:66:9D TexasIns # Texas Instruments 7C:69:F6 Cisco 7C:6A:B3 IbcTechn # IBC TECHNOLOGIES INC. +7C:6A:C3 Gatesair # GatesAir, Inc 7C:6A:DB Safetone # SafeTone Technology Co.,Ltd 7C:6B:33 TenyuTec # Tenyu Tech Co. Ltd. 7C:6B:52 TigaroWi # Tigaro Wireless 7C:6C:39 PixsysSr # PIXSYS SRL 7C:6C:8F AmsNeve # AMS NEVE LTD 7C:6D:62 Apple +7C:6D:F8 Apple 7C:6F:06 Caterpil # Caterpillar Trimble Control Technologies 7C:6F:F8 Shenzhen # ShenZhen ACTO Digital Video Technology Co.,Ltd. +7C:70:BC IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 7C:72:E4 UnikeyTe # Unikey Technologies 7C:76:73 Enmas # ENMAS GmbH 7C:7A:91 IntelCor # Intel Corporate @@ -20785,11 +21110,13 @@ 7C:BF:88 Mobilico # Mobilicom LTD 7C:BF:B1 ArrisGro # ARRIS Group, Inc. 7C:C3:A1 Apple +7C:C4:EF Devialet 7C:C5:37 Apple 7C:C8:AB AcroAsso # Acro Associates, Inc. 7C:C8:D0 TianjinY # TIANJIN YAAN TECHNOLOGY CO., LTD. 7C:C8:D7 Damalisk 7C:CB:0D AntairaT # Antaira Technologies, LLC +7C:CC:B8 IntelCor # Intel Corporate 7C:CD:11 Ms-Magne # MS-Magnet 7C:CD:3C Guangzho # Guangzhou Juzing Technology Co., Ltd 7C:CF:CF Shanghai # Shanghai SEARI Intelligent System Co., Ltd @@ -20805,6 +21132,7 @@ 7C:E0:44 Neon # NEON Inc 7C:E1:FF Computer # Computer Performance, Inc. DBA Digital Loggers, Inc. 7C:E4:AA Private +7C:E5:24 Quirky # Quirky, Inc. 7C:E5:6B EsenOpto # ESEN Optoelectronics Technology Co.,Ltd. 7C:E9:D3 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 7C:EB:EA Asct @@ -20827,9 +21155,11 @@ 80:0A:06 Comtec # COMTEC co.,ltd 80:0E:24 Forgetbo # ForgetBox 80:14:40 SunlitSy # Sunlit System Technology Corp +80:14:A8 Guangzho # Guangzhou V-SOLUTION Electronic Technology Co., Ltd. 80:16:B7 BrunelUn # Brunel University 80:17:7D NortelNe # Nortel Networks 80:18:A7 SamsungE # Samsung Eletronics Co., Ltd +80:19:34 IntelCor # Intel Corporate 80:1D:AA Avaya # Avaya Inc 80:1F:02 EdimaxTe # Edimax Technology Co. Ltd. 80:20:AF TradeFid # Trade FIDES, a.s. @@ -20861,9 +21191,11 @@ 80:64:59 Nimbus # Nimbus Inc. 80:65:E9 Benq # BenQ Corporation 80:66:29 Prescope # Prescope Technologies CO.,LTD. +80:6C:1B Motorola # Motorola Mobility LLC 80:6C:8B KaeserKo # KAESER KOMPRESSOREN AG 80:6C:BC NetNewEl # NET New Electronic Technology GmbH 80:71:1F JuniperN # Juniper Networks +80:71:7A HuaweiTe # Huawei Technologies Co., Ltd 80:76:93 NewagSa # Newag SA 80:79:AE Shandong # ShanDong Tecsunrise Co.,Ltd 80:7A:7F AbbGenwa # ABB Genway Xiamen Electrical Equipment CO., LTD @@ -20881,11 +21213,13 @@ 80:93:93 Xapt # Xapt GmbH 80:94:6C TokyoRad # TOKYO RADAR CORPORATION 80:96:B1 ArrisGro # ARRIS Group, Inc. +80:96:CA HonHaiPr # Hon Hai Precision Ind Co.,Ltd 80:97:1B Altenerg # Altenergy Power System,Inc. 80:9B:20 IntelCor # Intel Corporate 80:A1:D7 Shanghai # Shanghai DareGlobal Technologies Co.,Ltd 80:AA:A4 Usag 80:AD:00 CnetTech # CNET Technology Inc. (Probably an error, see instead 0080AD) +80:AD:67 KasdaDig # Kasda Digital Technology Co.,Ltd 80:B2:19 Elektron # ELEKTRON TECHNOLOGY UK LIMITED 80:B2:89 Forworld # Forworld Electronics Ltd. 80:B3:2A AlstomGr # Alstom Grid @@ -20903,22 +21237,27 @@ 80:CF:41 LenovoMo # Lenovo Mobile Communication Technology Ltd. 80:D0:19 Embed # Embed, Inc 80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd +80:D2:1D Azurewav # AzureWave Technologies, Inc 80:D4:33 Lzlabs # LzLabs GmbH 80:D7:33 QsrAutom # QSR Automations, Inc. 80:DB:31 PowerQuo # Power Quotient International Co., Ltd. 80:EA:96 Apple +80:EA:CA DialogSe # Dialog Semiconductor Hellas SA 80:EE:73 Shuttle # Shuttle Inc. 80:F2:5E Kyynel 80:F5:93 IrcoSist # IRCO Sistemas de Telecomunicación S.A. 80:F6:2E Hangzhou # Hangzhou H3C Technologies Co., Limited +80:F8:EB Raytight 80:FA:5B Clevo # CLEVO CO. 80:FB:06 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 80:FF:A8 Unidis 84:00:D2 SonyEric # Sony Ericsson Mobile Communications AB +84:01:A7 Greyware # Greyware Automation Products, Inc 84:0B:2D SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD 84:0F:45 Shanghai # Shanghai GMT Digital Technologies Co., Ltd 84:17:15 GpElectr # GP Electronics (HK) Ltd. 84:17:66 WeifangG # Weifang GoerTek Electronics Co., Ltd +84:18:3A RuckusWi # Ruckus Wireless 84:18:88 JuniperN # Juniper Networks 84:1B:38 Shenzhen # Shenzhen Excelsecu Data Technology Co.,Ltd 84:1B:5E Netgear @@ -20938,6 +21277,7 @@ 84:2B:BC Modellei # Modelleisenbahn GmbH 84:2F:75 InnokasG # Innokas Group 84:30:E5 Skyhawke # SkyHawke Technologies, LLC +84:32:EA AnhuiWan # ANHUI WANZTEN P&T CO., LTD 84:34:97 HewlettP # Hewlett Packard 84:36:11 Hyungseu # hyungseul publishing networks 84:38:35 Apple @@ -20968,6 +21308,7 @@ 84:83:71 Avaya # Avaya, Inc 84:84:33 ParadoxE # Paradox Engineering SA 84:85:06 Apple +84:85:0A HellaSon # Hella Sonnen- und Wetterschutztechnik GmbH 84:8D:84 Rajant # Rajant Corporation 84:8D:C7 CiscoSpv # Cisco SPVTG 84:8E:0C Apple @@ -20975,6 +21316,7 @@ 84:8F:69 Dell # Dell Inc. 84:90:00 ArnoldRi # Arnold & Richter Cine Technik 84:94:8C HitronTe # Hitron Technologies. Inc +84:96:D8 Pace # Pace plc 84:97:B8 Memjet # Memjet Inc. 84:9C:A6 Arcadyan # Arcadyan Technology Corporation 84:9D:C5 CenteraP # Centera Photonics Inc. @@ -21021,6 +21363,7 @@ 88:23:64 Watchnet # Watchnet DVR Inc 88:23:FE TttechCo # TTTech Computertechnik AG 88:25:2C Arcadyan # Arcadyan Technology Corporation +88:29:50 DalianNe # Dalian Netmoon Tech Develop Co.,Ltd 88:2E:5A Storone 88:30:8A MurataMa # Murata Manufactuaring Co.,Ltd. 88:32:9B SamsungE # Samsung Electro Mechanics co.,LTD. @@ -21040,8 +21383,9 @@ 88:57:6D XtaElect # XTA Electronics Ltd 88:5A:92 Cisco 88:5B:DD Aerohive # Aerohive Networks Inc. -88:5C:4F AlcatelL # Alcatel Lucent +88:5C:47 AlcatelL # Alcatel Lucent 88:61:5A SianoMob # Siano Mobile Silicon Ltd. +88:63:DF Apple 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd 88:6B:76 ChinaHop # CHINA HOPEFUL GROUP HOPEFUL ELECTRIC CO.,LTD 88:73:98 K2eTekpo # K2E Tekpoint @@ -21092,6 +21436,7 @@ 88:E8:F8 YongTaiE # YONG TAI ELECTRONIC (DONGGUAN) LTD. 88:E9:17 Tamaggo 88:ED:1C CudoComm # Cudo Communication Co., Ltd. +88:F0:31 Cisco 88:F0:77 Cisco # CISCO SYSTEMS, INC. 88:F4:88 CellonCo # cellon communications technology(shenzhen)Co.,Ltd. 88:F4:90 Jetmobil # Jetmobile Pte Ltd @@ -21115,6 +21460,7 @@ 8C:2D:AA Apple 8C:2F:39 IbaDosim # IBA Dosimetry GmbH 8C:33:30 Emfirst # EmFirst Co., Ltd. +8C:33:57 Hitevisi # HiteVision Digital Media Technology Co.,Ltd. 8C:3A:E3 LgElectr # LG Electronics 8C:3C:07 SkivaTec # Skiva Technologies, Inc. 8C:3C:4A NakayoTe # NAKAYO TELECOMMUNICATIONS,INC. @@ -21164,11 +21510,13 @@ 8C:A9:82 IntelCor # Intel Corporate 8C:AE:4C Plugable # Plugable Technologies 8C:AE:89 Y-CamSol # Y-cam Solutions Ltd +8C:B0:94 AirtechI # Airtech I&C Co., Ltd 8C:B6:4F Cisco # CISCO SYSTEMS, INC. 8C:B7:F7 Shenzhen # Shenzhen UniStrong Science & Technology Co., Ltd 8C:B8:2C IpitomyC # IPitomy Communications 8C:B8:64 AcsipTec # AcSiP Technology Corp. 8C:BE:BE XiaomiTe # Xiaomi Technology Co.,Ltd +8C:BF:9D Shanghai # Shanghai Xinyou Information Technology Ltd. Co. 8C:C1:21 Panasoni # Panasonic Corporation AVC Networks Company 8C:C5:E1 Shenzhen # ShenZhen Konka Telecommunication Technology Co.,Ltd 8C:C7:AA RadinetC # Radinet Communications Inc. @@ -21209,6 +21557,7 @@ 90:1B:0E FujitsuT # Fujitsu Technology Solutions GmbH 90:1D:27 Zte # zte corporation 90:1E:DD GreatCom # GREAT COMPUTER CORPORATION +90:20:3A BydPreci # BYD Precision Manufacture Co.,Ltd 90:20:83 GeneralE # General Engine Management Systems Ltd. 90:21:55 Htc # HTC Corporation 90:27:E4 Apple @@ -21226,6 +21575,7 @@ 90:3E:AB ArrisGro # ARRIS Group, Inc. 90:46:B7 VadaroPt # Vadaro Pte Ltd 90:47:16 Rorze # RORZE CORPORATION +90:48:9A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:49:FA Intel # Intel Corporation 90:4C:E5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:4E:2B HuaweiTe # Huawei Technologies Co., Ltd @@ -21257,6 +21607,7 @@ 90:84:0D Apple 90:88:A2 IonicsTe # IONICS TECHNOLOGY ME LTDA 90:8C:44 HKZongmu # H.K ZONGMU TECHNOLOGY CO., LTD. +90:8C:63 GzWeedon # GZ Weedong Networks Technology Co. , Ltd 90:8D:1D GhTechno # GH Technologies 90:8F:CF UnoSyste # UNO System Co., Ltd 90:90:3C TrisonTe # TRISON TECHNOLOGY CORPORATION @@ -21276,10 +21627,12 @@ 90:B1:1C Dell # Dell Inc. 90:B1:34 ArrisGro # ARRIS Group, Inc. 90:B2:1F Apple +90:B6:86 MurataMa # Murata Manufacturing Co., Ltd. 90:B8:D0 Joyent # Joyent, Inc. 90:B9:31 Apple # Apple, Inc 90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota 90:C1:15 SonyEric # Sony Ericsson Mobile Communications AB +90:C7:92 ArrisGro # ARRIS Group, Inc. 90:CC:24 Synaptic # Synaptics, Inc 90:CF:15 Nokia # Nokia Corporation 90:CF:6F Dlogixs # Dlogixs Co Ltd @@ -21290,6 +21643,7 @@ 90:D8:52 Comtec # Comtec Co., Ltd. 90:D9:2C Hug-Wits # HUG-WITSCHI AG 90:DA:4E Avanu +90:DA:6A MccSyste # MCC System Co., Ltd. 90:DB:46 E-LeadEl # E-LEAD ELECTRONIC CO., LTD 90:DF:B7 SMSSmart # s.m.s smart microwave sensors GmbH 90:E0:F0 Ieee1722 # IEEE 1722a Working Group @@ -21361,6 +21715,7 @@ 94:AA:B8 JoviewBe # Joview(Beijing) Technology Co. Ltd. 94:AC:CA TrivumTe # trivum technologies GmbH 94:AE:61 AlcatelL # Alcatel Lucent +94:AE:E3 BeldenHi # Belden Hirschmann Industries (Suzhou) Ltd. 94:B8:C5 Ruggedco # RuggedCom Inc. 94:B9:B4 AptosTec # Aptos Technology 94:BA:31 Visionte # Visiontec da Amazônia Ltda. @@ -21377,7 +21732,9 @@ 94:CC:B9 ArrisGro # ARRIS Group, Inc. 94:CD:AC Creowave # Creowave Oy 94:CE:2C SonyMobi # Sony Mobile Communications AB +94:CE:31 Cts # CTS Limited 94:D0:19 Cydle # Cydle Corp. +94:D6:0E Shenzhen # shenzhen yunmao information technologies co., ltd 94:D7:23 Shanghai # Shanghai DareGlobal Technologies Co., Ltd 94:D7:71 SamsungE # Samsung Electronics Co.,Ltd 94:D9:3C Enelps @@ -21415,6 +21772,7 @@ 98:29:3F FujianSt # Fujian Start Computer Equipment Co.,Ltd 98:2C:BE 2wire 98:2D:56 Resoluti # Resolution Audio +98:2F:3C SichuanC # Sichuan Changhong Electric Ltd. 98:30:00 BeijingK # Beijing KEMACOM Technologies Co., Ltd. 98:30:71 Daikyung # DAIKYUNG VASCOM 98:34:9D KraussMa # Krauss Maffei Technologies GmbH @@ -21448,6 +21806,7 @@ 98:73:C4 SageElec # Sage Electronic Engineering LLC 98:76:B6 Adafruit 98:77:70 PepDigit # Pep Digital Technology (Guangzhou) Co., Ltd +98:7E:46 EmizonNe # Emizon Networks Limited 98:82:17 Disrupti # Disruptive Ltd 98:86:B1 Flyaudio # Flyaudio corporation (China) 98:89:ED AnademIn # Anadem Information Inc. @@ -21480,6 +21839,7 @@ 98:E7:9A FoxconnN # Foxconn(NanJing) Communication Co.,Ltd. 98:EC:65 CosesyAp # Cosesy ApS 98:F0:AB Apple +98:F1:70 MurataMa # Murata Manufacturing Co., Ltd. 98:F5:37 Zte # zte corporation 98:F8:C1 IdtTechn # IDT Technology Limited 98:F8:DB MariniIm # Marini Impianti Industriali s.r.l. @@ -21509,6 +21869,7 @@ 9C:2A:70 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 9C:31:78 FoshanHu # Foshan Huadian Intelligent Communications Teachnologies Co.,Ltd 9C:31:B6 KuliteSe # Kulite Semiconductor Products Inc +9C:35:83 NiproDia # Nipro Diagnostics, Inc 9C:3A:AF SamsungE # Samsung Electronics Co.,Ltd 9C:3E:AA Envylogi # EnvyLogic Co.,Ltd. 9C:41:7C HameTech # Hame Technology Co., Limited @@ -21550,6 +21911,7 @@ 9C:8E:99 Hewlett- # Hewlett-Packard Company 9C:8E:DC Teracom # Teracom Limited 9C:93:4E Xerox # Xerox Corporation +9C:93:E4 Private 9C:95:F8 Smartdoo # SmartDoor Systems, LLC 9C:97:26 Technico # Technicolor 9C:98:11 Guangzho # Guangzhou Sunrise Electronics Development Co., Ltd @@ -21559,6 +21921,7 @@ 9C:A3:BA SakuraIn # SAKURA Internet Inc. 9C:A5:77 OsornoEn # Osorno Enterprises Inc. 9C:A9:E4 Zte # zte corporation +9C:AD:97 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 9C:AD:EF ObihaiTe # Obihai Technology, Inc. 9C:AF:CA Cisco # CISCO SYSTEMS, INC. 9C:B0:08 Ubiquito # Ubiquitous Computing Technology Corporation @@ -21570,6 +21933,7 @@ 9C:BD:9D Skydisk # SkyDisk, Inc. 9C:C0:77 Printcou # PrintCounts, LLC 9C:C0:D2 Conducti # Conductix-Wampfler AG +9C:C1:72 HuaweiTe # Huawei Technologies Co., Ltd 9C:C7:A6 Avm # AVM GmbH 9C:C7:D1 Sharp # SHARP Corporation 9C:CA:D9 Nokia # Nokia Corporation @@ -21593,12 +21957,14 @@ 9C:FF:BE Otsl # OTSL Inc. A0:02:DC AmazonTe # Amazon Technologies Inc. A0:03:63 RobertBo # Robert Bosch Healthcare GmbH +A0:06:27 NexpaSys # NEXPA System A0:07:98 SamsungE # Samsung Electronics A0:07:B6 Advanced # Advanced Technical Support, Inc. A0:0A:BF WiesonTe # Wieson Technologies Co., Ltd. A0:0B:BA SamsungE # SAMSUNG ELECTRO-MECHANICS A0:0C:A1 SktbSkit # SKTB SKiT A0:12:90 Avaya # Avaya, Inc +A0:12:DB TabuchiE # TABUCHI ELECTRIC CO.,LTD A0:13:3B Copyrigh # Copyright © HiTi Digital, Inc. A0:14:3D ParrotSa # PARROT SA A0:16:5C Triteka # Triteka LTD @@ -21625,6 +21991,7 @@ A0:4E:04 Nokia # Nokia Corporation A0:51:C6 Avaya # Avaya, Inc A0:55:DE Pace # Pace plc +A0:56:B2 Harman/B # Harman/Becker Automotive Systems GmbH A0:59:3A VDSVideo # V.D.S. Video Display Systems srl A0:5A:A4 GrandPro # Grand Products Nevada, Inc. A0:5B:21 Envinet # ENVINET GmbH @@ -21689,6 +22056,7 @@ A0:E4:53 SonyMobi # Sony Mobile Communications AB A0:E5:34 StratecB # Stratec Biomedical AG A0:E5:E9 Enimai # enimai Inc +A0:E6:F8 TexasIns # Texas Instruments Inc A0:E9:DB NingboFr # Ningbo FreeWings Technologies Co.,Ltd A0:EB:76 Aircuve # AirCUVE Inc. A0:EC:80 Zte # zte corporation @@ -21707,6 +22075,7 @@ A4:09:CB AlfredKa # Alfred Kaercher GmbH & Co KG A4:0B:ED CarryTec # Carry Technology Co.,Ltd A4:0C:C3 Cisco # CISCO SYSTEMS, INC. +A4:12:42 NecAcces # NEC AccessTechnica, Ltd. A4:13:4E Luxul A4:15:66 WeiFangG # Wei Fang Goertek Electronics Co.,Ltd A4:17:31 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -21737,6 +22106,7 @@ A4:5A:1C Smart-El # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:5D:36 HewlettP # Hewlett Packard +A4:5D:A1 AdbBroad # ADB Broadband Italia A4:60:32 MrvCommu # MRV Communications (Networks) LTD A4:67:06 Apple A4:6C:C1 LtiReene # LTi REEnergy GmbH @@ -21763,6 +22133,7 @@ A4:9F:85 LyveMind # Lyve Minds, Inc A4:9F:89 Shanghai # Shanghai Rui Rui Communication Technology Co.Ltd. A4:A2:4A CiscoSpv # Cisco SPVTG +A4:A4:D3 Bluebank # Bluebank Communication Technology Co.Ltd A4:A8:0F Shenzhen # Shenzhen Coship Electronics Co., Ltd. A4:AD:00 Ragsdale # Ragsdale Technology A4:AD:B8 VitecGro # Vitec Group, Camera Dynamics Ltd @@ -21788,7 +22159,7 @@ A4:D1:D1 Ecotalit # ECOtality North America A4:D1:D2 Apple A4:D3:B5 GlitelSt # GLITEL Stropkov, s.r.o. -A4:D8:56 Qualcomm # Qualcomm Labs Inc. +A4:D8:56 Gimbal # Gimbal, Inc A4:DA:3F Bionics # Bionics Corp. A4:DB:2E Kingspan # Kingspan Environmental Ltd A4:DB:30 LiteonTe # Liteon Technology Corporation @@ -21813,10 +22184,12 @@ A8:01:80 ImagoTec # IMAGO Technologies GmbH A8:06:00 SamsungE # Samsung Electronics Co.,Ltd A8:0C:0D Cisco +A8:13:74 Panasoni # Panasonic Corporation AVC Networks Company A8:15:4D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. A8:16:B2 LgElectr # LG Electronics A8:17:58 Elektron # Elektronik System i Umeå AB A8:1B:18 Xts # XTS CORP +A8:1B:5D FoxtelMa # Foxtel Management Pty Ltd A8:1F:AF KryptonP # KRYPTON POLSKA A8:20:66 Apple A8:24:EB ZaoNpoIn # ZAO NPO Introtest @@ -21824,6 +22197,7 @@ A8:29:4C Precisio # Precision Optical Transceivers, Inc. A8:2B:D6 ShinaSys # Shina System Co., Ltd A8:30:AD WeiFangG # Wei Fang Goertek Electronics Co.,Ltd +A8:32:9A DigicomF # Digicom Futuristic Technologies Ltd. A8:39:44 Actionte # Actiontec Electronics, Inc A8:40:41 DraginoT # Dragino Technology Co., Limited A8:44:81 Nokia # Nokia Corporation @@ -21853,6 +22227,7 @@ A8:88:08 Apple A8:8C:EE Micromad # MicroMade Galka i Drozdz sp.j. A8:8D:7B Sundroid # SunDroid Global limited. +A8:8E:24 Apple A8:92:2C LgElectr # LG Electronics A8:93:E6 JiangxiJ # JIANGXI JINGGANGSHAN CKING COMMUNICATION TECHNOLOGY CO.,LTD A8:95:B0 AkerSubs # Aker Subsea Ltd @@ -21878,6 +22253,7 @@ A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG A8:E0:18 Nokia # Nokia Corporation A8:E3:EE SonyComp # Sony Computer Entertainment Inc. +A8:E5:39 Moimston # Moimstone Co.,Ltd A8:EF:26 Tritonwa # Tritonwave A8:F2:74 SamsungE # Samsung Electronics A8:F4:70 FujianNe # Fujian Newland Communication Science Technologies Co.,Ltd. @@ -21898,6 +22274,7 @@ AC:06:13 Senselog # Senselogix Ltd AC:0A:61 LaborSRL # Labor S.r.L. AC:0D:FE Ekon-Myg # Ekon GmbH - myGEKKO +AC:11:D3 SuzhouHo # Suzhou HOTEK Video Technology Co. Ltd AC:14:61 Ataw # ATAW Co., Ltd. AC:14:D2 Wi-Daq # wi-daq, inc. AC:16:2D HewlettP # Hewlett Packard @@ -21911,6 +22288,7 @@ AC:31:9D Shenzhen # Shenzhen TG-NET Botone Technology Co.,Ltd. AC:34:CB ShanhaiG # Shanhai GBCOM Communication Technology Co. Ltd AC:36:13 SamsungE # Samsung Electronics Co.,Ltd +AC:38:70 LenovoMo # Lenovo Mobile Communication Technology Ltd. AC:3C:0B Apple AC:3C:B4 Nilan # Nilan A/S AC:3D:05 Instores # Instorescreen Aisa @@ -21959,12 +22337,15 @@ AC:9B:84 SmakTecn # Smak Tecnologia e Automacao AC:9C:E4 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd AC:A0:16 Cisco # CISCO SYSTEMS, INC. +AC:A2:13 Shenzhen # Shenzhen Bilian electronic CO.,LTD AC:A2:2C BaycityT # Baycity Technologies Ltd +AC:A3:1E ArubaNet # Aruba Networks AC:A4:30 Peerless # Peerless AV AC:A9:19 Trekstor # TrekStor GmbH AC:A9:A0 Audioeng # Audioengine, Ltd. AC:AB:8D LyngsoMa # Lyngso Marine A/S AC:B3:13 ArrisGro # ARRIS Group, Inc. +AC:B7:4F MetelSRO # METEL s.r.o. AC:B8:59 UnibandE # Uniband Electronic Corp, AC:BD:0B Imac # IMAC CO.,LTD AC:BE:75 UfineTec # Ufine Technologies Co.,Ltd. @@ -22006,12 +22387,15 @@ AC:FD:EC Apple # Apple, Inc B0:00:B4 Cisco B0:05:94 LiteonTe # Liteon Technology Corporation +B0:09:D3 Avizia +B0:10:41 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. B0:12:03 Dynamics # Dynamics Hong Kong Limited B0:12:66 Futaba-K # Futaba-Kikaku B0:14:08 Lightspe # LIGHTSPEED INTERNATIONAL CO. B0:17:43 EdisonGl # EDISON GLOBAL CIRCUITS LLC B0:1B:7C OntrolAS # Ontrol A.S. B0:1C:91 Elim # Elim Co +B0:1F:81 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. B0:24:F3 Progeny # Progeny Systems B0:25:AA Private B0:34:95 Apple @@ -22028,6 +22412,7 @@ B0:57:06 ValloxOy # Vallox Oy B0:58:C4 Broadcas # Broadcast Microwave Services, Inc B0:5B:1F ThermoFi # THERMO FISHER SCIENTIFIC S.P.A. +B0:5B:67 HuaweiTe # Huawei Technologies Co., Ltd B0:5C:E5 Nokia # Nokia Corporation B0:61:C7 Ericsson # Ericsson-LG Enterprise B0:65:63 Shanghai # Shanghai Railway Communication Factory @@ -22036,6 +22421,7 @@ B0:69:71 DeiSales # DEI Sales, Inc. B0:6C:BF 3alityDi # 3ality Digital Systems GmbH B0:75:0C QaCafe # QA Cafe +B0:75:4D Alcatel- # Alcatel-Lucent B0:75:D5 Zte # ZTE Corporation B0:77:AC ArrisGro # ARRIS Group, Inc. B0:79:08 Cummings # Cummings Engineering @@ -22044,6 +22430,7 @@ B0:7D:62 Dipl-Ing # Dipl.-Ing. H. Horstmann GmbH B0:80:8C LaserLig # Laser Light Engines B0:81:D8 I-Sys # I-sys Corp +B0:83:FE Dell # Dell Inc B0:86:9E Chloride # Chloride S.r.L B0:88:07 StrataWo # Strata Worldwide B0:89:91 Lge @@ -22057,7 +22444,9 @@ B0:9B:D4 GnhSoftw # GNH Software India Private Limited B0:9F:BA Apple B0:A1:0A Pivotal # Pivotal Systems Corporation +B0:A3:7E QingdaoH # Qingdao Haier Electronics Co.,Ltd B0:A7:2A Ensemble # Ensemble Designs, Inc. +B0:A7:37 Roku # Roku, Inc. B0:A8:6E JuniperN # Juniper Networks B0:AA:36 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD. B0:AC:FA Fujitsu # Fujitsu Limited @@ -22100,12 +22489,15 @@ B4:04:18 Smartchi # Smartchip Integrated Inc. B4:07:F9 SamsungE # SAMSUNG ELECTRO-MECHANICS B4:08:32 TcCommun # TC Communications +B4:0A:C6 Dexon # DEXON Systems Ltd. +B4:0B:44 Smartisa # Smartisan Technology Co., Ltd. B4:0B:7A BrusaEle # Brusa Elektronik AG B4:0C:25 PaloAlto # Palo Alto Networks B4:0E:96 Heran B4:0E:DC Lg-Erics # LG-Ericsson Co.,Ltd. B4:14:89 Cisco # CISCO SYSTEMS, INC. B4:15:13 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +B4:17:80 DtiGroup # DTI Group Ltd B4:18:D1 Apple B4:1D:EF Internet # Internet Laboratories, Inc. B4:21:1D BeijingG # Beijing GuangXin Technology Co., Ltd @@ -22126,6 +22518,7 @@ B4:3E:3B Viablewa # Viableware, Inc B4:41:7A Shenzhen # ShenZhen Gongjin Electronics Co.,Ltd B4:43:0D Broadlin # Broadlink Pty Ltd +B4:47:5E Avaya # Avaya, Inc B4:4C:C2 NrElectr # NR ELECTRIC CO., LTD B4:51:F9 NbSoftwa # NB Software B4:52:53 SeagateT # Seagate Technology @@ -22142,6 +22535,7 @@ B4:67:E9 QingdaoG # Qingdao GoerTek Technology Co., Ltd. B4:74:9F AskeyCom # askey computer corp B4:75:0E BelkinIn # Belkin International Inc. +B4:7C:29 Shenzhen # Shenzhen Guzidi Technology Co.,Ltd B4:7F:5E Foresigh # Foresight Manufacture (S) Pte Ltd B4:82:55 Research # Research Products Corporation B4:82:7B AkgAcous # AKG Acoustics GmbH @@ -22154,6 +22548,7 @@ B4:99:4C TexasIns # Texas Instruments B4:99:BA Hewlett- # Hewlett-Packard Company B4:9D:B4 AxionTec # Axion Technologies Inc. +B4:9E:AC ImagikIn # Imagik Int'l Corp B4:9E:E6 Shenzhen # SHENZHEN TECHNOLOGY CO LTD B4:A4:B5 ZenEye # Zen Eye Co.,Ltd B4:A4:E3 Cisco # CISCO SYSTEMS, INC. @@ -22162,17 +22557,20 @@ B4:A9:5A Avaya # Avaya, Inc B4:AA:4D Ensequen # Ensequence, Inc. B4:AB:2C MtmTechn # MtM Technology Corporation +B4:AE:6F CircleRe # Circle Reliance, Inc. B4:B0:17 Avaya # Avaya, Inc B4:B3:62 Zte # ZTE Corporation B4:B5:2F HewlettP # Hewlett Packard B4:B5:42 HubbellP # Hubbell Power Systems, Inc. B4:B5:AF MinsungE # Minsung Electronics B4:B6:76 IntelCor # Intel Corporate +B4:B8:59 Texa # Texa Spa B4:B8:8D Thuh # Thuh Company B4:C4:4E VxlEtech # VXL eTech Pvt Ltd B4:C7:99 Motorola # Motorola Solutions Inc. B4:C8:10 UmpiElet # UMPI Elettronica B4:CC:E9 Prosyst +B4:CE:F6 Htc # HTC Corporation B4:CF:DB Shenzhen # Shenzhen Jiuzhou Electric Co.,LTD B4:D8:A9 Betterbo # BetterBots B4:D8:DE IotaComp # iota Computing, Inc. @@ -22193,10 +22591,12 @@ B4:FE:8C CentroSi # Centro Sicurezza Italia SpA B8:03:05 IntelCor # Intel Corporate B8:04:15 BayanAud # Bayan Audio +B8:08:CF IntelCor # Intel Corporate B8:0B:9D RopexInd # ROPEX Industrie-Elektronik GmbH B8:14:13 KeenHigh # Keen High Holding(HK) Ltd. B8:16:19 ArrisGro # ARRIS Group, Inc. B8:17:C2 Apple +B8:18:6F Oriental # ORIENTAL MOTOR CO., LTD. B8:19:99 Nesys B8:20:E7 Guangzho # Guangzhou Horizontal Information & Network Integration Co. Ltd B8:24:10 MagnetiM # Magneti Marelli Slovakia s.r.o. @@ -22256,12 +22656,15 @@ B8:97:5A BiostarM # BIOSTAR Microtech Int'l Corp. B8:98:B0 Atlona # Atlona Inc. B8:98:F7 GioneeCo # Gionee Communication Equipment Co,Ltd.ShenZhen +B8:99:19 7signalS # 7signal Solutions, Inc B8:9A:ED Oceanser # OceanServer Technology, Inc B8:9B:C9 SmcNetwo # SMC Networks Inc +B8:9B:E4 AbbPower # ABB Power Systems Power Generation B8:A3:86 D-LinkIn # D-Link International B8:A3:E0 BenruiTe # BenRui Technology Co.,Ltd B8:A8:AF LogicSPA # Logic S.p.A. B8:AC:6F Dell # Dell Inc +B8:AD:3E Bluecom B8:AE:6E Nintendo # Nintendo Co., Ltd. B8:AF:67 Hewlett- # Hewlett-Packard Company B8:B1:C7 Bt&Com # BT&COM CO.,LTD @@ -22271,7 +22674,9 @@ B8:BA:68 XiAnJizh # Xi'an Jizhong Digital Communication Co.,Ltd B8:BA:72 Cynove B8:BB:6D Eneres # ENERES Co.,Ltd. +B8:BD:79 Trendpoi # TrendPoint Systems B8:BE:BF Cisco # CISCO SYSTEMS, INC. +B8:BF:83 IntelCor # Intel Corporate B8:C1:A2 DragonPa # Dragon Path Technologies Co., Limited B8:C4:6F Primmcon # PRIMMCON INDUSTRIES INC B8:C6:8E SamsungE # Samsung Electronics Co.,Ltd @@ -22293,6 +22698,7 @@ B8:E7:79 9solutio # 9Solutions Oy B8:E8:56 Apple B8:E9:37 Sonos # Sonos, Inc. +B8:EE:65 LiteonTe # Liteon Technology Corporation B8:EE:79 YwireTec # YWire Technologies, Inc. B8:F4:D0 Herrmann # Herrmann Ultraschalltechnik GmbH & Co. Kg B8:F5:E7 Waytools # WayTools, LLC @@ -22316,6 +22722,7 @@ BC:1A:67 YfTechno # YF Technology Co., Ltd BC:20:A4 SamsungE # Samsung Electronics BC:20:BA InspurSh # Inspur (Shandong) Electronic Information Co., Ltd +BC:25:F0 3dDispla # 3D Display Technologies Co., Ltd. BC:26:1D HongKong # HONG KONG TECON TECHNOLOGY BC:28:46 NextbitC # NextBIT Computing Pvt. Ltd. BC:28:D6 RowleyAs # Rowley Associates Limited @@ -22325,6 +22732,7 @@ BC:2D:98 Thinglob # ThinGlobal LLC BC:30:5B Dell # Dell Inc. BC:30:7D WistronN # Wistron Neweb Corp. +BC:34:00 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. BC:35:E5 Hydro # Hydro Systems Company BC:38:D2 Pandachi # Pandachip Limited BC:39:A6 CsunSyst # CSUN System Technology Co.,LTD @@ -22336,10 +22744,13 @@ BC:47:60 SamsungE # Samsung Electronics Co.,Ltd BC:4B:79 Sensingt # SensingTek BC:4E:3C CoreStaf # CORE STAFF CO., LTD. +BC:4E:5D Zhongmia # ZhongMiao Technology Co., Ltd. BC:51:FE SwannCom # Swann Communications Pty Ltd BC:52:B7 Apple BC:5F:F4 AsrockIn # ASRock Incorporation BC:62:9F TelenetP # Telenet Systems P. Ltd. +BC:66:41 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. +BC:67:1C Cisco BC:67:78 Apple BC:67:84 Environi # Environics Oy BC:6A:16 Tdvine @@ -22366,6 +22777,7 @@ BC:96:80 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd BC:98:89 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. BC:99:BC FonseeTe # FonSee Technology Inc. +BC:9C:C5 BeijingH # Beijing Huafei Technology Co., Ltd. BC:9D:A5 DascomEu # DASCOM Europe GmbH BC:A4:E1 Nabto BC:A9:D6 Cyber-Ra # Cyber-Rain, Inc. @@ -22380,9 +22792,11 @@ BC:C6:1A SpectraE # SPECTRA EMBEDDED SYSTEMS BC:C6:DB Nokia # Nokia Corporation BC:C8:10 CiscoSpv # Cisco SPVTG +BC:CA:B5 ArrisGro # ARRIS Group, Inc. BC:CD:45 Voismart BC:CF:CC Htc # HTC Corporation BC:D1:77 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +BC:D1:D3 TinnoMob # Tinno Mobile Technology Corp BC:D5:B6 D2dTechn # d2d technologies BC:D9:40 Asr # ASR Co,.Ltd. BC:E0:9D Eoslink @@ -22415,6 +22829,7 @@ C0:35:BD Velocyte # Velocytech Aps C0:38:F9 NokiaDan # Nokia Danmark A/S C0:3B:8F MinicomD # Minicom Digital Signage +C0:3D:46 Shanghai # Shanghai Mochui Network Technology Co., Ltd C0:3E:0F Bskyb # BSkyB Ltd C0:3F:0E Netgear C0:3F:2A Biscotti # Biscotti, Inc. @@ -22425,6 +22840,7 @@ C0:49:3D Maitrise # MAITRISE TECHNOLOGIQUE C0:4A:00 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. C0:4D:F7 Serelec +C0:56:E3 Hangzhou # Hangzhou Hikvision Digital Technology Co.,Ltd. C0:57:BC Avaya # Avaya, Inc C0:58:A7 Pico # Pico Systems Co., Ltd. C0:5E:6F VStonkau # V. Stonkaus firma "Kodinis Raktas" @@ -22481,15 +22897,19 @@ C0:E4:22 TexasIns # Texas Instruments C0:E5:4E DenxComp # DENX Computer Systems GmbH C0:EA:E4 Sonicwal # Sonicwall +C0:EE:FB OneplusT # OnePlus Tech (Shenzhen) Ltd C0:F1:C4 Pacidal # Pacidal Corporation Ltd. +C0:F2:FB Apple C0:F7:9D Powercod # Powercode C0:F8:DA HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C0:F9:91 GmeStand # GME Standard Communications P/L +C4:00:06 LipiData # Lipi Data Systems Ltd. C4:01:42 Maxmedia # MaxMedia Technology Limited C4:01:7C RuckusWi # Ruckus Wireless C4:01:B1 Seektech # SeekTech INC C4:04:15 Netgear # NETGEAR INC., C4:05:28 HuaweiTe # Huawei Technologies Co., Ltd +C4:08:4A Alcatel- # Alcatel-Lucent C4:09:38 FujianSt # Fujian Star-net Communication Co., Ltd C4:0A:CB Cisco # CISCO SYSTEMS, INC. C4:0E:45 AckNetwo # ACK Networks,Inc. @@ -22515,6 +22935,7 @@ C4:3A:9F Siconix # Siconix Inc. C4:3C:3C CybelecS # CYBELEC SA C4:3D:C7 Netgear +C4:42:02 SamsungE # Samsung Electronics Co.,Ltd C4:43:8F LgElectr # LG Electronics C4:45:67 SambonPr # SAMBON PRECISON and ELECTRONICS C4:45:EC Shanghai # Shanghai Yali Electron Co.,LTD @@ -22522,6 +22943,7 @@ C4:48:38 SatcomDi # Satcom Direct, Inc. C4:4A:D0 Fireflie # FIREFLIES SYSTEMS C4:4B:44 Omniprin # Omniprint Inc. +C4:4B:D1 WallysCo # Wallys Communications Teachnologies Co.,Ltd. C4:4E:1F Bluen C4:4E:AC Shenzhen # Shenzhen Shiningworth Technology Co., Ltd. C4:50:06 SamsungE # Samsung Electronics Co.,Ltd @@ -22529,6 +22951,7 @@ C4:55:A6 CadacHol # Cadac Holdings Ltd C4:55:C2 Bach-Sim # Bach-Simpson C4:56:00 GalleonE # Galleon Embedded Computing +C4:56:FE LavaInte # Lava International Ltd. C4:58:C2 Shenzhen # Shenzhen TATFOOK Technology Co., Ltd. C4:59:76 FugooCoo # Fugoo Coorporation C4:5D:D8 HdmiForu # HDMI Forum @@ -22570,6 +22993,7 @@ C4:C1:9F National # National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO) C4:C7:55 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd C4:C9:19 EnergyIm # Energy Imports Ltd +C4:C9:EC D&DGroup # D&D GROUP sp. z o.o. C4:CA:D9 Hangzhou # Hangzhou H3C Technologies Co., Limited C4:CD:45 BeijingB # Beijing Boomsense Technology CO.,LTD. C4:D4:89 JiangsuJ # JiangSu Joyque Information Industry Co.,Ltd @@ -22588,6 +23012,7 @@ C4:F4:64 SpicaInt # Spica international C4:F5:7C BrocadeC # Brocade Communications Systems, Inc. C4:FC:E4 DishtvNz # DishTV NZ Ltd +C8:02:10 LgInnote # LG Innotek C8:02:58 ItwGseAp # ITW GSE ApS C8:02:A6 BeijingN # Beijing Newmine Technology C8:07:18 Tdsi @@ -22636,6 +23061,7 @@ C8:8A:83 Dongguan # Dongguan HuaHong Electronics Co.,Ltd C8:8B:47 Nolangro # Nolangroup S.P.A con Socio Unico C8:90:3E PaktonTe # Pakton Technologies +C8:91:F9 Sagemcom C8:93:46 Mxchip # MXCHIP Company Limited C8:93:83 Embedded # Embedded Automation, Inc. C8:94:D2 JiangsuD # Jiangsu Datang Electronic Products Co., Ltd @@ -22679,6 +23105,8 @@ C8:DF:7C Nokia # Nokia Corporation C8:E0:EB Apple C8:E1:A7 Vertu # Vertu Corporation Limited +C8:E4:2F Technica # Technical Research Design and Development +C8:E7:D8 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. C8:EE:08 TangtopT # TANGTOP TECHNOLOGY CO.,LTD C8:EE:75 PishionI # Pishion International Co. Ltd C8:EE:A6 Shenzhen # Shenzhen SHX Technology Co., Ltd @@ -22694,7 +23122,9 @@ C8:F9:F9 Cisco # CISCO SYSTEMS, INC. C8:FB:26 CiscoSpv # Cisco SPVTG C8:FE:30 BejingDa # Bejing DAYO Mobile Communication Technology Ltd. +C8:FF:77 Dyson # Dyson Limited CC:00:80 BettiniS # BETTINI SRL +CC:03:FA Technico # Technicolor CH USA CC:04:7C G-WayMic # G-WAY Microwave CC:04:B4 SelectCo # Select Comfort CC:05:1B SamsungE # Samsung Electronics Co.,Ltd @@ -22719,6 +23149,7 @@ CC:39:8C Shiningt # Shiningtek CC:3A:61 SamsungE # SAMSUNG ELECTRO MECHANICS CO., LTD. CC:3C:3F SaSSDate # SA.S.S. Datentechnik AG +CC:3D:82 IntelCor # Intel Corporate CC:3E:5F HewlettP # Hewlett Packard CC:43:E3 TrumpSA # Trump s.a. CC:47:03 Intercon # Intercon Systems Co., Ltd. @@ -22761,6 +23192,7 @@ CC:9E:00 Nintendo # Nintendo Co., Ltd. CC:9F:35 Transbit # Transbit Sp. z o.o. CC:A0:E5 DzgMeter # DZG Metering GmbH +CC:A2:23 HuaweiTe # Huawei Technologies Co., Ltd CC:A3:74 Guangdon # Guangdong Guanglian Electronic Technology Co.Ltd CC:A4:62 ArrisGro # ARRIS Group, Inc. CC:A6:14 AifaTech # AIFA TECHNOLOGY CORP. @@ -22786,6 +23218,7 @@ CC:D5:39 Cisco CC:D8:11 AiconnTe # Aiconn Technology Corporation CC:D9:E9 ScrEngin # SCR Engineers Ltd. +CC:E1:7F JuniperN # juniper networks CC:E1:D5 Buffalo # Buffalo Inc. CC:E7:98 MySocial # My Social Stuff CC:E7:DF American # American Magnetics, Inc. @@ -22795,6 +23228,7 @@ CC:EF:48 Cisco # CISCO SYSTEMS, INC. CC:F3:A5 ChiMeiCo # Chi Mei Communication Systems, Inc CC:F4:07 EukreaEl # EUKREA ELECTROMATIQUE SARL +CC:F5:38 3isysnet # 3isysnetworks CC:F6:7A AyeckaCo # Ayecka Communication Systems LTD CC:F8:41 Lumewave CC:F8:F0 XiAnHisu # Xi'an HISU Multimedia Technology Co.,Ltd. @@ -22806,6 +23240,7 @@ CC:FC:B1 Wireless # Wireless Technology, Inc. CC:FE:3C SamsungE # Samsung Electronics D0:07:90 TexasIns # Texas Instruments +D0:0A:AB Yokogawa # Yokogawa Digital Computer Corporation D0:0E:A4 PorscheC # Porsche Cars North America D0:13:1E SunrexTe # Sunrex Technology Corp D0:15:4A Zte # zte corporation @@ -22820,6 +23255,7 @@ D0:31:10 IngenicS # Ingenic Semiconductor Co.,Ltd D0:37:61 TexasIns # Texas Instruments D0:39:72 TexasIns # Texas Instruments +D0:39:B3 ArrisGro # ARRIS Group, Inc. D0:46:DC Southwes # Southwest Research Institute D0:4C:C1 Sintrone # SINTRONES Technology Corp. D0:50:99 AsrockIn # ASRock Incorporation @@ -22831,7 +23267,9 @@ D0:57:A1 WermaSig # Werma Signaltechnik GmbH & Co. KG D0:58:75 ActiveCo # Active Control Technology Inc. D0:59:C3 Ceramicr # CeraMicro Technology Corporation +D0:59:E4 SamsungE # Samsung Electronics Co.,Ltd D0:5A:0F I-BtDigi # I-BT DIGITAL CO.,LTD +D0:5A:F1 Shenzhen # Shenzhen Pulier Tech CO.,Ltd D0:5F:B8 TexasIns # Texas Instruments D0:5F:CE HitachiD # Hitachi Data Systems D0:63:4D MeikoMas # Meiko Maschinenbau GmbH & Co. KG @@ -22860,6 +23298,7 @@ D0:9B:05 Emtronix D0:9C:30 FosterEl # Foster Electric Company, Limited D0:9D:0A Linkcom +D0:A0:D6 ChengduT # Chengdu TD Tech Ltd. D0:A3:11 Neuberge # Neuberger Gebäudeautomation GmbH D0:AE:EC AlphaNet # Alpha Networks Inc. D0:AF:B6 LinktopT # Linktop Technology Co., LTD @@ -22898,6 +23337,7 @@ D0:F0:DB Ericsson D0:F2:7F Steadyse # SteadyServ Technoligies, LLC D0:F7:3B HelmutMa # Helmut Mauell GmbH +D0:FA:1D Qihoo360 # Qihoo 360 Technology Co.,Ltd D0:FF:50 TexasIns # Texas Instruments, Inc D4:00:0D PhoenixB # Phoenix Broadband Technologies, LLC. D4:00:57 McTechno # MC Technologies GmbH @@ -22925,6 +23365,7 @@ D4:2C:3D SkyLight # Sky Light Digital Limited D4:2F:23 AkenoriP # Akenori PTE Ltd D4:31:9D Sinwatec +D4:37:D7 Zte # zte corporation D4:3A:65 IgrsEngi # IGRS Engineering Lab Ltd. D4:3A:E9 Dongguan # DONGGUAN ipt INDUSTRIAL CO., LTD D4:3D:67 CarmaInd # Carma Industries Inc. @@ -22940,7 +23381,7 @@ D4:52:97 Nstreams # nSTREAMS Technologies, Inc. D4:53:AF VigoSyst # VIGO System S.A. D4:5A:B2 Galleon # Galleon Systems -D4:5C:70 Wireless # Wireless Gigabit Alliance +D4:5C:70 Wi-FiAll # Wi-Fi Alliance D4:5D:42 Nokia # Nokia Corporation D4:64:F7 ChengduU # CHENGDU USEE DIGITAL TECHNOLOGY CO., LTD D4:66:A8 RiedoNet # Riedo Networks GmbH @@ -22954,6 +23395,7 @@ D4:6E:5C HuaweiTe # Huawei Technologies Co., Ltd D4:6F:42 WaxessUs # WAXESS USA Inc D4:79:C3 Camerone # Cameronet GmbH & Co. KG +D4:7B:35 NeoMonit # NEO Monitors AS D4:7B:75 HartingE # HARTING Electronics GmbH D4:81:CA Idevices # iDevices, LLC D4:82:3E ArgosyTe # Argosy Technologies, Ltd. @@ -22963,6 +23405,7 @@ D4:8C:B5 Cisco # CISCO SYSTEMS, INC. D4:8F:AA SogecamI # Sogecam Industrial, S.A. D4:91:AF Electroa # Electroacustica General Iberica, S.A. +D4:93:98 Nokia # Nokia Corporation D4:93:A0 FidelixO # Fidelix Oy D4:94:5A Cosmo # COSMO CO., LTD D4:94:A1 TexasIns # Texas Instruments @@ -23007,6 +23450,7 @@ D4:E8:B2 SamsungE # Samsung Electronics D4:EA:0E Avaya # Avaya, Inc D4:EC:0C Harley-D # Harley-Davidson Motor Company +D4:EC:86 Linkedho # LinkedHope Intelligent Technologies Co., Ltd D4:EE:07 Hiwifi # HIWIFI Co., Ltd. D4:F0:27 NavetasE # Navetas Energy Management D4:F0:B4 NapcoSec # Napco Security Technologies @@ -23017,6 +23461,7 @@ D8:06:D1 Honeywel # Honeywell Fire System (Shanghai) Co,. Ltd. D8:08:F5 ArcadiaN # Arcadia Networks Co. Ltd. D8:09:C3 Cercacor # Cercacor Labs +D8:0C:CF CGVSAS # C.G.V. S.A.S. D8:0D:E3 FxiTechn # FXI TECHNOLOGIES AS D8:15:0D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. D8:16:0A NipponEl # Nippon Electro-Sensory Devices @@ -23026,6 +23471,7 @@ D8:1C:14 Compacta # Compacta International, Ltd. D8:1E:DE B&WGroup # B&W Group Ltd D8:24:BD Cisco # CISCO SYSTEMS, INC. +D8:25:22 Pace # Pace plc D8:26:B9 Guangdon # Guangdong Coagent Electronics S &T Co., Ltd. D8:27:0C Maxtroni # MaxTronic International Co., Ltd. D8:28:C9 GeneralE # General Electric Consumer and Industrial @@ -23049,10 +23495,12 @@ D8:58:D7 CzNicZSP # CZ.NIC, z.s.p.o. D8:5D:4C Tp-LinkT # TP-LINK Technologies Co.,Ltd. D8:5D:84 CaxSoft # CAx soft GmbH +D8:5D:FB Private D8:61:94 Objetivo # Objetivos y Sevicios de Valor Añadido D8:62:DB Eno # Eno Inc. D8:65:95 ToySMyth # Toy's Myth Inc. D8:66:C6 Shenzhen # Shenzhen Daystar Technology Co.,ltd +D8:66:EE BoxinCom # BOXIN COMMUNICATION CO.,LTD. D8:67:D9 Cisco # CISCO SYSTEMS, INC. D8:69:60 Steinsvi # Steinsvik D8:6B:F7 Nintendo # Nintendo Co., Ltd. @@ -23070,7 +23518,8 @@ D8:95:2F TexasIns # Texas Instruments D8:96:85 Gopro D8:96:95 Apple -D8:97:3B EmersonN # Emerson Network Power Embedded Power +D8:96:E0 AlibabaC # Alibaba Cloud Computing Ltd. +D8:97:3B ArtesynE # Artesyn Embedded Technologies D8:97:60 C2Develo # C2 Development, Inc. D8:97:7C GreyInno # Grey Innovation D8:9D:67 HewlettP # Hewlett Packard @@ -23108,6 +23557,7 @@ D8:DE:CE Isung # ISUNG CO.,LTD D8:DF:0D Beronet # beroNet GmbH D8:E3:AE CirtecMe # CIRTEC MEDICAL SYSTEMS +D8:E5:6D TctMobil # TCT Mobile Limited D8:E7:2B OnpathTe # OnPATH Technologies D8:E7:43 Wush # Wush, Inc D8:E9:52 Keopsys @@ -23142,6 +23592,7 @@ DC:33:50 Techsat # TechSAT GmbH DC:37:D2 HunanHkt # Hunan HKT Electronic Technology Co., Ltd DC:38:E1 JuniperN # Juniper networks +DC:39:79 Skyport # Skyport Systems DC:3A:5E Roku # Roku, Inc DC:3C:2E Manufact # Manufacturing System Insights, Inc. DC:3C:84 TicomGeo # Ticom Geomatics, Inc. @@ -23150,6 +23601,7 @@ DC:45:17 ArrisGro # ARRIS Group, Inc. DC:49:C9 CascoSig # CASCO SIGNAL LTD DC:4E:DE ShinyeiT # SHINYEI TECHNOLOGY CO., LTD. +DC:53:7C CompalBr # Compal Broadband Networks, Inc. DC:57:26 Power-On # Power-One DC:5E:36 Paterson # Paterson Technology DC:64:7C CRSIimot # C.R.S. iiMotion GmbH @@ -23196,6 +23648,7 @@ DC:E5:78 Experime # Experimental Factory of Scientific Engineering and Special Design Department DC:E7:1C AugElekt # AUG Elektronik GmbH DC:F0:5D LettaTek # Letta Teknoloji +DC:F1:10 Nokia # Nokia Corporation DC:F7:55 Sitronik DC:F8:58 LorentNe # Lorent Networks, Inc. DC:FA:D5 StrongGe # STRONG Ges.m.b.H. @@ -23204,10 +23657,12 @@ E0:06:E6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. E0:0B:28 Inovonic # Inovonics E0:0C:7F Nintendo # Nintendo Co., Ltd. +E0:0D:B9 Private E0:14:3E Modoosis # Modoosis Inc. E0:18:77 Fujitsu # Fujitsu Limited E0:1C:41 Aerohive # Aerohive Networks Inc. E0:1C:EE BravoTec # Bravo Tech, Inc. +E0:1D:38 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd E0:1D:3B Cambridg # Cambridge Industries(Group) Co.,Ltd E0:1E:07 AniteTel # Anite Telecoms US. Inc E0:1F:0A XslentEn # Xslent Energy Technologies. LLC @@ -23237,6 +23692,7 @@ E0:62:90 JinanJov # Jinan Jovision Science & Technology Co., Ltd. E0:63:E5 SonyMobi # Sony Mobile Communications AB E0:64:BB Digiview # DigiView S.r.l. +E0:66:78 Apple E0:67:B3 C-DataTe # C-Data Technology Co., Ltd E0:69:95 Pegatron # PEGATRON CORPORATION E0:75:0A AlpsErec # ALPS ERECTORIC CO.,LTD. @@ -23341,6 +23797,7 @@ E4:55:EA Dedicate # Dedicated Computing E4:56:14 SuttleAp # Suttle Apparatus E4:57:A8 StuartMa # Stuart Manufacturing, Inc. +E4:5D:52 Avaya # Avaya, Inc E4:64:49 ArrisGro # ARRIS Group, Inc. E4:67:BA DanishIn # Danish Interpretation Systems A/S E4:68:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -23352,6 +23809,7 @@ E4:77:D4 MinrrayI # Minrray Industry Co.,Ltd E4:7C:F9 SamsungE # Samsung Electronics Co., LTD E4:7D:5A BeijingH # Beijing Hanbang Technology Corp. +E4:7F:B2 Fujitsu # Fujitsu Limited E4:81:84 Alcatel- # Alcatel-Lucent E4:81:B3 Shenzhen # Shenzhen ACT Industrial Co.,Ltd. E4:83:99 ArrisGro # ARRIS Group, Inc. @@ -23370,6 +23828,7 @@ E4:AF:A1 Hes-So E4:B0:21 SamsungE # Samsung Electronics Co.,Ltd E4:C1:46 Objetivo # Objetivos y Servicios de Valor A +E4:C6:2B Airware E4:C6:3D Apple # Apple, Inc. E4:C6:E6 MophieLl # Mophie, LLC E4:C7:22 Cisco @@ -23404,6 +23863,7 @@ E8:10:2E ReallySi # Really Simple Software, Inc E8:11:32 SamsungE # Samsung Electronics CO., LTD E8:13:24 Guangzho # GuangZhou Bonsoninfo System CO.,LTD +E8:15:0E Nokia # Nokia Corporation E8:17:FC Nifty # NIFTY Corporation E8:28:77 Tmy # TMY Co., Ltd. E8:28:D5 CotsTech # Cots Technology @@ -23429,6 +23889,7 @@ E8:5A:A7 LlcEmzio # LLC Emzior E8:5B:5B LgElectr # LG ELECTRONICS INC E8:5B:F0 ImagingD # Imaging Diagnostics +E8:5D:6B Luminate # Luminate Wireless E8:5E:53 Infratec # Infratec Datentechnik GmbH E8:61:1F DawningI # Dawning Information Industry Co.,Ltd E8:61:7E LiteonTe # Liteon Technology Corporation @@ -23441,6 +23902,7 @@ E8:75:7F FirsTech # FIRS Technologies(Shenzhen) Co., Ltd E8:78:A1 BeoviewI # BEOVIEW INTERCOM DOO E8:7A:F3 S5TechSR # S5 Tech S.r.l. +E8:80:2E Apple E8:80:D8 GntekEle # GNTEK Electronics Co.,Ltd. E8:89:2C ArrisGro # ARRIS Group, Inc. E8:8D:28 Apple @@ -23493,6 +23955,7 @@ E8:F2:26 MillsonC # MILLSON CUSTOM SOLUTIONS INC. E8:F9:28 RftechSr # RFTECH SRL E8:FC:60 ElcomInn # ELCOM Innovations Private Limited +E8:FC:AF Netgear # NETGEAR INC., EC:0E:D6 ItechIns # ITECH INSTRUMENTS SAS EC:10:00 EnanceSo # Enance Source Co., Ltd. PC clones(?) EC:11:20 Flodesig # FloDesign Wind Turbine Corporation @@ -23500,8 +23963,10 @@ EC:17:2F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. EC:17:66 Research # Research Centre Module EC:1A:59 BelkinIn # Belkin International Inc. +EC:1D:7F Zte # zte corporation EC:21:9F VidaboxL # VidaBox LLC EC:22:57 JiangsuN # JiangSu NanJing University Electronic Information Technology Co.,Ltd +EC:22:80 D-LinkIn # D-Link International EC:23:3D HuaweiTe # Huawei Technologies Co., Ltd EC:23:68 Intelliv # IntelliVoice Co.,Ltd. EC:2A:F0 Ypsomed # Ypsomed AG @@ -23535,6 +24000,7 @@ EC:85:2F Apple EC:88:8F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. EC:89:F5 LenovoMo # Lenovo Mobile Communication Technology Ltd. +EC:8A:4C Zte # zte corporation EC:8E:AD Dlx EC:92:33 EddyfiNd # Eddyfi NDT Inc EC:93:27 Memmert+ # MEMMERT GmbH + Co. KG @@ -23543,21 +24009,24 @@ EC:98:C1 BeijingR # Beijing Risbo Network Technology Co.,Ltd EC:9A:74 HewlettP # Hewlett Packard EC:9B:5B Nokia # Nokia Corporation -EC:9E:CD EmersonN # Emerson Network Power and Embedded Computing +EC:9E:CD ArtesynE # Artesyn Embedded Technologies EC:A2:9B KemppiOy # Kemppi Oy EC:A8:6B Elitegro # ELITEGROUP COMPUTER SYSTEMS CO., LTD. EC:B1:06 AcuroNet # Acuro Networks, Inc EC:B5:41 ShinanoE # SHINANO E and E Co.Ltd. +EC:B9:07 Cloudgen # CloudGenix Inc EC:BB:AE Digivoic # Digivoice Tecnologia em Eletronica Ltda EC:BD:09 FusionEl # FUSION Electronics Ltd EC:C3:8A Accuener # Accuenergy (CANADA) Inc EC:C8:82 Cisco # CISCO SYSTEMS, INC. +EC:CB:30 HuaweiTe # Huawei Technologies Co., Ltd EC:CD:6D AlliedTe # Allied Telesis, Inc. EC:D0:0E Miraerec # MiraeRecognition Co., Ltd. EC:D0:40 GeaFarmT # GEA Farm Technologies GmbH EC:D1:9A ZhuhaiLi # Zhuhai Liming Industries Co., Ltd EC:D9:25 Rami EC:D9:50 IrtSa # IRT SA +EC:D9:D1 Shenzhen # Shenzhen TG-NET Botone Technology Co.,Ltd. EC:DE:3D LampreyN # Lamprey Networks, Inc. EC:E0:9B SamsungE # Samsung electronics CO., LTD EC:E1:A9 Cisco @@ -23620,6 +24089,7 @@ F0:6B:CA SamsungE # Samsung Electronics Co.,Ltd F0:72:8C SamsungE # Samsung Electronics Co.,Ltd F0:73:AE Peak-Sys # PEAK-System Technik +F0:76:1C CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. F0:77:65 Sourcefi # Sourcefire, Inc F0:77:D0 Xcellen F0:7B:CB HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -23684,9 +24154,13 @@ F0:FD:A0 AcurixNe # Acurix Networks LP F4:03:21 BenextBV # BeNeXt B.V. F4:04:4C Valencet # ValenceTech Limited +F4:06:69 IntelCor # Intel Corporate F4:06:8D Devolo # devolo AG -F4:06:A5 Hangzhou # Hangzhou Bianfeng Networking technology Co., Ltd. +F4:06:A5 Hangzhou # Hangzhou Bianfeng Networking Technology Co., Ltd. +F4:09:D8 SamsungE # Samsung Electro Mechanics co., LTD. F4:0B:93 Research # Research In Motion +F4:0E:11 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. +F4:0F:1B Cisco F4:0F:9B Wavelink F4:15:FD Shanghai # Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd. F4:1B:A1 Apple @@ -23694,6 +24168,8 @@ F4:1F:0B Yamabish # YAMABISHI Corporation F4:1F:C2 Cisco F4:20:12 Cucinial # Cuciniale GmbH +F4:28:33 Mmpc # MMPC Inc. +F4:28:53 ZioncomE # Zioncom Electronics (Shenzhen) Ltd. F4:28:96 SpectoPa # SPECTO PAINEIS ELETRONICOS LTDA F4:36:E1 AbilisSa # Abilis Systems SARL F4:37:B7 Apple @@ -23737,6 +24213,7 @@ F4:94:66 Countmax # CountMax, ltd F4:99:AC WeberSch # WEBER Schraubautomaten GmbH F4:9F:54 SamsungE # Samsung Electronics +F4:9F:F3 HuaweiTe # Huawei Technologies Co., Ltd F4:A2:94 EagleWor # EAGLE WORLD DEVELOPMENT CO., LIMITED F4:A5:2A HawaTech # Hawa Technologies Inc F4:AC:C1 Cisco # CISCO SYSTEMS, INC. @@ -23756,24 +24233,32 @@ F4:CD:90 Vispiron # Vispiron Rotec GmbH F4:CE:46 Hewlett- # Hewlett-Packard Company F4:CF:E2 Cisco +F4:D0:32 YunnanId # Yunnan Ideal Information&Technology.,Ltd +F4:D2:61 Semocon # SEMOCON Co., Ltd F4:D9:FB SamsungE # Samsung Electronics CO., LTD F4:DC:4D BeijingC # Beijing CCD Digital Technology Co., Ltd F4:DC:DA ZhuhaiJi # Zhuhai Jiahe Communication Technology Co., limited F4:DC:F9 HuaweiTe # Huawei Technologies Co., Ltd +F4:DD:9E Gopro F4:E1:42 DeltaEle # Delta Elektronika BV F4:E6:D7 SolarPow # Solar Power Technologies, Inc. F4:EA:67 Cisco # CISCO SYSTEMS, INC. F4:EC:38 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. F4:F1:5A Apple +F4:F2:6D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. F4:F5:A5 Nokia # Nokia corporation +F4:F5:E8 Google +F4:F6:46 Dediprog # Dediprog Technology Co. Ltd. F4:F9:51 Apple F4:FC:32 TexasIns # Texas Instruments +F4:FD:2B Zoyi # ZOYI Company F8:01:13 HuaweiTe # Huawei Technologies Co., Ltd F8:03:32 Khomp F8:05:1C DrsImagi # DRS Imaging and Targeting Solutions F8:0B:BE ArrisGro # ARRIS Group, Inc. F8:0B:D0 DatangTe # Datang Telecom communication terminal (Tianjin) Co., Ltd. F8:0C:F3 LgElectr # LG Electronics +F8:0D:43 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. F8:0D:EA ZycastTe # ZyCast Technology Inc. F8:0F:41 WistronI # Wistron InfoComm(ZhongShan) Corporation F8:0F:84 NaturalS # Natural Security SAS @@ -23816,16 +24301,19 @@ F8:5F:2A Nokia # Nokia Corporation F8:62:AA Xn # xn systems F8:66:01 SuzhouCh # Suzhou Chi-tek information technology Co., Ltd +F8:66:D1 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. F8:66:F2 Cisco # CISCO SYSTEMS, INC. F8:69:71 SeibuEle # Seibu Electric Co., F8:6E:CF Arcx # Arcx Inc F8:71:FE GoldmanS # The Goldman Sachs Group, Inc. F8:72:EA Cisco +F8:73:94 Netgear # NETGEAR INC., F8:76:9B Neopis # Neopis Co., Ltd. F8:7B:62 FastwelI # FASTWEL INTERNATIONAL CO., LTD. Taiwan Branch F8:7B:7A ArrisGro # ARRIS Group, Inc. F8:7B:8C AmpedWir # Amped Wireless F8:81:1A Overkiz +F8:84:F2 SamsungE # Samsung Electronics Co.,Ltd F8:8C:1C KaishunE # KAISHUN ELECTRONIC TECHNOLOGY CO., LTD. BEIJING F8:8D:EF Tenebrae # Tenebraex F8:8E:85 Comtrend # COMTREND CORPORATION @@ -23850,6 +24338,7 @@ F8:BC:12 Dell # Dell Inc F8:C0:01 JuniperN # Juniper Networks F8:C0:91 Highgate # Highgates Technology +F8:C2:88 Cisco F8:C6:78 Carefusi # Carefusion F8:D0:AC SonyComp # Sony Computer Entertainment Inc. F8:D0:BD SamsungE # Samsung Electronics Co.,Ltd @@ -23899,6 +24388,7 @@ FC:15:B4 HewlettP # Hewlett Packard FC:16:07 TaianTec # Taian Technology(Wuxi) Co.,Ltd. FC:17:94 Intercre # InterCreative Co., Ltd +FC:19:10 SamsungE # Samsung Electronics Co.,Ltd FC:19:D0 CloudVis # Cloud Vision Networks Technology Co.,Ltd. FC:1B:FF V-Zug # V-ZUG AG FC:1D:59 ISmartCi # I Smart Cities HK Ltd @@ -23906,6 +24396,7 @@ FC:1F:19 SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD. FC:1F:C0 Eurecam FC:22:9C HanKyung # Han Kyung I Net Co.,Ltd. +FC:23:25 EostekSh # EosTek (Shenzhen) Co., Ltd. FC:25:3F Apple FC:27:A2 TransEle # TRANS ELECTRIC CO., LTD. FC:2A:54 Connecte # Connected Data, Inc. @@ -23914,7 +24405,7 @@ FC:35:98 Favite # Favite Inc. FC:35:E6 Visteon # Visteon corp FC:3F:AB HenanLan # Henan Lanxin Technology Co., Ltd -FC:44:63 Universa # Universal Audio +FC:44:63 Universa # Universal Audio, Inc FC:44:99 SwarcoLe # Swarco LEA d.o.o. FC:45:5F JiangxiS # JIANGXI SHANSHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD FC:48:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -23932,8 +24423,10 @@ FC:62:6E BeijingM # Beijing MDC Telecom FC:68:3E Directed # Directed Perception, Inc FC:6C:31 Lxinstru # LXinstruments GmbH +FC:6D:C0 Bme # BME CORPORATION FC:75:16 D-LinkIn # D-Link International FC:75:E6 Handream # Handreamnet +FC:79:0B HitachiH # Hitachi High Technologies America, Inc. FC:7C:E7 FciUsaLl # FCI USA LLC FC:83:29 TreiTech # Trei technics FC:83:99 Avaya # Avaya, Inc @@ -23945,9 +24438,11 @@ FC:94:E3 Technico # Technicolor USA Inc. FC:99:47 Cisco FC:9F:AE Fidus # Fidus Systems Inc +FC:9F:E1 ConwinTe # CONWIN.Tech. Ltd FC:A1:3E SamsungE # Samsung Electronics FC:A8:41 Avaya # Avaya, Inc FC:A9:B0 Miartech # MIARTECH (SHANGHAI),INC. +FC:AA:14 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. FC:AD:0F QtsNetwo # QTS NETWORKS FC:AF:6A Conemtec # Conemtech AB FC:B0:C4 Shanghai # Shanghai DareGlobal Technologies Co., Ltd @@ -23960,9 +24455,11 @@ FC:CF:62 Ibm # IBM Corp FC:D4:F2 CocaCola # The Coca Cola Company FC:D4:F6 MessanaA # Messana Air.Ray Conditioning s.r.l. +FC:D5:D9 Shenzhen # Shenzhen SDMC Technology Co., Ltd. FC:D6:BD RobertBo # Robert Bosch GmbH FC:D8:17 BeijingH # Beijing Hesun Technologies Co.Ltd. FC:DB:96 Enervall # ENERVALLEY CO., LTD +FC:DB:B3 MurataMa # Murata Manufacturing Co., Ltd. FC:DD:55 Shenzhen # Shenzhen WeWins wireless Co.,Ltd FC:E1:86 A3m # A3M Co., LTD FC:E1:92 SichuanJ # Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd @@ -23980,6 +24477,7 @@ FC:FA:F7 Shanghai # Shanghai Baud Data Communication Co.,Ltd. FC:FB:FB Cisco # CISCO SYSTEMS, INC. FC:FE:77 HitachiR # Hitachi Reftechno, Inc. +FC:FF:AA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAL public listing for more information. # # Well-known addresses. @@ -24075,6 +24573,8 @@ 01-80-C2-00-00-12 Loadable-Device 01-80-C2-00-00-14 ISIS-all-level-1-IS's 01-80-C2-00-00-15 ISIS-all-level-2-IS's +01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1 +01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests

@@ -2,34 +2,20 @@ # # $Id$ -. /etc/rc.common - -StartService () -{ - # - # Unfortunately, Mac OS X's devfs is based on the old FreeBSD - # one, not the current one, so there's no way to configure it - # to create BPF devices with particular owners or groups. - # This startup item will make it owned by the admin group, - # with permissions rw-rw----, so that anybody in the admin - # group can use programs that capture or send raw packets. - # - # Change this as appropriate for your site, e.g. to make - # it owned by a particular user without changing the permissions, - # so only that user and the super-user can capture or send raw - # packets, or give it the permissions rw-r-----, so that - # only the super-user can send raw packets but anybody in the - # admin group can capture packets. - # - chgrp access_bpf /dev/bpf* - chmod g+rw /dev/bpf* -} - -StopService () -{ - return 0; -} - -RestartService () { StartService; } - -RunService "$1" +# +# Unfortunately, Mac OS X's devfs is based on the old FreeBSD +# one, not the current one, so there's no way to configure it +# to create BPF devices with particular owners or groups. +# This startup item will make it owned by the admin group, +# with permissions rw-rw----, so that anybody in the admin +# group can use programs that capture or send raw packets. +# +# Change this as appropriate for your site, e.g. to make +# it owned by a particular user without changing the permissions, +# so only that user and the super-user can capture or send raw +# packets, or give it the permissions rw-r-----, so that +# only the super-user can send raw packets but anybody in the +# admin group can capture packets. +# +chgrp access_bpf /dev/bpf* +chmod g+rw /dev/bpf*

@@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>Label</key> + <string>org.wireshark.ChmodBPF</string> + <key>RunAtLoad</key> + <true/> + <key>Program</key> + <string>/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF</string> +</dict> +</plist>

@@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.10.6, Copyright 1998-2014 Wireshark Development Team</string> + <string>1.10.8, Copyright 1998-2014 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Wireshark.icns</string> <key>CFBundleIdentifier</key> @@ -56,11 +56,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.10.6</string> + <string>1.10.8</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.10.6</string> + <string>1.10.8</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2014 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>

@@ -13,8 +13,7 @@ EXTRA_DIST = \ ChmodBPF/ChmodBPF \ - ChmodBPF/README.macosx \ - ChmodBPF/StartupParameters.plist \ + ChmodBPF/org.wireshark.ChmodBPF.plist \ dmg_background.png \ dmg_background.svg \ util_background.png \

@@ -335,8 +335,7 @@ EXTRA_DIST = \ ChmodBPF/ChmodBPF \ - ChmodBPF/README.macosx \ - ChmodBPF/StartupParameters.plist \ + ChmodBPF/org.wireshark.ChmodBPF.plist \ dmg_background.png \ dmg_background.svg \ util_background.png \

@@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370 +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 \cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} @@ -36,14 +36,17 @@ \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural \ls2\ilvl0\cf0 {\listtext \'95 } -\i /Applications/Wireshark +\i /Applications/Wireshark.app \i0 . The main Wireshark application.\ {\listtext \'95 } -\i /Library/StartupItems/ChmodBPF -\i0 . A script which adjusts permissions on the system's packet capture devices ( +\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist +\i0 . A launch daemon that adjusts permissions on the system's packet capture devices ( \i /dev/bpf \i0 *) when the system starts up.\ {\listtext \'95 } +\i /Library/Application Support/Wireshark/ChmodBPF +\i0 A copy of the launch daemon property list, and the script that the launch daemon runs.\ +{\listtext \'95 } \i /usr/local/bin \i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /usr/local/bin to your PATH if it's not already in your PATH.\ \pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural @@ -63,13 +66,19 @@ \f1 \cf0 {\listtext 1. }Remove \i /Applications/Wireshark \i0 \ -{\listtext 2. }Remove the wrapper scripts from +{\listtext 2. }Remove +\i /Library/Application Support/Wireshark +\i0 \ +{\listtext 3. }Remove the wrapper scripts from \i /usr/local/bin \i0 \ -{\listtext 3. }Remove -\i /Library/StartupItems/ChmodBPF +{\listtext 4. }Unload the +\i org.wireshark.ChmodBPF.plist +\i0 launchd job\ +{\listtext 5. }Remove +\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist \i0 \ -{\listtext 4. }Remove the +{\listtext 6. }Remove the \i access_bpf \i0 group.\ } \ No newline at end of file

@@ -1,7 +1,6 @@ #!/bin/sh -CHMOD_BPF_DIR="/Library/StartupItems/ChmodBPF" -CHMOD_BPF="$CHMOD_BPF_DIR/ChmodBPF" +CHMOD_BPF="/Library/LaunchDaemons/org.wireshark.ChmodBPF.plist" BPF_GROUP="access_bpf" BPF_GROUP_NAME="BPF device access ACL" @@ -9,6 +8,11 @@ dseditgroup -q -o create "$BPF_GROUP" dseditgroup -q -o edit -a "$USER" -t user "$BPF_GROUP" -chmod -R go-w "$CHMOD_BPF_DIR" +cp "/Library/Application Support/Wireshark/ChmodBPF/org.wireshark.ChmodBPF.plist" \ + "$CHMOD_BPF" +chmod 755 "$CHMOD_BPF" +chown root:wheel "$CHMOD_BPF" -sh "$CHMOD_BPF" start +rm -rf /Library/StartupItems/ChmodBPF + +launchctl load "$CHMOD_BPF"

@@ -1 +1 @@ -<pkgref spec="1.12" uuid="67B4E446-7EE6-4D65-9616-CECAA7FB2094"><config><identifier>org.wireshark.ChmodBPF.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">ChmodBPF</installFrom><installTo mod="true">/Library/StartupItems</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>extraFiles</mod><mod>installTo.path</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/chmodbpf-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/><additionalPkgInfoXML><pkg-info><scripts><postinstall file="./postinstall"/></scripts></pkg-info></additionalPkgInfoXML></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="67B4E446-7EE6-4D65-9616-CECAA7FB2094"><config><identifier>org.wireshark.ChmodBPF.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">ChmodBPF</installFrom><installTo mod="true">/Library/Application Support/Wireshark</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>extraFiles</mod><mod>installTo.path</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/chmodbpf-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/><additionalPkgInfoXML><pkg-info><scripts><postinstall file="./postinstall"/></scripts></pkg-info></additionalPkgInfoXML></pkgref>

@@ -1 +1 @@ -<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF startup item and add an access_bpf group" description="This installs a startup item (ChmodBPF) that changes the group permissions of each BPF device to allow access for the "access_bpf" group. It creates the "access_bpf" group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires Mac OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc> +<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF launch daemon and add an access_bpf group" description="This installs a launch daemon (org.wireshark.ChmodBPF.plist) that changes the group permissions of each BPF device to allow access for the "access_bpf" group. It creates the "access_bpf" group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires Mac OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>

@@ -311,7 +311,7 @@ { FR_RESP_AFTER_PERIOD, "Send response(s) after the specified period expires following a conforming message" }, { FR_IGNORE_DURING_PER, - "Send response(s) for a conforming message and ignore\nfurther messages until the specified period expires" }, + "Send response(s) for a conforming message and ignore further messages until the specified period expires" }, { 0, NULL } };

@@ -91,7 +91,7 @@ static gboolean write_headers = FALSE; -static const gchar *get_field_hex_value(GSList *src_list, field_info *fi); +static gchar *get_field_hex_value(GSList *src_list, field_info *fi); static void proto_tree_print_node(proto_node *node, gpointer data); static void proto_tree_write_node_pdml(proto_node *node, gpointer data); static const guint8 *get_field_data(GSList *src_list, field_info *fi); @@ -297,7 +297,6 @@ const gchar *label_ptr; gchar label_str[ITEM_LABEL_LENGTH]; char *dfilter_string; - size_t chop_len; int i; gboolean wrap_in_fake_protocol; @@ -428,26 +427,13 @@ fputs("\" show=\"\" value=\"", pdata->fh); break; default: - /* XXX - this is a hack until we can just call - * fvalue_to_string_repr() for *all* FT_* types. */ - dfilter_string = proto_construct_match_selected_string(fi, - pdata->edt); + dfilter_string = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); if (dfilter_string != NULL) { - chop_len = strlen(fi->hfinfo->abbrev) + 4; /* for " == " */ - - /* XXX - Remove double-quotes. Again, once we - * can call fvalue_to_string_repr(), we can - * ask it not to produce the version for - * display-filters, and thus, no - * double-quotes. */ - if (dfilter_string[strlen(dfilter_string)-1] == '"') { - dfilter_string[strlen(dfilter_string)-1] = '\0'; - chop_len++; - } fputs("\" show=\"", pdata->fh); - print_escaped_xml(pdata->fh, &dfilter_string[chop_len]); + print_escaped_xml(pdata->fh, dfilter_string); } + g_free(dfilter_string); /* * XXX - should we omit "value" for any fields? @@ -1584,7 +1570,7 @@ /* print the value of all accurrences of the field */ /* If not the first, add the 'aggregator' */ if (g_ptr_array_len(fv_p) > 0) { - g_ptr_array_add(fv_p, (gpointer)ep_strdup_printf("%c", fields->aggregator)); + g_ptr_array_add(fv_p, (gpointer)g_strdup_printf("%c", fields->aggregator)); } break; default: @@ -1610,7 +1596,7 @@ field_index = g_hash_table_lookup(call_data->fields->field_indicies, fi->hfinfo->abbrev); if (NULL != field_index) { format_field_values(call_data->fields, field_index, - get_node_field_value(fi, call_data->edt) /* static or ep_alloc'd string */ + get_node_field_value(fi, call_data->edt) /* g_ alloc'd string */ ); } @@ -1672,7 +1658,7 @@ field_index = g_hash_table_lookup(fields->field_indicies, col_name); if (NULL != field_index) { - format_field_values(fields, field_index, cinfo->col_data[col]); + format_field_values(fields, field_index, g_strdup(cinfo->col_data[col])); } } } @@ -1683,6 +1669,7 @@ } if (NULL != fields->field_values[i]) { GPtrArray *fv_p; + gchar * str; gsize j; fv_p = fields->field_values[i]; if (fields->quote != '\0') { @@ -1691,7 +1678,9 @@ /* Output the array of (partial) field values */ for (j = 0; j < g_ptr_array_len(fv_p); j++ ) { - fputs((gchar *)g_ptr_array_index(fv_p, j), fh); + str = (gchar *)g_ptr_array_index(fv_p, j); + fputs(str, fh); + g_free(str); } if (fields->quote != '\0') { fputc(fields->quote, fh); @@ -1707,14 +1696,14 @@ /* Nothing to do */ } -/* Returns an ep_alloced string or a static constant*/ -const gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt) +/* Returns an g_malloced string */ +gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt) { if (fi->hfinfo->id == hf_text_only) { /* Text label. * Get the text */ if (fi->rep) { - return fi->rep->representation; + return g_strdup(fi->rep->representation); } else { return get_field_hex_value(edt->pi.data_src, fi); @@ -1728,41 +1717,25 @@ else { /* Normal protocols and fields */ gchar *dfilter_string; - size_t chop_len; switch (fi->hfinfo->type) { case FT_PROTOCOL: /* Print out the full details for the protocol. */ if (fi->rep) { - return fi->rep->representation; + return g_strdup(fi->rep->representation); } else { /* Just print out the protocol abbreviation */ - return fi->hfinfo->abbrev; + return g_strdup(fi->hfinfo->abbrev); } case FT_NONE: /* Return "1" so that the presence of a field of type * FT_NONE can be checked when using -T fields */ - return "1"; + return g_strdup("1"); default: - /* XXX - this is a hack until we can just call - * fvalue_to_string_repr() for *all* FT_* types. */ - dfilter_string = proto_construct_match_selected_string(fi, - edt); + dfilter_string = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); if (dfilter_string != NULL) { - chop_len = strlen(fi->hfinfo->abbrev) + 4; /* for " == " */ - - /* XXX - Remove double-quotes. Again, once we - * can call fvalue_to_string_repr(), we can - * ask it not to produce the version for - * display-filters, and thus, no - * double-quotes. */ - if (dfilter_string[strlen(dfilter_string)-1] == '"') { - dfilter_string[strlen(dfilter_string)-1] = '\0'; - chop_len++; - } - - return &(dfilter_string[chop_len]); + return dfilter_string; } else { return get_field_hex_value(edt->pi.data_src, fi); } @@ -1770,7 +1743,7 @@ } } -static const gchar* +static gchar* get_field_hex_value(GSList *src_list, field_info *fi) { const guint8 *pd; @@ -1779,7 +1752,7 @@ return NULL; if (fi->length > tvb_length_remaining(fi->ds_tvb, fi->start)) { - return "field length invalid!"; + return g_strdup("field length invalid!"); } /* Find the data for this field. */ @@ -1793,7 +1766,7 @@ const int chars_per_byte = 2; len = chars_per_byte * fi->length; - buffer = ep_alloc_array(gchar, len + 1); + buffer = (gchar *)g_malloc(sizeof(gchar)*(len + 1)); buffer[len] = '\0'; /* Ensure NULL termination in bad cases */ p = buffer; /* Print a simple hex dump */

@@ -158,7 +158,7 @@ extern void proto_tree_write_fields(output_fields_t* fields, epan_dissect_t *edt, column_info *cinfo, FILE *fh); extern void write_fields_finale(output_fields_t* fields, FILE *fh); -extern const gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt); +extern gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt); #ifdef __cplusplus }

@@ -900,9 +900,8 @@ guchar *ptr = (guchar*) &disk_hdr; static gchar err_str[100]; - memset(&mem_hdr, 0, sizeof(mem_hdr)); - if (want_pcap_pkthdr) { + bytes_needed = sizeof(mem_hdr); ptr = (guchar*) &mem_hdr; }

@@ -1368,8 +1368,8 @@ dhcp-failover2 847/udp # dhcp-failover 2 [Bernard_Volz] [Bernard_Volz] gdoi 848/tcp # GDOI [RFC3547] gdoi 848/udp # GDOI [RFC3547] -iscsi 860/tcp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] -iscsi 860/udp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] +iscsi 860/tcp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC7143] +iscsi 860/udp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC7143] owamp-control 861/tcp # OWAMP-Control [RFC4656] owamp-control 861/udp # OWAMP-Control [RFC4656] twamp-control 862/tcp # Two-way Active Measurement Protocol (TWAMP) Control [RFC5357] @@ -1605,8 +1605,8 @@ icp 1112/tcp # Intelligent Communication Protocol [Mark_H_David] [Mark_H_David] icp 1112/udp # Intelligent Communication Protocol [Mark_H_David] [Mark_H_David] ltp-deepspace 1113/tcp # Licklider Transmission Protocol [RFC5326] -ltp-deepspace 1113/udp # Licklider Transmission Protocol 2014-02-21 [RFC5326][RFC-irtf-dtnrg-dgram-clayer] -ltp-deepspace 1113/dccp # Licklider Transmission Protocol 2013-11-12 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer-05] 7107696 +ltp-deepspace 1113/udp # Licklider Transmission Protocol 2014-02-21 [RFC5326][RFC7122] +ltp-deepspace 1113/dccp # Licklider Transmission Protocol 2013-11-12 2014-02-21 [RFC7122] 7107696 mini-sql 1114/tcp # Mini SQL [David_Hughes] [David_Hughes] mini-sql 1114/udp # Mini SQL [David_Hughes] [David_Hughes] ardus-trns 1115/tcp # ARDUS Transfer @@ -1934,8 +1934,6 @@ t1distproc 1274/udp # t1distproc [Julian_Biddle] [Julian_Biddle] ivcollector 1275/tcp # ivcollector ivcollector 1275/udp # ivcollector -ivmanager 1276/tcp # ivmanager [Xavier_Roques] [Xavier_Roques] -ivmanager 1276/udp # ivmanager [Xavier_Roques] [Xavier_Roques] miva-mqs 1277/tcp # mqs [Miva_Corporation] [Miva_Corporation] miva-mqs 1277/udp # mqs [Miva_Corporation] [Miva_Corporation] dellwebadmin-1 1278/tcp # Dell Web Admin 1 @@ -2720,8 +2718,8 @@ dec-mbadmin-h 1656/udp # dec-mbadmin-h [Nick_Shipman] [Nick_Shipman] fujitsu-mmpdc 1657/tcp # fujitsu-mmpdc [Katsumi_Oomuro] [Katsumi_Oomuro] fujitsu-mmpdc 1657/udp # fujitsu-mmpdc [Katsumi_Oomuro] [Katsumi_Oomuro] -sixnetudr 1658/tcp # sixnetudr [Bob_Rennie] [Bob_Rennie] -sixnetudr 1658/udp # sixnetudr [Bob_Rennie] [Bob_Rennie] +sixnetudr 1658/tcp # sixnetudr [Red_Lion_Controls] [Denis_Aull] 2014-05-21 +sixnetudr 1658/udp # sixnetudr [Red_Lion_Controls] [Denis_Aull] 2014-05-21 sg-lm 1659/tcp # Silicon Grail License Manager [William_R_Bishop] [William_R_Bishop] sg-lm 1659/udp # Silicon Grail License Manager [William_R_Bishop] [William_R_Bishop] skip-mc-gikreq 1660/tcp # skip-mc-gikreq [Tom_Markson] [Tom_Markson] @@ -2955,6 +2953,7 @@ kmscontrol 1773/udp # KMSControl [Roy_Chastain] [Roy_Chastain] global-dtserv 1774/tcp # global-dtserv [Nicholas_Davies] [Nicholas_Davies] global-dtserv 1774/udp # global-dtserv [Nicholas_Davies] [Nicholas_Davies] +vdab 1775/tcp # data interchange between visual processing containers [MJA_Technology_LLC] [Mark_J._App] 2014-04-23 femis 1776/tcp # Federal Emergency Management Information System [Larry_Gerhardstein] [Larry_Gerhardstein] femis 1776/udp # Federal Emergency Management Information System [Larry_Gerhardstein] [Larry_Gerhardstein] powerguardian 1777/tcp # powerguardian [Charles_Bennett] [Charles_Bennett] 2008-08-29 @@ -4145,14 +4144,15 @@ service-ctrl 2367/udp # Service Control [Humberto_Sanchez] [Humberto_Sanchez] opentable 2368/tcp # OpenTable [Brett_Goldstein] [Brett_Goldstein] opentable 2368/udp # OpenTable [Brett_Goldstein] [Brett_Goldstein] -l3-hbmon 2370/tcp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Port 2370 Unofficially used by Compaq -l3-hbmon 2370/udp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Port 2370 Unofficially used by Compaq -worldwire 2371/tcp # Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] -worldwire 2371/udp # Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] +l3-hbmon 2370/tcp # L3-HBMon [Dolores_Scott] [Dolores_Scott] 2014-04-09 +l3-hbmon 2370/udp # L3-HBMon [Dolores_Scott] [Dolores_Scott] 2014-04-09 +hp-rda 2371/tcp # HP Remote Device Access [Hewlett_Packard_3] [Michael_Spratte][Steve_Roscio] 2014-04-09 lanmessenger 2372/tcp # LanMessenger [Garrett_Padera] [Garrett_Padera] 2008-02-01 lanmessenger 2372/udp # LanMessenger [Garrett_Padera] [Garrett_Padera] 2008-02-01 remographlm 2373/tcp # Remograph License Manager [Per_Fahlberg] [Per_Fahlberg] 2009-01-21 hydra 2374/tcp # Hydra RPC [Jacob_Feisley] [Jacob_Feisley] 2009-01-21 +docker 2375/tcp # Docker REST API (plain text) [DOCKER] [Christopher_Liljenstolpe] 2014-04-17 +docker-s 2376/tcp # Docker REST API (ssl) [DOCKER] [Christopher_Liljenstolpe] 2014-04-17 compaq-https 2381/tcp # Compaq HTTPS [Scott_Shaffer] [Scott_Shaffer] compaq-https 2381/udp # Compaq HTTPS [Scott_Shaffer] [Scott_Shaffer] ms-olap3 2382/tcp # Microsoft OLAP @@ -5100,8 +5100,7 @@ ispipes 2853/udp # ISPipes [Rajesh_Nandyalam] [Rajesh_Nandyalam] infomover 2854/tcp # InfoMover [Carla_Caputo] [Carla_Caputo] infomover 2854/udp # InfoMover [Carla_Caputo] [Carla_Caputo] -msrp 2855/tcp # MSRP over TCP [RFC4975] -msrp 2855/udp # MSRP [RFC4975] +msrp 2855/tcp # MSRP over TCP 2014-04-09 [RFC4976] cesdinv 2856/tcp # cesdinv [Yoshiaki_Tokumoto] [Yoshiaki_Tokumoto] cesdinv 2856/udp # cesdinv [Yoshiaki_Tokumoto] [Yoshiaki_Tokumoto] simctlp 2857/tcp # SimCtIP [Christian_Zietz] [Christian_Zietz] @@ -5536,8 +5535,8 @@ videobeans 3058/udp # videobeans [Hiroyuki_Takahashi] [Hiroyuki_Takahashi] qsoft 3059/tcp # qsoft [James_Kunz] [James_Kunz] qsoft 3059/udp # qsoft [James_Kunz] [James_Kunz] -interserver 3060/tcp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] -interserver 3060/udp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] +interserver 3060/tcp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] Known Unauthorized Use on port 3060 +interserver 3060/udp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] Known Unauthorized Use on port 3060 cautcpd 3061/tcp # cautcpd cautcpd 3061/udp # cautcpd ncacn-ip-tcp 3062/tcp # ncacn-ip-tcp @@ -5674,8 +5673,8 @@ netport-id 3129/udp # NetPort Discovery Port [P_T_K_Farrar] [P_T_K_Farrar] icpv2 3130/tcp # ICPv2 [Duane_Wessels] [Duane_Wessels] icpv2 3130/udp # ICPv2 [Duane_Wessels] [Duane_Wessels] -netbookmark 3131/tcp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] -netbookmark 3131/udp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] +netbookmark 3131/tcp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] Known Unauthorized Use on port 3131 +netbookmark 3131/udp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] Known Unauthorized Use on port 3131 ms-rule-engine 3132/tcp # Microsoft Business Rule Engine Update Service [Anush_Kumar] [Anush_Kumar] ms-rule-engine 3132/udp # Microsoft Business Rule Engine Update Service [Anush_Kumar] [Anush_Kumar] prism-deploy 3133/tcp # Prism Deploy User Port [Joan_Linck] [Joan_Linck] @@ -5932,8 +5931,8 @@ ivecon-port 3258/udp # Ivecon Server Port [Serguei_Tevs] [Serguei_Tevs] 2002-02 epncdp2 3259/tcp # Epson Network Common Devi [Oishi_Toshiaki] [Oishi_Toshiaki] 2002-02 epncdp2 3259/udp # Epson Network Common Devi [Oishi_Toshiaki] [Oishi_Toshiaki] 2002-02 -iscsi-target 3260/tcp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] -iscsi-target 3260/udp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] +iscsi-target 3260/tcp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC7143] +iscsi-target 3260/udp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC7143] winshadow 3261/tcp # winShadow [Colin_Barry] [Colin_Barry] winshadow 3261/udp # winShadow [Colin_Barry] [Colin_Barry] necp 3262/tcp # NECP [Alberto_Cerpa] [Alberto_Cerpa] @@ -6916,6 +6915,7 @@ mni-prot-rout 3764/udp # MNI Protected Routing [Tim_Behne] [Tim_Behne] 2003-06 rtraceroute 3765/tcp # Remote Traceroute [A_Blake_Cooper] [A_Blake_Cooper] 2003-06 rtraceroute 3765/udp # Remote Traceroute [A_Blake_Cooper] [A_Blake_Cooper] 2003-06 +sitewatch-s 3766/tcp # SSL e-watch sitewatch server [e-Watch_Corporation] [John_M_Baird_2] 2014-05-13 this port was previously updated on 2009-06-19 listmgr-port 3767/tcp # ListMGR Port [Takashi_Kubota] [Takashi_Kubota] 2003-06 listmgr-port 3767/udp # ListMGR Port [Takashi_Kubota] [Takashi_Kubota] 2003-06 rblcheckd 3768/tcp # rblcheckd server daemon [Sabri_Berisha] [Sabri_Berisha] 2003-06 @@ -7819,6 +7819,10 @@ jaxer-manager 4328/udp # Jaxer Manager Command Protocol [Uri_Sarid] [Uri_Sarid] 2008-01-22 publiqare-sync 4329/tcp # PubliQare Distributed Environment Synchronisation Engine [Tom_Maaswinkel] [Tom_Maaswinkel] 2011-02-07 dey-sapi 4330/tcp # DEY Storage Administration REST API [DEY_Storage_Systems_Inc] [Garrett_D_Amore] 2013-03-01 +ktickets-rest 4331/tcp # ktickets REST API for event management and ticketing systems (embedded POS devices) [KeyTicket_Solutions] [MANG_Ioan-Alexandru] 2014-04-04 +ahsp 4333/tcp # ArrowHead Service Protocol (AHSP) [QuantuMatriX_Technologies] [Matthew_Schultz] 2014-04-10 +ahsp 4333/udp # ArrowHead Service Protocol (AHSP) [QuantuMatriX_Technologies] [Matthew_Schultz] 2014-04-10 +ahsp 4333/sctp # ArrowHead Service Protocol (AHSP) [QuantuMatriX_Technologies] [Matthew_Schultz] 2014-04-10 gaia 4340/tcp # Gaia Connector Protocol [Philippe_Detournay] [Philippe_Detournay] 2007-11-12 gaia 4340/udp # Gaia Connector Protocol [Philippe_Detournay] [Philippe_Detournay] 2007-11-12 lisp-data 4341/tcp # LISP Data Packets [Dino_Farinacci] [Dino_Farinacci] 2007-11-12 @@ -7934,8 +7938,8 @@ netblox 4441/udp # Netblox Protocol [Brian_S_Locke] [Brian_S_Locke] 2008-07-10 saris 4442/tcp # Saris saris 4442/udp # Saris -pharos 4443/tcp # Pharos [TeleConsult] [TeleConsult] -pharos 4443/udp # Pharos [TeleConsult] [TeleConsult] +pharos 4443/tcp # Pharos [TeleConsult] [TeleConsult] Known Unauthorized Use on port 4443 +pharos 4443/udp # Pharos [TeleConsult] [TeleConsult] Known Unauthorized Use on port 4443 krb524 4444/tcp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] krb524 assigned the port, nv used it without an assignment krb524 4444/udp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] krb524 assigned the port, nv used it without an assignment nv-video 4444/tcp # NV Video default [Ron_Frederick] [Ron_Frederick] krb524 assigned the port, nv used it without an assignment @@ -8009,9 +8013,9 @@ msfrs 4554/udp # MS FRS Replication [Kev_George] [Kev_George] 2006-09 rsip 4555/tcp # RSIP Port [RFC3103] rsip 4555/udp # RSIP Port [RFC3103] -dtn-bundle-tcp 4556/tcp # DTN Bundle TCP CL Protocol -dtn-bundle 4556/udp # DTN Bundle UDP CL Protocol 2006-11 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer] -dtn-bundle 4556/dccp # DTN Bundle DCCP CL Protocol 2013-11-12 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer] 1685351985 +dtn-bundle 4556/tcp # DTN Bundle TCP CL Protocol [Simon_Perreault] [Simon_Perreault] 2014-03-12 [draft-irtf-dtnrg-tcp-clayer] +dtn-bundle 4556/udp # DTN Bundle UDP CL Protocol 2006-11 2014-02-21 [RFC7122] +dtn-bundle 4556/dccp # DTN Bundle DCCP CL Protocol 2013-11-12 2014-02-21 [RFC7122] 1685351985 mtcevrunqss 4557/udp # Marathon everRun Quorum Service Server [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 mtcevrunqman 4558/udp # Marathon everRun Quorum Service Manager [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 hylafax 4559/tcp # HylaFAX [Lee_Howard] [Lee_Howard] 2002-03 @@ -8050,6 +8054,7 @@ piranha2 4601/udp # Piranha2 [Primark_Corporation] [Primark_Corporation] mtsserver 4602/tcp # EAX MTS Server [Pedro_A_Rodriguez] [Pedro_A_Rodriguez] 2008-08-06 menandmice-upg 4603/tcp # Men & Mice Upgrade Agent [Eggert_Thorlacius_2] [Eggert_Thorlacius_2] 2010-01-27 +irp 4604/tcp # Identity Registration Protocol [Sixscape_Communications_Ltd] [Lawrence_E._Hughes] 2014-03-17 playsta2-app 4658/tcp # PlayStation2 App Port playsta2-app 4658/udp # PlayStation2 App Port playsta2-lob 4659/tcp # PlayStation2 Lobby Port [Noam_Rimon] [Noam_Rimon] 2004-12 @@ -8260,6 +8265,7 @@ bones 4914/tcp # Bones Remote Control [Andreas_Foedrowitz] [Andreas_Foedrowitz] 2008-06-18 bones 4914/udp # Bones Remote Control [Andreas_Foedrowitz] [Andreas_Foedrowitz] 2008-06-18 frcs 4915/tcp # Fibics Remote Control Service [Ken_Lagarec] [Ken_Lagarec] 2009-04-17 +an-signaling 4936/udp # Signal protocol port for autonomic networking [Cisco_systems_3] [Toerless_Eckert_2] 2014-06-06 atsc-mh-ssc 4937/udp # ATSC-M/H Service Signaling Channel [Jerry_Whitaker] [Jerry_Whitaker] 2008-10-27 eq-office-4940 4940/tcp # Equitrac Office eq-office-4940 4940/udp # Equitrac Office @@ -8381,10 +8387,12 @@ locus-disc 5058/udp # Locus Discovery [Alan_King] [Alan_King] 2009-08-13 sds 5059/tcp # SIP Directory Services [Arthur_Wilton] [Arthur_Wilton] 2006-03 sds 5059/udp # SIP Directory Services [Arthur_Wilton] [Arthur_Wilton] 2006-03 -sip 5060/tcp # SIP [Henning_Schulzrinne] [Henning_Schulzrinne] -sip 5060/udp # SIP [Henning_Schulzrinne] [Henning_Schulzrinne] -sip-tls 5061/tcp # SIP-TLS [Henning_Schulzrinne] [Henning_Schulzrinne] -sip-tls 5061/udp # SIP-TLS [Henning_Schulzrinne] [Henning_Schulzrinne] +sip 5060/tcp # SIP 2014-04-09 [RFC3263] +sip 5060/udp # SIP 2014-04-09 [RFC3263] +sip 5060/sctp # SIP [RFC4168] +sips 5061/tcp # SIP-TLS 2014-04-09 [RFC3263] +sips 5061/udp # SIP-TLS 2014-04-09 [RFC3263] +sips 5061/sctp # SIP-TLS [RFC4168] na-localise 5062/tcp # Localisation access [Jean_Pierre_Garcia_2] [Jean_Pierre_Garcia_2] 2009-10-28 na-localise 5062/udp # Localisation access [Jean_Pierre_Garcia_2] [Jean_Pierre_Garcia_2] 2009-10-28 csrpc 5063/tcp # centrify secure RPC [Paul_Moore] [Paul_Moore] 2009-10-28 @@ -8442,6 +8450,7 @@ actifio-c2c 5103/tcp # Actifio C2C [Ravi_Kollipara] [Ravi_Kollipara] 2010-06-18 tinymessage 5104/udp # TinyMessage [Josip_Medved] [Josip_Medved] 2010-10-20 hughes-ap 5105/udp # Hughes Association Protocol [Varun_Santosh] [Varun_Santosh] 2010-10-20 +actifioudsagent 5106/tcp # Actifio UDS Agent [Actifio] [Madhav_Mutalik] 2014-06-05 taep-as-svc 5111/tcp # TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05 taep-as-svc 5111/udp # TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05 pm-cmdsvr 5112/tcp # PeerMe Msg Cmd Service [Marcos_Della] [Marcos_Della] 2005-08 @@ -8480,7 +8489,7 @@ rugameonline 5156/tcp # Russian Online Game [Andrey_Mohov] [Andrey_Mohov] 2010-08-17 mediat 5157/tcp # Mediat Remote Object Exchange [Oliver_Anan] [Oliver_Anan] 2010-09-02 snmpssh 5161/tcp # SNMP over SSH Transport Model [RFC5592] -snmpssh-trap 5162/tcp # SNMP Notification over SSH Transport Model [RFC5592] +snmpssh-trap 5162/tcp # SNMP Notification over SSH Transport Model [RFC5592] Known Unauthorized Use on port 5162 sbackup 5163/tcp # Shadow Backup [Glenn_Allen] [Glenn_Allen] 2009-08-05 vpa 5164/tcp # Virtual Protocol Adapter [Douglas_Goodall] [Douglas_Goodall] 2009-08-05 vpa-disc 5164/udp # Virtual Protocol Adapter Discovery [Douglas_Goodall] [Douglas_Goodall] 2009-08-05 @@ -8494,6 +8503,7 @@ scte104 5167/udp # SCTE104 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 scte30 5168/tcp # SCTE30 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 scte30 5168/udp # SCTE30 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 +pcoip-mgmt 5172/tcp # PC over IP Endpoint Management [Teradici_2] [Paul_Helter] 2014-04-28 aol 5190/tcp # America-Online [Marty_Lyons] [Marty_Lyons] aol 5190/udp # America-Online [Marty_Lyons] [Marty_Lyons] aol-1 5191/tcp # AmericaOnline1 [Bruce_Mackey] [Bruce_Mackey] @@ -8765,8 +8775,8 @@ sgi-esphttp 5554/udp # SGI ESP HTTP [Vladimir_Legalov] [Vladimir_Legalov] personal-agent 5555/tcp # Personal Agent [Jackie_Wu] [Jackie_Wu] Known UNAUTHORIZED USEs on port 5555 personal-agent 5555/udp # Personal Agent [Jackie_Wu] [Jackie_Wu] Known UNAUTHORIZED USEs on port 5555 -freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 -freeciv 5556/udp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 +freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 Known Unauthorized Use on port 5556 +freeciv 5556/udp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 Known Unauthorized Use on port 5556 farenet 5557/tcp # Sandlab FARENET [Kay_T_Labinsky] [Kay_T_Labinsky] 2010-05-03 westec-connect 5566/tcp # Westec Connect [Jon_Bolen] [Jon_Bolen] 2009-03-18 enc-eps-mc-sec 5567/tcp # EMIT protocol stack multicast/secure transport [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2004-11 2012-11-12 @@ -9004,8 +9014,8 @@ consul-insight 5992/udp # Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01 cvsup 5999/tcp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] cvsup 5999/udp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] -x11 6000-6063/tcp # X Window System [Stephen_Gildea] [Stephen_Gildea] -x11 6000-6063/udp # X Window System [Stephen_Gildea] [Stephen_Gildea] +x11 6000-6063/tcp # X Window System [Stephen_Gildea] [Stephen_Gildea] Known Unauthorized Use on port 6003 +x11 6000-6063/udp # X Window System [Stephen_Gildea] [Stephen_Gildea] Known Unauthorized Use on port 6003 ndl-ahp-svc 6064/tcp # NDL-AHP-SVC [John_Richmond_2] [John_Richmond_2] ndl-ahp-svc 6064/udp # NDL-AHP-SVC [John_Richmond_2] [John_Richmond_2] winpharaoh 6065/tcp # WinPharaoh [Basil_Lee] [Basil_Lee] @@ -9028,6 +9038,7 @@ dpm-acm 6075/tcp # Microsoft DPM Access Control Manager [Prabu_Ambravaneswara] [Prabu_Ambravaneswara] 2009-10-29 msft-dpm-cert 6076/tcp # Microsoft DPM WCF Certificates [Microsoft_Corporation] [Prateek_Sharma] 2011-08-04 iconstructsrv 6077/tcp # iConstruct Server [iConstruct_Aus_Pty_Ltd] [Afshin_Jafari] 2012-12-21 +geneve 6081/udp # Generic Network Virtualization Encapsulation (Geneve) [Jesse_Gross] [Jesse_Gross] 2014-03-27 [draft-gross-geneve-00] p25cai 6082/udp # APCO Project 25 Common Air Interface - UDP encapsulation [APCO_Project] [APCO_Project] 2011-05-13 miami-bcast 6083/udp # telecomsoftware miami broadcast [Peter_Steiner] [Peter_Steiner] 2011-02-22 reload-config 6084/tcp # Peer to Peer Infrastructure Configuration [IESG] [IETF_Chair] 2009-01-29 2013-03-26 [RFC6940] @@ -9040,8 +9051,8 @@ doglms 6088/tcp # SuperDog License Manager [SafeNet] [Rob_Tao] 2012-07-26 doglms-notify 6088/udp # SuperDog License Manager Notifier [SafeNet] [Rob_Tao] 2012-07-26 raxa-mgmt 6099/tcp # RAXA Management [Sukanta_Ganguly] [Sukanta_Ganguly] -synchronet-db 6100/tcp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] -synchronet-db 6100/udp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] +synchronet-db 6100/tcp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] Known Unauthorized Use on port 6100 +synchronet-db 6100/udp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] Known Unauthorized Use on port 6100 synchronet-rtc 6101/tcp # SynchroNet-rtc [Arne_Haugland] [Arne_Haugland] synchronet-rtc 6101/udp # SynchroNet-rtc [Arne_Haugland] [Arne_Haugland] synchronet-upd 6102/tcp # SynchroNet-upd [Arne_Haugland] [Arne_Haugland] @@ -9111,8 +9122,8 @@ patrol-coll 6162/udp # PATROL Collector [Portnoy_Boxman] [Portnoy_Boxman] 2005-01 pscribe 6163/tcp # Precision Scribe Cnx Port [Robert_W_Hodges] [Robert_W_Hodges] 2005-01 pscribe 6163/udp # Precision Scribe Cnx Port [Robert_W_Hodges] [Robert_W_Hodges] 2005-01 -lm-x 6200/tcp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 -lm-x 6200/udp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 +lm-x 6200/tcp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 Known Unauthorized Use on port 6200 +lm-x 6200/udp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 Known Unauthorized Use on port 6200 thermo-calc 6201/udp # Management of service nodes in a processing grid for thermodynamic calculations [Thermo-Calc_Software] [Thomas_Revesz] 2012-06-28 radmind 6222/tcp # Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 radmind 6222/udp # Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 @@ -9190,6 +9201,7 @@ nim-wan 6421/tcp # NIM_WAN [Rik_Ditter] [Rik_Ditter] 2006-02 nim-wan 6421/udp # NIM_WAN [Rik_Ditter] [Rik_Ditter] 2006-02 pgbouncer 6432/tcp # PgBouncer [Marko_Kreen] [Marko_Kreen] 2009-02-13 +tarp 6442/tcp # Transitory Application Request Protocol [Chris_Peel_2] [Chris_Peel_2] 2014-05-16 sun-sr-https 6443/tcp # Service Registry Default HTTPS Domain [Paul_Sterk] [Paul_Sterk] 2006-03 sun-sr-https 6443/udp # Service Registry Default HTTPS Domain [Paul_Sterk] [Paul_Sterk] 2006-03 sge-qmaster 6444/tcp # Grid Engine Qmaster ServiceIANA assigned this well-formed service name as a replacement for "sge_qmaster". [Andreas_Haas] [Andreas_Haas] 2006-08 @@ -9230,8 +9242,8 @@ sun-sr-admin 6489/udp # Service Registry Default Admin Domain [Paul_Sterk] [Paul_Sterk] 2006-03 boks 6500/tcp # BoKS Master [Magnus_Nystrom] [Magnus_Nystrom] boks 6500/udp # BoKS Master [Magnus_Nystrom] [Magnus_Nystrom] -boks-servc 6501/tcp # BoKS ServcIANA assigned this well-formed service name as a replacement for "boks_servc". [Magnus_Nystrom] [Magnus_Nystrom] -boks_servc 6501/tcp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] This entry is an alias to "boks-servc".This entry is now historic, not usable for use with manycommon service discovery mechanisms. +boks-servc 6501/tcp # BoKS ServcIANA assigned this well-formed service name as a replacement for "boks_servc". [Magnus_Nystrom] [Magnus_Nystrom] Known Unauthorized Use on port 6501 +boks_servc 6501/tcp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] Known Unauthorized Use on port 6501 This entry is an alias to "boks-servc".This entry is now historic, not usable for use with manycommon service discovery mechanisms. boks-servc 6501/udp # BoKS ServcIANA assigned this well-formed service name as a replacement for "boks_servc". [Magnus_Nystrom] [Magnus_Nystrom] boks_servc 6501/udp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] This entry is an alias to "boks-servc".This entry is now historic, not usable for use with manycommon service discovery mechanisms. boks-servm 6502/tcp # BoKS ServmIANA assigned this well-formed service name as a replacement for "boks_servm". [Magnus_Nystrom] [Magnus_Nystrom] @@ -9439,16 +9451,16 @@ iatp-normalpri 6999/udp # IATP-normalPri [John_Murphy] [John_Murphy] afs3-fileserver 7000/tcp # file server itself afs3-fileserver 7000/udp # file server itself -afs3-callback 7001/tcp # callbacks to cache managers -afs3-callback 7001/udp # callbacks to cache managers -afs3-prserver 7002/tcp # users & groups database -afs3-prserver 7002/udp # users & groups database +afs3-callback 7001/tcp # callbacks to cache managers Known Unauthorized Use on port 7001 +afs3-callback 7001/udp # callbacks to cache managers Known Unauthorized Use on port 7001 +afs3-prserver 7002/tcp # users & groups database Known Unauthorized Use on port 7002 +afs3-prserver 7002/udp # users & groups database Known Unauthorized Use on port 7002 afs3-vlserver 7003/tcp # volume location database afs3-vlserver 7003/udp # volume location database afs3-kaserver 7004/tcp # AFS/Kerberos authentication service afs3-kaserver 7004/udp # AFS/Kerberos authentication service -afs3-volser 7005/tcp # volume managment server -afs3-volser 7005/udp # volume managment server +afs3-volser 7005/tcp # volume managment server Known Unauthorized Use on port 7005 +afs3-volser 7005/udp # volume managment server Known Unauthorized Use on port 7005 afs3-errors 7006/tcp # error interpretation service afs3-errors 7006/udp # error interpretation service afs3-bos 7007/tcp # basic overseer process @@ -9612,6 +9624,7 @@ faximum 7437/udp # Faximum [George_Pajari] [George_Pajari] oracleas-https 7443/tcp # Oracle Application Server HTTPS [David_McMarlin] [David_McMarlin] 2006-08 oracleas-https 7443/udp # Oracle Application Server HTTPS [David_McMarlin] [David_McMarlin] 2006-08 +sttunnel 7471/tcp # Stateless Transport Tunneling Protocol [Bruce_Davie_3] [Bruce_Davie_3] 2014-04-28 rise 7473/tcp # Rise: The Vieneo Province [Jason_Reskin] [Jason_Reskin] 2007-03 rise 7473/udp # Rise: The Vieneo Province [Jason_Reskin] [Jason_Reskin] 2007-03 neo4j 7474/tcp # Neo4j Graph Database [Neo_Technology_Inc] [Julian_Simpson] 2013-02-08 @@ -9619,8 +9632,8 @@ telops-lmd 7491/udp # telops-lmd [David_Spencer] [David_Spencer] silhouette 7500/tcp # Silhouette User [Anthony_Payne] [Anthony_Payne] 2004-02 silhouette 7500/udp # Silhouette User [Anthony_Payne] [Anthony_Payne] 2004-02 -ovbus 7501/tcp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] -ovbus 7501/udp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] +ovbus 7501/tcp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] Known Unauthorized Use on port 7501 +ovbus 7501/udp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] Known Unauthorized Use on port 7501 adcp 7508/tcp # Automation Device Configuration Protocol [Festo_AG] [Joerg_Ullmann] 2011-05-27 2012-07-26 acplt 7509/tcp # ACPLT - process automation service [Chair_for_Process_Control_Engineering] [Ulrich_Epple] 2010-12-07 2012-08-07 ovhpas 7510/tcp # HP OpenView Application Server [Jeff_Conrad] [Jeff_Conrad] @@ -9714,20 +9727,20 @@ raqmon-pdu 7744/udp # RAQMON PDU [RFC4712] prgp 7747/tcp # Put/Run/Get Protocol [Jayasooriah] [Jayasooriah] 2008-02-22 prgp 7747/udp # Put/Run/Get Protocol [Jayasooriah] [Jayasooriah] 2008-02-22 -cbt 7777/tcp # cbt [Tony_Ballardie] [Tony_Ballardie] -cbt 7777/udp # cbt [Tony_Ballardie] [Tony_Ballardie] +cbt 7777/tcp # cbt [Tony_Ballardie] [Tony_Ballardie] Known Unauthorized Use on port 7777 +cbt 7777/udp # cbt [Tony_Ballardie] [Tony_Ballardie] Known Unauthorized Use on port 7777 interwise 7778/tcp # Interwise [Joseph_Gray] [Joseph_Gray] interwise 7778/udp # Interwise [Joseph_Gray] [Joseph_Gray] vstat 7779/tcp # VSTAT [Vinh_Nguyn] [Vinh_Nguyn] vstat 7779/udp # VSTAT [Vinh_Nguyn] [Vinh_Nguyn] accu-lmgr 7781/tcp # accu-lmgr [Moises_E_Hernandez] [Moises_E_Hernandez] accu-lmgr 7781/udp # accu-lmgr [Moises_E_Hernandez] [Moises_E_Hernandez] -minivend 7786/tcp # MINIVEND [Mike_Heins] [Mike_Heins] -minivend 7786/udp # MINIVEND [Mike_Heins] [Mike_Heins] -popup-reminders 7787/tcp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 -popup-reminders 7787/udp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 -office-tools 7789/tcp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 -office-tools 7789/udp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 +minivend 7786/tcp # MINIVEND [Mike_Heins] [Mike_Heins] Known Unauthorized Use on port 7786 +minivend 7786/udp # MINIVEND [Mike_Heins] [Mike_Heins] Known Unauthorized Use on port 7786 +popup-reminders 7787/tcp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7787 +popup-reminders 7787/udp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7787 +office-tools 7789/tcp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7789 +office-tools 7789/udp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7789 q3ade 7794/tcp # Q3ADE Cluster Service [Uffe_Harksen] [Uffe_Harksen] 2005-08 q3ade 7794/udp # Q3ADE Cluster Service [Uffe_Harksen] [Uffe_Harksen] 2005-08 pnet-conn 7797/tcp # Propel Connector port @@ -9771,6 +9784,8 @@ t2-drm 7932/udp # Tier 2 Data Resource Manager [Peter_Carlson] [Peter_Carlson] t2-brm 7933/tcp # Tier 2 Business Rules Manager [Peter_Carlson] [Peter_Carlson] t2-brm 7933/udp # Tier 2 Business Rules Manager [Peter_Carlson] [Peter_Carlson] +generalsync 7962/tcp # Encrypted, extendable, general-purpose synchronization protocol [Dirk_Steinmetz] [Dirk_Steinmetz] 2014-04-17 +generalsync 7962/udp # Encrypted, extendable, general-purpose synchronization protocol [Dirk_Steinmetz] [Dirk_Steinmetz] 2014-04-17 supercell 7967/tcp # Supercell [Kevin_Nakagawa] [Kevin_Nakagawa] supercell 7967/udp # Supercell [Kevin_Nakagawa] [Kevin_Nakagawa] micromuse-ncps 7979/tcp # Micromuse-ncps [Hing_Wing_To] [Hing_Wing_To] @@ -9786,8 +9801,8 @@ irdmi2 7999/udp # iRDMI2 irdmi 8000/tcp # iRDMI [Gil_Shafriri] [Gil_Shafriri] irdmi 8000/udp # iRDMI [Gil_Shafriri] [Gil_Shafriri] -vcom-tunnel 8001/tcp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] -vcom-tunnel 8001/udp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] +vcom-tunnel 8001/tcp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] Known Unauthorized Use on port 8001 +vcom-tunnel 8001/udp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] Known Unauthorized Use on port 8001 teradataordbms 8002/tcp # Teradata ORDBMS [Curt_Ellmann] [Curt_Ellmann] teradataordbms 8002/udp # Teradata ORDBMS [Curt_Ellmann] [Curt_Ellmann] mcreport 8003/tcp # Mulberry Connect Reporting Service [Dave_Stoneham] [Dave_Stoneham] 2008-03-10 @@ -10058,12 +10073,12 @@ galaxy4d 8881/tcp # Galaxy4D Online Game Engine [Galaxy4D] [Olivier_St-Laurent] 2012-06-18 secure-mqtt 8883/tcp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 secure-mqtt 8883/udp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 -ddi-tcp-1 8888/tcp # NewsEDGE server TCP (TCP 1) [Fred_Yao] [Fred_Yao] -ddi-udp-1 8888/udp # NewsEDGE server UDP (UDP 1) [Fred_Yao] [Fred_Yao] -ddi-tcp-2 8889/tcp # Desktop Data TCP 1 [Fred_Yao] [Fred_Yao] -ddi-udp-2 8889/udp # NewsEDGE server broadcast [Fred_Yao] [Fred_Yao] -ddi-tcp-3 8890/tcp # Desktop Data TCP 2 [Fred_Yao] [Fred_Yao] -ddi-udp-3 8890/udp # NewsEDGE client broadcast [Fred_Yao] [Fred_Yao] +ddi-tcp-1 8888/tcp # NewsEDGE server TCP (TCP 1) [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8888 +ddi-udp-1 8888/udp # NewsEDGE server UDP (UDP 1) [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8888 +ddi-tcp-2 8889/tcp # Desktop Data TCP 1 [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8889 +ddi-udp-2 8889/udp # NewsEDGE server broadcast [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8889 +ddi-tcp-3 8890/tcp # Desktop Data TCP 2 [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8890 +ddi-udp-3 8890/udp # NewsEDGE client broadcast [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8890 ddi-tcp-4 8891/tcp # Desktop Data TCP 3: NESS application [Fred_Yao] [Fred_Yao] ddi-udp-4 8891/udp # Desktop Data UDP 3: NESS application [Fred_Yao] [Fred_Yao] ddi-tcp-5 8892/tcp # Desktop Data TCP 4: FARM product [Fred_Yao] [Fred_Yao] @@ -10101,8 +10116,8 @@ bctp 8999/udp # Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02 cslistener 9000/tcp # CSlistener [David_Jones] [David_Jones] cslistener 9000/udp # CSlistener [David_Jones] [David_Jones] -etlservicemgr 9001/tcp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 -etlservicemgr 9001/udp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 +etlservicemgr 9001/tcp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 Known Unauthorized Use on port 9001 +etlservicemgr 9001/udp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 Known Unauthorized Use on port 9001 dynamid 9002/tcp # DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03 dynamid 9002/udp # DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03 ogs-client 9007/udp # Open Grid Services Client [Gareth_Nelson_2] [Gareth_Nelson_2] 2008-08-22 @@ -10497,6 +10512,7 @@ blocks 10288/tcp # Blocks [Carl_Malamud] [Carl_Malamud] blocks 10288/udp # Blocks [Carl_Malamud] [Carl_Malamud] cosir 10321/tcp # Computer Op System Information Report [Kevin_C_Barber] [Kevin_C_Barber] 2009-01-13 +bngsync 10439/udp # BalanceNG session table synchronization protocol [Inlab_Software_GmbH] [Thomas_G._Obermair] 2014-05-02 hip-nat-t 10500/udp # HIP NAT-Traversal [Ari_Keranen] [Ari_Keranen] [RFC5770] MOS-lower 10540/tcp # MOS Media Object Metadata Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 MOS-lower 10540/udp # MOS Media Object Metadata Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 @@ -10572,6 +10588,7 @@ atm-uhas 11367/udp # ATM UHAS [Todd_Barker] [Todd_Barker] hkp 11371/tcp # OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 hkp 11371/udp # OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 +lsdp 11430/udp # Lenbrook Service Discovery Protocol [Lenbrook_Industries_Limited] [Kevin_Groeneveld] 2014-03-27 asgcypresstcps 11489/tcp # ASG Cypress Secure Only [David_Luxford] [David_Luxford] 2010-07-01 tempest-port 11600/tcp # Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] tempest-port 11600/udp # Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] @@ -10727,7 +10744,7 @@ ptp 15740/udp # Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> 2ping 15998/udp # 2ping Bi-Directional Ping Service [Ryan_Finnie] [Ryan_Finnie] 2010-10-06 programmar 15999/tcp # ProGrammar Enterprise [Norman_Wilson] [Norman_Wilson] 2010-10-06 -fmsas 16000/tcp # Administration Server Access [Mark_Davidson] [Mark_Davidson] 2010-10-06 +fmsas 16000/tcp # Administration Server Access [Mark_Davidson] [Mark_Davidson] 2010-10-06 Known Unauthorized Use on port 16000 fmsascon 16001/tcp # Administration Server Connector [Mark_Davidson] [Mark_Davidson] 2010-10-06 gsms 16002/tcp # GoodSync Mediation Service [Vadim_Maslov] [Vadim_Maslov] 2010-10-06 alfin 16003/udp # Automation and Control by REGULACE.ORG [Ing_Tomas_Halabala] [Ing_Tomas_Halabala] 2010-10-06 @@ -10775,6 +10792,8 @@ soundsvirtual 17185/udp # Sounds Virtual [Richard_Snider] [Richard_Snider] chipper 17219/tcp # Chipper [Ronald_Jimmink] [Ronald_Jimmink] chipper 17219/udp # Chipper [Ronald_Jimmink] [Ronald_Jimmink] +avtp 17220/tcp # IEEE 1722 Transport Protocol for Time Sensitive Applications [Transport_Protocol_for_Time-Sensitive_Networking_TG] [Ashley_Butterworth] 2014-03-07 +avtp 17220/udp # IEEE 1722 Transport Protocol for Time Sensitive Applications [Transport_Protocol_for_Time-Sensitive_Networking_TG] [Ashley_Butterworth] 2014-03-07 avdecc 17221/tcp # IEEE 1722.1 AVB Discovery, Enumeration, Connection management, and Control [IEEE_1722_1] [Jeffrey_Daniel_Koftinoff] 2011-11-01 avdecc 17221/udp # IEEE 1722.1 AVB Discovery, Enumeration, Connection management, and Control [IEEE_1722_1] [Jeffrey_Daniel_Koftinoff] 2011-11-01 cpsp 17222/udp # Control Plane Synchronization Protocol (SPSP) [Randall_Stewart_2] [Randall_Stewart_2] 2011-11-10 @@ -10784,6 +10803,7 @@ ssh-mgmt 17235/udp # SSH Tectia Manager [Ville_Laurikari] [Ville_Laurikari] 2005-08 db-lsp 17500/tcp # Dropbox LanSync Protocol [Paul_Bohm] [Paul_Bohm] 2010-01-21 db-lsp-disc 17500/udp # Dropbox LanSync Discovery [Paul_Bohm] [Paul_Bohm] 2010-01-21 +ailith 17555/tcp # Ailith management of routers [Thomas_Boje] [Thomas_Boje] 2014-03-27 ea 17729/tcp # Eclipse Aviation [William_Schmidt] [William_Schmidt] 2006-03 ea 17729/udp # Eclipse Aviation [William_Schmidt] [William_Schmidt] 2006-03 zep 17754/tcp # Encap. ZigBee Packets [Fred_Fierling] [Fred_Fierling] 2006-02 @@ -10831,6 +10851,8 @@ apc-necmp 18888/udp # APCNECMP [Michael_Yip] [Michael_Yip] igrid 19000/tcp # iGrid Server [Massimo_Cafaro] [Massimo_Cafaro] 2004-11 igrid 19000/udp # iGrid Server [Massimo_Cafaro] [Massimo_Cafaro] 2004-11 +scintilla 19007/tcp # Scintilla protocol for device services [Veejansh_Inc] [Chirag_Patel] 2014-03-04 +scintilla 19007/udp # Scintilla protocol for device services [Veejansh_Inc] [Chirag_Patel] 2014-03-04 j-link 19020/tcp # J-Link TCP/IP Protocol [SEGGER] [SEGGER] opsec-uaa 19191/tcp # OPSEC UAA [Reuven_Harrison] [Reuven_Harrison] opsec-uaa 19191/udp # OPSEC UAA [Reuven_Harrison] [Reuven_Harrison] @@ -10929,6 +10951,7 @@ optohost004 22005/udp # Opto Host Port 5 [Doug_Leany] [Doug_Leany] 2006-09 dcap 22125/tcp # dCache Access Protocol [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2009-03-10 gsidcap 22128/tcp # GSI dCache Access Protocol [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2009-03-10 +easyengine 22222/tcp # EasyEngine is CLI tool to manage WordPress Sites on Nginx server [rtCamp_Solutions_Private_Limited] [Rahul_Bansal] 2014-03-10 wnn6 22273/tcp # wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] wnn6 22273/udp # wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] cis 22305/tcp # CompactIS Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16 @@ -11110,6 +11133,7 @@ ovobs 30999/udp # OpenView Service Desk Client [Service_Desk_Product] [Service_Desk_Product] 2006-05 autotrac-acp 31020/tcp # Autotrac ACP 245 [Roberto_Jorge_Dino] [Roberto_Jorge_Dino] yawn 31029/udp # YaWN - Yet Another Windows Notifier [David_Spivey] [David_Spivey] 2010-08-30 +pace-licensed 31400/tcp # PACE license server [PACE_Anti-Piracy] [Allen_Cronce] 2014-04-28 xqosd 31416/tcp # XQoS network monitor [Joe_Elliott] [Joe_Elliott] 2002-06 xqosd 31416/udp # XQoS network monitor [Joe_Elliott] [Joe_Elliott] 2002-06 tetrinet 31457/tcp # TetriNET Protocol [Emmanuel_Bourg] [Emmanuel_Bourg] 2004-11 @@ -11220,6 +11244,8 @@ gdrive-sync 37483/tcp # Google Drive Sync [Google] [Fil_Zembowicz] 2013-02-01 unisys-eportal 37654/tcp # Unisys ClearPath ePortal [Sung_U_Ro] [Sung_U_Ro] 2006-01 unisys-eportal 37654/udp # Unisys ClearPath ePortal [Sung_U_Ro] [Sung_U_Ro] 2006-01 +ivs-database 38000/tcp # InfoVista Server Database [InfoVista] [Sebastien_Bouchex_Bellomie] 2014-05-23 +ivs-insertion 38001/tcp # InfoVista Server Insertion [InfoVista] [Sebastien_Bouchex_Bellomie] 2014-05-23 galaxy7-data 38201/tcp # Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 galaxy7-data 38201/udp # Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 fairview 38202/tcp # Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, DevStat=<device status> @@ -11266,8 +11292,8 @@ noit-transport 43191/tcp # Reconnoiter Agent Data Transport [Theo_Schlossnagle] [Theo_Schlossnagle] 2009-05-19 shaperai 43210/tcp # Shaper Automation Server Management [Shaper_Automation] [Yohann_Sulaiman] 2012-06-22 shaperai-disc 43210/udp # Shaper Automation Server Management Discovery [Shaper_Automation] [Yohann_Sulaiman] 2012-06-22 -eq3-update 43439/tcp # EQ3 firmware update [eQ-3_AG] [Falk_Werner] 2012-02-10 -eq3-config 43439/udp # EQ3 discovery and configuration [eQ-3_AG] [Falk_Werner] 2012-02-10 +eq3-update 43439/tcp # EQ3 firmware update [eQ-3_Entwicklung_GmbH] [Tido_de_Vries] 2012-02-10 2014-05-09 +eq3-config 43439/udp # EQ3 discovery and configuration [eQ-3_Entwicklung_GmbH] [Tido_de_Vries] 2012-02-10 2014-05-09 ew-mgmt 43440/tcp # Cisco EnergyWise Management ew-disc-cmd 43440/udp # Cisco EnergyWise Discovery and Command Flooding [John_Parello] [John_Parello] 2009-05-19 ciscocsdb 43441/tcp # Cisco NetMgmt DB Ports [Cisco_Systems] [Cisco_Systems] 2005-11

@@ -563,6 +563,7 @@ ##print "==> $title\n"; for my $k (sort keys %{$href}) { - printf "%-40.40s %5.5s %s\n", $title, $href->{$k} // "undef", $k; + my $h = defined($href->{$k}) ? $href->{$k} : "undef"; + printf "%-40.40s %5.5s %s\n", $title, $h, $k; } }

@@ -2,8 +2,6 @@ # create the sminmpec.c file from # http://www.iana.org/assignments/enterprise-numbers # -# $Id$ -# # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 2004 Gerald Combs @@ -21,16 +19,23 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + use strict; +use File::Spec; + +my ($vol, $script_dir, $file) = File::Spec->splitpath( __FILE__ ); +my $epan_dir = File::Spec->catpath($vol, $script_dir, '../epan'); +chdir($epan_dir) || die("Can't find $epan_dir"); my $in = shift; $in = "http://www.iana.org/assignments/enterprise-numbers" unless(defined $in); my @in_lines; +my $revision = '2014-04-27'; -my $revision = '$Revision$'; -if ($revision !~ /[0-9]/ ) { $revision = "unknown"; } +my $min_entries = 100; +my $smi_total = 0; if($in =~ m/^http:/i) { eval "require LWP::UserAgent;"; @@ -44,13 +49,6 @@ my $request = HTTP::Request->new(GET => $in); - - if (-f "enterprise-numbers") { - my $mtime; - (undef,undef,undef,undef,undef,undef,undef,undef,undef,$mtime,undef,undef,undef) = stat("enterprise-numbers"); - $request->if_modified_since( $mtime ); - } - my $result = $agent->request($request); if ($result->code eq 200) { @@ -80,8 +78,6 @@ } -open OUT, "> sminmpec.c"; - my $body = ''; my $code; my $prev_code = -1; ## Assumption: First code in enterprise file is 0; @@ -112,20 +108,28 @@ } $prev_code = $code; $body .= " { $code, \"$name\" },\n"; + $smi_total++; } } +# If this happens check what IANA is serving. +# XXX We already overwrote enterprise-numbers above. +if ($smi_total < $smi_total) { die "Too few SMI entries ($smi_total)\n"; } + +open OUT, "> sminmpec.c"; + print OUT <<"_SMINMPEC"; /* - * \$Id\$ - * * THIS FILE IS AUTOGENERATED, DO NOT EDIT * generated from http://www.iana.org/assignments/enterprise-numbers - * run "tools/make-sminmspec <infile> <outfile>" to regenerate + * run "tools/make-sminmpec.pl <infile> <outfile>" to regenerate + * + * Note 1: "Gaps" in the iana enterprise-numbers list have been "filled in" + * with "(Unknown)" as the name so that direct (indexed) access to + * the list is possible. * - * Note: "Gaps" in the iana enterprise-numbers list have been "filled in" - * with "(Unknown)" as the name so that direct (indexed) access - * to the list is possible. + * Note 2: We should probably parse "enterprise-numbers" at program start + * instead of generating this file. */ #include "config.h"

@@ -1692,7 +1692,7 @@ /* When capturing, we only support writing pcap or pcap-ng format. */ if (out_file_type != WTAP_FILE_PCAP && out_file_type != WTAP_FILE_PCAPNG) { - cmdarg_err("Live captures can only be saved in libpcap format."); + cmdarg_err("Live captures can only be saved in pcap or pcapng format."); return 1; } if (global_capture_opts.multi_files_on) { @@ -1727,6 +1727,7 @@ cmdarg_err("Display filters aren't supported when capturing and saving the captured packets."); return 1; } + global_capture_opts.use_pcapng = (out_file_type == WTAP_FILE_PCAPNG) ? TRUE : FALSE; } else { /* They didn't specify a "-w" flag, so we won't be saving to a capture file. Check for options that only make sense if

@@ -230,7 +230,7 @@ struct e_in6_addr ipaddr; memcpy(&ipaddr, stats.ip_address[0], 16); hostname0 = get_hostname6(&ipaddr); - memcpy(&ipaddr, stats.ip_address[0], 16); + memcpy(&ipaddr, stats.ip_address[1], 16); hostname1 = get_hostname6(&ipaddr); } else { guint32 ipaddr; @@ -248,7 +248,9 @@ /* Both Stream Directions */ both_directions_string = g_strdup_printf("Entire conversation (%u bytes)", follow_info->bytes_written[0] + follow_info->bytes_written[1]); - if(follow_info->client_port == stats.port[0]) { + if ((follow_info->client_port == stats.port[0]) && + ((stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 16) == 0)) || + (!stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 4) == 0)))) { server_to_client_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0,

@@ -268,7 +268,9 @@ port1 = get_tcp_port(stats.port[1]); /* Host 0 --> Host 1 */ - if(sc.src_port == stats.port[0]) { + if ((sc.src_port == stats.port[0]) && + ((stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[0], 16) == 0)) || + (!stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[0], 4) == 0)))) { server_to_client_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0, @@ -283,7 +285,9 @@ } /* Host 1 --> Host 0 */ - if(sc.src_port == stats.port[1]) { + if ((sc.src_port == stats.port[1]) && + ((stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[1], 16) == 0)) || + (!stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[1], 4) == 0)))) { client_to_server_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0,

@@ -179,7 +179,7 @@ struct e_in6_addr ipaddr; memcpy(&ipaddr, stats.ip_address[0], 16); hostname0 = get_hostname6(&ipaddr); - memcpy(&ipaddr, stats.ip_address[0], 16); + memcpy(&ipaddr, stats.ip_address[1], 16); hostname1 = get_hostname6(&ipaddr); } else { guint32 ipaddr; @@ -197,7 +197,9 @@ /* Both Stream Directions */ both_directions_string = g_strdup_printf("Entire conversation (%u bytes)", follow_info->bytes_written[0] + follow_info->bytes_written[1]); - if(follow_info->client_port == stats.port[0]) { + if ((follow_info->client_port == stats.port[0]) && + ((stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 16) == 0)) || + (!stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 4) == 0)))) { server_to_client_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0,

@@ -67,8 +67,6 @@ #include "ui/gtk/old-gtk-compat.h" -#include "../../image/voip_bg.xpm" - /****************************************************************************/ #define MAX_LABEL 50 @@ -628,6 +626,8 @@ GdkRGBA grey_color0 = {0.3945, 0.3945, 0.3945, 1.0}; GdkRGBA grey_color1 = {0.1484, 0.1484, 0.1484, 1.0}; + GdkRGBA bg_color = {0.9137, 0.8901, 0.8705, 1.0}; + static GdkRGBA background_color[MAX_NUM_COL_CONV+1] = { /* Red, Green, Blue Alpha */ {0.0039, 0.0039, 1.0000, 1.0}, @@ -643,9 +643,6 @@ {0.8281, 0.8281, 0.8281, 1.0} }; - /* XXX can't we just set the background color ? */ - GdkPixbuf *bg_pixbuf; - /* Dashed line pattern */ static const double dashed1[] = {5.0, 4.0}; static int len1 = sizeof(dashed1) / sizeof(dashed1[0]); @@ -656,7 +653,6 @@ return; } - bg_pixbuf = gdk_pixbuf_new_from_xpm_data(voip_bg_xpm); time_str = (gchar *)g_malloc(COL_MAX_LEN); user_data->dlg.needs_redraw = FALSE; @@ -804,24 +800,21 @@ #if GTK_CHECK_VERSION(2,22,0) /* Paint time title background */ cr = cairo_create (user_data->dlg.surface_time); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); /* Paint main title background */ cr = cairo_create (user_data->dlg.surface_main); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); /* Paint main comment background */ cr = cairo_create (user_data->dlg.surface_comments); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); @@ -829,8 +822,7 @@ /* Paint time title background */ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ) { cr = gdk_cairo_create (user_data->dlg.pixmap_time); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); @@ -839,8 +831,7 @@ /* Paint main title background */ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ) { cr = gdk_cairo_create (user_data->dlg.pixmap_main); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); @@ -849,8 +840,7 @@ /* Paint main comment background */ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) ) { cr = gdk_cairo_create (user_data->dlg.pixmap_comments); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr);

@@ -81,6 +81,10 @@ int tot_invokes, tot_rr; double tot_invokes_size, tot_rr_size; + if (cfile.state == FILE_CLOSED) { + return; + } + /* initialize the tally */ summary_fill_in(&cfile, &summary);

@@ -666,8 +666,9 @@ break; case COPY_SELECTED_VALUE: if (cfile.edt !=0 ) { - g_string_append(gtk_text_str, - get_node_field_value(cfile.finfo_selected, cfile.edt)); + gchar* field_str = get_node_field_value(cfile.finfo_selected, cfile.edt); + g_string_append(gtk_text_str, field_str); + g_free(field_str); } break; default:

@@ -1243,7 +1243,9 @@ break; case CopySelectedValue: if (cap_file_->edt != 0) { - clip.append(get_node_field_value(cap_file_->finfo_selected, cap_file_->edt)); + gchar* field_str = get_node_field_value(cap_file_->finfo_selected, cap_file_->edt); + clip.append(field_str); + g_free(field_str); } break; }

@@ -1,2 +1,2 @@ -#define GITVERSION "v1.10.6" +#define GITVERSION "v1.10.8-2-g52a5244" #define GITBRANCH "master-1.10"

@@ -30,7 +30,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:6:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:8:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL

@@ -647,7 +647,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:6:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:8:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS = -DWS_BUILD_DLL $(am__append_1) AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \

@@ -1037,12 +1037,6 @@ } } - if (wblock->data.packet.cap_len > wblock->data.packet.packet_len) { - *err = WTAP_ERR_BAD_FILE; - *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than packet_len %u.", - wblock->data.packet.cap_len, wblock->data.packet.packet_len); - return 0; - } if (wblock->data.packet.cap_len > WTAP_MAX_PACKET_SIZE) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u.",

@@ -92,6 +92,8 @@ 01-80-C2-00-00-12 Loadable-Device 01-80-C2-00-00-14 ISIS-all-level-1-IS's 01-80-C2-00-00-15 ISIS-all-level-2-IS's +01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1 +01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests

@@ -51,33 +51,96 @@ /* Originally copied from GCC Wiki at http://gcc.gnu.org/wiki/Visibility */ #if defined _WIN32 || defined __CYGWIN__ + /* Compiling for Windows, so we use the Windows DLL declarations. */ #ifdef WS_BUILD_DLL + /* + * Building a DLL; for all definitions, we want dllexport, and + * (presumably so source from DLL and source from a program using the + * DLL can both include a header that declares APIs and exported data + * for the DLL), for declarations, either dllexport or dllimport will + * work (they mean the same thing for a declaration when building a DLL). + */ #ifdef __GNUC__ -#define WS_DLL_PUBLIC __attribute__ ((dllexport)) + /* GCC */ +#define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((dllexport)) #else /* ! __GNUC__ */ -#define WS_DLL_PUBLIC __declspec(dllexport) /* Note: actually gcc seems to also support this syntax. */ + /* + * Presumably MSVC. + * Note: actually gcc seems to also support this syntax. + */ +#define WS_DLL_PUBLIC_NOEXTERN __declspec(dllexport) #endif /* __GNUC__ */ - #else + #else /* WS_BUILD_DLL */ + /* + * Building a program; we should only see declarations, not definitions, + * with WS_DLL_PUBLIC, and they all represent APIs or data imported + * from a DLL, so use dllimport. + * + * For functions, export shouldn't be necessary; for data, it might + * be necessary, e.g. if what's declared is an array whose size is + * not given in the declaration. + */ #ifdef __GNUC__ -#define WS_DLL_PUBLIC __attribute__ ((dllimport)) + /* GCC */ +#define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((dllimport)) #elif ! (defined ENABLE_STATIC) /* ! __GNUC__ */ -#define WS_DLL_PUBLIC __declspec(dllimport) /* Note: actually gcc seems to also support this syntax. */ + /* + * Presumably MSVC, and we're not building all-static. + * Note: actually gcc seems to also support this syntax. + */ +#define WS_DLL_PUBLIC_NOEXTERN __declspec(dllimport) #else /* ! __GNUC__ && ENABLE_STATIC */ -#define WS_DLL_PUBLIC + /* + * Presumably MSVC, and we're building all-static, so we're + * not building any DLLs. + */ +#define WS_DLL_PUBLIC_NOEXTERN #endif /* __GNUC__ */ #endif /* WS_BUILD_DLL */ - #define WS_DLL_PUBLIC_NOEXTERN WS_DLL_PUBLIC + + /* + * Symbols in a DLL are *not* exported unless they're specifically + * flagged as exported, so, for a non-static but non-exported + * symbol, we don't have to do anything. + */ #define WS_DLL_LOCAL -#else +#else /* defined _WIN32 || defined __CYGWIN__ */ + /* + * Compiling for UN*X, where the dllimport and dllexport stuff + * is neither necessary nor supported; just specify the + * visibility if we have a compiler that claims compatibility + * with GCC 4 or later. + */ #if __GNUC__ >= 4 -#define WS_DLL_PUBLIC __attribute__ ((visibility ("default"))) extern + /* + * Symbols exported from libraries. + */ #define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((visibility ("default"))) + + /* + * Non-static symbols *not* exported from libraries. + */ #define WS_DLL_LOCAL __attribute__ ((visibility ("hidden"))) #else /* ! __GNUC__ >= 4 */ - #define WS_DLL_PUBLIC + /* + * We have no way to control visibility. + */ #define WS_DLL_PUBLIC_NOEXTERN - #define WS_DLL_LOCAL extern + #define WS_DLL_LOCAL #endif /* __GNUC__ >= 4 */ #endif +/* + * You *must* use this for exported data *declarations*; if you use + * WS_DLL_PUBLIC_NOEXTERN, some compilers, such as MSVC++, will complain + * about array definitions with no size. + * + * You must *not* use this for exported data *definitions*, as that + * will, for some compilers, cause warnings about items being initialized + * and declared extern. + * + * Either can be used for exported *function* declarations and definitions. + */ +#define WS_DLL_PUBLIC WS_DLL_PUBLIC_NOEXTERN extern + #endif /* SYMBOL_EXPORT_H */

[-] [+]	Changed	wireshark.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Jun 14 21:36:01 UTC 2014 - cs@linux-administrator.com + +- update to release 1.10.8 + +------------------------------------------------------------------- Tue Mar 11 17:18:34 UTC 2014 - cs@linux-administrator.com - update to release 1.10.6
[-] [+]	Changed	wireshark.spec ^
@@ -22,7 +22,7 @@ License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.10.6 +Version: 1.10.8 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
[-] [+]	Deleted	wireshark-1.10.6.tar.bz2/packaging/macosx/ChmodBPF/README.macosx ^
@@ -1,48 +0,0 @@ -As with other systems using BPF, Mac OS X allows users with read access -to the BPF devices to capture packets with libpcap and allows users with -write access to the BPF devices to send packets with libpcap. - -On some systems that use BPF, the BPF devices live on the root file -system, and the permissions and/or ownership on those devices can be -changed to give users other than root permission to read or write those -devices. - -On newer versions of FreeBSD, the BPF devices live on devfs, and devfs -can be configured to set the permissions and/or ownership of those -devices to give users other than root permission to read or write those -devices. - -On Mac OS X, the BPF devices live on devfs, but the OS X version of -devfs is based on an older (non-default) FreeBSD devfs, and that version -of devfs cannot be configured to set the permissions and/or ownership of -those devices. - -Therefore, we supply a "startup item" for OS X that will change the -ownership of the BPF devices so that the "admin" group owns them, and -will change the permission of the BPF devices to rw-rw----, so that all -users in the "admin" group - i.e., all users with "Allow user to -administer this computer" turned on - have both read and write access to -them. - -The startup item is in the ChmodBPF directory in the source tree. A -/Library/StartupItems directory should be created if it doesn't already -exist, and the ChmodBPF directory should be copied to the -/Library/StartupItems directory (copy the entire directory, so that -there's a /Library/StartupItems/ChmodBPF directory, containing all the -files in the source tree's ChmodBPF directory; don't copy the individual -items in that directory to /Library/StartupItems). - -If you want to give a particular user permission to access the BPF -devices, rather than giving all administrative users permission to -access them, you can have the ChmodBPF/ChmodBPF script change the -ownership of /dev/bpf* without changing the permissions. If you want to -give a particular user permission to read and write the BPF devices and -give the administrative users permission to read but not write the BPF -devices, you can have the script change the owner to that user, the -group to "admin", and the permissions to rw-r-----. Other possibilities -are left as an exercise for the reader. - -(NOTE: due to a bug in Snow Leopard, if you change the permissions not -to grant write permission to everybody who should be allowed to capture -traffic, non-root users who cannot open the BPF devices for writing will -not be able to capture outgoing packets.)
[-] [+]	Deleted	wireshark-1.10.6.tar.bz2/packaging/macosx/ChmodBPF/StartupParameters.plist ^
@@ -1,4 +0,0 @@ -{ - Description = "Change BPF permissions"; - Provides = ("ChmodBPF"); -}
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ChangeLog ^
@@ -1,1101 +1,649 @@ -commit 94d9b3d0e52d8b2234a0c3c73c8132d3055a4d7b -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 13:49:51 2014 -0800 - - Add a CVE ID and attribution. - - Change-Id: If3359fb1c73446747c6be4ab1f8b05f2697dba6f - Reviewed-on: https://code.wireshark.org/review/541 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9e4f943e12405079b7edcddd52ee5ccd580948d1 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 12:34:27 2014 -0800 - - Add wnpa-sec-2014-04. - - Change-Id: I3ca3843bf7f25aeafb35c4352367e36ba3f9c41a - Reviewed-on: https://code.wireshark.org/review/540 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 34144b8d4da141e8aa9b99221855edc9f4c73ad8 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 11:27:45 2014 -0800 - - Add a check for an oversized record. - - For now we declare the file corrupt and give up. We may want to handle - this more gracefully. Fixes a vulnerability discovered by Wesley Neelen - (bug 9843). - - Remove the RCS ID and add modelines. - - Change-Id: I418938d7d6485b27cc51cf1dde50bc42dabf8c85 - Reviewed-on: https://code.wireshark.org/review/533 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 69bf1a988a6629497ccf5feaf358413885d89a2d -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Mar 5 17:08:39 2014 -0800 - - Add CVE IDs. - - Change-Id: Iff81dd013812e79d4c70018cae48b3c16495a3af - Reviewed-on: https://code.wireshark.org/review/523 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 116c8da958fcc8ecc3b629350572bad40a1746c8 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Mar 5 00:33:52 2014 -0500 - - Fix another case of a missing BASE_EXT_STRING (which may cause a crash). - - Change-Id: Ibe690826747b47d8b9a5e93f1ad3e96f2f18e7ef - Reviewed-on: https://code.wireshark.org/review/514 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit 983f5f9366e0b6f015de80cd1596b3367be1ab6a +commit 7c3e02668f4da537296cf3e2cc089b9d2b851a5d Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Mar 4 20:58:01 2014 -0800 +Date: Wed Jun 11 16:56:55 2014 -0700 - Fix some cases of value_string_ext without BASE_EXT_STRING. - - This fixes bug 9834. + Some more SVN->Git. - Change-Id: Ida6034fd4149b647545ed314eb10819e71553f85 - Reviewed-on: https://code.wireshark.org/review/512 + Change-Id: Iba5274ab5e653a0a3c0a56e62ee168ac957daf27 + Reviewed-on: https://code.wireshark.org/review/2152 Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 95065da33d2d22cad046219e291e54cb2fce33be) + Reviewed-on: https://code.wireshark.org/review/2153 + (cherry picked from commit 85fb7dc807a7a423b59ccba351add7e29f56a694) + Reviewed-on: https://code.wireshark.org/review/2154 -commit 4fc99f885a3df4abf84279308064a059f64e02fa -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Mar 4 19:41:27 2014 -0500 - - Fix 2 instances of "Warning: Extended value string ... forced to fall back to linear search". - - Note: This issue was fixed in dev Wireshark as part of a much more extensive set - of changes. - - Change-Id: Iadca7e7813f42029e62c922ed183b6535a9c2a77 - Reviewed-on: https://code.wireshark.org/review/510 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit 5abc15ffcf967968ba4afacfb3f0a65f51e93697 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Mar 4 16:43:54 2014 -0500 - - Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10 - - Another Fix for part 2 of Bug #9834 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834 - - ============ - commit 2336eb9919e20de306b29ab34d1ca12550930f4a - Author: Gerald Combs <gerald@wireshark.org> - Date: Fri Aug 2 00:22:51 2013 +0000 - - Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5, - 2.7, and 3.3. - - svn path=/trunk/; revision=51106 - /tools/make-tap-reg.py - - Change-Id: I2a7aca979c596b4d06e91490aaf42126bb9da211 - Reviewed-on: https://code.wireshark.org/review/509 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit c7c59771e6a217ac68546374e676fa2d33708d6d -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Mar 4 14:31:44 2014 -0500 - - Backport g97c9a9b from git/master to git/master-1.10 - - Fix for part 2 of Bug #9834 - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834 - - ======== - commit 97c9a9b9ba3c29f394c306d6ba9bd1916d06c430 - Author: Gerald Combs <gerald@wireshark.org> - Date: Fri Aug 2 16:34:31 2013 +0000 - - Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5, - 2.7, and 3.3. The contents of packet-ncp2222.c are different after the - changes (e.g. some array contents are in a different order) but the - output of running 'tshark -nVxr' on the NCP files in the menagerie are - identical. - - svn path=/trunk/; revision=51123 - - Change-Id: Ib500bade79d65b97a57eeb4dd497228a6eb85c19 - Reviewed-on: https://code.wireshark.org/review/508 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Tested-by: Bill Meier <wmeier@newsguy.com> - -commit d58a92fc6fd936083196c044b91ab2607a9fe2f4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Mar 4 11:16:44 2014 -0800 - - Update the release notes. - - Change-Id: Iec747ea0f92142a81a88b6ff92d9dd3ec1818e7e - Reviewed-on: https://code.wireshark.org/review/506 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 447c45a341124f091543cbe7ad6d6872a041f6ba -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Feb 27 15:31:10 2014 -0800 +commit 70c8cafcd1e95ce7627aaea5a75648225947260e +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Jun 11 16:49:05 2014 -0700 - Disable IPv4 checksum verfification to match TCP and UDP. - - Offloading seems to be very common nowadays and having this option - enabled by default generates a lot of false positives. Suggested by - Laura Chappell. + A Subversion->Git change that we missed. - Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff - Reviewed-on: https://code.wireshark.org/review/426 - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit 104a6edd1fb703c5c2319c893720df86f8c9a9e7) - Reviewed-on: https://code.wireshark.org/review/470 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I651d25cb0a59f9ec350d4c482062077833c8f278 + Reviewed-on: https://code.wireshark.org/review/2149 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 7db2135069b03b9dcbfa12a244969246b938443d) + Reviewed-on: https://code.wireshark.org/review/2150 + (cherry picked from commit b0c0b33a86473fa6411add002729b6f76062704d) + Reviewed-on: https://code.wireshark.org/review/2151 -commit 31187b1c5d863e2338f0050ff897512b92ebf774 +commit 42b9bf0dcae7aa579c6bae616128e0928ebf0fbc Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 15:03:41 2014 -0800 +Date: Wed Jun 11 10:35:58 2014 -0400 - Switch to "rc" instead of "pre" to match our tags. + Add a CVE ID. - Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e - Reviewed-on: https://code.wireshark.org/review/489 + Change-Id: I789e4738aff3016fba1b56950e051c324bc0ae59 + Reviewed-on: https://code.wireshark.org/review/2136 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 65f3fea66842838faf49f322de66e84be78e1f0b -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 14:49:00 2014 -0800 +commit 3aea41d507502daef7a73db237c13895b9954c7e +Author: Jeff Morriss <morriss@ulticom.com> +Date: Tue Jun 10 15:21:13 2014 -0400 - More version stamp fixes. + Fix unused-variable warning. - Change-Id: I80601db962734364575c989ecd64983ef5a493a2 - Reviewed-on: https://code.wireshark.org/review/487 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 75bc4fd32ce2c3856f5f369b609c29743097690d -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 14:26:15 2014 -0800 - - Don't append "-dirty" to the version string. + (Followup to I7b291892b041055fe4165abcbb2962a295aedce4) - Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301 - Reviewed-on: https://code.wireshark.org/review/485 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit 7bb4ec81a7912a785758cd63570dab1d00da2647) - Reviewed-on: https://code.wireshark.org/review/486 + Change-Id: I6a58f2b90c41fa3ce8ac521ebc04db4ae1f9758d + Reviewed-on: https://code.wireshark.org/review/2114 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 59c96b89eb214546093c7acd925eedcbadb920a3 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 13:52:57 2014 -0800 +commit b850e6c3e47123daf2b3b929657302588a3fc9e2 +Author: Jeff Morriss <morriss@ulticom.com> +Date: Tue Jun 10 15:30:03 2014 -0400 - Strip out carriage returns when reading version.conf. - - The input record separator ($/) under Cygwin's Perl appears to be "\n" - which means that chomp() won't strip out carriage returns. Make sure - we do that when reading version.conf, otherwise we can end up with - unexpected behavior. + Squelch compiler warnings. - Check pkg_enable using an integer comparison as an extra level of - protection. + Some are legitimate warnings - get_node_field_value() now returns a + value that the callers are expected to g_free(), so we'd better not + return a string constant. - (We need to handle CRs better in general but for now we need to get - version stamping working for the next release.) + Manually applied from I937254316119044691c1d9a3da8c9615763e2e5a (2 of the + 4 chunks of that patch needed to be applied to this branch). - Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b - Reviewed-on: https://code.wireshark.org/review/483 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0) - Reviewed-on: https://code.wireshark.org/review/484 + Change-Id: I2fa4e3bba37f0cf908d8afcfb437de877181ce52 + Reviewed-on: https://code.wireshark.org/review/2115 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit b8c1cc09466cf436104de9d0eb52f563eca5c0cd +commit 627d5830dd259de9d8dc06662fee8bd8d8803f51 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jun 29 21:58:46 2013 +0000 +Date: Tue Jun 10 08:48:27 2014 +0200 - Update .gitignore to add some Windows specific build stuff to ignore list. + CAPWAP: Display incorrect value for Wireless IEEE802.11 RSSI and Data Rate - svn path=/trunk/; revision=50231 - (cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b) + * Wireless data ieee80211 RSSI (dBm) is a signed integer. In the wireless radio the dBm value is negative. + * Wireless data ieee80211 Data Rate (Mbps) is a 100Kbps. You need divide this value by 10. - Change-Id: I41fd7ba5ce96055928d65fb5de4252750692078e - Reviewed-on: https://code.wireshark.org/review/481 - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f58c4cdef2e4aa3f5107601d4968568ab1112f8c -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Mar 2 08:08:42 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-03-02] + Issue found by Massimo Vellucci (SmartCAPWAP) - Change-Id: Ifd0cc536cc7b532f61aaae3aa9e9642f1299405b - Reviewed-on: https://code.wireshark.org/review/445 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I04dd8a9e38a5f60ee5bf64cd304db1b11413c809 + Reviewed-on: https://code.wireshark.org/review/2094 + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 2f13ccc64c6e38336674d1fd6d13e9ece9efec84) + Reviewed-on: https://code.wireshark.org/review/2104 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 4ac46b6c1103a28397630634ca2042839653df17) + Reviewed-on: https://code.wireshark.org/review/2105 -commit e635d3f0f2bc1f1909553294a6488b6bd947f82d +commit 05d09fcb86d389a91ccc0c71eef1c171b4e2a07b Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Feb 28 16:34:19 2014 -0800 +Date: Mon Jun 9 15:54:28 2014 -0700 - Have git-compare-abis build in a sub-sub-subdirectory. - - We have a lot of relative includes which apparently weren't updated - correctly when we moved the gtk directory to ui/gtk. For example, - ui/gtk/about_dlg.c has - - The Autotools Makefile adds "-I../.." to the include path, which means - we end up including the current, top-level version_info.h instead of the - one in the compare-abis build directory. + Release note updates for 1.10.8. - Change-Id: I9df83857fc9f7d87a3b79d5b4da08d5e41625e4c - Reviewed-on: https://code.wireshark.org/review/436 + Change-Id: I492bcdccb0f59d8d1385d92c746900a890f70c88 + Reviewed-on: https://code.wireshark.org/review/2091 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit d8075e79f7dc435d68b942695d3d1604f3e166b7 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Feb 26 12:47:35 2014 -0500 - - Don't mix emem and glib memory and init routines. - - The seasonal memory is freed before the init routine is called, leading to a - whole bunch of use-after-free errors. - - Fixes bug #9802 (and duplicates). - - This introduces a few minor leaks but I can't find an easy way to add additional - free calls that doesn't lead to double-free errors. - - Change-Id: Idda79cb643d46d29253165cdeefeed189db6b078 - Reviewed-on: https://code.wireshark.org/review/406 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 9201ee0d484227722a9a5c325e12129336b9d283 +commit cab89dca31e5d5785326e9048dbefc4418fb3324 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 25 09:18:41 2014 -0800 - - Release note updates for 1.10.6. - - Change-Id: I1a921df33d317a87ca1de6257c3783f0bfd3505f - Reviewed-on: https://code.wireshark.org/review/374 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit bfd4ba95c8365e1e92774e0398215e6b8cca7f66 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 15 02:09:11 2014 +0000 - - Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many - heuristic cases broken in r49999 when we permitted packets > 64KB, since that - relaxed so severely the definition of a valid packet header. - - 64MB is an arbitrary and perhaps suboptimal number, but it seems to do the right - thing in all the examples I have handy. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 - - svn path=/trunk/; revision=54812 - (cherry picked from commit dae86605b61bbbabd54749e6bde7c0c10b031ca8 with - release note updates) - - Change-Id: Id3a9b413113148c8072bdd6c221246a56d0df2cb - Reviewed-on: https://code.wireshark.org/review/349 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 246ef6a981714cfd97adf3884b6888be81fd9cf6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 21 18:16:07 2013 +0000 - - If Gtk >= 3.10, allow use of deprecated Gtk features (and prevent 'deprecated' warnings); - - Given that Wireshark is moving to QT, the Wireshark changes required to - fix the features deprecated in Gtk 3.10 will not be done. - - svn path=/trunk/; revision=54337 - (cherry picked from commit 6ec4ba58a18298d443d87de2cd8bd64dc97464e1 with - release note updates) - - Change-Id: Ic6e8f44e201a1e487ed969bbdcfaa3f40c00e682 - Reviewed-on: https://code.wireshark.org/review/347 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 76c8bfa9a3b3fb672549fbb313be21db4c08f873 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 29 18:45:09 2013 +0000 - - From stcook - clear the temporary buffer after each DXM channel data line - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - - svn path=/trunk/; revision=54488 - (cherry picked from commit 745c8660be2707df41d7cea3cd2725d18b9d6ff0) - - Change-Id: I420ca616a6c19489214100d86446450905c4234d - Reviewed-on: https://code.wireshark.org/review/346 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit ff3c3a37991536980ec7bdf0b5549f95d12fd743 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Dec 26 14:10:26 2013 +0000 - - "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) - - From Roland Knall - - This fix is on top of/in conjunction with r54193 and both need to be backported. - - svn path=/trunk/; revision=54463 - (cherry picked from commit 6697a94ba55934a132154439dc44b378cbf991e3 with - release note updates) - - Change-Id: I0fa9fbf6f7429fb6d8ad53731d7760f62edb1b02 - Reviewed-on: https://code.wireshark.org/review/345 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d7d110415cdeb84a726c11cd47fd3269ff6144f7 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Dec 17 20:06:03 2013 +0000 +Date: Mon Jun 9 10:07:10 2014 -0700 - Bugfix OpenSafety "heuristics" to only consider a packet "handled" if a subdissector is called. Fixes bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572) - - Also removed tree check in Modbus dissector because dissector_try_string() is being called under it. - - svn path=/trunk/; revision=54193 - cherry-picked from 6db9eb0b73b4bb02864ab389c74f5a17a9da50e2. Added - release note entry. + Add back Balint's copyright. - Change-Id: I9bad5846d08cbf8b9c40c6a17a7f88712451794e - Reviewed-on: https://code.wireshark.org/review/344 + Change-Id: Ib7a3789c95c4651beec76ab318410b1b7a3aaa2b + Reviewed-on: https://code.wireshark.org/review/2082 Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 174cd47ab3416e670cccc81e86ecb5188b5bb521) + Reviewed-on: https://code.wireshark.org/review/2083 -commit 551423110b94730ed25a4193df5e30fbb5998b95 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Fri May 31 02:27:40 2013 +0000 - - Don't intentionally use -1 as an hfindex: while only naughty before, with the - changes from r49644 you'll get complaints about the hf being unregistered... - - Note that this code also intentionally passes -1 as an ett_index. It doesn't - currently complain so I'm leaving it alone for now... - - svn path=/trunk/; revision=49648 - (cherry picked from commit 813dcf79a15d6527cce8a6a7bac4234de6ab577f) - Change-Id: I2bca70df606397264df54e88ce6fa85815aaf1b9 - Reviewed-on: https://code.wireshark.org/review/338 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit e45b0954fd182c6ac07a7c9ab1557ec9d23f2aaa +commit 8c900b4cd93da6578ca7c20877b4d0fcdf0b474a Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Feb 23 23:36:11 2014 +0100 +Date: Sun Jun 8 22:46:45 2014 +0200 - NAS EPS: fix dissection of CS service notification message - - Fixes bug 9789 - - Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee - Reviewed-on: https://code.wireshark.org/review/330 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - - (cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682) + IEEE 80211: fix dissection of HT Capabilities - Change-Id: Ia2d3cbdeda7935cec07fbfbb2c0d6b7cb2841288 - Reviewed-on: https://code.wireshark.org/review/333 + Bug: 10166 + Change-Id: Iafe789968bd5b9a6e593b682f8d42ba42db5fce9 + Reviewed-on: https://code.wireshark.org/review/2046 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> + (cherry picked from commit 89960510e30b9b96a0d0b84619df099fd8a707f1) + Reviewed-on: https://code.wireshark.org/review/2053 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit d1eaa9325a8e943310168e79f45849a89d8d3596 +commit d88fb71c1fbff17ef15b6eca086b0a2f5e64a172 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 23 08:08:19 2014 -0800 +Date: Sun Jun 8 08:09:31 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-23] + [Automatic manuf, services and enterprise-numbers update for 2014-06-08] - Change-Id: Ida5492e584bea365c0c9ec1b3a449c253b251122 - Reviewed-on: https://code.wireshark.org/review/317 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I389a2be2a4e4465cf5d62db437759b5b54e7ebef + Reviewed-on: https://code.wireshark.org/review/2038 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 1fe82ae65685c75c01b89bacdfe5b1659bef7573 +commit 348942c0f0f240ddca469c016d6f0698e47e99c8 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Feb 21 16:47:55 2014 -0800 +Date: Sat Jun 7 12:00:31 2014 -0700 - Add bug 9492. + PEEKREMOTE packets don't appear to have Atheros padding. - Change-Id: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 - Reviewed-on: https://code.wireshark.org/review/306 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/308 - -commit 953684ce31e8d302921c23ab662331ce9814d11e -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 1 13:47:11 2013 +0000 - - Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) - - From Peter Paluch + Call the without-Atheros-padding dissector for the payload. - svn path=/trunk/; revision=53694 + Fixes bug 10139. - Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204 - Reviewed-on: https://code.wireshark.org/review/304 + Change-Id: I3b5dd25953113fe30b9278e4533561933304ae5b + Reviewed-on: https://code.wireshark.org/review/2030 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit a4382fc3acbfd90eb69febdafcc77a638d868eea -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Feb 18 14:21:25 2014 +0100 - - Fix typo in name of Radio Type 802.11b (in IEEE802.11 WTP Radio Information) - - Found by Massimo Vellucci - - Change-Id: Ibbe2d0a4d1e421e647028262baf0398d05905c8d - Reviewed-on: https://code.wireshark.org/review/246 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit 8a1cead94713f0c7c6e2f5cc58aa1d0f6c8f2a60) - Reviewed-on: https://code.wireshark.org/review/289 - -commit c49165098a47dbd9610cd21d77a2edc69e492cf9 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Feb 12 08:32:27 2014 +0100 +commit 9afa5d6166790661ddc5b44e1e8cb0c2f18fa83e +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Jun 7 10:44:17 2014 -0700 - Add message type from RFC5416 : Section 3 : IEEE 802.11 Specific CAPWAP Control Messages - - Issue found by Massimo Vellucci (SmartCAPWAP) + Only nuke the startup item once we've installed the launch daemon. - Partial-Bug: 9752 + That way, if we crash in the middle, there's still something installed + that will try to set the permissions on the BPF devices. - Change-Id: I6f61a3c8706572e9ea7935e8f00818e6aa9fef7a - Reviewed-on: https://code.wireshark.org/review/193 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit a9dc8016e9d37663c3d09f1563f993182a979554) - Reviewed-on: https://code.wireshark.org/review/290 + Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 + Reviewed-on: https://code.wireshark.org/review/2023 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 39ca18d71b85d0b99c0fd3c5edab48fa217d7d34) + Reviewed-on: https://code.wireshark.org/review/2024 + (cherry picked from commit 9cf44c19d00e1072e28e353a4c8fcdd22e01e554) + Reviewed-on: https://code.wireshark.org/review/2025 -commit 2ba9a20dd132b92b2b567948be2fc5389f40fe93 -Author: Andreas Schultz <aschultz@tpip.net> -Date: Thu Oct 17 02:13:23 2013 +0000 +commit 648766952bf188c3a77c2482d25041694a0dd423 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Jun 6 23:41:51 2014 -0700 - Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165) + When installing the launch daemon, get rid of the old startup item. - From Andreas Schultz + Only one is necessary; get rid of the startup item. - From me: Use expert API instead of throwing exception for a bad length. - - svn path=/trunk/; revision=52657 - - Manual Backport to 1.10 (Use old expert API) - - Change-Id: Iab31aeb9521630d3ad69bb8b7fe5f10d4d95cee7 - Reviewed-on: https://code.wireshark.org/review/288 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 + Reviewed-on: https://code.wireshark.org/review/2016 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit b319a67bfb23a93a7f15076a94be3fe6adb9983d) + Reviewed-on: https://code.wireshark.org/review/2017 + (cherry picked from commit 003746cf120366bb8be4764506eda1c1fdb78504) + Reviewed-on: https://code.wireshark.org/review/2018 -commit 63b3a9dfd3d2d12be127e9358a05a4eced9f6c4b +commit 540f061d5499f9135bb74178fe3cd0bbf26176ea Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Feb 20 17:50:52 2014 -0800 +Date: Fri Jun 6 12:14:27 2014 -0700 - Force "printing" if -T is specified, even if -w is also specified. + Switch to a launch daemon for ChmodBPF. - Just as "tshark ... -P -w xxx" writes raw packets to xxx and writes - text packet summaries to the standard output, and just as "tshark ... - -V -w xxx" writes raw packets to xxx and writes text packet details to - the standard output, so should "tshark ... -T fff -w xxx" write raw - packets to xxx and write whatever "-T fff" (and any "-e" options) - specifies to the standard output. + "Ah finally blew that varmint to Kingdom Come!" - Change-Id: I28ab3a4d48531f297533ec4dfb3742031eb69885 - Reviewed-on: https://code.wireshark.org/review/278 + Change-Id: If935d87dd487f7463261379d76e953396a3ea5e5 + Reviewed-on: https://code.wireshark.org/review/2007 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/279 - -commit 78dae7c43f6512cd411dcfb4f20bc3363fc6ddf6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 17:09:05 2014 -0800 - - More SVN → Git conversion. - - Change-Id: Iddb56a54befd187f87f7a250f1fb38c4d2cc59b2 - Reviewed-on: https://code.wireshark.org/review/265 - Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 83640307e7538fd9586076c9e708b252c410977e -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 23 22:18:49 2013 +0000 +commit 460db8ac53df696058184b729d4446904fab1e6f +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 16:49:12 2014 -0400 - Add NSIS path discovery to config.nmake. - - Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try - to locate makensis automatically, similar to the way we locate Python. + tshark.c: Backport 68a1b55 (with change) from Dev; Also: backport dc02627 - svn path=/trunk/; revision=51497 - (cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c) + 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991. + Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format" - Change-Id: I42d6084e3699275d8212c6e37f8f776f12b343f3 - Reviewed-on: https://code.wireshark.org/review/262 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I469682f24c0cc592cf4111ac8e516b5595807907 + Reviewed-on: https://code.wireshark.org/review/1961 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 5086c0e21d734612e12173acbee6a98b1a5df2ed -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 15:16:44 2014 -0800 +commit 451796d9998b4f70c7f81650b125ca5c1b9cae33 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 20:23:31 2014 +0000 - Replace "svn" with "git" all over the place. - - Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. - Rename "svnversion.h" to "version.h" as Evan suggested. Update some - URLs. In make-version.pl, make sure we don't set an improper upstream - branch name. Use the number of commits + short hash from `git describe` - for package names by default. + Revert "tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991." - Cherry-picked from gf966980 with a lot of manual intervention. + This reverts commit eab9d6b11ae8fa0fd7bf2f44435453a04fb6a472. - Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102 - Reviewed-on: https://code.wireshark.org/review/261 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 84e3498349e202262857985a29549ac93b1beff8 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 16 08:08:09 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-16] - - Change-Id: Id8a7fe6a64184a121c945c8cd281863b96dd233e - Reviewed-on: https://code.wireshark.org/review/230 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ia4a38ba726a0778dfd704dea18887ac36c5b2861 + Reviewed-on: https://code.wireshark.org/review/1960 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 8e4e30f615293b42d14a687ae0db986458942d10 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Fri Feb 14 02:06:03 2014 -0500 +commit eab9d6b11ae8fa0fd7bf2f44435453a04fb6a472 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 15:18:16 2014 -0400 - Fix Bug 9728 'Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be' - - Similar to bug 9725 and ProtoField.new(), the way the VALUESTRING argument is being checked - in the code for ProtoField.bool() ends up making it non-optional. This patch fixes that, - along with some minor API documentation fixes (text). + tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991. - This is a backport for change-id Iadb9a8ace9c5514fc623d882301fe16b637fe4ce - - Change-Id: Ic60375f3e0ad7c7a8887dce7ffbd946f0a9d80b5 - Reviewed-on: https://code.wireshark.org/review/209 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit b826cb9da886d135fdb07439e31dc1ea496911ab -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Feb 5 01:23:25 2014 -0500 - - Fix Bug 9725 'Lua: ProtoField.new() is buggy' - - Using ProtoField.new() is dicey. Many of the optional arguments don't properly check the lua stack - they call lua_isnil() for their index number, instead of lua_gettop() to see the stack size. lua_isnil() may return false in such cases. - - Change-Id: I83ca1e5fc34e71ec35899adbedabcee69571b9fe - Reviewed-on: https://code.wireshark.org/review/118 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-on: https://code.wireshark.org/review/207 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I182357fc57d6e57033319afc762549d805c2c10c + Reviewed-on: https://code.wireshark.org/review/1954 + Reviewed-by: Bill Meier <wmeier@newsguy.com> + (cherry picked from commit 68a1b552f74152a4da39097e8ae5e463518bbb28) + Reviewed-on: https://code.wireshark.org/review/1959 -commit 00caebf4170f88ed02f7712c8c133d9efc364a76 +commit 0be6fee6bc69093cbd22328667e4bc30171e127f Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 11 08:56:15 2014 -0800 +Date: Sun Jun 1 08:09:38 2014 -0700 - Fix the host entry. + [Automatic manuf, services and enterprise-numbers update for 2014-06-01] - Change-Id: Ia76b5585c38eebdec6c275c6e1aadabb3862cf2b - Reviewed-on: https://code.wireshark.org/review/172 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit bed30b8a94b645361a00d70ee2db0ec184cae103) - Reviewed-on: https://code.wireshark.org/review/174 + Change-Id: I71e1941d213f57e5b1b0ae3b52e88c6991814608 + Reviewed-on: https://code.wireshark.org/review/1909 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 0522f62f34214099247aa50bf28c74e75625a80f -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 9 08:07:53 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-09] - - Change-Id: Ia3c3a4e113028e601e074c7ae9005fb532089ecb - Reviewed-on: https://code.wireshark.org/review/152 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b62a8961c7adecc8405ad838bd659b6da8ae8d0d -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Tue Feb 4 00:45:45 2014 -0500 - - Fix bug 9720 'Lua: bitop library is missing in Lua 5.2' - - In Lua 5.2 the bitop library is missing - it's not getting loaded into - the lua global table as "bit", or anything else for that matter. Lua - 5.2 has its own bit-operations library ("bit32") which is there, but - that one's not as good as bitop and would break back/forward - compatibility for lua scripts anyway. - - Change-Id: I94b7d45bbeb2f637d1c76b0b5c9d8472eebfcaea - Reviewed-on: https://code.wireshark.org/review/100 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-on: https://code.wireshark.org/review/141 -commit b921379e087e4fa5a4e9894ee21ae15af6305bb9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Feb 6 16:49:40 2014 -0800 +commit be1f44bd08026a8f854c151691d06611cfe9ac9c +Author: Michael Mann <mmann78@netscape.net> +Date: Tue May 27 19:33:59 2014 -0400 - Pass the caplen from the struct wtap_pkthdr to pcap_read_post_process(). + bugfix address handling - That makes it clearer what the argument should be and, in the case of an - SPB, passes the correct length (the length after any pseudo-header we - convert to a union wtap_pseudo_header and remove from the raw packet - data we hand to our caller). + Also update some encoding arguments caught by pre-commit script that we're backported. - Change-Id: Ia360cd7c971ae1e1635bdef8f7e17a8d9e2495f8 - Reviewed-on: https://code.wireshark.org/review/134 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I9791c1e0a2c6348286d16830cf3703d105b038f3 + Reviewed-on: https://code.wireshark.org/review/1828 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6ed5bab8d5e4d59eaaf01c3d4122ee6610a99d4f -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Feb 4 22:27:07 2014 +0100 - - Introduce end-of-line normalization - - Change-Id: I543039935aec3715cf9887708ca74966fa106571 - Reviewed-on: https://code.wireshark.org/review/115 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 1de44d769cd205a49446ac1fd09ddd196fedb6a8 +commit 9008494ed690c0be833c2373c433bd973311f656 Author: Evan Huus <eapache@gmail.com> -Date: Tue Feb 4 10:28:06 2014 -0500 +Date: Tue May 20 23:22:26 2014 -0400 - Fix dissection of GTP MM Context RAND field. + Permit "jumbo" allocations in emem - As suggested by Lükő Bálint to fix bug #9722. + (potentially) masterful hack to fix bug 10115 without backporting 3/4 of wmem or + doing any real work - Change-Id: Ie6b801a9660716c2c6efa6fd09b50a2481f5acd7 - Reviewed-on: https://code.wireshark.org/review/110 + Bug:10115 + Change-Id: Id7de4fd8bc9340d4ca8e98ba33c68b2c4793a65c + Reviewed-on: https://code.wireshark.org/review/1710 Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - -commit 037db78dbdf5ce3a4b2b66f769db8dbc01fbe9c7 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Fri Jan 10 08:48:38 2014 +0000 - - correct a typo in a filter string - - svn path=/trunk/; revision=54687 - - Change-Id: Ie9ca9fbffdfe83b74f38ab314ba4403d2f17ee8e - Reviewed-on: https://code.wireshark.org/review/104 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 194dafbc0c707fea6f451e06e0848c3d31c63550 -Author: Anders Broman <anders.broman@ericsson.com> -Date: Tue Sep 10 06:06:55 2013 +0000 +commit 783d06d108c5b37acf06c7ce5975de0ad433c40e +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun May 25 18:01:31 2014 +0200 - Freom Dennis: - - As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by - oui_info = (oui_info_t )g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui)) - The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key. + GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 + While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent - svn path=/trunk/; revision=51918 + Bug: 10120 + Change-Id: I3fe113279c779a9d8143d07489747a67d7351664 + Reviewed-on: https://code.wireshark.org/review/1794 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Conflicts: - epan/dissectors/packet-ieee802a.c + epan/dissectors/packet-gsm_rlcmac.c + + (cherry picked from commit c4ead251da7199cfd746d378c51eb8c30d09a6ba) - Change-Id: I659b8eee2bff74d8741d67546a1d7959fc40a113 - Reviewed-on: https://code.wireshark.org/review/101 + Change-Id: I3e022eea6acdc5606c39da53e5c4da956d4ef89c + Reviewed-on: https://code.wireshark.org/review/1797 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6c4d8cbf7d5850a1c731558b6db47f96f93b7528 +commit 6fda9c812f7169e0d471c79e6c5fb9af1f8c92c1 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 2 08:08:14 2014 -0800 +Date: Sun May 25 08:09:06 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-02] + [Automatic manuf, services and enterprise-numbers update for 2014-05-25] - Change-Id: I9e016b004a305d86521ebe6065fd7f6cc9805a89 - Reviewed-on: https://code.wireshark.org/review/76 + Change-Id: I4925f981b73305da591363a01cdcd5700ef968d1 + Reviewed-on: https://code.wireshark.org/review/1791 Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> -commit fba07cd7503a45065fe19bb3717c7472f56fb809 -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 31 18:51:39 2014 -0500 +commit 177affe2ce7c9727147847c71c44874da44f0f24 +Author: Michael Mann <mmann78@netscape.net> +Date: Thu May 22 22:54:28 2014 -0400 - Add gitreview file for master-1.10 + tvb parameter should not be NULL as the lengths are nonzero. - Change-Id: I951f5ad9c121b63d1f075710b0f5e566516c5cca - Reviewed-on: https://code.wireshark.org/review/67 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> + Change-Id: If085a9fc69bbbf28a7c801930a664c412a4a5b7a + Reviewed-on: https://code.wireshark.org/review/1734 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-on: https://code.wireshark.org/review/1735 -commit 0b6bb297545c4da1cee747464834cd7242799a70 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Dec 20 13:33:48 2013 +0000 +commit 45e901d44fb790d72b23cffb80bf4e47844462fc +Author: Michael Mann <mmann78@netscape.net> +Date: Sun May 18 14:21:31 2014 -0400 - Rewrote ProtoField_new to: - - Allow both string and integer for type and base (improve usability). - - Check valid base and mask for different types (avoid crashes). - - Remove ftypes.PROTOCOL from valid types. + Use g_ alloced memory (instead of emem) when printing fields. emem shouldn't be used for GUI functions anyway. - This should fix bug #9549. + emem was exposed because of its memory limits trying to output PDML for a very large byte field in a capture file. - svn path=/trunk/; revision=54292 + When converting from proto_construct_match_selected_string to fvalue_to_string_repr remember proto_construct_match_selected_string includes fieldname + value, not just value - Conflicts: - epan/wslua/wslua_proto.c + Manually applied from I4fc6ea7fd1f63cff410207c8b30562771af40ada - Change-Id: I6e925933b178deb9784340e03d72a4252b498b9c + bug:10081 + Change-Id: Ie45f19a81fad25ae144e3bc5b5ad7d21b1f9c68c + Reviewed-on: https://code.wireshark.org/review/1733 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit d3bd3965e8df79d63ae6a4ae0f7529db49fd906e -Author: Evan Huus <eapache@gmail.com> -Date: Sat Aug 31 02:50:32 2013 +0000 +commit 3057ffc4a2998a504154f703977e5df0a4ed9aff +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Apr 5 07:46:26 2014 -0400 - Convert m3ua to wmem and use the pinfo pool for a variable that might be used - for an address. Fixes the recent valgrind fuzz failure. - - Fixes bug #9699 + Rework debug_print_hash logic so that it's supported by older versions of perl. - svn path=/trunk/; revision=51608 - - Change-Id: Ibbe8018509f8c74c0c70d6f64397fc0c8084d44c - -commit 69c740352a1bf2fec5bf501dad2ee2729f4666d2 -Merge: 892eb72 63d4c99 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 29 11:17:54 2014 +0000 - - Merge "Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded" into master-1.10 - -commit 892eb72ef92c9d56c4f1b1846da20028c7cbdd0b -Merge: aa977c7 312f7e1 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 29 02:13:46 2014 +0000 - - Merge "Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe Kaplan for the report." into master-1.10 - -commit aa977c77b3ef902fe9fa9ceebc84afcc86093871 -Merge: 4d16e9b 3eb9b1c -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 29 00:17:14 2014 +0000 - - Merge "Fix bug 9649: SMPP: source_telematics_id value length is 1 byte" into master-1.10 - -commit 4d16e9b9f0c0b05d495354d5a0b61d535f1bf23c -Merge: 7bb25ec 2efc732 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Jan 28 22:44:06 2014 +0000 + Change-Id: I1720681dc367e01268ffbb1f31035464fa642496 + Reviewed-on: https://code.wireshark.org/review/971 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Tested-by: Michael Mann <mmann78@netscape.net> + Reviewed-on: https://code.wireshark.org/review/1732 - Merge "Add missing gitignore entries" into master-1.10 - -commit 7bb25ecfe4c95dee6186b8c81463c76fbbd78de0 -Merge: e7d6aee 7c8d960 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Jan 28 20:26:28 2014 +0000 - - Merge "Renamed new_TvbRange to push_TvbRange and use this when creating a new TvbRange from a FieldInfo." into master-1.10 - -commit e7d6aee85ca723d65d72a219ec93c51f5d5a7b37 +commit 828466ca500b33f05d52888814c4b1b1414ea97b Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 26 09:08:42 2014 -0800 +Date: Sun May 18 08:06:59 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-26] + [Automatic manuf, services and enterprise-numbers update for 2014-05-18] - Change-Id: I1dbd8bdeed0afb95951f9d10363b4ac1f8713f77 + Change-Id: If0bde72fd6023b26baa040cfab68c35a7cb2f344 + Reviewed-on: https://code.wireshark.org/review/1680 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 2efc732f7fd26ba4d3fa2eb907e8e33a77249ee3 -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 26 09:11:53 2014 -0500 +commit 6a77ad9ea439cb0d3d212a345f9c3cac30e084d4 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Tue Apr 22 22:18:35 2014 -0400 - Add missing gitignore entries + Manually apply https://code.wireshark.org/review/1289 to master-1.10: - Change-Id: I6bc9bbe885d6d68d2545d1d0f7010cd939af4407 - -commit 9e61436165177098c7d526e8f1d9b59204cd7e3a -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 26 14:05:30 2014 +0000 - - Backport r54295 and part of r54296 - g_memmove is deprecated, so just use - memmove instead to permit building with recent glib versions. + Fix up get_hfi_and_length(): - svn path=/trunk-1.10/; revision=54966 - -commit f37b929a48571217e6063ff299cff80bdf53c800 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 24 07:56:15 2014 +0000 - - Copy over r54938 from trunk: - - ------------------------------------------------------------------------ - r54938 \| guy \| 2014-01-23 23:55:03 -0800 (Thu, 23 Jan 2014) \| 5 lines + Treat FT_BYTES and a few others the same as FT_PROTOCOL: allow a zero length + but throw an exception if the offset is already beyond the end of the TVB + (prior to this change it would assert out). This (when manually applied to + master-1.10) fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9999 . - Check for a zero offset in the "get status" reply before* adding the - offset in the tvbuff of the beginning of the packet to it. Otherwise, - it will never be zero, and the tests will always think the field pointed - to by the offset is present. + Use tvb_ensure_captured_length_remaining() to throw an exception if the offset + is bad. - svn path=/trunk-1.10/; revision=54939 + Change-Id: Ibc61cc9ac331b669c688611ee9f23d36479378ef + Reviewed-on: https://code.wireshark.org/review/1290 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 7c8d9609fb8539b97bacfcd05d8909d2ed0ab7fe -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Dec 19 15:26:31 2013 +0000 +commit 5cdb0c35aa3ca7ec5a3af9c166c42c9a01f9eefc +Author: Evan Huus <eapache@gmail.com> +Date: Sun May 11 20:33:58 2014 -0400 - Renamed new_TvbRange to push_TvbRange and use this when creating a new - TvbRange from a FieldInfo. + Don't use -1 as length in frame dissector. - This should fix the crash in bug #9483. + Additional belated followup to gfe195c0c9 per conversation on -dev about the use + of -1 and when we should throw exceptions. See also g867a1827e7. - svn path=/trunk/; revision=54247 + Should (in theory) permit reverting gfe195c0c9 (which was not in 1.10) - Change-Id: I0eaa87a5c95f486e2fb259f437e1ed9727d560d8 - -commit cadc31c42a21d2edfb77de8357d4aca337ca5e5c -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 22 02:17:04 2014 +0000 - - Copy over r54884 from trunk, with manual intervention: + Bug:9999 + Bug:10030 + Change-Id: I56e5f4e5dc12fe82268243d0b113cfc9ff5fdd17 + Reviewed-on: https://code.wireshark.org/review/1603 + Reviewed-by: Anders Broman <a.broman58@gmail.com> - ------------------------------------------------------------------------ - r54884 \| guy \| 2014-01-21 17:22:01 -0800 (Tue, 21 Jan 2014) \| 4 lines + Conflicts: + epan/dissectors/packet-frame.c - It's not a string, it's a byte array (bit array, really). + Change-Id: Ibeb119f911a698d44f4baa06d888bb1e775983bc + Reviewed-on: https://code.wireshark.org/review/1640 + Reviewed-by: Evan Huus <eapache@gmail.com> + +commit 40fe99a372df5297d3b19588875b9f2802fe00e6 +Author: AndersBroman <a.broman@bredband.net> +Date: Fri Mar 28 06:45:01 2014 +0100 + + Deleted one line to much in previous chgange. + + Change-Id: I19d1153558130356286bac55f6cb321d30a767b1 + Reviewed-on: https://code.wireshark.org/review/852 + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit b2509f67b8d64ecb5de902b9954c7659605c4395) + Reviewed-on: https://code.wireshark.org/review/1638 + +commit 1283e76ff338aa4fab34819f3e41caed58d6b984 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Mon Mar 24 13:41:49 2014 +0100 + + Get rid of the background pixmap, set the background color directly. + + Change-Id: I7b291892b041055fe4165abcbb2962a295aedce4 + Reviewed-on: https://code.wireshark.org/review/811 + Reviewed-by: Anders Broman <a.broman58@gmail.com> - Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. + Conflicts: + ui/gtk/graph_analysis.c - As part of the manual intervention, use ep allocation, so we don't leak - memory. (In the trunk, we used wmem packet scope when allocating even - before the fix.) + This fixes the crash happening when opening flow graph. - svn path=/trunk-1.10/; revision=54887 + Bug: 9179 + Change-Id: I70108eae7c11aa4bdb5b61dfeaa1cea1e602652a + Reviewed-on: https://code.wireshark.org/review/1635 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 312f7e18098177b6098878de33d555aae39ab815 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Jan 21 18:48:01 2014 +0000 +commit f6b86a46974b803de01ab4ffff19fdf46a91cfc7 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun May 11 15:07:25 2014 +0200 - Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe - Kaplan for the report. + Identify client/server by their IP address and port number in follow streams dialog box - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some - other cases in the same vein. + This allows to properly identify hosts that use the same port number - svn path=/trunk/; revision=54875 + Change-Id: I93bf5b53e4df1d339fb06b372b90f88fce6785a0 + Reviewed-on: https://code.wireshark.org/review/1588 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Conflicts: - epan/dissectors/packet-nfs.c + ui/gtk/follow_ssl.c + ui/gtk/follow_tcp.c + ui/gtk/follow_udp.c + ui/qt/follow_stream_dialog.cpp + + (cherry picked from commit 98f608cc0ddd5493a18e87ffe09ed551969b8ae3) - Change-Id: I73714f5c0df608785b0bd96666e0dcf7a9d7ca3a + Change-Id: I6c984dc4e6e68ce74c619980777602fcd1b25cba + Reviewed-on: https://code.wireshark.org/review/1612 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 63d4c995d0b207c101611ec1168616e99e11b4ff +commit b765985eeb706e83b24c4d8d32462aa3f34665b4 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 12 20:52:19 2014 +0000 +Date: Sat May 10 17:02:24 2014 +0200 - Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded + Small fixes to Follow Streams dialog box: + - get the right IPv6 client address + - display the right client to server string for UDP/SSL in Qt port - svn path=/trunk/; revision=54707 + Change-Id: I399cc38b8a32321198deccdd8e2ecd05b54e14db + Reviewed-on: https://code.wireshark.org/review/1586 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Conflicts: - epan/dissectors/packet-h264.c + ui/gtk/follow_ssl.c + ui/gtk/follow_udp.c + ui/qt/follow_stream_dialog.cpp - (cherry picked from commit 527071fb0dba0b8cae5ed8baa58b19ebf1996b89) + (cherry picked from commit e2eea89698b7109d5271186200ab95d97ebc7981) - Change-Id: I572506ad6be63c7243d7b8181c6c79a75d1af04c + Change-Id: Ifac6625ceb3103e1c82a9ca485a26a842a395aec + Reviewed-on: https://code.wireshark.org/review/1611 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 3eb9b1c839910823a4779a6eaf92cf2e9665a749 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 17 22:18:50 2014 +0000 +commit ccce29a936d15dfdfea4f81df90f99150b189ad9 +Author: Gerald Combs <gerald@zing.org> +Date: Sun May 11 09:47:09 2014 -0700 - Fix bug 9649: SMPP: source_telematics_id value length is 1 byte - - svn path=/trunk/; revision=54837 + Don't build update-sminmpec by default when using CMake. - (cherry picked from commit 642949701501d313059c3e7de888af266e00d0d1) - - Change-Id: Ib389f8f9b898492b69240cbf0674fe74bc0e1ca4 + Change-Id: Iccce783eeef23a90ca23900cf18e2d3d2620c767 + Reviewed-on: https://code.wireshark.org/review/1592 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 44d83c2f4f9256f7436e43dee940c922d864d57d) + Reviewed-on: https://code.wireshark.org/review/1593 -commit bc178a12738f03bb5e64edb0e91d14de9960f39d +commit 0bd3ab12e3b28253a21df12dbf5e5691d169380f Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 19 15:19:29 2014 +0000 +Date: Sun May 11 08:07:07 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-19] + [Automatic manuf, services and enterprise-numbers update for 2014-05-11] - svn path=/trunk-1.10/; revision=54845 + Change-Id: Iabdbf1459b32d684cd811be94d22e8cb1e459b20 + Reviewed-on: https://code.wireshark.org/review/1590 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit e57d7a63a05aa7e69c9a3e61f92c1eabf55f48c0 +commit 9f6a83447a9076f29910ccc33196db7c3b14b03a Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 15 00:39:25 2014 +0000 +Date: Mon May 5 11:50:24 2014 -0700 - Copy over recent changes from trunk-1.8 along with some local - modifications. + Be less aggressive about rebuilding sminmpec.c. - ------------------------------------------------------------------------ - r54807 \| gerald \| 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) \| 2 lines + Instead of forcing developers to generate sminmpec.c (which will have + different results depending on the presence or absence of a working + Internet connection) add sminmpec.c back to the repository. I'll add + it to the weekly update-numbers script so that it will be updated at + the same time as manuf, services, enterprise-numbers, and usb.c. - Start using the output of 'git describe'. - ------------------------------------------------------------------------ - r54805 \| gerald \| 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) \| 2 lines + Change the Autotools, CMake, and Nmake sminmpec.c target name to + "update-sminmpec". - Start adding support for plain git. - ------------------------------------------------------------------------ + Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers + and sminmpec.c while we're here. + Tested with an in-tree Autotools build and an out-of-tree CMake build. - svn path=/trunk-1.10/; revision=54808 + Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 + Reviewed-on: https://code.wireshark.org/review/1516 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 3f247a5cee61d8f2139ade94cd9840b100337b05 with manual fixes) + Reviewed-on: https://code.wireshark.org/review/1576 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f3b6ddbc2729b26e91672942c633056af707e1fb -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 13 19:56:48 2014 +0000 +commit efd7ec4f255981f1a4a2ad1f49580233d522af7a +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu May 8 12:38:34 2014 +0200 - Copy over r54714 from trunk: - - ------------------------------------------------------------------------ - r54714 \| guy \| 2014-01-13 11:49:12 -0800 (Mon, 13 Jan 2014) \| 17 lines + TCAP: set a fence on info column after calling sub dissector - In a source file that defines external functions, the header file that - declares the functions must be included, in order to make sure the - declarations match the function signature. Make it so. + Bug: 10091 + Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 + Reviewed-on: https://code.wireshark.org/review/1555 + Reviewed-by: Anders Broman <a.broman58@gmail.com> - They didn't match; fix that. - - Do not use 16-bit tvbuff offsets; there is no advantage to that (and, - in fact, 32-bit arithmetic may be easier on some platforms), and it has - the disadvantage that you're more likely to have the offset overflow. - - dissect_cbs_serial_number() returns the new offset, not the length of - the item it dissected; don't add its return value to the offset, set the - offset to its return value. + Conflicts: + asn1/tcap/packet-tcap-template.c + epan/dissectors/packet-tcap.c - Make dissect_cbs_message_identifier() return the new offset as well, for - consistency, and don't add its return value to the offset. + (cherry picked from commit 54be3eaaec057c44a4b42e4cf538cd07ee247bce) - svn path=/trunk-1.10/; revision=54715 + Change-Id: I37f554d284bdbe45979ec4ccea3d12198023ba53 + Reviewed-on: https://code.wireshark.org/review/1558 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 80489e7c688904319f8fa143fec0ea69bb85f2cb -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 12 15:19:31 2014 +0000 +commit b76f8c7d4698d4dd174beb8714e31489d8173ea1 +Author: Jakub Zawadzki <darkjames@darkjames.pl> +Date: Sun May 4 23:06:54 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2014-01-12] + Fix possible buffer overflow in col_append_sep_fstr() - svn path=/trunk-1.10/; revision=54703 - -commit 11ef00df3e94a5499d3863ff9ac2370be6d37530 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 7 21:24:22 2014 +0000 - - Copy over r54630 from trunk: + After appending separator it might happen that len > max_len, in such case + g_vsnprintf() will overflow the col_buf buffer. - ------------------------------------------------------------------------ - r54630 \| guy \| 2014-01-07 13:21:20 -0800 (Tue, 07 Jan 2014) \| 6 lines - - The capabilities for dumpcap don't need to be inheritable. - - See - - https://bugzilla.redhat.com/show_bug.cgi?id=1022377 - - svn path=/trunk-1.10/; revision=54631 + Change-Id: Ic5ff49d30e30509e835165c4cc7e72e31f92fd5f + Reviewed-on: https://code.wireshark.org/review/1493 + Reviewed-by: Evan Huus <eapache@gmail.com> + (cherry picked from commit 984e52244f08d344a6979bf1405b3d730a388702) + Reviewed-on: https://code.wireshark.org/review/1514 -commit 65a9164e08c0e152c7ce2a2586f0b417b1c263a4 +commit a1df6a4adc72e7f24c2be6f73e5a1de5e78bd01c Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 5 15:19:24 2014 +0000 +Date: Sun May 4 08:06:56 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-05] + [Automatic manuf, services and enterprise-numbers update for 2014-05-04] - svn path=/trunk-1.10/; revision=54602 + Change-Id: Ie2afbbb081e3815470be82d3dcec0166baaf9a7b + Reviewed-on: https://code.wireshark.org/review/1489 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 7fdea48ff9d44de1117a7d52555eb17adb000beb -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 2 09:41:50 2014 +0000 +commit 2ad067c54b349274ae83a9b0827bd475967fdcc8 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Apr 30 13:16:31 2014 -0400 - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54529 \| stig \| 2014-01-01 13:20:27 +0100 (mer. 01 janv. 2014) \| 2 lignes - Chemins modifiés : - M /trunk/packaging/macosx/Info.plist.in - M /trunk/version_info.c - - Happy new year! + Copy make-sminmpec.pl from master. - ------------------------------------------------------------------------ + The previous cherry-pick didn't have the desired effect. - svn path=/trunk-1.10/; revision=54550 + Change-Id: I52b6bd7f33ffe090680e578ae6be8518fbd27022 + Reviewed-on: https://code.wireshark.org/review/1443 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 96d5a4760395b7a6c5a64f243de728fe2b3f0a92 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 1 23:24:27 2014 +0000 +commit e4e5bc3194ebfbb42759ca7e3ce4cc9d5f1fb1a8 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Apr 27 13:26:17 2014 -0700 - Copy over r54544 from trunk: - - ------------------------------------------------------------------------ - r54544 \| guy \| 2014-01-01 15:22:53 -0800 (Wed, 01 Jan 2014) \| 11 lines + make-sminmpec.pl fixups. - If the uncompression buffers are empty, they have no data; set the count - of bytes in them to 0, as there's no data in them, and set the offset in - that buffer of the stream's current position, to 0, as we're currently - at the beginning of the file in both streams. + Enforce a minimum number of entries and do our work in the epan + directory. - This fixes some tricky-to-reproduce errors (which show up only if the - ngsniffer_t structure is allocated from data that's been allocated, - written to in those variables, and freed). - - svn path=/trunk-1.10/; revision=54545 + Change-Id: I69cc6ae3255b23706a2e67db890a9718e10568b2 + Reviewed-on: https://code.wireshark.org/review/1398 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 002cefc721e5fe01ba6ecb9ec7261f549f4f1459) + Reviewed-on: https://code.wireshark.org/review/1441 -commit cddbba2b1bc2ec846d7fa70130686ac286dcb2c6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 17:30:27 2013 +0000 +commit 26dd11dec3b600b09f76bc7000ceae04241ee607 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Apr 27 15:33:13 2014 -0400 - Manually copy over r54485: - - ------------------------------------------------------------------------ - r54485 \| gerald \| 2013-12-29 09:28:12 -0800 (Sun, 29 Dec 2013) \| 9 lines - Changed paths: - M /trunk/manuf - M /trunk/tools/make-manuf - - The IEEE OUI, IAB, and OUI-36 lists currently redirect to - http://standards.ieee.org/regauthmaint.html, which says - - IEEE Registration Authority Services will be unavailable from Friday, December 27th through Monday, December 30th + Remove support for SHIM6 on protocol 61 - As a result the manuf file got clobbered. Revert the manuf file to - its non-clobbered state and add sanity checks to make-manuf. Add a - note about the impending addition of OUI-28. - ------------------------------------------------------------------------ - - svn path=/trunk-1.10/; revision=54486 + bug:9995 + Change-Id: I3c6ff189c4f9cca83b18ea2f057a1bca0c6809c4 + Reviewed-on: https://code.wireshark.org/review/1390 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit fb147728833becb86736162f4a3b6d56db820677 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 15:19:23 2013 +0000 +commit d76e07f5ba94f579c9e81fdab40ab7e83d65d632 +Author: Jaap Keuter <jaap.keuter@xs4all.nl> +Date: Wed Apr 23 23:59:19 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2013-12-29] + Adding two well known OAM related multicast address ranges. - svn path=/trunk-1.10/; revision=54481 + Change-Id: I8fb840e7422b5fe7cd3072d8332de659598ebd3d + Reviewed-on: https://code.wireshark.org/review/1313 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 560b5d9e0c9e4a2ad3e4e930f8ed9dc5b2966756) + Reviewed-on: https://code.wireshark.org/review/1331 + Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> -commit 6e69a1798c5c4de2877b13f5b32e8db86ecc47b7 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Thu Dec 26 23:01:13 2013 +0000 +commit 7aaaf15a12812e7ab6dd03bb122c4ed2bb79fff3 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Apr 25 10:44:11 2014 -0700 - Remove a (presumably debug) fprintf of the default filter value. + Don't fail if a pcap-NG PB or EPB has caplen > actual len. + + We don't fail for other file types; there's no point in failing for + pcap-NG. wtap_read() and wtap_seek_read() will ensure that + caplen <= len. + + Fixes bug 10037. - svn path=/trunk-1.10/; revision=54471 + Change-Id: If8fe0c21ff4a3a57fbd0575d43306fa892d31a6a + Reviewed-on: https://code.wireshark.org/review/1356 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5d329247198b60502bbd295013660936d175d822 +commit 2515bbe055e84b2b610385bbca9a1d246de20c4c Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 22 15:19:28 2013 +0000 +Date: Tue Apr 22 11:58:40 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2013-12-22] + 1.10.7 → 1.10.8. - svn path=/trunk-1.10/; revision=54360 + Change-Id: Icc8695bbc102ee5f827a17fcced9db475fdb9621 + Reviewed-on: https://code.wireshark.org/review/1281 + Reviewed-by: Gerald Combs <gerald@wireshark.org>
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/INSTALL ^
@@ -1,12 +1,13 @@ $Id$ NOTE: this document applies to the Wireshark source releases and -buildbot source tarballs. It does not apply to source code checked -out directly from Subversion, as files such as the configuration -script are not checked into Subversion, but need to be generated -from the autoconf and automake files. -See http://wiki.wireshark.org/Development if you would like to build -the source code checked out directly from Subversion. +buildbot source tarballs. It does not apply to source code checked out +directly from Git, as files such as the configuration script are not +checked into Git, but need to be generated from the autoconf and +automake files. + +See http://wiki.wireshark.org/Development if you would like to build the +source code checked out directly from Git. Installation ============
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/NEWS ^
@@ -1,4 +1,4 @@ - Wireshark 1.10.6 Release Notes + Wireshark 1.10.8 Release Notes __________________________________________________________ What is Wireshark? @@ -13,59 +13,31 @@ Bug Fixes The following vulnerabilities have been fixed. - * [1]wnpa-sec-2014-01 - The NFS dissector could crash. Discovered by Moshe Kaplan. - ([2]Bug 9672) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [3]CVE-2014-2281 - * [4]wnpa-sec-2014-02 - The M3UA dissector could crash. Discovered by Laurent - Butti. ([5]Bug 9699) - Versions affected: 1.10.0 to 1.10.5 - [6]CVE-2014-2282 - * [7]wnpa-sec-2014-03 - The RLC dissector could crash. ([8]Bug 9730) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [9]CVE-2014-2283 - * [10]wnpa-sec-2014-04 - The MPEG file parser could overflow a buffer. Discovered by - Wesley Neelen. ([11]Bug 9843) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [12]CVE-2014-2299 + * [1]wnpa-sec-2014-07 + The frame metadissector could crash. ([2]Bug 9999, [3]Bug + 10030) + Versions affected: 1.10.0 to 1.10.7 + [4]CVE-2014-4020 The following bugs have been fixed: - * Customized OUI is not recognized correctly during - dissection. ([13]Bug 9122) - * Properly decode CAPWAP Data Keep-Alives. ([14]Bug 9165) - * Build failure with GTK 3.10 - GTK developers have gone - insane. ([15]Bug 9340) - * SIGSEGV/SIGABRT during free of TvbRange using a chained - dissector in lua. ([16]Bug 9483) - * MPLS dissector no longer registers itself in "ppp.protocol" - table. ([17]Bug 9492) - * Tshark doesn't display the longer data fields (mbtcp). - ([18]Bug 9572) - * DMX-CHAN disector does not clear strbuf between rows. - ([19]Bug 9598) - * Dissector bug, protocol SDP: proto.c:4214: failed assertion - "length >= 0". ([20]Bug 9633) - * False error: capture file appears to be damaged or corrupt. - ([21]Bug 9634) - * SMPP field source_telematics_id field length different from - spec. ([22]Bug 9649) - * Lua: bitop library is missing in Lua 5.2. ([23]Bug 9720) - * GTPv1-C / MM Context / Authentication quintuplet / RAND is - not correct. ([24]Bug 9722) - * Lua: ProtoField.new() is buggy. ([25]Bug 9725) - * Lua: ProtoField.bool() VALUESTRING argument is not optional - but was supposed to be. ([26]Bug 9728) - * Problem with CAPWAP Wireshark Dissector. ([27]Bug 9752) - * nas-eps dissector: CS Service notification dissection stops - after Paging identity IE. ([28]Bug 9789) + * VoIP flow graph crash upon opening. ([5]Bug 9179) + * Tshark with "-F pcap" still generates a pcapng file. + ([6]Bug 9991) + * IPv6 Next Header 0x3d recognized as SHIM6. ([7]Bug 9995) + * Failed to export pdml on large pcap. ([8]Bug 10081) + * TCAP: set a fence on info column after calling sub + dissector ([9]Bug 10091) + * Dissector bug in JSON protocol. ([10]Bug 10115) + * GSM RLC MAC: do not skip too many lines of the CSN_DESCR + when the field is missing ([11]Bug 10120) + * Wireshark PEEKREMOTE incorrectly decoding QoS data packets + from Cisco Sniffer APs. ([12]Bug 10139) + * IEEE 802.11: fix dissection of HT Capabilities ([13]Bug + 10166) New and Updated Features - IPv4 checksum verfification is now disabled by default. + There are no new features in this release. New Protocol Support @@ -73,25 +45,24 @@ Updated Protocol Support - AppleTalk, CAPWAP, DMX-CHAN, DSI, DVB-CI, ESS, GTPv1, IEEE - 802a, M3UA, Modbus/TCP, NAS-EPS, NFS, OpenSafety, SDP, and SMPP + CIP, EtherNet/IP, GSM RLC MAC, IEEE 802.11, IPv6, and TCAP New and Updated Capture File Support - libpcap, MPEG, and pcap-ng + pcap-ng, and PEEKREMOTE __________________________________________________________ Getting Wireshark Wireshark source code and installation packages are available - from [29]http://www.wireshark.org/download.html. + from [14]http://www.wireshark.org/download.html. Vendor-supplied Packages Most Linux and Unix vendors supply their own Wireshark packages. You can usually install or upgrade Wireshark using the package management system specific to that platform. A list - of third-party packages can be found on the [30]download page + of third-party packages can be found on the [15]download page on the Wireshark web site. __________________________________________________________ @@ -105,101 +76,86 @@ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([31]Bug + Dumpcap might not quit if Wireshark or TShark crashes. ([16]Bug 1419) - The BER dissector might infinitely loop. ([32]Bug 1516) + The BER dissector might infinitely loop. ([17]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([33]Bug 1814) + ([18]Bug 1814) Filtering tshark captures with read filters (-R) no longer - works. ([34]Bug 2234) + works. ([19]Bug 2234) The 64-bit Windows installer does not support Kerberos - decryption. ([35]Win64 development page) + decryption. ([20]Win64 development page) - Resolving ([36]Bug 9044) reopens ([37]Bug 3528) so that + Resolving ([21]Bug 9044) reopens ([22]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([38]Bug + Application crash when changing real-time option. ([23]Bug 4035) - Hex pane display issue after startup. ([39]Bug 4056) + Hex pane display issue after startup. ([24]Bug 4056) - Packet list rows are oversized. ([40]Bug 4357) + Packet list rows are oversized. ([25]Bug 4357) Summary pane selected frame highlighting not maintained. - ([41]Bug 4445) + ([26]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. ([42]Bug 4985) + cases. ([27]Bug 4985) __________________________________________________________ Getting Help - Community support is available on [43]Wireshark's Q&A site and + Community support is available on [28]Wireshark's Q&A site and on the wireshark-users mailing list. Subscription information and archives for all of Wireshark's mailing lists can be found - on [44]the web site. + on [29]the web site. Official Wireshark training and certification are available - from [45]Wireshark University. + from [30]Wireshark University. __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [46]Wireshark web site. + A complete FAQ is available on the [31]Wireshark web site. __________________________________________________________ - Last updated 2014-03-06 13:50:43 PST + Last updated 2014-06-12 12:06:58 PDT References - 1. https://www.wireshark.org/security/wnpa-sec-2014-01.html - 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 - 3. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2281 - 4. https://www.wireshark.org/security/wnpa-sec-2014-02.html - 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9699 - 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2282 - 7. https://www.wireshark.org/security/wnpa-sec-2014-03.html - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9730 - 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2283 - 10. https://www.wireshark.org/security/wnpa-sec-2014-04.html - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9843 - 12. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2299 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165 - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9340 - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9483 - 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492 - 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572 - 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - 20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 - 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634 - 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 - 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9720 - 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9722 - 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9725 - 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9728 - 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9752 - 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9789 - 29. http://www.wireshark.org/download.html - 30. http://www.wireshark.org/download.html#thirdparty - 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 35. https://wiki.wireshark.org/Development/Win64 - 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 - 42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 43. http://ask.wireshark.org/ - 44. http://www.wireshark.org/lists/ - 45. http://www.wiresharktraining.com/ - 46. http://www.wireshark.org/faq.html + 1. https://www.wireshark.org/security/wnpa-sec-2014-07.html + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9999 + 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10030 + 4. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-4020 + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9179 + 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9991 + 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9995 + 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10081 + 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10091 + 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10115 + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10120 + 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10139 + 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10166 + 14. http://www.wireshark.org/download.html + 15. http://www.wireshark.org/download.html#thirdparty + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 20. https://wiki.wireshark.org/Development/Win64 + 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 28. http://ask.wireshark.org/ + 29. http://www.wireshark.org/lists/ + 30. http://www.wiresharktraining.com/ + 31. http://www.wireshark.org/faq.html
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/README.macos ^
@@ -38,7 +38,7 @@ After you have installed those libraries: -If you are building from a Subversion tree, rather than from a source +If you are building from a Git tree, rather than from a source distribution tarball, run the autogen.sh script. This should not be necessary if you're building from a source distribution tarball, unless you've added new source files to the Wireshark source. @@ -52,7 +52,7 @@ If you are building from a release tarball: make distclean - If you are building from SVN: + If you are building from Git: make maintainer-clean ./autogen.sh
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/asn1/lcsap/packet-lcsap-template.c ^
@@ -148,8 +148,7 @@ { 0x01, "Attempted successfully: results not used to generate location - not used." }, { 0x02, "Attempted successfully: results used to verify but not generate location - not used." }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" }, @@ -184,8 +183,7 @@ { 0x01, "Attempted successfully: results not used to generate location" }, { 0x02, "Attempted successfully: results used to verify but not generate location" }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" },
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/asn1/lte-rrc/lte-rrc.cnf ^
@@ -305,7 +305,16 @@ case SI_OrPSI_GERAN_si: /* SI message / if (gsm_a_dtap_handle) { - call_dissector(gsm_a_dtap_handle, sys_info_list_tvb, actx->pinfo, subtree); + tvbuff_t si_tvb = tvb_new_composite(); + guint8 pd = (guint8 )g_malloc(1); + tvbuff_t *pd_tvb = tvb_new_child_real_data(sys_info_list_tvb, pd, 1, 1); + tvb_set_free_cb(pd_tvb, g_free); + pd[0] = 0x06; + tvb_composite_append(si_tvb, pd_tvb); + tvb_composite_append(si_tvb, sys_info_list_tvb); + tvb_composite_finalize(si_tvb); + add_new_data_source(actx->pinfo, si_tvb, "System Information"); + call_dissector(gsm_a_dtap_handle, si_tvb, actx->pinfo, subtree); } break; case SI_OrPSI_GERAN_psi:
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/asn1/tcap/packet-tcap-template.c ^
@@ -633,8 +633,10 @@ } /* Call the sub dissector if present, and not already called */ - if (is_subdissector) + if (is_subdissector) { call_dissector(subdissector_handle, tvb, actx->pinfo, tree); + col_set_fence(actx->pinfo->cinfo, COL_INFO); + } return offset; }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/config.nmake ^
@@ -23,13 +23,13 @@ ##### Versions ##### # The Git description of our build. Updated by make-version.pl -GIT_REVISION=2253 +GIT_REVISION=2 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=10 -VERSION_MICRO=6 +VERSION_MICRO=8 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for wireshark 1.10.6. +# Generated by GNU Autoconf 2.68 for wireshark 1.10.8. # # Report bugs to <http://bugs.wireshark.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.10.6' -PACKAGE_STRING='wireshark 1.10.6' +PACKAGE_VERSION='1.10.8' +PACKAGE_STRING='wireshark 1.10.8' PACKAGE_BUGREPORT='http://bugs.wireshark.org/' PACKAGE_URL='http://www.wireshark.org/' @@ -1553,7 +1553,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.10.6 to adapt to many kinds of systems. +\`configure' configures wireshark 1.10.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1624,7 +1624,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of wireshark 1.10.6:";; + short \| recursive ) echo "Configuration of wireshark 1.10.8:";; esac cat <<\_ACEOF @@ -1832,7 +1832,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.10.6 +wireshark configure 1.10.8 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2376,7 +2376,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.10.6, which was +It was created by wireshark $as_me 1.10.8, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3310,7 +3310,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.10.6' + VERSION='1.10.8' cat >>confdefs.h <<_ACEOF @@ -3440,7 +3440,7 @@ $as_echo "#define VERSION_MINOR 10" >>confdefs.h -$as_echo "#define VERSION_MICRO 6" >>confdefs.h +$as_echo "#define VERSION_MICRO 8" >>confdefs.h # Check whether --enable-static was given. @@ -34973,7 +34973,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.10.6, which was +This file was extended by wireshark $as_me 1.10.8, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35040,7 +35040,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.10.6 +wireshark config.status 1.10.8 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/configure.ac ^
@@ -3,7 +3,7 @@ m4_define([version_major], [1]) m4_define([version_minor], [10]) -m4_define([version_micro], [6]) +m4_define([version_micro], [8]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], [])
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/debian/changelog ^
@@ -1,4 +1,4 @@ -wireshark (1.10.6) unstable; urgency=low +wireshark (1.10.8) unstable; urgency=low * Self-made package
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/dfilters ^
@@ -8,7 +8,7 @@ "IPX only" ipx "TCP only" tcp "UDP only" udp -"UDP port isn't 53 (not DNS), don't use != for this!" !(tcp.port == 53) +"Non-DNS" !(udp.port == 53 \|\| tcp.port == 53) "TCP or UDP port is 80 (HTTP)" tcp.port == 80 \|\| udp.port == 80 "HTTP" http "No ARP and no DNS" not arp and !(udp.port == 53)
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/doc/README.packaging ^
@@ -23,7 +23,7 @@ Logo and icon artwork can be found in the "image" directory in the distribution. This is available online at - http://anonsvn.wireshark.org/wireshark/trunk/image/ + https://code.wireshark.org/review/gitweb?p=wireshark.git;a=tree;f=image;hb=HEAD 2. Licensing.
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/docbook/asciidoc.conf ^
@@ -4,7 +4,7 @@ [replacements] # Yes, this is a fake macro. -wireshark-version:\[\]=1.10.6 +wireshark-version:\[\]=1.10.8 [macros]
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/docbook/developer-guide.xml ^
@@ -28,7 +28,7 @@ --> <!ENTITY DocumentTitle "<application>Wireshark</application> Developer's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &WiresharkCurrentVersion;"> + <!ENTITY DocumentSubTitle "&GitVersion; for Wireshark &WiresharkCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "WSDG"> <!ENTITY DocumentCopyrightHolder "Ulf Lamping"> @@ -37,8 +37,8 @@ <!ENTITY DocumentEdition "Draft"> <!ENTITY DocumentVersion "Draft 0.0.3"> <!ENTITY DocumentPubDate "2008"> - <!ENTITY % SvnVersionFile SYSTEM "git_version.xml"> - %SvnVersionFile; + <!ENTITY % GitVersionFile SYSTEM "git_version.xml"> + %GitVersionFile; <!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/docbook/git_version.xml ^
@@ -1 +1 @@ -<!ENTITY GitVersion "wireshark-1.10.6-dirty"> +<!ENTITY GitVersion "wireshark-1.10.8-2-g52a5244-dirty">
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/docbook/release-notes.asciidoc ^
@@ -16,78 +16,35 @@ //* ws-salink:2013-11[] //* cve-idlink:2013-2486[] -* ws-salink:2014-01[] +* ws-salink:2014-07[] + -The NFS dissector could crash. Discovered by Moshe Kaplan. -// Fixed in trunk: r54875 / gf4ab2b2 -// Fixed in trunk-1.10: g312f7e1 -// Fixed in trunk-1.8: g2fb9848 -(ws-buglink:9672[]) +The frame metadissector could crash. +// Fixed in master: gbeb119f +// Fixed in master-1.10: g5cdb0c3 +(ws-buglink:9999[], ws-buglink:10030[]) + -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 +Versions affected: 1.10.0 to 1.10.7 + -cve-idlink:2014-2281[] - -* ws-salink:2014-02[] -+ -The M3UA dissector could crash. Discovered by Laurent Butti. -// Fixed in master: r51608 / ga8f4327 -// Fixed in master-1.10: gd3bd396 -(ws-buglink:9699[]) -+ -Versions affected: 1.10.0 to 1.10.5 -+ -cve-idlink:2014-2282[] - -* ws-salink:2014-03[] -+ -The RLC dissector could crash. -// Fixed in trunk: n/a -// Fixed in trunk-1.10: gd8075e7 -// Fixed in trunk-1.8: g217293b -(ws-buglink:9730[]) -+ -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -+ -cve-idlink:2014-2283[] - -* ws-salink:2014-04[] -+ -The MPEG file parser could overflow a buffer. Discovered by Wesley -Neelen. -// Fixed in trunk: n/a -// Fixed in trunk-1.10: g34144b8 -// Fixed in trunk-1.8: gf567435 -(ws-buglink:9843[]) -+ -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -+ -cve-idlink:2014-2299[] +cve-idlink:2014-4020[] The following bugs have been fixed: +// Should be sorted numerically. //* Wireshark will practice the jazz flute for hours on end when you're trying to sleep. (ws-buglink:0000[]) -* Customized OUI is not recognized correctly during dissection. (ws-buglink:9122[]) -* Properly decode CAPWAP Data Keep-Alives. (ws-buglink:9165[]) -* Build failure with GTK 3.10 - GTK developers have gone insane. (ws-buglink:9340[]) -* SIGSEGV/SIGABRT during free of TvbRange using a chained dissector in lua. (ws-buglink:9483[]) -* MPLS dissector no longer registers itself in "ppp.protocol" table. (ws-buglink:9492[]) -* Tshark doesn't display the longer data fields (mbtcp). (ws-buglink:9572[]) -* DMX-CHAN disector does not clear strbuf between rows. (ws-buglink:9598[]) -* Dissector bug, protocol SDP: proto.c:4214: failed assertion "length >= 0". (ws-buglink:9633[]) -* False error: capture file appears to be damaged or corrupt. (ws-buglink:9634[]) -* SMPP field source_telematics_id field length different from spec. (ws-buglink:9649[]) -* Lua: bitop library is missing in Lua 5.2. (ws-buglink:9720[]) -* GTPv1-C / MM Context / Authentication quintuplet / RAND is not correct. (ws-buglink:9722[]) -* Lua: ProtoField.new() is buggy. (ws-buglink:9725[]) -* Lua: ProtoField.bool() VALUESTRING argument is not optional but was supposed to be. (ws-buglink:9728[]) -* Problem with CAPWAP Wireshark Dissector. (ws-buglink:9752[]) -* nas-eps dissector: CS Service notification dissection stops after Paging identity IE. (ws-buglink:9789[]) +* VoIP flow graph crash upon opening. (ws-buglink:9179[]) +* Tshark with "-F pcap" still generates a pcapng file. (ws-buglink:9991[]) +* IPv6 Next Header 0x3d recognized as SHIM6. (ws-buglink:9995[]) +* Failed to export pdml on large pcap. (ws-buglink:10081[]) +* TCAP: set a fence on info column after calling sub dissector (ws-buglink:10091[]) +* Dissector bug in JSON protocol. (ws-buglink:10115[]) +* GSM RLC MAC: do not skip too many lines of the CSN_DESCR when the field is missing (ws-buglink:10120[]) +* Wireshark PEEKREMOTE incorrectly decoding QoS data packets from Cisco Sniffer APs. (ws-buglink:10139[]) +* IEEE 802.11: fix dissection of HT Capabilities (ws-buglink:10166[]) === New and Updated Features -IPv4 checksum verfification is now disabled by default. +There are no new features in this release. === New Protocol Support @@ -97,21 +54,12 @@ --sort-and-group-- -AppleTalk -CAPWAP -GTPv1 -DMX-CHAN -DSI -DVB-CI -ESS -IEEE 802a -M3UA -Modbus/TCP -NAS-EPS -NFS -OpenSafety -SDP -SMPP +CIP +EtherNet/IP +GSM RLC MAC +IEEE 802.11 +IPv6 +TCAP --sort-and-group-- @@ -119,8 +67,7 @@ --sort-and-group-- -libpcap -MPEG +PEEKREMOTE pcap-ng --sort-and-group--
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/docbook/user-guide.xml ^
@@ -61,7 +61,7 @@ --> <!ENTITY DocumentTitle "<application>Wireshark</application> User's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &WiresharkCurrentVersion;"> + <!ENTITY DocumentSubTitle "&GitVersion; for Wireshark &WiresharkCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "WSUG"> <!ENTITY DocumentCopyrightHolder1 "Ulf Lamping "> @@ -73,8 +73,8 @@ <!ENTITY DocumentVersion "V3.0.2"> <!ENTITY DocumentPubDate "2008"> - <!ENTITY % SvnVersionFile SYSTEM "git_version.xml"> - %SvnVersionFile; + <!ENTITY % GitVersionFile SYSTEM "git_version.xml"> + %GitVersionFile; <!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation.</para><para>All logos and trademarks in this document are property of their respective owner.</para>"> <!--
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/CMakeLists.txt ^
@@ -1381,13 +1381,10 @@ wmem/wmem_strutl.c ) -ADD_CUSTOM_COMMAND( - OUTPUT - sminmpec.c +ADD_CUSTOM_TARGET( + update-sminmpec COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl - ${CMAKE_CURRENT_SOURCE_DIR}/enterprise-numbers - sminmpec.c DEPENDS enterprise-numbers ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/Makefile.am ^
@@ -56,7 +56,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 4:6:1 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 4:8:1 @LDFLAGS_SHAREDLIB@ include Makefile.common @@ -129,8 +129,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - Makefile.in \ - sminmpec.c + Makefile.in # # Add the object files for missing routines, if any. @@ -187,8 +186,8 @@ tvbtest.o exntest.o: exceptions.h -sminmpec.c: enterprise-numbers ../tools/make-sminmpec.pl - $(PERL) $(srcdir)/../tools/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c +update-sminmpec: + $(PERL) $(srcdir)/../tools/make-sminmpec.pl if HAVE_PLUGINS @@ -223,16 +222,10 @@ ../plugins/docsis/packet-uccreq.c \ ../plugins/docsis/packet-uccrsp.c \ ../plugins/docsis/packet-ucd.c \ - ../plugins/giop/packet-cosnaming.c \ - ../plugins/giop/packet-coseventcomm.c \ ../plugins/gryphon/packet-gryphon.c \ - ../plugins/interlink/packet-interlink.c \ ../plugins/irda/packet-irda.c \ ../plugins/m2m/packet-m2m.c \ ../plugins/m2m/wimax_tlv.c \ - ../plugins/mgcp/packet-mgcp.c \ - ../plugins/rdm/packet-rdm.c \ - ../plugins/sercosiii/packet-sercosiii.c \ ../plugins/wimax/crc.c \ ../plugins/wimax/crc_data.c \ ../plugins/wimax/mac_hd_generic_decoder.c \
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/Makefile.in ^
@@ -595,7 +595,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 4:6:1 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 4:8:1 @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ @@ -890,8 +890,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - Makefile.in \ - sminmpec.c + Makefile.in # @@ -951,16 +950,10 @@ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/docsis/packet-uccreq.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/docsis/packet-uccrsp.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/docsis/packet-ucd.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/giop/packet-cosnaming.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/giop/packet-coseventcomm.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/gryphon/packet-gryphon.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/interlink/packet-interlink.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/irda/packet-irda.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/m2m/packet-m2m.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/m2m/wimax_tlv.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/mgcp/packet-mgcp.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/rdm/packet-rdm.c \ -@ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/sercosiii/packet-sercosiii.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/wimax/crc.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/wimax/crc_data.c \ @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@ ../plugins/wimax/mac_hd_generic_decoder.c \ @@ -2068,8 +2061,8 @@ tvbtest.o exntest.o: exceptions.h -sminmpec.c: enterprise-numbers ../tools/make-sminmpec.pl - $(PERL) $(srcdir)/../tools/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c +update-sminmpec: + $(PERL) $(srcdir)/../tools/make-sminmpec.pl @ENABLE_STATIC_TRUE@@HAVE_PLUGINS_TRUE@-include ../plugins/Custom.make
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/Makefile.nmake ^
@@ -170,7 +170,7 @@ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ $(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - dtd_grammar.out sminmpec.c + dtd_grammar.out distclean: distclean-local cd crypt @@ -337,8 +337,8 @@ $(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $? !ENDIF -sminmpec.c: enterprise-numbers ..\tools\make-sminmpec.pl - $(PERL) ../tools/make-sminmpec.pl enterprise-numbers sminmpec.c +update-sminmpec: + $(PERL) ../tools/make-sminmpec.pl RUNLEX=..\tools\runlex.sh
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/column-utils.c ^
@@ -382,9 +382,11 @@ len += sep_len; } } - va_start(ap, format); - g_vsnprintf(&cinfo->col_buf[i][len], max_len - len, format, ap); - va_end(ap); + if (len < max_len) { + va_start(ap, format); + g_vsnprintf(&cinfo->col_buf[i][len], max_len - len, format, ap); + va_end(ap); + } } } }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-ansi_a.c ^
@@ -951,7 +951,7 @@ } #define NO_MORE_DATA_CHECK(nmdc_len) \ - if ((nmdc_len) == (curr_offset - offset)) return(nmdc_len); + if ((nmdc_len) <= (curr_offset - offset)) return(nmdc_len); /*
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-btatt.c ^
@@ -359,8 +359,8 @@ offset += 2; proto_tree_add_item(st, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - if( tvb_length_remaining(tvb, offset) > 0) - proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x07: /* Find By Type Value Response / @@ -438,6 +438,7 @@ case 0x0d: / Read Blob Response / case 0x0f: / Multiple Read Response / proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x0c: / Read Blob Request / @@ -500,6 +501,7 @@ proto_tree_add_item(st, hf_btatt_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x16: / Prepare Write Request / @@ -511,6 +513,7 @@ proto_tree_add_item(st, hf_btatt_offset, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(st, hf_btatt_value, tvb, offset, -1, ENC_NA); + offset = tvb_reported_length(tvb); break; case 0x18: / Execute Write Request */
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-capwap.c ^
@@ -717,20 +717,23 @@ static void dissect_capwap_data_message_bindings_ieee80211(tvbuff_t tvb, proto_tree data_message_binding_tree, guint offset, packet_info pinfo) { - proto_item data_message_binding_item; + proto_item data_message_binding_item, ti; proto_tree sub_data_message_binding_tree; if (global_capwap_data_udp_port == pinfo->destport) { + guint16 data_rate; / (WTP -> AC) IEEE 802.11 Frame Info */ - data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi,tvb, offset, 4, ENC_NA); + data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi, tvb, offset, 4, ENC_NA); sub_data_message_binding_tree = proto_item_add_subtree(data_message_binding_item, ett_capwap); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_rssi,tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_rssi, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_snr,tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_snr, tvb, offset+1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_data_rate,tvb, offset+2, 2, ENC_BIG_ENDIAN); + ti = proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_fi_data_rate, tvb, offset+2, 2, ENC_BIG_ENDIAN); + data_rate = tvb_get_ntohs(tvb, offset+2); + proto_item_append_text(ti, " (%.1f Mb/s)", ((float)data_rate / 10)); } else { @@ -738,9 +741,9 @@ data_message_binding_item = proto_tree_add_item(data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dest_wlan,tvb, offset, 4, ENC_NA); sub_data_message_binding_tree = proto_item_add_subtree(data_message_binding_item, ett_capwap); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap,tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_reserved,tvb, offset+2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_data_message_binding_tree, hf_capwap_header_wireless_data_ieee80211_dw_reserved, tvb, offset+2, 2, ENC_BIG_ENDIAN); } } @@ -1699,7 +1702,7 @@ NULL, HFILL }}, { &hf_capwap_header_wireless_data_ieee80211_fi_rssi, { "Wireless data ieee80211 RSSI (dBm)", "capwap.header.wireless.data.ieee80211.fi.rssi", - FT_UINT8, BASE_DEC, NULL, 0x00, + FT_INT8, BASE_DEC, NULL, 0x00, NULL, HFILL }}, { &hf_capwap_header_wireless_data_ieee80211_fi_snr, { "Wireless data ieee80211 SNR (dB)", "capwap.header.wireless.data.ieee80211.fi.snr",
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-cip.c ^
@@ -2638,7 +2638,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_state_info); proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_num, tvb, offset+2+i4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_state, tvb, offset+4+i4, 2, ENC_LITTLE_ENDIAN); @@ -2671,7 +2671,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_enable_cfg); proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_num, tvb, offset+2+i4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_enable, tvb, offset+4+i4, 2, ENC_LITTLE_ENDIAN); @@ -2704,7 +2704,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_log_announce); proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_port_num, tvb, offset+2+i4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_interval, tvb, offset+4+i4, 2, ENC_LITTLE_ENDIAN); @@ -2737,7 +2737,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i4, 4, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i4, 4, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_log_sync); proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_num, tvb, offset+2+i4, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_log_sync_interval, tvb, offset+4+i4, 2, ENC_LITTLE_ENDIAN); @@ -2897,7 +2897,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i10, 10, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i10, 10, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_profile_id_info); proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_port_num, tvb, offset+2+i10, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_profile_id, tvb, offset+4+i10, 8, ENC_NA); @@ -2930,7 +2930,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i36, 36, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i36, 36, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_phys_addr_info); proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_port_num, tvb, offset+2+i36, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+4+i36, 16, ENC_NA); @@ -2965,7 +2965,7 @@ for (i = 0; i < num_ports; i++) { - ti = proto_tree_add_text(tree, NULL, offset+2+i22, 22, "Port #%d", i+1); + ti = proto_tree_add_text(tree, tvb, offset+2+i22, 22, "Port #%d", i+1); port_tree = proto_item_add_subtree(ti, ett_time_sync_port_proto_addr_info); proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_port_num, tvb, offset+2+i22, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_network_proto, tvb, offset+4+i22, 2, ENC_LITTLE_ENDIAN);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-dvbci.c ^
@@ -1983,7 +1983,7 @@ { int key_string_len; int i, j; - char input[2]; + char input[3]; if (!key_string \|\| !key_bin) return -1; @@ -1991,6 +1991,7 @@ if (key_string_len != 2AES_KEY_LEN) return -1; key_bin = (unsigned char*)g_malloc(key_string_len/2); + input[2] = '\0'; j=0; for (i=0; i<key_string_len-1; i+=2) {
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-enip.c ^
@@ -943,7 +943,7 @@ /* Check if separate T->O conversation is necessary. If either side is multicast or ports aren't equal, a separate conversation must be generated / - dest_address.data = &connInfo->T2O.ipaddress; + dest_address.data = connInfo->T2O.ipaddress.data; if((conversationTO = find_conversation(pinfo->fd->num, &pinfo->src, &dest_address, PT_UDP, connInfo->T2O.port, 0, NO_PORT_B)) == NULL) { @@ -1268,10 +1268,10 @@ } proto_tree_add_item(tree, hf_tcpip_lcd_acd_activity, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_tcpip_lcd_remote_mac, tvb, offset+1, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_tcpip_lcd_remote_mac, tvb, offset+1, 6, ENC_NA); if( tvb_get_guint8(tvb, offset) == 0 ) - proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_tcpip_lcd_arp_pdu, tvb, offset+7, 28, ENC_NA); else { / Dissect ARP PDU, but don't have it change column info */ @@ -1413,7 +1413,7 @@ } proto_tree_add_item(tree, hf_dlr_lanp1_dev_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_lanp1_dev_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_lanp1_dev_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1428,7 +1428,7 @@ } proto_tree_add_item(tree, hf_dlr_lanp2_dev_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_lanp2_dev_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_lanp2_dev_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1448,7 +1448,7 @@ while( pos < total_len) { proto_tree_add_item(tree, hf_dlr_rppl_dev_ip_addr, tvb, offset+pos, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_rppl_dev_physical_address, tvb, offset+pos+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_rppl_dev_physical_address, tvb, offset+pos+4, 6, ENC_NA); pos+=10; } return total_len; @@ -1465,7 +1465,7 @@ } proto_tree_add_item(tree, hf_dlr_asa_supervisor_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_asa_supervisor_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_asa_supervisor_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -1524,7 +1524,7 @@ } proto_tree_add_item(tree, hf_dlr_aga_ip_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_tree_add_item(tree, hf_dlr_aga_physical_address, tvb, offset+4, 6, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_dlr_aga_physical_address, tvb, offset+4, 6, ENC_NA); return 10; } @@ -2293,7 +2293,7 @@ proto_tree_add_item( dlr_tree, hf_dlr_supervisorprecedence, tvb, DLR_BE_SUPERVISOR_PRECEDENCE, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_beaconinterval, tvb, DLR_BE_BEACON_INTERVAL, 4, ENC_BIG_ENDIAN ); proto_tree_add_item( dlr_tree, hf_dlr_beacontimeout, tvb, DLR_BE_BEACON_TIMEOUT, 4, ENC_BIG_ENDIAN ); - proto_tree_add_item( dlr_tree, hf_dlr_beaconreserved, tvb, DLR_BE_RESERVED, 20, ENC_BIG_ENDIAN ); + proto_tree_add_item( dlr_tree, hf_dlr_beaconreserved, tvb, DLR_BE_RESERVED, 20, ENC_NA); } else if( dlr_frametype == DLR_FT_NEIGHBOR_REQ ) {
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-frame.c ^
@@ -228,9 +228,9 @@ } if(pinfo->fd->opt_comment){ - item = proto_tree_add_item(tree, proto_pkt_comment, tvb, 0, -1, ENC_NA); + item = proto_tree_add_item(tree, proto_pkt_comment, tvb, 0, 0, ENC_NA); comments_tree = proto_item_add_subtree(item, ett_comments); - comment_item = proto_tree_add_string_format(comments_tree, hf_comments_text, tvb, 0, -1, + comment_item = proto_tree_add_string_format(comments_tree, hf_comments_text, tvb, 0, 0, pinfo->fd->opt_comment, "%s", pinfo->fd->opt_comment); expert_add_info_format(pinfo, comment_item, PI_COMMENTS_GROUP, PI_COMMENT, @@ -259,7 +259,7 @@ cap_plurality = plurality(cap_len, "", "s"); frame_plurality = plurality(frame_len, "", "s"); - ti = proto_tree_add_protocol_format(tree, proto_frame, tvb, 0, -1, + ti = proto_tree_add_protocol_format(tree, proto_frame, tvb, 0, tvb_length(tvb), "Frame %u: %u byte%s on wire", pinfo->fd->num, frame_len, frame_plurality); if (generate_bits_field) @@ -458,7 +458,7 @@ if (pinfo->fd->flags.ignored) { /* Ignored package, stop handling here */ col_set_str(pinfo->cinfo, COL_INFO, "<Ignored>"); - proto_tree_add_text (tree, tvb, 0, -1, "This frame is marked as ignored"); + proto_tree_add_text (tree, tvb, 0, 0, "This frame is marked as ignored"); return; }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-gsm_a_common.h ^
@@ -259,7 +259,7 @@ } #define NO_MORE_DATA_CHECK(nmdc_len) \ - if ((nmdc_len) == (curr_offset - offset)) return(nmdc_len); + if ((nmdc_len) <= (curr_offset - offset)) return(nmdc_len); #define SET_ELEM_VARS(SEV_pdu_type, SEV_elem_names_ext, SEV_elem_ett, SEV_elem_funcs) \ switch (SEV_pdu_type) \
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-gsm_rlcmac.c ^
@@ -463,7 +463,6 @@ static int hf_change_mark_change_mark_2 = -1; static int hf_indirect_encoding_ma_number = -1; static int hf_packet_request_reference_random_access_information = -1; -static int hf_timeslot_allocation_usf_tn = -1; static int hf_extended_dynamic_allocation = -1; static int hf_rlc_data_blocks_granted = -1; static int hf_single_block_allocation_timeslot_number = -1; @@ -2594,7 +2593,7 @@ static const CSN_DESCR_BEGIN(Timeslot_Allocation_t) M_NEXT_EXIST (Timeslot_Allocation_t, Exist, 1), - M_UINT (Timeslot_Allocation_t, USF_TN, 3, &hf_timeslot_allocation_usf_tn), + M_UINT (Timeslot_Allocation_t, USF_TN, 3, &hf_usf), CSN_DESCR_END (Timeslot_Allocation_t) static const @@ -5207,7 +5206,7 @@ static const CSN_DESCR_BEGIN (GlobalTimeslotDescription_UA_t) M_TYPE (GlobalTimeslotDescription_UA_t, GlobalTimeslotDescription, GlobalTimeslotDescription_t), - M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 3), /* Don't use M_REC_TARRAY as we don't support multiple TBFs / + M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 2), / Don't use M_REC_TARRAY as we don't support multiple TBFs / M_TYPE (GlobalTimeslotDescription_UA_t, PHO_UA, PHO_UplinkAssignment_t), M_FIXED (GlobalTimeslotDescription_UA_t, 1, 0x0), / Escape recursive */ @@ -5260,7 +5259,7 @@ M_NEXT_EXIST (PHO_EGPRS_t, Exist_GlobalTimeslotDescription_UA, 1), M_TYPE (PHO_EGPRS_t, GTD_UA, GlobalTimeslotDescription_UA_t), - M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 2), + M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 1), M_TYPE (PHO_EGPRS_t, DownlinkTBF, DownlinkTBF_t), CSN_DESCR_END (PHO_EGPRS_t)
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-ieee80211-prism.c ^
@@ -260,6 +260,24 @@ capture_ieee80211(pd, offset, len, ld); } +static guint16 +tvb_get_enctohs(tvbuff_t tvb, int offset, guint encoding) +{ + if (encoding == ENC_BIG_ENDIAN) + return tvb_get_ntohs(tvb, offset); + else + return tvb_get_letohs(tvb, offset); +} + +static guint32 +tvb_get_enctohl(tvbuff_t tvb, int offset, guint encoding) +{ + if (encoding == ENC_BIG_ENDIAN) + return tvb_get_ntohl(tvb, offset); + else + return tvb_get_letohl(tvb, offset); +} + static void dissect_prism(tvbuff_t tvb, packet_info pinfo, proto_tree tree) { @@ -268,6 +286,7 @@ tvbuff_t next_tvb; int offset; guint32 msgcode, msglen, did; + guint byte_order; guint16 status; guint8 devname_p; @@ -288,12 +307,18 @@ at least one capture has AVS headers on some packets and no * radio headers on others (incoming vs. outgoing?). * - * XXX - check for both byte orders and use that to determine - * the byte order of the fields in the Prism header? + * Check for both byte orders and use that to determine + * the byte order of the fields in the Prism header. / - msgcode = tvb_get_letohl(tvb, offset); - if ((msgcode != PRISM_TYPE1_MSGCODE) && - (msgcode != PRISM_TYPE2_MSGCODE)) { + if ((msgcode == PRISM_TYPE1_MSGCODE) \|\| (msgcode == PRISM_TYPE2_MSGCODE)) { + / big-endian fetch matched / + byte_order = ENC_BIG_ENDIAN; + } else if (((msgcode = tvb_get_letohl(tvb, offset)) == PRISM_TYPE1_MSGCODE) \|\| + (msgcode == PRISM_TYPE2_MSGCODE)) { + / little-endian fetch matched / + byte_order = ENC_LITTLE_ENDIAN; + } else { + / neither matched - try it as just 802.11 with no Prism header / call_dissector(ieee80211_handle, tvb, pinfo, tree); return; } @@ -308,16 +333,16 @@ / Message Code / if(tree) { - proto_tree_add_item(prism_tree, hf_ieee80211_prism_msgcode, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_tree, hf_ieee80211_prism_msgcode, tvb, offset, 4, byte_order); } - msgcode = tvb_get_letohl(tvb, offset); + msgcode = tvb_get_enctohl(tvb, offset, byte_order); offset += 4; / Message Length / if(tree) { - proto_tree_add_item(prism_tree, hf_ieee80211_prism_msglen, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_tree, hf_ieee80211_prism_msglen, tvb, offset, 4, byte_order); } - msglen = tvb_get_letohl(tvb, offset); + msglen = tvb_get_enctohl(tvb, offset, byte_order); offset += 4; / Device Name / @@ -329,7 +354,6 @@ col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname_p, msgcode, msglen); - while(offset < PRISM_HEADER_LENGTH) { / DID / @@ -337,23 +361,23 @@ ti_did = proto_tree_add_item(prism_tree, hf_ieee80211_prism_did, tvb, offset, 12, ENC_NA); prism_did_tree = proto_item_add_subtree(ti_did, ett_prism_did); - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); - did = tvb_get_letohl(tvb, offset); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_type, tvb, offset, 4, byte_order); + did = tvb_get_enctohl(tvb, offset, byte_order); proto_item_append_text(ti_did, " %s", val_to_str(did, prism_did_vals, "Unknown %x") ); } offset += 4; / Status / - status = tvb_get_letohs(tvb, offset); + status = tvb_get_enctohs(tvb, offset, byte_order); if(tree) { - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_status, tvb, offset, 2, byte_order); } offset += 2; / Length */ if(tree) { - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_length, tvb, offset, 2, byte_order); } offset += 2; @@ -363,89 +387,89 @@ case PRISM_TYPE1_HOSTTIME: case PRISM_TYPE2_HOSTTIME: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_hosttime, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_MACTIME: case PRISM_TYPE2_MACTIME: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_mactime, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_CHANNEL: case PRISM_TYPE2_CHANNEL: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) ); } - col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_letohl(tvb, offset)); + col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_enctohl(tvb, offset, byte_order)); break; case PRISM_TYPE1_RSSI: case PRISM_TYPE2_RSSI: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rssi, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } - col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_letohl(tvb, offset)); + col_add_fstr(pinfo->cinfo, COL_RSSI, "%d", tvb_get_enctohl(tvb, offset, byte_order)); break; case PRISM_TYPE1_SQ: case PRISM_TYPE2_SQ: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_sq, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_SIGNAL: case PRISM_TYPE2_SIGNAL: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_signal, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_NOISE: case PRISM_TYPE2_NOISE: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_noise, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_RATE: case PRISM_TYPE2_RATE: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_letohl(tvb, offset)) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_enctohl(tvb, offset, byte_order)) ); } - col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_letohl(tvb, offset)) ); + col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_enctohl(tvb, offset, byte_order)) ); break; case PRISM_TYPE1_ISTX: case PRISM_TYPE2_ISTX: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " 0x%x", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_istx, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " 0x%x", tvb_get_enctohl(tvb, offset, byte_order) ); } break; case PRISM_TYPE1_FRMLEN: case PRISM_TYPE2_FRMLEN: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(ti_did, " %d", tvb_get_letohl(tvb, offset) ); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_frmlen, tvb, offset, 4, byte_order); + proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order)); } break; default: if(tree){ - proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_unknown, tvb, offset, 4, byte_order); } break; }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-ieee80211.c ^
@@ -644,7 +644,7 @@ #define TAG_BEACON_TIMING 120 #define TAG_MCCAOP_SETUP_REQUEST 121 #define TAG_MCCAOP_SETUP_REPLY 122 -#define TAG_MCCAOP_ADVERTISSEMENT 123 +#define TAG_MCCAOP_ADVERTISEMENT 123 #define TAG_MCCAOP_TEARDOWN 124 #define TAG_GANN 125 #define TAG_RANN 126 /* IEEE Std 802.11s-2011 / @@ -664,9 +664,9 @@ #define TAG_CISCO_CCX3 149 / Cisco Compatible eXtensions v3 / #define TAG_CISCO_UNKNOWN_96 150 / Cisco Compatible eXtensions / #define TAG_SYMBOL_PROPRIETARY 173 -#define TAG_MCCAOP_ADVERTISSEMENT_OV 174 -#define TAG_VHT_CAPABILITY 191 / IEEE Stc 802.11ac/D3.1 / -#define TAG_VHT_OPERATION 192 / IEEE Stc 802.11ac/D3.1 / +#define TAG_MCCAOP_ADVERTISEMENT_OV 174 +#define TAG_VHT_CAPABILITY 191 / IEEE Std 802.11ac/D3.1 / +#define TAG_VHT_OPERATION 192 / IEEE Std 802.11ac/D3.1 / #define TAG_VENDOR_SPECIFIC_IE 221 static const value_string tag_num_vals[] = { @@ -775,9 +775,9 @@ { TAG_BEACON_TIMING, "Beacon Timing" }, { TAG_MCCAOP_SETUP_REQUEST, "MCCAOP Setup Request" }, { TAG_MCCAOP_SETUP_REPLY, "MCCAOP SETUP Reply" }, - { TAG_MCCAOP_ADVERTISSEMENT, "MCCAOP Advertissement" }, + { TAG_MCCAOP_ADVERTISEMENT, "MCCAOP Advertisement" }, { TAG_MCCAOP_TEARDOWN, "MCCAOP Teardown" }, - { TAG_GANN, "Gate Announcemen" }, + { TAG_GANN, "Gate Announcement" }, { TAG_RANN, "Root Announcement" }, { TAG_EXTENDED_CAPABILITIES, "Extended Capabilities" }, { TAG_AGERE_PROPRIETARY, "Agere Proprietary" }, @@ -795,9 +795,9 @@ { TAG_CISCO_CCX3, "Cisco Unknown 95" }, { TAG_CISCO_UNKNOWN_96, "Cisco Unknown 96" }, { TAG_SYMBOL_PROPRIETARY, "Symbol Proprietary" }, - { TAG_MCCAOP_ADVERTISSEMENT_OV, "MCCAOP Advertissement Overviw" }, - { TAG_VHT_CAPABILITY, "VHT Capabilities (IEEE Stc 802.11ac/D3.1)" }, - { TAG_VHT_OPERATION, "VHT Operation (IEEE Stc 802.11ac/D3.1)" }, + { TAG_MCCAOP_ADVERTISEMENT_OV, "MCCAOP Advertisement Overview" }, + { TAG_VHT_CAPABILITY, "VHT Capabilities (IEEE Std 802.11ac/D3.1)" }, + { TAG_VHT_OPERATION, "VHT Operation (IEEE Std 802.11ac/D3.1)" }, { TAG_VENDOR_SPECIFIC_IE, "Vendor Specific" }, { 0, NULL } }; @@ -1097,7 +1097,7 @@ { 4, "Controlled Load (Video)" }, { 5, "Video (Video)" }, { 6, "Voice (Voice)" }, - { 7, "Netowrk Control (Voice)" }, + { 7, "Network Control (Voice)" }, { 0, NULL } }; @@ -10196,13 +10196,13 @@ cap_item = proto_tree_add_item(tree, hf_ieee80211_htex_cap, tvb, offset, 2, ENC_LITTLE_ENDIAN); } cap_tree = proto_item_add_subtree(cap_item, ett_htex_cap_tree); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_pco, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_transtime, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; - proto_tree_add_item(cap_tree, hf_ieee80211_htex_mcs, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_htc_support, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_htex_rd_responder, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; + proto_tree_add_item(cap_tree, hf_ieee80211_htex_pco, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_htex_transtime, tvb, offset, 2, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_htex_mcs, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_htex_htc_support, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_htex_rd_responder, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset += 2; / 4 byte TxBF capabilities / @@ -10213,33 +10213,30 @@ cap_item = proto_tree_add_item(tree, hf_ieee80211_txbf, tvb, offset, 4, ENC_LITTLE_ENDIAN); } cap_tree = proto_item_add_subtree(cap_item, ett_txbf_tree); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_cap, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ssc, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ssc, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ndp, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ndp, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_impl_txbf, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_calib, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; - - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_csi, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_bf_csi, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm_feed, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm_feed, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 1; - - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_min_group, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_num_bf_ant, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_uncomp_sm_bf_ant, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_comp_sm_bf_ant, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset += 1; - - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_max_rows_bf, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_chan_est, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(cap_tree, hf_ieee80211_txbf_resrv, tvb, offset, 1, ENC_LITTLE_ENDIAN); - offset += 1; + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_cap, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ssc, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ssc, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_rcv_ndp, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_tx_ndp, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_impl_txbf, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_calib, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_csi, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_bf_csi, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_uncomp_fm_feed, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_expl_comp_fm_feed, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_min_group, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_num_bf_ant, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_uncomp_sm_bf_ant, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_comp_sm_bf_ant, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_csi_max_rows_bf, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_chan_est, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(cap_tree, hf_ieee80211_txbf_resrv, tvb, offset, 4, ENC_LITTLE_ENDIAN); + offset += 4; / 1 byte Antenna Selection (ASEL) capabilities / if (vs) @@ -11692,6 +11689,12 @@ / TODO / case 9: / Transmit Stream Measurement Request / / TODO / + case 10: / Multicast diagnostics request / + / TODO / + case 11: / Location Civic request / + / TODO / + case 12: / Location Identifier request / + / TODO / case 255: / Measurement Pause Request/ / TODO / default: / unknown / @@ -11939,6 +11942,12 @@ / TODO / case 9: / Transmit Stream Measurement Report / / TODO / + case 10: / Multicast diagnostics Report / + / TODO / + case 11: / Location Civic Report / + / TODO / + case 12: / Location Identifier Report / + / TODO / default: / unknown / break; } @@ -17320,12 +17329,12 @@ {&hf_ieee80211_txbf, {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", - FT_UINT16, BASE_HEX, NULL, 0, + FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, {&hf_ieee80211_txbf_vs, {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf", - FT_UINT16, BASE_HEX, NULL, 0, + FT_UINT32, BASE_HEX, NULL, 0, "Vendor Specific Transmit Beam Forming (TxBF) Capabilities", HFILL }}, {&hf_ieee80211_txbf_cap, @@ -20700,18 +20709,18 @@ }; module_t wlan_module; - memset (&wlan_stats, 0, sizeof wlan_stats); + memset(&wlan_stats, 0, sizeof wlan_stats); proto_aggregate = proto_register_protocol("IEEE 802.11 wireless LAN aggregate frame", "IEEE 802.11 Aggregate Data", "wlan_aggregate"); proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields)); - proto_wlan = proto_register_protocol ("IEEE 802.11 wireless LAN", + proto_wlan = proto_register_protocol("IEEE 802.11 wireless LAN", "IEEE 802.11", "wlan"); - proto_register_field_array (proto_wlan, hf, array_length (hf)); + proto_register_field_array(proto_wlan, hf, array_length (hf)); - proto_wlan_mgt = proto_register_protocol ("IEEE 802.11 wireless LAN management frame", - "802.11 MGT", "wlan_mgt"); + proto_wlan_mgt = proto_register_protocol("IEEE 802.11 wireless LAN management frame", + "IEEE 802.11 MGT", "wlan_mgt"); proto_register_field_array (proto_wlan_mgt, ff, array_length (ff)); proto_register_subtree_array (tree_array, array_length (tree_array));
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-infiniband.c ^
@@ -99,9 +99,6 @@ static gint ett_eoib = -1; static gint ett_link = -1; -/* Global ref to highest level tree should we find other protocols encapsulated in IB / -static proto_tree top_tree = NULL; - /* Dissector Declarations / static dissector_handle_t ipv6_handle; static dissector_handle_t data_handle; @@ -136,7 +133,7 @@ / Parsing Methods for specific IB headers. / static void parse_VENDOR(proto_tree , tvbuff_t , gint ); -static void parse_PAYLOAD(proto_tree , packet_info , tvbuff_t , gint , gint length); +static void parse_PAYLOAD(proto_tree , packet_info , tvbuff_t , gint , gint length, proto_tree ); static void parse_IETH(proto_tree , tvbuff_t , gint ); static void parse_IMMDT(proto_tree , tvbuff_t , gint offset); static void parse_ATOMICACKETH(proto_tree , tvbuff_t , gint offset); @@ -146,8 +143,8 @@ static void parse_DETH(proto_tree , packet_info , tvbuff_t , gint offset); static void parse_RDETH(proto_tree , tvbuff_t , gint offset); static void parse_IPvSix(proto_tree , tvbuff_t , gint offset, packet_info ); -static void parse_RWH(proto_tree , tvbuff_t , gint offset, packet_info ); -static gboolean parse_EoIB(proto_tree , tvbuff_t , gint offset, packet_info ); +static void parse_RWH(proto_tree , tvbuff_t , gint offset, packet_info , proto_tree ); +static gboolean parse_EoIB(proto_tree , tvbuff_t , gint offset, packet_info , proto_tree ); static void parse_SUBN_LID_ROUTED(proto_tree , packet_info , tvbuff_t , gint offset); static void parse_SUBN_DIRECTED_ROUTE(proto_tree , packet_info , tvbuff_t , gint offset); @@ -309,14 +306,14 @@ / RMPP Types / -#define RMPP_ILLEGAL 0 +#define RMPP_NOT_USED 0 #define RMPP_DATA 1 #define RMPP_ACK 2 #define RMPP_STOP 3 #define RMPP_ABORT 4 static const value_string RMPP_Packet_Types[] = { - { RMPP_ILLEGAL, " Illegal RMPP Type (0)! " }, + { RMPP_NOT_USED, " Not an RMPP Packet " }, { RMPP_DATA, "RMPP (DATA)" }, { RMPP_ACK, "RMPP (ACK)" }, { RMPP_STOP, "RMPP (STOP)" }, @@ -1634,28 +1631,6 @@ col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand"); col_clear(pinfo->cinfo, COL_INFO); - / Get the parent tree from the ERF dissector. We don't want to nest under ERF / - if (tree && tree->parent) - { - / Set the normal tree outside of ERF / - tree = tree->parent; - / Set a global reference for nested protocols / - top_tree = tree; - } - - / The "quick-dissection" code in dissect_general_info skips lots of the recently-added code - for saving context etc. It is no longer viable to maintain two code branches, so we have - (temporarily?) disabled the second one. All dissection now goes through the full branch, - using a NULL tree pointer if this is not a full dissection call. Take care not to dereference - the tree pointer or any subtree pointers you create using it and you'll be fine. / - if (0 && !tree) - { - / If no packet details are being dissected, extract some high level info for the packet view / - / Assigns column values rather than full tree population / - dissect_general_info(tvb, offset, pinfo, starts_with_grh); - return; - } - / Top Level Packet / infiniband_packet = proto_tree_add_item(tree, proto_infiniband, tvb, offset, -1, ENC_NA); @@ -1804,7 +1779,7 @@ parse_IPvSix(all_headers_tree, tvb, &offset, pinfo); break; case RAW: - parse_RWH(all_headers_tree, tvb, &offset, pinfo); + parse_RWH(all_headers_tree, tvb, &offset, pinfo, tree); break; default: / Unknown Packet / @@ -1836,7 +1811,7 @@ packetLength -= 4; / RDETH / packetLength -= 8; / DETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_RETH_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1847,7 +1822,7 @@ packetLength -= 8; / DETH / packetLength -= 16; / RETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_IMMDT_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1858,7 +1833,7 @@ packetLength -= 8; / DETH / packetLength -= 4; / IMMDT / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_RETH_IMMDT_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1871,7 +1846,7 @@ packetLength -= 16; / RETH / packetLength -= 4; / IMMDT / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_DETH_RETH: parse_RDETH(all_headers_tree, tvb, &offset); @@ -1890,14 +1865,14 @@ packetLength -= 4; / RDETH / packetLength -= 4; / AETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_PAYLD: parse_RDETH(all_headers_tree, tvb, &offset); packetLength -= 4; / RDETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RDETH_AETH: parse_AETH(all_headers_tree, tvb, &offset); @@ -1941,25 +1916,25 @@ packetLength -= 8; / DETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case PAYLD: - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case IMMDT_PAYLD: parse_IMMDT(all_headers_tree, tvb, &offset); packetLength -= 4; / IMMDT / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RETH_PAYLD: parse_RETH(all_headers_tree, tvb, &offset); packetLength -= 16; / RETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case RETH: parse_RETH(all_headers_tree, tvb, &offset); @@ -1972,7 +1947,7 @@ packetLength -= 4; / AETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case AETH: parse_AETH(all_headers_tree, tvb, &offset); @@ -1999,7 +1974,7 @@ packetLength -= 4; / IETH / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; case DETH_IMMDT_PAYLD: parse_DETH(all_headers_tree, pinfo, tvb, &offset); @@ -2008,7 +1983,7 @@ packetLength -= 8; / DETH / packetLength -= 4; / IMMDT / - parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength); + parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, tree); break; default: parse_VENDOR(all_headers_tree, tvb, &offset); @@ -2067,22 +2042,9 @@ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(operand, Operand_Description, "Unknown (0x%1x)")); - / Get the parent tree from the ERF dissector. We don't want to nest under ERF / - if (tree && tree->parent) - { - / Set the normal tree outside of ERF / - tree = tree->parent; - / Set a global reference for nested protocols / - top_tree = tree; - } - - if (!tree) - { - / If no packet details are being dissected, extract some high level info for the packet view / - / Assigns column values rather than full tree population / - dissect_general_info(tvb, offset, pinfo, FALSE); - return; - } + / If no packet details are being dissected, extract some high level info for the packet view / + / Assigns column values rather than full tree population / + dissect_general_info(tvb, offset, pinfo, FALSE); / Top Level Packet / infiniband_link_packet = proto_tree_add_item(tree, proto_infiniband_link, tvb, offset, -1, ENC_NA); @@ -2385,8 +2347,9 @@ IN: pinfo - packet info from wireshark * IN: tvb - the data buffer from wireshark * IN/OUT: offset - The current and updated offset -* IN: length - Length of Payload / -static void parse_PAYLOAD(proto_tree parentTree, packet_info pinfo, tvbuff_t tvb, gint offset, gint length) + IN: length - Length of Payload +* IN: top_tree - parent tree of Infiniband dissector / +static void parse_PAYLOAD(proto_tree parentTree, packet_info pinfo, tvbuff_t tvb, gint offset, gint length, proto_tree top_tree) { gint local_offset = offset; / Payload - Packet Payload / @@ -2485,7 +2448,7 @@ if (pref_dissect_eoib && (transport_type == TRANSPORT_UD) && (tvb_get_bits8(tvb, local_offset8, 4) == 0xC)) { - dissector_found = parse_EoIB(parentTree, tvb, local_offset, pinfo); + dissector_found = parse_EoIB(parentTree, tvb, local_offset, pinfo, top_tree); } /* IBA packet data could be anything in principle, however it is common @@ -2588,7 +2551,7 @@ } - /parse_RWH(parentTree, tvb, &local_offset, pinfo);/ + /parse_RWH(parentTree, tvb, &local_offset, pinfo, top_tree);/ /* Will contain ICRC and VCRC = 4+2 / local_offset = tvb_reported_length(tvb) - 6; @@ -2638,8 +2601,9 @@ IN: parentTree to add the dissection to - in this code the all_headers_tree * IN: tvb - the data buffer from wireshark * IN/OUT: The current and updated offset -* IN: pinfo - packet info from wireshark / -static void parse_RWH(proto_tree ah_tree, tvbuff_t tvb, gint offset, packet_info pinfo) + IN: pinfo - packet info from wireshark +* IN: top_tree - parent tree of Infiniband dissector / +static void parse_RWH(proto_tree ah_tree, tvbuff_t tvb, gint offset, packet_info pinfo, proto_tree top_tree) { guint16 ether_type; tvbuff_t next_tvb; @@ -2693,8 +2657,9 @@ IN: parentTree to add the dissection to - in this code the all_headers_tree * IN: tvb - the data buffer from wireshark * IN: The current offset -* IN: pinfo - packet info from wireshark / -static gboolean parse_EoIB(proto_tree tree, tvbuff_t tvb, gint offset, packet_info pinfo) +* IN: pinfo - packet info from wireshark +* IN: top_tree - parent tree of Infiniband dissector / +static gboolean parse_EoIB(proto_tree tree, tvbuff_t tvb, gint offset, packet_info pinfo, proto_tree top_tree) { proto_item header_item; proto_tree *header_subtree; @@ -2861,8 +2826,8 @@ SUBNADMN_header_tree = proto_item_add_subtree(SUBNADMN_header_item, ett_subnadmin); proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_sm_key, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 4; - proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 4; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; + proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16, tvb, local_offset, 2, ENC_BIG_ENDIAN); local_offset += 2; proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_component_mask, tvb, local_offset, 8, ENC_BIG_ENDIAN); local_offset += 8; label_SUBA_Method(SUBNADMN_header_item, &MadData, pinfo); @@ -3381,7 +3346,7 @@ proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_status, tvb, local_offset, 1, ENC_BIG_ENDIAN); local_offset += 1; switch (RMPP_Type) { - case RMPP_ILLEGAL: + case RMPP_NOT_USED: proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data1, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data2, tvb, local_offset, 4, ENC_BIG_ENDIAN); local_offset += 4; break;
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-ipv6.c ^
@@ -403,7 +403,6 @@ offset += advance; goto again; case IP_PROTO_SHIM6: - case IP_PROTO_SHIM6_OLD: if (!BYTES_ARE_IN_FRAME(offset, len, 2)) { ld->other++; return; @@ -1992,7 +1991,6 @@ goto again; case IP_PROTO_SHIM6: - case IP_PROTO_SHIM6_OLD: shim6 = TRUE; advance = dissect_shim6(tvb, offset, ipv6_tree, pinfo); nxt = tvb_get_guint8(tvb, offset);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-lcsap.c ^
@@ -363,8 +363,7 @@ { 0x01, "Attempted successfully: results not used to generate location - not used." }, { 0x02, "Attempted successfully: results used to verify but not generate location - not used." }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" }, @@ -399,8 +398,7 @@ { 0x01, "Attempted successfully: results not used to generate location" }, { 0x02, "Attempted successfully: results used to verify but not generate location" }, { 0x03, "Attempted successfully: results used to generate location" }, - { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods \n" - "and the actual method or methods used by the UE cannot be determined." }, + { 0x04, "Attempted successfully: case where UE supports multiple mobile based positioning methods and the actual method or methods used by the UE cannot be determined." }, { 0x05, "Reserved" }, { 0x06, "Reserved" }, { 0x07, "Reserved" }, @@ -2220,7 +2218,7 @@ /--- End of included file: packet-lcsap-fn.c ---/ -#line 197 "../../asn1/lcsap/packet-lcsap-template.c" +#line 195 "../../asn1/lcsap/packet-lcsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t tvb, packet_info pinfo, proto_tree tree, void data _U_) { @@ -2320,7 +2318,7 @@ /--- End of included file: packet-lcsap-dis-tab.c ---/ -#line 258 "../../asn1/lcsap/packet-lcsap-template.c" +#line 256 "../../asn1/lcsap/packet-lcsap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, lcsap_handle); @@ -2802,7 +2800,7 @@ "UnsuccessfulOutcome_value", HFILL }}, /--- End of included file: packet-lcsap-hfarr.c ---/ -#line 303 "../../asn1/lcsap/packet-lcsap-template.c" +#line 301 "../../asn1/lcsap/packet-lcsap-template.c" }; /* List of subtrees / @@ -2858,7 +2856,7 @@ &ett_lcsap_UnsuccessfulOutcome, /--- End of included file: packet-lcsap-ettarr.c ---/ -#line 309 "../../asn1/lcsap/packet-lcsap-template.c" +#line 307 "../../asn1/lcsap/packet-lcsap-template.c" }; module_t lcsap_module;
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-lte-rrc.c ^
@@ -18688,7 +18688,16 @@ case SI_OrPSI_GERAN_si: /* SI message / if (gsm_a_dtap_handle) { - call_dissector(gsm_a_dtap_handle, sys_info_list_tvb, actx->pinfo, subtree); + tvbuff_t si_tvb = tvb_new_composite(); + guint8 pd = (guint8 )g_malloc(1); + tvbuff_t *pd_tvb = tvb_new_child_real_data(sys_info_list_tvb, pd, 1, 1); + tvb_set_free_cb(pd_tvb, g_free); + pd[0] = 0x06; + tvb_composite_append(si_tvb, pd_tvb); + tvb_composite_append(si_tvb, sys_info_list_tvb); + tvb_composite_finalize(si_tvb); + add_new_data_source(actx->pinfo, si_tvb, "System Information"); + call_dissector(gsm_a_dtap_handle, si_tvb, actx->pinfo, subtree); } break; case SI_OrPSI_GERAN_psi:
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-mac-lte.c ^
@@ -513,7 +513,7 @@ { 10, "36 < BS <= 42"}, { 11, "42 < BS <= 49"}, { 12, "49 < BS <= 57"}, - { 13, "47 < BS <= 67"}, + { 13, "57 < BS <= 67"}, { 14, "67 < BS <= 78"}, { 15, "78 < BS <= 91"}, { 16, "91 < BS <= 107"},
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-peekremote.c ^
@@ -147,7 +147,7 @@ { dissector_handle_t peekremote_handle; - ieee80211_handle = find_dissector("wlan_datapad"); + ieee80211_handle = find_dissector("wlan"); peekremote_handle = create_dissector_handle(dissect_peekremote, proto_peekremote); dissector_add_uint("udp.port", 5000, peekremote_handle);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-rtp.c ^
@@ -879,8 +879,9 @@ /* * Update the conversation data. / - / Free the hash if already exists / - rtp_free_hash_dyn_payload(p_conv_data->rtp_dyn_payload); + / Free the hash if a different one already exists */ + if (p_conv_data->rtp_dyn_payload != rtp_dyn_payload) + rtp_free_hash_dyn_payload(p_conv_data->rtp_dyn_payload); g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_data->frame_number = setup_frame_number;
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-sdp.c ^
@@ -239,6 +239,8 @@ * We should probably handle offer/answer and session updates etc(SIP) quite possibly the whole handling of * seting up the RTP conversations should be done by the signaling protocol(s) calling the SDP dissector * and the SDP dissector just provide the relevant data. + * YES! packet-sdp.c should be about SDP parsing... SDP state needs to be maintained by upper + * protocols, because each one has different rules/semantics. / guint encryption_algorithm; guint auth_algorithm; @@ -248,9 +250,10 @@ / Data that is retrieved from a packet, but does not need to be kept / typedef struct { - char connection_address; + char connection_address; / there should actually be SDP_MAX_RTP_CHANNELS of these too / char connection_type; - char media_type; + / media_type is for 'audio', 'video', etc, so per-stream / + char media_type[SDP_MAX_RTP_CHANNELS]; char media_port[SDP_MAX_RTP_CHANNELS]; char media_proto[SDP_MAX_RTP_CHANNELS]; guint8 media_count; @@ -710,7 +713,7 @@ proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, offset, tokenlen, ENC_ASCII\|ENC_NA); - media_info->media_type = (char)tvb_get_ephemeral_string(tvb, offset, tokenlen); + media_info->media_type[media_info->media_count] = (char)tvb_get_ephemeral_string(tvb, offset, tokenlen); offset = next_offset + 1; @@ -1601,7 +1604,7 @@ convert_disposable_media(transport_info_t* transport_info, disposable_media_info_t* media_info, gint start_transport_info_count) { - gint8 n, i, transport_index; + gint8 n, transport_index; guint proto_bitmask; for (n = 0; (n < media_info->media_count) && (n+start_transport_info_count < SDP_MAX_RTP_CHANNELS); n++) @@ -1619,6 +1622,7 @@ proto_bitmask = 0; /* Check if media protocol is RTP / + / XXX: what about 'RTP/AVPF' or RTP/SAVPF'? / if (!strcmp(media_info->media_proto[n],"RTP/AVP")) { transport_info->proto_bitmask[transport_index] \|= SDP_RTP_PROTO; proto_bitmask \|= SDP_RTP_PROTO; @@ -1646,12 +1650,15 @@ proto_bitmask \|= SDP_SPRT_PROTO; } + / now check if this stream's port==0, in which case we need to disable its paired stream / if (transport_info->media_port[transport_index] == 0) { - / This will disable any ports that share the media / - for (i = 0; i < transport_index; i++) { - if (proto_bitmask & transport_info->proto_bitmask[i]) { - transport_info->media_port[i] = 0; - } + / This should disable the matching media session in the offer - it's a bit of a hack though, + basically start_transport_info_count is 0 for the offer, and >0 for the answer, so we + check that and if this is the answer, then we go set the offer's paired stream to 0. + If it turns out we got a port=0 in the offer, we don't care and it's ok to let the + answer have a non-port=0 (though that would be illegal per the RFCs). / + if (start_transport_info_count > 0 && (proto_bitmask & transport_info->proto_bitmask[n])) { + transport_info->media_port[n] = 0; } } } @@ -1689,14 +1696,16 @@ transport_info->media_port[transport_index] = media_info->msrp_port_number; } - if ((media_info->media_type != NULL) && (strcmp(media_info->media_type, "video") == 0)) { + if ((media_info->media_type[transport_index] != NULL) && + (strcmp(media_info->media_type[transport_index], "video") == 0)) { transport_info->proto_bitmask[transport_index] \|= SDP_VIDEO; } } } void -setup_sdp_transport(tvbuff_t tvb, packet_info pinfo, enum sdp_exchange_type exchange_type, int request_frame) +setup_sdp_transport(tvbuff_t tvb, packet_info pinfo, enum sdp_exchange_type exchange_type, + int request_frame, const gboolean delay) { gint offset = 0, next_offset, n; int linelen; @@ -1748,6 +1757,18 @@ if (transport_info->media_count > 0) start_transport_info_count = transport_info->media_count; + / if we don't delay, and this is an answer after a previous offer, then + we free'd the unused media rtp_dyn_payload last time while processing + the offer, so we need to re-create them this time in case we need them. + If they don't get used they'll get free'd again later / + if (!delay && (exchange_type == SDP_EXCHANGE_ANSWER_ACCEPT) && + (transport_info->sdp_status == SDP_EXCHANGE_OFFER)) { + for (n = start_transport_info_count; n < SDP_MAX_RTP_CHANNELS; n++) { + if (!transport_info->media[n].rtp_dyn_payload) + transport_info->media[n].rtp_dyn_payload = g_hash_table_new(g_int_hash, g_int_equal); + } + } + / * Show the SDP message a line at a time. / @@ -1815,6 +1836,18 @@ if (in_media_description) { / Increase the count of media channels, but don't walk off the end of the arrays. / + / XXX: I don't know why this was done here - I'm keeping it here in case + * removing it causes problems, but it's wrong. transport_info->media_count + * is already incremented in the while() loop above. Incrementing it + * again here will cause bugs. The name of this is misleading, because + * 'transport_info->media_count' is actually an index, not count. + * In other words, it's a 0-based number, of the current rtp channel. + * So debug printing shows bogus rtp channels get created and then later + * removed because luckily it knows they were bogus. But it will cause bugs + * because if we're not delaying, then for the SDP_EXCHANGE_ANSWER_ACCEPT + * run through this function, it will add new RTP channels at a +1 index, + * which will likely cause problems. + / if (transport_info->media_count < (SDP_MAX_RTP_CHANNELS-1)) transport_info->media_count++; if (media_info.media_count < (SDP_MAX_RTP_CHANNELS-1)) @@ -1827,8 +1860,8 @@ convert_disposable_media(transport_info, &media_info, start_transport_info_count); / We have a successful negotiation, apply data to their respective protocols / - if ((exchange_type == SDP_EXCHANGE_ANSWER_ACCEPT) && - (transport_info->sdp_status == SDP_EXCHANGE_OFFER)) { + if (!delay \|\| ((exchange_type == SDP_EXCHANGE_ANSWER_ACCEPT) && + (transport_info->sdp_status == SDP_EXCHANGE_OFFER))) { for (n = 0; n <= transport_info->media_count; n++) { / Add (s)rtp and (s)rtcp conversation, if available (overrides t38 if conversation already set) / @@ -1845,11 +1878,13 @@ srtp_info->auth_tag_len = transport_info->auth_tag_len; } - srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, + / srtp_add_address and rtp_add_address are given the request_frame's not this frame's number, + because that's where the RTP flow started, and thus conversation needs to check against */ + srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", request_frame, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload, srtp_info); } else { - rtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, + rtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", request_frame, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload); } @@ -1859,9 +1894,9 @@ } if (rtcp_handle) { if (transport_info->proto_bitmask[n] & SDP_SRTP_PROTO) { - srtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->fd->num, srtp_info); + srtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", request_frame, srtp_info); } else { - rtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", pinfo->fd->num); + rtcp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n]+1, 0, "SDP", request_frame); } } } @@ -1930,7 +1965,7 @@ } } } - transport_info->sdp_status = SDP_EXCHANGE_ANSWER_ACCEPT; + transport_info->sdp_status = exchange_type; } else if ((exchange_type == SDP_EXCHANGE_ANSWER_REJECT) && (transport_info->sdp_status != SDP_EXCHANGE_ANSWER_REJECT)){ @@ -2186,7 +2221,7 @@ srtp_info->auth_algorithm = transport_info->auth_algorithm; srtp_info->mki_len = transport_info->mki_len; srtp_info->auth_tag_len = transport_info->auth_tag_len; - } + } srtp_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num, (transport_info->proto_bitmask[n] & SDP_VIDEO) ? TRUE : FALSE, transport_info->media[n].rtp_dyn_payload, srtp_info);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-sdp.h ^
@@ -37,7 +37,7 @@ SDP_EXCHANGE_ANSWER_REJECT, }; -extern void setup_sdp_transport(tvbuff_t tvb, packet_info pinfo, enum sdp_exchange_type type, int request_frame); +extern void setup_sdp_transport(tvbuff_t tvb, packet_info pinfo, enum sdp_exchange_type type, int request_frame, const gboolean delay); /* Handles duplicate OFFER packets so they don't end up processed by dissect_sdp(). This can probably * be removed when all higher layer dissectors properly handle SDP themselves with setup_sdp_transport() */
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-sip.c ^
@@ -794,6 +794,9 @@ / static gboolean sip_retrans_the_same_sport = TRUE; +/ whether we hold off tracking RTP conversations until an SDP answer is received / +static gboolean sip_delay_sdp_changes = FALSE; + / Extension header subdissectors / static dissector_table_t ext_hdr_subdissector_table; @@ -3184,15 +3187,15 @@ / Resends don't count / if (resend_for_packet == 0) { if (line_type == REQUEST_LINE) { - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->fd->num); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_OFFER, pinfo->fd->num, sip_delay_sdp_changes); } else if (line_type == STATUS_LINE) { if (stat_info->response_code >= 400) { / SIP client request failed, so SDP offer should fail / - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_REJECT, request_for_response, sip_delay_sdp_changes); } else if ((stat_info->response_code >= 200) && (stat_info->response_code <= 299)) { / SIP success request, so SDP offer should be accepted / - setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response); + setup_sdp_transport(next_tvb, pinfo, SDP_EXCHANGE_ANSWER_ACCEPT, request_for_response, sip_delay_sdp_changes); } } } else { @@ -3200,6 +3203,8 @@ } } + / XXX: why is this called even if setup_sdp_transport() was called before? That will + parse the SDP a second time, for 'application/sdp' media MIME bodies */ found_match = dissector_try_string(media_type_dissector_table, media_type_str_lower_case, next_tvb, pinfo, @@ -5219,6 +5224,13 @@ "Retransmissions always use the same source port", "Whether retransmissions are detected coming from the same source port only.", &sip_retrans_the_same_sport); + prefs_register_bool_preference(sip_module, "delay_sdp_changes", + "Delay SDP changes for tracking media", + "Whether SIP should delay tracking the media (e.g., RTP/RTCP) until an SDP offer " + "is answered. If enabled, mid-dialog changes to SDP and media state only take " + "effect if and when an SDP offer is successfully answered; however enabling this " + "prevents tracking media in early-media call scenarios", + &sip_delay_sdp_changes); prefs_register_obsolete_preference(sip_module, "tcp.port");
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-tcap.c ^
@@ -2235,8 +2235,10 @@ } /* Call the sub dissector if present, and not already called */ - if (is_subdissector) + if (is_subdissector) { call_dissector(subdissector_handle, tvb, actx->pinfo, tree); + col_set_fence(actx->pinfo->cinfo, COL_INFO); + } return offset; }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/packet-umts_fp.c ^
@@ -3994,7 +3994,7 @@ } tb_bit_off = (2+p_conv_data->num_dch_in_flow)8; /Point to the C/T of first TB/ /Set configuration for individual blocks/ - for(j=0; j < num_tbs; j++){ + for(j=0; j < num_tbs && j+chan < MAX_MAC_FRAMES; j++){ /Set transport channel id (useful for debugging)*/ macinf->trchid[j+chan] = p_conv_data->dchs_in_flow_list[chan];
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/dissectors/usb.c ^
@@ -37,6 +37,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. / +/ + * XXX We should probably parse a USB ID file at program start instead + * of generating this file. + */ + #include "config.h" #include <epan/packet.h> @@ -45,7 +50,7 @@ { 0x0002, "Ingram" }, { 0x0003, "Club Mac" }, { 0x0004, "Nebraska Furniture Mart" }, - { 0x0011, "Unknown manufacturer" }, + { 0x0011, "Unknown" }, { 0x0053, "Planex" }, { 0x0079, "DragonRise Inc." }, { 0x0105, "Trust International B.V." }, @@ -982,6 +987,7 @@ { 0x088c, "Swecoin AB" }, { 0x088e, "iLok" }, { 0x0892, "DioGraphy, Inc." }, + { 0x0894, "TSI Incorporated" }, { 0x0897, "Lauterbach" }, { 0x089c, "United Technologies Research Cntr." }, { 0x089d, "Icron Technologies Corp." }, @@ -992,6 +998,7 @@ { 0x08a8, "Andrea Electronics" }, { 0x08a9, "CWAV Inc." }, { 0x08ae, "Macally (Mace Group, Inc.)" }, + { 0x08b0, "Metrohm" }, { 0x08b4, "Sorenson Vision, Inc." }, { 0x08b7, "NATSU" }, { 0x08b8, "J. Gordon Electronic Design, Inc." }, @@ -1103,7 +1110,7 @@ { 0x095b, "Medialogic Corp." }, { 0x095c, "K-Tec Electronics" }, { 0x095d, "Polycom, Inc." }, - { 0x0967, "Acer (?)" }, + { 0x0967, "Acer NeWeb Corp." }, { 0x0968, "Catalyst Enterprises, Inc." }, { 0x096e, "Feitian Technologies, Inc." }, { 0x0971, "Gretag-Macbeth AG" }, @@ -1190,6 +1197,7 @@ { 0x0a05, "Unknown Manufacturer" }, { 0x0a07, "Ontrak Control Systems Inc." }, { 0x0a0b, "Cybex Computer Products Co." }, + { 0x0a0d, "Servergy, Inc" }, { 0x0a11, "Xentec, Inc." }, { 0x0a12, "Cambridge Silicon Radio, Ltd" }, { 0x0a13, "Telebyte, Inc." }, @@ -1214,6 +1222,7 @@ { 0x0a46, "Davicom Semiconductor, Inc." }, { 0x0a47, "Hirose Electric" }, { 0x0a48, "I/O Interconnect" }, + { 0x0a4a, "Ploytec GmbH" }, { 0x0a4b, "Fujitsu Media Devices, Ltd" }, { 0x0a4c, "Computex Co., Ltd" }, { 0x0a4d, "Evolution Electronics, Ltd" }, @@ -1304,6 +1313,7 @@ { 0x0af6, "Silver I Co., Ltd" }, { 0x0af7, "B2C2, Inc." }, { 0x0af9, "Hama, Inc." }, + { 0x0afa, "DMC Co., Ltd." }, { 0x0afc, "Zaptronix Ltd" }, { 0x0afd, "Tateno Dennou, Inc." }, { 0x0afe, "Cummins Engine Co." }, @@ -1684,6 +1694,7 @@ { 0x0db3, "Tekram Technology Co., Ltd" }, { 0x0db4, "Chung Fu Chen Yeh Enterprise Corp." }, { 0x0db7, "ELCON Systemtechnik" }, + { 0x0dba, "Digidesign" }, { 0x0dbc, "A&D Medical" }, { 0x0dbe, "Jiuh Shiuh Precision Industry Co., Ltd" }, { 0x0dbf, "Jess-Link International" }, @@ -1794,6 +1805,7 @@ { 0x0eb3, "Saint Technology Corp." }, { 0x0eb7, "Endor AG" }, { 0x0eb8, "Mettler Toledo" }, + { 0x0ebb, "Thermo Fisher Scientific" }, { 0x0ebe, "VWeb Corp." }, { 0x0ebf, "Omega Technology of Taiwan, Inc." }, { 0x0ec0, "LHI Technology (China) Co., Ltd" }, @@ -1839,6 +1851,7 @@ { 0x0f11, "LD Didactic GmbH" }, { 0x0f12, "Mars Engineering Corp." }, { 0x0f13, "Acetek Technology Co., Ltd" }, + { 0x0f14, "Ingenico" }, { 0x0f18, "Finger Lakes Instrumentation" }, { 0x0f19, "Oracom Co., Ltd" }, { 0x0f1b, "Onset Computer Corp." }, @@ -1856,6 +1869,7 @@ { 0x0f32, "YFC-BonEagle Electric Co., Ltd" }, { 0x0f37, "Kokuyo Co., Ltd" }, { 0x0f38, "Nien-Yi Industrial Corp." }, + { 0x0f39, "TG3 Electronics" }, { 0x0f3d, "Airprime, Incorporated" }, { 0x0f41, "RDC Semiconductor Co., Ltd" }, { 0x0f42, "Nital Consulting Services, Inc." }, @@ -1880,6 +1894,7 @@ { 0x0f6a, "Vibren Technologies, Inc." }, { 0x0f6e, "INTELLIGENT SYSTEMS" }, { 0x0f73, "DFI" }, + { 0x0f78, "Guntermann & Drunck GmbH" }, { 0x0f7c, "DQ Technology, Inc." }, { 0x0f7d, "NetBotz, Inc." }, { 0x0f7e, "Fluke Corp." }, @@ -1922,6 +1937,7 @@ { 0x0fd9, "Elgato Systems GmbH" }, { 0x0fda, "Quantec Networks GmbH" }, { 0x0fdc, "Micro Plus" }, + { 0x0fde, "Oregon Scientific" }, { 0x0fe0, "Osterhout Design Group" }, { 0x0fe4, "IN-Tech Electronics, Ltd" }, { 0x0fe5, "Greenconn (U.S.A.), Inc." }, @@ -1971,7 +1987,7 @@ { 0x1031, "Comax Technology, Inc." }, { 0x1032, "C-One Technology Corp." }, { 0x1033, "Nucam Corp." }, - { 0x1038, "Ideazon, Inc." }, + { 0x1038, "SteelSeries ApS" }, { 0x1039, "devolo AG" }, { 0x103d, "Stanton" }, { 0x1043, "iCreate Technologies Corp." }, @@ -2016,6 +2032,7 @@ { 0x108e, "Lotes Co., Ltd." }, { 0x1099, "Surface Optics Corp." }, { 0x109a, "DATASOFT Systems GmbH" }, + { 0x109b, "Hisense" }, { 0x109f, "eSOL Co., Ltd" }, { 0x10a0, "Hirotech, Inc." }, { 0x10a3, "Mitsubishi Materials Corp." }, @@ -2031,6 +2048,7 @@ { 0x10bc, "Dinging Technology Co., Ltd" }, { 0x10bd, "TMT Technology, Inc." }, { 0x10bf, "SmartHome" }, + { 0x10c3, "Universal Laser Systems, Inc." }, { 0x10c4, "Cygnal Integrated Products, Inc." }, { 0x10c5, "Sanei Electric, Inc." }, { 0x10c6, "Intec, Inc." }, @@ -2115,7 +2133,9 @@ { 0x11ab, "Exito Electronics Co., Ltd" }, { 0x11ac, "Nike" }, { 0x11b0, "ATECH FLASH TECHNOLOGY" }, + { 0x11be, "R&D International NV" }, { 0x11c5, "Inmax" }, + { 0x11ca, "VeriFone Inc" }, { 0x11db, "Topfield Co., Ltd." }, { 0x11e6, "K.I. Technology Co. Ltd." }, { 0x11f5, "Siemens AG" }, @@ -2132,7 +2152,7 @@ { 0x1230, "Chipidea-Microelectronica, S.A." }, { 0x1233, "Denver Electronics" }, { 0x1234, "Brain Actuated Technologies" }, - { 0x1235, "Novation EMS" }, + { 0x1235, "Focusrite-Novation" }, { 0x1241, "Belkin" }, { 0x124a, "AirVast" }, { 0x124b, "Nyko (Honey Bee)" }, @@ -2163,10 +2183,12 @@ { 0x12b9, "E28" }, { 0x12ba, "Licensed by Sony Computer Entertainment America" }, { 0x12c4, "Autocue Group Ltd" }, + { 0x12cf, "DEXIN" }, { 0x12d1, "Huawei Technologies Co., Ltd." }, { 0x12d2, "LINE TECH INDUSTRIAL CO., LTD." }, { 0x12d6, "EMS Dr. Thomas Wuensche" }, { 0x12d7, "BETTER WIRE FACTORY CO., LTD." }, + { 0x12d8, "Araneus Information Systems Oy" }, { 0x12e6, "Waldorf Music GmbH" }, { 0x12ef, "Tapwave, Inc." }, { 0x12f5, "Dynamic System Electronics Corp." }, @@ -2182,6 +2204,7 @@ { 0x132a, "Envara Inc." }, { 0x132b, "Konica Minolta" }, { 0x1342, "Mobility" }, + { 0x1343, "Citizen Systems" }, { 0x1345, "Sino Lite Technology Corp." }, { 0x1347, "Moravian Instruments" }, { 0x1348, "Katsuragawa Electric Co., Ltd." }, @@ -2233,6 +2256,7 @@ { 0x1410, "Novatel Wireless" }, { 0x1415, "Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc." }, { 0x1419, "ABILITY ENTERPRISE CO., LTD." }, + { 0x1421, "Sensor Technology" }, { 0x1429, "Vega Technologies Industrial (Austria) Co." }, { 0x142a, "Thales E-Transactions" }, { 0x142b, "Arbiter Systems, Inc." }, @@ -2279,6 +2303,7 @@ { 0x14dd, "Raritan Computer, Inc." }, { 0x14e0, "WiNRADiO Communications" }, { 0x14e1, "Dialogue Technology Corp." }, + { 0x14e4, "Broadcom Corp." }, { 0x14e5, "SAIN Information & Communications Co., Ltd." }, { 0x14ea, "Planex Communications" }, { 0x14ed, "Shure Inc." }, @@ -2290,6 +2315,7 @@ { 0x1514, "Actel" }, { 0x1516, "CompUSA" }, { 0x1518, "Cheshire Engineering Corp." }, + { 0x1519, "Comneon" }, { 0x1520, "Bitwire Corp." }, { 0x1524, "ENE Technology Inc" }, { 0x1527, "Silicon Portals" }, @@ -2298,6 +2324,7 @@ { 0x152d, "JMicron Technology Corp. / JMicron USA Technology Corp." }, { 0x152e, "LG (HLDS)" }, { 0x1532, "Razer USA, Ltd" }, + { 0x153b, "TerraTec Electronic GmbH" }, { 0x1546, "U-Blox AG" }, { 0x1547, "SG Intec Ltd & Co KG" }, { 0x154a, "Celectronic GmbH" }, @@ -2390,6 +2417,7 @@ { 0x16ca, "Wireless Cables, Inc." }, { 0x16cc, "silex technology, Inc." }, { 0x16d0, "MCS" }, + { 0x16d1, "Suprema Inc." }, { 0x16d3, "Frontline Test Equipment, Inc." }, { 0x16d5, "AnyDATA Corporation" }, { 0x16d6, "JABLOCOM s.r.o." }, @@ -2402,14 +2430,18 @@ { 0x1707, "ARTIMI" }, { 0x170b, "Swissonic" }, { 0x170d, "Avnera" }, + { 0x1711, "Leica Microsystems" }, + { 0x1724, "Meyer Instruments (MIS)" }, { 0x1725, "Vitesse Semiconductor" }, { 0x1726, "Axesstel, Inc." }, { 0x172f, "Waltop International Corp." }, { 0x1733, "Cellink Technology Co., Ltd" }, { 0x1736, "CANON IMAGING SYSTEM TECHNOLOGIES INC." }, { 0x1737, "Linksys" }, + { 0x173d, "QSENN" }, { 0x1740, "Senao" }, { 0x1743, "General Atomics" }, + { 0x1748, "MQP Electronics" }, { 0x174c, "ASMedia Technology Inc." }, { 0x174f, "Syntek" }, { 0x1753, "GERTEC Telecomunicacoes Ltda." }, @@ -2669,7 +2701,7 @@ { 0x1c79, "Unigen Corporation" }, { 0x1c7a, "LighTuning Technology Inc." }, { 0x1c7b, "LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD." }, - { 0x1c83, "Schom\\xc3\\xa4cker GmbH" }, + { 0x1c83, "Schomaecker GmbH" }, { 0x1c87, "2N TELEKOMUNIKACE a.s." }, { 0x1c88, "Somagic, Inc." }, { 0x1c89, "HONGKONG WEIDIDA ELECTRON LIMITED" }, @@ -2964,6 +2996,7 @@ { 0x03eb210d, "XPLAIN evaluation kit (CDC ACM)" }, { 0x03eb2110, "AVR JTAGICE3 Debugger and Programmer" }, { 0x03eb2122, "XMEGA-A1 Explained evaluation kit" }, + { 0x03eb2141, "ICE debugger" }, { 0x03eb2310, "EVK11xx evaluation board" }, { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" }, { 0x03eb2ff0, "atmega32u2 DFU bootloader" }, @@ -3020,6 +3053,7 @@ { 0x03f0011d, "Bluetooth 1.2 Interface [Broadcom BCM2035]" }, { 0x03f00121, "HP49g+ Calculator" }, { 0x03f00122, "HID Internet Keyboard" }, + { 0x03f00139, "Barcode Scanner 4430" }, { 0x03f00201, "ScanJet 6200c" }, { 0x03f00202, "PhotoSmart S20" }, { 0x03f00204, "DeskJet 815c" }, @@ -3129,6 +3163,7 @@ { 0x03f01512, "Printing Support" }, { 0x03f01517, "color LaserJet 3500" }, { 0x03f01524, "Smart Card Keyboard - KR" }, + { 0x03f01539, "Mini Magnetic Stripe Reader" }, { 0x03f01602, "PhotoSmart 330 series" }, { 0x03f01604, "DeskJet 940c" }, { 0x03f01605, "ScanJet 5530C PhotoSmart" }, @@ -3166,6 +3201,7 @@ { 0x03f01c17, "Color LaserJet 2550l" }, { 0x03f01d02, "PhotoSmart A310 series" }, { 0x03f01d17, "LaserJet 1320" }, + { 0x03f01d24, "Barcode scanner" }, { 0x03f01e02, "PhotoSmart A320 Printer series" }, { 0x03f01e11, "PSC-950" }, { 0x03f01e17, "LaserJet 1160 series" }, @@ -3180,6 +3216,7 @@ { 0x03f02005, "ScanJet 3570c" }, { 0x03f02012, "OfficeJet Pro K5400" }, { 0x03f0201d, "un2400 Gobi Wireless Modem (QDL mode)" }, + { 0x03f02039, "Cashdrawer" }, { 0x03f02102, "PhotoSmart 7345" }, { 0x03f02104, "DeskJet 630c" }, { 0x03f02112, "OfficeJet Pro L7500" }, @@ -3204,7 +3241,7 @@ { 0x03f02502, "PhotoSmart 7700 series" }, { 0x03f02504, "DeskJet F4200 series" }, { 0x03f02505, "ScanJet 3770" }, - { 0x03f02512, "OfficeJet Pro L7300" }, + { 0x03f02512, "OfficeJet Pro L7300 / Compaq LA2405 series monitor" }, { 0x03f02514, "4-port hub" }, { 0x03f02517, "LaserJet 2410" }, { 0x03f0251d, "Gobi 2000 Wireless Modem" }, @@ -3217,6 +3254,7 @@ { 0x03f02702, "PhotoSmart A620 series" }, { 0x03f02704, "DeskJet 915" }, { 0x03f02717, "Color LaserJet 2830" }, + { 0x03f02724, "Magnetic Stripe Reader IDRA-334133-HP" }, { 0x03f02811, "PSC-2100" }, { 0x03f02817, "Color LaserJet 2840" }, { 0x03f02902, "PhotoSmart A820 series" }, @@ -3343,6 +3381,7 @@ { 0x03f05811, "PhotoSmart C5100 series" }, { 0x03f05817, "LaserJet M1319f MFP" }, { 0x03f05911, "PhotoSmart C6180" }, + { 0x03f05912, "Officejet Pro 8600" }, { 0x03f05a11, "PhotoSmart C7100 series" }, { 0x03f05b11, "OfficeJet J2100 series" }, { 0x03f05c11, "PhotoSmart C4200 Printer series" }, @@ -3381,6 +3420,7 @@ { 0x03f06b02, "HP PhotoSmart 707" }, { 0x03f06b11, "Photosmart C4500 series" }, { 0x03f06c02, "HP PhotoSmart 733" }, + { 0x03f06c11, "Photosmart C4480" }, { 0x03f06c17, "Color LaserJet 4610" }, { 0x03f06d02, "HP PhotoSmart 607" }, { 0x03f06e02, "HP PhotoSmart 507" }, @@ -3517,6 +3557,7 @@ { 0x03f90100, "KT-2001 Keyboard" }, { 0x03f90101, "Keyboard" }, { 0x03f90102, "Keyboard Mouse" }, + { 0x03fd0008, "Platform Cable USB II" }, { 0x040005dc, "Rigol Technologies DS1000USB Oscilloscope" }, { 0x04000807, "Bluetooth Dongle" }, { 0x0400080a, "Bluetooth Device" }, @@ -3547,6 +3588,7 @@ { 0x04030000, "H4SMK 7 Port Hub" }, { 0x04030232, "Serial Converter" }, { 0x04031060, "JTAG adapter" }, + { 0x04031234, "IronLogic RFID Adapter [Z-2 USB]" }, { 0x04036001, "FT232 USB-Serial (UART) IC" }, { 0x04036002, "Lumel PD12" }, { 0x04036007, "Serial Converter" }, @@ -3571,8 +3613,10 @@ { 0x04038b2a, "Alpermann+Velte Rubidium Q1" }, { 0x04038b2b, "Alpermann+Velte TCD" }, { 0x04038b2c, "Alpermann+Velte TCC70" }, + { 0x04039132, "LCD and Temperature Interface" }, { 0x04039133, "CallerID" }, { 0x04039135, "Rotary Pub alarm" }, + { 0x04039136, "Pulsecounter" }, { 0x04039e90, "Marvell OpenRD Base/Client" }, { 0x04039f80, "Ewert Energy Systems CANdapter" }, { 0x0403a6d0, "Texas Instruments XDS100v2 JTAG / BeagleBone A3" }, @@ -3640,6 +3684,7 @@ { 0x0403ed74, "HAMEG HO820 Serial Port" }, { 0x0403ef10, "FT1245BL" }, { 0x0403f070, "Serial Converter 422/485 [Vardaan VEUSB422R3]" }, + { 0x0403f0e9, "Tagsys L-P101" }, { 0x0403f1a0, "Asix PRESTO Programmer" }, { 0x0403f208, "Papenmeier Braille-Display" }, { 0x0403f3c0, "4N-GALAXY Serial Converter" }, @@ -3878,6 +3923,7 @@ { 0x040a4000, "InkJet Color Printer" }, { 0x040a4021, "Photo Printer 6800" }, { 0x040a4022, "1400 Digital Photo Printer" }, + { 0x040a402b, "Photo Printer 6850" }, { 0x040a402e, "605 Photo Printer" }, { 0x040a4034, "805 Photo Printer" }, { 0x040a4056, "ESP 7200 Series AiO" }, @@ -4368,6 +4414,7 @@ { 0x04244064, "Ultra Fast Media Reader" }, { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" }, { 0x04249512, "SMC9512/9514 USB Hub" }, + { 0x04249514, "SMC9514 Hub" }, { 0x0424a700, "2 Port Hub" }, { 0x0424ec00, "SMSC9512/9514 Fast Ethernet Adapter" }, { 0x04250101, "G-Tech Wireless Mouse & Keyboard" }, @@ -4611,6 +4658,7 @@ { 0x04512036, "TUSB2036 Hub" }, { 0x04512046, "TUSB2046 Hub" }, { 0x04512077, "TUSB2077 Hub" }, + { 0x04512f90, "SM-USB-DIG" }, { 0x04513410, "TUSB3410 Microcontroller" }, { 0x04513f00, "OMAP1610" }, { 0x04513f02, "SMC WSKP100 Wi-Fi Phone" }, @@ -4709,6 +4757,7 @@ { 0x04584012, "TVGo DVB-T03 [AF9015]" }, { 0x04585003, "G-pen 560 Tablet" }, { 0x04585004, "G-pen Tablet" }, + { 0x0458505e, "Genius iSlim 330" }, { 0x04586001, "GF3000F Ethernet Adapter" }, { 0x04587004, "VideoCAM Express V2" }, { 0x04587006, "Dsc 1.3 Smart Camera Device" }, @@ -4731,9 +4780,17 @@ { 0x04587055, "Slim 2020AF camera" }, { 0x0458705a, "Asus USB2.0 Webcam" }, { 0x0458705c, "Genius iSlim 1300AF" }, + { 0x04587061, "Genius iLook 1321 V2" }, + { 0x04587066, "Acer Crystal Eye Webcam" }, + { 0x04587067, "Genius iSlim 1300AF V2" }, + { 0x04587068, "Genius eFace 1325R" }, + { 0x0458706d, "Genius iSlim 2000AF V2" }, + { 0x04587076, "Genius FaceCam 312" }, { 0x04587079, "FaceCam 2025R" }, { 0x0458707f, "TVGo DVB-T03 [RTL2832]" }, { 0x04587088, "WideCam 1050" }, + { 0x04587089, "Genius FaceCam 320" }, + { 0x0458708c, "Genius WideCam F100" }, { 0x045a07da, "Supra Express 56K modem" }, { 0x045a0b4a, "SupraMax 2890 56K Modem [Lucent Atlas]" }, { 0x045a0b68, "SupraMax 56K Modem" }, @@ -4865,6 +4922,9 @@ { 0x045e02ae, "Xbox NUI Camera" }, { 0x045e02b0, "Xbox NUI Motor" }, { 0x045e02b6, "Xbox 360 / Bluetooth Wireless Headset" }, + { 0x045e02be, "Kinect for Windows NUI Audio" }, + { 0x045e02bf, "Kinect for Windows NUI Camera" }, + { 0x045e02c2, "Kinect for Windows NUI Motor" }, { 0x045e0400, "Windows Powered Pocket PC 2002" }, { 0x045e0401, "Windows Powered Pocket PC 2002" }, { 0x045e0402, "Windows Powered Pocket PC 2002" }, @@ -5139,6 +5199,7 @@ { 0x046d082d, "HD Pro Webcam C920" }, { 0x046d0830, "QuickClip" }, { 0x046d0840, "QuickCam Express" }, + { 0x046d0843, "Webcam C930e" }, { 0x046d0850, "QuickCam Web" }, { 0x046d0870, "QuickCam Express" }, { 0x046d0890, "QuickCam Traveler" }, @@ -5240,6 +5301,8 @@ { 0x046d0a17, "G330 Headset" }, { 0x046d0a1f, "G930" }, { 0x046d0a29, "H600 [Wireless Headset]" }, + { 0x046d0a38, "Headset H340" }, + { 0x046d0a4d, "G430 Surround Sound Gaming Headset" }, { 0x046d0b02, "C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)" }, { 0x046d8801, "Video Camera" }, { 0x046db305, "BT Mini-Receiver" }, @@ -5400,7 +5463,7 @@ { 0x046dc318, "Illuminated Keyboard" }, { 0x046dc31a, "Comfort Wave 450" }, { 0x046dc31b, "Compact Keyboard K300" }, - { 0x046dc31c, "Keyboard K120 for Business" }, + { 0x046dc31c, "Keyboard K120" }, { 0x046dc31d, "Media Keyboard K200" }, { 0x046dc401, "TrackMan Marble Wheel" }, { 0x046dc402, "Marble Mouse (2-button)" }, @@ -5434,14 +5497,22 @@ { 0x046dc526, "Nano Receiver" }, { 0x046dc529, "Logitech Keyboard + Mice" }, { 0x046dc52b, "Unifying Receiver" }, + { 0x046dc52d, "R700 Remote Presenter receiver" }, { 0x046dc52e, "MK260 Wireless Combo Receiver" }, { 0x046dc52f, "Unifying Receiver" }, { 0x046dc532, "Unifying Receiver" }, + { 0x046dc603, "3Dconnexion Spacemouse Plus XT" }, + { 0x046dc605, "3Dconnexion CADman" }, + { 0x046dc606, "3Dconnexion Spacemouse Classic" }, + { 0x046dc621, "3Dconnexion Spaceball 5000" }, { 0x046dc623, "3Dconnexion Space Traveller 3D Mouse" }, { 0x046dc625, "3Dconnexion Space Pilot 3D Mouse" }, { 0x046dc626, "3Dconnexion Space Navigator 3D Mouse" }, { 0x046dc627, "3Dconnexion Space Explorer 3D Mouse" }, + { 0x046dc628, "3Dconnexion Space Navigator for Notebooks" }, { 0x046dc629, "3Dconnexion SpacePilot Pro 3D Mouse" }, + { 0x046dc62b, "3Dconnexion Space Mouse Pro" }, + { 0x046dc640, "NuLOOQ navigator" }, { 0x046dc702, "Cordless Presenter" }, { 0x046dc703, "Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth)" }, { 0x046dc704, "diNovo Wireless Desktop" }, @@ -5720,6 +5791,7 @@ { 0x04800004, "InTouch Module" }, { 0x04800011, "InTouch Module" }, { 0x04800014, "InTouch Module" }, + { 0x04800100, "Stor.E Slim USB 3.0" }, { 0x0480a006, "External Disk 1.5TB" }, { 0x0480a007, "External Disk USB 3.0" }, { 0x0480a009, "Stor.E Basics" }, @@ -6162,6 +6234,7 @@ { 0x04a92224, "CanoScan LiDE 600F" }, { 0x04a92225, "CanoScan LiDE 70" }, { 0x04a92228, "CanoScan 4400F" }, + { 0x04a92229, "CanoScan 8600F" }, { 0x04a92602, "MultiPASS C555" }, { 0x04a92603, "MultiPASS C755" }, { 0x04a9260a, "CAPT Printer" }, @@ -6489,6 +6562,7 @@ { 0x04a9322c, "Canon PowerShot SX220HS" }, { 0x04a93233, "Canon PowerShot G1 X" }, { 0x04a93234, "PowerShot SX150 IS" }, + { 0x04a93235, "PowerShot ELPH 510 HS / IXUS 1100 HS" }, { 0x04a93236, "PowerShot S100" }, { 0x04a93237, "PowerShot ELPH 310 HS / IXUS 230 HS" }, { 0x04a93238, "Canon PowerShot SX40HS" }, @@ -6515,8 +6589,10 @@ { 0x04a9325a, "PowerShot SX160 IS" }, { 0x04a9325b, "Canon PowerShot S110" }, { 0x04a9325c, "Canon PowerShot SX500IS" }, + { 0x04a9325e, "PowerShot N" }, { 0x04a9325f, "PowerShot SX280 HS" }, { 0x04a93260, "PowerShot SX270 HS" }, + { 0x04a93261, "PowerShot A3500 IS" }, { 0x04a93262, "PowerShot A2600" }, { 0x04a93264, "PowerShot A1400" }, { 0x04a93265, "Powershot ELPH 130 IS / IXUS 140" }, @@ -6525,6 +6601,9 @@ { 0x04a93276, "PowerShot SX170 IS" }, { 0x04a93277, "PowerShot SX510 HS" }, { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" }, + { 0x04a93288, "Powershot ELPH 135 / IXUS 145" }, + { 0x04a93289, "PowerShot ELPH 340 HS / IXUS 265 HS" }, + { 0x04a9328a, "PowerShot ELPH 150 IS / IXUS 155" }, { 0x04ad2501, "Bluetooth Device" }, { 0x04b00102, "Coolpix 990" }, { 0x04b00103, "Coolpix 880" }, @@ -6706,6 +6785,7 @@ { 0x04b41006, "Human Interface Device" }, { 0x04b42050, "hub" }, { 0x04b42830, "Opera1 DVB-S (cold state)" }, + { 0x04b44235, "Monitor 02 Driver" }, { 0x04b44381, "SCAPS USC-1 Scanner Controller" }, { 0x04b44611, "Storage Adapter FX2 (CY)" }, { 0x04b44616, "Flash Disk (TPP)" }, @@ -7003,6 +7083,7 @@ { 0x04c51097, "fi-5110C" }, { 0x04c510ae, "fi-4120C2" }, { 0x04c510af, "fi-4220C2" }, + { 0x04c510c7, "fi-60f scanner" }, { 0x04c510e0, "fi-5120c Scanner" }, { 0x04c510e1, "fi-5220C" }, { 0x04c510e7, "fi-5900C" }, @@ -7198,7 +7279,7 @@ { 0x04d92221, "Keyboard" }, { 0x04d92323, "Keyboard" }, { 0x04d92519, "Shenzhen LogoTech 2.4GHz receiver" }, - { 0x04d92832, "1channel Telephone line recorder" }, + { 0x04d92832, "HT82A832R Audio MCU" }, { 0x04d92834, "HT82A834R Audio MCU" }, { 0x04d9a055, "Keyboard" }, { 0x04da0901, "LS-120 Camera" }, @@ -7230,6 +7311,7 @@ { 0x04da2374, "Panasonic DMC-GF1" }, { 0x04da2375, "Leica D-LUX 2" }, { 0x04da2451, "HDC-SD9" }, + { 0x04da245b, "HC-X920K (3MOS Full HD video camcorder)" }, { 0x04da2497, "HDC-TM700" }, { 0x04da250c, "Gobi Wireless Modem (QDL mode)" }, { 0x04da250d, "Gobi Wireless Modem" }, @@ -7374,6 +7456,7 @@ { 0x04e81003, "MP3 Player and Recorder" }, { 0x04e81006, "SDC-200Z" }, { 0x04e8130c, "NX100" }, + { 0x04e81f05, "S2 Portable [JMicron] (500GB)" }, { 0x04e81f06, "HX-MU064DA portable harddisk" }, { 0x04e82018, "WIS09ABGN LinkStick Wireless LAN Adapter" }, { 0x04e82035, "Digital Photo Frame Mass Storage" }, @@ -7419,6 +7502,7 @@ { 0x04e8330c, "ML-1865" }, { 0x04e83310, "ML-331x Series Laser Printer" }, { 0x04e83315, "ML-2540 Series Laser Printer" }, + { 0x04e8331e, "M262x/M282x Xpress Series Laser Printer" }, { 0x04e83409, "SCX-4216F Scanner" }, { 0x04e8340c, "SCX-5x15 series" }, { 0x04e8340d, "SCX-6x20 series" }, @@ -7435,6 +7519,7 @@ { 0x04e8341f, "Composite Device" }, { 0x04e83420, "Composite Device" }, { 0x04e83426, "SCX-4500 Laser Printer" }, + { 0x04e8342d, "SCX-4x28 Series" }, { 0x04e8344f, "SCX-3400 Series" }, { 0x04e83605, "InkJet Color Printer" }, { 0x04e83606, "InkJet Color Printer" }, @@ -7572,12 +7657,14 @@ { 0x04e8684a, "Samsung S5620" }, { 0x04e8684e, "Wave (GT-S8500)" }, { 0x04e8685b, "GT-I9100 Phone [Galaxy S II] (mass storage mode)" }, - { 0x04e8685c, "GT-I9250 Phone [Galaxy Nexus]" }, + { 0x04e8685c, "GT-I9250 Phone [Galaxy Nexus] (Mass storage mode)" }, { 0x04e8685d, "GT-I9100 Phone [Galaxy S II] (Download mode)" }, { 0x04e8685e, "Samsung Galaxy Y" }, - { 0x04e86860, "GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1]" }, + { 0x04e86860, "GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] , GT-I9500 [Galaxy S 4]" }, + { 0x04e86863, "GT-I9500 [Galaxy S4] / GT-I9250 [Galaxy Nexus] (network tethering)" }, { 0x04e86865, "GT-I9300 Phone [Galaxy S III] (PTP mode)" }, { 0x04e86866, "GT-I9300 Phone [Galaxy S III] (debugging mode)" }, + { 0x04e86868, "Escape Composite driver for Android Phones: Modem+Diagnostic+ADB" }, { 0x04e86875, "GT-B3710 Standalone LTE device (Commercial)" }, { 0x04e86876, "GT-B3710 LTE Modem" }, { 0x04e86877, "Samsung Galaxy models Kies mode" }, @@ -7662,6 +7749,8 @@ { 0x04f2b044, "Acer CrystalEye Webcam" }, { 0x04f2b057, "integrated USB webcam" }, { 0x04f2b059, "CKF7037 HP webcam" }, + { 0x04f2b064, "CNA7137 Integrated Webcam" }, + { 0x04f2b070, "Camera" }, { 0x04f2b071, "2.0M UVC Webcam / CNF7129" }, { 0x04f2b083, "CKF7063 Webcam (HP)" }, { 0x04f2b091, "Webcam" }, @@ -7685,9 +7774,11 @@ { 0x04f2b272, "Lenovo EasyCamera" }, { 0x04f2b2b0, "Camera" }, { 0x04f2b2b9, "Lenovo Integrated Camera UVC" }, + { 0x04f2b2da, "thinkpad t430s camera" }, { 0x04f2b2ea, "Integrated Camera [ThinkPad]" }, { 0x04f2b330, "Asus 720p CMOS webcam" }, { 0x04f2b354, "UVC 1.00 device HD UVC WebCam" }, + { 0x04f2b394, "Integrated Camera" }, { 0x04f3000a, "Touchscreen" }, { 0x04f30103, "ActiveJet K-2024 Multimedia Keyboard" }, { 0x04f301a4, "Wireless Keyboard" }, @@ -7887,6 +7978,7 @@ { 0x04f901ea, "DCP-7030" }, { 0x04f901eb, "MFC-7320" }, { 0x04f901f4, "MFC-5890CN" }, + { 0x04f90217, "MFC-8480DN" }, { 0x04f90223, "DCP-365CN" }, { 0x04f90248, "DCP-7055 scanner/printer" }, { 0x04f91000, "Printer" }, @@ -7924,7 +8016,9 @@ { 0x04fc5330, "Digitrex 2110" }, { 0x04fc5331, "Vivitar Vivicam 10" }, { 0x04fc5360, "Sunplus Generic Digital Camera" }, + { 0x04fc5563, "Digital Media Player MP3/WMA [The Sharper Image]" }, { 0x04fc5720, "Card Reader Driver" }, + { 0x04fc6333, "Siri A9 UVC chipset" }, { 0x04fc7333, "Finet Technology Palmpix DC-85" }, { 0x04fc757a, "Aiptek, MP315 MP3 Player" }, { 0x04fcffff, "PureDigital Ritz Disposable" }, @@ -7953,6 +8047,9 @@ { 0x0502337d, "Acer Iconia TAB A200 (ID2)" }, { 0x0502338a, "Acer Iconia TAB A510" }, { 0x050233c3, "Acer E350 Liquid Gallant Duo" }, + { 0x050233c4, "Liquid Gallant Duo E350 (debug mode)" }, + { 0x050233c7, "Liquid Gallant Duo E350 (USB tethering)" }, + { 0x050233c8, "Liquid Gallant Duo E350 (debug mode, USB tethering)" }, { 0x0502d001, "Divio NW801/DVC-V6+ Digital Camera" }, { 0x0506009d, "HomeConnect Camera" }, { 0x050600a0, "3CREB96 Bluetooth Adapter" }, @@ -8012,6 +8109,7 @@ { 0x050d0409, "F5U409 Serial" }, { 0x050d0416, "Staples 12416 7 port desktop hub" }, { 0x050d0551, "F6C550-AVR UPS" }, + { 0x050d065a, "F8T065BF Mini Bluetooth 4.0 Adapter" }, { 0x050d0706, "2-N-1 7-Port Hub (Lower half)" }, { 0x050d0802, "Nostromo n40 Gamepad" }, { 0x050d0803, "Nostromo 1745 GamePad" }, @@ -8029,6 +8127,7 @@ { 0x050d1203, "F5U120-PC Serial Port" }, { 0x050d2103, "F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU]" }, { 0x050d21f1, "N300 WLAN N Adapter [ISY]" }, + { 0x050d21f2, "RTL8192CU 802.11n WLAN Adapter [ISY IWL 4000]" }, { 0x050d258a, "F5U258 Host to Host cable" }, { 0x050d3101, "F1DF102U/F1DG102U Flip Hub" }, { 0x050d3201, "F1DF102U/F1DG102U Flip KVM" }, @@ -8082,6 +8181,7 @@ { 0x05251080, "NET1080 USB-USB Bridge" }, { 0x05251200, "SSDC Adapter II" }, { 0x05251265, "File-backed Storage Gadget" }, + { 0x05253424, "Lumidigm Venus fingerprint sensor" }, { 0x0525a0f0, "Cambridge Electronic Devices Power1401 mk 2" }, { 0x0525a140, "USB Clik! 40" }, { 0x0525a141, "(OME) PocketZip 40 MP3 Player Driver" }, @@ -8361,6 +8461,7 @@ { 0x054c035a, "Sony Walkman NWZ-S716F" }, { 0x054c035b, "Sony Walkman NWZ-A826/NWZ-A828/NWZ-A829" }, { 0x054c035c, "Sony Walkman NWZ-A726/NWZ-A728/NWZ-A768" }, + { 0x054c035f, "UP-DR200 Photo Printer" }, { 0x054c036e, "Sony Walkman NWZ-B135" }, { 0x054c0382, "Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)" }, { 0x054c0385, "Sony Walkman NWZ-E436F" }, @@ -8390,6 +8491,7 @@ { 0x054c04d1, "Sony Sony Tablet P1" }, { 0x054c052a, "Sony DSC-RX100" }, { 0x054c052b, "Sony DSC-RX1" }, + { 0x054c0541, "DSC-HX100V [Cybershot Digital Still Camera]" }, { 0x054c0543, "Sony DSC-HX100V" }, { 0x054c0574, "Sony SLT-A65V" }, { 0x054c059a, "Sony NWZ-B163F" }, @@ -8398,12 +8500,16 @@ { 0x054c05b3, "Sony Sony Tablet S" }, { 0x054c05b4, "Sony Sony Tablet S1" }, { 0x054c061f, "Sony DSC-HX200V" }, + { 0x054c0689, "Walkman NWZ-B173F" }, { 0x054c06bb, "WALKMAN NWZ-F805" }, + { 0x054c088c, "Portable Headphone Amplifier" }, { 0x054c1000, "Wireless Buzz! Receiver" }, { 0x054c1294, "Sony DCR-SR75" }, { 0x05500002, "InkJet Color Printer" }, { 0x05500004, "InkJet Color Printer" }, { 0x05500005, "InkJet Color Printer" }, + { 0x0550000b, "Workcentre 24" }, + { 0x0550014e, "CM215b Printer" }, { 0x05530001, "TerraCAM" }, { 0x05530002, "CPiA Webcam" }, { 0x05530100, "STV0672 Camera" }, @@ -8573,6 +8679,7 @@ { 0x056a0065, "Bamboo" }, { 0x056a0069, "Bamboo One" }, { 0x056a0081, "Graphire Wireless 6x8" }, + { 0x056a0084, "Wireless adapter for Bamboo tablets" }, { 0x056a0090, "TPC90" }, { 0x056a0093, "TPC93" }, { 0x056a009a, "TPC9A" }, @@ -8595,12 +8702,15 @@ { 0x056a00cc, "Cintiq 21UX (DTK-2100)" }, { 0x056a00d1, "Bamboo Pen & Touch (CTH-460-DE)" }, { 0x056a00d3, "Bamboo Fun (CTH-661)" }, + { 0x056a00d4, "Bamboo Pen (CTL-460)" }, { 0x056a00d6, "Bamboo Pen & Touch (CTH-460)" }, { 0x056a00db, "Bamboo Fun (CTH-661SE-NL)" }, { 0x056a00dd, "Bamboo Pen (CTL-470)" }, { 0x056a00de, "CTH-470 [Bamboo Fun Pen & Touch]" }, { 0x056a00f6, "Cintiq 24HD touch (DTH-2400) touchscreen" }, { 0x056a00f8, "Cintiq 24HD touch (DTH-2400) tablet" }, + { 0x056a0307, "Cintiq Companion Hybrid 13HD (DTH-A1300) tablet" }, + { 0x056a0309, "Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen" }, { 0x056a0400, "PenPartner 4x5" }, { 0x056a4850, "PenPartner 6x8" }, { 0x056c0006, "KwikLink Host-Host Connector" }, @@ -9016,8 +9126,11 @@ { 0x0586341a, "NWD-270N Wireless N-lite USB Adapter" }, { 0x0586341e, "NWD2105 802.11bgn Wireless Adapter [Ralink RT3070]" }, { 0x0586341f, "NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU]" }, + { 0x05863425, "NWD6505 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]" }, { 0x0586343e, "N220 802.11bgn Wireless Adapter" }, + { 0x058b0015, "Flash Loader utility" }, { 0x058b001c, "Flash Drive" }, + { 0x058b0041, "Flash Loader utility" }, { 0x058c0007, "Flash" }, { 0x058c0008, "LP130" }, { 0x058c000a, "LP530" }, @@ -9052,7 +9165,7 @@ { 0x058f6362, "Flash Card Reader/Writer" }, { 0x058f6364, "AU6477 Card Reader Controller" }, { 0x058f6366, "Multi Flash Reader" }, - { 0x058f6377, "Multimedia Card Reader" }, + { 0x058f6377, "AU6375 4-LUN card reader" }, { 0x058f6386, "Memory Card" }, { 0x058f6387, "Flash Drive" }, { 0x058f6390, "USB 2.0-IDE bridge" }, @@ -9076,8 +9189,10 @@ { 0x058f9472, "Keyboard Hub" }, { 0x058f9510, "ChunghwaTL USB02 Smartcard Reader" }, { 0x058f9520, "EMV Certified Smart Card Reader" }, + { 0x058f9540, "AU9540 Smartcard Reader" }, { 0x058f9720, "USB-Serial Adapter" }, { 0x058fa014, "Asus Integrated Webcam" }, + { 0x058fb002, "Acer Integrated Webcam" }, { 0x05900004, "Cable Modem" }, { 0x0590000b, "MR56SVS" }, { 0x05900028, "HJ-720IT / HEM-7080IT-E / HEM-790IT" }, @@ -9088,6 +9203,7 @@ { 0x05960001, "Touchscreen" }, { 0x05960002, "Touch Screen Controller" }, { 0x05960500, "PCT Multitouch HID Controller" }, + { 0x05960543, "DELL XPS touchscreen" }, { 0x059b0001, "Zip 100 (Type 1)" }, { 0x059b000b, "Zip 100 (Type 2)" }, { 0x059b0021, "Win98 Disk Controller" }, @@ -9107,6 +9223,7 @@ { 0x059b0060, "PCMCIA PocketZip Dock" }, { 0x059b0061, "Varo PocketZip 40 MP3 Player" }, { 0x059b006d, "HipZip MP3 Player" }, + { 0x059b0070, "eGo Portable Hard Drive" }, { 0x059b007c, "Ultra Max USB/1394" }, { 0x059b007d, "HTC42606 0G9AT00 [Iomega HDD]" }, { 0x059b007e, "Mini 256MB/512MB Flash Drive [IOM2D5]" }, @@ -9139,7 +9256,9 @@ { 0x059f0213, "PocketDrive USB2" }, { 0x059f0323, "LaCie d2 Drive USB2" }, { 0x059f0421, "Big Disk G465" }, + { 0x059f0525, "BigDisk Extreme 500" }, { 0x059f0641, "Mobile Hard Drive" }, + { 0x059f0829, "BigDisk Extreme+" }, { 0x059f100c, "Rugged Triple Interface Mobile Hard Drive" }, { 0x059f1010, "Desktop Hard Drive" }, { 0x059f1019, "Desktop Hard Drive" }, @@ -9148,6 +9267,7 @@ { 0x059f102a, "Rikiki Hard Drive" }, { 0x059f1049, "rikiki Harddrive" }, { 0x059f1052, "P'9220 Mobile Drive" }, + { 0x059f1064, "Rugged 16 and 32 GB" }, { 0x059fa601, "HardDrive" }, { 0x059fa602, "CD R/W" }, { 0x05a38388, "Marvell 88W8388 802.11a/b/g WLAN" }, @@ -9226,7 +9346,7 @@ { 0x05ac0223, "Internal Keyboard/Trackpad (ANSI)" }, { 0x05ac0224, "Internal Keyboard/Trackpad (ISO)" }, { 0x05ac0225, "Internal Keyboard/Trackpad (JIS)" }, - { 0x05ac0229, "Internal Keyboard/Trackpad (MacBook Pro) (ANSI)" }, + { 0x05ac0229, "Internal Keyboard/Trackpad (ANSI)" }, { 0x05ac022a, "Internal Keyboard/Trackpad (MacBook Pro) (ISO)" }, { 0x05ac022b, "Internal Keyboard/Trackpad (MacBook Pro) (JIS)" }, { 0x05ac0230, "Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI)" }, @@ -9253,7 +9373,7 @@ { 0x05ac0263, "Apple Internal Keyboard / Trackpad (MacBook Retina)" }, { 0x05ac0301, "USB Mouse [Mitsumi, M4848]" }, { 0x05ac0302, "Optical Mouse [Fujitsu]" }, - { 0x05ac0304, "Optical USB Mouse [Mitsumi]" }, + { 0x05ac0304, "Mighty Mouse [Mitsumi, M1152]" }, { 0x05ac0306, "Optical USB Mouse [Fujitsu]" }, { 0x05ac030a, "Internal Trackpad" }, { 0x05ac030b, "Internal Trackpad" }, @@ -9264,6 +9384,7 @@ { 0x05ac1002, "Extended Keyboard Hub [Mitsumi]" }, { 0x05ac1003, "Hub in Pro Keyboard [Mitsumi, A1048]" }, { 0x05ac1006, "Hub in Aluminum Keyboard" }, + { 0x05ac1008, "Mini DisplayPort to Dual-Link DVI Adapter" }, { 0x05ac1101, "Speakers" }, { 0x05ac1105, "Audio in LED Cinema Display" }, { 0x05ac1107, "Thunderbolt Display Audio" }, @@ -9295,6 +9416,7 @@ { 0x05ac1263, "iPod Nano 4.Gen" }, { 0x05ac1265, "iPod Nano 5.Gen" }, { 0x05ac1266, "iPod Nano 6.Gen" }, + { 0x05ac1267, "iPod Nano 7.Gen" }, { 0x05ac1281, "Apple Mobile Device [Recovery Mode]" }, { 0x05ac1290, "Apple iPhone" }, { 0x05ac1291, "Apple iPod Touch" }, @@ -9305,13 +9427,19 @@ { 0x05ac1297, "Apple iPhone 4" }, { 0x05ac1299, "Apple iPod Touch 3rd Gen" }, { 0x05ac129a, "Apple iPad" }, + { 0x05ac129c, "iPhone 4(CDMA)" }, { 0x05ac129e, "iPod Touch 4.Gen" }, { 0x05ac129f, "iPad 2" }, { 0x05ac12a0, "Apple iPhone 4S" }, { 0x05ac12a2, "iPad 2 (3G; 64GB)" }, + { 0x05ac12a3, "iPad 2 (CDMA)" }, + { 0x05ac12a4, "iPad 3 (wifi)" }, + { 0x05ac12a5, "iPad 3 (CDMA)" }, { 0x05ac12a6, "iPad 3 (3G, 16 GB)" }, + { 0x05ac12a8, "iPhone5/5C/5S" }, { 0x05ac12a9, "iPad 2" }, { 0x05ac12aa, "iPod Touch 5.Gen [A1421]" }, + { 0x05ac12ab, "iPad 4 (WiFi, 32GB)" }, { 0x05ac1300, "iPod Shuffle" }, { 0x05ac1301, "iPod Shuffle 2.Gen" }, { 0x05ac1302, "iPod Shuffle 3.Gen" }, @@ -9319,6 +9447,9 @@ { 0x05ac1401, "Modem" }, { 0x05ac1402, "Ethernet Adapter [A1277]" }, { 0x05ac1500, "SuperDrive [A1379]" }, + { 0x05ac8005, "OHCI Root Hub Simulation" }, + { 0x05ac8006, "EHCI Root Hub Simulation" }, + { 0x05ac8007, "XHCI Root Hub USB 2.0 Simulation" }, { 0x05ac8202, "HCF V.90 Data/Fax Modem" }, { 0x05ac8203, "Bluetooth HCI" }, { 0x05ac8204, "Built-in Bluetooth 2.0+EDR HCI" }, @@ -9351,6 +9482,7 @@ { 0x05ac850a, "FaceTime Camera" }, { 0x05ac8510, "FaceTime HD Camera (Built-in)" }, { 0x05ac911c, "Hub in A1082 [Cinema HD Display 23\"]" }, + { 0x05ac9127, "Hub in Thunderbolt Display" }, { 0x05ac912f, "Hub in 30\" Cinema Display" }, { 0x05ac9215, "Studio Display 15\"" }, { 0x05ac9217, "Studio Display 17\"" }, @@ -9398,6 +9530,7 @@ { 0x05c69201, "Gobi Wireless Modem (QDL mode)" }, { 0x05c69202, "Gobi Wireless Modem" }, { 0x05c69203, "Gobi Wireless Modem" }, + { 0x05c69205, "Gobi 2000" }, { 0x05c69211, "Acer Gobi Wireless Modem (QDL mode)" }, { 0x05c69212, "Acer Gobi Wireless Modem" }, { 0x05c69214, "Acer Gobi 2000 Wireless Modem (QDL mode)" }, @@ -9423,7 +9556,10 @@ { 0x05c80103, "FO13FF-65 PC-CAM" }, { 0x05c8021a, "HP Webcam" }, { 0x05c80318, "Webcam" }, + { 0x05c80361, "SunplusIT INC. HP Truevision HD Webcam" }, + { 0x05c8036e, "Webcam" }, { 0x05c80403, "Webcam" }, + { 0x05c8041b, "HP 2.0MP High Definition Webcam" }, { 0x05ca0101, "RDC-5300 Camera" }, { 0x05ca0110, "Ricoh Caplio R5" }, { 0x05ca0325, "Ricoh Caplio GX" }, @@ -9655,6 +9791,7 @@ { 0x05dc4d02, "MP3 Player" }, { 0x05dc4d12, "MP3 Player" }, { 0x05dc4d30, "MP3 Player" }, + { 0x05dca209, "JumpDrive S70" }, { 0x05dca300, "JumpDrive2" }, { 0x05dca400, "JumpDrive trade; Pro 40-501" }, { 0x05dca410, "JumpDrive 128MB/256MB" }, @@ -9675,12 +9812,15 @@ { 0x05dca560, "JumpDrive FireFly" }, { 0x05dca701, "JumpDrive FireFly" }, { 0x05dca731, "JumpDrive FireFly" }, + { 0x05dca768, "JumpDrive Retrax" }, { 0x05dca790, "JumpDrive 2GB" }, { 0x05dca811, "16GB Gizmo!" }, { 0x05dca813, "16gB flash thumb drive" }, + { 0x05dca815, "JumpDrive V10" }, { 0x05dcb002, "USB CF Reader" }, { 0x05dcb018, "Multi-Card Reader" }, { 0x05dcb047, "SDHC Reader [RW047-7000]" }, + { 0x05dcba02, "Workflow CFR1" }, { 0x05dcc753, "JumpDrive TwistTurn" }, { 0x05ddff31, "AWU-120" }, { 0x05ddff32, "FriendlyNET AeroLAN AL2011" }, @@ -9723,7 +9863,7 @@ { 0x05e30605, "USB 2.0 Hub" }, { 0x05e30606, "USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub" }, { 0x05e30607, "Logitech G110 Hub" }, - { 0x05e30608, "USB-2.0 4-Port HUB" }, + { 0x05e30608, "Hub" }, { 0x05e30610, "4-port hub" }, { 0x05e30660, "USB 2.0 Hub" }, { 0x05e30700, "SIIG US2256 CompactFlash Card Reader" }, @@ -9748,11 +9888,15 @@ { 0x05e30717, "All-in-1 Card Reader" }, { 0x05e30718, "IDE/SATA Adapter" }, { 0x05e30719, "SATA adapter" }, + { 0x05e30722, "SD/MMC card reader" }, { 0x05e30723, "GL827L SD/MMC/MS Flash Card Reader" }, { 0x05e30726, "SD Card Reader" }, { 0x05e30727, "microSD Reader/Writer" }, { 0x05e30731, "GL3310 SATA 3Gb/s Bridge Controller" }, + { 0x05e30732, "All-in-One Cardreader" }, { 0x05e30736, "microSD Reader/Writer" }, + { 0x05e30741, "microSD Card Reader" }, + { 0x05e30743, "SDXC and microSDXC CardReader" }, { 0x05e30760, "USB 2.0 Card Reader/Writer" }, { 0x05e30761, "Genesys Mass Storage Device" }, { 0x05e30780, "USBFS DFU Adapter" }, @@ -9781,6 +9925,7 @@ { 0x05f30007, "Kinesis Advantage PRO MPC/USB Keyboard" }, { 0x05f30081, "Kinesis Integrated Hub" }, { 0x05f300ff, "VEC Footpedal" }, + { 0x05f30203, "Y-mouse Keyboard & Mouse Adapter" }, { 0x05f3020b, "PS2 Adapter" }, { 0x05f30232, "X-Keys Switch Interface, Programming Mode" }, { 0x05f30261, "X-Keys Switch Interface, SPLAT Mode" }, @@ -9811,9 +9956,11 @@ { 0x05fe0011, "Browser Mouse" }, { 0x05fe0014, "Gamepad" }, { 0x05fe1010, "Optical Wireless" }, + { 0x05fe2001, "Microsoft Wireless Receiver 700" }, { 0x06010003, "Internet Security Co., Ltd. SecureKey" }, { 0x06021001, "ViCam Webcam" }, { 0x060300f1, "Keyboard" }, + { 0x060300f2, "Keyboard (Labtec Ultra Flat Keyboard)" }, { 0x06036871, "Mouse" }, { 0x0609031d, "eHome Infrared Receiver" }, { 0x06090322, "eHome Infrared Receiver" }, @@ -9825,6 +9972,7 @@ { 0x060b2101, "Keyboard" }, { 0x060b2231, "KSK-6001 UELX Keyboard" }, { 0x060b2270, "Gigabyte K8100 Aivia Gaming Keyboard" }, + { 0x060b5253, "Thermaltake MEKA G-Unit Gaming Keyboard" }, { 0x060b5811, "ACK-571U Wireless Keyboard" }, { 0x060b5903, "Japanese Keyboard - 595U" }, { 0x060b6001, "SolidTek USB 2p HUB" }, @@ -9905,6 +10053,7 @@ { 0x064ea103, "Acer/HP Integrated Webcam [CN0314]" }, { 0x064ea110, "HP Webcam" }, { 0x064ea114, "Lemote Webcam" }, + { 0x064ea116, "UVC 1.3MPixel WebCam" }, { 0x064ea136, "Asus Integrated Webcam [CN031B]" }, { 0x064ea219, "1.3M WebCam (notebook emachines E730, Acer sub-brand)" }, { 0x064ec107, "HP webcam [dv6-1190en]" }, @@ -10186,7 +10335,7 @@ { 0x068e00f2, "Flight Sim Pedals" }, { 0x068e00f3, "Fighterstick" }, { 0x068e00f4, "Combatstick" }, - { 0x068e00fa, "Flight Sim Pedals" }, + { 0x068e00fa, "Ch Throttle Quadrant" }, { 0x068e00ff, "Flight Sim Yoke" }, { 0x068e0500, "GameStick 3D" }, { 0x068e0501, "CH Pro Pedals" }, @@ -10202,6 +10351,7 @@ { 0x06981786, "1300ex Monitor" }, { 0x06982003, "CTX M730V built in Camera" }, { 0x06989999, "VLxxxx Monitor+Hub" }, + { 0x06990347, "AFG 3022B" }, { 0x069a0001, "VC010 Webcam [pwc]" }, { 0x069a0303, "Cable Modem" }, { 0x069a0311, "ADSL Router Remote NDIS Device" }, @@ -10359,6 +10509,7 @@ { 0x06be1005, "Dazzle DPVM! (1005)" }, { 0x06bed001, "P35U Camera Capture" }, { 0x06c20030, "PhidgetRFID" }, + { 0x06c20031, "RFID reader" }, { 0x06c20038, "4-Motor PhidgetServo v3.0" }, { 0x06c20039, "1-Motor PhidgetServo v3.0" }, { 0x06c2003a, "8-Motor PhidgetAvancedServo" }, @@ -10447,6 +10598,8 @@ { 0x06d30394, "CP9000D/DW Port" }, { 0x06d303a1, "CP9550D/DW Port" }, { 0x06d321ba, "FOMA D905i" }, + { 0x06d33b30, "CP-D70DW / CP-D707DW" }, + { 0x06d33b31, "CP-K60DW-S" }, { 0x06d54000, "Japanese Keyboard" }, { 0x06d60025, "Gamepad" }, { 0x06d60026, "Predator TH 400 Gamepad" }, @@ -10656,6 +10809,7 @@ { 0x072f0008, "ACR 80 Smart Card Reader" }, { 0x072f1000, "PLDT Drive" }, { 0x072f1001, "PLDT Drive" }, + { 0x072f2200, "ACR122U" }, { 0x072f8002, "AET63 BioTRUSTKey" }, { 0x072f8003, "ACR120" }, { 0x072f8103, "ACR120" }, @@ -10785,6 +10939,8 @@ { 0x07640005, "Cyber Power UPS" }, { 0x07640501, "CP1500 AVR UPS" }, { 0x07655001, "Huey PRO Colorimeter" }, + { 0x07655020, "i1 Display Pro" }, + { 0x07656003, "ColorMunki Smile" }, { 0x0765d094, "X-Rite DTP94 [Quato Silver Haze Pro]" }, { 0x0766001b, "Packard Bell Go" }, { 0x07660204, "TopSpeed Cyberlink Remote Control" }, @@ -10852,8 +11008,12 @@ { 0x0781540e, "Cruzer Contour Flash Drive" }, { 0x07815530, "Cruzer" }, { 0x07815567, "Cruzer Blade" }, + { 0x0781556c, "Ultra" }, + { 0x0781556d, "Memory Vault" }, { 0x07815571, "Cruzer Fit" }, + { 0x07815576, "Cruzer Facet" }, { 0x07815580, "SDCZ80 Flash Drive" }, + { 0x07815581, "Ultra" }, { 0x07815e10, "Encrypted" }, { 0x07816100, "Ultra II SD Plus 2GB" }, { 0x07817100, "Cruzer Mini" }, @@ -10998,7 +11158,7 @@ { 0x07aa0017, "FEther USB2-TX" }, { 0x07aa0018, "Wireless LAN USB-11 mini 2" }, { 0x07aa001a, "ULUSB-11 Key" }, - { 0x07aa001c, "CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]" }, + { 0x07aa001c, "CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]" }, { 0x07aa002e, "CG-WLUSB2GPX [Ralink RT2571W]" }, { 0x07aa002f, "CG-WLUSB2GNL" }, { 0x07aa0031, "CG-WLUSB2GS 802.11bg [Atheros AR5523]" }, @@ -11088,6 +11248,7 @@ { 0x07b40114, "Olympus IR-300" }, { 0x07b40116, "Olympus X925" }, { 0x07b40118, "Olympus E-410" }, + { 0x07b40125, "Tough TG-1 Camera" }, { 0x07b4012f, "Olympus E-PL5" }, { 0x07b40184, "P-S100 port" }, { 0x07b40202, "Foot Switch RS-26" }, @@ -11188,6 +11349,7 @@ { 0x07c4a200, "DF-UT-06 Hama MMC/SD Reader" }, { 0x07c4a400, "CompactFlash & Microdrive Reader" }, { 0x07c4a600, "Card Reader" }, + { 0x07c4a604, "12-in-1 Card Reader" }, { 0x07c4ad01, "Mass Storage Device" }, { 0x07c4ae01, "Mass Storage Device" }, { 0x07c4af01, "Mass Storage Device" }, @@ -11198,6 +11360,7 @@ { 0x07c4b00a, "USB to CF+SD Drive(LC1)" }, { 0x07c4b00b, "USB to Memory Stick(LC1)" }, { 0x07c4c010, "Kingston FCR-HS2/ATA Card Reader" }, + { 0x07c50500, "Cash Drawer" }, { 0x07c60002, "Bodega Wireless Access Point" }, { 0x07c60003, "Bodega Wireless Network Adapter" }, { 0x07c80202, "MN128-SOHO PAL" }, @@ -11383,6 +11546,7 @@ { 0x08010002, "Mini Swipe Reader" }, { 0x08010003, "Magstripe Insert Reader" }, { 0x08031300, "V92 Faxmodem" }, + { 0x08033095, "V.92 56K Mini External Modem Model 3095" }, { 0x08034310, "4410a Wireless-G Adapter [Intersil ISL3887]" }, { 0x08034410, "4410b Wireless-G Adapter [ZyDAS ZD1211B]" }, { 0x08035241, "Cable Modem" }, @@ -11543,10 +11707,15 @@ { 0x08469012, "WNDA4100 802.11abgn 3x3:3 [Ralink RT3573]" }, { 0x08469018, "WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280]" }, { 0x08469020, "WNA3100(v1) Wireless-N 300 [Broadcom BCM43231]" }, + { 0x08469021, "WNA3100M(v1) Wireless-N 300 [Realtek RTL8192CU]" }, { 0x08469030, "WNA1100 Wireless-N 150 [Atheros AR9271]" }, { 0x08469040, "WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]" }, { 0x08469041, "WNA1000M 802.11bgn [Realtek RTL8188CUS]" }, + { 0x08469042, "On Networks N150MA 802.11bgn [Realtek RTL8188CUS]" }, + { 0x08469050, "A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" }, + { 0x08469052, "A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]" }, { 0x0846a001, "PA101 10 Mbps HPNA Home Phoneline RJ-1" }, + { 0x0846f001, "On Networks N300MA 802.11bgn [Realtek RTL8192CU]" }, { 0x084d0001, "Jenoptik JD800i" }, { 0x084d0003, "S-Cam F5/D-Link DSC-350 Digital Camera" }, { 0x084d0011, "Argus DC3500 Digital Camera" }, @@ -11584,7 +11753,10 @@ { 0x085a8021, "1 port to Serial" }, { 0x085a8023, "2 port to Serial" }, { 0x085a8027, "PGSDB9 Serial Port" }, - { 0x085c0200, "Monitor Spyder" }, + { 0x085c0100, "Spyder 1" }, + { 0x085c0200, "Spyder 2" }, + { 0x085c0300, "Spyder 3" }, + { 0x085c0400, "Spyder 4" }, { 0x08644100, "MA101 802.11b Adapter" }, { 0x08644102, "MA101 802.11b Adapter" }, { 0x08679812, "ECON Data acquisition unit" }, @@ -11641,6 +11813,7 @@ { 0x088c2030, "Ticket Printer TTP 2030" }, { 0x088e5036, "Portable secure storage for software licenses" }, { 0x08920101, "Smartdio Reader/Writer" }, + { 0x08940010, "Remote NDIS Network Device" }, { 0x08970002, "Power Debug/Power Debug II" }, { 0x08a60051, "B-SV4" }, { 0x08a90005, "USBee ZX" }, @@ -11649,6 +11822,9 @@ { 0x08a90013, "USBee AX-Plus" }, { 0x08a90014, "USBee AX-Pro" }, { 0x08a90015, "USBee DX" }, + { 0x08b00006, "814 Sample Processor" }, + { 0x08b00015, "857 Titrando" }, + { 0x08b0001a, "852 Titrando" }, { 0x08b70001, "Playstation adapter" }, { 0x08b801f4, "USBSIMM1" }, { 0x08bb2702, "Speakers" }, @@ -11885,6 +12061,8 @@ { 0x08ffffff, "Sensor (Emulator)" }, { 0x09010001, "Hard Drive Adapter (TPP)" }, { 0x09010002, "SigmaDrive Adapter (TPP)" }, + { 0x090801f4, "SIMATIC NET CP 5711" }, + { 0x090801fe, "SIMATIC NET PC Adapter A2" }, { 0x09082701, "ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA" }, { 0x090a1001, "T33520 Flash Card Controller" }, { 0x090a1100, "Comotron C3310 MP3 player" }, @@ -11954,15 +12132,19 @@ { 0x091e2380, "Oregon series" }, { 0x091e23cc, "n\\xc3\\xbcvi 1350" }, { 0x091e2459, "GPSmap 62/78 series" }, + { 0x091e2491, "Edge 800" }, { 0x091e2519, "eTrex 30" }, { 0x091e2535, "Edge 800" }, + { 0x091e253c, "GPSmap 62sc" }, { 0x091e255b, "Nuvi 2505LM" }, { 0x09207500, "Network Interface" }, { 0x09211001, "GoCOM232 Serial" }, { 0x09220007, "LabelWriter 330" }, { 0x09220009, "LabelWriter 310" }, + { 0x09220019, "LabelWriter 400" }, { 0x0922001a, "LabelWriter 400 Turbo" }, { 0x09220020, "LabelWriter 450" }, + { 0x09221001, "LabelManager PnP" }, { 0x0923010f, "SIIG MobileCam" }, { 0x092423dd, "DocuPrint M760 (X760_USB)" }, { 0x09243ce8, "Phaser 3428 Printer" }, @@ -11974,6 +12156,7 @@ { 0x0924ffef, "WorkCenter M15" }, { 0x0924fffb, "DocuPrint M750 (X750_USB)" }, { 0x09250005, "Gamtec.,Ltd SmartJoy PLUS Adapter" }, + { 0x092503e8, "Wii Classic Controller Adapter" }, { 0x09253881, "Saleae Logic" }, { 0x09258101, "Phidgets, Inc., 1-Motor PhidgetServo v2.0" }, { 0x09258104, "Phidgets, Inc., 4-Motor PhidgetServo v2.0" }, @@ -11993,6 +12176,7 @@ { 0x09300019, "Toshiba Gigabeat T" }, { 0x0930001a, "Toshiba Gigabeat MEU201" }, { 0x0930001d, "Toshiba Gigabeat MET401" }, + { 0x09300200, "Integrated Bluetooth (Taiyo Yuden)" }, { 0x09300301, "PCX1100U Cable Modem (WDM)" }, { 0x09300302, "PCX2000 Cable Modem (WDM)" }, { 0x09300305, "Cable Modem PCX3000" }, @@ -12016,6 +12200,7 @@ { 0x0930070b, "Pocket PC e800 Series" }, { 0x09300963, "Toshiba Excite AT300" }, { 0x09300a07, "WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572]" }, + { 0x09300a13, "AX88179 Gigabit Ethernet [Toshiba]" }, { 0x09300b05, "PX1220E-1G25 External hard drive" }, { 0x09300b09, "PX1396E-3T01 External hard drive" }, { 0x09300b1a, "STOR.E ALU 2S" }, @@ -12080,7 +12265,7 @@ { 0x0936000c, "Rhythmedics 6 BioData Integrator" }, { 0x09360030, "Composite Device, Mass Storage Device (Flash Drive) amd HID" }, { 0x0936003c, "Rhythmedics HID Bootloader" }, - { 0x09390b15, "Toshiba Stor.E Alu 2 1TB (PX1710E-1HJ0)" }, + { 0x09390b15, "Toshiba Stor.E Alu 2" }, { 0x093a0007, "CMOS 100K-R Rev. 1.90" }, { 0x093a010e, "Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A" }, { 0x093a010f, "Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55" }, @@ -12100,6 +12285,7 @@ { 0x093a260e, "PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350" }, { 0x093a260f, "PAC7311 SnakeCam" }, { 0x093a2621, "PAC731x Trust Webcam" }, + { 0x093a2622, "Webcam Genius" }, { 0x093a2624, "Webcam" }, { 0x093b0010, "Storage Adapter" }, { 0x093b0011, "PlexWriter 40/12/40U" }, @@ -12150,6 +12336,7 @@ { 0x09511643, "DataTraveler G3" }, { 0x09511653, "Data Traveler 100 G2 8 GiB" }, { 0x09511656, "DataTraveler Ultimate G2" }, + { 0x09511665, "Digital DataTraveler SE9 64GB" }, { 0x09511689, "DataTraveler SE9" }, { 0x0951168a, "DataTraveler Micro" }, { 0x0951168c, "DT Elite 3.0" }, @@ -12161,6 +12348,7 @@ { 0x0955b401, "SHIELD" }, { 0x09570200, "E-Video DC-350 Camera" }, { 0x09570202, "E-Video DC-350 Camera" }, + { 0x09570407, "33220A Waveform Generator" }, { 0x09570518, "82357B GPIB Interface" }, { 0x09570a07, "34411A Multimeter" }, { 0x09571745, "Test and Measurement Device (IVI)" }, @@ -12172,9 +12360,11 @@ { 0x096e0120, "Microcosm Ltd Dinkey" }, { 0x096e0802, "ePass2000 (G&D STARCOS SPK 2.4)" }, { 0x096e0807, "ePass2003" }, + { 0x09712000, "i1 Pro" }, + { 0x09712001, "i1 Monitor" }, { 0x09712003, "Eye-One display" }, { 0x09712005, "Huey" }, - { 0x09712007, "ColorMunki" }, + { 0x09712007, "ColorMunki Photo" }, { 0x09730001, "e-gate Smart Card" }, { 0x09790222, "Keychain Display" }, { 0x09790224, "JL2005A Toy Camera" }, @@ -12190,6 +12380,7 @@ { 0x09930002, "eBook" }, { 0x099a0638, "Sanwa Supply Inc. Small Keyboard" }, { 0x099a610c, "EL-610 Super Mini Electron luminescent Keyboard" }, + { 0x099a713a, "WK-713 Multimedia Keyboard" }, { 0x099a7160, "Hyper Slim Keyboard" }, { 0x09a68001, "Mass Storage Device" }, { 0x09aa1000, "Prism GT 802.11b/g Adapter" }, @@ -12224,7 +12415,8 @@ { 0x09c40011, "ACT-IR2000U IrDA Dongle" }, { 0x09cc0404, "BAFO USB-ATA/ATAPI Bridge Controller" }, { 0x09cd2001, "Psion WaveFinder DAB radio receiver" }, - { 0x09d30001, "ISDN TA" }, + { 0x09d30001, "ISDN TA / Light Rider 128K" }, + { 0x09d3000b, "Bluetooth Adapter class 1 [BlueLight]" }, { 0x09d70100, "NovAtel FlexPack GPS receiver" }, { 0x09da0006, "Optical Mouse WOP-35 / Trust 450L Optical Mouse" }, { 0x09da000a, "Optical Mouse Opto 510D" }, @@ -12269,6 +12461,7 @@ { 0x0a0700c8, "ADU200 Relay I/O Interface" }, { 0x0a0700d0, "ADU208 Relay I/O Interface" }, { 0x0a0700da, "ADU218 Solid-State Relay I/O Interface" }, + { 0x0a0d2514, "CTS-1000 Internal Hub" }, { 0x0a120001, "Bluetooth Dongle (HCI mode)" }, { 0x0a120002, "Frontline Test Equipment Bluetooth Device" }, { 0x0a120003, "Nanosira" }, @@ -12441,6 +12634,7 @@ { 0x0a5c6300, "Pirelli Remote NDIS Device" }, { 0x0a5cbd11, "TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320]" }, { 0x0a5cbd13, "BCM4323 802.11abgn Wireless Adapter" }, + { 0x0a5cbd16, "BCM4319 802.11bgn Wireless Adapter" }, { 0x0a5cbd17, "BCM43236 802.11abgn Wireless Adapter" }, { 0x0a5cd11b, "Eminent EM4045 [Broadcom 4320 USB]" }, { 0x0a5f0009, "LP2844 Printer" }, @@ -12575,6 +12769,7 @@ { 0x0ac8c326, "Namuga 1.3M Webcam" }, { 0x0ac8c33f, "Webcam" }, { 0x0ac8c429, "Lenovo ThinkCentre Web Camera" }, + { 0x0ac8c42d, "Lenovo IdeaCentre Web Camera" }, { 0x0ac90000, "Backpack CD-ReWriter" }, { 0x0ac90001, "BACKPACK 2 Cable" }, { 0x0ac90010, "BACKPACK" }, @@ -12587,6 +12782,7 @@ { 0x0acd0401, "Spectrum III Hybrid Smartcard Reader" }, { 0x0acd0630, "Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC" }, { 0x0acd0810, "SecurePIN (IDPA-506100Y) PIN Pad" }, + { 0x0acd2030, "ValueMag Magnetic Stripe Reader" }, { 0x0ace1201, "ZD1201 802.11b" }, { 0x0ace1211, "ZD1211 802.11g" }, { 0x0ace1215, "ZD1211B 802.11g" }, @@ -12636,6 +12832,8 @@ { 0x0af70101, "Digital TV USB Receiver (DVB-S/T/C / ATSC)" }, { 0x0af90010, "USB SightCam 100" }, { 0x0af90011, "Micro Innovations IC50C Webcam" }, + { 0x0afa07d2, "Controller Board for Projected Capacitive Touch Screen DUS3000" }, + { 0x0b050001, "MeMO Pad HD 7 (CD-ROM mode)" }, { 0x0b051101, "Mass Storage (UISDMC4S)" }, { 0x0b051706, "WL-167G v1 802.11g Adapter [Ralink RT2571]" }, { 0x0b051707, "WL-167G v1 802.11g Adapter [Ralink RT2571]" }, @@ -12671,12 +12869,15 @@ { 0x0b051779, "My Cinema U3100 Mini Plus [AF9035A]" }, { 0x0b051784, "USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072]" }, { 0x0b051786, "USB-N10 802.11n Network Adapter [Realtek RTL8188SU]" }, + { 0x0b051788, "BT-270 Bluetooth Adapter" }, { 0x0b051791, "WL-167G v3 802.11n Adapter [Realtek RTL8188SU]" }, { 0x0b05179d, "USB-N53 802.11abgn Network Adapter [Ralink RT3572]" }, { 0x0b05179e, "Eee Note EA800 (network mode)" }, { 0x0b05179f, "Eee Note EA800 (tablet mode)" }, + { 0x0b0517a0, "Xonar U3 sound card" }, { 0x0b0517a1, "Eee Note EA800 (mass storage mode)" }, { 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" }, + { 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" }, { 0x0b054c80, "Asus TF300 Transformer" }, { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" }, { 0x0b054c90, "Asus TF700 Transformer" }, @@ -12688,6 +12889,8 @@ { 0x0b054e01, "Asus TF101 Eeepad Slider" }, { 0x0b054e0f, "Asus TF101 Eeepad Transformer" }, { 0x0b054e1f, "Asus TF101 Eeepad Transformer (debug mode)" }, + { 0x0b055410, "MeMO Pad HD 7 (MTP mode)" }, + { 0x0b055412, "MeMO Pad HD 7 (PTP mode)" }, { 0x0b056101, "Cable Modem" }, { 0x0b05620a, "Remote NDIS Device" }, { 0x0b05b700, "Broadcom Bluetooth 2.1" }, @@ -12699,7 +12902,9 @@ { 0x0b0c0050, "Argos Mini II Smart Card Reader (CCID)" }, { 0x0b0d0000, "CenturyCD" }, { 0x0b0e0420, "Jabra SPEAK 510" }, + { 0x0b0e094d, "GN Netcom / Jabra REVO Wireless" }, { 0x0b0e1022, "Jabra PRO 9450, Type 9400BS (DECT Headset)" }, + { 0x0b0e2007, "GN 2000 Stereo Corded Headset" }, { 0x0b0e620c, "Jabra BT620s" }, { 0x0b0e9330, "Jabra GN9330 Headset" }, { 0x0b1e8007, "Blackhawk USB560-BP JTAG Emulator" }, @@ -12707,6 +12912,7 @@ { 0x0b28100c, "Kenwood Media Keg HD10GB7 Sport Player" }, { 0x0b300006, "SM Media-Shuttle Card Reader" }, { 0x0b330020, "ShuttleXpress" }, + { 0x0b330700, "RollerMouse Pro" }, { 0x0b380003, "Keyboard" }, { 0x0b380010, "107-Key Keyboard" }, { 0x0b390001, "Composite USB PS2 Converter" }, @@ -12785,6 +12991,7 @@ { 0x0b8c00c3, "Sympodium ID350" }, { 0x0b951720, "10/100 Ethernet" }, { 0x0b951780, "AX88178" }, + { 0x0b951790, "AX88179 Gigabit Ethernet" }, { 0x0b957720, "AX88772" }, { 0x0b95772a, "AX88772A Fast Ethernet" }, { 0x0b95772b, "AX88772B" }, @@ -12810,6 +13017,7 @@ { 0x0baf0118, "U5 802.11g Adapter" }, { 0x0baf011b, "Wireless MAXg Adapter [Broadcom 4320]" }, { 0x0baf0121, "USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B]" }, + { 0x0baf0303, "USR5637 56K Faxmodem" }, { 0x0baf6112, "FaxModem Model 5633" }, { 0x0bb00100, "Sound Vision Stream" }, { 0x0bb05007, "3340z/Rollei DC3100" }, @@ -12987,6 +13195,7 @@ { 0x0bb40bce, "Vario MDA" }, { 0x0bb40c01, "Dream / ADP1 / G1 / Magic / Tattoo" }, { 0x0bb40c02, "HTC Zopo ZP100 (ID1)" }, + { 0x0bb40c03, "Android Phone [Fairphone First Edition (FP1)]" }, { 0x0bb40c13, "Diamond" }, { 0x0bb40c1f, "Sony Ericsson XPERIA X1" }, { 0x0bb40c5f, "Snap" }, @@ -13002,6 +13211,8 @@ { 0x0bb40ca2, "Desire HD (debug mode)" }, { 0x0bb40ca5, "Android Phone [Evo Shift 4G]" }, { 0x0bb40ca8, "HTC EVO 4G LTE (second ID)" }, + { 0x0bb40cae, "T-Mobile MyTouch 4G Slide [Doubleshot]" }, + { 0x0bb40dea, "M7_UL [HTC One]" }, { 0x0bb40ff8, "Desire HD (Tethering Mode)" }, { 0x0bb40ff9, "Desire / Desire HD / Hero / Thunderbolt (Charge Mode)" }, { 0x0bb40ffe, "Desire HD (modem mode)" }, @@ -13016,10 +13227,15 @@ { 0x0bc22300, "Expansion Portable" }, { 0x0bc22320, "USB 3.0 bridge [Portable Expansion Drive]" }, { 0x0bc23008, "FreeAgent Desk 1TB" }, + { 0x0bc23101, "FreeAgent XTreme 640GB" }, + { 0x0bc23312, "SRD00F2 [Expansion Desktop Drive 2TB]" }, { 0x0bc23320, "SRD00F2 [Expansion Desktop Drive]" }, { 0x0bc23332, "Expansion" }, + { 0x0bc25020, "FreeAgent GoFlex" }, { 0x0bc25021, "FreeAgent GoFlex USB 2.0" }, + { 0x0bc25030, "FreeAgent GoFlex Upgrade Cable STAE104" }, { 0x0bc25031, "FreeAgent GoFlex USB 3.0" }, + { 0x0bc25070, "FreeAgent GoFlex Desk" }, { 0x0bc250a1, "FreeAgent GoFlex Desk" }, { 0x0bc250a5, "FreeAgent GoFlex Desk USB 3.0" }, { 0x0bc25121, "FreeAgent GoFlex" }, @@ -13027,6 +13243,7 @@ { 0x0bc2a003, "Backup Plus" }, { 0x0bc2a0a1, "Backup Plus Desktop" }, { 0x0bc2a0a4, "Backup Plus Desktop Drive" }, + { 0x0bc2ab00, "Slim Portable Drive" }, { 0x0bc30001, "UMTS-TDD (TD-CDMA) modem" }, { 0x0bc70001, "ActiveHome (ACPI-compliant)" }, { 0x0bc70002, "Firecracker Interface (ACPI-compliant)" }, @@ -13074,6 +13291,8 @@ { 0x0bda0178, "Mass Storage Device" }, { 0x0bda0184, "RTS5182 Card Reader" }, { 0x0bda0186, "Card Reader" }, + { 0x0bda0301, "multicard reader" }, + { 0x0bda1724, "RTL8723AU 802.11n WLAN Adapter" }, { 0x0bda2831, "RTL2831U DVB-T" }, { 0x0bda2832, "RTL2832U DVB-T" }, { 0x0bda2838, "RTL2838 DVB-T" }, @@ -13093,6 +13312,7 @@ { 0x0bda8197, "RTL8187B Wireless Adapter" }, { 0x0bda8198, "RTL8187B Wireless Adapter" }, { 0x0bda8199, "RTL8187SU 802.11g WLAN Adapter" }, + { 0x0bda8812, "RTL8812AU 802.11a/b/g/n/ac WLAN Adapter" }, { 0x0bdb1000, "BV Bluetooth Device" }, { 0x0bdb1002, "Bluetooth Device 1.2" }, { 0x0bdb1049, "C3607w Mobile Broadband Module" }, @@ -13165,7 +13385,7 @@ { 0x0c240012, "Bluetooth Device(BC04-External)" }, { 0x0c240018, "Bluetooth Device(BC04-External)" }, { 0x0c240019, "Bluetooth Device" }, - { 0x0c240021, "Bluetooth Device" }, + { 0x0c240021, "Bluetooth Device (V2.1+EDR)" }, { 0x0c240c24, "Bluetooth Device(SAMPLE)" }, { 0x0c24ffff, "Bluetooth module with BlueCore in DFU mode" }, { 0x0c250310, "Scream Cam" }, @@ -13184,6 +13404,7 @@ { 0x0c4403a2, "iDEN Smartphone" }, { 0x0c4441d9, "i1 phone" }, { 0x0c450011, "EBUDDY" }, + { 0x0c450520, "MaxTrack Wireless Mouse" }, { 0x0c451018, "Compact Flash storage memory card reader" }, { 0x0c451020, "Mass Storage Reader" }, { 0x0c451028, "Mass Storage Reader" }, @@ -13302,7 +13523,9 @@ { 0x0c4562be, "PC Camera with Microphone (SN9C202 + OV7663)" }, { 0x0c4562c0, "Sonix USB 2.0 Camera" }, { 0x0c4562e0, "MSI Starcam Racer" }, + { 0x0c456300, "PC Microscope camera" }, { 0x0c456310, "Sonix USB 2.0 Camera" }, + { 0x0c456340, "Camera" }, { 0x0c456341, "Defender G-Lens 2577 HD720p Camera" }, { 0x0c4563e0, "Sonix Integrated Webcam" }, { 0x0c4563f1, "Integrated Webcam" }, @@ -13312,9 +13535,12 @@ { 0x0c456417, "Integrated Webcam" }, { 0x0c456419, "Integrated Webcam" }, { 0x0c45641d, "1.3 MPixel Integrated Webcam" }, + { 0x0c45643f, "Dell Integrated HD Webcam" }, + { 0x0c45644d, "1.3 MPixel Integrated Webcam" }, { 0x0c456480, "Sonix 1.3 MP Laptop Integrated Webcam" }, { 0x0c45648b, "Integrated Webcam" }, { 0x0c4564bd, "Sony Visual Communication Camera" }, + { 0x0c457401, "TEMPer Temperature Sensor" }, { 0x0c457402, "TEMPerHUM Temperature & Humidity Sensor" }, { 0x0c457403, "Foot Switch" }, { 0x0c458000, "DC31VC" }, @@ -13509,6 +13735,7 @@ { 0x0cf320ff, "AR7010 (no firmware)" }, { 0x0cf33000, "AR3011 Bluetooth (no firmware)" }, { 0x0cf33002, "AR3011 Bluetooth" }, + { 0x0cf33004, "AR3012 Bluetooth 4.0" }, { 0x0cf33005, "AR3011 Bluetooth" }, { 0x0cf33008, "Bluetooth (AR3011)" }, { 0x0cf37015, "TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287]" }, @@ -13535,7 +13762,11 @@ { 0x0d160105, "Photo Printer 64xPS" }, { 0x0d160200, "Photo Printer 64xDL" }, { 0x0d280204, "LPC1768" }, + { 0x0d3a0206, "Series 3xxx Cash Drawer" }, + { 0x0d3a0207, "Series 3xxx Cash Drawer" }, + { 0x0d3a0500, "Magnetic Stripe Reader" }, { 0x0d3d0001, "HID Keyboard" }, + { 0x0d3d0040, "PS/2 Adapter" }, { 0x0d462012, "KAAN Standard Plus (Smartcard reader)" }, { 0x0d463003, "mIDentity Light / KAAN SIM III" }, { 0x0d464000, "mIDentity (mass storage)" }, @@ -13554,6 +13785,7 @@ { 0x0d497000, "OneTouch" }, { 0x0d497010, "OneTouch" }, { 0x0d497100, "OneTouch II 300GB External Hard Disk" }, + { 0x0d497310, "OneTouch 4" }, { 0x0d497410, "Mobile Hard Disk Drive (1TB)" }, { 0x0d497450, "Basics Portable USB Device" }, { 0x0d4e047a, "WLAN Card" }, @@ -13587,6 +13819,7 @@ { 0x0d642208, "Mass Storage" }, { 0x0d643105, "Dual Mode Digital Camera Disk" }, { 0x0d643108, "Digicam Mass Storage Device" }, + { 0x0d7a0001, "CrypToken" }, { 0x0d7d0100, "PS1001/1011/1006/1026 Flash Disk" }, { 0x0d7d0110, "Gigabyte FlexDrive" }, { 0x0d7d0120, "Disk Pro 64MB" }, @@ -13728,6 +13961,7 @@ { 0x0db0b970, "Bluetooth EDR Device" }, { 0x0db0b97a, "Bluetooth EDR Device" }, { 0x0db70002, "Goldpfeil P-LAN" }, + { 0x0dba3000, "Mbox 2" }, { 0x0dbc0003, "AND Serial Cable [AND Smart Cable]" }, { 0x0dbf0002, "SmartDongle Security Key" }, { 0x0dbf0200, "HDD Storage Solution" }, @@ -13820,6 +14054,7 @@ { 0x0df6005d, "WLA-2000 v1.001 WLAN [RTL8191SU]" }, { 0x0df60060, "WLA-4000 802.11bgn [Ralink RT3072]" }, { 0x0df60062, "WLA-5000 802.11abgn [Ralink RT3572]" }, + { 0x0df60072, "AX88179 Gigabit Ethernet [Sitecom]" }, { 0x0df6061c, "LN-028 Network USB 2.0 Adapter" }, { 0x0df621f4, "44 St Bluetooth Device" }, { 0x0df62200, "Sitecom bluetooth2.0 class 2 dongle CN-512" }, @@ -13979,6 +14214,7 @@ { 0x0e791539, "Archos 101 G9 Turbo" }, { 0x0e791568, "Archos 70it2 (mode 1)" }, { 0x0e791569, "Archos 70it2 (mode 2)" }, + { 0x0e793001, "40 Titanium" }, { 0x0e7e0001, "Yopy 3000 PDA" }, { 0x0e7e1001, "YP3X00 PDA" }, { 0x0e8d0003, "MT6227 phone" }, @@ -13986,9 +14222,11 @@ { 0x0e8d0023, "S103" }, { 0x0e8d1806, "Samsung SE-208AB Slim Portable DVD Writer" }, { 0x0e8d1836, "Samsung SE-S084 Super WriteMaster Slim External DVD writer" }, + { 0x0e8d2000, "MT65xx Preloader" }, { 0x0e8d3329, "Qstarz BT-Q1000XT" }, + { 0x0e8d763e, "MT7630e Bluetooth Adapter" }, { 0x0e8f0003, "MaxFire Blaze2" }, - { 0x0e8f0012, "USB Wireless 2.4GHz Gamepad" }, + { 0x0e8f0012, "Joystick/Gamepad" }, { 0x0e8f0016, "4 port USB 1.1 hub UH-174" }, { 0x0e8f0020, "USB to PS/2 Adapter" }, { 0x0e8f0021, "Multimedia Keyboard Controller" }, @@ -14009,7 +14247,9 @@ { 0x0eb16666, "WinFast WalkieTV TV Loader" }, { 0x0eb16668, "WinFast WalkieTV TV Loader" }, { 0x0eb17007, "WinFast WalkieTV WDM Capture" }, + { 0x0eb82200, "Ariva Scale" }, { 0x0eb8f000, "PS60 Scale" }, + { 0x0ebb0002, "FT-IR Spectrometer" }, { 0x0ec71008, "So., Show 301 Digital Camera" }, { 0x0ecd1400, "CD\\\\RW 40X" }, { 0x0ecda100, "LDW-411SX DVD/CD Rewritable Drive" }, @@ -14024,6 +14264,8 @@ { 0x0eee8810, "Mass Storage Drive" }, { 0x0eef0001, "eGalax TouchScreen" }, { 0x0eef0002, "Touchscreen Controller(Professional)" }, + { 0x0eef7200, "Touchscreen Controller" }, + { 0x0eefa802, "eGalaxTouch EXC7920" }, { 0x0ef52202, "Flash Disk" }, { 0x0ef52366, "Flash Disk" }, { 0x0f030001, "Alpha 1200Sx" }, @@ -14042,6 +14284,7 @@ { 0x0f112020, "Network Analyser" }, { 0x0f112030, "Converter Control Unit" }, { 0x0f112040, "Machine Test System" }, + { 0x0f140012, "Vital'Act 3S" }, { 0x0f180002, "CCD" }, { 0x0f180006, "Focuser" }, { 0x0f180007, "Filter Wheel" }, @@ -14053,6 +14296,7 @@ { 0x0f300110, "Dual Analog Rumble Pad" }, { 0x0f300111, "Colour Rumble Pad" }, { 0x0f300208, "Xbox & PC Gamepad" }, + { 0x0f390876, "Keyboard [87 Francium Pro]" }, { 0x0f3d0112, "CDMA 1xEVDO PC Card, PC 5220" }, { 0x0f44ef11, "Patriot (firmware not loaded)" }, { 0x0f44ef12, "Patriot" }, @@ -14063,6 +14307,7 @@ { 0x0f5d9455, "Compact Drive" }, { 0x0f621001, "Targus Mini Trackball Optical Mouse" }, { 0x0f630010, "Leapster Explorer" }, + { 0x0f630022, "Leap Reader" }, { 0x0f630500, "Fly Fusion" }, { 0x0f630600, "Leap Port Turbo" }, { 0x0f630700, "POGO" }, @@ -14100,7 +14345,7 @@ { 0x0fca0006, "Blackberry Pearl" }, { 0x0fca0008, "Blackberry Pearl" }, { 0x0fca8001, "Blackberry Handheld" }, - { 0x0fca8004, "Blackberry Handheld" }, + { 0x0fca8004, "Blackberry" }, { 0x0fca8007, "RIM BlackBerry Storm/9650" }, { 0x0fca8010, "Blackberry Playbook (Connect to Windows mode)" }, { 0x0fca8011, "Blackberry Playbook (Connect to Mac mode)" }, @@ -14255,10 +14500,12 @@ { 0x0fcee161, "Xperia Ray" }, { 0x0fcee166, "Xperia Mini Pro" }, { 0x0fcee167, "XPERIA mini" }, + { 0x0fcef0fa, "Liveview micro display MN800 in DFU mode" }, { 0x0fcf1003, "ANT Development Board" }, - { 0x0fcf1004, "ANT2USB" }, + { 0x0fcf1004, "ANTUSB Stick" }, { 0x0fcf1006, "ANT Development Board" }, - { 0x0fcf1008, "Mini stick Suunto" }, + { 0x0fcf1008, "ANTUSB2 Stick" }, + { 0x0fcf1009, "ANTUSB-m Stick" }, { 0x0fd20001, "RDS 6000" }, { 0x0fd90011, "EyeTV Diversity" }, { 0x0fd90018, "EyeTV Hybrid" }, @@ -14269,6 +14516,7 @@ { 0x0fd90033, "Video Capture" }, { 0x0fd90037, "Video Capture v2" }, { 0x0fda0100, "quanton flight control" }, + { 0x0fdeca01, "WMRS200 weather station" }, { 0x0fe00100, "Bluetooth Mouse" }, { 0x0fe00101, "Bluetooth IMU" }, { 0x0fe00200, "Bluetooth Keypad" }, @@ -14283,6 +14531,7 @@ { 0x0fe9db78, "FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized)" }, { 0x0ffc0021, "Nord Stage 2" }, { 0x0ffdff00, "OEM" }, + { 0x1000153b, "TerraTec Electronic GmbH" }, { 0x10030003, "SD14" }, { 0x10030100, "SD9/SD10" }, { 0x10041fae, "U8120 3G Cellphone" }, @@ -14296,6 +14545,7 @@ { 0x1004618e, "Ally/Optimus One/Vortex (debug mode)" }, { 0x1004618f, "Ally/Optimus One" }, { 0x1004619a, "LG Electronics Inc. LG8575" }, + { 0x100461c5, "P880 / Charge only" }, { 0x100461c6, "Vortex (msc)" }, { 0x100461cc, "Optimus S" }, { 0x100461f1, "Optimus Android Phone [LG Software mode]" }, @@ -14304,10 +14554,13 @@ { 0x100461fe, "Optimus Android Phone [USB tethering mode]" }, { 0x10046300, "Optimus Android Phone" }, { 0x1004631c, "LG Electronics Inc. LG-E617G/P700" }, + { 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" }, { 0x1004631e, "Optimus Android Phone [Camera/PTP mode]" }, + { 0x1004631f, "Optimus Android Phone (Charge Mode)" }, { 0x10046356, "Optimus Android Phone [Virtual CD mode]" }, { 0x10046800, "CDMA Modem" }, { 0x10047000, "LG LDP-7024D(LD)USB" }, + { 0x100491c8, "P880 / USB tethering" }, { 0x1004a400, "Renoir (KC910)" }, { 0x10051001, "MP3 Player" }, { 0x10051004, "MP3 Player" }, @@ -14348,8 +14601,8 @@ { 0x102c6151, "Q-Cam Sangha CIF" }, { 0x102c6251, "Q-Cam VGA" }, { 0x10330068, "3,5'' HDD case MD-231" }, - { 0x10380100, "Zboard" }, - { 0x10381361, "Sensei" }, + { 0x10380100, "Ideazon Zboard" }, + { 0x10381361, "Ideazon Sensei" }, { 0x10390824, "1866 802.11bg [Texas Instruments TNETW1450]" }, { 0x10392140, "dsl+ 1100 duo" }, { 0x103d0100, "ScratchAmp" }, @@ -14399,21 +14652,28 @@ { 0x10580500, "hub" }, { 0x10580702, "Passport External HDD" }, { 0x10580704, "Passport External HDD" }, - { 0x1058070a, "My Passport Essential SE" }, + { 0x1058070a, "My Passport Essential SE, My Passport for Mac (WDBAAB)" }, { 0x1058071a, "My Passport" }, - { 0x10580730, "My Passport" }, + { 0x10580730, "My Passport Essential (WDBACY)" }, { 0x10580740, "My Passport" }, + { 0x10580741, "My Passport Ultra" }, { 0x10580742, "My Passport Essential SE" }, - { 0x10580748, "My Passport 1TB USB 3.0" }, + { 0x10580748, "My Passport (WDBKXH)" }, + { 0x10580810, "My Passport Ultra" }, { 0x10580900, "MyBook Essential External HDD" }, - { 0x10580901, "MyBook External HDD" }, + { 0x10580901, "My Book Essential Edition (Green Ring)" }, + { 0x10580902, "My Book Pro Edition" }, { 0x10580903, "My Book Premium Edition" }, { 0x10580910, "MyBook Essential External HDD" }, - { 0x10581001, "External Hard Disk [Elements]" }, + { 0x10581001, "Elements Desktop (WDE1U)" }, { 0x10581003, "Elements 1000 GB" }, - { 0x10581010, "Elements External HDD" }, - { 0x10581021, "Elements 2TB" }, + { 0x10581010, "Elements Portable (WDBAAR)" }, + { 0x10581021, "Elements Desktop (WDBAAU)" }, { 0x10581023, "Elements SE" }, + { 0x10581048, "Elements Portable (WDBU6Y)" }, + { 0x105810a2, "Elements SE Portable (WDBPCK)" }, + { 0x105810a8, "Elements Portable (WDBUZG)" }, + { 0x10581100, "My Book Essential Edition 2.0 (WDH1U)" }, { 0x10581103, "My Book Studio" }, { 0x10581104, "MyBook Mirror Edition External HDD" }, { 0x10581105, "My Book Studio II" }, @@ -14496,6 +14756,7 @@ { 0x106cf003, "Pantech Crux" }, { 0x106f0009, "CT10x Coin Transaction" }, { 0x106f000a, "CR10x Coin Recycler" }, + { 0x106f000c, "Xchange" }, { 0x10760031, "Bluetooth Device" }, { 0x10760032, "Bluetooth Device" }, { 0x107b3009, "eHome Infrared Transceiver" }, @@ -14503,6 +14764,7 @@ { 0x107b55f2, "WGU-210 802.11g Adapter [Intersil ISL3886]" }, { 0x1083161b, "DR-2010C Scanner" }, { 0x1083162c, "P-150 Scanner" }, + { 0x109b9118, "Medion P4013 Mobile" }, { 0x109f3163, "Trigem Mobile SmartDisplay84" }, { 0x109f3164, "Trigem Mobile SmartDisplay121" }, { 0x10a91102, "Sky Love Actually IM-U460K" }, @@ -14529,6 +14791,8 @@ { 0x10b80bc7, "DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm)" }, { 0x10bd1427, "Ethernet" }, { 0x10bf0001, "SmartHome PowerLinc" }, + { 0x10c300a4, "ULS PLS Series Laser Engraver Firmware Loader" }, + { 0x10c300a5, "ULS Print Support" }, { 0x10c40002, "F32x USBXpress Device" }, { 0x10c40003, "CommandIR" }, { 0x10c48030, "K4JRG Ham Radio devices" }, @@ -14545,12 +14809,15 @@ { 0x10c48460, "Sangoma Wanpipe VoiceTime" }, { 0x10c48461, "Sangoma U100" }, { 0x10c48477, "Balluff RFID Reader" }, + { 0x10c48496, "SiLabs Cypress FW downloader" }, + { 0x10c48497, "SiLabs Cypress EVB" }, { 0x10c48605, "dilitronics ESoLUX solar lighting controller" }, { 0x10c486bc, "C8051F34x AudioDelay [AD-340]" }, { 0x10c48789, "C8051F34x Extender & EDID MGR [EMX-DVI]" }, { 0x10c487be, "C8051F34x HDMI Audio Extractor [EMX-HD-AUD]" }, { 0x10c48863, "C8051F34x Bootloader" }, { 0x10c48897, "C8051F38x HDMI Splitter [UHBX]" }, + { 0x10c48918, "C8051F38x HDMI Audio Extractor [VSA-HA-DP]" }, { 0x10c4ea60, "CP210x UART Bridge / myAVR mySmartUSB light" }, { 0x10c4ea61, "CP210x UART Bridge" }, { 0x10c4ea70, "CP210x UART Bridge" }, @@ -14636,9 +14903,11 @@ { 0x11324337, "PDR-M11" }, { 0x11324338, "PDR-M25" }, { 0x11363131, "CTS LS515" }, + { 0x11420709, "Cyberview High Speed Scanner" }, { 0x11450001, "AirH PHONE AH-J3001V/J3002V" }, { 0x114b0110, "Turbolink UB801R WLAN Adapter" }, { 0x114b0150, "Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187]" }, + { 0x114f1234, "Fastrack Xtend FXT001 Modem" }, { 0x11630100, "Earthmate GPS (orig)" }, { 0x11630200, "Earthmate GPS (LT-20, LT-40)" }, { 0x11632020, "Earthmate GPS (PN-40)" }, @@ -14677,7 +14946,7 @@ { 0x11996832, "MC8780 Device" }, { 0x11996833, "MC8781 Device" }, { 0x1199683a, "MC8785 Device" }, - { 0x1199683c, "MC8790 Device" }, + { 0x1199683c, "Mobile Broadband 3G/UMTS (MC8790 Device)" }, { 0x11996850, "AirCard 880 Device" }, { 0x11996851, "AirCard 881 Device" }, { 0x11996852, "AirCard 880E Device" }, @@ -14700,13 +14969,19 @@ { 0x11999008, "Gobi 2000 Wireless Modem" }, { 0x11999009, "Gobi 2000 Wireless Modem" }, { 0x1199900a, "Gobi 2000 Wireless Modem" }, + { 0x11999055, "Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode)" }, + { 0x11999057, "Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode)" }, { 0x119b0400, "Infrared Keyboard V2.01" }, { 0x11a0eb11, "CC2400EB 2.0 ZigBee Sniffer" }, { 0x11a38031, "MP3 Player" }, { 0x11a38032, "MP3 Player" }, { 0x11aa1518, "iREZ K2" }, { 0x11ac6565, "FuelBand" }, + { 0x11b06208, "PRO-28U" }, + { 0x11bef0a0, "Martin Maxxyz DMX" }, { 0x11c50521, "IMT-0521 Smartcard Reader" }, + { 0x11ca0207, "PIN Pad VX 810" }, + { 0x11ca0220, "PIN Pad VX 805" }, { 0x11db1000, "PVR" }, { 0x11db1100, "PVR" }, { 0x11f50001, "SX1" }, @@ -14714,8 +14989,9 @@ { 0x11f50004, "X75" }, { 0x11f50005, "SXG75/EF81" }, { 0x11f50008, "UMTS/HSDPA Data Card" }, + { 0x11f50101, "RCU Connect" }, { 0x11f62001, "Willcom WSIM" }, - { 0x11f702df, "TD10 Mobile phone USB cable" }, + { 0x11f702df, "Serial cable (v2) for TD-10 Mobile Phone" }, { 0x12030140, "TTP-245C" }, { 0x12091001, "USB Hub" }, { 0x12091002, "USB Relais" }, @@ -14730,21 +15006,52 @@ { 0x121e3403, "Muzio JM250 Audio Player" }, { 0x12280012, "Q18 Data Logger" }, { 0x12280015, "TPaq21/MPaq21 Datalogger" }, + { 0x1228584c, "XL2 Logger" }, { 0x12335677, "FUSB200 mp3 player" }, { 0x12340000, "Neural Impulse Actuator Prototype 1.0 [NIA]" }, { 0x12344321, "Human Interface Device" }, { 0x1234ed02, "Emotiv EPOC Developer Headset Wireless Dongle" }, - { 0x12350001, "ReMOTE Audio/XStation" }, + { 0x12350001, "ReMOTE Audio/XStation First Edition" }, { 0x12350002, "Speedio" }, - { 0x12350003, "ReMOTE ZeRO SL" }, + { 0x12350003, "RemoteSL + ZeroSL" }, + { 0x12350004, "ReMOTE LE" }, + { 0x12350005, "XIOSynth [First Edition]" }, + { 0x12350006, "XStation" }, + { 0x12350007, "XIOSynth" }, + { 0x12350008, "ReMOTE SL Compact" }, + { 0x12350009, "nIO" }, + { 0x1235000a, "Nocturn" }, + { 0x1235000b, "ReMOTE SL MkII" }, + { 0x1235000c, "ZeRO MkII" }, + { 0x1235000e, "Launchpad" }, + { 0x12350010, "Saffire 6" }, + { 0x12350011, "Ultranova" }, + { 0x12350012, "Nocturn Keyboard" }, + { 0x12350013, "VRM Box" }, + { 0x12350014, "VRM Box Audio Class (2-out)" }, + { 0x12350015, "Dicer" }, + { 0x12350016, "Ultranova" }, + { 0x12350018, "Twitch" }, + { 0x12350019, "Impulse 25" }, + { 0x1235001a, "Impulse 49" }, + { 0x1235001b, "Impulse 61" }, { 0x12354661, "ReMOTE25" }, + { 0x12358000, "Scarlett 18i6" }, + { 0x12358002, "Scarlett 8i6" }, { 0x12358006, "Focusrite Scarlett 2i2" }, + { 0x12358008, "Saffire 6" }, + { 0x1235800a, "Scarlett 2i4" }, + { 0x1235800c, "Scarlett 18i20" }, + { 0x1235800e, "iTrack Solo" }, + { 0x12358010, "Forte" }, + { 0x12358012, "Scarlett 6i6" }, + { 0x12358014, "Scarlett 18i8" }, { 0x12410504, "Wireless Trackball Keyboard" }, { 0x12411111, "Mouse" }, { 0x12411122, "Typhoon Stream Optical Mouse USB+PS/2" }, { 0x12411155, "PS2/USB Browser Combo Mouse" }, { 0x12411166, "MI-2150 Trust Mouse" }, - { 0x12411177, "F8E842-DL Mouse" }, + { 0x12411177, "Mouse [HT82M21A]" }, { 0x12411503, "Keyboard" }, { 0x12411603, "Keyboard" }, { 0x1241f767, "Keyboard" }, @@ -14757,11 +15064,13 @@ { 0x125c0010, "Alta series CCD" }, { 0x125f312a, "Superior S102" }, { 0x125f312b, "Superior S102 Pro" }, + { 0x125fa22a, "DashDrive Elite HE720 500GB" }, { 0x125fa91a, "Portable HDD CH91" }, { 0x125fc08a, "C008 Flash Drive" }, { 0x125fc81a, "Flash drive" }, { 0x125fc93a, "4GB Pen Drive" }, { 0x125fc96a, "C906 Flash Drive" }, + { 0x125fcb10, "Dash Drive UV100" }, { 0x1260ee22, "SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]" }, { 0x12666302, "Fastweb DRG A226M ADSL Router" }, { 0x12670103, "G-720 Keyboard" }, @@ -14802,6 +15111,7 @@ { 0x12830121, "emed-AT" }, { 0x12830130, "PDM" }, { 0x12830150, "CMS10GI (Golf)" }, + { 0x128600bc, "Marvell JTAG Probe" }, { 0x12861fab, "88W8338 [Libertas] 802.11g" }, { 0x12862001, "88W8388 802.11a/b/g WLAN" }, { 0x12862006, "88W8362 802.11n WLAN" }, @@ -14823,6 +15133,7 @@ { 0x12ba0210, "Harmonix Drum Kit for PlayStation(R)3" }, { 0x12c40006, "Teleprompter Two-button Hand Control (v1)" }, { 0x12c40008, "Teleprompter Foot Control (v1)" }, + { 0x12cf0170, "Tt eSPORTS BLACK Gaming mouse" }, { 0x12d11001, "E169/E620/E800 HSDPA Modem" }, { 0x12d11003, "E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem" }, { 0x12d11004, "E220 (bis)" }, @@ -14846,7 +15157,9 @@ { 0x12d114c9, "K3770 3G Modem" }, { 0x12d114cf, "K3772" }, { 0x12d114d1, "K3770 3G Modem (Mass Storage Mode)" }, + { 0x12d114db, "E353/E3131" }, { 0x12d114f1, "Gobi 3000 HSPA+ Modem" }, + { 0x12d114fe, "Modem (Mass Storage Mode)" }, { 0x12d11501, "Pulse" }, { 0x12d11505, "E398 LTE/UMTS/GSM Modem/Networkcard" }, { 0x12d11506, "Modem/Networkcard" }, @@ -14854,16 +15167,21 @@ { 0x12d11520, "K3765 HSPA" }, { 0x12d11521, "K4505 HSPA+" }, { 0x12d1155a, "R205 Mobile WiFi (CD-ROM mode)" }, + { 0x12d11575, "K5150 LTE modem" }, + { 0x12d115ca, "E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode)" }, { 0x12d11805, "AT&T Go Phone U2800A phone" }, { 0x12d11c05, "E173s 3G broadband stick (modem on)" }, { 0x12d11c0b, "E173s 3G broadband stick (modem off)" }, { 0x12d11c20, "R205 Mobile WiFi (Charging)" }, { 0x12d11d50, "ET302s TD-SCDMA/TD-HSDPA Mobile Broadband" }, + { 0x12d11f01, "E353/E3131 (Mass storage mode)" }, + { 0x12d11f16, "K5150 LTE modem (Mass Storage Mode)" }, { 0x12d1360f, "Huawei Mediapad (mode 0)" }, { 0x12d1361f, "Huawei Mediapad (mode 1)" }, { 0x12d1380b, "WiMAX USB modem(s)" }, { 0x12d60444, "CPC-USB/ARM7" }, { 0x12d60888, "CPC-USB/M16C" }, + { 0x12d80001, "Alea I True Random Number Generator" }, { 0x12e60013, "Blofeld" }, { 0x12ef0100, "Tapwave Handheld [Tapwave Zodiac]" }, { 0x12f71a00, "TD Classic 003B" }, @@ -14873,7 +15191,7 @@ { 0x13021016, "Haier Ibiza Rhapsody" }, { 0x13021017, "Haier Ibiza Rhapsody" }, { 0x13070163, "256MB/512MB/1GB Flash Drive" }, - { 0x13070165, "2GB/4GB Flash Drive" }, + { 0x13070165, "2GB/4GB/8GB Flash Drive" }, { 0x13070190, "Ut190 8 GB Flash Drive with MicroSD reader" }, { 0x13070310, "SD/MicroSD CardReader [hama]" }, { 0x13070330, "63-in-1 Multi-Card Reader/Writer" }, @@ -14883,6 +15201,21 @@ { 0x13080003, "VFD Module" }, { 0x1308c001, "eHome Infrared Transceiver" }, { 0x13100001, "Class 1 Bluetooth Dongle" }, + { 0x13130010, "LC1 Linear Camera (Jungo)" }, + { 0x13130011, "SP1 Spectrometer (Jungo)" }, + { 0x13130012, "SP2 Spectrometer (Jungo)" }, + { 0x13130110, "LC1 Linear Camera (VISA)" }, + { 0x13130111, "SP1 Spectrometer (VISA)" }, + { 0x13130112, "SP2 Spectrometer (VISA)" }, + { 0x13138001, "TXP-Series Slot (TXP5001, TXP5004)" }, + { 0x13138012, "BC106 Camera Beam Profiler" }, + { 0x13138013, "WFS10 Wavefront Sensor" }, + { 0x13138017, "BC206 Camera Beam Profiler" }, + { 0x13138019, "BP2 Multi Slit Beam Profiler" }, + { 0x13138020, "PM300 Optical Power Meter" }, + { 0x13138021, "PM300E Optical Power and Energy Meter" }, + { 0x13138022, "PM320E Optical Power and Energy Meter" }, + { 0x13138030, "ER100 Extinction Ratio Meter" }, { 0x13138070, "PM100D" }, { 0x131d0155, "TrackIR 3 Pro Head Tracker" }, { 0x131d0156, "TrackIR 4 Pro Head Tracker" }, @@ -14923,6 +15256,9 @@ { 0x13420203, "EasiDock 200 Printer Port" }, { 0x13420204, "Ethernet" }, { 0x13420304, "EasiDock Ethernet" }, + { 0x13430003, "CX / DNP DS40" }, + { 0x13430004, "CX-W / DNP DS80" }, + { 0x13430005, "CY / DNP DSRX" }, { 0x1345001c, "Xbox Controller Hub" }, { 0x13456006, "Defender Wireless Controller" }, { 0x13470400, "G2CCD USB 1.1 obsolete" }, @@ -14930,6 +15266,8 @@ { 0x13470402, "G2CCD2" }, { 0x13470403, "G2/G3CCD-I KAI CCD" }, { 0x13470404, "G2/G3/G4 CCD-F KAF CCD" }, + { 0x13470405, "Gx CCD-I CCD" }, + { 0x13470406, "Gx CCD-F CCD" }, { 0x13470410, "G1-0400 CCD" }, { 0x13470411, "G1-0800 CCD" }, { 0x13470412, "G1-0300 CCD" }, @@ -14967,8 +15305,10 @@ { 0x138a0018, "Fingerprint scanner" }, { 0x138a003c, "VFS471 Fingerprint Reader" }, { 0x138a003d, "VFS491" }, + { 0x138a0050, "Swipe Fingerprint Sensor" }, { 0x138e9000, "Raisonance S.A. STM32 ARM evaluation board" }, { 0x13900001, "GO 520 T/GO 630/ONE XL (v9)" }, + { 0x13905454, "Blue & Me 2" }, { 0x13911000, "URTC-1000" }, { 0x13953556, "USB Headset" }, { 0x139700bc, "BCF2000" }, @@ -14996,9 +15336,12 @@ { 0x13b10031, "AM10 v1 802.11n [Ralink RT3072]" }, { 0x13b10039, "AE1200 802.11bgn Wireless Adapter [Broadcom BCM43235]" }, { 0x13b1003a, "AE2500 802.11abgn Wireless Adapter [Broadcom BCM43236]" }, + { 0x13b1003b, "AE3000 802.11abgn (3x3) Wireless Adapter [Ralink RT3573]" }, + { 0x13b1003e, "AE6000 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U]" }, + { 0x13b1003f, "WUSB6300 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]" }, { 0x13b113b1, "WUSB200: Wireless-G Business Network Adapter with Rangebooster" }, { 0x13b20030, "Multimix 8" }, - { 0x13ba0001, "K\\xc3\\xb6nig Electronic CMP-KEYPAD12 Numeric Keypad" }, + { 0x13ba0001, "Konig Electronic CMP-KEYPAD12 Numeric Keypad" }, { 0x13ba0017, "PS/2 Keyboard+Mouse Adapter" }, { 0x13ba0018, "Barcode PCP-BCG4209" }, { 0x13cf1200, "Olidata Wireless Multimedia Adapter" }, @@ -15049,10 +15392,13 @@ { 0x13d33306, "Mediao 802.11n WLAN [Realtek RTL8191SU]" }, { 0x13d33315, "Bluetooth module" }, { 0x13d33375, "Atheros AR3012 Bluetooth 4.0 Adapter" }, + { 0x13d33392, "Azurewave 43228+20702" }, + { 0x13d33394, "Bluetooth" }, { 0x13d35070, "Webcam" }, { 0x13d35111, "Integrated Webcam" }, { 0x13d35115, "Integrated Webcam" }, { 0x13d35116, "Integrated Webcam" }, + { 0x13d35122, "2M Integrated Webcam" }, { 0x13d35126, "PC Cam" }, { 0x13d35702, "UVC VGA Webcam" }, { 0x13d35710, "UVC VGA Webcam" }, @@ -15066,22 +15412,27 @@ { 0x13ee0003, "Optical Mouse" }, { 0x13fd0840, "INIC-1618L SATA" }, { 0x13fd0841, "Samsung SE-T084M DVD-RW" }, + { 0x13fd1040, "INIC-1511L PATA Bridge" }, { 0x13fd1340, "Hi-Speed USB to SATA Bridge" }, { 0x13fd160f, "RocketFish SATA Bridge [INIC-1611]" }, { 0x13fd1640, "INIC-1610L SATA Bridge" }, + { 0x13fd1669, "INIC-1609PN" }, { 0x13fd1840, "INIC-1608 SATA bridge" }, + { 0x13fd1e40, "INIC-1610P SATA bridge" }, { 0x13fe1a00, "512MB/1GB Flash Drive" }, { 0x13fe1a23, "512MB Flash Drive" }, { 0x13fe1d00, "DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive" }, { 0x13fe1e00, "Flash Drive 2 GB [ICIDU 2 GB]" }, { 0x13fe1e50, "U3 Smart Drive" }, - { 0x13fe1f00, "DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive" }, - { 0x13fe1f23, "2Gb" }, + { 0x13fe1f00, "Kingston DataTraveler / Patriot Xporter" }, + { 0x13fe1f23, "PS2232 flash drive controller" }, { 0x13fe2240, "microSD card reader" }, { 0x13fe3100, "2/4 GB stick" }, { 0x13fe3123, "Verbatim STORE N GO 4GB" }, + { 0x13fe3600, "flash drive (4GB, EMTEC)" }, { 0x13fe3800, "Rage XT Flash Drive" }, { 0x13fe3e00, "Flash Drive" }, + { 0x13fe5000, "USB flash drive (32 GB SHARKOON Accelerate)" }, { 0x13fe5100, "Flash Drive" }, { 0x14030001, "Digital Photo Frame" }, { 0x14091000, "generic (firmware not loaded yet)" }, @@ -15107,6 +15458,7 @@ { 0x14150000, "Sony SingStar USBMIC" }, { 0x14150020, "Sony Wireless SingStar" }, { 0x14152000, "Sony Playstation Eye" }, + { 0x14210605, "Sentech Camera" }, { 0x142a0003, "Artema Hybrid" }, { 0x142a0005, "Artema Modular" }, { 0x142a0043, "medCompact" }, @@ -15128,6 +15480,10 @@ { 0x14575117, "OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode" }, { 0x14575118, "OpenMoko Neo1973 Debug board (V2+)" }, { 0x14575119, "OpenMoko Neo1973 u-boot cdc_acm serial port" }, + { 0x1457511a, "HXD8 u-boot usbtty CDC ACM Mode" }, + { 0x1457511b, "SMDK2440 u-boot usbtty CDC ACM mode" }, + { 0x1457511c, "SMDK2443 u-boot usbtty CDC ACM mode" }, + { 0x1457511d, "QT2410 u-boot usbtty CDC ACM mode" }, { 0x14575120, "OpenMoko Neo1973 u-boot usbtty generic serial" }, { 0x14575121, "OpenMoko Neo1973 kernel mass storage (g_storage) mode" }, { 0x14575122, "OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network" }, @@ -15167,6 +15523,7 @@ { 0x14847616, "Elsa Hub" }, { 0x14850001, "U2E" }, { 0x14850002, "Psion Gold Port Ethernet" }, + { 0x148f1000, "Motorola BC4 Bluetooth 3.0+HS Adapter" }, { 0x148f1706, "RT2500USB Wireless Adapter" }, { 0x148f2070, "RT2070 Wireless Adapter" }, { 0x148f2570, "RT2570 Wireless Adapter" }, @@ -15183,9 +15540,13 @@ { 0x148f5370, "RT5370 Wireless Adapter" }, { 0x148f5372, "RT5372 Wireless Adapter" }, { 0x148f5572, "RT5572 Wireless Adapter" }, + { 0x148f7601, "MT7601U Wireless Adapter" }, { 0x148f9020, "RT2500USB Wireless Adapter" }, { 0x148f9021, "RT2501USB Wireless Adapter" }, { 0x14910020, "FS81 Fingerprint Scanner Module" }, + { 0x14930010, "Bluebird [Ambit]" }, + { 0x14930019, "Duck [Ambit2]" }, + { 0x1493001a, "Colibri [Ambit2 S]" }, { 0x1498a090, "DVB-T Tuner" }, { 0x149a2107, "DBX1 DSP core" }, { 0x14aa0001, "Avermedia AverTV DVBT USB1.1 (cold)" }, @@ -15213,11 +15574,12 @@ { 0x14c20250, "Storage Adapter V2" }, { 0x14c20350, "Storage Adapter V2" }, { 0x14cd121c, "microSD card reader" }, + { 0x14cd121f, "microSD CardReader SY-T18" }, { 0x14cd123a, "SD/MMC/RS-MMC Card Reader" }, { 0x14cd125c, "SD card reader" }, { 0x14cd127b, "SDXC Reader" }, { 0x14cd6116, "M6116 SATA Bridge" }, - { 0x14cd6600, "USB 2.0 IDE DEVICE" }, + { 0x14cd6600, "M110E PATA bridge" }, { 0x14cd6700, "Card Reader" }, { 0x14cd6900, "Card Reader" }, { 0x14cd8123, "SD MMC Reader" }, @@ -15234,6 +15596,9 @@ { 0x14f70003, "CableStar Combo HD CI" }, { 0x14f70004, "AirStar TeleStick 2" }, { 0x14f70500, "DVB-PC TV Star HD" }, + { 0x15090a01, "LI-3100 Area Meter" }, + { 0x15090a02, "LI-7000 CO2/H2O Gas Analyzer" }, + { 0x15090a03, "C-DiGit Blot Scanner" }, { 0x15099242, "eHome Infrared Transceiver" }, { 0x15130444, "medMobile" }, { 0x15142003, "FlashPro3 Programmer" }, @@ -15243,10 +15608,14 @@ { 0x15168628, "Pen Drive" }, { 0x15180001, "HDReye High Dynamic Range Camera" }, { 0x15180002, "HDReye (before firmware loads)" }, + { 0x15190020, "HSIC Device" }, { 0x15246680, "UTS 6680" }, { 0x15270200, "YAP Phone (no firmware)" }, { 0x15270201, "YAP Phone" }, { 0x15293100, "CDMA 1xRTT USB Modem (U-100/105/200/300/520)" }, + { 0x152a8400, "INI DVS128" }, + { 0x152a840d, "INI DAViS" }, + { 0x152a841a, "INI DAViS FX3" }, { 0x152d0539, "JMS539 SuperSpeed SATA II 3.0G Bridge" }, { 0x152d0770, "Alienware Integrated Webcam" }, { 0x152d2329, "JM20329 SATA Bridge" }, @@ -15263,6 +15632,7 @@ { 0x15320003, "Krait Mouse" }, { 0x15320007, "DeathAdder Mouse" }, { 0x15320013, "Orochi mouse" }, + { 0x15320015, "Naga Mouse" }, { 0x15320016, "DeathAdder Mouse" }, { 0x15320017, "RZ01-0035 Laser Gaming Mouse [Imperator]" }, { 0x1532001c, "RZ01-0036 Optical Gaming Mouse [Abyssus]" }, @@ -15272,12 +15642,17 @@ { 0x15320101, "Copperhead Mouse" }, { 0x15320102, "Tarantula Keyboard" }, { 0x15320109, "Lycosa Keyboard" }, + { 0x15320113, "RZ07-0074 Gaming Keypad [Orbweaver]" }, { 0x15320300, "RZ06-0063 Motion Sensing Controllers [Hydra]" }, + { 0x153b1181, "Cinergy S2 PCIe Dual Port 1" }, + { 0x153b1182, "Cinergy S2 PCIe Dual Port 2" }, { 0x15471000, "SG-Lock[U2]" }, { 0x154a8180, "CARD STAR/medic2" }, { 0x154b0010, "USB 2.0 Flash Drive" }, + { 0x154b0048, "Flash Drive" }, { 0x154b004d, "8 GB Flash Drive" }, { 0x154b0057, "32GB Micro Slide Attache Flash Drive" }, + { 0x154b007a, "8GB Classic Attache Flash Drive" }, { 0x154b6545, "FD Device" }, { 0x154e3000, "Marantz RC9001 Remote Control" }, { 0x15545010, "PV-D231U(RN)-F [PixelView PlayTV SBTVD Full-Seg]" }, @@ -15307,7 +15682,8 @@ { 0x15a20042, "OSBDM - Debug Port" }, { 0x15a2004f, "i.MX28 SystemOnChip in RecoveryMode" }, { 0x15a20052, "i.MX50 SystemOnChip in RecoveryMode" }, - { 0x15a20054, "i.MX6Q SystemOnChip in RecoveryMode" }, + { 0x15a20054, "i.MX 6Dual/6Quad SystemOnChip in RecoveryMode" }, + { 0x15a20061, "i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode" }, { 0x15a41000, "AF9015/AF9035 DVB-T stick" }, { 0x15a41001, "AF9015/AF9035 DVB-T stick" }, { 0x15a41336, "SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader" }, @@ -15336,6 +15712,7 @@ { 0x15c00101, "3M pixel Microscope Camera" }, { 0x15c20036, "LC16M VFD Display/IR Receiver" }, { 0x15c20038, "GD01 MX LCD Display/IR Receiver" }, + { 0x15c20042, "Antec Veris Multimedia Station E-Z IR Receiver" }, { 0x15c2ffda, "iMON PAD Remote Controller" }, { 0x15c2ffdc, "iMON PAD Remote Controller" }, { 0x15c50008, "WL532U 802.11g Adapter" }, @@ -15357,6 +15734,7 @@ { 0x15d90a41, "MI-2540D [Optical mouse]" }, { 0x15d90a4c, "USB+PS/2 Optical Mouse" }, { 0x15d90a4d, "Optical Mouse" }, + { 0x15d90a4f, "Optical Mouse" }, { 0x15e12007, "RSA SecurID (R) Authenticator" }, { 0x15e40024, "Mixtrack" }, { 0x15e40140, "ION VCR 2 PC / Video 2 PC" }, @@ -15573,6 +15951,9 @@ { 0x16900726, "Wi-Fi Wireless LAN Adapter" }, { 0x16900740, "802.11n Wireless LAN Card" }, { 0x16900901, "Voyager 205 ADSL Router" }, + { 0x16902000, "naturaSign Pad Standard" }, + { 0x16902001, "naturaSign Pad Standard" }, + { 0x1690fe12, "Bootloader" }, { 0x16a63000, "VTG-3xxx Video Test Generator family" }, { 0x16a64000, "VTG-4xxx Video Test Generator family" }, { 0x16a65000, "VTG-5xxx Video Test Generator family" }, @@ -15618,6 +15999,7 @@ { 0x16c005e4, "Free shared USB VID/PID pair for MIDI devices" }, { 0x16c006b4, "USB2LPT with 2 interfaces" }, { 0x16c006b5, "USB2LPT with 3 interfaces (native, HID, printer)" }, + { 0x16c00762, "Osmocom SIMtrace" }, { 0x16c0076b, "OpenPCD 13.56MHz RFID Reader" }, { 0x16c0076c, "OpenPICC 13.56MHz RFID Simulator (native)" }, { 0x16c008ac, "OpenBeacon USB stick" }, @@ -15645,9 +16027,12 @@ { 0x16d0075c, "AB-1.x UAC1 [Audio Widget]" }, { 0x16d0075d, "AB-1.x UAC2 [Audio Widget]" }, { 0x16d0080a, "S2E1 Interface" }, + { 0x16d00870, "Kaufmann Automotive GmbH, RKS+CAN Interface" }, + { 0x16d10401, "SUP-SFR400(A) BioMini Fingerprint Reader" }, { 0x16d56202, "CDMA/UMTS/GPRS modem" }, { 0x16d56501, "CDMA 2000 1xRTT/EV-DO Modem" }, { 0x16d56502, "CDMA/UMTS/GPRS modem" }, + { 0x16d56603, "ADU-890WH modem" }, { 0x16d68000, "GDP-04 desktop phone" }, { 0x16d68001, "EYE-02" }, { 0x16d68003, "GDP-04 modem" }, @@ -15672,6 +16057,8 @@ { 0x17030001, "NormSoft, Inc. Pocket Tunes" }, { 0x17030002, "NormSoft, Inc. Pocket Tunes 4" }, { 0x170b0011, "MIDI-USB 1x1" }, + { 0x17113020, "IC80 HD Camera" }, + { 0x17240115, "PAXcam5" }, { 0x17261000, "wireless modem" }, { 0x17262000, "wireless modem" }, { 0x17263000, "wireless modem" }, @@ -15695,6 +16082,9 @@ { 0x17370077, "WUSB54GC v3 802.11g Adapter [Ralink RT2070L]" }, { 0x17370078, "WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070]" }, { 0x17370079, "WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572]" }, + { 0x173d0002, "GP-K7000 keyboard" }, + { 0x17400100, "EUB1200AC AC1200 DB Wireless Adapter [Realtek RTL8812AU]" }, + { 0x17400600, "EUB600v1 802.11abgn Wireless Adapter [Ralink RT3572]" }, { 0x17400605, "LevelOne WUA-0605 N_Max Wireless USB Adapter" }, { 0x17400615, "LevelOne WUA-0615 N_Max Wireless USB Adapter" }, { 0x17401000, "NUB-350 802.11g Wireless Adapter [Intersil ISL3887]" }, @@ -15707,8 +16097,10 @@ { 0x17409705, "EnGenius 802.11n Wireless USB Adapter" }, { 0x17409706, "EUB9706 802.11n Wireless Adapter [Ralink RT3072]" }, { 0x17409801, "EUB9801 802.11abgn Wireless Adapter [Ralink RT3572]" }, + { 0x17480101, "Packet-Master USB12" }, { 0x174c5106, "Transcend StoreJet 25M3" }, - { 0x174c55aa, "ASMedia 2105 SATA bridge" }, + { 0x174c5136, "ASM1053 SATA 6Gb/s bridge" }, + { 0x174c55aa, "ASM1051 SATA 3Gb/s bridge" }, { 0x174f1105, "SM-MS/Pro-MMC-XD Card Reader" }, { 0x174f110b, "HP Webcam" }, { 0x174f1403, "Integrated Webcam" }, @@ -15742,6 +16134,7 @@ { 0x17810c30, "Telldus TellStick" }, { 0x17810c31, "Telldus TellStick Duo" }, { 0x17810c9f, "USBtiny" }, + { 0x17811eef, "OpenAPC SecuKey" }, { 0x17840001, "eHome Infrared Transceiver" }, { 0x17840004, "RF Combo Device" }, { 0x17840006, "eHome Infrared Transceiver" }, @@ -15756,11 +16149,13 @@ { 0x17a00002, "Q1U dynamic microphone" }, { 0x17a00100, "C03U multi-pattern microphone" }, { 0x17a00101, "UB1 boundary microphone" }, + { 0x17a00120, "Meteorite condenser microphone" }, { 0x17a00200, "StudioDock monitors (internal hub)" }, { 0x17a00201, "StudioDock monitors (audio)" }, { 0x17a00210, "StudioGT monitors" }, { 0x17a00301, "Q2U handheld microphone with XLR" }, { 0x17a00302, "GoMic compact condenser microphone" }, + { 0x17a00303, "C01U Pro condenser microphone" }, { 0x17a00304, "Q2U handheld mic with XLR" }, { 0x17a00305, "GoMic compact condenser mic" }, { 0x17a00310, "Meteor condenser microphone" }, @@ -15798,12 +16193,15 @@ { 0x17e9037b, "Plugable USB-VGA-165" }, { 0x17e9037c, "Plugable DC-125" }, { 0x17e9037d, "Plugable USB2-HDMI-165" }, + { 0x17e9410a, "HDMI Adapter" }, { 0x17e9430a, "HP Port Replicator (Composite Device)" }, { 0x17e94312, "S2340T" }, + { 0x17ef1000, "Hub" }, { 0x17ef1003, "Integrated Smart Card Reader" }, { 0x17ef1004, "Integrated Webcam" }, { 0x17ef1008, "Hub" }, { 0x17ef100a, "ThinkPad Mini Dock Plus Series 3" }, + { 0x17ef304b, "AX88179 Gigabit Ethernet [ThinkPad OneLink GigaLAN]" }, { 0x17ef3815, "ChipsBnk 2GB USB Stick" }, { 0x17ef4802, "Lenovo Vc0323+MI1310_SOC Camera" }, { 0x17ef4807, "UVC Camera" }, @@ -15824,6 +16222,8 @@ { 0x17ef6007, "Smartcard Keyboard" }, { 0x17ef6009, "ThinkPad Keyboard with TrackPoint" }, { 0x17ef6014, "Mini Wireless Keyboard N5901" }, + { 0x17ef6025, "ThinkPad Travel Mouse" }, + { 0x17ef7203, "Ethernet adapter [U2L 100P-Y1]" }, { 0x17ef740a, "Lenovo K1" }, { 0x17ef741c, "Lenovo ThinkPad Tablet" }, { 0x17ef7423, "IdeaPad A1 Tablet" }, @@ -16569,6 +16969,8 @@ { 0x2040c000, "Windham" }, { 0x2040c010, "Windham" }, { 0x20470200, "MSP430 USB HID Bootstrap Loader" }, + { 0x20470855, "Invensense Embedded MotionApp HID Sensor" }, + { 0x20470964, "Inventio Software MSP430" }, { 0x20800001, "nook" }, { 0x20800002, "NOOKcolor" }, { 0x20800003, "NOOK Simple Touch" },
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/emem.c ^
@@ -781,7 +781,9 @@ #endif /* make sure we dont try to allocate too much (arbitrary limit) */ - DISSECTOR_ASSERT(size<(EMEM_PACKET_CHUNK_SIZE>>2)); + if (size >= (EMEM_PACKET_CHUNK_SIZE>>2)) { + return emem_alloc_glib(size, mem); + } if (!mem->free_list) mem->free_list = emem_create_chunk_gp(EMEM_PACKET_CHUNK_SIZE);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/enterprise-numbers ^
@@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2014-03-01) +(last updated 2014-06-08) SMI Network Management Private Enterprise Codes: @@ -1903,8 +1903,8 @@ harley&premisys.com 472 Bell South Telecommunications - - Johnny Walker 205-988-7105 + Johnny Walker + 205-988-7105 473 J. Stainsbury PLC Steve Parker @@ -2103,8 +2103,8 @@ DIA-DMS&DDN-CONUS.DDN.MIL 522 Telesystems SLW Inc. - - Joe Magony 416-441-9966 + Joe Magony + 416-441-9966 523 APT Communications David Kloper @@ -2338,9 +2338,9 @@ nigelc&lna.oz.au ---none--- 581 - Intec Telecom Systems + CSG Systems International (previous was 'Intec Telecom Systems') David Meibusch - david.meibusch&intecbilling.com + David.Meibusch&csgi.com 582 Newport Systems Solutions, Inc. Pauline Chen @@ -3646,9 +3646,9 @@ Yu Chin 76500,3160&compuserve.com 908 - Elsag Bailey Incorporated - Ron Kupiec - Ron.Kupiec&bailey.com + ABB Inc. (previous was 'Elsag Bailey Incorporated') + Matthew Miller + Matthew.Miller&us.abb.com 909 J.P. Morgan Chung Szeto @@ -3939,8 +3939,8 @@ alan&arktel.com 981 National Security Agency (NSA) - - Cynthia Beighley maedeen&romulus.ncsc.mil + Cynthia Beighley + maedeen&romulus.ncsc.mil 982 Southwestern Bell Corporation Brian Bearden @@ -4862,9 +4862,9 @@ Dominique Ambach Dominique_Ambach&stortek.com 1212 - Tadiran Telecomunications L.T.D - Meir Barack - Meirb&Telecomm.Tadiran.co.il + Tadiran Telecom TTL. + Gal Ben-Yair + Gal.ben-yair&tadirantele.com 1213 NCP Reiner Walter @@ -5714,9 +5714,9 @@ Lewis Donzis lew&perftech.com 1425 - CXR Telecom - Nick Charles - 7511.1047&CompuServe.com + CXR + Didier ANA + didier.ana&cxr.fr 1426 Amir Technology Labs Derek Palma @@ -7266,20 +7266,20 @@ (33) 51 41 41 89decision&calva.net 1813 - VTEL CorporationBill Black - + VTEL Corporation + Bill Black bblack&vtel.com 1814 - Bloomberg, L.P.Franko Rahimi - + Bloomberg, L.P. + Franko Rahimi frahimi&bny18.bloomberg.com 1815 Witness Systems, Inc Joe Watson jwatson&witness.com 1816 - Rose-Hulman Institute of TechnologyLans H. Carstensen - + Rose-Hulman Institute of Technology + Lans H. Carstensen Lans.H.Carstensen&rose-hulman.edu 1817 Aether Technologies @@ -7298,16 +7298,16 @@ lmreseau&calva.net 1821 - Total Entertainment NetworkWill Coertnik - + Total Entertainment Network + Will Coertnik will&tenetwork.com 1822 - Open Port TechnologyJeffrey Nowland - 312 867 5050 + Open Port Technology + Jeffrey Nowland jnowland&openport.com 1823 - Mikroelektronik Anwendungszentrum Hamburg GmbHZbynek Bazanowski - + Mikroelektronik Anwendungszentrum Hamburg GmbHZ + bynek Bazanowski ba&maz-hh.de 1824 International Management Consulting, Inc. @@ -7574,9 +7574,9 @@ Francois Gauthie metfgar&met.fr 1890 - JBM Electronics - Kevin Morris - jbmelect&mo.net + Red Lion Controls (JBM Electronics) + Denis Aull + Engineering&RedLion.net 1891 OPTIM Systems, Inc. Mr. Sunil Meht @@ -8626,9 +8626,9 @@ Ed Bernosky eddy&dlcmhc.com 2153 - Insider Technologies Ltd Paul Hancock 706001.1542 compuserv.com - - ---none--- + Insider Technologies Ltd Paul Hancock + Paul Hancock + 706001.1542 compuserv.com 2154 Berkeley Networks Bob Thomas @@ -9474,7 +9474,7 @@ Randy Maas randym&xiotech.com 2367 - IMS Gesellschaft f\|r Informations- und Managementsysteme mbH + IMS Gesellschaft fuer Informations- und Managementsysteme mbH Mr. Arndt Hoppe infoserv&ims.wes.eunet.de 2368 @@ -11756,7 +11756,7 @@ 2937 Deutsche Telekom AG Peter Krupp - Peter.Krupp&t-com.net + Peter.Krupp&telekom.de 2938 Proginet Corporation Thomas Bauer @@ -12130,7 +12130,7 @@ Dennis Oszuscik denniso&cninews.com 3031 - daoCon + dao Consulting, LLC David Osborn david.osborn&daoConsulting.com 3032 @@ -22130,9 +22130,9 @@ Buyle You ybl&cybertek.co.kr 5540 - Aachen University of Technology (RWTH) + RWTH Aachen University Guido Bunsen - Bunsen&rz.RWTH-Aachen.DE + Bunsen&itc.RWTH-Aachen.DE 5541 Paragea Communications, Inc Laique Ahmed @@ -23722,9 +23722,9 @@ Miran Bohak miran.bohak&halcom.si 5940 - JBM Electronics Co., Inc. - Art Surgant - asurgant&jbmelectronics.com + Red Lion Controls (JBM Electronics Co., Inc.) + Denis Aull + Engineering&RedLion.net 5941 Cosmocom Inc. Rick Marlborough @@ -30038,9 +30038,9 @@ Harris Corp SNMP Harris-SNMP&harris.com 7521 - NetStar Networks + Logicalis Australia Pty Ltd (previous was 'NetStar Networks') Garry Thomas - gthomas&netstarnetworks.com + gthomas&au.logicalis.com 7522 Brains Corp Takehito Horiuchi @@ -34063,8 +34063,8 @@ webmaster&notariato.it 8527 Harvard MIT Data Center - Micah Altman - Micah_Altman&harvard.edu + Leonard Wisniewski + linux&lists.hmdc.harvard.edu 8528 HeyAnita Inc. Mandar Wadekar @@ -45027,8 +45027,8 @@ dissc&dissc.presidencia.gob.es 11268 Aastra - Dr. Wolfgang Perlich - wperlich&aastra.com + Mario Giacometto + mgiacometto&aastra.com 11269 Aculab plc Chris Brown @@ -45174,7 +45174,7 @@ Jeremy Finn jfinn&printeron.net 11305 - Research Institute for Particle and Nuclear Physics, Department ofBiophysics + Research Institute for Particle and Nuclear Physics, Department of Biophysics Csardi Gabor csardi&rmki.kfki.hu 11306 @@ -47872,7 +47872,7 @@ 12079 dotmaudot Maurizio Codogno - puntomaupunto&tiscalinet.it + dot.maudot&gmail.com 12080 e-peopleserve Neal Brett @@ -48359,8 +48359,8 @@ rabakker&seneca.nl 12201 University Health Network - John Waldron - john.waldron&uhn.on.ca + Geoff Hallford + geoff.hallford&uhn.ca 12202 UP3I Christian Sack @@ -51428,7 +51428,7 @@ 12968 Menno Pieters (previously Stelvio) Menno Pieters - iana-assigned-numbers&mwpieter.dds.nl + iana-assigned-numbers&menno.pieters.cx 12969 The Rockefeller University Lawry Persaud @@ -59856,8 +59856,8 @@ rdefalco&icominfo.fr 15076 Fresenius AG - Frank Wagner - frank.wagner&fresenius-netcare.com + Hendrik Stahl + ad.support&fresenius-netcare.com 15077 Thermeon Corporation Scott Nelson @@ -63571,9 +63571,9 @@ David Meltzer djm&intrusec.com 16005 - University of Durham - Barry Cornelius - barry.cornelius&durham.ac.uk + Durham University + David Griffith + d.e.griffith&durham.ac.uk 16006 CodeFab Inc Charles Swiger @@ -63628,8 +63628,8 @@ max&punker.org 16019 Reitek - Federico Pinna - fpinna&reitek.com + Giovanni Carbone + itadmin&reitek.com 16020 Wasadata System AB Tor Borrhed @@ -72507,9 +72507,9 @@ Ryan Hodgson ryan&skylinkdesign.com 18239 - Digital Theater Systems, Inc - Brian Berg - bberg&dtsonline.com + DTS, Inc. (previous was 'Digital Theater Systems, Inc') + Phil Maness + phillip.maness&dts.com 18240 berger.de Thomas Berger @@ -72979,9 +72979,9 @@ Kevin Stevens contact&kevinstevens.info 18357 - Leathern Apron Incorporated + Full Frontal Ingenuity LLC (previous was 'Leathern Apron Incorporated') Paul Talbot - support&leathernapron.us + paul&fullfrontalingenuity.com 18358 EPITECH Notre RN nationnal @@ -81715,9 +81715,9 @@ Tilman Reiff chinchilla&fursr.com 20540 - SIXNET - Dave Ellis - dge&sixnetio.com + Red Lion Controls (SIXNET) + Denis Aull + Engineering&RedLion.net 20541 CITTIO, Inc. Ross Fujii @@ -90430,8 +90430,8 @@ leigh&modern-world.net 22717 VRT - Van de Kauter Marnix - marnix.vandekauter&vrt.be + Lieven Troch + lieven.troch&vrt.be 22718 Centre Reseau Communication Pierre David @@ -92811,8 +92811,8 @@ markus&macab.se 23312 IntelliCom Innovation AB - Lars-Ake Ekstrand - laek&intellicom.se + Jens Jakobsen + ianacontact&hms.se 23313 Tesla a.s. ing. Zdenek Kotalik @@ -94352,9 +94352,9 @@ Joe Teoh Chin Hor joe_teoh&nilai.edu.my 23697 - aspector GmbH + hoi-polloi.org (previous was 'aspector GmbH') Bernd R. Fix - Bernd.Fix&aspector.com + brf&hoi-polloi.org 23698 RELDATA Inc. Yann Livis @@ -94697,9 +94697,9 @@ Michal Wrobel mwrobel&asn.pl 23783 - Tellurian Networks, Inc. + iTellus Holdings, Inc. (previous was 'Tellurian Networks, Inc.') Robert Boyle - robert&tellurian.net + robert&itellus.com 23784 StrataLight Communications Roberto Marcoccia @@ -98134,9 +98134,9 @@ Del Miller del&allodialsolutions.com 24642 - University in Sarajevo - Faculty of Electrical Engineering + University of Sarajevo - Faculty of Electrical Engineering Ernedin Zajko - oid.admin&etf.unsa.ba + ezajko&etf.unsa.ba 24643 Cedval Info inc. Francois Meehan @@ -99203,9 +99203,9 @@ Janos Haide iana&storediq.com 24909 - Secure-24, Inc. - Joshua M. Thompson - joshua.thompson&secure-24.com + Secure-24, LLC + Sean E. Millichamp + sean.millichamp&secure-24.com 24910 OOO "ElitStudio" Alex Unigovsky @@ -105069,8 +105069,8 @@ geile&oekonet-bremen.de 26374 University of Illinois - Michael Corn - security&uiuc.edu + Joseph Barnes + security&illinois.edu 26375 Ockan Roberto Costa Filho @@ -108235,9 +108235,9 @@ Nikk Eh nikk.eh&cnet.com 27165 - UTFPR - Daniel Mealha Cabrita - dancab&utfpr.edu.br + Universidade Tecnológica Federal do Paraná (UTFPR) + Thiago Herek + therek&utfpr.edu.br 27166 Checchia.NET IT Consulting Daniel Checchia @@ -109174,8 +109174,8 @@ bernd.haug&gmail.com 27399 Ross Video Limited - Glenn Greig - ggreig&rossvideo.com + Jeff Allen + administrator&rossvideo.com 27400 Randolph-Macon College Jeff Hague @@ -113104,9 +113104,9 @@ chandra nath nath&01edge.com 28381 - N-Tron Corp. - Warren Nicholson - warren.nicholson&n-tron.com + Red Lion Controls (N-Tron) + Denis Aull + Engineering&RedLion.net 28382 AirCell LLC Brad Schnair @@ -115406,7 +115406,7 @@ 28956 Allen Martin Ltd Paul Davies - help&allen-martin.co.uk + box2&allen-martin.co.uk 28957 Institut für Graphische und Parallele Datenverarbeitung, Universität Linz Roland Hopferwieser @@ -118736,9 +118736,9 @@ Krzysztof Czajka iptv&telmor.pl 29789 - BlueTree Wireless Data, Inc. - Fadi Bachaalani - fbachaalani&bluetreewireless.com + Red Lion Controls (BlueTree Wireless Data, Inc.) + Denis Aull + Engineering&RedLion.net 29790 Yelp Inc. Sean Plaice @@ -119433,8 +119433,8 @@ pen-admin&tagsystems.fi 29963 Iron Council - Joseph Harrison - jharrison&ironcouncil.net + Amelia Wilhelm + awilhelm&ironcouncil.net 29964 Tribunal de Contas dos Municipios do Estado do Pará Sérgio Cunha @@ -119461,7 +119461,6 @@ root&morishima.net 29970 Zervina Technologies LLC - Rich Vaughn rvaughn&zervina.com 29971 @@ -119726,8 +119725,8 @@ joy&tw-wireless.com 30036 Nomad Digital Ltd - Erik Haagsman - erik.haagsman&nomadrail.com + Paul Herring + paul.herring&nomadrail.com 30037 Company Extrim pro, Ltd. Maxim A. Serebrov @@ -124314,8 +124313,8 @@ slamberty&vdl.lu 31183 The Logic Group Enterprises Ltd - Paul Milliken - paul.milliken&the-logic-group.com + Mohammad Rahin + mohammad.rahin&the-logic-group.com 31184 EWE AG Stephan Backhaus @@ -127797,9 +127796,9 @@ Jamie Chen jamie.chen&3ypower.com 32054 - IPSL/CETP + IPSL (previous was 'IPSL/CETP') Elisabeth Porteneuve - elisabeth.porteneuve&cetp.ipsl.fr + elisabeth.porteneuve&latmos.ipsl.fr 32055 Service to Youth Council Inc Information and Communication Technology @@ -127826,8 +127825,8 @@ mathieu.pasture&babelway.com 32061 VAS Latvijas Valsts radio un televizijas centrs - Zane Silgale - silgale&lvrtc.lv + Dmitrijs Telnovs + dmitrijs.telnovs&lvrtc.lv 32062 Endersys Omer Faruk Sen @@ -130390,7 +130389,6 @@ dominik.pekarek&loyaltypartner.com 32702 Joint Stock Company "NPO RusBITech" - Vladimir Podobaev rusbitech_cct&mail.ru 32703 @@ -131502,7 +131500,7 @@ Markus Juenemann markus&juenemann.net 32980 - Hitachi Systems Engineering and Solutions, Ltd. (previous was 'Computer System Engineering Co., Ltd.') + Hitachi Systems Engineering Services, Ltd. (previous was 'Hitachi Systems Engineering and Solutions, Ltd.') Yasumasa Ichioka wiseaudit.rm&ml.hitachi-systems.com 32981 @@ -136010,9 +136008,9 @@ Petr Absolon iana&tescoma.com 34107 - SELEX GALILEO + SELEX ES LTD (previous was 'SELEX GALILEO') Davina Forster - davina.forster&selexgalileo.com + davina.forster&selex-es.com 34108 IAM Solutions GmbH & Co. KG Michael Raunft @@ -144443,9 +144441,9 @@ Dawei Qi dqi&galaxytelecomms.com 36215 - Greek Universities Network + Greek Academic Network - GUnet Nikos Voutsinas - nvoutsin&noc.uoa.gr + nvoutsin&gunet.gr 36216 GoliathDNS ENK Atle Solbakken @@ -145480,8 +145478,8 @@ support&directone.ro 36474 Lifespan Corporation - Christopher Logan - clogan&lifespan.org + Paul Howard + pdhoward&lifespan.org 36475 Fujian Etim Information & Technology Co,.Ltd. yangxiaoyan @@ -151309,7 +151307,7 @@ 37931 Bob Greene Bob Greene - bobg&liquidnetworx.com + onms.bg&gmail.com 37932 Jack Storm Jack Storm @@ -152036,8 +152034,8 @@ yedaoliang&163.com 38113 Red Lion Controls Inc. - Paul Marsh - paulm&redlion.net + Denis Aull + Engineering&RedLion.net 38114 Merseytravel Mark Evans @@ -152117,7 +152115,7 @@ 38133 Ingnitia http://www.ingnitia.com Mikel Mugarza - mmugarza&gmail.com + mmugarza&ingnitia.com 38134 National Document Custodians, LLC Albert Wheeler @@ -153015,9 +153013,9 @@ Rafael Forcada rafael.forcada&actualmed.com 38358 - Western Electricity Coordinating Council + Peak Reliability (previous was 'Western Electricity Coordinating Council') Lyonell Keplar - lkeplar&wecc.biz + lkeplar&peakrc.com 38359 Meissner Oliver Meissner @@ -155359,9 +155357,9 @@ Steffen Jeschke s.jeschke&kittner.de 38944 - Kamstrup SVM AB - Ann-Sofie Erdenvik - ase&kamstrup.se + Kamstrup A/S + Erik B. Pedersen + ebp&kamstrup.dk 38945 NASA Center for Climate Simulation (NCCS) Bennett Samowich @@ -156720,8 +156718,8 @@ David.Hodgson&teleware.com 39284 Mountain States Health Alliance - Kimberly Trent - trentkk&msha.com + Kevin Bowes + boweskj&msha.com 39285 Prime Engineering Ltd Jeff Johnson @@ -162316,7 +162314,7 @@ differential.karma&gmail.com 40683 Open Grid Europe GmbH - Norbert Holtkamp + Holger Kayser pen-admin&open-grid-europe.com 40684 Appdynamics @@ -164104,7 +164102,7 @@ l.rizzi&wide-net.org 41130 Mint Medical GmbH - Daniel Maleike + Johannes Kast support&mint-medical.de 41131 LUGO TERMINAL SPA @@ -169087,9 +169085,9 @@ Removed 2013-09-06 ---none--- 42376 - Xyne GmbH + Ocedo GmbH (previous was 'Xyne GmbH') Ulrich Weber - uw&xyne.com + uw&ocedo.com 42377 MBD Consulting, LLC Timothy Sawyer @@ -170992,8 +170990,8 @@ robm&fidelityvoice.com 42852 Bank Gospodarstwa Krajowego - Przemyslaw Wasaznik - przemyslaw.wasaznik&BGK.com.pl + Dorota Remiszewska-Gajek + pwasa&BGK.com.pl 42853 DunnCox Ryan Dunbar @@ -172990,6 +172988,2082 @@ Advania Aki Barkarson aki&advania.is +43352 + Hangzhou Huaxing Chuangye Communication Technology CO.,LTD. + Wang Ke + yujiangang&hxcy.com.cn +43353 + Beijing Certificate Authority + Lanfang Yang + yanglanfang&bjca.org.cn +43354 + OBI Smart Technologies GmbH + Dirk Proepper + dirk.proepper&obi.de +43355 + VTI Instruments Corporation + Dale P. Smith + dsmith&vtiinstruments.com +43356 + Mimosa Networks, Inc + Alexander Gostrer + alex&mimosa.co +43357 + Thomas Fagart (Brozs) + Thomas Fagart + tfagart&brozs.net +43358 + candiansolar.com + wei.yang + wei.yang&canadiansolar.com +43359 + China Guodian Corporation + ChengChuan + ChengChuan&cgdc.com.cn +43360 + Binhai Online Information Technology Company Limited + Sun Yajiang + info&binhai.com +43361 + IT Voimala Oy + Topias Airaksinen + topias.airaksinen&itvoimala.fi +43362 + Zakład Automatyki i Urządzeń Pomiarowych AREX Sp. z o.o. + Marcin Garski + marcin.garski&arex.pl +43363 + B2B.CZ, s.r.o. + Richard Kotal + richard.kotal&b2b.cz +43364 + Vision Box, S.A. + Roger Davies + rdavies&vision-box.com +43365 + Qi ict + Martijn Ebben + martijn.ebben&qi.nl +43366 + N-Tools.de + Dirk Nenninger + iana&n-tools.de +43367 + Suedzucker AG + Wolfgang Junker + wolfgang.junker&suedzucker.de +43368 + Oradian d.o.o. + Dražen Kačar + drazen.kacar&oradian.com +43369 + BrightSign LLC + Mike Crowe + mcrowe&brightsign.biz +43370 + Giordano Bruno Stiftung + Dr. Michael Schmidt-Salomon + it-ops&giordano-bruno-stiftung.de +43371 + Moegui S.p.A + Luciano Giacchetta + admin&moegui.com +43372 + Embedded Access Inc + Craig Honegger + craig.honegger&embedded-access.com +43373 + Associação dos Registradores Imobiliários de São Paulo + walter de oliveira + walter&arisp.com.br +43374 + Belton IT + Thomas Matysik + noc&belton.co.nz +43375 + Baer & Karrer AG + Forgiarini Gabriele + gabriele.forgiarini&baerkarrer.ch +43376 + Ladybird Cranes Ltd. + Karl Knibbs + it&ladybirdcranes.co.uk +43377 + GDV-IT + Christian Graichen + info&gdv-it.de +43378 + Holger Genth (HGD) + Holger Genth + kontakt&holger-genth.de +43379 + R.J. O'Brien and Associates + Matthew Wulk + MWulk&rjobrien.com +43380 + Counterpoint Networking, Inc. + John Hudson + ipadmin&cpoint.net +43381 + GEMATICA SRL + Enrico Ciotola + snmp&gematica.com +43382 + Dreamket Co., Ltd. + Jae Young Lee + duri&dreamket.co.kr +43383 + Commercial Bank “Severo-Vostochny Alliance” (Joint-Stock сompany) + Vasily Rusakov + sb&svabank.ru +43384 + Pelle Olsson (Raholmen) + Pelle Olsson + pelle_olsson&swipnet.se +43385 + Proyectos-IP + Jose Antonio Perez + japerez&proyectos-ip.com +43386 + Expkits + Göktuğ ÇAKMAK + info&expkits.com +43387 + city of Sioux City, IA + Daniel Middleton + dmiddleton&sioux-city.org +43388 + aeworld.co.uk + ian sutherland + isutherland1&hotmail.co.uk +43389 + Eko-konnect Research and Education Initiative + Cletus Okolie + okoliec&eko-konnect.net.ng +43390 + BEIJING FOREVER COMMUNICATION ELECTRONICS CO.,LTD + Jin Cancan + jcc&xinxunxintong.com +43391 + UTT Co., Ltd. + Cho Yoon Sik + yscho&uttsys.com +43392 + Agile Digital Engineering Pty Ltd + Justin Smith + infrastructure&agiledigital.com.au +43393 + S-Net + Henrik. Schröter + registrierung&snet-it.de +43394 + Intrinium, Inc + Nolan Garrett + internalit&intrinium.com +43395 + The City of Amsterdam + Niels de Groot + N.de.Groot&amsterdam.nl +43396 + earthlab (daichi makino) + daichi makino + makino.daichi&earthlab.info +43397 + NET MEDIA SERVICES a.s. + Marek Lukács + marek.lukacs&netmedia.as +43398 + WILDIX + Stefano Osler + stefano.osler&wildix.com +43399 + Tiscali Italia SpA + Anselmo Canfora + acanfora&it.tiscali.com +43400 + IT storitve, Gregor Jerše, s.p. + Gregor Jerše + gregor&jerse.info +43401 + TRData Limited + Anton Pasiechnikov + anton&trdata.com +43402 + Layer-7 Technologies + Michael Rommel + rommel&layer-7.net +43403 + CareerHub Pty Ltd + Dee Hughes + dee&careerhub.com.au +43404 + SOCIEDAD ESTATAL CORREOS Y TELEGRAFOS SA + David Matesanz + asei&correos.com +43405 + SA Water Corporation + Andrew Commons + issecurity&sawater.com.au +43406 + Universiti Putra Malaysia + Norhayti Mustafa + ldap&upm.edu.my +43407 + David Martin (ReaperLegion) + David Martin + ReaperLegion&gmail.com +43408 + HDmessaging Inc + Juho-Pekka Virolainen + ops&hdmessaging.com +43409 + Reith IT-Lösungen GmbH + Nico Reith + info&reith.it +43410 + Joseph Williams + Joseph Williams + williams.joe&gmail.com +43411 + Graeser Development + Patrik Gräser + mib-mgr&graeser.se +43412 + Genius Digital Limited + Alex Dick + registry&geniusdigital.tv +43413 + Fairview Health Services + Coral Lindahl + codell1&fairview.org +43414 + Molson Coors Brewing Company + Jackie Halewood + jackie.halewood&molsoncoors.com +43415 + Deepblue Informatikai Kft + Attila Kuti + attila.kuti&deepblue.hu +43416 + Multigenregameworld LLC + Mikhail Kuznetsov + mikhail.kuznetsov&mggworld.com +43417 + South Side Hackerspace Chicago, NFP + Christopher Swingler + cto&sshchicago.org +43418 + Khakham Sayavong (Nticks) + Khakham Sayavong + contact&nticks.net +43419 + Microsoft Unified Communications and Collaboration User Group + Yves Frédéric N´Soussoula + info&msuccug.de +43420 + Proximic Inc + Paul Armstrong + iana&proximic.com +43421 + SysMa.cz + Tomas Krejcik + tomas.krejcikz&gmail.com +43422 + ADTEC Communications + Jon Bolton + engineering&adtec.com.au +43423 + KeyONet + Kim Cheol Kee + firstpw&keyonet.com +43424 + Securitas FINLAND + Juha Miettinen + juha.miettinen&securitas.fi +43425 + Aduno Gruppe + Boris Bellorini + boris.bellorini&aduno-gruppe.ch +43426 + Noction + Eugeniu Ceglov + eceglov&noction.com +43427 + Altus Sistemas de Automação S.A + Rafael Morello + rd&altus.com.br +43428 + The William and Flora Hewlett Foundation + Boris Decout + bdecout&hewlett.org +43429 + Strata Information Technology, Inc + Keith Stark + keith&stratait.com +43430 + Systems Definition, Inc. + Frank Briese + briesef&systemsdefinition.com +43431 + Tate, Inc. + Peter Strapp + pstrapp&tateinc.com +43432 + MICROMED BIOTECNOLOGIA LTDA + FRANCISCO DUARTE MOREIRA NETO + neto&micromed.ind.br +43433 + Sreevidya Aravind + Sreevidya Aravind + sv.vidyaaravind&gmail.com +43434 + Metacom Pty Ltd + Stefan Reinke + stefan&metacom.co.za +43435 + Nutsrange Technologies + James Gu + nutsrange&gmail.com +43436 + Accumuli PLC + Paul Maskelyne + paul.maskelyne&accumuli.com +43437 + City of Montclair + Robert Castillo + rcastillo&cityofmontclair.org +43438 + County Of Bruce + Jaron Kerr + jkerr&brucecounty.on.ca +43439 + J.J. Downs Industrial Plastics Inc. + Dani Cela + dcela&jjdowns.com +43440 + royal holloway, university of london + roger matthews + roger.matthews&rhul.ac.uk +43441 + royal holloway, university of london + roger matthews + roger.matthews&rhul.ac.uk +43442 + Niles Radio Communications + John Lindsey + john&nilesradio.com +43443 + Transacciones y Servicios Mobile + Fernando Bas + ferbas&transermobile.com +43444 + Inspire Living, Inc. + Michael Script + mscript&inspirelivinginc.com +43445 + 4th Layer Integrated Solutions S.r.l. + Enrico Milani + enrico.milani&4lis.it +43446 + Hartmann Electronic GmbH + Fedor Minich + fedor.minich&hartmann-electronic.com +43447 + LoadFront, S.L. + Víctor Román Archidona + vroman&loadfront.com +43448 + THEFEINERS.COM + Amnon Feiner + Amnon.Feiner&hotmail.com +43449 + mobilcom-debitel GmbH + Jan Singer + jan.singer&md.de +43450 + Agencja Restrukturyzacji i Modernizacji Rolnictwa + Marek Michnowicz + PKI&arimr.gov.pl +43451 + Australian Customs and Border Protection Service + Chris Sherlock + chris.sherlock&customs.gov.au +43452 + Pragtec inc. + Jean-Francois Savard + jf.savard&pragtec.com +43453 + Visiometrics S.L. + Tony Rueda Roselló + tony.rueda&visiometrics.com +43454 + Wiccess + Jean-Paul Mallet + jp.mallet&wiccess.com +43455 + LFT Solutions + Angel Manchado + angel.manchado&lftsolutions.com +43456 + KHS GmbH + Frank Jaenecke + frank.jaenecke&khs.com +43457 + Warp Software Ltda. + Luiz Imbroisi Filho + luiz&imbroisi.com +43458 + Nvizible Ltd + Mr Andrew Kingston + licenses&nvizible.com +43459 + Virsae Group Ltd + Matthew Bagley + matthew.bagley&virsae.com +43460 + university college Leuven Limburg (UCLL) + Noe Gunther + gunther.noe&khleuven.be +43461 + DGIT INTERNATIONAL PTE. LTD + Allan Randall + engineering&dgit.biz +43462 + Universidade Federal Rural de Pernambuco + Carlos Frederico Medeiros de Souza + coord.suporte&nti.ufrpe.br +43463 + Kyoto-University Microcomputer Club + Kasumi Hanazuki + hanazuki&kmc.gr.jp +43464 + Ten Cities Media + Greg Foster + greg.foster&tencitiesmedia.com +43465 + Communication Federal Credit Union + Travis Llewellyn + travisll&comfedcu.org +43466 + CMS Central Media Solutions GmbH + Lablack, Stefan + stefan.lablack&centralmedia-solutions.de +43467 + Evolv, Inc. + Haam Tham + pencontact&evolv.net +43468 + Cacto Internet Ltda + Daniel Farias + daniel&cacto.me +43469 + Sysnove + Guillaume Subiron + guillaume&sysnove.fr +43470 + G + H Netzwerk-Design Gesellschaft für IT-Consulting mbH + Tobias Schröder + t.schroeder&netzwerk-design.de +43471 + Sun Trading Solutions + Jason Conley + jconley&suntradingllc.com +43472 + APC Integrated Services Group, Inc. + Matt Lehmann + mlehmann&apcisg.com +43473 + YHGfL Foundation + Andrew Yoward + support&yhgfl.net +43474 + Coca-Cola Hellenic Bottling Company + Martin Mirov + martin.mirov&cchellenic.com +43475 + XNX Sàrl + Cyril Christin + iana-pen&xnx.ch +43476 + LeanDev + Robert Pettersson + robert.pettersson&leandev.se +43477 + Bioss Consulting SRL + Giovanni Tirino + info&biossconsulting.com +43478 + Jonathon Anderson (civilfritz) + Jonathon Anderson + anderbubble&gmail.com +43479 + Ecole nationale Supérieure d'Informatique + MEDABIS BILAL + b_medabis&esi.dz +43480 + Canine Creche + Alanna Marquis + info&caninecreche.co.za +43481 + Innovaatik Grupp OÜ + Jargo Kõster + jargo&inno.ee +43482 + GlobalSensing Technologies + Olivier BROUSSE + r_et_d&globalsensing.eu +43483 + AIPHONE CO., LTD. + Hirokazu Harima + soft_snmp&aiphone.co.jp +43484 + Fundación Fulgor + Juan Vercellone + jvercellone&fundacionfulgor.org.ar +43485 + Trillium Teamologies, Inc. + Robert Morris + helpdesk&trilliumteam.com +43486 + Fuse Networks, LLC + Garan Williams + garanwilliams&fusenetworks.com +43487 + Guangzhou Woxiang Information Technology Co., Ltd + Difan Zhang + tifan&ifanr.com +43488 + Schletter GmbH + Markus Burgstaller + markus.burgstaller&schletter.de +43489 + GOOD FIRST GROUP . + HongDe + 59295152&qq.com +43490 + Rite-Tech Industrial Co., Ltd. + Sam Huang + sam&ritetech.com.tw +43491 + ITR Service GmbH + Stephan Schumann + stephan.schumann&itr-service.de +43492 + Bernhard Trinnes (microdots) + Bernhard Trinnes + bernhard.trinnes&microdots.de +43493 + Online Linjeforening + Kristian Ekle + kristian.ekle&gmail.com +43494 + Clarity Ltd + Robert Stiles + b06&gmx.com +43495 + Taide Enterprise Co.,Ltd. + Luo Xinheng + luo&tai-de.com +43496 + QSC AG + Thore Bunde + thore.bunde&qsc.de +43497 + Weavesys UK + Elliott Clark + elliott.clark&weavesys.com +43498 + SENSORBOX DO BRASIL LTDA + Carlos Eduardo Padua Sarcinelli + c.eduardo&sensorbox.com.br +43499 + Youncta + Luigi Russo + luigi.russo&youncta.com +43500 + 4D Security Solutions + Ken Robinson + kenneth_robinson&4-dsecurity.com +43501 + Boston Financial Data Services Inc + Rob Forand + rforand&bostonfinancial.com +43502 + HighRes Biosolutions + Ian Locke + ilocke&highresbio.com +43503 + Jay Ridgeway (beekling.com) + Jay Ridgeway + jayridge&gmail.com +43504 + Judd Storrs + Judd Storrs + jstorrs&gmail.com +43505 + Plugh Studios Ltd + Randy Beiter + iana&plughstudios.com +43506 + Beats by Dre + Brannon Means + brannon.means&beatsbydre.com +43507 + ti&m AG + Harald Böttcher + harald.boettcher&ti8m.ch +43508 + EDT SAS - Electronic Data Transfer + Stéphane CHANVILLARD + schanvillard&edt.fr +43509 + BITPRO AS + André Nordstokke + an&bitpro.no +43510 + Juan Jose Rodriguez Ponce + Juan Jose Rodriguez Ponce + mail&juan-jose.com +43511 + E7 Solutions + Brandon Opfermann + brandon.opfermann&e7solutions.com +43512 + BEIJING SIFANG AUTOMATION CO., LTD + youtao + youtao&sf-auto.com +43513 + SDIS68 + Nicolas Riss + nicolas.riss&sdis68.fr +43514 + kt telecop + Park, Sang Yeon + itsmeda.park&kt.com +43515 + NISCOM,Inc. + Kaoru Miyazaki + k-miyazaki&niscom.co.jp +43516 + Auvik Networks Inc. + Marc Morin + mmorin&auvik.com +43517 + CoolMinds Technologies (P) Ltd + Abraham Jacob + abraham&coolmindsinc.com +43518 + Smartconnect NV / SA + Mark Tetrode + mark.tetrode&smartconnect.eu +43519 + Tranwall + Aurelien Duarte + aurelien.duarte&tranwall.com +43520 + pteam gmbh + Markus Gruetter + office&pteam.ch +43521 + RSE Informationstechnologie GmbH + Dipl.Ing. Alfred Darmann + darmann&rse.at +43522 + VoltServer, Inc. + Dan Lowe + dan.lowe&voltserver.com +43523 + Alberta Investment Management Corporation + Nathanael Law + nathanael.law&aimco.alberta.ca +43524 + Vanteon Corp. + Matt Healy + mhealy&vanteon.com +43525 + Wavecon GmbH + Cemil Degirmenci + info&wavecon.de +43526 + Signal Bredbånd AS + Lars Erik Utsi Gullerud + lerik&signal.no +43527 + Presidio Networked Solutions + Robert Shade + rshade&presidio.com +43528 + SHODEN CORPORATION + Yoshito Yagi + yagi&sdn.co.jp +43529 + Istituto Radiologico e Fisioradioterapico Valdarno + Andrea Venanzi + andrea.venanzi&centromedicovaldarno.it +43530 + HYTEC INTER Co.,Ltd. + Takashi Nishihara + net_admin&hytec.co.jp +43531 + Atomic Object LLC + Justin Kulesza + admin&atomicobject.com +43532 + Yafeng Shan (kokonur) + Yafeng Shan + yafeng.shan&gmail.com +43533 + Beijing National Railway Research & Design Institude of Signal & Communication Co, Ltd. (CRSCD) + Yafeng Shan + yafeng.shan&gmail.com +43534 + Alstom Grid + Zhi Shi + zhi.shi&alstom.com +43535 + Luxottica North America Distribution LLC + David Reasoner + dreasone&luxotticaretail.com +43536 + AO K-Dorstroy + Alex Chernyavskiy + support&k-dorstroy.kz +43537 + Solumed + Saul Jankelow + Saulj&solumed.co.za +43538 + EXA-TMR + Tülin Yaman + tulin.yaman&exa-tmr.com +43539 + Dwarf Animation Studio + Yann VOTÉ + it&dwarf-labs.com +43540 + Federal Agricultural Marketing Authority + Sharifah Khairun Nisa Habib Elias + ldap&fama.gov.my +43541 + LSY Inc + Brian Grey + brian.grey&lsyinc.com +43542 + DENT Instruments + Jesse Laird + jlaird&dentinstruments.com +43543 + ID Business Solutions Ltd + Simon Diaz + snmp-admin&idbs.com +43544 + DigiComm GmbH + Theo Bongartz + tbongartz&digicomm.de +43545 + Omnitracs, LLC + Pete Patron + ppatron&omnitracs.com +43546 + Tariox Limited + Martyn Van Berkel + hostmaster&tariox.com +43547 + SCOOP Software GmbH + Jürgen Link + juergen.link&scoop-software.de +43548 + Trasis sa + Gauthier Philippart + info&trasis.com +43549 + IT Competence Group SE + Karl Gerber + support&neton.ag +43550 + CAMEA spol. s r. o. + Fučík Otto + camea&camea.cz +43551 + Mavari-IT bvba + Peter Maeseele + peter&mavari.be +43552 + Whitesky Communications + Spencer Thomason + spencer&whiteskycommunications.com +43553 + Rapid Focus Security, Inc. + Sam Stelfox + sam&pwnieexpress.com +43554 + IGC + Didier Houdas + didier.houdas&igc-erp.com +43555 + LayeredDefense + Deral Heiland + dh&layereddefense.com +43556 + Rigas domes Informacijas tehnologiju centrs + Juris Persins + Juris.Persins&riga.lv +43557 + Nick Fender + Nick Fender + net.admin&nickfender.com +43558 + GitHub, Inc + Hugh Bawt + ops&github.com +43559 + ENKOM AG + Patrick Bruegger + info&enkom.com +43560 + New Orleans East Hospital + Kimberly Jones-Williams + Kim.JWilliams&NOEHospital.org +43561 + Micro-Research Finland Oy + Jukka Pietarinen + jukka.pietarinen&mrf.fi +43562 + ZepMed, LLC + Nathan White + natewhite44&gmail.com +43563 + pedro paulo medeiros + Pedro Paulo Medeiros + ppmedeiros&ig.com.br +43564 + TSC AUTO ID Technology Co., Ltd. + Phil Liu + phil&tscprinters.com +43565 + Reliance Jio Infocomm Limited + Sudhanshu Purwar + sudhanshu.purwar&ril.com +43566 + Engineering Center REGIONAL SYSTEMS, Limited + Alexey Gordichuk + a.gordichuk&ec-rs.ru +43567 + Yongjia County Board of Education + Li Chengdao + lcd&yje.cn +43568 + EMICON + Rifat Abdulkaumov + rifat&emicon.ru +43569 + Hong Yun Technology + Hong Yun + hongyuntech&gmail.com +43570 + Coopérative Forestière Bourgogne Limousin (CFBL) + Chantal BRODIN PREVOSTO + chantal.prevosto&cfbl.fr +43571 + SOCIETE DES TRANSPORTS ROCHATTE + Rose-Marie ROCHATTE + str&transports-rochatte.com +43572 + Foundation for Research and Technology Hellas + Panagiotis Sikas + sikas&ics.forth.gr +43573 + VSAT-SERVICE + Shishkov Alexey + shan&vsat-s.ru +43574 + Lansing Makers Network + Michael Johnson + itstaff&lansingmakersnetwork.org +43575 + OpenPeak + Dustin Oprea + dustin&openpeak.com +43576 + IntSec.NET + Alessio Bravi + alessio&bravi.org +43577 + CNPC Beijing Richfit Information Technology Co.,LTD. + Songjiajia + songphd&hotmail.com +43578 + 42technology AG + Stephan Koch + sw-development&42technology.ch +43579 + EASYPROTO di Giacomo Cesari + giacomo cesari + info&easyproto.it +43580 + SutherlandGlobalServices + Arunbabu Rajmohan + Arunbabu.r&sutherlandglobal.com +43581 + Ooyala Inc. + Bao Nguyen + ngqbao&gmail.com +43582 + Document Centric Solutions Ltd + David Randall + sysadmin&doccentrics.com +43583 + ReMake Electric + Karl Palsson + developers&remake-electric.com +43584 + Trizetto Provider Solutions + Kyle Pott + kyle.pott&trizetto.com +43585 + SAMSON AG + Axel Goettmann + agoettmann&samson.de +43586 + SVS TELEKOMÜNİKASYON HİZ. TİC. SAN. A.Ş. + Muhammet Fatih OKUTAN + fatih.okutan&svstelekom.com.tr +43587 + Roave, LLC. + Evan Coury + info&roave.com +43588 + SAA Topnet GmbH + Suzanne Epp + epp&saatopnet.de +43589 + KEKLOLWTF AS + Jan Egil Vestbø + iana&keklolw.tf +43590 + HAL9k hackerspace + Georg Sluyterman + bestyrelse&lists.hal9k.dk +43591 + Erlang Solutions LTD + Michal Tomczuk + sysadmin&erlang-solutions.com +43592 + Campbell Scientific, Incorporated + Sam Utley + sutley&campbellsci.com +43593 + Crimson Innovative + Sudhakara Rao + sudhakarmurala03&gmail.com +43594 + Interhyp AG + Norman Bauer + _IT_Windows_Services&interhyp.de +43595 + MolinoSoft (Julian Bourne) + Julian Bourne + julian&britesc.com +43596 + Carnegie Fitness + Clark Chiu + clark&carnegie-fitness.com +43597 + Comprehensive Health Management, Inc. + Oscar Galdona + oscar.galdona&wellcare.com +43598 + STORM + Sernin van de Krol + chip&storm.vu +43599 + Paneidos Desu + Sernin van de Krol + sernin&paneidosdesu.com +43600 + Beijing Easesky Netcom Technology Co.,Ltd + David Xu + davidxu&easeskytech.com +43601 + Nuri Technology Co., Ltd. + Kwang-Wook, Lee + nuritec&nuritec.co.kr +43602 + Rossiya Segodnya + Andrey Belokurov + postmaster&rian.ru +43603 + The Twelve Tribes + Patrick McCourt + patrick.mccourt&twelvetribes.org +43604 + Arkansas Educational Television Network (AETN) + Greg Barber + gbarber&aetn.org +43605 + Metatrust + Jorge Rocha + jorge.rocha&metatrust.com.mx +43606 + nobaq.net + Nikolaus Hammler + noc&nobaq.net +43607 + Funda Real Estate B.V. + Remie Bolte + beheer&funda.nl +43608 + Raben Group + Marcin Piotrowski + it.admin&raben-group.com +43609 + NetCracker Technology Corp. + Nikita Sizykh + ldap.snmp.oids.group&netcracker.com +43610 + ColosseoEAS, a.s. + Miroslav Petrak + miroslav.petrak&colosseoeas.com +43611 + Power Ethernet + James Gardiner + james.gardiner&powerethernet.com +43612 + IOLAN + Ernst Lemm + e.lemm&iolan.com +43613 + Skylife Engineering + Antonio Rodriguez + itadmin&skylife-eng.com +43614 + phaenovum Schülerforschungszentrum Lörrach-Dreiländereck e.V. + Lars Möllendorf + it-robotik&phaenovum.eu +43615 + VonRoll + Bilal Karaagac + bilal.karaagac&vonroll.com +43616 + Aventura Technologies Inc. + Michael Wangner + info&aventuratechnologies.com +43617 + Vidant Health + Kirk Davis + kirk.davis&vidanthealth.com +43618 + Camtrace + Alain Dumouchel + alcodu1812&gmail.com +43619 + LianYunGang E-Port Information Development Co.,Ltd + Yaokun Zhang + postmaster&lygeport.gov.cn +43620 + Shenzhen Headsun Technology + Bo Liu + 18929378839&189.cn +43621 + Medical Effect + Dr. Roman Zolow + zolow&medical-effect.com +43622 + WebPerative LLC + Alan McCluney + alan&webperative.com +43623 + Umensis - Guillaume Pannatier + Guillaume Pannatier + guillaume.pannatier&gmail.com +43624 + Jaroslav Sendler (xsendl00) + Jaroslav Sendler + sendler.jaroslav&gmail.com +43625 + Core Technology + Krzysztof Kielak + contact&moosefs.com +43626 + NewB + Catherine Blancquaert + info&newb.coop +43627 + Devani Creative + Sernin van de Krol + sernin&devani.nl +43628 + The Rubicon Project + Sean Michael Byron + poc&rubiconproject.com +43629 + PSITEX, LLC + Jack D. Pond + jack.pond&psitex.com +43630 + Duxoft, Inc. + Gennadiy Bezkorovayniy + gb&duxoft.com +43631 + Heijmans N.V. + Edwin van de Burgt + eburgt2&heijmans.nl +43632 + Celtex Works + Davey Robertson + d.robertson&celtexworks.com +43633 + AIES Advanced Industrial Electronic Systems + Dariusz Makowski + dariusz.makowski&aies.pl +43634 + Metrellis, Inc. + Walter Sujansky + wsujansky&sujansky.com +43635 + Practice Velocity, LLC + Gregory J Wentz + gwentz&practicevelocity.com +43636 + LES.NET + Leslie Bester + sales&les.net +43637 + Zymer Inc. + Peter Yoo + pryoo&zymerinc.com +43638 + ITS Korea + Sanghyun Lee + shleego&itskorea.kr +43639 + Evoluta Interactive + Schalk Snyman + schalks&evoluta.biz +43640 + through.other.eyes (Jonathan Platzer) + Jonathan Platzer + jonathan1996&gmx.at +43641 + netplus.ch SA + Jean-Blaise Rey + jean-blaise.rey&netplus.pro +43642 + Linde Engineering + Walter Werther + walter.werther&linde-le.com +43643 + TEQ SA + Alessandro Prioglio + tech-admin&teq.ch +43644 + Infra Services + Arjen Barnhard + pen.iana&infra-services.net +43645 + FEIG ELECTRONIC GmbH + Sascha Brueck + sascha.brueck&feig.de +43646 + Datatal AB + Thomas Persson + thomas&datatal.se +43647 + Rimbach IT Systems UG + Rene M. Rimbach + info&rimbach-it-systems.de +43648 + Naudit High Performance Computing and Networking S.L. + Eduardo Magaña + eduardo.magana&naudit.es +43649 + Raritan Bay Medical Center + Susan Landow + slandow&rbmc.org +43650 + United Health Services + Kevin Rymer + kevin_rymer&uhs.org +43651 + INTTRA Inc + Michael Lunny + michael.lunny&inttra.com +43652 + GoBICS + Rasmus Steinkamp + iana.pen.6kUL4EWH2w&gobics.de +43653 + UNIVERSITAT OBERTA DE CATALUNYA + Carles Cortada i Hortalà + ccortada&uoc.edu +43654 + marcsi.ch + Marc Siegenthaler + shin&marcsi.ch +43655 + University Ecclesiastical Academy of Thessaloniki + Telemachos Stamkopoulos + telem&aeath.gr +43656 + Consortium + Samsun Kang + sammy-kang&nate.com +43657 + Kanton St.Gallen + Robert Schneider + Robert.Schneider&sg.ch +43658 + Seacloud + Bong Dae Kim + bd.kim&sea-cloud.co.kr +43659 + Hochschule für Technik und Wirtschaft des Saarlandes (htw saar) + Niclas Wolniak + niclas.wolniak&htwsaar.de +43660 + Zadara Storage Ltd + Yair Hershko + yair&zadarastorage.com +43661 + Columbus Business Solutions + Johnny Mejias + jmejias17&gmail.com +43662 + Simpson Housing LLLP + Gene Pinson + gene.pinson&simpsonhousing.com +43663 + eTouch Federal Systems + Benjamin Stassart + iana&etouchfederal.com +43664 + Unzane + Gerald Turner + gturner&unzane.com +43665 + rioxo GmbH + Rudolf Rohr + rudolf.rohr&rioxo.net +43666 + Hackerspace Brussels + Frederic Pasteleurs + askarel&hackerspace.be +43667 + Sunwire Inc + Jason Legault + support&sunwire.ca +43668 + Andreas Kreisel + Andreas Kreisel + akreisel&duck-edv.de +43669 + The Institute of Mathematical Sciences + B. Raveendra Reddy + ravi&imsc.res.in +43670 + Epic Code Pty. Ltd. + Michael Slade + mslade&knobbits.org +43671 + EMSEAS Teknik AB + Jonathan Petersson + jonathan.petersson&cxense.com +43672 + INTELLECT MODULE + Ivan Fedotov + ivan&intellect-module.ru +43673 + Federal State Unitary Enterprise CentrInform + Aleksey Gvozdev + a.gvozdev&center-inform.ru +43674 + Robonect + Mikhail Sokolov + robot&robonect.com +43675 + Accenture CAS GmbH + Carsten Mueller + carsten.mueller&accenture.com +43676 + 57North Hacklab + Iain Learmonth + irl&fsfe.org +43677 + ICT Plus srl + Alessandro Barsotti + alessandro.barsotti&ictplus.it +43678 + Michael Kramer + Michael Kramer + verwaltung&turkeyfish.de +43679 + SETTE + Sotir Gramosli + sotir.gramosli&sette.com.mk +43680 + Chorus Limited + David Vink + chorusopsnotify&chorus.co.nz +43681 + ELESTER-PKP Sp. z o.o. + Robert Bojara + robert.bojara&elester-pkp.com.pl +43682 + ITSA Consulting, LLC + Joshua M Miller + joshua&itsecureadmin.com +43683 + ALDEIS + Damien guigue + damien&yooda.com +43684 + NOVASIB GmbH + René Carl + rene.carl&novasib.de +43685 + biz:Consult Unternehmensberatung GmbH + Gregor Kralik + gregor.kralik&bizconsult.at +43686 + Jefferson County + David Olsen + itstaff&co.jefferson.wa.us +43687 + Christoph Knott - IT-Sicherheitstechnik + Christoph Knott + info&it-sicher.com +43688 + GERMEN ELEKTRONIK LTD + MURAT GERMEN + mgermen&germen.com.tr +43689 + schugart + Dimitri Fagart + raspberry&schugart.net +43690 + The Active Network + Heather Tillman + heather.tillman&activenetwork.com +43691 + Michael Kettner + Michael Kettner + mikettner&gmx.de +43692 + haberberger.com + Andreas Haberberger + admin&haberberger.com +43693 + Fotolia LLC + Renaud Chaput + renaud&fotolia.com +43694 + Omega Intelligence Systems Ltd + Martin Adamczyk + martin&omegahq.biz +43695 + 5nine Software + Dr. Konstantin Malkov + kmalkov&5nine.com +43696 + LLC Info-Kontent + Sergey Mudrak + sergey.mudrak&beeper.ru +43697 + JSC Bryansk Supply Company + Ivan Toporkov + Ivan&elektro-32.ru +43698 + Joint Electronic Teller Services Ltd. + Ricky Man + rickyman&jetco.com.hk +43699 + EasyData, LLC + Vladimir Baranov + info&easydata.ru +43700 + PathCore + Dan Hosseinzadeh + iana.org&pathcore.ca +43701 + HySecurity, Inc. + Chuck Davidson + cdavidson&hysecurity.com +43702 + Dom-Daniel + Artashes Kalantarian + artashes&dom-daniel.com +43703 + Wacom Company Ltd. + Daniel Dietz + daniel.dietz&wacom.eu +43704 + Accutron Instruments Inc + Mike Sharkey + mike&accutroninstruments.com +43705 + F!nTcH.org + Vincent BECHON + fintch&fintch.org +43706 + Statnett SF + Roar Håkonsen + roar.hakonsen&statnett.no +43707 + Australian Rail Tecchnology + Thomas George + t.george&ar-tech.com.au +43708 + SimonMed Imaging + Chris Diehn + cdiehn&simonmed.com +43709 + AirDSL (Pty) Ltd + Iliyan Dobrev + iliyan&airdsl.co.za +43710 + GAMESA + Jose Antonio Contreras Caballero + jacontreras&gamesacorp.com +43711 + mySupply ApS + Peter Freiberg + peter.schmidt.freiberg&mySupply.dk +43712 + Universidad Central de Venezuela + Alberto Bellorin + alberto.bellorin&ucv.ve +43713 + Code 42 + Ethan J Sommer + ethan&code42.com +43714 + Mega Soft Computación, C.A. + Jose E. Delgado + infra&megasoft.com.ve +43715 + Data Infrastructure Technologies Ltd. + Chris Ianculovici + crs5tx&gmail.com +43716 + Veterinary Nurse Solutions Pty Ltd + Deane Klaer + deane&vetnurse.com.au +43717 + imensup + makan jooyani + info&imensup.com +43718 + Österreichisches Weltraum Forum + Sebastian Sams + sebastian.sams&oewf.org +43719 + Telvio LLC + Andrew Kolchoogin + gadm&telvio.ru +43720 + Creat0r.pro + Sergey A. Prokofyev + s-proff&creat0r.pro +43721 + Cyberoam Technologies Pvt. Ltd. + Sanket Handa + pen.iana&cyberoam.com +43722 + DAC Systems, Inc. + Mark Nickson + mnickson&dacsystems.com +43723 + Stancil Corporation + Simon Farrow + simon.farrow&stancilcorp.com +43724 + Japan Prime Computing + daisuke watanabe + watanabe.daisuke&j-pc.jp +43725 + Casair, Inc + Mike Sturdee + mike.sturdee&casair.net +43726 + GO! Express & Logistics Deutschland GmbH + Uwe Rehorst + uwe.rehorst&general-overnight.com +43727 + Valeo Comfort ans Driving assitance + Etter Stephan + stephan.etter&valeo.com +43728 + Sinergise Ltd. + Primoz Kolaric + primoz.kolaric&sinergise.com +43729 + Teckids e.V. + Dominik George + dominik.george&teckids.org +43730 + Ernst Klett AG + Horst Lehmacher + hostmaster&klett-gruppe.de +43731 + FooxTek Co., LTD. + David Chu + david&foox.cc +43732 + Netmag Technology Corporation + Joyce Chen + joycechen&netmag-tech.com +43733 + East Photonics, Inc. + Yong-Seung Jeong + tech&eastphotonics.com +43734 + IQUO Ltd + Peter Reynolds + peter&iquo.co.uk +43735 + STI-Tassimco + Patrick Lauziere + patrick.lauziere&sti-tassimco.com +43736 + Standard Imaging, Inc. + Mark Mackenzie + mmackenzie&standardimaging.com +43737 + MedAllies + Devin Kusek + dkusek&medallies.com +43738 + Doshisha University + TANAKA, Yasuhiro + donetmgr&mail.doshisha.ac.jp +43739 + Concept Smoke screen Ltd + Matt Gilmartin + Matt&smoke-screen.co.uk +43740 + ASB-Technology Sp. z o.o. + Tomasz Cholewiński + t.cholewinski&asb.nl +43741 + Cerqueira & Marcos, Lda + Luis Martins + luis.fcm&netcabo.pt +43742 + Microx Computer GmbH + Adam Jaskowiec + adam.jaskowiec&microx-computer.de +43743 + Open Systems Technology, Pty. + Louis Rodriguez + itt&ost.com.au +43744 + airberlin + Peter Jaremenko + peter.jaremenko&airberlin.com +43745 + CONSEJO DE LA JUDICATURA + David Moncayo + entidad.certificacion&funcionjudicial.gob.ec +43746 + Ulterius Technologies, LLC + Alex Cavgalar + alex.cavgalar&ulteriustech.com +43747 + MaterialApps + Andreas Werder + andreas.werder&yahoo.com +43748 + ARES Conocimiento de Negocio, SL + Andres Escribano de Mingo + AEscribano&ares-cn.es +43749 + Country Bright Company Ltd. + Terence Ho + it&countrybright.com +43750 + Jabil Circuit, Inc + Thomas Cetta + domains-administrator&jabil.com +43751 + Shenzhen TG-NET Botone Technology CO. Ltd. + Shine Zhang + xian.zhang&tg-net.cn +43752 + China Film Equipment Co. Ltd. + linxiaofei + linxiaofei&cfec.com.cn +43753 + Kyriasis + Johannes Löthberg + johannes&kyriasis.com +43754 + Philipp Wagner Softwareentwicklung + Philipp Wagner + mail&philipp-wagner.com +43755 + BG-Phoenics GmbH + David Feindel + david.feindel&bg-phoenics.de +43756 + Schwarz Dienstleistung KG + Max Killinger + gtld&sbg.de +43757 + QOSIT AG + Uwe Schneider + uwe.schneider&qosit.com +43758 + Clique Intelligence Inc. + Art Leondires + art.leondires&cliqueintelligence.com +43759 + Big White Network Technologies,Ltd. + Tuhongchao + tuhongchao&bigwhitenet.com +43760 + Atlas Networks + Nathan Eisenberg + nathan&atlasnetworks.us +43761 + Our School Ltd + Brett Merrick + support&ourschool.co.nz +43762 + PlazaLotusGroup + Pavel Chikovani + admin&plazalotus.com +43763 + ChinaFilm Global (Beijing) Technology limited + wang heng + heng.wang&cfgdc.net +43764 + Tallac Networks + Matthew Davy + mpd&tallac.com +43765 + Color Print + Torben Vingborg + TV&colorprint.dk +43766 + MBSys LLC Azerbaijan + Mehdi Kamran Mammadov + mehdi&mbsys.tv +43767 + Eastern Long Island Hospital + Susan Apicello + sapicello&elih.org +43768 + GatesAir, Inc. + Bradley Thomson + brad.thomson&gatesair.com +43769 + Vezea + Sebastian Wetzel + iana.admin&vezea.com +43770 + Addat s.r.o. + Ing. Jiri Kubias + jiri.kubias&addat.cz +43771 + Behlman Electronics + Heather Savage + hsavage&behlman.com +43772 + K+S IT-Services GmbH + Regina Böhm + regina.boehm&k-plus-s.com +43773 + The Vancouver Clinic Inc. + Tim Morris + netadmins&tvc.org +43774 + Hortonworks Inc + Jesse Lesperance + jlesperance&hortonworks.com +43775 + Quotepro Inc + Brian Marquis + brian&quotepro.com +43776 + Symbiotic System Design + Manuel Deschambault + themactech&me.com +43777 + Maikel de Boer + Maikel de Boer + maikel&loopodoopo.nl +43778 + Hampshire Controls Corporation + Diane D. Rush + drush&hampshirecontrols.com +43779 + Finnova AG + Alexander Berger + alexander.berger&finnova.ch +43780 + Paradox Networks, Inc + Jackie Bates + iana-pen&paradoxnetworks.net +43781 + Moshel Kamadu Records + Markus Szumovski + markus.szumovski&moshel-kamadu.at +43782 + UPS Solutions INC. + Mitsunari Tomosaka + sdb-develop&ups-sol.com +43783 + WaveNet Communications Private Limited + MUSUNURU SRIDHAR + ms&wavenet.co +43784 + IFOM + Ivan Lago + ivan.lago&ifom.eu +43785 + Magellium + Romain Cabassot + romain.cabassot&magellium.fr +43786 + Factual Inc + Philip Marcus + sysops&factual.com +43787 + Leviathan Security Technologies + Falcon Darkstar Momot + falcon.momot&leviathansecurity.com +43788 + Comita d.d. + Bojan Oresnik + bojan.oresnik&comita.net +43789 + Trading & Consulting `H.P.C.´ GmbH + Robert Gierzinger + rg&hpc.at +43790 + becker-aero + Roger Becker + roger.becker&becker-aero.de +43791 + Cine Digital Service + Ronan SALMON + snmp&cinedigitalservice.fr +43792 + Now Wireless Limited + Brett Warthen + brett&nowsms.com +43793 + Tom Gundersen (systemd) + Tom Gundersen + teg&jklm.no +43794 + Chris Thomson + Chris Thomson + chris&chris-thomson.co.uk +43795 + Guangzhou Andea Electronics Technology Co.,Ltd + ZhenSong Li + lzs6401948&163.com +43796 + Rasing IT Solutions + Bastiaan Rasing + bastiaan&rasing.me +43797 + Croz d.o.o. + Neven Biruski + nbiruski&croz.net +43798 + NANJING SAND TECHNOLOGY CO., LTD + Wang Kai Jiang + tech&sandkj.com +43799 + TRUMPF GmbH + Co. KG + Andreas Reinmoeller + andreas.reinmoeller&de.trumpf.com +43800 + OraSentry + Raphaël Tiran + raphael&orasentry.com +43801 + Dolphin Systems AG + Peter Honegger + peter.honegger&dolphin.ch +43802 + Avaloq Evolution AG + Jukka Salmi + jukka.salmi&avaloq.com +43803 + University of South Wales + Jeremy Thomas + sysadmin&southwales.ac.uk +43804 + Bombardier Aerospace + Marc Rinfret + marc.rinfret&aero.bombardier.com +43805 + Metalogix International GmbH + Anna DeGiorgio + adegiorgio&metalogix.com +43806 + Shape Security, Inc + Judy Karp + judy&shapesecurity.com +43807 + CENTRI Technology, Inc. + Lance Lu + lance&centritechnology.com +43808 + Spincat Studios + Bob Bregant II + bob&spincats.com +43809 + University of the Philippines + Rommel Feria + admin&up.edu.ph +43810 + Li Hongnan (LiHN) + Li Hongnan + mail&lihn.cn +43811 + University of the Philippines Mindanao + Krishna Hernandez + krishnahernandez&upmin.edu.ph +43812 + Corscience GmbH & Co. KG + Florian Kasper + edv&corscience.de +43813 + Centraal Justitieel Incassobureau + C.M. Eyzenga + informatiebeveiliging&cjib.minjus.nl +43814 + GNU Networks Ltd. + Kenneth Peiruza + kenneth&gnun.net +43815 + The University of Texas M.D. Anderson Cancer Center + Sean Walker + swalker&mdanderson.org +43816 + Tran Industries LLC + Duc Tran + info&tranindustries.com +43817 + Vertex Business Services + Pat Sagers + pat.sagers&vertexgroup.com +43818 + Featurespace Limited + Andy Whitell + sysadmin&featurespace.co.uk +43819 + pulse technologies + Ronnie Gilkey + ronnie&pulsetechofla.com +43820 + Mozy, Inc. + Thor Sigurjonsson + thor.sigurjonsson&mozy.com +43821 + Suwannee County School Board + Adam Boatright + adam.boatright&suwannee.k12.fl.us +43822 + Nok Nok Labs, Inc. + John Westien + jw-iana&noknok.com +43823 + VAS Experts + Dmitriy Moldavanov + dmoldavanov&vasexperts.ru +43824 + ConectaIP Tecnologia S.L. + Jordi Corpas + jordi.corpas&conectaip.es +43825 + Earnest Products, Inc. dba Southern Manufacturing + Anjanett Exum + aexum&southernmfg.com +43826 + TEXKA LABS + Carlos Visser + cvisser&texka.com +43827 + Ideosoft C.B. + Juan Gomez Melero + jgomez&ideosoft.es +43828 + Bosoft + Karol Klos + karol.r.klos&gmail.com +43829 + Ifield School + Andrew Mudamai + amudamai&ifield.kent.sch.uk +43830 + eWater Pty Ltd + Erick Tomaliwan + support&ewater.com.au +43831 + Ezvoicetek Co., Ltd. + Samuel Sung + samuel&ezvoicetek.com +43832 + Beijing D&S FieldBus Technology Co.,Ltd + Biao Wang + wangbiao&c-profibus.com.cn +43833 + LIVECREATION + Navas Chakkiyamparimble Hydrose + navas&livecreation.in +43834 + Urban Systems Design Institute + Bugarev Ivan + support&ecocity.ru +43835 + HOCHTIEF CZ, a.s. + Vladimir Bouchal + vladimir.bouchal&hochtief.cz +43836 + C Tech Bilisim Teknolojileri San.ve Tic. A.S + Mahmut Bulut + mahmut.bulut&ctech.com.tr +43837 + DTI Group Ltd + Jean-Michel Florent + jean-michel.florent&dti.com.au +43838 + Genex Hellas L.T.D + Dimitrios Papadopoulos + ts&genex.gr +43839 + RailComm LLC + Tim Myers + tmyers&railcomm.com +43840 + Sumitomo Mitsui Banking Corporation + Sean Boyd + SBoyd&JRI-America.com +43841 + Eatel + Duane Wylie + duane.wylie&eatel.com +43842 + Zero Waste Scotland + Chris Meikle + chris.meikle&zerowastescotland.org.uk +43843 + Alter Trading Corporation, LLC + Jason Hitt + isapps&altertrading.com +43844 + GuangDong Big Banian Info Tech Co., Ltd. + Jack Peng + bigbanian&gd3n.com +43845 + Toshiba Tec Solution Services Corporation + Syo Koyanagi + syou_koyanagi&toshibatec.co.jp +43846 + University of the Philippines - Baguio + Dominic S. Dulay + sysnet&upb.edu.ph +43847 + A Hagedoorn Electronics + Arend Hagedoorn + ah&ah-electronics.com +43848 + INoTHINGS GmbH + Andreas Brodmann + andreas.brodmann&inothings.com +43849 + LiiON, LLC + Thomas Lynn + applications&liionllc.com +43850 + Doxcelerate Corporation + Thierry Thelliez + tt&doxcelerate.com +43851 + danieLLegal.Net - Rechtsanwälte + Dr. Andreas Daniel + daniel&daniellegal.net +43852 + Truseco, s.r.o. + Jakub Horak + info&truseco.com +43853 + Academy of Economic Studies of Moldova + Constantin Sclifos + sclifcon&ase.md +43854 + TU Investment Club e.V. + Mathias Burger + mathias.burger&tuinvest.de +43855 + ezIX.org + Lyonel Vincent + lyonel&ezix.org +43856 + UNIT4 Business Software Spain S.L.U. + Ezequiel Parra Mestre + ezequiel.parra&unit4.com +43857 + mITra data + Supriya Mitra + sm&mitradata.com +43858 + Grigorivska International School + Vadim Baglikov + vadim&grigorivska.com +43859 + Harbor Freight Tools + Garrett Scott + InfoSec&harborfreight.com +43860 + Groenewoud + Frank Groenewoud + snmp&groenewoud.me +43861 + New York Genome Center + Fred Parks + fparks&priveon.com +43862 + Drei Banken EDV Ges.m.b.H. + Lothar Handl + lothar.handl&3beg.at +43863 + Valour Security Ltd + Dave Shaw + dave&val-sec.com +43864 + Breeze Innovations Private Limited + Seenivasan Balaji + balaji_blr&yahoo.com +43865 + Matthias Krause (spectre-net) + Matthias Krause + matthias.krause&hotmail.de +43866 + beijing huafei technology co.,ltd + wukuang + wukuang&huafeitech.com +43867 + Rename it + Rien Broekstra + rien&rename-it.nl +43868 + Conjur Inc + Kevin Gilpin + kgilpin&conjur.net +43869 + Yatharth Gupta + Yatharth Gupta + yatharth.gupta&gmail.com +43870 + Precyse Technologies + Yaniv Shneiderman + yanivs&precysetech.com End of Document
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/follow.c ^
@@ -68,14 +68,14 @@ void follow_stats(follow_stats_t* stats) { - int i; + int i; - for (i = 0; i < 2 ; i++) { - memcpy(stats->ip_address[i], ip_address[i], MAX_IPADDR_LEN); - stats->port[i] = port[i]; - stats->bytes_written[i] = bytes_written[i]; - stats->is_ipv6 = is_ipv6; - } + for (i = 0; i < 2 ; i++) { + memcpy(stats->ip_address[i], ip_address[i], MAX_IPADDR_LEN); + stats->port[i] = port[i]; + stats->bytes_written[i] = bytes_written[i]; + stats->is_ipv6 = is_ipv6; + } } /* this will build libpcap filter text that will only @@ -91,7 +91,7 @@ if( ((pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4) \|\| (pi->net_src.type == AT_IPv6 && pi->net_dst.type == AT_IPv6)) - && pi->ipproto == IP_PROTO_TCP + && pi->ipproto == IP_PROTO_TCP && (conv=find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype, pi->srcport, pi->destport, 0)) != NULL ) { /* TCP over IPv4 / @@ -111,24 +111,24 @@ } } else if( pi->net_src.type == AT_IPv4 && pi->net_dst.type == AT_IPv4 - && pi->ipproto == IP_PROTO_UDP ) { + && pi->ipproto == IP_PROTO_UDP ) { / UDP over IPv4 / buf = g_strdup_printf( - "(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", - ip_to_str((guint8 )pi->net_src.data), - ip_to_str((guint8 )pi->net_dst.data), - pi->srcport, pi->destport ); + "(ip.addr eq %s and ip.addr eq %s) and (udp.port eq %d and udp.port eq %d)", + ip_to_str((guint8 )pi->net_src.data), + ip_to_str((guint8 )pi->net_dst.data), + pi->srcport, pi->destport ); len = 4; is_ipv6 = FALSE; } else if( pi->net_src.type == AT_IPv6 && pi->net_dst.type == AT_IPv6 - && pi->ipproto == IP_PROTO_UDP ) { + && pi->ipproto == IP_PROTO_UDP ) { / UDP over IPv6 / buf = g_strdup_printf( - "(ipv6.addr eq %s and ipv6.addr eq %s) and (udp.port eq %d and udp.port eq %d)", - ip6_to_str((const struct e_in6_addr )pi->net_src.data), - ip6_to_str((const struct e_in6_addr )pi->net_dst.data), - pi->srcport, pi->destport ); + "(ipv6.addr eq %s and ipv6.addr eq %s) and (udp.port eq %d and udp.port eq %d)", + ip6_to_str((const struct e_in6_addr )pi->net_src.data), + ip6_to_str((const struct e_in6_addr )pi->net_dst.data), + pi->srcport, pi->destport ); len = 16; is_ipv6 = TRUE; } @@ -273,11 +273,11 @@ / assign it to a src_index and get going / for( j=0; j<2; j++ ) { if( src_port[j] == 0 ) { - memcpy(src_addr[j], srcx, len); - src_port[j] = srcport; - src_index = j; - first = 1; - break; + memcpy(src_addr[j], srcx, len); + src_port[j] = srcport; + src_index = j; + first = 1; + break; } } } @@ -322,26 +322,26 @@ } / if we are here, we have already seen this src, let's try and figure out if this packet is in the right place / - if( sequence < seq[src_index] ) { + if( LT_SEQ(sequence, seq[src_index]) ) { / this sequence number seems dated, but check the end to make sure it has no more info than we have already seen / newseq = sequence + length; - if( newseq > seq[src_index] ) { + if( GT_SEQ(newseq, seq[src_index]) ) { guint32 new_len; / this one has more than we have seen. let's get the - payload that we have not seen. / + payload that we have not seen. / new_len = seq[src_index] - sequence; if ( data_length <= new_len ) { - data = NULL; - data_length = 0; - incomplete_tcp_stream = TRUE; + data = NULL; + data_length = 0; + incomplete_tcp_stream = TRUE; } else { - data += new_len; - data_length -= new_len; + data += new_len; + data_length -= new_len; } sc.dlen = data_length; sequence = seq[src_index]; @@ -350,7 +350,7 @@ /* this will now appear to be right on time :) / } } - if ( sequence == seq[src_index] ) { + if ( EQ_SEQ(sequence, seq[src_index]) ) { / right on time / seq[src_index] += length; if( synflag ) seq[src_index]++; @@ -371,9 +371,9 @@ tmp_frag->data_len = data_length; memcpy( tmp_frag->data, data, data_length ); if( frags[src_index] ) { - tmp_frag->next = frags[src_index]; + tmp_frag->next = frags[src_index]; } else { - tmp_frag->next = NULL; + tmp_frag->next = NULL; } frags[src_index] = tmp_frag; } @@ -397,13 +397,13 @@ lowest_seq = current->seq; } - if( current->seq < seq[idx] ) { + if( LT_SEQ(current->seq, seq[idx]) ) { guint32 newseq; / this sequence number seems dated, but check the end to make sure it has no more info than we have already seen / newseq = current->seq + current->len; - if( newseq > seq[idx] ) { + if( GT_SEQ(newseq, seq[idx]) ) { guint32 new_pos; / this one has more than we have seen. let's get the @@ -433,7 +433,7 @@ return 1; } - if( current->seq == seq[idx] ) { + if( EQ_SEQ(current->seq, seq[idx]) ) { /* this fragment fits the stream */ if( current->data ) { sc->dlen = current->data_len;
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/ipproto.c ^
@@ -101,7 +101,7 @@ { IP_PROTO_ICMPV6, "ICMPv6" }, /* 58 IPv6-ICMP ICMP for IPv6 [RFC1883] / { IP_PROTO_NONE, "IPv6 no next header" }, / 59 IPv6-NoNxt No Next Header for IPv6 [RFC1883] / { IP_PROTO_DSTOPTS, "IPv6 destination option" },/ 60 IPv6-Opts Destination Options for IPv6 [RFC1883] / - { IP_PROTO_SHIM6_OLD, "SHIM6 header" }, / 61 any host internal protocol [Internet_Assigned_Numbers_Authority] / + { 61, "any host internal protocol" }, / 61 any host internal protocol [Internet_Assigned_Numbers_Authority] / { IP_PROTO_MIPV6_OLD, "Mobile IPv6 (old)" }, / 62 CFTP CFTP [Forsdick, H., "CFTP", Network Message, Bolt Beranek and Newman, January 1982.][Harry_Forsdick] / { 63, "any local network" }, / 63 any local network [Internet_Assigned_Numbers_Authority] / { IP_PROTO_SATEXPAK,"SATNET EXPAK" }, / 64 SAT-EXPAK SATNET and Backroom EXPAK [Steven_Blumenthal] */
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/ipproto.h ^
@@ -98,8 +98,6 @@ #define IP_PROTO_NONE 59 /* IP6 no next header - RFC1883 / #define IP_PROTO_DSTOPTS 60 / IP6 destination options - RFC1883 / / 61 is reserved by IANA for any host internal protocol / -/ 61 is used by UCL's SHIM6 implementation as Next Header for SHIM6 / -#define IP_PROTO_SHIM6_OLD 61 / SHIM6 / / * The current Protocol Numbers list says that the IP protocol number for
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/proto.c ^
@@ -3525,32 +3525,24 @@ switch (hfinfo->type) { case FT_PROTOCOL: + case FT_NONE: + case FT_BYTES: + case FT_STRING: /* - * We allow this to be zero-length - for - * example, an ONC RPC NULL procedure has + * We allow FT_PROTOCOLs to be zero-length - + * for example, an ONC RPC NULL procedure has * neither arguments nor reply, so the * payload for that protocol is empty. * - * However, if the length is negative, the - * start offset is past the byte past the - * end of the tvbuff, so we throw an - * exception. + * We also allow the others to be zero-length - + * because that's the way the code has been for a + * long, long time. + * + * However, we want to ensure that the start + * offset is not past the byte past the end + * of the tvbuff: we throw an exception in that + * case. / - length = tvb_length_remaining(tvb, start); - if (length < 0) { - / - * Use "tvb_ensure_bytes_exist()" - * to force the appropriate exception - * to be thrown. - / - tvb_ensure_bytes_exist(tvb, start, 0); - } - DISSECTOR_ASSERT(length >= 0); - break; - - case FT_NONE: - case FT_BYTES: - case FT_STRING: length = tvb_ensure_length_remaining(tvb, start); DISSECTOR_ASSERT(length >= 0); break;
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/sminmpec.c ^
@@ -1,13 +1,14 @@ /* - * $Id$ - * * THIS FILE IS AUTOGENERATED, DO NOT EDIT * generated from http://www.iana.org/assignments/enterprise-numbers - * run "tools/make-sminmspec <infile> <outfile>" to regenerate + * run "tools/make-sminmpec.pl <infile> <outfile>" to regenerate + * + * Note 1: "Gaps" in the iana enterprise-numbers list have been "filled in" + * with "(Unknown)" as the name so that direct (indexed) access to + * the list is possible. * - * Note: "Gaps" in the iana enterprise-numbers list have been "filled in" - * with "(Unknown)" as the name so that direct (indexed) access - * to the list is possible. + * Note 2: We should probably parse "enterprise-numbers" at program start + * instead of generating this file. / #include "config.h" @@ -600,7 +601,7 @@ { 578, "Interlink Computer Sciences, Inc." }, { 579, "Bridge Information Systems, Inc." }, { 580, "Leeds and Northrup Australia (LNA) Nigel Cook" }, - { 581, "Intec Telecom Systems" }, + { 581, "CSG Systems International (previous was 'Intec Telecom Systems')" }, { 582, "Newport Systems Solutions, Inc." }, { 583, "azel Corporation" }, { 584, "ROBOTIKER" }, @@ -927,7 +928,7 @@ { 905, "Scorpion Logic" }, { 906, "Inotech Inc.Eric Jacobs" }, { 907, "Controlled Power Co." }, - { 908, "Elsag Bailey Incorporated" }, + { 908, "ABB Inc. (previous was 'Elsag Bailey Incorporated')" }, { 909, "J.P. Morgan" }, { 910, "Clear Communications Corp." }, { 911, "General Technology Inc." }, @@ -1231,7 +1232,7 @@ { 1209, "timonWare Inc." }, { 1210, "Capital Resources Computer Corporation" }, { 1211, "Storage Technology Corporation" }, - { 1212, "Tadiran Telecomunications L.T.D" }, + { 1212, "Tadiran Telecom TTL." }, { 1213, "NCP" }, { 1214, "Operations Control Systems (OCS)" }, { 1215, "The NASDAQ Stock Market Inc." }, @@ -1444,7 +1445,7 @@ { 1422, "Syntax" }, { 1423, "LIGHT-INFOCON" }, { 1424, "Performance Technology, Inc." }, - { 1425, "CXR Telecom" }, + { 1425, "CXR" }, { 1426, "Amir Technology Labs" }, { 1427, "ISOCOR" }, { 1428, "Array Technology Corportion" }, @@ -1832,17 +1833,17 @@ { 1810, "Czech Railways s.o. CITJaroslav Militky" }, { 1811, "Scan-Matic A/S" }, { 1812, "DECISION Europe Joel CHOTARD" }, - { 1813, "VTEL CorporationBill Black" }, - { 1814, "Bloomberg, L.P.Franko Rahimi" }, + { 1813, "VTEL Corporation" }, + { 1814, "Bloomberg, L.P." }, { 1815, "Witness Systems, Inc" }, - { 1816, "Rose-Hulman Institute of TechnologyLans H. Carstensen" }, + { 1816, "Rose-Hulman Institute of Technology" }, { 1817, "Aether Technologies" }, { 1818, "Infonet Software SolutionsDavid Hauck" }, { 1819, "CSTI (Compagnie des Signaux / Technologies Informatiques)Mr Camille Breeus" }, { 1820, "LEROY MERLINRIGAULT Alain" }, - { 1821, "Total Entertainment NetworkWill Coertnik" }, - { 1822, "Open Port TechnologyJeffrey Nowland" }, - { 1823, "Mikroelektronik Anwendungszentrum Hamburg GmbHZbynek Bazanowski" }, + { 1821, "Total Entertainment Network" }, + { 1822, "Open Port Technology" }, + { 1823, "Mikroelektronik Anwendungszentrum Hamburg GmbHZ" }, { 1824, "International Management Consulting, Inc." }, { 1825, "Fore Systems, Inc." }, { 1826, "MTech Systems" }, @@ -1909,7 +1910,7 @@ { 1887, "Albis Technologies Ltd. (previously was 'Siemens Switzerland Ltd.')" }, { 1888, "GigaLabs, Inc." }, { 1889, "MET Matra-Ericsson" }, - { 1890, "JBM Electronics" }, + { 1890, "Red Lion Controls (JBM Electronics)" }, { 1891, "OPTIM Systems, Inc." }, { 1892, "Software Brewery" }, { 1893, "WaveLinQ" }, @@ -2172,7 +2173,7 @@ { 2150, "SDS Ltd." }, { 2151, "Promus Hotel Corporation Oscar Pearce" }, { 2152, "Cavid Lawrence Center" }, - { 2153, "Insider Technologies Ltd Paul Hancock 706001.1542 compuserv.com" }, + { 2153, "Insider Technologies Ltd Paul Hancock" }, { 2154, "Berkeley Networks" }, { 2155, "Infonautics Corporation" }, { 2156, "Easy Software" }, @@ -2386,7 +2387,7 @@ { 2364, "Konica Corporation" }, { 2365, "Viacom" }, { 2366, "XIOtech Corporation" }, - { 2367, "IMS Gesellschaft f\|r Informations- und Managementsysteme mbH" }, + { 2367, "IMS Gesellschaft fuer Informations- und Managementsysteme mbH" }, { 2368, "Softworks" }, { 2369, "MobileWare Corporation" }, { 2370, "Memco Software Ltd." }, @@ -3050,7 +3051,7 @@ { 3028, "Dialogic Corporation" }, { 3029, "Digital Data Security" }, { 3030, "ISCNI" }, - { 3031, "daoCon" }, + { 3031, "dao Consulting, LLC" }, { 3032, "Beaufort Memorial Hospital" }, { 3033, "Informationstechnik Dr. Hansmeyer" }, { 3034, "URMET SUD s.p.a." }, @@ -5559,7 +5560,7 @@ { 5537, "Comdial Corporation" }, { 5538, "Micron Tech. Information co. kr" }, { 5539, "Cybertek Holdings" }, - { 5540, "Aachen University of Technology (RWTH)" }, + { 5540, "RWTH Aachen University" }, { 5541, "Paragea Communications, Inc" }, { 5542, "eOn Communications Corporation" }, { 5543, "INIEMP HOLDINGS CORPORATION S.L." }, @@ -5959,7 +5960,7 @@ { 5937, "HypoVereinsbank" }, { 5938, "Macfarlane TeleSystems Ltd." }, { 5939, "HALCOM Informatika, d.o.o." }, - { 5940, "JBM Electronics Co., Inc." }, + { 5940, "Red Lion Controls (JBM Electronics Co., Inc.)" }, { 5941, "Cosmocom Inc." }, { 5942, "ThoughtShare Communications" }, { 5943, "MatchCraft, Inc." }, @@ -7540,7 +7541,7 @@ { 7518, "Chicago Mercantile Exchange" }, { 7519, "RateIntegration, Inc." }, { 7520, "Harris Corporation (previous was 'M/A-COM Private Radio Systems, Inc.')" }, - { 7521, "NetStar Networks" }, + { 7521, "Logicalis Australia Pty Ltd (previous was 'NetStar Networks')" }, { 7522, "Brains Corp" }, { 7523, "AccessNet" }, { 7524, "RapidSolution Software GmbH" }, @@ -11324,7 +11325,7 @@ { 11302, "Perimeter Technology" }, { 11303, "PhotoniXnet Corporation" }, { 11304, "PrinterOn Corporation" }, - { 11305, "Research Institute for Particle and Nuclear Physics, Department ofBiophysics" }, + { 11305, "Research Institute for Particle and Nuclear Physics, Department of Biophysics" }, { 11306, "Robarts Research Institute" }, { 11307, "Solarwinds.net" }, { 11308, "SWAPCOM" }, @@ -16024,7 +16025,7 @@ { 16002, "Glyphix" }, { 16003, "Zschimmer GmbH" }, { 16004, "Intrusec, Inc." }, - { 16005, "University of Durham" }, + { 16005, "Durham University" }, { 16006, "CodeFab Inc" }, { 16007, "Native Instruments" }, { 16008, "Consolidated Communications Inc" }, @@ -18258,7 +18259,7 @@ { 18236, "McGill University" }, { 18237, "IntelliVid Corporation" }, { 18238, "SkyLink Design" }, - { 18239, "Digital Theater Systems, Inc" }, + { 18239, "DTS, Inc. (previous was 'Digital Theater Systems, Inc')" }, { 18240, "berger.de" }, { 18241, "w3design" }, { 18242, "Wyyzzk, Inc." }, @@ -18376,7 +18377,7 @@ { 18354, "Calyptech Pty Ltd" }, { 18355, "Avitech International Corp." }, { 18356, "kevinstevens.info" }, - { 18357, "Leathern Apron Incorporated" }, + { 18357, "Full Frontal Ingenuity LLC (previous was 'Leathern Apron Incorporated')" }, { 18358, "EPITECH" }, { 18359, "Intransa, Inc." }, { 18360, "INTEC Web and Genome Informatics Corporation" }, @@ -20559,7 +20560,7 @@ { 20537, "NIPPON EXPRESS CO.,LTD" }, { 20538, "FIBRENETIX" }, { 20539, "//////////fur////" }, - { 20540, "SIXNET" }, + { 20540, "Red Lion Controls (SIXNET)" }, { 20541, "CITTIO, Inc." }, { 20542, "AirLink Communications, Inc." }, { 20543, "Optovia Corporation" }, @@ -23716,7 +23717,7 @@ { 23694, "PMX NETWORKS, INC" }, { 23695, "PePLink Ltd." }, { 23696, "Nilai International College" }, - { 23697, "aspector GmbH" }, + { 23697, "hoi-polloi.org (previous was 'aspector GmbH')" }, { 23698, "RELDATA Inc." }, { 23699, "Zyden Software" }, { 23700, "Internews 98 Ltd." }, @@ -23802,7 +23803,7 @@ { 23780, "Freedomware UK" }, { 23781, "Albertslund Ungdomsboliger" }, { 23782, "ASN" }, - { 23783, "Tellurian Networks, Inc." }, + { 23783, "iTellus Holdings, Inc. (previous was 'Tellurian Networks, Inc.')" }, { 23784, "StrataLight Communications" }, { 23785, "CIC/CAFMICRO" }, { 23786, "DS DATA SYSTEMS GmbH" }, @@ -24661,7 +24662,7 @@ { 24639, "Elecom scsi" }, { 24640, "Nova Technologies" }, { 24641, "Allodial Solutions, Inc." }, - { 24642, "University in Sarajevo - Faculty of Electrical Engineering" }, + { 24642, "University of Sarajevo - Faculty of Electrical Engineering" }, { 24643, "Cedval Info inc." }, { 24644, "Applied Broadband, Inc." }, { 24645, "e-DMZ Security, LLC." }, @@ -24928,7 +24929,7 @@ { 24906, "Electronic Solutions Ltd." }, { 24907, "Infopact Netwerkdiensten B.V." }, { 24908, "Stored IQ, Inc." }, - { 24909, "Secure-24, Inc." }, + { 24909, "Secure-24, LLC" }, { 24910, "OOO \"ElitStudio\"" }, { 24911, "Foxbyte Ltd" }, { 24912, "Aselsan" }, @@ -27184,7 +27185,7 @@ { 27162, "Serveis de Salut Integrats Baix Empord\0303\0240" }, { 27163, "Dolphin Technology Inc" }, { 27164, "CNET Networks Asia Pacific Pte Ltd" }, - { 27165, "UTFPR" }, + { 27165, "Universidade Tecnol\0303\0263gica Federal do Paran\0303\0241 (UTFPR)" }, { 27166, "Checchia.NET IT Consulting" }, { 27167, "NIPPON ANTENNA CO.,LTD." }, { 27168, "Edward Roper" }, @@ -28400,7 +28401,7 @@ { 28378, "Pulsewidth" }, { 28379, "Open Systems International, Inc." }, { 28380, "01edge technologies" }, - { 28381, "N-Tron Corp." }, + { 28381, "Red Lion Controls (N-Tron)" }, { 28382, "AirCell LLC" }, { 28383, "Open1X" }, { 28384, "PConRails, LLC" }, @@ -29808,7 +29809,7 @@ { 29786, "Mediterrum SARL" }, { 29787, "T-Systems MMS Dresden" }, { 29788, "GZT Telkom-Telmor Sp. z o.o." }, - { 29789, "BlueTree Wireless Data, Inc." }, + { 29789, "Red Lion Controls (BlueTree Wireless Data, Inc.)" }, { 29790, "Yelp Inc." }, { 29791, "Quality Nighthawk" }, { 29792, "IPercom" }, @@ -32073,7 +32074,7 @@ { 32051, "SAMsystems GmbH" }, { 32052, "Toronto Hydro Corporation" }, { 32053, "3Y Power Technology, Inc." }, - { 32054, "IPSL/CETP" }, + { 32054, "IPSL (previous was 'IPSL/CETP')" }, { 32055, "Service to Youth Council Inc" }, { 32056, "Vietnam Datacommunication Company (VDC)" }, { 32057, "Mercury Brain Systems" }, @@ -32999,7 +33000,7 @@ { 32977, "TELoIP" }, { 32978, "IntelliDOT Corporation" }, { 32979, "XIX" }, - { 32980, "Hitachi Systems Engineering and Solutions, Ltd. (previous was 'Computer System Engineering Co., Ltd.')" }, + { 32980, "Hitachi Systems Engineering Services, Ltd. (previous was 'Hitachi Systems Engineering and Solutions, Ltd.')" }, { 32981, "Arcadyan Technology Corporation" }, { 32982, "Trends Telematics BV" }, { 32983, "Open Computing Solutions" }, @@ -34126,7 +34127,7 @@ { 34104, "Ceton Corp" }, { 34105, "Local Website Consulting" }, { 34106, "TESCOMA s.r.o." }, - { 34107, "SELEX GALILEO" }, + { 34107, "SELEX ES LTD (previous was 'SELEX GALILEO')" }, { 34108, "IAM Solutions GmbH & Co. KG" }, { 34109, "G&G Fitness Equipment Inc." }, { 34110, "Code Blue Corporation" }, @@ -36234,7 +36235,7 @@ { 36212, "Research and Education Bridge Certification Authority, Inc." }, { 36213, "SIA \"INBOKSS\"" }, { 36214, "Galaxy Telecom Technologies Ltd" }, - { 36215, "Greek Universities Network" }, + { 36215, "Greek Academic Network - GUnet" }, { 36216, "GoliathDNS ENK" }, { 36217, "Ladela Interactive" }, { 36218, "Open Cloud Consultants, Inc" }, @@ -38377,7 +38378,7 @@ { 38355, "TTTech Computertechnik AG" }, { 38356, "Mike Becker" }, { 38357, "ActualMed" }, - { 38358, "Western Electricity Coordinating Council" }, + { 38358, "Peak Reliability (previous was 'Western Electricity Coordinating Council')" }, { 38359, "Meissner" }, { 38360, "Delled Company Ltd" }, { 38361, "Exabre Ltd" }, @@ -38963,7 +38964,7 @@ { 38941, "D. E. Shaw & Co, L.P." }, { 38942, "Coca-Cola Enterprises, Inc." }, { 38943, "Edgar Kittner GmbH & Co.KG" }, - { 38944, "Kamstrup SVM AB" }, + { 38944, "Kamstrup A/S" }, { 38945, "NASA Center for Climate Simulation (NCCS)" }, { 38946, "Raja Consulting Ltd" }, { 38947, "IREQ (Institut de recherche d'Hydro-Quebec)" }, @@ -42395,7 +42396,7 @@ { 42373, "Kliniken des MTK GmbH" }, { 42374, "Inmar Enterprises" }, { 42375, "Unassigned" }, - { 42376, "Xyne GmbH" }, + { 42376, "Ocedo GmbH (previous was 'Xyne GmbH')" }, { 42377, "MBD Consulting, LLC" }, { 42378, "FOSS-Group GmbH" }, { 42379, "Danske Fragtm\0303\0246nd A/S" }, @@ -43371,6 +43372,525 @@ { 43349, "Nigerian Research and Education Network (NgREN)" }, { 43350, "Arikel.net Enterprises, LLC" }, { 43351, "Advania" }, + { 43352, "Hangzhou Huaxing Chuangye Communication Technology CO.,LTD." }, + { 43353, "Beijing Certificate Authority" }, + { 43354, "OBI Smart Technologies GmbH" }, + { 43355, "VTI Instruments Corporation" }, + { 43356, "Mimosa Networks, Inc" }, + { 43357, "Thomas Fagart (Brozs)" }, + { 43358, "candiansolar.com" }, + { 43359, "China Guodian Corporation" }, + { 43360, "Binhai Online Information Technology Company Limited" }, + { 43361, "IT Voimala Oy" }, + { 43362, "Zak\0305\0202ad Automatyki i Urz\0304\0205dze\0305\0204 Pomiarowych AREX Sp. z o.o." }, + { 43363, "B2B.CZ, s.r.o." }, + { 43364, "Vision Box, S.A." }, + { 43365, "Qi ict" }, + { 43366, "N-Tools.de" }, + { 43367, "Suedzucker AG" }, + { 43368, "Oradian d.o.o." }, + { 43369, "BrightSign LLC" }, + { 43370, "Giordano Bruno Stiftung" }, + { 43371, "Moegui S.p.A" }, + { 43372, "Embedded Access Inc" }, + { 43373, "Associa\0303\0247\0303\0243o dos Registradores Imobili\0303\0241rios de S\0303\0243o Paulo " }, + { 43374, "Belton IT" }, + { 43375, "Baer & Karrer AG" }, + { 43376, "Ladybird Cranes Ltd." }, + { 43377, "GDV-IT" }, + { 43378, "Holger Genth (HGD)" }, + { 43379, "R.J. O'Brien and Associates" }, + { 43380, "Counterpoint Networking, Inc." }, + { 43381, "GEMATICA SRL" }, + { 43382, "Dreamket Co., Ltd." }, + { 43383, "Commercial Bank \0342\0200\0234Severo-Vostochny Alliance\0342\0200\0235 (Joint-Stock \0321\0201ompany)" }, + { 43384, "Pelle Olsson (Raholmen)" }, + { 43385, "Proyectos-IP" }, + { 43386, "Expkits" }, + { 43387, "city of Sioux City, IA " }, + { 43388, "aeworld.co.uk" }, + { 43389, "Eko-konnect Research and Education Initiative" }, + { 43390, "BEIJING FOREVER COMMUNICATION ELECTRONICS CO.,LTD" }, + { 43391, "UTT Co., Ltd." }, + { 43392, "Agile Digital Engineering Pty Ltd" }, + { 43393, "S-Net" }, + { 43394, "Intrinium, Inc" }, + { 43395, "The City of Amsterdam" }, + { 43396, "earthlab (daichi makino)" }, + { 43397, "NET MEDIA SERVICES a.s." }, + { 43398, "WILDIX" }, + { 43399, "Tiscali Italia SpA" }, + { 43400, "IT storitve, Gregor Jer\0305\0241e, s.p." }, + { 43401, "TRData Limited" }, + { 43402, "Layer-7 Technologies" }, + { 43403, "CareerHub Pty Ltd" }, + { 43404, "SOCIEDAD ESTATAL CORREOS Y TELEGRAFOS SA" }, + { 43405, "SA Water Corporation" }, + { 43406, "Universiti Putra Malaysia" }, + { 43407, "David Martin (ReaperLegion)" }, + { 43408, "HDmessaging Inc" }, + { 43409, "Reith IT-L\0303\0266sungen GmbH" }, + { 43410, "Joseph Williams" }, + { 43411, "Graeser Development" }, + { 43412, "Genius Digital Limited" }, + { 43413, "Fairview Health Services" }, + { 43414, "Molson Coors Brewing Company" }, + { 43415, "Deepblue Informatikai Kft" }, + { 43416, "Multigenregameworld LLC" }, + { 43417, "South Side Hackerspace Chicago, NFP" }, + { 43418, "Khakham Sayavong (Nticks)" }, + { 43419, "Microsoft Unified Communications and Collaboration User Group" }, + { 43420, "Proximic Inc" }, + { 43421, "SysMa.cz" }, + { 43422, "ADTEC Communications" }, + { 43423, "KeyONet" }, + { 43424, "Securitas FINLAND" }, + { 43425, "Aduno Gruppe" }, + { 43426, "Noction" }, + { 43427, sminmpec_unknown }, / (Added by Wireshark) */ + { 43428, "The William and Flora Hewlett Foundation" }, + { 43429, "Strata Information Technology, Inc" }, + { 43430, "Systems Definition, Inc." }, + { 43431, "Tate, Inc." }, + { 43432, "MICROMED BIOTECNOLOGIA LTDA" }, + { 43433, "Sreevidya Aravind" }, + { 43434, "Metacom Pty Ltd" }, + { 43435, "Nutsrange Technologies" }, + { 43436, "Accumuli PLC" }, + { 43437, "City of Montclair" }, + { 43438, "County Of Bruce" }, + { 43439, "J.J. Downs Industrial Plastics Inc." }, + { 43440, "royal holloway, university of london" }, + { 43441, "royal holloway, university of london" }, + { 43442, "Niles Radio Communications" }, + { 43443, "Transacciones y Servicios Mobile" }, + { 43444, "Inspire Living, Inc." }, + { 43445, "4th Layer Integrated Solutions S.r.l." }, + { 43446, "Hartmann Electronic GmbH" }, + { 43447, "LoadFront, S.L." }, + { 43448, "THEFEINERS.COM" }, + { 43449, "mobilcom-debitel GmbH" }, + { 43450, "Agencja Restrukturyzacji i Modernizacji Rolnictwa" }, + { 43451, "Australian Customs and Border Protection Service" }, + { 43452, "Pragtec inc." }, + { 43453, "Visiometrics S.L." }, + { 43454, "Wiccess" }, + { 43455, "LFT Solutions" }, + { 43456, "KHS GmbH" }, + { 43457, "Warp Software Ltda." }, + { 43458, "Nvizible Ltd" }, + { 43459, "Virsae Group Ltd" }, + { 43460, "university college Leuven Limburg (UCLL)" }, + { 43461, "DGIT INTERNATIONAL PTE. LTD" }, + { 43462, "Universidade Federal Rural de Pernambuco" }, + { 43463, "Kyoto-University Microcomputer Club" }, + { 43464, "Ten Cities Media" }, + { 43465, "Communication Federal Credit Union" }, + { 43466, "CMS Central Media Solutions GmbH" }, + { 43467, "Evolv, Inc." }, + { 43468, "Cacto Internet Ltda" }, + { 43469, "Sysnove" }, + { 43470, "G + H Netzwerk-Design Gesellschaft f\0303\0274r IT-Consulting mbH" }, + { 43471, "Sun Trading Solutions" }, + { 43472, "APC Integrated Services Group, Inc." }, + { 43473, "YHGfL Foundation" }, + { 43474, "Coca-Cola Hellenic Bottling Company" }, + { 43475, "XNX S\0303\0240rl" }, + { 43476, "LeanDev" }, + { 43477, "Bioss Consulting SRL" }, + { 43478, "Jonathon Anderson (civilfritz)" }, + { 43479, "Ecole nationale Sup\0303\0251rieure d'Informatique" }, + { 43480, "Canine Creche" }, + { 43481, "Innovaatik Grupp O\0303\0234" }, + { 43482, "GlobalSensing Technologies" }, + { 43483, "AIPHONE CO., LTD." }, + { 43484, "Fundaci\0303\0263n Fulgor" }, + { 43485, "Trillium Teamologies, Inc." }, + { 43486, "Fuse Networks, LLC" }, + { 43487, "Guangzhou Woxiang Information Technology Co., Ltd" }, + { 43488, "Schletter GmbH" }, + { 43489, "GOOD FIRST GROUP . " }, + { 43490, "Rite-Tech Industrial Co., Ltd." }, + { 43491, "ITR Service GmbH" }, + { 43492, "Bernhard Trinnes (microdots)" }, + { 43493, "Online Linjeforening" }, + { 43494, "Clarity Ltd" }, + { 43495, "Taide Enterprise Co.,Ltd." }, + { 43496, "QSC AG" }, + { 43497, "Weavesys UK" }, + { 43498, "SENSORBOX DO BRASIL LTDA" }, + { 43499, "Youncta" }, + { 43500, "4D Security Solutions" }, + { 43501, "Boston Financial Data Services Inc" }, + { 43502, "HighRes Biosolutions" }, + { 43503, "Jay Ridgeway (beekling.com)" }, + { 43504, "Judd Storrs" }, + { 43505, "Plugh Studios Ltd" }, + { 43506, "Beats by Dre" }, + { 43507, "ti&m AG" }, + { 43508, "EDT SAS - Electronic Data Transfer" }, + { 43509, "BITPRO AS" }, + { 43510, "Juan Jose Rodriguez Ponce" }, + { 43511, "E7 Solutions" }, + { 43512, "BEIJING SIFANG AUTOMATION CO., LTD" }, + { 43513, "SDIS68" }, + { 43514, "kt telecop" }, + { 43515, "NISCOM,Inc." }, + { 43516, "Auvik Networks Inc." }, + { 43517, "CoolMinds Technologies (P) Ltd" }, + { 43518, "Smartconnect NV / SA" }, + { 43519, "Tranwall" }, + { 43520, "pteam gmbh" }, + { 43521, "RSE Informationstechnologie GmbH" }, + { 43522, "VoltServer, Inc." }, + { 43523, "Alberta Investment Management Corporation" }, + { 43524, "Vanteon Corp." }, + { 43525, "Wavecon GmbH" }, + { 43526, "Signal Bredb\0303\0245nd AS" }, + { 43527, "Presidio Networked Solutions" }, + { 43528, "SHODEN CORPORATION" }, + { 43529, "Istituto Radiologico e Fisioradioterapico Valdarno" }, + { 43530, "HYTEC INTER Co.,Ltd." }, + { 43531, "Atomic Object LLC" }, + { 43532, "Yafeng Shan (kokonur)" }, + { 43533, "Beijing National Railway Research & Design Institude of Signal & Communication Co, Ltd. (CRSCD)" }, + { 43534, "Alstom Grid" }, + { 43535, "Luxottica North America Distribution LLC" }, + { 43536, "AO K-Dorstroy" }, + { 43537, "Solumed" }, + { 43538, "EXA-TMR" }, + { 43539, "Dwarf Animation Studio" }, + { 43540, "Federal Agricultural Marketing Authority" }, + { 43541, "LSY Inc" }, + { 43542, "DENT Instruments" }, + { 43543, "ID Business Solutions Ltd" }, + { 43544, "DigiComm GmbH" }, + { 43545, "Omnitracs, LLC" }, + { 43546, "Tariox Limited" }, + { 43547, "SCOOP Software GmbH" }, + { 43548, "Trasis sa" }, + { 43549, "IT Competence Group SE" }, + { 43550, "CAMEA spol. s r. o." }, + { 43551, "Mavari-IT bvba" }, + { 43552, "Whitesky Communications" }, + { 43553, "Rapid Focus Security, Inc." }, + { 43554, "IGC" }, + { 43555, "LayeredDefense" }, + { 43556, "Rigas domes Informacijas tehnologiju centrs" }, + { 43557, "Nick Fender" }, + { 43558, "GitHub, Inc" }, + { 43559, "ENKOM AG" }, + { 43560, "New Orleans East Hospital" }, + { 43561, "Micro-Research Finland Oy" }, + { 43562, "ZepMed, LLC" }, + { 43563, "pedro paulo medeiros" }, + { 43564, "TSC AUTO ID Technology Co., Ltd." }, + { 43565, "Reliance Jio Infocomm Limited" }, + { 43566, "Engineering Center REGIONAL SYSTEMS, Limited" }, + { 43567, "Yongjia County Board of Education" }, + { 43568, "EMICON" }, + { 43569, "Hong Yun Technology" }, + { 43570, "Coop\0303\0251rative Foresti\0303\0250re Bourgogne Limousin (CFBL)" }, + { 43571, "SOCIETE DES TRANSPORTS ROCHATTE" }, + { 43572, "Foundation for Research and Technology Hellas" }, + { 43573, "VSAT-SERVICE" }, + { 43574, "Lansing Makers Network" }, + { 43575, "OpenPeak" }, + { 43576, "IntSec.NET" }, + { 43577, "CNPC Beijing Richfit Information Technology Co.,LTD." }, + { 43578, "42technology AG" }, + { 43579, "EASYPROTO di Giacomo Cesari" }, + { 43580, "SutherlandGlobalServices" }, + { 43581, "Ooyala Inc." }, + { 43582, "Document Centric Solutions Ltd" }, + { 43583, "ReMake Electric" }, + { 43584, "Trizetto Provider Solutions" }, + { 43585, "SAMSON AG" }, + { 43586, "SVS TELEKOM\0303\0234N\0304\0260KASYON H\0304\0260Z. T\0304\0260C. SAN. A.\0305\0236. " }, + { 43587, "Roave, LLC." }, + { 43588, "SAA Topnet GmbH" }, + { 43589, "KEKLOLWTF AS" }, + { 43590, "HAL9k hackerspace" }, + { 43591, "Erlang Solutions LTD" }, + { 43592, "Campbell Scientific, Incorporated" }, + { 43593, "Crimson Innovative" }, + { 43594, "Interhyp AG" }, + { 43595, "MolinoSoft (Julian Bourne)" }, + { 43596, "Carnegie Fitness " }, + { 43597, "Comprehensive Health Management, Inc." }, + { 43598, "STORM" }, + { 43599, "Paneidos Desu" }, + { 43600, "Beijing Easesky Netcom Technology Co.,Ltd" }, + { 43601, "Nuri Technology Co., Ltd." }, + { 43602, "Rossiya Segodnya" }, + { 43603, "The Twelve Tribes" }, + { 43604, "Arkansas Educational Television Network (AETN)" }, + { 43605, "Metatrust" }, + { 43606, "nobaq.net" }, + { 43607, "Funda Real Estate B.V." }, + { 43608, "Raben Group" }, + { 43609, "NetCracker Technology Corp." }, + { 43610, "ColosseoEAS, a.s." }, + { 43611, "Power Ethernet" }, + { 43612, "IOLAN" }, + { 43613, "Skylife Engineering" }, + { 43614, "phaenovum Sch\0303\0274lerforschungszentrum L\0303\0266rrach-Dreil\0303\0244ndereck e.V." }, + { 43615, "VonRoll" }, + { 43616, "Aventura Technologies Inc." }, + { 43617, "Vidant Health" }, + { 43618, "Camtrace" }, + { 43619, "LianYunGang E-Port Information Development Co.,Ltd" }, + { 43620, "Shenzhen Headsun Technology" }, + { 43621, "Medical Effect" }, + { 43622, "WebPerative LLC" }, + { 43623, "Umensis - Guillaume Pannatier" }, + { 43624, "Jaroslav Sendler (xsendl00)" }, + { 43625, "Core Technology" }, + { 43626, "NewB" }, + { 43627, "Devani Creative" }, + { 43628, "The Rubicon Project" }, + { 43629, "PSITEX, LLC" }, + { 43630, "Duxoft, Inc." }, + { 43631, "Heijmans N.V." }, + { 43632, "Celtex Works" }, + { 43633, "AIES Advanced Industrial Electronic Systems" }, + { 43634, "Metrellis, Inc." }, + { 43635, "Practice Velocity, LLC" }, + { 43636, "LES.NET" }, + { 43637, "Zymer Inc." }, + { 43638, "ITS Korea" }, + { 43639, "Evoluta Interactive" }, + { 43640, "through.other.eyes (Jonathan Platzer)" }, + { 43641, "netplus.ch SA" }, + { 43642, "Linde Engineering" }, + { 43643, "TEQ SA" }, + { 43644, "Infra Services" }, + { 43645, "FEIG ELECTRONIC GmbH" }, + { 43646, "Datatal AB" }, + { 43647, "Rimbach IT Systems UG" }, + { 43648, "Naudit High Performance Computing and Networking S.L." }, + { 43649, "Raritan Bay Medical Center" }, + { 43650, "United Health Services" }, + { 43651, "INTTRA Inc" }, + { 43652, "GoBICS" }, + { 43653, "UNIVERSITAT OBERTA DE CATALUNYA" }, + { 43654, "marcsi.ch" }, + { 43655, "University Ecclesiastical Academy of Thessaloniki" }, + { 43656, "Consortium" }, + { 43657, "Kanton St.Gallen" }, + { 43658, "Seacloud" }, + { 43659, "Hochschule f\0303\0274r Technik und Wirtschaft des Saarlandes (htw saar)" }, + { 43660, "Zadara Storage Ltd" }, + { 43661, "Columbus Business Solutions" }, + { 43662, "Simpson Housing LLLP" }, + { 43663, "eTouch Federal Systems" }, + { 43664, "Unzane" }, + { 43665, "rioxo GmbH" }, + { 43666, "Hackerspace Brussels" }, + { 43667, "Sunwire Inc" }, + { 43668, "Andreas Kreisel" }, + { 43669, "The Institute of Mathematical Sciences" }, + { 43670, "Epic Code Pty. Ltd." }, + { 43671, "EMSEAS Teknik AB" }, + { 43672, "INTELLECT MODULE" }, + { 43673, "Federal State Unitary Enterprise CentrInform" }, + { 43674, "Robonect" }, + { 43675, "Accenture CAS GmbH" }, + { 43676, "57North Hacklab" }, + { 43677, "ICT Plus srl" }, + { 43678, "Michael Kramer" }, + { 43679, "SETTE" }, + { 43680, "Chorus Limited" }, + { 43681, "ELESTER-PKP Sp. z o.o." }, + { 43682, "ITSA Consulting, LLC" }, + { 43683, "ALDEIS" }, + { 43684, "NOVASIB GmbH" }, + { 43685, "biz:Consult Unternehmensberatung GmbH" }, + { 43686, "Jefferson County" }, + { 43687, "Christoph Knott - IT-Sicherheitstechnik" }, + { 43688, "GERMEN ELEKTRONIK LTD" }, + { 43689, "schugart" }, + { 43690, "The Active Network" }, + { 43691, "Michael Kettner" }, + { 43692, "haberberger.com" }, + { 43693, "Fotolia LLC" }, + { 43694, "Omega Intelligence Systems Ltd" }, + { 43695, "5nine Software" }, + { 43696, "LLC Info-Kontent" }, + { 43697, "JSC Bryansk Supply Company" }, + { 43698, "Joint Electronic Teller Services Ltd." }, + { 43699, "EasyData, LLC" }, + { 43700, "PathCore" }, + { 43701, "HySecurity, Inc." }, + { 43702, "Dom-Daniel" }, + { 43703, "Wacom Company Ltd." }, + { 43704, "Accutron Instruments Inc" }, + { 43705, "F!nTcH.org" }, + { 43706, "Statnett SF" }, + { 43707, "Australian Rail Tecchnology" }, + { 43708, "SimonMed Imaging" }, + { 43709, "AirDSL (Pty) Ltd" }, + { 43710, "GAMESA" }, + { 43711, "mySupply ApS" }, + { 43712, "Universidad Central de Venezuela" }, + { 43713, "Code 42" }, + { 43714, "Mega Soft Computaci\0303\0263n, C.A." }, + { 43715, "Data Infrastructure Technologies Ltd. " }, + { 43716, "Veterinary Nurse Solutions Pty Ltd" }, + { 43717, "imensup" }, + { 43718, "\0303\0226sterreichisches Weltraum Forum" }, + { 43719, "Telvio LLC" }, + { 43720, "Creat0r.pro" }, + { 43721, "Cyberoam Technologies Pvt. Ltd." }, + { 43722, "DAC Systems, Inc." }, + { 43723, "Stancil Corporation" }, + { 43724, "Japan Prime Computing" }, + { 43725, "Casair, Inc" }, + { 43726, "GO! Express & Logistics Deutschland GmbH" }, + { 43727, "Valeo Comfort ans Driving assitance" }, + { 43728, "Sinergise Ltd." }, + { 43729, "Teckids e.V." }, + { 43730, "Ernst Klett AG" }, + { 43731, "FooxTek Co., LTD." }, + { 43732, "Netmag Technology Corporation" }, + { 43733, "East Photonics, Inc." }, + { 43734, "IQUO Ltd" }, + { 43735, "STI-Tassimco" }, + { 43736, "Standard Imaging, Inc." }, + { 43737, "MedAllies" }, + { 43738, "Doshisha University" }, + { 43739, "Concept Smoke screen Ltd" }, + { 43740, "ASB-Technology Sp. z o.o." }, + { 43741, "Cerqueira & Marcos, Lda" }, + { 43742, "Microx Computer GmbH" }, + { 43743, "Open Systems Technology, Pty." }, + { 43744, "airberlin" }, + { 43745, "CONSEJO DE LA JUDICATURA" }, + { 43746, "Ulterius Technologies, LLC" }, + { 43747, "MaterialApps" }, + { 43748, "ARES Conocimiento de Negocio, SL" }, + { 43749, "Country Bright Company Ltd." }, + { 43750, "Jabil Circuit, Inc" }, + { 43751, "Shenzhen TG-NET Botone Technology CO. Ltd." }, + { 43752, "China Film Equipment Co. Ltd." }, + { 43753, "Kyriasis" }, + { 43754, "Philipp Wagner Softwareentwicklung" }, + { 43755, "BG-Phoenics GmbH" }, + { 43756, "Schwarz Dienstleistung KG" }, + { 43757, "QOSIT AG" }, + { 43758, "Clique Intelligence Inc." }, + { 43759, "Big White Network Technologies,Ltd." }, + { 43760, "Atlas Networks" }, + { 43761, "Our School Ltd" }, + { 43762, "PlazaLotusGroup" }, + { 43763, "ChinaFilm Global (Beijing) Technology limited" }, + { 43764, "Tallac Networks" }, + { 43765, "Color Print" }, + { 43766, "MBSys LLC Azerbaijan" }, + { 43767, "Eastern Long Island Hospital" }, + { 43768, "GatesAir, Inc." }, + { 43769, "Vezea" }, + { 43770, "Addat s.r.o." }, + { 43771, "Behlman Electronics" }, + { 43772, "K+S IT-Services GmbH" }, + { 43773, "The Vancouver Clinic Inc." }, + { 43774, "Hortonworks Inc" }, + { 43775, "Quotepro Inc" }, + { 43776, "Symbiotic System Design" }, + { 43777, "Maikel de Boer" }, + { 43778, "Hampshire Controls Corporation" }, + { 43779, "Finnova AG" }, + { 43780, "Paradox Networks, Inc" }, + { 43781, "Moshel Kamadu Records" }, + { 43782, "UPS Solutions INC." }, + { 43783, "WaveNet Communications Private Limited" }, + { 43784, "IFOM" }, + { 43785, "Magellium" }, + { 43786, "Factual Inc" }, + { 43787, "Leviathan Security Technologies" }, + { 43788, "Comita d.d." }, + { 43789, "Trading & Consulting `H.P.C.\0302\0264 GmbH" }, + { 43790, "becker-aero" }, + { 43791, "Cine Digital Service" }, + { 43792, "Now Wireless Limited" }, + { 43793, "Tom Gundersen (systemd)" }, + { 43794, "Chris Thomson" }, + { 43795, "Guangzhou Andea Electronics Technology Co.,Ltd" }, + { 43796, "Rasing IT Solutions" }, + { 43797, "Croz d.o.o." }, + { 43798, "NANJING SAND TECHNOLOGY CO., LTD" }, + { 43799, "TRUMPF GmbH + Co. KG" }, + { 43800, "OraSentry" }, + { 43801, "Dolphin Systems AG" }, + { 43802, "Avaloq Evolution AG" }, + { 43803, "University of South Wales" }, + { 43804, "Bombardier Aerospace" }, + { 43805, "Metalogix International GmbH" }, + { 43806, "Shape Security, Inc" }, + { 43807, "CENTRI Technology, Inc." }, + { 43808, "Spincat Studios" }, + { 43809, "University of the Philippines" }, + { 43810, "Li Hongnan (LiHN)" }, + { 43811, "University of the Philippines Mindanao" }, + { 43812, "Corscience GmbH & Co. KG" }, + { 43813, "Centraal Justitieel Incassobureau" }, + { 43814, "GNU Networks Ltd." }, + { 43815, "The University of Texas M.D. Anderson Cancer Center" }, + { 43816, "Tran Industries LLC" }, + { 43817, "Vertex Business Services" }, + { 43818, "Featurespace Limited" }, + { 43819, "pulse technologies" }, + { 43820, "Mozy, Inc." }, + { 43821, "Suwannee County School Board" }, + { 43822, "Nok Nok Labs, Inc." }, + { 43823, "VAS Experts" }, + { 43824, "ConectaIP Tecnologia S.L." }, + { 43825, "Earnest Products, Inc. dba Southern Manufacturing" }, + { 43826, "TEXKA LABS" }, + { 43827, "Ideosoft C.B." }, + { 43828, "Bosoft" }, + { 43829, "Ifield School" }, + { 43830, "eWater Pty Ltd" }, + { 43831, "Ezvoicetek Co., Ltd." }, + { 43832, "Beijing D&S FieldBus Technology Co.,Ltd" }, + { 43833, "LIVECREATION" }, + { 43834, "Urban Systems Design Institute" }, + { 43835, "HOCHTIEF CZ, a.s." }, + { 43836, "C Tech Bilisim Teknolojileri San.ve Tic. A.S" }, + { 43837, "DTI Group Ltd" }, + { 43838, "Genex Hellas L.T.D" }, + { 43839, "RailComm LLC" }, + { 43840, "Sumitomo Mitsui Banking Corporation" }, + { 43841, "Eatel" }, + { 43842, "Zero Waste Scotland" }, + { 43843, "Alter Trading Corporation, LLC" }, + { 43844, "GuangDong Big Banian Info Tech Co., Ltd. " }, + { 43845, "Toshiba Tec Solution Services Corporation" }, + { 43846, "University of the Philippines - Baguio" }, + { 43847, "A Hagedoorn Electronics" }, + { 43848, "INoTHINGS GmbH" }, + { 43849, "LiiON, LLC" }, + { 43850, "Doxcelerate Corporation" }, + { 43851, "danieLLegal.Net - Rechtsanw\0303\0244lte" }, + { 43852, "Truseco, s.r.o." }, + { 43853, "Academy of Economic Studies of Moldova" }, + { 43854, "TU Investment Club e.V." }, + { 43855, "ezIX.org" }, + { 43856, "UNIT4 Business Software Spain S.L.U." }, + { 43857, "mITra data" }, + { 43858, "Grigorivska International School" }, + { 43859, "Harbor Freight Tools" }, + { 43860, "Groenewoud" }, + { 43861, "New York Genome Center" }, + { 43862, "Drei Banken EDV Ges.m.b.H." }, + { 43863, "Valour Security Ltd" }, + { 43864, "Breeze Innovations Private Limited" }, + { 43865, "Matthias Krause (spectre-net)" }, + { 43866, "beijing huafei technology co.,ltd" }, + { 43867, "Rename it" }, + { 43868, "Conjur Inc" }, + { 43869, "Yatharth Gupta" }, + { 43870, "Precyse Technologies" }, { 0, NULL} };
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/epan/wslua/wslua_proto.c ^
@@ -297,18 +297,18 @@ luaL_error(L,"a preference named %s exists already",name); return 0; } - /* + /* * Make sure that only lower-case ASCII letters, numbers, * underscores, and dots appear in the preference name. - / - for (c = name; c != '\0'; c++) { - if (!isascii((guchar)c) \|\| - (!islower((guchar)c) && !isdigit((guchar)c) && c != '_' && c != '.')) - { - luaL_error(L,"illegal preference name \"%s\", only lower-case ASCII letters, numbers, underscores and dots may be used",name); - return 0; + / + for (c = name; c != '\0'; c++) { + if (!isascii((guchar)c) \|\| + (!islower((guchar)c) && !isdigit((guchar)c) && c != '_' && c != '.')) + { + luaL_error(L,"illegal preference name \"%s\", only lower-case ASCII letters, numbers, underscores and dots may be used",name); + return 0; + } } - } if ( ! p->next) { p->next = pref; @@ -391,6 +391,11 @@ if (! ( name && prefs_p ) ) return 0; + if (!prefs_p->next) { + luaL_error(L,"No preference is registered yet"); + return 0; + } + prefs_p = prefs_p->next; do { @@ -640,7 +645,7 @@ const gchar *blob = luaL_optstring(L,WSLUA_OPTARG_ProtoField_new_DESCR,NULL); if (lua_isnumber(L,WSLUA_ARG_ProtoField_new_TYPE)) { - type = luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE); + type = (enum ftenum)luaL_checkint(L,WSLUA_ARG_ProtoField_new_TYPE); } else { type = get_ftenum(luaL_checkstring(L,WSLUA_ARG_ProtoField_new_TYPE)); }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/make-version.pl ^
@@ -78,7 +78,7 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 10, - "version_micro" => 6, + "version_micro" => 8, "version_build" => 0, "enable" => 1, @@ -166,11 +166,11 @@ $last_change = $line; } - # Commits in current (master-1.10) branch. We may want to use - # a different number. - chomp($line = qx{git --git-dir=$srcdir/.git describe --long --match v1.10.0-rc1}); + # Commits since last annotated tag. + chomp($line = qx{git --git-dir=$srcdir/.git describe --long --always --match "v"}); if ($? == 0 && length($line) > 1) { my @parts = split(/-/, $line); + $git_description = $line; $num_commits = $parts[-2]; $commit_id = $parts[-1]; } @@ -187,11 +187,6 @@ $repo_branch = basename($line); } - chomp($line = qx{git --git-dir=$srcdir/.git describe --match "v"}); - if (defined($line)) { - $git_description = $line; - } - 1; };
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/manuf ^
@@ -152,7 +152,7 @@ 00:00:61 GatewayC # GATEWAY COMMUNICATIONS 00:00:62 Hneywell # Honeywell 00:00:63 HP -00:00:64 Yokogawa # YOKOGAWA DIGITAL COMPUTER CORP +00:00:64 Yokogawa # Yokogawa Electric Corporation 00:00:65 NetworkG # Network General Corporation 00:00:66 Talaris # TALARIS SYSTEMS, INC. 00:00:67 SoftRit # SOFT RITE, INC. @@ -483,7 +483,7 @@ 00:01:AC SitaraNe # Sitara Networks, Inc. 00:01:AD CoachMas # Coach Master International d.b.a. CMI Worldwide, Inc. 00:01:AE TrexEnte # Trex Enterprises -00:01:AF EmersonN # Emerson Network Power +00:01:AF ArtesynE # Artesyn Embedded Technologies 00:01:B0 FulltekT # Fulltek Technology Co., Ltd. 00:01:B1 GeneralB # General Bandwidth 00:01:B2 DigitalP # Digital Processing Systems, Inc. @@ -821,7 +821,7 @@ 00:02:FE Viditec # Viditec, Inc. 00:02:FF HandanBr # Handan BroadInfoCom 00:03:00 Barracud # Barracuda Networks, Inc. -00:03:01 AvantasN # Avantas Networks Corporation +00:03:01 Exfo 00:03:02 CharlesI # Charles Industries, Ltd. 00:03:03 JamaElec # JAMA Electronics Co., Ltd. 00:03:04 PacificB # Pacific Broadband Communications @@ -1599,7 +1599,7 @@ 00:06:08 At-SkySa # At-Sky SAS 00:06:09 Crosspor # Crossport Systems 00:06:0A Blue2spa # Blue2space -00:06:0B EmersonN # Emerson Network Power +00:06:0B ArtesynE # Artesyn Embedded Technologies 00:06:0C MelcoInd # Melco Industries, Inc. 00:06:0D Wave7Opt # Wave7 Optics 00:06:0E Igys # IGYS Systems, Inc. @@ -2049,7 +2049,7 @@ 00:07:CA CreatixP # Creatix Polymedia Ges Fur Kommunikaitonssysteme 00:07:CB FreeboxS # Freebox SA 00:07:CC KabaBenz # Kaba Benzing GmbH -00:07:CD Nmtel # NMTEL Co., Ltd. +00:07:CD KumohEle # Kumoh Electronic Co, Ltd 00:07:CE Cabletim # Cabletime Limited 00:07:CF Anoto # Anoto AB 00:07:D0 AutomatE # Automat Engenharia de Automação Ltda. @@ -2322,7 +2322,7 @@ 00:08:F6 Sumitomo # Sumitomo Electric System Solutions Co., Ltd. 00:08:F7 HitachiS # Hitachi Ltd, Semiconductor & Integrated Circuits Gr 00:08:F8 UtcCcs # UTC CCS -00:08:F9 EmersonN # Emerson Network Power +00:08:F9 ArtesynE # Artesyn Embedded Technologies 00:08:FA KarlEBri # Karl E.Brinkmann GmbH 00:08:FB Sonosite # SonoSite, Inc. 00:08:FC Gigaphot # Gigaphoton Inc. @@ -3710,7 +3710,7 @@ 00:0E:63 LemkeDia # Lemke Diagnostics GmbH 00:0E:64 Elphel # Elphel, Inc 00:0E:65 Transcor # TransCore -00:0E:66 HitachiA # Hitachi Advanced Digital, Inc. +00:0E:66 HitachiI # Hitachi Industry & Control Solutions, Ltd. 00:0E:67 EltisMic # Eltis Microelectronics Ltd. 00:0E:68 E-TopNet # E-TOP Network Technology Inc. 00:0E:69 ChinaEle # China Electric Power Research Institute @@ -3834,7 +3834,7 @@ 00:0E:DF PlxTechn # PLX Technology 00:0E:E0 Mcharge 00:0E:E1 Extremes # ExtremeSpeed Inc. -00:0E:E2 CustomEn # Custom Engineering S.p.A. +00:0E:E2 CustomEn # Custom Engineering 00:0E:E3 ChiyuTec # Chiyu Technology Co.,Ltd 00:0E:E4 BoeTechn # BOE TECHNOLOGY GROUP CO.,LTD 00:0E:E5 Bitwalle # bitWallet, Inc. @@ -5557,7 +5557,7 @@ 00:15:9A ArrisGro # ARRIS Group, Inc. 00:15:9B Nortel 00:15:9C B-KyungS # B-KYUNG SYSTEM Co.,Ltd. -00:15:9D MinicomA # Minicom Advanced Systems ltd +00:15:9D TrippLit # Tripp Lite 00:15:9E MadCatzI # Mad Catz Interactive Inc 00:15:9F Terascal # Terascala, Inc. 00:15:A0 NokiaDan # Nokia Danmark A/S @@ -8097,30 +8097,30 @@ 00:1E:C5 MiddleAt # Middle Atlantic Products Inc 00:1E:C6 ObviusHo # Obvius Holdings LLC 00:1E:C7 2wire # 2Wire, Inc. -00:1E:C8 2wire # 2Wire, Inc. -00:1E:C9 2wire # 2Wire, Inc. -00:1E:CA 2wire # 2Wire, Inc. -00:1E:CB 2wire # 2Wire, Inc. -00:1E:CC 2wire # 2Wire, Inc. +00:1E:C8 RapidMob # Rapid Mobile (Pty) Ltd +00:1E:C9 Dell # Dell Inc +00:1E:CA Nortel +00:1E:CB "Rpc"Ene # "RPC "Energoautomatika" Ltd +00:1E:CC Cdvi 00:1E:CD KylandTe # KYLAND Technology Co. LTD -00:1E:CE 2wire # 2Wire, Inc. -00:1E:CF 2wire # 2Wire, Inc. -00:1E:D0 2wire # 2Wire, Inc. -00:1E:D1 2wire # 2Wire, Inc. -00:1E:D2 2wire # 2Wire, Inc. -00:1E:D3 2wire # 2Wire, Inc. -00:1E:D4 2wire # 2Wire, Inc. -00:1E:D5 2wire # 2Wire, Inc. -00:1E:D6 2wire # 2Wire, Inc. -00:1E:D7 2wire # 2Wire, Inc. -00:1E:D8 2wire # 2Wire, Inc. -00:1E:D9 2wire # 2Wire, Inc. -00:1E:DA 2wire # 2Wire, Inc. -00:1E:DB 2wire # 2Wire, Inc. -00:1E:DC 2wire # 2Wire, Inc. -00:1E:DD 2wire # 2Wire, Inc. -00:1E:DE 2wire # 2Wire, Inc. -00:1E:DF 2wire # 2Wire, Inc. +00:1E:CE BisaTech # BISA Technologies (Hong Kong) Limited +00:1E:CF PhilipsE # PHILIPS ELECTRONICS UK LTD +00:1E:D0 Ingespac # Ingespace +00:1E:D1 Keyproce # Keyprocessor B.V. +00:1E:D2 RayShine # Ray Shine Video Technology Inc +00:1E:D3 DotTechn # Dot Technology Int'l Co., Ltd. +00:1E:D4 DobleEng # Doble Engineering +00:1E:D5 Tekon-Au # Tekon-Automatics +00:1E:D6 AlentecO # Alentec & Orion AB +00:1E:D7 H-Stream # H-Stream Wireless, Inc. +00:1E:D8 DigitalU # Digital United Inc. +00:1E:D9 Mitsubis # Mitsubishi Precision Co.,LTd. +00:1E:DA Wesemann # Wesemann Elektrotechniek B.V. +00:1E:DB GikenTra # Giken Trastem Co., Ltd. +00:1E:DC SonyEric # Sony Ericsson Mobile Communications AB +00:1E:DD WaskoSA # WASKO S.A. +00:1E:DE Byd # BYD COMPANY LIMITED +00:1E:DF MasterIn # Master Industrialization Center Kista 00:1E:E0 UrmetDom # Urmet Domus SpA 00:1E:E1 SamsungE # Samsung Electronics Co.,Ltd 00:1E:E2 SamsungE # Samsung Electronics Co.,Ltd @@ -9479,7 +9479,7 @@ 00:24:2B HonHaiPr # Hon Hai Precision Ind.Co.,Ltd. 00:24:2C HonHaiPr # Hon Hai Precision Ind. Co., Ltd. 00:24:2E Datastri # Datastrip Inc. -00:24:2F Virtensy # VirtenSys Inc +00:24:2F Micron 00:24:30 RubyTech # Ruby Tech Corp. 00:24:31 Uni-V # Uni-v co.,ltd 00:24:32 NeostarT # Neostar Technology Co.,LTD @@ -13100,7 +13100,7 @@ 00:50:C2:86:F0:00/36 B-Plus # b-plus GmbH 00:50:C2:87:00:00/36 LogelSRL # LOGEL S.R.L. 00:50:C2:87:10:00/36 R-S-IEle # R-S-I Elektrotechnik GmbH & Co. KG -00:50:C2:87:20:00/36 Oliotalo # Oliotalo - Objecthouse Oy +00:50:C2:87:20:00/36 Oliotalo # Oliotalo Oy 00:50:C2:87:30:00/36 Xronet # XRONET Corporation 00:50:C2:87:40:00/36 ArcosTec # Arcos Technologies Ltd. 00:50:C2:87:50:00/36 PhytecMe # Phytec Messtechnik GmbH @@ -13261,7 +13261,7 @@ 00:50:C2:91:00:00/36 Autotank # Autotank AB 00:50:C2:91:10:00/36 VaporRai # Vapor Rail 00:50:C2:91:20:00/36 AssetInt # ASSET InterTech, Inc. -00:50:C2:91:30:00/36 SelexSen # Selex Sensors & Airborne Systems +00:50:C2:91:30:00/36 SelexEx # Selex Ex Ltd 00:50:C2:91:40:00/36 Io-Conne # IO-Connect 00:50:C2:91:50:00/36 Verint # Verint Systems Ltd. 00:50:C2:91:60:00/36 ChkGrids # CHK GridSense P/L @@ -15075,6 +15075,7 @@ 00:54:AF Continen # Continental Automotive Systems Inc. 00:55:00 Xerox 00:59:07 Lenovoem # LenovoEMC Products USA, LLC +00:5A:39 Shenzhen # SHENZHEN FAST TECHNOLOGIES CO., LTD. 00:5C:B1 GospellD # Gospell DIGITAL TECHNOLOGY CO., LTD 00:5D:03 Xilinx # Xilinx, Inc 00:60:00 Xycom # XYCOM INC. @@ -15336,11 +15337,13 @@ 00:64:40 Cisco # CISCO SYSTEMS, INC. 00:64:A6 MaquetCa # Maquet CardioVascular 00:66:4B HuaweiTe # Huawei Technologies Co., Ltd +00:6B:8E Shanghai # Shanghai Feixun Communication Co.,Ltd. 00:6B:9E Vizio # VIZIO Inc 00:6B:A0 Shenzhen # SHENZHEN UNIVERSAL INTELLISYS PTE LTD 00:6D:FB VutrixUk # Vutrix (UK) Ltd 00:70:B0 M/A-ComC # M/A-COM INC. COMPANIES 00:70:B3 DataReca # DATA RECALL LTD. +00:71:CC HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 00:73:8D TinnoMob # Tinno Mobile Technology Corp 00:73:E0 SamsungE # Samsung Electronics Co.,Ltd 00:75:32 InidBv # INID BV @@ -15414,7 +15417,7 @@ 00:80:3F Tatung # TATUNG COMPANY 00:80:40 JohnFluk # JOHN FLUKE MANUFACTURING CO. 00:80:41 VebKombi # VEB KOMBINAT ROBOTRON -00:80:42 EmersonN # Emerson Network Power +00:80:42 ArtesynE # Artesyn Embedded Technologies 00:80:43 Networld # NETWORLD, INC. 00:80:44 SystechC # SYSTECH COMPUTER CORP. 00:80:45 Matsushi # MATSUSHITA ELECTRIC IND. CO @@ -15877,6 +15880,7 @@ 00:97:FF HeimannS # Heimann Sensor GmbH 00:9C:02 Hewlett- # Hewlett-Packard Company 00:9D:8E CardiacR # CARDIAC RECORDERS, INC. +00:9E:C8 BeijingX # Beijing Xiaomi Electronic Products Co., Ltd. 00:A0:00 Centilli # CENTILLION NETWORKS, INC. 00:A0:01 DrsSigna # DRS Signal Solutions 00:A0:02 LeedsNor # LEEDS & NORTHRUP AUSTRALIA PTY LTD @@ -16441,7 +16445,7 @@ 00:C0:F6 CelanTec # CELAN TECHNOLOGY INC. 00:C0:F7 EngageCo # ENGAGE COMMUNICATION, INC. 00:C0:F8 AboutCom # ABOUT COMPUTING INC. -00:C0:F9 EmersonN # Emerson Network Power +00:C0:F9 ArtesynE # Artesyn Embedded Technologies 00:C0:FA CanaryCo # CANARY COMMUNICATIONS, INC. 00:C0:FB Advanced # ADVANCED TECHNOLOGY LABS 00:C0:FC ElasticR # ELASTIC REALITY, INC. @@ -16714,6 +16718,7 @@ 00:D1:1C Acetel 00:D3:8D HotelTec # Hotel Technology Next Generation 00:D6:32 GeEnergy # GE Energy +00:D9:D1 SonyComp # Sony Computer Entertainment Inc. 00:DB:1E AlbedoTe # Albedo Telecom SL 00:DB:45 Thamway # THAMWAY CO.,LTD. 00:DB:DF IntelCor # Intel Corporate @@ -16787,7 +16792,7 @@ 00:E0:32 MisysFin # MISYS FINANCIAL SYSTEMS, LTD. 00:E0:33 EEPD # E.E.P.D. GmbH 00:E0:34 Cisco # CISCO SYSTEMS, INC. -00:E0:35 EmersonN # Emerson Network Power +00:E0:35 ArtesynE # Artesyn Embedded Technologies 00:E0:36 Pioneer # PIONEER CORPORATION 00:E0:37 Century # CENTURY CORPORATION 00:E0:38 Proxima # PROXIMA CORPORATION @@ -16990,6 +16995,7 @@ 00:E0:FD A-TrendT # A-TREND TECHNOLOGY CO., LTD. 00:E0:FE Cisco # CISCO SYSTEMS, INC. 00:E0:FF Security # SECURITY DYNAMICS TECHNOLOGIES, Inc. +00:E1:6D Cisco 00:E1:75 Ak-Syste # AK-Systems Ltd 00:E3:B2 SamsungE # Samsung Electronics Co.,Ltd 00:E6:66 ArimaCom # ARIMA Communications Corp. @@ -17062,10 +17068,12 @@ 04:58:6F SichuanW # Sichuan Whayer information industry Co.,LTD 04:5A:95 Nokia # Nokia Corporation 04:5C:06 ZmodoTec # Zmodo Technology Corporation +04:5C:8E GosundGr # gosund GROUP CO.,LTD 04:5D:56 CamtronI # camtron industrial inc. 04:5F:A7 Shenzhen # Shenzhen Yichen Technology Development Co.,LTD 04:62:D7 AlstomHy # ALSTOM HYDRO FRANCE 04:63:E0 NomeOy # Nome Oy +04:67:85 ScemtecH # scemtec Hard- und Software fuer Mess- und Steuerungstechnik GmbH 04:6D:42 Bryston # Bryston Ltd. 04:6E:49 TaiyearE # TaiYear Electronic Technology (Suzhou) Co., Ltd 04:70:BC Globalst # Globalstar Inc. @@ -17098,6 +17106,7 @@ 04:C1:B9 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 04:C5:A4 Cisco # CISCO SYSTEMS, INC. 04:C8:80 Samtec # Samtec Inc +04:C9:91 Phistek # Phistek INC. 04:CB:1D Traka # Traka plc 04:CE:14 Wilocity # Wilocity LTD. 04:CF:25 Manycolo # MANYCOLORS, INC. @@ -17107,6 +17116,7 @@ 04:DB:56 Apple # Apple, Inc. 04:DB:8A SuntechI # Suntech International Ltd. 04:DD:4C Velocyte # Velocytech +04:DE:DB Rockport # Rockport Networks Inc 04:DF:69 CarConne # Car Connectivity Consortium 04:E0:C4 Triumph- # TRIUMPH-ADLER AG 04:E1:C8 ImsSoluç # IMS Soluções em Energia Ltda. @@ -17299,13 +17309,13 @@ 08:37:9C Topaz # Topaz Co. LTD. 08:38:A5 Funkwerk # Funkwerk plettac electronic GmbH 08:3A:B8 ShinodaP # Shinoda Plasma Co., Ltd. +08:3D:88 SamsungE # Samsung Electronics Co.,Ltd 08:3E:0C ArrisGro # ARRIS Group, Inc. 08:3E:8E HonHaiPr # Hon Hai Precision Ind.Co.Ltd 08:3F:3E Wsh # WSH GmbH 08:3F:76 Intellia # Intellian Technologies, Inc. 08:40:27 Gridstor # Gridstore Inc. 08:48:2C RaycoreT # Raycore Taiwan Co., LTD. -08:49:29 Cybati 08:4E:1C H2aLlc # H2A Systems, LLC 08:4E:BF BroadNet # Broad Net Mux Corporation 08:51:2E OrionDia # Orion Diagnostica Oy @@ -17353,6 +17363,7 @@ 08:BE:09 AstrolEl # Astrol Electronic AG 08:CA:45 ToyouFei # Toyou Feiji Electronics Co., Ltd. 08:CC:68 Cisco +08:CD:9B SamtecAu # samtec automotive electronics & software GmbH 08:D0:9F Cisco # CISCO SYSTEMS, INC. 08:D2:9A Proforma # Proformatique 08:D4:0C IntelCor # Intel Corporate @@ -17370,6 +17381,7 @@ 08:F1:B7 Towerstr # Towerstream Corpration 08:F2:F4 NetOnePa # Net One Partners Co.,Ltd. 08:F6:F8 GetEngin # GET Engineering +08:F7:28 GloboMul # GLOBO Multimedia Sp. z o.o. Sp.k. 08:FA:E0 FohhnAud # Fohhn Audio AG 08:FC:52 OpenxsBv # OpenXS BV 08:FC:88 SamsungE # Samsung Electronics Co.,Ltd @@ -17393,6 +17405,7 @@ 0C:2D:89 QiiqComm # QiiQ Communications Inc. 0C:30:21 Apple 0C:37:DC HuaweiTe # Huawei Technologies Co., Ltd +0C:38:3E FanvilTe # Fanvil Technology Co., Ltd. 0C:39:56 Observat # Observator instruments 0C:3C:65 DomeImag # Dome Imaging Inc 0C:3E:9F Apple # Apple, Inc @@ -17428,6 +17441,7 @@ 0C:85:25 Cisco # CISCO SYSTEMS, INC. 0C:89:10 SamsungE # Samsung Electronics Co.,LTD 0C:8B:FD IntelCor # Intel Corporate +0C:8C:8F KamoTech # Kamo Technology Limited 0C:8C:DC SuuntoOy # Suunto Oy 0C:8D:98 TopEight # TOP EIGHT IND CORP 0C:92:4E RiceLake # Rice Lake Weighing Systems @@ -17442,6 +17456,7 @@ 0C:A4:02 AlcatelL # Alcatel Lucent IPD 0C:A4:2A ObTeleco # OB Telecom Electronic Technology Co., Ltd 0C:A6:94 SunitecE # Sunitec Enterprise Co.,Ltd +0C:AC:05 UnitendT # Unitend Technologies Inc. 0C:AF:5A GenusPow # GENUS POWER INFRASTRUCTURES LIMITED 0C:B4:EF Digience # Digience Co.,Ltd. 0C:BD:51 TctMobil # TCT Mobile Limited @@ -17491,6 +17506,7 @@ 10:00:E8 National # NATIONAL SEMICONDUCTOR 10:00:FD Laonpeop # LaonPeople 10:01:CA AshleyBu # Ashley Butterworth +10:05:CA Cisco 10:09:0C JanomeSe # Janome Sewing Machine Co., Ltd. 10:0B:A9 IntelCor # Intel Corporate 10:0C:24 Pomdevic # pomdevices, LLC @@ -17515,6 +17531,8 @@ 10:28:31 Morion # Morion Inc. 10:2D:96 Looxcie # Looxcie Inc. 10:2E:AF TexasIns # Texas Instruments +10:2F:6B Microsof # Microsoft Corporation +10:30:47 SamsungE # Samsung Electronics Co.,Ltd 10:33:78 Flectron # FLECTRON Co., LTD 10:37:11 SimlinkA # Simlink AS 10:3B:59 SamsungE # Samsung Electronics Co.,Ltd @@ -17527,6 +17545,7 @@ 10:47:80 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 10:48:B1 BeijingD # Beijing Duokan Technology Limited 10:4D:77 Innovati # Innovative Computer Engineering +10:51:72 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 10:56:CA PeplinkI # Peplink International Ltd. 10:5C:3B Perma-Pi # Perma-Pipe, Inc. 10:5C:BF Durobyte # DuroByte Inc @@ -17552,6 +17571,7 @@ 10:88:0F DarumaTe # Daruma Telecomunicações e Informática S.A. 10:88:CE Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 10:8C:CF Cisco # CISCO SYSTEMS, INC. +10:92:66 SamsungE # Samsung Electronics Co.,Ltd 10:93:E9 Apple 10:9A:B9 TosiboxO # Tosibox Oy 10:9A:DD Apple @@ -17569,6 +17589,7 @@ 10:BD:18 Cisco # CISCO SYSTEMS, INC. 10:BF:48 AsustekC # ASUSTEK COMPUTER INC. 10:C2:BA Utt # UTT Co., Ltd. +10:C3:7B AsustekC # ASUSTek COMPUTER INC. 10:C5:86 BioSound # BIO SOUND LAB CO., LTD. 10:C6:1F HuaweiTe # Huawei Technologies Co., Ltd 10:C6:FC GarminIn # Garmin International @@ -17606,6 +17627,7 @@ 14:1A:51 Treetech # Treetech Sistemas Digitais 14:1B:BD Volex # Volex Inc. 14:1B:F0 Intellim # Intellimedia Systems Ltd +14:1F:BA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 14:23:D7 Eutronix # EUTRONIX CO., LTD. 14:2B:D2 Armtel # Armtel Ltd. 14:2B:D6 Guangdon # Guangdong Appscomm Co.,Ltd @@ -17613,6 +17635,7 @@ 14:2D:8B IncipioT # Incipio Technologies, Inc 14:2D:F5 Amphitec # Amphitech 14:30:7A Avermetr # Avermetrics +14:30:C6 Motorola # Motorola Mobility LLC 14:35:8B Mediabri # Mediabridge Products, LLC. 14:35:B3 FutureDe # Future Designs, Inc. 14:36:05 Nokia # Nokia Corporation @@ -17628,6 +17651,7 @@ 14:4C:1A MaxCommu # Max Communication GmbH 14:54:12 Entis # Entis Co., Ltd. 14:56:45 Savitech # Savitech Corp. +14:58:D0 HewlettP # Hewlett Packard 14:5A:05 Apple 14:5B:D1 ArrisGro # ARRIS Group, Inc. 14:60:80 Zte # zte corporation @@ -17636,6 +17660,7 @@ 14:6E:0A Private 14:73:73 TubitakU # TUBITAK UEKAE 14:74:11 Rim +14:75:90 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 14:7D:B3 JoaTelec # JOA TELECOM.CO.,LTD 14:7D:C5 MurataMa # Murata Manufacturing Co., Ltd. 14:82:5B HefeiRad # Hefei Radio Communication Technology Co., Ltd @@ -17647,6 +17672,7 @@ 14:94:48 BluCastl # BLU CASTLE S.A. 14:99:E2 Apple # Apple, Inc 14:9F:E8 LenovoMo # Lenovo Mobile Communication Technology Ltd. +14:A3:64 SamsungE # Samsung Electronics Co.,Ltd 14:A6:2C SMDezacS # S.M. Dezac S.A. 14:A8:6B Shenzhen # ShenZhen Telacom Science&Technology Co., Ltd 14:A9:E3 Mst # MST CORPORATION @@ -17657,6 +17683,7 @@ 14:B7:3D ArcheanT # ARCHEAN Technologies 14:B9:68 HuaweiTe # Huawei Technologies Co., Ltd 14:C0:89 DuneHd # DUNE HD LTD +14:C1:26 Nokia # Nokia Corporation 14:C2:1D SabtechI # Sabtech Industries 14:CC:20 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD 14:CF:8D OhsungEl # OHSUNG ELECTRONICS CO., LTD. @@ -17675,6 +17702,7 @@ 14:F0:C5 Xtremio # Xtremio Ltd. 14:F2:8E Shenyang # ShenYang ZhongKe-Allwin Technology Co.LTD 14:F4:2A SamsungE # Samsung Electronics +14:F6:5A Xiaomi # Xiaomi inc. 14:FE:AF Sagittar # SAGITTAR LIMITED 14:FE:B5 Dell # Dell Inc 18:00:2D SonyMobi # Sony Mobile Communications AB @@ -17704,6 +17732,7 @@ 18:2A:7B Nintendo # Nintendo Co., Ltd. 18:2B:05 8dTechno # 8D Technologies 18:2C:91 ConceptD # Concept Development, Inc. +18:30:09 WoojinIn # Woojin Industrial Systems Co., Ltd. 18:32:A2 LaonTech # LAON TECHNOLOGY CO., LTD. 18:33:9D Cisco # CISCO SYSTEMS, INC. 18:34:51 Apple @@ -17718,6 +17747,7 @@ 18:44:62 RiavaNet # Riava Networks, Inc. 18:46:17 SamsungE # Samsung Electronics 18:48:D8 Fastback # Fastback Networks +18:4A:6F Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd 18:4E:94 MessoaTe # MESSOA TECHNOLOGIES INC. 18:52:53 Pixord # Pixord Corporation 18:53:E0 HanyangD # Hanyang Digitech Co.Ltd @@ -17737,7 +17767,9 @@ 18:7E:D5 Shenzhen # shenzhen kaism technology Co. Ltd 18:80:CE Barberry # Barberry Solutions Ltd 18:80:F5 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd +18:82:19 AlibabaC # Alibaba Cloud Computing Ltd. 18:83:31 SamsungE # Samsung Electronics Co.,Ltd +18:83:BF Arcadyan # Arcadyan Technology Corporation 18:84:10 Coretrus # CoreTrust Inc. 18:86:3A DigitalA # DIGITAL ART SYSTEM 18:86:AC NokiaDan # Nokia Danmark A/S @@ -17768,7 +17800,9 @@ 18:C4:51 TucsonEm # Tucson Embedded Systems 18:C8:E7 Shenzhen # Shenzhen Hualistone Technology Co.,Ltd 18:CC:23 PhilioTe # Philio Technology Corporation +18:CF:5E LiteonTe # Liteon Technology Corporation 18:D0:71 DasanSmc # DASAN SMC, Inc. +18:D5:B6 SmgHoldi # SMG Holdings LLC 18:D6:6A Inmarsat 18:D6:CF KurthEle # Kurth Electronic GmbH 18:D9:49 QvisLabs # Qvis Labs, LLC @@ -17813,6 +17847,7 @@ 1C:41:58 GemaltoM # Gemalto M2M GmbH 1C:43:EC JapanCir # JAPAN CIRCUIT CO.,LTD 1C:45:93 TexasIns # Texas Instruments +1C:48:40 ImsMesss # IMS Messsysteme GmbH 1C:48:F9 GnNetcom # GN Netcom A/S 1C:4A:F7 Amon # AMON INC 1C:4B:B9 SmgEnter # SMG ENTERPRISE, LLC @@ -17830,6 +17865,7 @@ 1C:66:6D HonHaiPr # Hon Hai Precision Ind.Co.Ltd 1C:66:AA SamsungE # Samsung Electronics 1C:69:A5 Research # Research In Motion +1C:6A:7A Cisco 1C:6B:CA Mitsunam # Mitsunami Co., Ltd. 1C:6F:65 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 1C:75:08 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. @@ -17851,6 +17887,7 @@ 1C:95:9F Veethree # Veethree Electronics And Marine LLC 1C:97:3D PricomDe # PRICOM Design 1C:99:4C MurataMa # Murata Manufactuaring Co.,Ltd. +1C:9C:26 ZoovelTe # Zoovel Technologies 1C:A7:70 Shenzhen # SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT 1C:AA:07 Cisco # CISCO SYSTEMS, INC. 1C:AB:01 Innovolt @@ -17869,6 +17906,7 @@ 1C:C3:16 Milesigh # MileSight Technology Co., Ltd. 1C:C6:3C Arcadyan # Arcadyan Technology Corporation 1C:D4:0C KriwanIn # Kriwan Industrie-Elektronik GmbH +1C:DE:A7 Cisco 1C:DF:0F Cisco # CISCO SYSTEMS, INC. 1C:E1:65 Marshal # Marshal Corporation 1C:E1:92 Qisda # Qisda Corporation @@ -17893,6 +17931,7 @@ 20:0E:95 Iec–Tc9W # IEC – TC9 WG43 20:10:7A GemtekTe # Gemtek Technology Co., Ltd. 20:12:57 MostLuck # Most Lucky Trading Ltd +20:12:D5 Scientec # Scientech Materials Corporation 20:13:E0 SamsungE # Samsung Electronics Co.,Ltd 20:16:D8 LiteonTe # Liteon Technology Corporation 20:18:0E Shenzhen # Shenzhen Sunchip Technology Co., Ltd @@ -17927,6 +17966,7 @@ 20:68:9D LiteonTe # Liteon Technology Corporation 20:6A:8A WistronI # Wistron InfoComm Manufacturing(Kunshan)Co.,Ltd. 20:6A:FF AtlasEle # Atlas Elektronik UK Limited +20:6E:9C SamsungE # Samsung Electronics Co.,Ltd 20:6F:EC BraemacC # Braemac CA LLC 20:73:55 ArrisGro # ARRIS Group, Inc. 20:74:CF Shenzhen # Shenzhen Voxtech Co.,Ltd @@ -17939,10 +17979,12 @@ 20:89:86 Zte # zte corporation 20:91:8A Profalux 20:91:D9 IM # I'M SPA +20:93:4D FujianSt # Fujian Star-net Communication Co., Ltd 20:9A:E9 Volacomm # Volacomm Co., Ltd 20:9B:A5 JiaxingG # JIAXING GLEAD Electronics Co.,Ltd 20:A2:E7 Lee-Dick # Lee-Dickens Ltd 20:A7:87 BointecT # Bointec Taiwan Corporation Limited +20:A9:9B Microsof # Microsoft Corporation 20:AA:25 Ip-NetLl # IP-NET LLC 20:AA:4B Cisco-Li # Cisco-Linksys, LLC 20:B0:F7 Enclustr # Enclustra GmbH @@ -17953,6 +17995,7 @@ 20:BB:C6 JabilCir # Jabil Circuit Hungary Ltd. 20:BF:DB Dvl 20:C1:AF IWitDigi # i Wit Digital Co., Limited +20:C3:8F TexasIns # Texas Instruments Inc 20:C6:0D Shanghai # Shanghai annijie Information technology Co.,LTD 20:C6:EB Panasoni # Panasonic Corporation AVC Networks Company 20:C8:B3 Shenzhen # SHENZHEN BUL-TECH CO.,LTD. @@ -17973,6 +18016,7 @@ 20:E5:64 ArrisGro # ARRIS Group, Inc. 20:E7:91 SiemensH # Siemens Healthcare Diagnostics, Inc 20:EA:C7 Shenzhen # SHENZHEN RIOPINE ELECTRONICS CO., LTD +20:ED:74 AbilityE # Ability enterprise co.,Ltd. 20:EE:C6 Elefirst # Elefirst Science & Tech Co ., ltd 20:F0:02 MtdataDe # MTData Developments Pty. Ltd. 20:F3:A3 HuaweiTe # Huawei Technologies Co., Ltd @@ -18005,6 +18049,7 @@ 24:45:97 GemueGeb # GEMUE Gebr. Mueller Apparatebau 24:47:0E Pentroni # PentronicAB 24:49:7B Innovati # Innovative Converged Devices Inc +24:4F:1D IruleLlc # iRule LLC 24:5F:DF Kyocera # KYOCERA Corporation 24:62:78 Sysmocom # sysmocom - systems for mobile communications GmbH 24:64:EF CygSunri # CYG SUNRI CO.,LTD. @@ -18049,6 +18094,7 @@ 24:C9:DE Genoray 24:CB:E7 Myk # MYK, Inc. 24:CF:21 Shenzhen # Shenzhen State Micro Technology Co., Ltd +24:D1:3F Mexus # MEXUS CO.,LTD 24:D2:CC Smartdri # SmartDrive Systems Inc. 24:D9:21 Avaya # Avaya, Inc 24:DA:B6 Sistemas # Sistemas de Gestión Energética S.A. de C.V @@ -18057,6 +18103,7 @@ 24:DB:ED SamsungE # Samsung Electronics Co.,Ltd 24:DE:C6 ArubaNet # Aruba Networks 24:E2:71 QingdaoH # Qingdao Hisense Communications Co.,Ltd +24:E3:14 Apple 24:E6:BA JscZavod # JSC Zavod im. Kozitsky 24:E9:B3 Cisco 24:EA:40 SystemeH # Systeme Helmholz GmbH @@ -18083,6 +18130,7 @@ 28:22:46 BeijingS # Beijing Sinoix Communication Co., LTD 28:26:A6 PbrElect # PBR electronics GmbH 28:28:5D ZyxelCom # ZyXEL Communications Corporation +28:29:CC CorsaTec # Corsa Technology Incorporated 28:29:D9 Globalbe # GlobalBeiMing technology (Beijing)Co. Ltd 28:2C:B2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 28:31:52 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -18101,6 +18149,7 @@ 28:48:46 Gridcent # GridCentric Inc. 28:4C:53 IntuneNe # Intune Networks 28:4D:92 Luminato # Luminator +28:4E:D7 Outsmart # OutSmart Power Systems, Inc. 28:4F:CE Liaoning # Liaoning Wontel Science and Technology Development Co.,Ltd. 28:51:32 Shenzhen # Shenzhen Prayfly Technology Co.,Ltd 28:57:67 Echostar # Echostar Technologies Corp @@ -18135,6 +18184,7 @@ 28:A1:EB EtekTech # ETEK TECHNOLOGY (SHENZHEN) CO.,LTD 28:A2:41 Exlar # exlar corp 28:A5:74 MillerEl # Miller Electric Mfg. Co. +28:A5:EE Shenzhen # Shenzhen SDGI CATV Co., Ltd 28:AF:0A SiriusXm # Sirius XM Radio Inc 28:B0:CC XenyaDOO # Xenya d.o.o. 28:B2:BD IntelCor # Intel Corporate @@ -18147,6 +18197,7 @@ 28:C6:71 YotaDevi # Yota Devices OY 28:C6:8E Netgear # NETGEAR INC., 28:C7:18 Altierre +28:C7:CE Cisco 28:C8:25 Dellking # DellKing Industrial Co., Ltd 28:C9:14 Taimag # Taimag Corporation 28:CB:EB One @@ -18167,8 +18218,10 @@ 28:E0:2C Apple 28:E1:4C Apple # Apple, Inc. 28:E2:97 Shanghai # Shanghai InfoTM Microelectronics Co.,Ltd. +28:E3:1F Xiaomi # Xiaomi inc. 28:E3:47 LiteonTe # Liteon Technology Corporation 28:E6:08 Tokheim +28:E6:E9 SisSatIn # SIS Sat Internet Services GmbH 28:E7:94 Microtim # Microtime Computer Inc. 28:E7:CF Apple 28:ED:58 JagJakob # JAG Jakob AG @@ -18179,14 +18232,17 @@ 28:F6:06 SyesSrl # Syes srl 28:FB:D3 Ragentek # Ragentek Technology Group 28:FC:51 Electric # The Electric Controller and Manufacturing Co., LLC +28:FC:F6 Shenzhen # Shenzhen Xin KingBrand enterprises Co.,Ltd 2C:00:2C Unowhy 2C:00:33 Econtrol # EControls, LLC 2C:00:F7 Xos +2C:01:0B NascentT # NASCENT Technology, LLC - RemKon 2C:06:23 WinLeade # Win Leader Inc. 2C:07:3C Devline # DEVLINE LIMITED 2C:10:C1 Nintendo # Nintendo Co., Ltd. 2C:18:AE TrendEle # Trend Electronics Co., Ltd. 2C:19:84 IdnTelec # IDN Telecom, Inc. +2C:1A:31 Electron # Electronics Company Limited 2C:1E:EA Aerodev 2C:21:72 JuniperN # Juniper Networks 2C:24:5F BabolatV # Babolat VS @@ -18213,6 +18269,7 @@ 2C:44:FD HewlettP # Hewlett Packard 2C:53:4A Shenzhen # Shenzhen Winyao Electronic Limited 2C:54:2D Cisco # CISCO SYSTEMS, INC. +2C:54:CF LgElectr # LG Electronics 2C:55:3C Gainspee # Gainspeed, Inc. 2C:59:E5 HewlettP # Hewlett Packard 2C:5A:05 Nokia # Nokia Corporation @@ -18248,11 +18305,13 @@ 2C:A7:80 TrueTech # True Technologies Inc. 2C:A8:35 Rim 2C:AB:25 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd +2C:AB:A4 CiscoSpv # Cisco SPVTG 2C:B0:5D Netgear 2C:B0:DF SolitonT # Soliton Technologies Pvt Ltd 2C:B4:3A Apple 2C:B6:93 Radware 2C:B6:9D RedDigit # RED Digital Cinema +2C:BE:08 Apple 2C:BE:97 Ingenieu # Ingenieurbuero Bickele und Buehler GmbH 2C:C2:60 Ravello # Ravello Systems 2C:CC:15 Nokia # Nokia Corporation @@ -18272,9 +18331,11 @@ 2C:EE:26 Petroleu # Petroleum Geo-Services 2C:F2:03 EmkoElek # EMKO ELEKTRONIK SAN VE TIC AS 2C:F4:C5 Avaya # Avaya, Inc +2C:FA:A2 Alcatel- # Alcatel-Lucent 2E:2E:2E LaaLocal # LAA (Locally Administered Address) for Meditech Systems 30:05:5C BrotherI # Brother industries, LTD. 30:0B:9C DeltaMob # Delta Mobile Systems, Inc. +30:0D:2A Zhejiang # Zhejiang Wellcom Technology Co.,Ltd. 30:0E:D5 HonHaiPr # Hon Hai Precision Ind.Co.Ltd 30:10:E4 Apple # Apple, Inc. 30:14:2D Piciorgr # Piciorgros GmbH @@ -18289,6 +18350,7 @@ 30:2D:E8 JdaLlcJd # JDA, LLC (JDA Systems) 30:32:94 W-Ie-Ne- # W-IE-NE-R Plein & Baus GmbH 30:32:D4 Hanilstm # Hanilstm Co., Ltd. +30:33:35 Boosty 30:37:A6 Cisco # CISCO SYSTEMS, INC. 30:38:55 Nokia # Nokia Corporation 30:39:26 SonyEric # Sony Ericsson Mobile Communications AB @@ -18298,6 +18360,7 @@ 30:3D:08 GlinttTe # GLINTT TES S.A. 30:3E:AD SonavoxC # Sonavox Canada Inc 30:41:74 AltecLan # ALTEC LANSING LLC +30:42:25 Burg-Wäc # BURG-WÄCHTER KG 30:44:49 Plath # PLATH GmbH 30:46:9A Netgear 30:49:3B NanjingZ # Nanjing Z-Com Wireless Co.,Ltd @@ -18307,6 +18370,7 @@ 30:52:5A Nst # NST Co., LTD 30:55:ED TrexNetw # Trex Network LLC 30:57:AC Irlab # IRLAB LTD. +30:59:5B Streamno # streamnow AG 30:59:B7 Microsof # Microsoft 30:5D:38 Beissbar # Beissbarth 30:60:23 ArrisGro # ARRIS Group, Inc. @@ -18338,6 +18402,7 @@ 30:B2:16 HytecGer # Hytec Geraetebau GmbH 30:B3:A2 Shenzhen # Shenzhen Heguang Measurement & Control Technology Co.,Ltd 30:B5:C2 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +30:B5:F1 AitexinT # Aitexin Technology Co., Ltd 30:C7:50 MicTechn # MIC Technology Group 30:C7:AE SamsungE # Samsung Electronics Co.,Ltd 30:C8:2A Wi-NextS # Wi-Next s.r.l. @@ -18356,10 +18421,15 @@ 30:F4:2F Esp 30:F7:0D Cisco # Cisco Systems 30:F7:C5 Apple +30:F7:D7 ThreadTe # Thread Technology Co., Ltd 30:F9:ED Sony # Sony Corporation 30:FD:11 Macrotec # MACROTECH (USA) INC. +34:00:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +34:02:86 IntelCor # Intel Corporate +34:02:9B Cloudber # CloudBerry Technologies Private Limited 34:07:FB Ericsson # Ericsson AB 34:08:04 D-Link # D-Link Corporation +34:0A:FF QingdaoH # Qingdao Hisense Communications Co.,Ltd 34:13:A8 Mediplan # Mediplan Limited 34:13:E8 IntelCor # Intel Corporate 34:15:9E Apple @@ -18373,10 +18443,12 @@ 34:29:EA McdElect # MCD ELECTRONICS SP. Z O.O. 34:2F:6E Anywire # Anywire corporation 34:31:11 SamsungE # Samsung Electronics Co.,Ltd +34:31:C4 Avm # AVM GmbH 34:40:B5 Ibm 34:46:6F HitemEng # HiTEM Engineering 34:4B:3D Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 34:4B:50 Zte # ZTE Corporation +34:4D:F7 LgElectr # LG Electronics 34:4F:3F Io-Power # IO-Power Technology Co., Ltd. 34:4F:5C R&Amp;M # R&M AG 34:4F:69 EkinopsS # EKINOPS SAS @@ -18427,6 +18499,7 @@ 34:BA:51 Se-KureC # Se-Kure Controls, Inc. 34:BA:9A Asiatelc # Asiatelco Technologies Co. 34:BB:1F Research # Research In Motion +34:BB:26 Motorola # Motorola Mobility LLC 34:BC:A6 BeijingD # Beijing Ding Qing Technology, Ltd. 34:BD:C8 Cisco # Cisco Systems 34:BD:F9 Shanghai # Shanghai WDK Industrial Co.,Ltd. @@ -18435,6 +18508,7 @@ 34:BF:90 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. 34:C0:59 Apple 34:C3:AC SamsungE # Samsung Electronics +34:C5:D0 Hagleitn # Hagleitner Hygiene International GmbH 34:C6:9A Enecsys # Enecsys Ltd 34:C7:31 Alps # ALPS Co,. Ltd. 34:C8:03 Nokia # Nokia Corporation @@ -18455,6 +18529,7 @@ 34:E4:2A Automati # Automatic Bar Controls Inc. 34:EF:44 2wire 34:EF:8B NttCommu # NTT Communications Corporation +34:F0:CA Shenzhen # Shenzhen Linghangyuan Digital Technology Co.,Ltd. 34:F3:9B Wizlan # WizLAN Ltd. 34:F6:2D Sharp # SHARP Corporation 34:F9:68 AtekProd # ATEK Products, LLC @@ -18462,6 +18537,7 @@ 34:FC:6F Alcea 38:01:97 ToshibaS # Toshiba Samsung Storage Technolgoy Korea Corporation 38:06:B4 ADC # A.D.C. GmbH +38:08:FD Silca # Silca Spa 38:0A:0A Sky-City # Sky-City Communication and Electronics Limited Company 38:0A:94 SamsungE # Samsung Electronics Co.,Ltd 38:0B:40 SamsungE # Samsung Electronics Co.,Ltd @@ -18471,11 +18547,14 @@ 38:16:D1 SamsungE # Samsung Electronics Co.,Ltd 38:17:66 Promzaka # PROMZAKAZ LTD. 38:19:2F Nokia # Nokia Corporation +38:1C:1A Cisco 38:1C:4A SimcomWi # SIMCom Wireless Solutions Co.,Ltd. 38:22:9D PirelliT # Pirelli Tyre S.p.A. 38:22:D6 H3cTechn # H3C Technologies Co., Limited +38:26:2B UtranTec # UTran Technology 38:26:CD Andtek 38:28:EA FujianNe # Fujian Netcom Technology Co., LTD +38:2D:D1 SamsungE # Samsung Electronics Co.,Ltd 38:31:AC Weg 38:3F:10 DblTechn # DBL Technology Ltd. 38:42:33 Wildeboe # Wildeboer Bauteile GmbH @@ -18539,8 +18618,10 @@ 38:EC:E4 SamsungE # Samsung Electronics 38:EE:9D Anedo # Anedo Ltd. 38:F0:98 VaporSto # Vapor Stone Rail Systems +38:F3:3F Tatsuno # TATSUNO CORPORATION 38:F5:97 Home2net # home2net GmbH 38:F7:08 National # National Resource Management, Inc. +38:F8:89 HuaweiTe # Huawei Technologies Co., Ltd 38:F8:B7 V2comPar # V2COM PARTICIPACOES S.A. 38:FE:C5 EllipsBV # Ellips B.V. 3C:00:00 3Com @@ -18559,6 +18640,7 @@ 3C:10:6F Albahith # ALBAHITH TECHNOLOGIES 3C:15:C2 Apple 3C:15:EA Tescom # TESCOM CO., LTD. +3C:18:9F Nokia # Nokia Corporation 3C:18:A0 Luxshare # Luxshare Precision Industry Co.,Ltd. 3C:19:15 GfiChron # GFI Chrono Time 3C:19:7D Ericsson # Ericsson AB @@ -18578,6 +18660,7 @@ 3C:3A:73 Avaya # Avaya, Inc 3C:40:4F Guangdon # Guangdong Pisen Electronics Co. Ltd. 3C:43:8E ArrisGro # ARRIS Group, Inc. +3C:46:D8 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 3C:4A:92 Hewlett- # Hewlett-Packard Company 3C:4C:69 Infinity # Infinity System S.L. 3C:4E:47 Etronic # Etronic A/S @@ -18613,9 +18696,11 @@ 3C:98:BF QuestCon # Quest Controls, Inc. 3C:99:F7 Lansente # Lansentechnology AB 3C:9F:81 Shenzhen # Shenzhen CATIC Bit Communications Technology Co.,Ltd +3C:A1:0D SamsungE # Samsung Electronics Co.,Ltd 3C:A3:15 BlessInf # Bless Information & Communications Co., Ltd 3C:A7:2B MrvCommu # MRV Communications (Networks) LTD 3C:A9:F4 IntelCor # Intel Corporate +3C:AA:3F Ikey # iKey, Ltd. 3C:AB:8E Apple 3C:B1:5B Avaya # Avaya, Inc 3C:B1:7F Wattwatc # Wattwatchers Pty Ld @@ -18628,6 +18713,7 @@ 3C:C2:43 Nokia # Nokia Corporation 3C:C9:9E HuiyangT # Huiyang Technology Co., Ltd 3C:CA:87 Iders # Iders Incorporated +3C:CD:5A Technisc # Technische Alternative GmbH 3C:CD:93 LgElectr # LG ELECTRONICS INC 3C:CE:73 Cisco # CISCO SYSTEMS, INC. 3C:D0:F8 Apple @@ -18635,6 +18721,7 @@ 3C:D4:D6 Wireless # WirelessWERX, Inc 3C:D7:DA SkMtekMi # SK Mtek microelectronics(shenzhen)limited 3C:D9:2B Hewlett- # Hewlett-Packard Company +3C:D9:CE EclipseW # Eclipse WiFi 3C:DF:1E Cisco # CISCO SYSTEMS, INC. 3C:DF:BD HuaweiTe # Huawei Technologies Co., Ltd 3C:E0:72 Apple @@ -18681,6 +18768,7 @@ 40:4A:03 ZyxelCom # ZyXEL Communications Corporation 40:4A:18 AddrekSm # Addrek Smart Solutions 40:4D:8E Shenzhen # Shenzhen Huawei Communication Technologies Co., Ltd +40:4E:EB HigherWa # Higher Way Electronic Co., Ltd. 40:50:E0 MiltonSe # Milton Security Group LLC 40:51:6C GrandexI # Grandex International Corporation 40:52:0D PicoTech # Pico Technology @@ -18701,9 +18789,11 @@ 40:70:4A PowerIde # Power Idea Technology Limited 40:70:74 LifeTech # Life Technology (China) Co., Ltd 40:74:96 AfunTech # aFUN TECHNOLOGY INC. +40:78:6A Motorola # Motorola Mobility LLC 40:78:75 Imbel-In # IMBEL - Industria de Material Belico do Brasil 40:7A:80 Nokia # Nokia Corporation 40:7B:1B MettleNe # Mettle Networks Inc. +40:82:56 Continen # Continental Automotive GmbH 40:83:DE Motorola 40:84:93 Claviste # Clavister AB 40:88:E0 BeijingE # Beijing Ereneben Information Technology Limited Shenzhen Branch @@ -18735,6 +18825,7 @@ 40:BF:17 Digistar # Digistar Telecom. SA 40:C2:45 Shenzhen # Shenzhen Hexicom Technology Co., Ltd. 40:C4:D6 Chongqin # ChongQing Camyu Technology Development Co.,Ltd. +40:C6:2A Shanghai # Shanghai Jing Ren Electronic Technology Co., Ltd. 40:C7:C9 Naviit # Naviit Inc. 40:CB:A8 HuaweiTe # Huawei Technologies Co., Ltd 40:CD:3A Z3Techno # Z3 Technology @@ -19230,6 +19321,7 @@ 40:EF:4C Fihonest # Fihonest communication co.,Ltd 40:F0:2F LiteonTe # Liteon Technology Corporation 40:F1:4C IseEurop # ISE Europe SPRL +40:F2:01 Sagemcom 40:F2:E9 Ibm 40:F3:08 MurataMa # Murata Manufactuaring Co.,Ltd. 40:F4:07 Nintendo # Nintendo Co., Ltd. @@ -19280,12 +19372,14 @@ 44:5F:7A ShihlinE # Shihlin Electric & Engineering Corp. 44:61:32 Ecobee # ecobee inc 44:61:9C Fonsyste # FONsystem co. ltd. +44:66:6E Ip-Line 44:67:55 OrbitIrr # Orbit Irrigation 44:68:AB Juin # JUIN COMPANY, LIMITED 44:6C:24 ReallinE # Reallin Electronic Co.,Ltd 44:6D:57 LiteonTe # Liteon Technology Corporation 44:70:0B Iffu 44:70:98 MingHong # MING HONG TECHNOLOGY (SHEN ZHEN) LIMITED +44:74:6C SonyMobi # Sony Mobile Communications AB 44:7B:C4 Dualshin # DualShine Technology(SZ)Co.,Ltd 44:7C:7F Innoligh # Innolight Technology Corporation 44:7D:A5 VtionInf # VTION INFORMATION TECHNOLOGY (FUJIAN) CO.,LTD @@ -19306,6 +19400,7 @@ 44:9C:B5 Alcomp # Alcomp, Inc 44:A4:2D TctMobil # TCT Mobile Limited 44:A6:89 PromaxEl # PROMAX ELECTRONICA SA +44:A6:E5 Thinking # THINKING TECHNOLOGY CO.,LTD 44:A7:CF MurataMa # Murata Manufacturing Co., Ltd. 44:A8:C2 SewooTec # SEWOO TECH CO., LTD 44:AA:27 Udworks # udworks Co., Ltd. @@ -19340,12 +19435,14 @@ 47:54:43 GtcNotRe # GTC (Not registered!) (This number is a multicast!) 48:02:2A B-LinkEl # B-Link Electronic Limited 48:03:62 DesayEle # DESAY ELECTRONICS(HUIZHOU)CO.,LTD +48:0C:49 NakayoTe # NAKAYO TELECOMMUNICATIONS,INC 48:12:49 LuxcomTe # Luxcom Technologies Inc. 48:13:F3 BbkElect # BBK Electronics Corp., Ltd. 48:17:4C Micropow # MicroPower technologies 48:18:42 Shanghai # Shanghai Winaas Co. Equipment Co. Ltd. 48:1A:84 PointerT # Pointer Telocation Ltd 48:1B:D2 IntronSc # Intron Scientific co., ltd. +48:26:E8 Tek-Air # Tek-Air Systems, Inc. 48:28:2F Zte # ZTE Corporation 48:2C:EA Motorola # Motorola Inc Business Light Radios 48:33:DD ZennioAv # ZENNIO AVANCE Y TECNOLOGIA, S.L. @@ -19357,8 +19454,10 @@ 48:46:F1 UrosOy # Uros Oy 48:46:FB HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 48:4C:00 NetworkS # Network Solutions +48:51:B7 IntelCor # Intel Corporate 48:52:61 Soreel 48:54:E8 Winbond? +48:59:29 LgElectr # LG Electronics 48:5A:3F Wisol 48:5A:B6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 48:5B:39 AsustekC # ASUSTek COMPUTER INC. @@ -19377,6 +19476,7 @@ 48:91:53 Weinmann # Weinmann Geräte für Medizin GmbH + Co. KG 48:91:F6 Shenzhen # Shenzhen Reach software technology CO.,LTD 48:9B:E2 SciInnov # SCI Innovations Ltd +48:9D:18 Flashbay # Flashbay Limited 48:9D:24 Research # Research In Motion 48:A2:2D Shenzhen # Shenzhen Huaxuchang Telecom Technology Co.,Ltd 48:A2:B7 KodofonJ # Kodofon JSC @@ -19396,7 +19496,9 @@ 48:D1:8E MetisCom # Metis Communication Co.,Ltd 48:D2:24 LiteonTe # Liteon Technology Corporation 48:D5:4C JedaNetw # Jeda Networks +48:D7:05 Apple 48:D7:FF BlankomA # BLANKOM Antennentechnik GmbH +48:D8:55 Telvent 48:D8:FE ClaridyS # ClarIDy Solutions, Inc. 48:DC:FB Nokia # Nokia Corporation 48:DF:1C WuhanNec # Wuhan NEC Fibre Optic Communications industry Co. Ltd @@ -19425,6 +19527,7 @@ 4C:0D:EE JabilCir # JABIL CIRCUIT (SHANGHAI) LTD. 4C:0F:6E HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 4C:0F:C7 EardaEle # Earda Electronics Co.,Ltd +4C:11:BF Zhejiang # ZHEJIANG DAHUA TECHNOLOGY CO.,LTD. 4C:14:80 Noregon # NOREGON SYSTEMS, INC 4C:14:A3 TclTechn # TCL Technoly Electronics (Huizhou) Co., Ltd. 4C:17:EB Sagemcom @@ -19434,6 +19537,7 @@ 4C:21:D0 SonyMobi # Sony Mobile Communications AB 4C:22:58 Cozybit # cozybit, Inc. 4C:25:78 Nokia # Nokia Corporation +4C:26:E7 Welgate # Welgate Co., Ltd. 4C:2C:80 BeijingS # Beijing Skyway Technologies Co.,Ltd 4C:2F:9D IcmContr # ICM Controls 4C:30:89 ThalesTr # Thales Transportation Systems GmbH @@ -19459,6 +19563,7 @@ 4C:62:55 Sanmina- # SANMINA-SCI SYSTEM DE MEXICO S.A. DE C.V. 4C:63:EB Applicat # Application Solutions (Electronics and Vision) Ltd 4C:64:D9 Guangdon # Guangdong Leawin Group Co., Ltd +4C:6E:6E ComnectT # Comnect Technology CO.,LTD 4C:72:B9 Pegatron # Pegatron Corporation 4C:73:67 GeniusBy # Genius Bytes Software Solutions GmbH 4C:73:A5 Kove @@ -19469,6 +19574,7 @@ 4C:80:4F Armstron # Armstrong Monitoring Corp 4C:80:93 IntelCor # Intel Corporate 4C:82:CF Echostar # Echostar Technologies +4C:83:DE CiscoSpv # Cisco SPVTG 4C:8B:30 Actionte # Actiontec Electronics, Inc 4C:8B:55 GrupoDig # Grupo Digicon 4C:8B:EF HuaweiTe # Huawei Technologies Co., Ltd @@ -19478,6 +19584,7 @@ 4C:98:EF Zeo 4C:9E:80 KyokkoEl # KYOKKO ELECTRIC Co., Ltd. 4C:9E:E4 HanyangN # Hanyang Navicom Co.,Ltd. +4C:9E:FF ZyxelCom # ZyXEL Communications Corp 4C:A5:6D SamsungE # Samsung Electronics Co.,Ltd 4C:A7:4B AlcatelL # Alcatel Lucent 4C:AA:16 Azurewav # AzureWave Technologies (Shanghai) Inc. @@ -19489,6 +19596,8 @@ 4C:B8:1C SamElect # SAM Electronics GmbH 4C:B9:C8 Conet # CONET CO., LTD. 4C:BA:A3 BisonEle # Bison Electronics Inc. +4C:BB:58 ChiconyE # Chicony Electronics Co., Ltd. +4C:BC:42 Shenzhen # Shenzhen Hangsheng Electronics Co.,Ltd. 4C:BC:A5 SamsungE # Samsung Electronics Co.,Ltd 4C:C4:52 ShangHai # Shang Hai Tyd. Electon Technology Ltd. 4C:C6:02 Radios # Radios, Inc. @@ -19502,9 +19611,11 @@ 4C:DF:3D TeamEngi # TEAM ENGINEERS ADVANCE TECHNOLOGIES INDIA PVT LTD 4C:E1:BB ZhuhaiHi # Zhuhai HiFocus Technology Co., Ltd. 4C:E6:76 Buffalo # Buffalo Inc. +4C:E9:33 Railcomm # RailComm, LLC 4C:EB:42 IntelCor # Intel Corporate 4C:ED:DE AskeyCom # Askey Computer Corp 4C:F0:2E VifaDenm # Vifa Denmark A/S +4C:F2:BF Cambridg # Cambridge Industries(Group) Co.,Ltd. 4C:F4:5B BlueClov # Blue Clover Devices 4C:F7:37 SamjiEle # SamJi Electronics Co., Ltd 50:00:8C HongKong # Hong Kong Telecommunications (HKT) Limited @@ -19539,6 +19650,7 @@ 50:4A:5E Masimo # Masimo Corporation 50:4A:6E Netgear # NETGEAR INC., 50:4F:94 LoxoneEl # Loxone Electronics GmbH +50:50:65 Takt # TAKT Corporation 50:56:63 TexasIns # Texas Instruments 50:56:A8 Jolla # Jolla Ltd 50:56:BF SamsungE # Samsung Electronics Co.,LTD @@ -19550,6 +19662,7 @@ 50:61:D6 Indu-Sol # Indu-Sol GmbH 50:63:13 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 50:64:41 Greenlee +50:67:87 Itellus 50:67:F0 ZyxelCom # ZyXEL Communications Corporation 50:6F:9A Wi-FiAll # Wi-Fi Alliance 50:70:E5 HeShanWo # He Shan World Fair Electronics Technology Limited @@ -19560,6 +19673,7 @@ 50:7D:02 Biodit 50:7E:5D Arcadyan # Arcadyan Technology Corporation 50:85:69 SamsungE # Samsung Electronics Co.,LTD +50:87:89 Cisco 50:87:B8 Nuvyyo # Nuvyyo Inc 50:8A:42 UptmateT # Uptmate Technology Co., LTD 50:8A:CB Shenzhen # SHENZHEN MAXMADE TECHNOLOGY CO., LTD. @@ -19581,6 +19695,7 @@ 50:B7:C3 SamsungE # Samsung Electronics CO., LTD 50:B8:88 Wi2beTec # wi2be Tecnologia S/A 50:B8:A2 ImtechTe # ImTech Technologies LLC, +50:BD:5F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 50:C0:06 Carmanah # Carmanah Signs 50:C2:71 Securete # SECURETECH INC 50:C5:8D JuniperN # Juniper Networks @@ -19605,6 +19720,7 @@ 50:FA:AB L-TekDOO # L-tek d.o.o. 50:FC:30 Treehous # Treehouse Labs 50:FC:9F SamsungE # Samsung Electronics Co.,Ltd +50:FE:F2 SifyTech # Sify Technologies Ltd 52:54:00 RealtekU # Realtek (UpTech? also reported) 52:54:4C Novell20 # Novell 2000 52:54:AB RealtekA # REALTEK (a Realtek 8029 based PCI Card) @@ -19672,6 +19788,7 @@ 54:A9:D4 Minibar # Minibar Systems 54:AE:27 Apple 54:B6:20 SuhdolE& # SUHDOL E&C Co.Ltd. +54:B7:53 HunanFen # Hunan Fenghui Yinjia Science And Technology Co.,Ltd 54:BE:F7 Pegatron # PEGATRON CORPORATION 54:C8:0F Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. 54:CD:A7 FujianSh # Fujian Shenzhou Electronic Co.,Ltd @@ -19680,6 +19797,7 @@ 54:D1:63 Max-Tech # MAX-TECH,INC 54:D1:B0 Universa # Universal Laser Systems, Inc 54:D4:6F CiscoSpv # Cisco SPVTG +54:DF:00 Ulterius # Ulterius Technologies, LLC 54:DF:63 Intrakey # Intrakey technologies GmbH 54:E0:32 JuniperN # Juniper Networks 54:E2:E0 Pace # Pace plc @@ -19692,8 +19810,10 @@ 54:EF:92 Shenzhen # Shenzhen Elink Technology Co., LTD 54:F5:B6 Oriental # ORIENTAL PACIFIC INTERNATIONAL LIMITED 54:F6:66 Berthold # Berthold Technologies GmbH and Co.KG +54:FA:3E SamsungE # Samsung Electronics Co.,LTD 54:FB:58 Wiseware # WISEWARE, Lda 54:FD:BF ScheidtB # Scheidt & Bachmann GmbH +54:FF:CF MopriaAl # Mopria Alliance 56:58:57 AculabPl # Aculab plc audio bridges 58:05:28 LabrisNe # LABRIS NETWORKS 58:05:56 Elettron # Elettronica GF S.r.L. @@ -19706,6 +19826,7 @@ 58:17:0C SonyEric # Sony Ericsson Mobile Communications AB 58:1C:BD Affinegy 58:1D:91 Advanced # Advanced Mobile Telecom co.,ltd. +58:1F:67 Open-MTe # Open-m technology limited 58:1F:AA Apple 58:1F:EF Tuttnaer # Tuttnaer LTD 58:23:8C Technico # Technicolor CH USA @@ -19785,6 +19906,7 @@ 58:F6:7B XiaMenUn # Xia Men UnionCore Technology LTD. 58:F6:BF KyotoUni # Kyoto University 58:F9:8E Secudos # SECUDOS GmbH +58:FC:DB IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 58:FD:20 BravidaS # Bravida Sakerhet AB 5C:02:6A AppliedV # Applied Vision Corporation 5C:07:6F ThoughtC # Thought Creator @@ -19793,6 +19915,7 @@ 5C:0E:8B Motorola 5C:11:93 SealOne # Seal One AG 5C:14:37 Thyssenk # Thyssenkrupp Aufzugswerke GmbH +5C:15:15 Advan 5C:15:E1 AidcTech # AIDC TECHNOLOGY (S) PTE LTD 5C:16:C7 BigSwitc # Big Switch Networks 5C:17:37 I-ViewNo # I-View Now, LLC. @@ -19804,6 +19927,7 @@ 5C:25:4C AvireGlo # Avire Global Pte Ltd 5C:26:0A Dell # Dell Inc. 5C:2A:EF OpenAcce # Open Access Pty Ltd +5C:2E:59 SamsungE # Samsung Electronics Co.,Ltd 5C:31:3E TexasIns # Texas Instruments 5C:33:27 SpazioIt # Spazio Italia srl 5C:33:5C Swisspho # Swissphone Telecom AG @@ -19823,6 +19947,7 @@ 5C:57:1A ArrisGro # ARRIS Group, Inc. 5C:57:C8 Nokia # Nokia Corporation 5C:59:48 Apple +5C:5B:C2 Yik # YIK Corporation 5C:5E:AB JuniperN # Juniper Networks 5C:63:BF Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 5C:69:84 Nuvico @@ -19836,6 +19961,8 @@ 5C:86:4A SecretLa # Secret Labs LLC 5C:87:78 Cybertel # Cybertelbridge co.,ltd 5C:89:D4 BeijingB # Beijing Banner Electric Co.,Ltd +5C:8D:4E Apple +5C:93:A2 LiteonTe # Liteon Technology Corporation 5C:95:AE Apple 5C:96:9D Apple 5C:9A:D8 Fujitsu # Fujitsu Limited @@ -19844,6 +19971,8 @@ 5C:A4:8A Cisco 5C:AC:4C HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 5C:B5:24 SonyEric # Sony Ericsson Mobile Communications AB +5C:B6:CC Novacomm # NovaComm Technologies Inc. +5C:B8:CB AllisCom # Allis Communications 5C:BD:9E Hongkong # HONGKONG MIRACLE EAGLE TECHNOLOGY(GROUP) LIMITED 5C:C2:13 FrSauter # Fr. Sauter AG 5C:C5:D4 IntelCor # Intel Corporate @@ -19876,9 +20005,12 @@ 5C:F6:DC SamsungE # Samsung Electronics Co.,LTD 5C:F8:A1 MurataMa # Murata Manufactuaring Co.,Ltd. 5C:F9:38 Apple # Apple, Inc +5C:F9:6A HuaweiTe # Huawei Technologies Co., Ltd 5C:F9:DD Dell # Dell Inc +5C:F9:F0 AtomosEn # Atomos Engineering P/L 5C:FF:35 Wistron # Wistron Corporation 5C:FF:FF Shenzhen # Shenzhen Kezhonglong Optoelectronic Technology Co., Ltd +60:02:92 Pegatron # PEGATRON CORPORATION 60:02:B4 WistronN # Wistron NeWeb Corp. 60:03:08 Apple 60:03:47 BillionE # Billion Electric Co. Ltd. @@ -19898,6 +20030,7 @@ 60:32:F0 MplusTec # Mplus technology 60:33:4B Apple 60:35:53 BuwonTec # Buwon Technology +60:36:96 Sapling # The Sapling Company 60:36:DD IntelCor # Intel Corporate 60:38:0E AlpsElec # Alps Electric Co., 60:39:1F Abb # ABB Ltd @@ -19907,7 +20040,10 @@ 60:45:BD Microsof # Microsoft 60:46:16 XiamenVa # XIAMEN VANN INTELLIGENT CO., LTD 60:47:D4 ForicsEl # FORICS Electronic Technology Co., Ltd. +60:48:26 Newbridg # Newbridge Technologies Int. Ltd. 60:4A:1C Suyin # SUYIN Corporation +60:50:C1 KinetekS # Kinetek Sports +60:51:2C TctMobil # TCT mobile limited 60:52:D0 FactsEng # FACTS Engineering 60:54:64 EyedroGr # Eyedro Green Solutions Inc. 60:57:18 IntelCor # Intel Corporate @@ -19922,7 +20058,9 @@ 60:73:5C Cisco 60:74:8D AtmacaEl # Atmaca Elektronik 60:76:88 Velodyne +60:77:E2 SamsungE # Samsung Electronics Co.,Ltd 60:81:2B CustomCo # Custom Control Concepts +60:81:F9 Helium # Helium Systems, Inc 60:83:B2 GkwareEK # GkWare e.K. 60:84:3B Soladigm # Soladigm, Inc. 60:86:45 AveryWei # Avery Weigh-Tronix, LLC @@ -19940,6 +20078,7 @@ 60:9F:9D Cloudswi # CloudSwitch 60:A1:0A SamsungE # Samsung Electronics Co.,Ltd 60:A4:4C AsustekC # ASUSTek COMPUTER INC. +60:A8:FE NokiaSol # Nokia Solutions and Networks 60:A9:B0 Merchand # Merchandising Technologies, Inc 60:B1:85 AthSyste # ATH system 60:B3:C4 ElberSrl # Elber Srl @@ -19951,11 +20090,13 @@ 60:BC:4C EwmHight # EWM Hightec Welding GmbH 60:BD:91 MoveInno # Move Innovation 60:BE:B5 Motorola # Motorola Mobility LLC +60:C1:CB FujianGr # Fujian Great Power PLC Equipment Co.,Ltd 60:C3:97 2wire # 2Wire Inc 60:C5:47 Apple 60:C5:A8 BeijingL # Beijing LT Honway Technology Co.,Ltd 60:C9:80 Trymus 60:CB:FB Airscape # AirScape Inc. +60:CD:A9 Abloomy 60:CD:C5 TaiwanCa # Taiwan Carol Electronics., Ltd 60:D0:A9 SamsungE # Samsung Electronics Co.,Ltd 60:D1:AA VishalTe # Vishal Telecommunications Pvt Ltd @@ -19968,6 +20109,7 @@ 60:DE:44 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 60:E0:0E ShinseiE # SHINSEI ELECTRONICS CO LTD 60:E3:27 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +60:E7:01 HuaweiTe # Huawei Technologies Co., Ltd 60:E9:56 AylaNetw # Ayla Networks, Inc 60:EB:69 QuantaCo # Quanta computer Inc. 60:F1:3D Jablocom # JABLOCOM s.r.o. @@ -19987,6 +20129,7 @@ 64:00:F1 Cisco # CISCO SYSTEMS, INC. 64:05:BE NewLight # NEW LIGHT LED 64:09:4C BeijingS # Beijing Superbee Wireless Technology Co.,Ltd +64:09:80 XiaomiEl # XIAOMI Electronics,CO.,LTD 64:0B:4A DigitalT # Digital Telecom Technology Limited 64:0E:36 Taztag 64:0E:94 Pluribus # Pluribus Networks, Inc. @@ -20014,6 +20157,8 @@ 64:4B:F0 Caldigit # CalDigit, Inc 64:4D:70 Dspace # dSPACE GmbH 64:4F:74 Lenus # LENUS Co., Ltd. +64:4F:B0 HyunjinC # Hyunjin.com +64:51:06 HewlettP # Hewlett Packard 64:51:7E LongBenD # LONG BEN (DONGGUAN) ELECTRONIC TECHNOLOGY CO.,LTD. 64:52:99 Chamberl # The Chamberlain Group, Inc 64:53:5D Frausche # Frauscher Sensortechnik @@ -20027,11 +20172,13 @@ 64:5E:BE Yahoo!Ja # Yahoo! JAPAN 64:5F:FF NicoletN # Nicolet Neuro 64:62:23 Cellient # Cellient Co., Ltd. +64:64:9B JuniperN # juniper networks 64:65:C0 Nuvon # Nuvon, Inc 64:66:B3 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. 64:67:07 BeijingO # Beijing Omnific Technology, Ltd. 64:68:0C Comtrend 64:69:BC HyteraCo # Hytera Communications Co .,ltd +64:6C:B2 SamsungE # Samsung Electronics Co.,Ltd 64:6E:6C RadioDat # Radio Datacom LLC 64:6E:EA Iskratel # Iskratel d.o.o. 64:70:02 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. @@ -20070,6 +20217,7 @@ 64:AE:88 Polytec # Polytec GmbH 64:B3:10 SamsungE # Samsung Electronics Co.,Ltd 64:B3:70 Powercom # PowerComm Solutons LLC +64:B4:73 Xiaomi # Xiaomi inc. 64:B6:4A Vivotech # ViVOtech, Inc. 64:B9:E8 Apple 64:BA:BD SdjTechn # SDJ Technologies, Inc. @@ -20085,6 +20233,7 @@ 64:D4:DA IntelCor # Intel Corporate 64:D8:14 Cisco # CISCO SYSTEMS, INC. 64:D9:12 Solidica # Solidica, Inc. +64:D9:54 TaicangA # TAICANG AND W ELECTRONICS CO LTD 64:D9:89 Cisco # CISCO SYSTEMS, INC. 64:DB:18 Openpatt # OpenPattern 64:DC:01 StaticGr # Static Systems Group PLC @@ -20097,6 +20246,7 @@ 64:E8:92 MorioDen # Morio Denki Co., Ltd. 64:E8:E6 GlobalMo # global moisture management system 64:E9:50 Cisco +64:EA:C5 Sibotech # SiboTech Automation Co., Ltd. 64:EB:8C SeikoEps # Seiko Epson Corporation 64:ED:57 ArrisGro # ARRIS Group, Inc. 64:ED:62 Woori # WOORI SYSTEMS Co., Ltd @@ -20105,6 +20255,7 @@ 64:F9:70 KenadeEl # Kenade Electronics Technology Co.,LTD. 64:F9:87 Avvasi # Avvasi Inc. 64:FC:8C Zonar # Zonar Systems +68:05:71 SamsungE # Samsung Electronics Co.,Ltd 68:05:CA IntelCor # Intel Corporate 68:09:27 Apple 68:0A:D7 Yancheng # Yancheng Kecheng Optoelectronic Technology Co., Ltd @@ -20140,6 +20291,7 @@ 68:69:2E Zycoo # Zycoo Co.,Ltd 68:69:F2 ComapSRO # ComAp s.r.o. 68:6E:23 Wi3 # Wi3 Inc. +68:6E:48 ProphetE # Prophet Electronic Technology Corp.,Ltd 68:72:51 Ubiquiti # Ubiquiti Networks 68:76:4F SonyMobi # Sony Mobile Communications AB 68:78:48 Westunit # Westunitis Co., Ltd. @@ -20164,6 +20316,7 @@ 68:97:E8 SocietyO # Society of Motion Picture & Television Engineers 68:9C:5E AcsipTec # AcSiP Technology Corp. 68:9C:70 Apple +68:A0:F6 HuaweiTe # Huawei Technologies Co., Ltd 68:A1:B7 HonghaoM # Honghao Mingchuan Technology (Beijing) CO.,Ltd. 68:A3:C4 LiteonTe # Liteon Technology Corporation 68:A4:0E BshBosch # BSH Bosch and Siemens Home Appliances GmbH @@ -20201,6 +20354,7 @@ 68:F8:95 Redflow # Redflow Limited 68:FB:95 Generalp # Generalplus Technology Inc. 68:FC:B3 NextLeve # Next Level Security Systems, Inc. +6C:02:73 Shenzhen # Shenzhen Jin Yun Video Equipment Co., Ltd. 6C:04:60 RbhAcces # RBH Access Technologies Inc. 6C:09:D6 Digiques # Digiquest Electronics LTD 6C:0E:0D SonyEric # Sony Ericsson Mobile Communications AB @@ -20208,6 +20362,7 @@ 6C:14:F7 Erhardt+ # Erhardt+Leimer GmbH 6C:15:F9 Nautroni # Nautronix Limited 6C:18:11 DecaturE # Decatur Electronics +6C:19:8F D-LinkIn # D-Link International 6C:20:56 Cisco 6C:22:AB Ainswort # Ainsworth Game Technology 6C:23:B9 SonyEric # Sony Ericsson Mobile Communications AB @@ -20215,6 +20370,7 @@ 6C:2C:06 OooNppSy # OOO NPP Systemotechnika-NN 6C:2E:33 Accelink # Accelink Technologies Co.,Ltd. 6C:2E:85 Sagemcom +6C:2F:2C SamsungE # Samsung Electronics Co.,Ltd 6C:32:DE IndieonT # Indieon Technologies Pvt. Ltd. 6C:33:A9 Magicjac # Magicjack LP 6C:39:1D BeijingZ # Beijing ZhongHuaHun Network Information center @@ -20237,10 +20393,12 @@ 6C:61:26 RinicomH # Rinicom Holdings 6C:62:6D Micro-St # Micro-Star INT'L CO., LTD 6C:64:1A PenguinC # Penguin Computing +6C:6E:FE CoreLogi # Core Logic Inc. 6C:6F:18 Stereota # Stereotaxis, Inc. 6C:70:39 Novar # Novar GmbH 6C:70:9F Apple 6C:71:D9 Azurewav # AzureWave Technologies, Inc +6C:76:60 Kyocera # KYOCERA Corporation 6C:81:FE Mitsuba # Mitsuba Corporation 6C:83:36 SamsungE # Samsung Electronics Co.,Ltd 6C:83:66 NanjingS # Nanjing SAC Power Grid Automation Co., Ltd. @@ -20268,11 +20426,14 @@ 6C:AD:EF KzBroadb # KZ Broadband Technologies, Ltd. 6C:AD:F8 Azurewav # Azurewave Technologies, Inc. 6C:AE:8B Ibm # IBM Corporation +6C:B0:CE Netgear 6C:B3:11 Shenzhen # Shenzhen Lianrui Electronics Co.,Ltd 6C:B3:50 AnhuiCom # Anhui comhigher tech co.,ltd 6C:B7:F4 SamsungE # Samsung Electronics Co.,Ltd 6C:BE:E9 Alcatel- # Alcatel-Lucent-IPD +6C:BF:B5 NoonTech # Noon Technology Co., Ltd 6C:C1:D2 ArrisGro # ARRIS Group, Inc. +6C:C2:17 HewlettP # Hewlett Packard 6C:C2:6B Apple 6C:D0:32 LgElectr # LG Electronics 6C:D1:46 SmartekD # Smartek d.o.o. @@ -20291,6 +20452,7 @@ 6C:F3:7F ArubaNet # Aruba Networks 6C:F9:7C Nanoptix # Nanoptix Inc. 6C:FA:58 Avaya # Avaya, Inc +6C:FA:89 Cisco 6C:FA:A7 AmpakTec # AMPAK Technology Inc. 6C:FD:B9 ProwareT # Proware Technologies Co Ltd. 6C:FF:BE MpbCommu # MPB Communications Inc. @@ -20310,6 +20472,7 @@ 70:25:59 Cybertan # CyberTAN Technology, Inc. 70:2B:1D E-DomusI # E-Domus International Limited 70:2C:1F Wisol +70:2D:D1 NewingsC # Newings Communication CO., LTD. 70:2F:4B Polyvisi # PolyVision Inc. 70:2F:97 AavaMobi # Aava Mobile Oy 70:30:18 Avaya # Avaya, Inc @@ -20337,6 +20500,7 @@ 70:59:57 Medallio # Medallion Instrumentation Systems 70:59:86 OooTtv # OOO TTV 70:5A:B6 CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. +70:5B:2E M2commun # M2Communication Inc. 70:5C:AD KonamiGa # Konami Gaming Inc 70:5E:AA ActionTa # Action Target, Inc. 70:60:DE Lavision # LaVision GmbH @@ -20348,6 +20512,7 @@ 70:70:4C PurpleCo # Purple Communications, Inc 70:71:B3 Brain # Brain Corporation 70:71:BC Pegatron # PEGATRON CORPORATION +70:72:0D LenovoMo # Lenovo Mobile Communication Technology Ltd. 70:72:3C HuaweiTe # Huawei Technologies Co., Ltd 70:72:CF Edgecore # EdgeCore Networks 70:73:CB Apple @@ -20377,17 +20542,29 @@ 70:A6:6A ProxDyna # Prox Dynamics AS 70:A8:E3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 70:AA:B2 Research # Research In Motion +70:AF:25 Nishiyam # Nishiyama Industry Co.,LTD. 70:B0:35 Shenzhen # Shenzhen Zowee Technology Co., Ltd 70:B0:8C ShenouCo # Shenou Communication Equipment Co.,Ltd 70:B1:4E Pace # Pace plc 70:B2:65 HiltronS # Hiltron s.r.l. 70:B3:D5 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see OUI36 public listing for more information. +70:B3:D5:01:00:00/36 HanwaEle # Hanwa Electronic Ind.Co.,Ltd. +70:B3:D5:01:60:00/36 Guardian # Guardian Controls International Ltd +70:B3:D5:01:D0:00/36 WeiglEle # Weigl Elektronik & Mediaprojekte +70:B3:D5:02:50:00/36 ElsuhdNe # Elsuhd Net Ltd Co. +70:B3:D5:02:90:00/36 MarimoEl # Marimo electronics Co.,Ltd. +70:B3:D5:03:B0:00/36 Ssl-Elec # SSL - Electrical Aerospace Ground Equipment Section 70:B3:D5:04:40:00/36 DonElect # Don Electronics Ltd 70:B3:D5:05:20:00/36 SudoPrem # Sudo Premium Engineering +70:B3:D5:05:80:00/36 TelinkSe # Telink Semiconductor CO, Limtied, Taiwan 70:B3:D5:07:70:00/36 Inaccess # InAccess Networks SA 70:B3:D5:09:00:00/36 Powercra # POWERCRAFT ELECTRONICS PVT. LTD. +70:B3:D5:09:90:00/36 Schwer+K # Schwer+Kopka GmbH 70:B3:D5:0A:90:00/36 Proconne # ProConnections, Inc. 70:B3:D5:0A:A0:00/36 Wanco # Wanco Inc +70:B3:D5:0B:30:00/36 ReonixAu # Reonix Automation +70:B3:D5:0C:00:00/36 MoluTech # Molu Technology Inc., LTD. +70:B3:D5:0D:60:00/36 TattileS # TATTILE SRL 70:B3:D5:0E:00:00/36 Plcis 70:B3:D5:0F:00:00/36 Avionica 70:B3:D5:0F:B0:00/36 CygnusLl # Cygnus LLC @@ -20396,73 +20573,206 @@ 70:B3:D5:18:30:00/36 EvcoSPA # Evco S.p.a. 70:B3:D5:18:40:00/36 Xv360Opt # XV360 Optical Information Systems Ltd. 70:B3:D5:19:00:00/36 FantomWi # Fantom Wireless, Inc. +70:B3:D5:19:C0:00/36 Kubu # Kubu, Inc. 70:B3:D5:1A:C0:00/36 SvpBroad # SVP Broadcast Microwave S.L. +70:B3:D5:20:40:00/36 Twc +70:B3:D5:20:C0:00/36 SiemensH # Siemens Healthcare Diagnostics +70:B3:D5:23:C0:00/36 Quasonix # Quasonix, LLC +70:B3:D5:25:00:00/36 DatumEle # Datum Electronics Limited +70:B3:D5:28:E0:00/36 TexCompu # TEX COMPUTER SRL 70:B3:D5:28:F0:00/36 Overline # Overline Systems 70:B3:D5:29:D0:00/36 Xtech2Si # XTech2 SIA +70:B3:D5:2A:50:00/36 Taitotek # Taitotekniikka +70:B3:D5:2D:40:00/36 Ct # CT Company +70:B3:D5:2D:A0:00/36 SkywaveN # Skywave Networks Private Limited +70:B3:D5:2E:30:00/36 Meiknolo # Meiknologic GmbH +70:B3:D5:2F:00:00/36 Clock-O- # Clock-O-Matic +70:B3:D5:2F:D0:00/36 SpecialP # Special Projects Group, Inc +70:B3:D5:30:50:00/36 CaitronI # CAITRON Industrial Solutions GmbH 70:B3:D5:30:80:00/36 DsdMicro # DSD MICROTECHNOLOGY,INC. +70:B3:D5:32:30:00/36 TattileS # TATTILE SRL +70:B3:D5:33:C0:00/36 Videri # Videri Inc. +70:B3:D5:34:60:00/36 Ultamati # Ultamation Limited +70:B3:D5:34:A0:00/36 PavoTasa # PAVO TASARIM ÜRETİM TİC A.Ş. 70:B3:D5:35:C0:00/36 AcsElect # ACS electronics srl 70:B3:D5:35:F0:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:36:20:00/36 Asiga +70:B3:D5:36:D0:00/36 Cybertea # Cyberteam Sp z o o +70:B3:D5:39:B0:00/36 Iroc # IROC AB 70:B3:D5:3A:80:00/36 Jamhub # JamHub Corp. 70:B3:D5:3C:20:00/36 Cellular # Cellular Specialties, Inc. +70:B3:D5:3C:E0:00/36 Aditec # Aditec GmbH 70:B3:D5:3D:E0:00/36 ElomacEl # ELOMAC Elektronik GmbH +70:B3:D5:3D:F0:00/36 Multidyn # MultiDyne +70:B3:D5:3E:10:00/36 Barnstor # Barnstormer Softworks +70:B3:D5:3E:50:00/36 Ateme 70:B3:D5:3E:D0:00/36 UltraEle # Ultra Electronics Sonar System Division +70:B3:D5:3E:F0:00/36 VtronPty # Vtron Pty Ltd 70:B3:D5:3F:10:00/36 OlympusN # Olympus NDT Canada 70:B3:D5:40:A0:00/36 MonroeEl # Monroe Electronics, Inc. 70:B3:D5:42:F0:00/36 Sintokog # SINTOKOGIO, LTD 70:B3:D5:43:30:00/36 Flexsolu # Flexsolution APS +70:B3:D5:43:D0:00/36 VeryxTec # Veryx Technologies Private Limited +70:B3:D5:45:E0:00/36 Esol # eSOL Co.,Ltd. 70:B3:D5:4C:10:00/36 QuercusT # QUERCUS TECHNOLOGIES, S. L. 70:B3:D5:4C:80:00/36 Hosokawa # Hosokawa Micron Powder Systems +70:B3:D5:50:10:00/36 PeekTraf # PEEK TRAFFIC +70:B3:D5:50:70:00/36 HumanOri # Human Oriented Technology, Inc. 70:B3:D5:51:D0:00/36 TecnintH # Tecnint HTE Srl 70:B3:D5:51:E0:00/36 Fundació # Fundación Cardiovascular de Colombia +70:B3:D5:54:D0:00/36 QingdaoH # Qingdao Haitian Weiye Automation Control System Co., Ltd +70:B3:D5:54:E0:00/36 RflElect # RFL Electronics, Inc. +70:B3:D5:55:90:00/36 EagleMou # Eagle Mountain Technology +70:B3:D5:55:D0:00/36 Lunanexu # LunaNexus Inc +70:B3:D5:56:40:00/36 Christma # christmann informationstechnik + medien GmbH & Co. KG +70:B3:D5:57:B0:00/36 Elamakat # ELAMAKATO GmbH +70:B3:D5:58:70:00/36 IncaaCom # INCAA Computers 70:B3:D5:5A:80:00/36 Farmobil # Farmobile +70:B3:D5:5A:A0:00/36 ChugokuE # Chugoku Electric Manufacturing Co.,Inc +70:B3:D5:5B:50:00/36 LehighEl # Lehigh Electric Products Co 70:B3:D5:5E:80:00/36 Vitec +70:B3:D5:5F:00:00/36 Managee # managee GmbH & Co KG +70:B3:D5:60:B0:00/36 Edgeware # Edgeware AB +70:B3:D5:60:C0:00/36 IstElekt # IST ElektronikgesmbH 70:B3:D5:61:F0:00/36 Labotect # Labotect Labor-Technik-Göttingen GmbH 70:B3:D5:62:50:00/36 VxInstru # VX Instruments GmbH +70:B3:D5:63:40:00/36 Idaqs # idaqs Co.,Ltd. +70:B3:D5:65:50:00/36 AotSyste # AOT System GmbH +70:B3:D5:68:20:00/36 Rosslare # Rosslare Enterprises Limited 70:B3:D5:6B:60:00/36 Inradios # INRADIOS GmbH 70:B3:D5:6D:30:00/36 Deuta-We # DEUTA-WERKE GmbH +70:B3:D5:6D:90:00/36 Vectare # VECTARE Inc +70:B3:D5:6E:50:00/36 Deuta-We # DEUTA-WERKE GmbH +70:B3:D5:6F:20:00/36 P&CMicro # P&C Micro's Pty Ltd +70:B3:D5:6F:60:00/36 AccoBran # Acco Brands Europe 70:B3:D5:70:20:00/36 SensorHi # Sensor Highway Ltd +70:B3:D5:70:80:00/36 IbmResea # IBM Research GmbH +70:B3:D5:70:90:00/36 Aml +70:B3:D5:71:00:00/36 Guardian # Guardian Controls International Ltd +70:B3:D5:73:10:00/36 Phoniro # Phoniro Systems AB +70:B3:D5:75:10:00/36 Gnf +70:B3:D5:75:50:00/36 Landmark # LandmarkTech Systems Technology Co.,Ltd. 70:B3:D5:79:A0:00/36 Innerspe # Innerspec Technologies Inc. +70:B3:D5:7A:90:00/36 Adidas # adidas AG +70:B3:D5:7E:70:00/36 Atessa # Atessa, Inc. 70:B3:D5:80:F0:00/36 Quickwar # Quickware Eng & Des LLC 70:B3:D5:81:40:00/36 Ingenieu # Ingenieurbuero SOMTRONIK +70:B3:D5:81:90:00/36 «Intelle # «Intellect module» LLC +70:B3:D5:82:C0:00/36 Nels # NELS Ltd. +70:B3:D5:83:B0:00/36 Telefoni # Telefonix Incorporated +70:B3:D5:86:D0:00/36 CensusDi # Census Digital Incorporated 70:B3:D5:87:10:00/36 OsoTechn # Oso Technologies +70:B3:D5:8A:B0:00/36 Emac # EMAC, Inc. 70:B3:D5:8B:10:00/36 M-TechIn # M-Tech Innovations Ltd +70:B3:D5:8C:E0:00/36 Cores # CORES Corporation +70:B3:D5:8D:C0:00/36 NiveoInt # Niveo International BV +70:B3:D5:8F:50:00/36 Stmovic 70:B3:D5:90:80:00/36 Accusoni # Accusonic 70:B3:D5:91:80:00/36 GlovaRai # Glova Rail A/S +70:B3:D5:93:60:00/36 FaroTech # FARO TECHNOLOGIES, INC. +70:B3:D5:94:10:00/36 Triax # Triax A/S +70:B3:D5:95:60:00/36 Aerovisi # AeroVision Avionics, Inc. +70:B3:D5:95:A0:00/36 SigmannE # Sigmann Elektronik GmbH +70:B3:D5:96:F0:00/36 4cam # 4CAM GmbH +70:B3:D5:98:60:00/36 AplexTec # Aplex Technology Inc. 70:B3:D5:99:40:00/36 KeffNetw # KeFF Networks 70:B3:D5:9A:70:00/36 Honeywel # Honeywell 70:B3:D5:9F:40:00/36 TbandSrl # Tband srl 70:B3:D5:A0:B0:00/36 Ambihome # ambiHome GmbH 70:B3:D5:A0:E0:00/36 Vetaphon # Vetaphone A/S +70:B3:D5:A1:50:00/36 Intercor # Intercore GmbH 70:B3:D5:A2:F0:00/36 Botek # Botek Systems AB +70:B3:D5:A4:00:00/36 StrackLi # STRACK LIFT AUTOMATION GmbH +70:B3:D5:A5:70:00/36 Pcsc +70:B3:D5:A6:20:00/36 Environe # Environexus +70:B3:D5:A7:A0:00/36 FluidMan # Fluid Management Technology +70:B3:D5:AA:00:00/36 SimpleWo # Simple Works, Inc. +70:B3:D5:AB:70:00/36 Siglead # SIGLEAD INC +70:B3:D5:AB:C0:00/36 Bkm-Micr # BKM-Micronic Richtfunkanlagen GmbH +70:B3:D5:AB:F0:00/36 AgrInter # AGR International +70:B3:D5:AC:80:00/36 Heartlan # Heartland.Data Inc. +70:B3:D5:AD:D0:00/36 GhlBerha # GHL Systems Berhad +70:B3:D5:AE:20:00/36 TransasM # Transas Marine International 70:B3:D5:AE:90:00/36 CariElec # Cari Electronic +70:B3:D5:AE:E0:00/36 DitestFa # DiTEST Fahrzeugdiagnose GmbH +70:B3:D5:B0:80:00/36 Secuinfo # Secuinfo Co. Ltd 70:B3:D5:B1:50:00/36 EtaBetaS # Eta Beta Srl +70:B3:D5:B1:60:00/36 XiAnShen # XI'AN SHENMING ELECTRON TECHNOLOGY CO.,LTD 70:B3:D5:B2:A0:00/36 MyroCont # Myro Control, LLC +70:B3:D5:B3:30:00/36 AplexTec # Aplex Technology Inc. +70:B3:D5:B3:90:00/36 MbConnec # MB Connect Line GmbH +70:B3:D5:B3:C0:00/36 DorletSa # DORLET SAU 70:B3:D5:B3:D0:00/36 Inras # Inras GmbH +70:B3:D5:B8:80:00/36 Arp # ARP Corporation 70:B3:D5:B8:A0:00/36 NexusTec # Nexus Tech. VN +70:B3:D5:B8:C0:00/36 EpointEm # ePOINT Embedded Computing Limited 70:B3:D5:BB:20:00/36 Mettler- # Mettler-Toledo Hi-Speed +70:B3:D5:BB:D0:00/36 Providiu # Providius Corp +70:B3:D5:BB:E0:00/36 SunriseE # Sunrise Systems Electronics Co. Inc. +70:B3:D5:BC:60:00/36 Hattelan # Hatteland Display AS +70:B3:D5:BC:A0:00/36 DeymedDi # Deymed Diagnostic +70:B3:D5:BD:A0:00/36 5-D # 5-D Systems, Inc. +70:B3:D5:C2:40:00/36 ElbitOfA # Elbit Systems of America 70:B3:D5:C2:70:00/36 GeneralD # GENERAL DYNAMICS C4 SYSTEMS 70:B3:D5:C2:C0:00/36 DromontS # Dromont S.p.A. +70:B3:D5:C4:30:00/36 FutureSk # Future Skies +70:B3:D5:C5:80:00/36 RmiLaser # RMI Laser LLC +70:B3:D5:C6:D0:00/36 CyvizAs # Cyviz AS +70:B3:D5:C7:80:00/36 NetaElek # NETA Elektronik AS +70:B3:D5:C8:10:00/36 DspDesig # DSP DESIGN 70:B3:D5:C8:D0:00/36 KstTechn # KST Technology +70:B3:D5:C9:60:00/36 UniDimen # UNI DIMENXI SDN BHD +70:B3:D5:CB:70:00/36 Hkc # HKC Limited +70:B3:D5:CB:C0:00/36 ProconEl # Procon Electronics Pty Ltd 70:B3:D5:CE:90:00/36 Kinemetr # KINEMETRICS +70:B3:D5:CF:10:00/36 Lightdec # LightDec GmbH & Co. KG +70:B3:D5:D1:E0:00/36 HoustonR # Houston Radar LLC 70:B3:D5:D4:70:00/36 Yotascop # YotaScope Technologies Co., Ltd. 70:B3:D5:D4:E0:00/36 Flsmidth 70:B3:D5:D8:60:00/36 WpgsysPt # WPGSYS Pte Ltd 70:B3:D5:D8:B0:00/36 LenoxiAu # Lenoxi Automation s.r.o. +70:B3:D5:D8:F0:00/36 MoluTech # Molu Technology Inc., LTD. 70:B3:D5:D9:E0:00/36 GrupoEpe # GRUPO EPELSA S.L. +70:B3:D5:DA:10:00/36 QprelSrl # Qprel srl +70:B3:D5:DC:50:00/36 ExcelMed # Excel Medical Electronics LLC 70:B3:D5:DD:D0:00/36 BioRadLa # BIO RAD LABORATORIES +70:B3:D5:DE:C0:00/36 Condev-A # Condev-Automation GmbH +70:B3:D5:DF:30:00/36 SpcBiocl # SPC Bioclinicum +70:B3:D5:E0:70:00/36 BaaderPl # Baader Planetarium GmbH 70:B3:D5:E0:80:00/36 Olssen +70:B3:D5:E2:60:00/36 Feitian # FEITIAN CO.,LTD. +70:B3:D5:E2:70:00/36 Woodside # Woodside Electronics +70:B3:D5:E4:A0:00/36 IcpNewte # ICP NewTech Ltd +70:B3:D5:E4:C0:00/36 Iai-Isra # IAI-Israel Aerospace Industries MBT +70:B3:D5:E5:30:00/36 Mi # MI INC. +70:B3:D5:E7:40:00/36 Exfronti # Exfrontier Co., Ltd. +70:B3:D5:E9:90:00/36 Advitron # Advitronics telecom bv +70:B3:D5:E9:A0:00/36 MetaComp # Meta Computing Services, Corp 70:B3:D5:EB:00:00/36 NautelLi # Nautel Limted +70:B3:D5:EB:20:00/36 ShooterD # Shooter Detection Systems 70:B3:D5:EC:D0:00/36 Sbs-Fein # SBS-Feintechnik GmbH & Co. KG +70:B3:D5:EC:F0:00/36 Ipitek 70:B3:D5:ED:C0:00/36 JDKoftin # J.D. Koftinoff Software, Ltd. 70:B3:D5:ED:D0:00/36 SolarNet # Solar Network & Partners +70:B3:D5:EE:40:00/36 O-NetAut # O-Net Automation Technology (Shenzhen)Limited +70:B3:D5:EF:20:00/36 Kongsber # Kongsberg Intergrated Tactical Systems +70:B3:D5:EF:30:00/36 Octoscop # octoScope 70:B3:D5:EF:90:00/36 Critical # Critical Link +70:B3:D5:EF:A0:00/36 NexteraE # NextEra Energy Resources, LLC +70:B3:D5:F2:A0:00/36 WibondIn # WIBOND Informationssysteme GmbH +70:B3:D5:F2:B0:00/36 Sensys # SENSYS GmbH 70:B3:D5:F3:40:00/36 MacgrayS # MacGray Services 70:B3:D5:F3:80:00/36 Scanvaeg # Scanvaegt Nordic A/S 70:B3:D5:F6:10:00/36 PowerDia # Power Diagnostic Service 70:B3:D5:F6:20:00/36 Frs # FRS GmbH & Co. KG 70:B3:D5:F6:30:00/36 ArsProdu # Ars Products +70:B3:D5:F6:80:00/36 AlZajelM # AL ZAJEL MODERN TELECOMM +70:B3:D5:FA:10:00/36 BbiEngin # BBI Engineering, Inc. 70:B3:D5:FB:00:00/36 Rohde&Sc # Rohde&Schwarz Topex SA +70:B3:D5:FC:50:00/36 Eltwin # Eltwin A/S 70:B3:D5:FD:10:00/36 Redrat # RedRat Ltd +70:B3:D5:FD:30:00/36 AkisTech # AKIS technologies +70:B3:D5:FD:A0:00/36 AcdElekt # ACD Elektronik GmbH 70:B5:99 Embedded # Embedded Technologies s.r.o. 70:B9:21 Fiberhom # FiberHome Telecommunication Technologies CO.,LTD 70:C6:AC BoschAut # Bosch Automotive Aftermarket @@ -20482,6 +20792,7 @@ 70:E8:43 BeijingC # Beijing C&W Optical Communication Technology Co.,Ltd. 70:EE:50 Netatmo 70:F1:76 DataModu # Data Modul AG +70:F1:96 Actionte # Actiontec Electronics, Inc 70:F1:A1 LiteonTe # Liteon Technology Corporation 70:F1:E5 Xetawave # Xetawave LLC 70:F3:95 Universa # Universal Global Scientific Industrial Co., Ltd. @@ -20537,6 +20848,7 @@ 74:8E:08 Bestek # Bestek Corp. 74:8E:F8 BrocadeC # Brocade Communications Systems, Inc. 74:8F:1B Masterim # MasterImage 3D +74:8F:4D MenMikro # MEN Mikro Elektronik GmbH 74:90:50 RenesasE # Renesas Electronics Corporation 74:91:1A RuckusWi # Ruckus Wireless 74:93:A4 ZebraTec # Zebra Technologies Corp. @@ -20563,6 +20875,8 @@ 74:D4:35 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. 74:D6:75 WymaTecn # WYMA Tecnologia 74:D8:50 Evrisko # Evrisko Systems +74:DA:38 EdimaxTe # Edimax Technology Co. Ltd. +74:DB:D1 Ebay # Ebay Inc 74:DE:2B LiteonTe # Liteon Technology Corporation 74:E0:6E Ergophon # Ergophone GmbH 74:E1:B6 Apple @@ -20577,6 +20891,7 @@ 74:F0:6D Azurewav # AzureWave Technologies, Inc. 74:F0:7D Bncom # BnCOM Co.,Ltd 74:F1:02 BeijingH # Beijing HCHCOM Technology Co., Ltd +74:F4:13 MaxwellF # Maxwell Forest 74:F6:12 ArrisGro # ARRIS Group, Inc. 74:F7:26 NeuronRo # Neuron Robotics 74:F8:5D Berkeley # Berkeley Nucleonics Corp @@ -20595,6 +20910,7 @@ 78:1D:FD Jabil # Jabil Inc 78:1F:DB SamsungE # Samsung Electronics Co.,Ltd 78:22:3D Affirmed # Affirmed Networks +78:24:AF AsustekC # ASUSTek COMPUTER INC. 78:25:44 Omnima # Omnima Limited 78:25:AD SamsungE # SAMSUNG ELECTRONICS CO., LTD. 78:2B:CB Dell # Dell Inc @@ -20603,12 +20919,14 @@ 78:30:E1 Ultracle # UltraClenz, LLC 78:31:C1 Apple 78:32:4F Millenni # Millennium Group, Inc. +78:3A:84 Apple 78:3C:E3 Kai-Ee 78:3D:5B TelnetRe # TELNET Redes Inteligentes S.A. 78:3E:53 Bskyb # BSkyB Ltd 78:3F:15 Easysync # EasySYNC Ltd. 78:44:05 FujituHo # FUJITU(HONG KONG) ELECTRONIC Co.,LTD. 78:44:76 ZioncomT # Zioncom technology co.,ltd +78:45:61 Cybertan # CyberTAN Technology Inc. 78:45:C4 Dell # Dell Inc 78:46:C4 DaehapHy # DAEHAP HYPER-TECH 78:47:1D SamsungE # Samsung Electronics Co.,Ltd @@ -20639,10 +20957,12 @@ 78:8D:F7 HitronTe # Hitron Technologies. Inc 78:92:3E Nokia # Nokia Corporation 78:92:9C IntelCor # Intel Corporate +78:96:84 ArrisGro # ARRIS Group, Inc. 78:98:FD Q9Networ # Q9 Networks Inc. 78:99:5C NationzT # Nationz Technologies Inc 78:99:66 MusilabE # Musilab Electronics (DongGuan)Co.,Ltd. 78:99:8F Mediline # MEDILINE ITALIA SRL +78:9C:E7 Shenzhen # Shenzhen Aikede Technology Co., Ltd 78:9E:D0 SamsungE # Samsung Electronics 78:9F:4C Hoerbige # HOERBIGER Elektronik GmbH 78:9F:87 SiemensI # Siemens AG I IA PP PRM @@ -20702,6 +21022,7 @@ 78:F5:FD HuaweiTe # Huawei Technologies Co., Ltd 78:F7:BE SamsungE # Samsung Electronics Co.,Ltd 78:F7:D0 Silverbr # Silverbrook Research +78:FD:94 Apple 78:FE:3D JuniperN # Juniper Networks 78:FE:41 SocusNet # Socus networks 78:FE:E2 Shanghai # Shanghai Diveo Technology Co., Ltd @@ -20725,6 +21046,7 @@ 7C:1E:B3 2nTeleko # 2N TELEKOMUNIKACE a.s. 7C:20:48 Koamtac 7C:20:64 AlcatelL # Alcatel Lucent IPD +7C:25:87 Chaowifi # chaowifi.com 7C:2C:F3 SecureEl # Secure Electrans Ltd 7C:2E:0D Blackmag # Blackmagic Design 7C:2F:80 GigasetC # Gigaset Communications GmbH @@ -20748,14 +21070,17 @@ 7C:66:9D TexasIns # Texas Instruments 7C:69:F6 Cisco 7C:6A:B3 IbcTechn # IBC TECHNOLOGIES INC. +7C:6A:C3 Gatesair # GatesAir, Inc 7C:6A:DB Safetone # SafeTone Technology Co.,Ltd 7C:6B:33 TenyuTec # Tenyu Tech Co. Ltd. 7C:6B:52 TigaroWi # Tigaro Wireless 7C:6C:39 PixsysSr # PIXSYS SRL 7C:6C:8F AmsNeve # AMS NEVE LTD 7C:6D:62 Apple +7C:6D:F8 Apple 7C:6F:06 Caterpil # Caterpillar Trimble Control Technologies 7C:6F:F8 Shenzhen # ShenZhen ACTO Digital Video Technology Co.,Ltd. +7C:70:BC IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. 7C:72:E4 UnikeyTe # Unikey Technologies 7C:76:73 Enmas # ENMAS GmbH 7C:7A:91 IntelCor # Intel Corporate @@ -20785,11 +21110,13 @@ 7C:BF:88 Mobilico # Mobilicom LTD 7C:BF:B1 ArrisGro # ARRIS Group, Inc. 7C:C3:A1 Apple +7C:C4:EF Devialet 7C:C5:37 Apple 7C:C8:AB AcroAsso # Acro Associates, Inc. 7C:C8:D0 TianjinY # TIANJIN YAAN TECHNOLOGY CO., LTD. 7C:C8:D7 Damalisk 7C:CB:0D AntairaT # Antaira Technologies, LLC +7C:CC:B8 IntelCor # Intel Corporate 7C:CD:11 Ms-Magne # MS-Magnet 7C:CD:3C Guangzho # Guangzhou Juzing Technology Co., Ltd 7C:CF:CF Shanghai # Shanghai SEARI Intelligent System Co., Ltd @@ -20805,6 +21132,7 @@ 7C:E0:44 Neon # NEON Inc 7C:E1:FF Computer # Computer Performance, Inc. DBA Digital Loggers, Inc. 7C:E4:AA Private +7C:E5:24 Quirky # Quirky, Inc. 7C:E5:6B EsenOpto # ESEN Optoelectronics Technology Co.,Ltd. 7C:E9:D3 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 7C:EB:EA Asct @@ -20827,9 +21155,11 @@ 80:0A:06 Comtec # COMTEC co.,ltd 80:0E:24 Forgetbo # ForgetBox 80:14:40 SunlitSy # Sunlit System Technology Corp +80:14:A8 Guangzho # Guangzhou V-SOLUTION Electronic Technology Co., Ltd. 80:16:B7 BrunelUn # Brunel University 80:17:7D NortelNe # Nortel Networks 80:18:A7 SamsungE # Samsung Eletronics Co., Ltd +80:19:34 IntelCor # Intel Corporate 80:1D:AA Avaya # Avaya Inc 80:1F:02 EdimaxTe # Edimax Technology Co. Ltd. 80:20:AF TradeFid # Trade FIDES, a.s. @@ -20861,9 +21191,11 @@ 80:64:59 Nimbus # Nimbus Inc. 80:65:E9 Benq # BenQ Corporation 80:66:29 Prescope # Prescope Technologies CO.,LTD. +80:6C:1B Motorola # Motorola Mobility LLC 80:6C:8B KaeserKo # KAESER KOMPRESSOREN AG 80:6C:BC NetNewEl # NET New Electronic Technology GmbH 80:71:1F JuniperN # Juniper Networks +80:71:7A HuaweiTe # Huawei Technologies Co., Ltd 80:76:93 NewagSa # Newag SA 80:79:AE Shandong # ShanDong Tecsunrise Co.,Ltd 80:7A:7F AbbGenwa # ABB Genway Xiamen Electrical Equipment CO., LTD @@ -20881,11 +21213,13 @@ 80:93:93 Xapt # Xapt GmbH 80:94:6C TokyoRad # TOKYO RADAR CORPORATION 80:96:B1 ArrisGro # ARRIS Group, Inc. +80:96:CA HonHaiPr # Hon Hai Precision Ind Co.,Ltd 80:97:1B Altenerg # Altenergy Power System,Inc. 80:9B:20 IntelCor # Intel Corporate 80:A1:D7 Shanghai # Shanghai DareGlobal Technologies Co.,Ltd 80:AA:A4 Usag 80:AD:00 CnetTech # CNET Technology Inc. (Probably an error, see instead 0080AD) +80:AD:67 KasdaDig # Kasda Digital Technology Co.,Ltd 80:B2:19 Elektron # ELEKTRON TECHNOLOGY UK LIMITED 80:B2:89 Forworld # Forworld Electronics Ltd. 80:B3:2A AlstomGr # Alstom Grid @@ -20903,22 +21237,27 @@ 80:CF:41 LenovoMo # Lenovo Mobile Communication Technology Ltd. 80:D0:19 Embed # Embed, Inc 80:D1:8B Hangzhou # Hangzhou I'converge Technology Co.,Ltd +80:D2:1D Azurewav # AzureWave Technologies, Inc 80:D4:33 Lzlabs # LzLabs GmbH 80:D7:33 QsrAutom # QSR Automations, Inc. 80:DB:31 PowerQuo # Power Quotient International Co., Ltd. 80:EA:96 Apple +80:EA:CA DialogSe # Dialog Semiconductor Hellas SA 80:EE:73 Shuttle # Shuttle Inc. 80:F2:5E Kyynel 80:F5:93 IrcoSist # IRCO Sistemas de Telecomunicación S.A. 80:F6:2E Hangzhou # Hangzhou H3C Technologies Co., Limited +80:F8:EB Raytight 80:FA:5B Clevo # CLEVO CO. 80:FB:06 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD 80:FF:A8 Unidis 84:00:D2 SonyEric # Sony Ericsson Mobile Communications AB +84:01:A7 Greyware # Greyware Automation Products, Inc 84:0B:2D SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD 84:0F:45 Shanghai # Shanghai GMT Digital Technologies Co., Ltd 84:17:15 GpElectr # GP Electronics (HK) Ltd. 84:17:66 WeifangG # Weifang GoerTek Electronics Co., Ltd +84:18:3A RuckusWi # Ruckus Wireless 84:18:88 JuniperN # Juniper Networks 84:1B:38 Shenzhen # Shenzhen Excelsecu Data Technology Co.,Ltd 84:1B:5E Netgear @@ -20938,6 +21277,7 @@ 84:2B:BC Modellei # Modelleisenbahn GmbH 84:2F:75 InnokasG # Innokas Group 84:30:E5 Skyhawke # SkyHawke Technologies, LLC +84:32:EA AnhuiWan # ANHUI WANZTEN P&T CO., LTD 84:34:97 HewlettP # Hewlett Packard 84:36:11 Hyungseu # hyungseul publishing networks 84:38:35 Apple @@ -20968,6 +21308,7 @@ 84:83:71 Avaya # Avaya, Inc 84:84:33 ParadoxE # Paradox Engineering SA 84:85:06 Apple +84:85:0A HellaSon # Hella Sonnen- und Wetterschutztechnik GmbH 84:8D:84 Rajant # Rajant Corporation 84:8D:C7 CiscoSpv # Cisco SPVTG 84:8E:0C Apple @@ -20975,6 +21316,7 @@ 84:8F:69 Dell # Dell Inc. 84:90:00 ArnoldRi # Arnold & Richter Cine Technik 84:94:8C HitronTe # Hitron Technologies. Inc +84:96:D8 Pace # Pace plc 84:97:B8 Memjet # Memjet Inc. 84:9C:A6 Arcadyan # Arcadyan Technology Corporation 84:9D:C5 CenteraP # Centera Photonics Inc. @@ -21021,6 +21363,7 @@ 88:23:64 Watchnet # Watchnet DVR Inc 88:23:FE TttechCo # TTTech Computertechnik AG 88:25:2C Arcadyan # Arcadyan Technology Corporation +88:29:50 DalianNe # Dalian Netmoon Tech Develop Co.,Ltd 88:2E:5A Storone 88:30:8A MurataMa # Murata Manufactuaring Co.,Ltd. 88:32:9B SamsungE # Samsung Electro Mechanics co.,LTD. @@ -21040,8 +21383,9 @@ 88:57:6D XtaElect # XTA Electronics Ltd 88:5A:92 Cisco 88:5B:DD Aerohive # Aerohive Networks Inc. -88:5C:4F AlcatelL # Alcatel Lucent +88:5C:47 AlcatelL # Alcatel Lucent 88:61:5A SianoMob # Siano Mobile Silicon Ltd. +88:63:DF Apple 88:68:5C Shenzhen # Shenzhen ChuangDao & Perpetual Eternal Technology Co.,Ltd 88:6B:76 ChinaHop # CHINA HOPEFUL GROUP HOPEFUL ELECTRIC CO.,LTD 88:73:98 K2eTekpo # K2E Tekpoint @@ -21092,6 +21436,7 @@ 88:E8:F8 YongTaiE # YONG TAI ELECTRONIC (DONGGUAN) LTD. 88:E9:17 Tamaggo 88:ED:1C CudoComm # Cudo Communication Co., Ltd. +88:F0:31 Cisco 88:F0:77 Cisco # CISCO SYSTEMS, INC. 88:F4:88 CellonCo # cellon communications technology(shenzhen)Co.,Ltd. 88:F4:90 Jetmobil # Jetmobile Pte Ltd @@ -21115,6 +21460,7 @@ 8C:2D:AA Apple 8C:2F:39 IbaDosim # IBA Dosimetry GmbH 8C:33:30 Emfirst # EmFirst Co., Ltd. +8C:33:57 Hitevisi # HiteVision Digital Media Technology Co.,Ltd. 8C:3A:E3 LgElectr # LG Electronics 8C:3C:07 SkivaTec # Skiva Technologies, Inc. 8C:3C:4A NakayoTe # NAKAYO TELECOMMUNICATIONS,INC. @@ -21164,11 +21510,13 @@ 8C:A9:82 IntelCor # Intel Corporate 8C:AE:4C Plugable # Plugable Technologies 8C:AE:89 Y-CamSol # Y-cam Solutions Ltd +8C:B0:94 AirtechI # Airtech I&C Co., Ltd 8C:B6:4F Cisco # CISCO SYSTEMS, INC. 8C:B7:F7 Shenzhen # Shenzhen UniStrong Science & Technology Co., Ltd 8C:B8:2C IpitomyC # IPitomy Communications 8C:B8:64 AcsipTec # AcSiP Technology Corp. 8C:BE:BE XiaomiTe # Xiaomi Technology Co.,Ltd +8C:BF:9D Shanghai # Shanghai Xinyou Information Technology Ltd. Co. 8C:C1:21 Panasoni # Panasonic Corporation AVC Networks Company 8C:C5:E1 Shenzhen # ShenZhen Konka Telecommunication Technology Co.,Ltd 8C:C7:AA RadinetC # Radinet Communications Inc. @@ -21209,6 +21557,7 @@ 90:1B:0E FujitsuT # Fujitsu Technology Solutions GmbH 90:1D:27 Zte # zte corporation 90:1E:DD GreatCom # GREAT COMPUTER CORPORATION +90:20:3A BydPreci # BYD Precision Manufacture Co.,Ltd 90:20:83 GeneralE # General Engine Management Systems Ltd. 90:21:55 Htc # HTC Corporation 90:27:E4 Apple @@ -21226,6 +21575,7 @@ 90:3E:AB ArrisGro # ARRIS Group, Inc. 90:46:B7 VadaroPt # Vadaro Pte Ltd 90:47:16 Rorze # RORZE CORPORATION +90:48:9A HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:49:FA Intel # Intel Corporation 90:4C:E5 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 90:4E:2B HuaweiTe # Huawei Technologies Co., Ltd @@ -21257,6 +21607,7 @@ 90:84:0D Apple 90:88:A2 IonicsTe # IONICS TECHNOLOGY ME LTDA 90:8C:44 HKZongmu # H.K ZONGMU TECHNOLOGY CO., LTD. +90:8C:63 GzWeedon # GZ Weedong Networks Technology Co. , Ltd 90:8D:1D GhTechno # GH Technologies 90:8F:CF UnoSyste # UNO System Co., Ltd 90:90:3C TrisonTe # TRISON TECHNOLOGY CORPORATION @@ -21276,10 +21627,12 @@ 90:B1:1C Dell # Dell Inc. 90:B1:34 ArrisGro # ARRIS Group, Inc. 90:B2:1F Apple +90:B6:86 MurataMa # Murata Manufacturing Co., Ltd. 90:B8:D0 Joyent # Joyent, Inc. 90:B9:31 Apple # Apple, Inc 90:B9:7D JohnsonO # Johnson Outdoors Marine Electronics d/b/a Minnkota 90:C1:15 SonyEric # Sony Ericsson Mobile Communications AB +90:C7:92 ArrisGro # ARRIS Group, Inc. 90:CC:24 Synaptic # Synaptics, Inc 90:CF:15 Nokia # Nokia Corporation 90:CF:6F Dlogixs # Dlogixs Co Ltd @@ -21290,6 +21643,7 @@ 90:D8:52 Comtec # Comtec Co., Ltd. 90:D9:2C Hug-Wits # HUG-WITSCHI AG 90:DA:4E Avanu +90:DA:6A MccSyste # MCC System Co., Ltd. 90:DB:46 E-LeadEl # E-LEAD ELECTRONIC CO., LTD 90:DF:B7 SMSSmart # s.m.s smart microwave sensors GmbH 90:E0:F0 Ieee1722 # IEEE 1722a Working Group @@ -21361,6 +21715,7 @@ 94:AA:B8 JoviewBe # Joview(Beijing) Technology Co. Ltd. 94:AC:CA TrivumTe # trivum technologies GmbH 94:AE:61 AlcatelL # Alcatel Lucent +94:AE:E3 BeldenHi # Belden Hirschmann Industries (Suzhou) Ltd. 94:B8:C5 Ruggedco # RuggedCom Inc. 94:B9:B4 AptosTec # Aptos Technology 94:BA:31 Visionte # Visiontec da Amazônia Ltda. @@ -21377,7 +21732,9 @@ 94:CC:B9 ArrisGro # ARRIS Group, Inc. 94:CD:AC Creowave # Creowave Oy 94:CE:2C SonyMobi # Sony Mobile Communications AB +94:CE:31 Cts # CTS Limited 94:D0:19 Cydle # Cydle Corp. +94:D6:0E Shenzhen # shenzhen yunmao information technologies co., ltd 94:D7:23 Shanghai # Shanghai DareGlobal Technologies Co., Ltd 94:D7:71 SamsungE # Samsung Electronics Co.,Ltd 94:D9:3C Enelps @@ -21415,6 +21772,7 @@ 98:29:3F FujianSt # Fujian Start Computer Equipment Co.,Ltd 98:2C:BE 2wire 98:2D:56 Resoluti # Resolution Audio +98:2F:3C SichuanC # Sichuan Changhong Electric Ltd. 98:30:00 BeijingK # Beijing KEMACOM Technologies Co., Ltd. 98:30:71 Daikyung # DAIKYUNG VASCOM 98:34:9D KraussMa # Krauss Maffei Technologies GmbH @@ -21448,6 +21806,7 @@ 98:73:C4 SageElec # Sage Electronic Engineering LLC 98:76:B6 Adafruit 98:77:70 PepDigit # Pep Digital Technology (Guangzhou) Co., Ltd +98:7E:46 EmizonNe # Emizon Networks Limited 98:82:17 Disrupti # Disruptive Ltd 98:86:B1 Flyaudio # Flyaudio corporation (China) 98:89:ED AnademIn # Anadem Information Inc. @@ -21480,6 +21839,7 @@ 98:E7:9A FoxconnN # Foxconn(NanJing) Communication Co.,Ltd. 98:EC:65 CosesyAp # Cosesy ApS 98:F0:AB Apple +98:F1:70 MurataMa # Murata Manufacturing Co., Ltd. 98:F5:37 Zte # zte corporation 98:F8:C1 IdtTechn # IDT Technology Limited 98:F8:DB MariniIm # Marini Impianti Industriali s.r.l. @@ -21509,6 +21869,7 @@ 9C:2A:70 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 9C:31:78 FoshanHu # Foshan Huadian Intelligent Communications Teachnologies Co.,Ltd 9C:31:B6 KuliteSe # Kulite Semiconductor Products Inc +9C:35:83 NiproDia # Nipro Diagnostics, Inc 9C:3A:AF SamsungE # Samsung Electronics Co.,Ltd 9C:3E:AA Envylogi # EnvyLogic Co.,Ltd. 9C:41:7C HameTech # Hame Technology Co., Limited @@ -21550,6 +21911,7 @@ 9C:8E:99 Hewlett- # Hewlett-Packard Company 9C:8E:DC Teracom # Teracom Limited 9C:93:4E Xerox # Xerox Corporation +9C:93:E4 Private 9C:95:F8 Smartdoo # SmartDoor Systems, LLC 9C:97:26 Technico # Technicolor 9C:98:11 Guangzho # Guangzhou Sunrise Electronics Development Co., Ltd @@ -21559,6 +21921,7 @@ 9C:A3:BA SakuraIn # SAKURA Internet Inc. 9C:A5:77 OsornoEn # Osorno Enterprises Inc. 9C:A9:E4 Zte # zte corporation +9C:AD:97 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. 9C:AD:EF ObihaiTe # Obihai Technology, Inc. 9C:AF:CA Cisco # CISCO SYSTEMS, INC. 9C:B0:08 Ubiquito # Ubiquitous Computing Technology Corporation @@ -21570,6 +21933,7 @@ 9C:BD:9D Skydisk # SkyDisk, Inc. 9C:C0:77 Printcou # PrintCounts, LLC 9C:C0:D2 Conducti # Conductix-Wampfler AG +9C:C1:72 HuaweiTe # Huawei Technologies Co., Ltd 9C:C7:A6 Avm # AVM GmbH 9C:C7:D1 Sharp # SHARP Corporation 9C:CA:D9 Nokia # Nokia Corporation @@ -21593,12 +21957,14 @@ 9C:FF:BE Otsl # OTSL Inc. A0:02:DC AmazonTe # Amazon Technologies Inc. A0:03:63 RobertBo # Robert Bosch Healthcare GmbH +A0:06:27 NexpaSys # NEXPA System A0:07:98 SamsungE # Samsung Electronics A0:07:B6 Advanced # Advanced Technical Support, Inc. A0:0A:BF WiesonTe # Wieson Technologies Co., Ltd. A0:0B:BA SamsungE # SAMSUNG ELECTRO-MECHANICS A0:0C:A1 SktbSkit # SKTB SKiT A0:12:90 Avaya # Avaya, Inc +A0:12:DB TabuchiE # TABUCHI ELECTRIC CO.,LTD A0:13:3B Copyrigh # Copyright © HiTi Digital, Inc. A0:14:3D ParrotSa # PARROT SA A0:16:5C Triteka # Triteka LTD @@ -21625,6 +21991,7 @@ A0:4E:04 Nokia # Nokia Corporation A0:51:C6 Avaya # Avaya, Inc A0:55:DE Pace # Pace plc +A0:56:B2 Harman/B # Harman/Becker Automotive Systems GmbH A0:59:3A VDSVideo # V.D.S. Video Display Systems srl A0:5A:A4 GrandPro # Grand Products Nevada, Inc. A0:5B:21 Envinet # ENVINET GmbH @@ -21689,6 +22056,7 @@ A0:E4:53 SonyMobi # Sony Mobile Communications AB A0:E5:34 StratecB # Stratec Biomedical AG A0:E5:E9 Enimai # enimai Inc +A0:E6:F8 TexasIns # Texas Instruments Inc A0:E9:DB NingboFr # Ningbo FreeWings Technologies Co.,Ltd A0:EB:76 Aircuve # AirCUVE Inc. A0:EC:80 Zte # zte corporation @@ -21707,6 +22075,7 @@ A4:09:CB AlfredKa # Alfred Kaercher GmbH & Co KG A4:0B:ED CarryTec # Carry Technology Co.,Ltd A4:0C:C3 Cisco # CISCO SYSTEMS, INC. +A4:12:42 NecAcces # NEC AccessTechnica, Ltd. A4:13:4E Luxul A4:15:66 WeiFangG # Wei Fang Goertek Electronics Co.,Ltd A4:17:31 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -21737,6 +22106,7 @@ A4:5A:1C Smart-El # smart-electronic GmbH A4:5C:27 Nintendo # Nintendo Co., Ltd. A4:5D:36 HewlettP # Hewlett Packard +A4:5D:A1 AdbBroad # ADB Broadband Italia A4:60:32 MrvCommu # MRV Communications (Networks) LTD A4:67:06 Apple A4:6C:C1 LtiReene # LTi REEnergy GmbH @@ -21763,6 +22133,7 @@ A4:9F:85 LyveMind # Lyve Minds, Inc A4:9F:89 Shanghai # Shanghai Rui Rui Communication Technology Co.Ltd. A4:A2:4A CiscoSpv # Cisco SPVTG +A4:A4:D3 Bluebank # Bluebank Communication Technology Co.Ltd A4:A8:0F Shenzhen # Shenzhen Coship Electronics Co., Ltd. A4:AD:00 Ragsdale # Ragsdale Technology A4:AD:B8 VitecGro # Vitec Group, Camera Dynamics Ltd @@ -21788,7 +22159,7 @@ A4:D1:D1 Ecotalit # ECOtality North America A4:D1:D2 Apple A4:D3:B5 GlitelSt # GLITEL Stropkov, s.r.o. -A4:D8:56 Qualcomm # Qualcomm Labs Inc. +A4:D8:56 Gimbal # Gimbal, Inc A4:DA:3F Bionics # Bionics Corp. A4:DB:2E Kingspan # Kingspan Environmental Ltd A4:DB:30 LiteonTe # Liteon Technology Corporation @@ -21813,10 +22184,12 @@ A8:01:80 ImagoTec # IMAGO Technologies GmbH A8:06:00 SamsungE # Samsung Electronics Co.,Ltd A8:0C:0D Cisco +A8:13:74 Panasoni # Panasonic Corporation AVC Networks Company A8:15:4D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. A8:16:B2 LgElectr # LG Electronics A8:17:58 Elektron # Elektronik System i Umeå AB A8:1B:18 Xts # XTS CORP +A8:1B:5D FoxtelMa # Foxtel Management Pty Ltd A8:1F:AF KryptonP # KRYPTON POLSKA A8:20:66 Apple A8:24:EB ZaoNpoIn # ZAO NPO Introtest @@ -21824,6 +22197,7 @@ A8:29:4C Precisio # Precision Optical Transceivers, Inc. A8:2B:D6 ShinaSys # Shina System Co., Ltd A8:30:AD WeiFangG # Wei Fang Goertek Electronics Co.,Ltd +A8:32:9A DigicomF # Digicom Futuristic Technologies Ltd. A8:39:44 Actionte # Actiontec Electronics, Inc A8:40:41 DraginoT # Dragino Technology Co., Limited A8:44:81 Nokia # Nokia Corporation @@ -21853,6 +22227,7 @@ A8:88:08 Apple A8:8C:EE Micromad # MicroMade Galka i Drozdz sp.j. A8:8D:7B Sundroid # SunDroid Global limited. +A8:8E:24 Apple A8:92:2C LgElectr # LG Electronics A8:93:E6 JiangxiJ # JIANGXI JINGGANGSHAN CKING COMMUNICATION TECHNOLOGY CO.,LTD A8:95:B0 AkerSubs # Aker Subsea Ltd @@ -21878,6 +22253,7 @@ A8:D3:C8 Wachendo # Wachendorff Elektronik GmbH & Co. KG A8:E0:18 Nokia # Nokia Corporation A8:E3:EE SonyComp # Sony Computer Entertainment Inc. +A8:E5:39 Moimston # Moimstone Co.,Ltd A8:EF:26 Tritonwa # Tritonwave A8:F2:74 SamsungE # Samsung Electronics A8:F4:70 FujianNe # Fujian Newland Communication Science Technologies Co.,Ltd. @@ -21898,6 +22274,7 @@ AC:06:13 Senselog # Senselogix Ltd AC:0A:61 LaborSRL # Labor S.r.L. AC:0D:FE Ekon-Myg # Ekon GmbH - myGEKKO +AC:11:D3 SuzhouHo # Suzhou HOTEK Video Technology Co. Ltd AC:14:61 Ataw # ATAW Co., Ltd. AC:14:D2 Wi-Daq # wi-daq, inc. AC:16:2D HewlettP # Hewlett Packard @@ -21911,6 +22288,7 @@ AC:31:9D Shenzhen # Shenzhen TG-NET Botone Technology Co.,Ltd. AC:34:CB ShanhaiG # Shanhai GBCOM Communication Technology Co. Ltd AC:36:13 SamsungE # Samsung Electronics Co.,Ltd +AC:38:70 LenovoMo # Lenovo Mobile Communication Technology Ltd. AC:3C:0B Apple AC:3C:B4 Nilan # Nilan A/S AC:3D:05 Instores # Instorescreen Aisa @@ -21959,12 +22337,15 @@ AC:9B:84 SmakTecn # Smak Tecnologia e Automacao AC:9C:E4 Alcatel- # Alcatel-Lucent Shanghai Bell Co., Ltd AC:A0:16 Cisco # CISCO SYSTEMS, INC. +AC:A2:13 Shenzhen # Shenzhen Bilian electronic CO.,LTD AC:A2:2C BaycityT # Baycity Technologies Ltd +AC:A3:1E ArubaNet # Aruba Networks AC:A4:30 Peerless # Peerless AV AC:A9:19 Trekstor # TrekStor GmbH AC:A9:A0 Audioeng # Audioengine, Ltd. AC:AB:8D LyngsoMa # Lyngso Marine A/S AC:B3:13 ArrisGro # ARRIS Group, Inc. +AC:B7:4F MetelSRO # METEL s.r.o. AC:B8:59 UnibandE # Uniband Electronic Corp, AC:BD:0B Imac # IMAC CO.,LTD AC:BE:75 UfineTec # Ufine Technologies Co.,Ltd. @@ -22006,12 +22387,15 @@ AC:FD:EC Apple # Apple, Inc B0:00:B4 Cisco B0:05:94 LiteonTe # Liteon Technology Corporation +B0:09:D3 Avizia +B0:10:41 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. B0:12:03 Dynamics # Dynamics Hong Kong Limited B0:12:66 Futaba-K # Futaba-Kikaku B0:14:08 Lightspe # LIGHTSPEED INTERNATIONAL CO. B0:17:43 EdisonGl # EDISON GLOBAL CIRCUITS LLC B0:1B:7C OntrolAS # Ontrol A.S. B0:1C:91 Elim # Elim Co +B0:1F:81 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. B0:24:F3 Progeny # Progeny Systems B0:25:AA Private B0:34:95 Apple @@ -22028,6 +22412,7 @@ B0:57:06 ValloxOy # Vallox Oy B0:58:C4 Broadcas # Broadcast Microwave Services, Inc B0:5B:1F ThermoFi # THERMO FISHER SCIENTIFIC S.P.A. +B0:5B:67 HuaweiTe # Huawei Technologies Co., Ltd B0:5C:E5 Nokia # Nokia Corporation B0:61:C7 Ericsson # Ericsson-LG Enterprise B0:65:63 Shanghai # Shanghai Railway Communication Factory @@ -22036,6 +22421,7 @@ B0:69:71 DeiSales # DEI Sales, Inc. B0:6C:BF 3alityDi # 3ality Digital Systems GmbH B0:75:0C QaCafe # QA Cafe +B0:75:4D Alcatel- # Alcatel-Lucent B0:75:D5 Zte # ZTE Corporation B0:77:AC ArrisGro # ARRIS Group, Inc. B0:79:08 Cummings # Cummings Engineering @@ -22044,6 +22430,7 @@ B0:7D:62 Dipl-Ing # Dipl.-Ing. H. Horstmann GmbH B0:80:8C LaserLig # Laser Light Engines B0:81:D8 I-Sys # I-sys Corp +B0:83:FE Dell # Dell Inc B0:86:9E Chloride # Chloride S.r.L B0:88:07 StrataWo # Strata Worldwide B0:89:91 Lge @@ -22057,7 +22444,9 @@ B0:9B:D4 GnhSoftw # GNH Software India Private Limited B0:9F:BA Apple B0:A1:0A Pivotal # Pivotal Systems Corporation +B0:A3:7E QingdaoH # Qingdao Haier Electronics Co.,Ltd B0:A7:2A Ensemble # Ensemble Designs, Inc. +B0:A7:37 Roku # Roku, Inc. B0:A8:6E JuniperN # Juniper Networks B0:AA:36 Guangdon # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD. B0:AC:FA Fujitsu # Fujitsu Limited @@ -22100,12 +22489,15 @@ B4:04:18 Smartchi # Smartchip Integrated Inc. B4:07:F9 SamsungE # SAMSUNG ELECTRO-MECHANICS B4:08:32 TcCommun # TC Communications +B4:0A:C6 Dexon # DEXON Systems Ltd. +B4:0B:44 Smartisa # Smartisan Technology Co., Ltd. B4:0B:7A BrusaEle # Brusa Elektronik AG B4:0C:25 PaloAlto # Palo Alto Networks B4:0E:96 Heran B4:0E:DC Lg-Erics # LG-Ericsson Co.,Ltd. B4:14:89 Cisco # CISCO SYSTEMS, INC. B4:15:13 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD +B4:17:80 DtiGroup # DTI Group Ltd B4:18:D1 Apple B4:1D:EF Internet # Internet Laboratories, Inc. B4:21:1D BeijingG # Beijing GuangXin Technology Co., Ltd @@ -22126,6 +22518,7 @@ B4:3E:3B Viablewa # Viableware, Inc B4:41:7A Shenzhen # ShenZhen Gongjin Electronics Co.,Ltd B4:43:0D Broadlin # Broadlink Pty Ltd +B4:47:5E Avaya # Avaya, Inc B4:4C:C2 NrElectr # NR ELECTRIC CO., LTD B4:51:F9 NbSoftwa # NB Software B4:52:53 SeagateT # Seagate Technology @@ -22142,6 +22535,7 @@ B4:67:E9 QingdaoG # Qingdao GoerTek Technology Co., Ltd. B4:74:9F AskeyCom # askey computer corp B4:75:0E BelkinIn # Belkin International Inc. +B4:7C:29 Shenzhen # Shenzhen Guzidi Technology Co.,Ltd B4:7F:5E Foresigh # Foresight Manufacture (S) Pte Ltd B4:82:55 Research # Research Products Corporation B4:82:7B AkgAcous # AKG Acoustics GmbH @@ -22154,6 +22548,7 @@ B4:99:4C TexasIns # Texas Instruments B4:99:BA Hewlett- # Hewlett-Packard Company B4:9D:B4 AxionTec # Axion Technologies Inc. +B4:9E:AC ImagikIn # Imagik Int'l Corp B4:9E:E6 Shenzhen # SHENZHEN TECHNOLOGY CO LTD B4:A4:B5 ZenEye # Zen Eye Co.,Ltd B4:A4:E3 Cisco # CISCO SYSTEMS, INC. @@ -22162,17 +22557,20 @@ B4:A9:5A Avaya # Avaya, Inc B4:AA:4D Ensequen # Ensequence, Inc. B4:AB:2C MtmTechn # MtM Technology Corporation +B4:AE:6F CircleRe # Circle Reliance, Inc. B4:B0:17 Avaya # Avaya, Inc B4:B3:62 Zte # ZTE Corporation B4:B5:2F HewlettP # Hewlett Packard B4:B5:42 HubbellP # Hubbell Power Systems, Inc. B4:B5:AF MinsungE # Minsung Electronics B4:B6:76 IntelCor # Intel Corporate +B4:B8:59 Texa # Texa Spa B4:B8:8D Thuh # Thuh Company B4:C4:4E VxlEtech # VXL eTech Pvt Ltd B4:C7:99 Motorola # Motorola Solutions Inc. B4:C8:10 UmpiElet # UMPI Elettronica B4:CC:E9 Prosyst +B4:CE:F6 Htc # HTC Corporation B4:CF:DB Shenzhen # Shenzhen Jiuzhou Electric Co.,LTD B4:D8:A9 Betterbo # BetterBots B4:D8:DE IotaComp # iota Computing, Inc. @@ -22193,10 +22591,12 @@ B4:FE:8C CentroSi # Centro Sicurezza Italia SpA B8:03:05 IntelCor # Intel Corporate B8:04:15 BayanAud # Bayan Audio +B8:08:CF IntelCor # Intel Corporate B8:0B:9D RopexInd # ROPEX Industrie-Elektronik GmbH B8:14:13 KeenHigh # Keen High Holding(HK) Ltd. B8:16:19 ArrisGro # ARRIS Group, Inc. B8:17:C2 Apple +B8:18:6F Oriental # ORIENTAL MOTOR CO., LTD. B8:19:99 Nesys B8:20:E7 Guangzho # Guangzhou Horizontal Information & Network Integration Co. Ltd B8:24:10 MagnetiM # Magneti Marelli Slovakia s.r.o. @@ -22256,12 +22656,15 @@ B8:97:5A BiostarM # BIOSTAR Microtech Int'l Corp. B8:98:B0 Atlona # Atlona Inc. B8:98:F7 GioneeCo # Gionee Communication Equipment Co,Ltd.ShenZhen +B8:99:19 7signalS # 7signal Solutions, Inc B8:9A:ED Oceanser # OceanServer Technology, Inc B8:9B:C9 SmcNetwo # SMC Networks Inc +B8:9B:E4 AbbPower # ABB Power Systems Power Generation B8:A3:86 D-LinkIn # D-Link International B8:A3:E0 BenruiTe # BenRui Technology Co.,Ltd B8:A8:AF LogicSPA # Logic S.p.A. B8:AC:6F Dell # Dell Inc +B8:AD:3E Bluecom B8:AE:6E Nintendo # Nintendo Co., Ltd. B8:AF:67 Hewlett- # Hewlett-Packard Company B8:B1:C7 Bt&Com # BT&COM CO.,LTD @@ -22271,7 +22674,9 @@ B8:BA:68 XiAnJizh # Xi'an Jizhong Digital Communication Co.,Ltd B8:BA:72 Cynove B8:BB:6D Eneres # ENERES Co.,Ltd. +B8:BD:79 Trendpoi # TrendPoint Systems B8:BE:BF Cisco # CISCO SYSTEMS, INC. +B8:BF:83 IntelCor # Intel Corporate B8:C1:A2 DragonPa # Dragon Path Technologies Co., Limited B8:C4:6F Primmcon # PRIMMCON INDUSTRIES INC B8:C6:8E SamsungE # Samsung Electronics Co.,Ltd @@ -22293,6 +22698,7 @@ B8:E7:79 9solutio # 9Solutions Oy B8:E8:56 Apple B8:E9:37 Sonos # Sonos, Inc. +B8:EE:65 LiteonTe # Liteon Technology Corporation B8:EE:79 YwireTec # YWire Technologies, Inc. B8:F4:D0 Herrmann # Herrmann Ultraschalltechnik GmbH & Co. Kg B8:F5:E7 Waytools # WayTools, LLC @@ -22316,6 +22722,7 @@ BC:1A:67 YfTechno # YF Technology Co., Ltd BC:20:A4 SamsungE # Samsung Electronics BC:20:BA InspurSh # Inspur (Shandong) Electronic Information Co., Ltd +BC:25:F0 3dDispla # 3D Display Technologies Co., Ltd. BC:26:1D HongKong # HONG KONG TECON TECHNOLOGY BC:28:46 NextbitC # NextBIT Computing Pvt. Ltd. BC:28:D6 RowleyAs # Rowley Associates Limited @@ -22325,6 +22732,7 @@ BC:2D:98 Thinglob # ThinGlobal LLC BC:30:5B Dell # Dell Inc. BC:30:7D WistronN # Wistron Neweb Corp. +BC:34:00 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. BC:35:E5 Hydro # Hydro Systems Company BC:38:D2 Pandachi # Pandachip Limited BC:39:A6 CsunSyst # CSUN System Technology Co.,LTD @@ -22336,10 +22744,13 @@ BC:47:60 SamsungE # Samsung Electronics Co.,Ltd BC:4B:79 Sensingt # SensingTek BC:4E:3C CoreStaf # CORE STAFF CO., LTD. +BC:4E:5D Zhongmia # ZhongMiao Technology Co., Ltd. BC:51:FE SwannCom # Swann Communications Pty Ltd BC:52:B7 Apple BC:5F:F4 AsrockIn # ASRock Incorporation BC:62:9F TelenetP # Telenet Systems P. Ltd. +BC:66:41 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. +BC:67:1C Cisco BC:67:78 Apple BC:67:84 Environi # Environics Oy BC:6A:16 Tdvine @@ -22366,6 +22777,7 @@ BC:96:80 Shenzhen # Shenzhen Gongjin Electronics Co.,Ltd BC:98:89 Fiberhom # Fiberhome Telecommunication Tech.Co.,Ltd. BC:99:BC FonseeTe # FonSee Technology Inc. +BC:9C:C5 BeijingH # Beijing Huafei Technology Co., Ltd. BC:9D:A5 DascomEu # DASCOM Europe GmbH BC:A4:E1 Nabto BC:A9:D6 Cyber-Ra # Cyber-Rain, Inc. @@ -22380,9 +22792,11 @@ BC:C6:1A SpectraE # SPECTRA EMBEDDED SYSTEMS BC:C6:DB Nokia # Nokia Corporation BC:C8:10 CiscoSpv # Cisco SPVTG +BC:CA:B5 ArrisGro # ARRIS Group, Inc. BC:CD:45 Voismart BC:CF:CC Htc # HTC Corporation BC:D1:77 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. +BC:D1:D3 TinnoMob # Tinno Mobile Technology Corp BC:D5:B6 D2dTechn # d2d technologies BC:D9:40 Asr # ASR Co,.Ltd. BC:E0:9D Eoslink @@ -22415,6 +22829,7 @@ C0:35:BD Velocyte # Velocytech Aps C0:38:F9 NokiaDan # Nokia Danmark A/S C0:3B:8F MinicomD # Minicom Digital Signage +C0:3D:46 Shanghai # Shanghai Mochui Network Technology Co., Ltd C0:3E:0F Bskyb # BSkyB Ltd C0:3F:0E Netgear C0:3F:2A Biscotti # Biscotti, Inc. @@ -22425,6 +22840,7 @@ C0:49:3D Maitrise # MAITRISE TECHNOLOGIQUE C0:4A:00 Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. C0:4D:F7 Serelec +C0:56:E3 Hangzhou # Hangzhou Hikvision Digital Technology Co.,Ltd. C0:57:BC Avaya # Avaya, Inc C0:58:A7 Pico # Pico Systems Co., Ltd. C0:5E:6F VStonkau # V. Stonkaus firma "Kodinis Raktas" @@ -22481,15 +22897,19 @@ C0:E4:22 TexasIns # Texas Instruments C0:E5:4E DenxComp # DENX Computer Systems GmbH C0:EA:E4 Sonicwal # Sonicwall +C0:EE:FB OneplusT # OnePlus Tech (Shenzhen) Ltd C0:F1:C4 Pacidal # Pacidal Corporation Ltd. +C0:F2:FB Apple C0:F7:9D Powercod # Powercode C0:F8:DA HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. C0:F9:91 GmeStand # GME Standard Communications P/L +C4:00:06 LipiData # Lipi Data Systems Ltd. C4:01:42 Maxmedia # MaxMedia Technology Limited C4:01:7C RuckusWi # Ruckus Wireless C4:01:B1 Seektech # SeekTech INC C4:04:15 Netgear # NETGEAR INC., C4:05:28 HuaweiTe # Huawei Technologies Co., Ltd +C4:08:4A Alcatel- # Alcatel-Lucent C4:09:38 FujianSt # Fujian Star-net Communication Co., Ltd C4:0A:CB Cisco # CISCO SYSTEMS, INC. C4:0E:45 AckNetwo # ACK Networks,Inc. @@ -22515,6 +22935,7 @@ C4:3A:9F Siconix # Siconix Inc. C4:3C:3C CybelecS # CYBELEC SA C4:3D:C7 Netgear +C4:42:02 SamsungE # Samsung Electronics Co.,Ltd C4:43:8F LgElectr # LG Electronics C4:45:67 SambonPr # SAMBON PRECISON and ELECTRONICS C4:45:EC Shanghai # Shanghai Yali Electron Co.,LTD @@ -22522,6 +22943,7 @@ C4:48:38 SatcomDi # Satcom Direct, Inc. C4:4A:D0 Fireflie # FIREFLIES SYSTEMS C4:4B:44 Omniprin # Omniprint Inc. +C4:4B:D1 WallysCo # Wallys Communications Teachnologies Co.,Ltd. C4:4E:1F Bluen C4:4E:AC Shenzhen # Shenzhen Shiningworth Technology Co., Ltd. C4:50:06 SamsungE # Samsung Electronics Co.,Ltd @@ -22529,6 +22951,7 @@ C4:55:A6 CadacHol # Cadac Holdings Ltd C4:55:C2 Bach-Sim # Bach-Simpson C4:56:00 GalleonE # Galleon Embedded Computing +C4:56:FE LavaInte # Lava International Ltd. C4:58:C2 Shenzhen # Shenzhen TATFOOK Technology Co., Ltd. C4:59:76 FugooCoo # Fugoo Coorporation C4:5D:D8 HdmiForu # HDMI Forum @@ -22570,6 +22993,7 @@ C4:C1:9F National # National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO) C4:C7:55 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd C4:C9:19 EnergyIm # Energy Imports Ltd +C4:C9:EC D&DGroup # D&D GROUP sp. z o.o. C4:CA:D9 Hangzhou # Hangzhou H3C Technologies Co., Limited C4:CD:45 BeijingB # Beijing Boomsense Technology CO.,LTD. C4:D4:89 JiangsuJ # JiangSu Joyque Information Industry Co.,Ltd @@ -22588,6 +23012,7 @@ C4:F4:64 SpicaInt # Spica international C4:F5:7C BrocadeC # Brocade Communications Systems, Inc. C4:FC:E4 DishtvNz # DishTV NZ Ltd +C8:02:10 LgInnote # LG Innotek C8:02:58 ItwGseAp # ITW GSE ApS C8:02:A6 BeijingN # Beijing Newmine Technology C8:07:18 Tdsi @@ -22636,6 +23061,7 @@ C8:8A:83 Dongguan # Dongguan HuaHong Electronics Co.,Ltd C8:8B:47 Nolangro # Nolangroup S.P.A con Socio Unico C8:90:3E PaktonTe # Pakton Technologies +C8:91:F9 Sagemcom C8:93:46 Mxchip # MXCHIP Company Limited C8:93:83 Embedded # Embedded Automation, Inc. C8:94:D2 JiangsuD # Jiangsu Datang Electronic Products Co., Ltd @@ -22679,6 +23105,8 @@ C8:DF:7C Nokia # Nokia Corporation C8:E0:EB Apple C8:E1:A7 Vertu # Vertu Corporation Limited +C8:E4:2F Technica # Technical Research Design and Development +C8:E7:D8 Shenzhen # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD. C8:EE:08 TangtopT # TANGTOP TECHNOLOGY CO.,LTD C8:EE:75 PishionI # Pishion International Co. Ltd C8:EE:A6 Shenzhen # Shenzhen SHX Technology Co., Ltd @@ -22694,7 +23122,9 @@ C8:F9:F9 Cisco # CISCO SYSTEMS, INC. C8:FB:26 CiscoSpv # Cisco SPVTG C8:FE:30 BejingDa # Bejing DAYO Mobile Communication Technology Ltd. +C8:FF:77 Dyson # Dyson Limited CC:00:80 BettiniS # BETTINI SRL +CC:03:FA Technico # Technicolor CH USA CC:04:7C G-WayMic # G-WAY Microwave CC:04:B4 SelectCo # Select Comfort CC:05:1B SamsungE # Samsung Electronics Co.,Ltd @@ -22719,6 +23149,7 @@ CC:39:8C Shiningt # Shiningtek CC:3A:61 SamsungE # SAMSUNG ELECTRO MECHANICS CO., LTD. CC:3C:3F SaSSDate # SA.S.S. Datentechnik AG +CC:3D:82 IntelCor # Intel Corporate CC:3E:5F HewlettP # Hewlett Packard CC:43:E3 TrumpSA # Trump s.a. CC:47:03 Intercon # Intercon Systems Co., Ltd. @@ -22761,6 +23192,7 @@ CC:9E:00 Nintendo # Nintendo Co., Ltd. CC:9F:35 Transbit # Transbit Sp. z o.o. CC:A0:E5 DzgMeter # DZG Metering GmbH +CC:A2:23 HuaweiTe # Huawei Technologies Co., Ltd CC:A3:74 Guangdon # Guangdong Guanglian Electronic Technology Co.Ltd CC:A4:62 ArrisGro # ARRIS Group, Inc. CC:A6:14 AifaTech # AIFA TECHNOLOGY CORP. @@ -22786,6 +23218,7 @@ CC:D5:39 Cisco CC:D8:11 AiconnTe # Aiconn Technology Corporation CC:D9:E9 ScrEngin # SCR Engineers Ltd. +CC:E1:7F JuniperN # juniper networks CC:E1:D5 Buffalo # Buffalo Inc. CC:E7:98 MySocial # My Social Stuff CC:E7:DF American # American Magnetics, Inc. @@ -22795,6 +23228,7 @@ CC:EF:48 Cisco # CISCO SYSTEMS, INC. CC:F3:A5 ChiMeiCo # Chi Mei Communication Systems, Inc CC:F4:07 EukreaEl # EUKREA ELECTROMATIQUE SARL +CC:F5:38 3isysnet # 3isysnetworks CC:F6:7A AyeckaCo # Ayecka Communication Systems LTD CC:F8:41 Lumewave CC:F8:F0 XiAnHisu # Xi'an HISU Multimedia Technology Co.,Ltd. @@ -22806,6 +23240,7 @@ CC:FC:B1 Wireless # Wireless Technology, Inc. CC:FE:3C SamsungE # Samsung Electronics D0:07:90 TexasIns # Texas Instruments +D0:0A:AB Yokogawa # Yokogawa Digital Computer Corporation D0:0E:A4 PorscheC # Porsche Cars North America D0:13:1E SunrexTe # Sunrex Technology Corp D0:15:4A Zte # zte corporation @@ -22820,6 +23255,7 @@ D0:31:10 IngenicS # Ingenic Semiconductor Co.,Ltd D0:37:61 TexasIns # Texas Instruments D0:39:72 TexasIns # Texas Instruments +D0:39:B3 ArrisGro # ARRIS Group, Inc. D0:46:DC Southwes # Southwest Research Institute D0:4C:C1 Sintrone # SINTRONES Technology Corp. D0:50:99 AsrockIn # ASRock Incorporation @@ -22831,7 +23267,9 @@ D0:57:A1 WermaSig # Werma Signaltechnik GmbH & Co. KG D0:58:75 ActiveCo # Active Control Technology Inc. D0:59:C3 Ceramicr # CeraMicro Technology Corporation +D0:59:E4 SamsungE # Samsung Electronics Co.,Ltd D0:5A:0F I-BtDigi # I-BT DIGITAL CO.,LTD +D0:5A:F1 Shenzhen # Shenzhen Pulier Tech CO.,Ltd D0:5F:B8 TexasIns # Texas Instruments D0:5F:CE HitachiD # Hitachi Data Systems D0:63:4D MeikoMas # Meiko Maschinenbau GmbH & Co. KG @@ -22860,6 +23298,7 @@ D0:9B:05 Emtronix D0:9C:30 FosterEl # Foster Electric Company, Limited D0:9D:0A Linkcom +D0:A0:D6 ChengduT # Chengdu TD Tech Ltd. D0:A3:11 Neuberge # Neuberger Gebäudeautomation GmbH D0:AE:EC AlphaNet # Alpha Networks Inc. D0:AF:B6 LinktopT # Linktop Technology Co., LTD @@ -22898,6 +23337,7 @@ D0:F0:DB Ericsson D0:F2:7F Steadyse # SteadyServ Technoligies, LLC D0:F7:3B HelmutMa # Helmut Mauell GmbH +D0:FA:1D Qihoo360 # Qihoo 360 Technology Co.,Ltd D0:FF:50 TexasIns # Texas Instruments, Inc D4:00:0D PhoenixB # Phoenix Broadband Technologies, LLC. D4:00:57 McTechno # MC Technologies GmbH @@ -22925,6 +23365,7 @@ D4:2C:3D SkyLight # Sky Light Digital Limited D4:2F:23 AkenoriP # Akenori PTE Ltd D4:31:9D Sinwatec +D4:37:D7 Zte # zte corporation D4:3A:65 IgrsEngi # IGRS Engineering Lab Ltd. D4:3A:E9 Dongguan # DONGGUAN ipt INDUSTRIAL CO., LTD D4:3D:67 CarmaInd # Carma Industries Inc. @@ -22940,7 +23381,7 @@ D4:52:97 Nstreams # nSTREAMS Technologies, Inc. D4:53:AF VigoSyst # VIGO System S.A. D4:5A:B2 Galleon # Galleon Systems -D4:5C:70 Wireless # Wireless Gigabit Alliance +D4:5C:70 Wi-FiAll # Wi-Fi Alliance D4:5D:42 Nokia # Nokia Corporation D4:64:F7 ChengduU # CHENGDU USEE DIGITAL TECHNOLOGY CO., LTD D4:66:A8 RiedoNet # Riedo Networks GmbH @@ -22954,6 +23395,7 @@ D4:6E:5C HuaweiTe # Huawei Technologies Co., Ltd D4:6F:42 WaxessUs # WAXESS USA Inc D4:79:C3 Camerone # Cameronet GmbH & Co. KG +D4:7B:35 NeoMonit # NEO Monitors AS D4:7B:75 HartingE # HARTING Electronics GmbH D4:81:CA Idevices # iDevices, LLC D4:82:3E ArgosyTe # Argosy Technologies, Ltd. @@ -22963,6 +23405,7 @@ D4:8C:B5 Cisco # CISCO SYSTEMS, INC. D4:8F:AA SogecamI # Sogecam Industrial, S.A. D4:91:AF Electroa # Electroacustica General Iberica, S.A. +D4:93:98 Nokia # Nokia Corporation D4:93:A0 FidelixO # Fidelix Oy D4:94:5A Cosmo # COSMO CO., LTD D4:94:A1 TexasIns # Texas Instruments @@ -23007,6 +23450,7 @@ D4:E8:B2 SamsungE # Samsung Electronics D4:EA:0E Avaya # Avaya, Inc D4:EC:0C Harley-D # Harley-Davidson Motor Company +D4:EC:86 Linkedho # LinkedHope Intelligent Technologies Co., Ltd D4:EE:07 Hiwifi # HIWIFI Co., Ltd. D4:F0:27 NavetasE # Navetas Energy Management D4:F0:B4 NapcoSec # Napco Security Technologies @@ -23017,6 +23461,7 @@ D8:06:D1 Honeywel # Honeywell Fire System (Shanghai) Co,. Ltd. D8:08:F5 ArcadiaN # Arcadia Networks Co. Ltd. D8:09:C3 Cercacor # Cercacor Labs +D8:0C:CF CGVSAS # C.G.V. S.A.S. D8:0D:E3 FxiTechn # FXI TECHNOLOGIES AS D8:15:0D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. D8:16:0A NipponEl # Nippon Electro-Sensory Devices @@ -23026,6 +23471,7 @@ D8:1C:14 Compacta # Compacta International, Ltd. D8:1E:DE B&WGroup # B&W Group Ltd D8:24:BD Cisco # CISCO SYSTEMS, INC. +D8:25:22 Pace # Pace plc D8:26:B9 Guangdon # Guangdong Coagent Electronics S &T Co., Ltd. D8:27:0C Maxtroni # MaxTronic International Co., Ltd. D8:28:C9 GeneralE # General Electric Consumer and Industrial @@ -23049,10 +23495,12 @@ D8:58:D7 CzNicZSP # CZ.NIC, z.s.p.o. D8:5D:4C Tp-LinkT # TP-LINK Technologies Co.,Ltd. D8:5D:84 CaxSoft # CAx soft GmbH +D8:5D:FB Private D8:61:94 Objetivo # Objetivos y Sevicios de Valor Añadido D8:62:DB Eno # Eno Inc. D8:65:95 ToySMyth # Toy's Myth Inc. D8:66:C6 Shenzhen # Shenzhen Daystar Technology Co.,ltd +D8:66:EE BoxinCom # BOXIN COMMUNICATION CO.,LTD. D8:67:D9 Cisco # CISCO SYSTEMS, INC. D8:69:60 Steinsvi # Steinsvik D8:6B:F7 Nintendo # Nintendo Co., Ltd. @@ -23070,7 +23518,8 @@ D8:95:2F TexasIns # Texas Instruments D8:96:85 Gopro D8:96:95 Apple -D8:97:3B EmersonN # Emerson Network Power Embedded Power +D8:96:E0 AlibabaC # Alibaba Cloud Computing Ltd. +D8:97:3B ArtesynE # Artesyn Embedded Technologies D8:97:60 C2Develo # C2 Development, Inc. D8:97:7C GreyInno # Grey Innovation D8:9D:67 HewlettP # Hewlett Packard @@ -23108,6 +23557,7 @@ D8:DE:CE Isung # ISUNG CO.,LTD D8:DF:0D Beronet # beroNet GmbH D8:E3:AE CirtecMe # CIRTEC MEDICAL SYSTEMS +D8:E5:6D TctMobil # TCT Mobile Limited D8:E7:2B OnpathTe # OnPATH Technologies D8:E7:43 Wush # Wush, Inc D8:E9:52 Keopsys @@ -23142,6 +23592,7 @@ DC:33:50 Techsat # TechSAT GmbH DC:37:D2 HunanHkt # Hunan HKT Electronic Technology Co., Ltd DC:38:E1 JuniperN # Juniper networks +DC:39:79 Skyport # Skyport Systems DC:3A:5E Roku # Roku, Inc DC:3C:2E Manufact # Manufacturing System Insights, Inc. DC:3C:84 TicomGeo # Ticom Geomatics, Inc. @@ -23150,6 +23601,7 @@ DC:45:17 ArrisGro # ARRIS Group, Inc. DC:49:C9 CascoSig # CASCO SIGNAL LTD DC:4E:DE ShinyeiT # SHINYEI TECHNOLOGY CO., LTD. +DC:53:7C CompalBr # Compal Broadband Networks, Inc. DC:57:26 Power-On # Power-One DC:5E:36 Paterson # Paterson Technology DC:64:7C CRSIimot # C.R.S. iiMotion GmbH @@ -23196,6 +23648,7 @@ DC:E5:78 Experime # Experimental Factory of Scientific Engineering and Special Design Department DC:E7:1C AugElekt # AUG Elektronik GmbH DC:F0:5D LettaTek # Letta Teknoloji +DC:F1:10 Nokia # Nokia Corporation DC:F7:55 Sitronik DC:F8:58 LorentNe # Lorent Networks, Inc. DC:FA:D5 StrongGe # STRONG Ges.m.b.H. @@ -23204,10 +23657,12 @@ E0:06:E6 HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. E0:0B:28 Inovonic # Inovonics E0:0C:7F Nintendo # Nintendo Co., Ltd. +E0:0D:B9 Private E0:14:3E Modoosis # Modoosis Inc. E0:18:77 Fujitsu # Fujitsu Limited E0:1C:41 Aerohive # Aerohive Networks Inc. E0:1C:EE BravoTec # Bravo Tech, Inc. +E0:1D:38 BeijingH # Beijing HuaqinWorld Technology Co.,Ltd E0:1D:3B Cambridg # Cambridge Industries(Group) Co.,Ltd E0:1E:07 AniteTel # Anite Telecoms US. Inc E0:1F:0A XslentEn # Xslent Energy Technologies. LLC @@ -23237,6 +23692,7 @@ E0:62:90 JinanJov # Jinan Jovision Science & Technology Co., Ltd. E0:63:E5 SonyMobi # Sony Mobile Communications AB E0:64:BB Digiview # DigiView S.r.l. +E0:66:78 Apple E0:67:B3 C-DataTe # C-Data Technology Co., Ltd E0:69:95 Pegatron # PEGATRON CORPORATION E0:75:0A AlpsErec # ALPS ERECTORIC CO.,LTD. @@ -23341,6 +23797,7 @@ E4:55:EA Dedicate # Dedicated Computing E4:56:14 SuttleAp # Suttle Apparatus E4:57:A8 StuartMa # Stuart Manufacturing, Inc. +E4:5D:52 Avaya # Avaya, Inc E4:64:49 ArrisGro # ARRIS Group, Inc. E4:67:BA DanishIn # Danish Interpretation Systems A/S E4:68:A3 HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -23352,6 +23809,7 @@ E4:77:D4 MinrrayI # Minrray Industry Co.,Ltd E4:7C:F9 SamsungE # Samsung Electronics Co., LTD E4:7D:5A BeijingH # Beijing Hanbang Technology Corp. +E4:7F:B2 Fujitsu # Fujitsu Limited E4:81:84 Alcatel- # Alcatel-Lucent E4:81:B3 Shenzhen # Shenzhen ACT Industrial Co.,Ltd. E4:83:99 ArrisGro # ARRIS Group, Inc. @@ -23370,6 +23828,7 @@ E4:AF:A1 Hes-So E4:B0:21 SamsungE # Samsung Electronics Co.,Ltd E4:C1:46 Objetivo # Objetivos y Servicios de Valor A +E4:C6:2B Airware E4:C6:3D Apple # Apple, Inc. E4:C6:E6 MophieLl # Mophie, LLC E4:C7:22 Cisco @@ -23404,6 +23863,7 @@ E8:10:2E ReallySi # Really Simple Software, Inc E8:11:32 SamsungE # Samsung Electronics CO., LTD E8:13:24 Guangzho # GuangZhou Bonsoninfo System CO.,LTD +E8:15:0E Nokia # Nokia Corporation E8:17:FC Nifty # NIFTY Corporation E8:28:77 Tmy # TMY Co., Ltd. E8:28:D5 CotsTech # Cots Technology @@ -23429,6 +23889,7 @@ E8:5A:A7 LlcEmzio # LLC Emzior E8:5B:5B LgElectr # LG ELECTRONICS INC E8:5B:F0 ImagingD # Imaging Diagnostics +E8:5D:6B Luminate # Luminate Wireless E8:5E:53 Infratec # Infratec Datentechnik GmbH E8:61:1F DawningI # Dawning Information Industry Co.,Ltd E8:61:7E LiteonTe # Liteon Technology Corporation @@ -23441,6 +23902,7 @@ E8:75:7F FirsTech # FIRS Technologies(Shenzhen) Co., Ltd E8:78:A1 BeoviewI # BEOVIEW INTERCOM DOO E8:7A:F3 S5TechSR # S5 Tech S.r.l. +E8:80:2E Apple E8:80:D8 GntekEle # GNTEK Electronics Co.,Ltd. E8:89:2C ArrisGro # ARRIS Group, Inc. E8:8D:28 Apple @@ -23493,6 +23955,7 @@ E8:F2:26 MillsonC # MILLSON CUSTOM SOLUTIONS INC. E8:F9:28 RftechSr # RFTECH SRL E8:FC:60 ElcomInn # ELCOM Innovations Private Limited +E8:FC:AF Netgear # NETGEAR INC., EC:0E:D6 ItechIns # ITECH INSTRUMENTS SAS EC:10:00 EnanceSo # Enance Source Co., Ltd. PC clones(?) EC:11:20 Flodesig # FloDesign Wind Turbine Corporation @@ -23500,8 +23963,10 @@ EC:17:2F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. EC:17:66 Research # Research Centre Module EC:1A:59 BelkinIn # Belkin International Inc. +EC:1D:7F Zte # zte corporation EC:21:9F VidaboxL # VidaBox LLC EC:22:57 JiangsuN # JiangSu NanJing University Electronic Information Technology Co.,Ltd +EC:22:80 D-LinkIn # D-Link International EC:23:3D HuaweiTe # Huawei Technologies Co., Ltd EC:23:68 Intelliv # IntelliVoice Co.,Ltd. EC:2A:F0 Ypsomed # Ypsomed AG @@ -23535,6 +24000,7 @@ EC:85:2F Apple EC:88:8F Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. EC:89:F5 LenovoMo # Lenovo Mobile Communication Technology Ltd. +EC:8A:4C Zte # zte corporation EC:8E:AD Dlx EC:92:33 EddyfiNd # Eddyfi NDT Inc EC:93:27 Memmert+ # MEMMERT GmbH + Co. KG @@ -23543,21 +24009,24 @@ EC:98:C1 BeijingR # Beijing Risbo Network Technology Co.,Ltd EC:9A:74 HewlettP # Hewlett Packard EC:9B:5B Nokia # Nokia Corporation -EC:9E:CD EmersonN # Emerson Network Power and Embedded Computing +EC:9E:CD ArtesynE # Artesyn Embedded Technologies EC:A2:9B KemppiOy # Kemppi Oy EC:A8:6B Elitegro # ELITEGROUP COMPUTER SYSTEMS CO., LTD. EC:B1:06 AcuroNet # Acuro Networks, Inc EC:B5:41 ShinanoE # SHINANO E and E Co.Ltd. +EC:B9:07 Cloudgen # CloudGenix Inc EC:BB:AE Digivoic # Digivoice Tecnologia em Eletronica Ltda EC:BD:09 FusionEl # FUSION Electronics Ltd EC:C3:8A Accuener # Accuenergy (CANADA) Inc EC:C8:82 Cisco # CISCO SYSTEMS, INC. +EC:CB:30 HuaweiTe # Huawei Technologies Co., Ltd EC:CD:6D AlliedTe # Allied Telesis, Inc. EC:D0:0E Miraerec # MiraeRecognition Co., Ltd. EC:D0:40 GeaFarmT # GEA Farm Technologies GmbH EC:D1:9A ZhuhaiLi # Zhuhai Liming Industries Co., Ltd EC:D9:25 Rami EC:D9:50 IrtSa # IRT SA +EC:D9:D1 Shenzhen # Shenzhen TG-NET Botone Technology Co.,Ltd. EC:DE:3D LampreyN # Lamprey Networks, Inc. EC:E0:9B SamsungE # Samsung electronics CO., LTD EC:E1:A9 Cisco @@ -23620,6 +24089,7 @@ F0:6B:CA SamsungE # Samsung Electronics Co.,Ltd F0:72:8C SamsungE # Samsung Electronics Co.,Ltd F0:73:AE Peak-Sys # PEAK-System Technik +F0:76:1C CompalIn # COMPAL INFORMATION (KUNSHAN) CO., LTD. F0:77:65 Sourcefi # Sourcefire, Inc F0:77:D0 Xcellen F0:7B:CB HonHaiPr # Hon Hai Precision Ind. Co.,Ltd. @@ -23684,9 +24154,13 @@ F0:FD:A0 AcurixNe # Acurix Networks LP F4:03:21 BenextBV # BeNeXt B.V. F4:04:4C Valencet # ValenceTech Limited +F4:06:69 IntelCor # Intel Corporate F4:06:8D Devolo # devolo AG -F4:06:A5 Hangzhou # Hangzhou Bianfeng Networking technology Co., Ltd. +F4:06:A5 Hangzhou # Hangzhou Bianfeng Networking Technology Co., Ltd. +F4:09:D8 SamsungE # Samsung Electro Mechanics co., LTD. F4:0B:93 Research # Research In Motion +F4:0E:11 IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information. +F4:0F:1B Cisco F4:0F:9B Wavelink F4:15:FD Shanghai # Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd. F4:1B:A1 Apple @@ -23694,6 +24168,8 @@ F4:1F:0B Yamabish # YAMABISHI Corporation F4:1F:C2 Cisco F4:20:12 Cucinial # Cuciniale GmbH +F4:28:33 Mmpc # MMPC Inc. +F4:28:53 ZioncomE # Zioncom Electronics (Shenzhen) Ltd. F4:28:96 SpectoPa # SPECTO PAINEIS ELETRONICOS LTDA F4:36:E1 AbilisSa # Abilis Systems SARL F4:37:B7 Apple @@ -23737,6 +24213,7 @@ F4:94:66 Countmax # CountMax, ltd F4:99:AC WeberSch # WEBER Schraubautomaten GmbH F4:9F:54 SamsungE # Samsung Electronics +F4:9F:F3 HuaweiTe # Huawei Technologies Co., Ltd F4:A2:94 EagleWor # EAGLE WORLD DEVELOPMENT CO., LIMITED F4:A5:2A HawaTech # Hawa Technologies Inc F4:AC:C1 Cisco # CISCO SYSTEMS, INC. @@ -23756,24 +24233,32 @@ F4:CD:90 Vispiron # Vispiron Rotec GmbH F4:CE:46 Hewlett- # Hewlett-Packard Company F4:CF:E2 Cisco +F4:D0:32 YunnanId # Yunnan Ideal Information&Technology.,Ltd +F4:D2:61 Semocon # SEMOCON Co., Ltd F4:D9:FB SamsungE # Samsung Electronics CO., LTD F4:DC:4D BeijingC # Beijing CCD Digital Technology Co., Ltd F4:DC:DA ZhuhaiJi # Zhuhai Jiahe Communication Technology Co., limited F4:DC:F9 HuaweiTe # Huawei Technologies Co., Ltd +F4:DD:9E Gopro F4:E1:42 DeltaEle # Delta Elektronika BV F4:E6:D7 SolarPow # Solar Power Technologies, Inc. F4:EA:67 Cisco # CISCO SYSTEMS, INC. F4:EC:38 Tp-LinkT # TP-LINK TECHNOLOGIES CO., LTD. F4:F1:5A Apple +F4:F2:6D Tp-LinkT # TP-LINK TECHNOLOGIES CO.,LTD. F4:F5:A5 Nokia # Nokia corporation +F4:F5:E8 Google +F4:F6:46 Dediprog # Dediprog Technology Co. Ltd. F4:F9:51 Apple F4:FC:32 TexasIns # Texas Instruments +F4:FD:2B Zoyi # ZOYI Company F8:01:13 HuaweiTe # Huawei Technologies Co., Ltd F8:03:32 Khomp F8:05:1C DrsImagi # DRS Imaging and Targeting Solutions F8:0B:BE ArrisGro # ARRIS Group, Inc. F8:0B:D0 DatangTe # Datang Telecom communication terminal (Tianjin) Co., Ltd. F8:0C:F3 LgElectr # LG Electronics +F8:0D:43 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. F8:0D:EA ZycastTe # ZyCast Technology Inc. F8:0F:41 WistronI # Wistron InfoComm(ZhongShan) Corporation F8:0F:84 NaturalS # Natural Security SAS @@ -23816,16 +24301,19 @@ F8:5F:2A Nokia # Nokia Corporation F8:62:AA Xn # xn systems F8:66:01 SuzhouCh # Suzhou Chi-tek information technology Co., Ltd +F8:66:D1 HonHaiPr # Hon Hai Precision Ind. Co., Ltd. F8:66:F2 Cisco # CISCO SYSTEMS, INC. F8:69:71 SeibuEle # Seibu Electric Co., F8:6E:CF Arcx # Arcx Inc F8:71:FE GoldmanS # The Goldman Sachs Group, Inc. F8:72:EA Cisco +F8:73:94 Netgear # NETGEAR INC., F8:76:9B Neopis # Neopis Co., Ltd. F8:7B:62 FastwelI # FASTWEL INTERNATIONAL CO., LTD. Taiwan Branch F8:7B:7A ArrisGro # ARRIS Group, Inc. F8:7B:8C AmpedWir # Amped Wireless F8:81:1A Overkiz +F8:84:F2 SamsungE # Samsung Electronics Co.,Ltd F8:8C:1C KaishunE # KAISHUN ELECTRONIC TECHNOLOGY CO., LTD. BEIJING F8:8D:EF Tenebrae # Tenebraex F8:8E:85 Comtrend # COMTREND CORPORATION @@ -23850,6 +24338,7 @@ F8:BC:12 Dell # Dell Inc F8:C0:01 JuniperN # Juniper Networks F8:C0:91 Highgate # Highgates Technology +F8:C2:88 Cisco F8:C6:78 Carefusi # Carefusion F8:D0:AC SonyComp # Sony Computer Entertainment Inc. F8:D0:BD SamsungE # Samsung Electronics Co.,Ltd @@ -23899,6 +24388,7 @@ FC:15:B4 HewlettP # Hewlett Packard FC:16:07 TaianTec # Taian Technology(Wuxi) Co.,Ltd. FC:17:94 Intercre # InterCreative Co., Ltd +FC:19:10 SamsungE # Samsung Electronics Co.,Ltd FC:19:D0 CloudVis # Cloud Vision Networks Technology Co.,Ltd. FC:1B:FF V-Zug # V-ZUG AG FC:1D:59 ISmartCi # I Smart Cities HK Ltd @@ -23906,6 +24396,7 @@ FC:1F:19 SamsungE # SAMSUNG ELECTRO-MECHANICS CO., LTD. FC:1F:C0 Eurecam FC:22:9C HanKyung # Han Kyung I Net Co.,Ltd. +FC:23:25 EostekSh # EosTek (Shenzhen) Co., Ltd. FC:25:3F Apple FC:27:A2 TransEle # TRANS ELECTRIC CO., LTD. FC:2A:54 Connecte # Connected Data, Inc. @@ -23914,7 +24405,7 @@ FC:35:98 Favite # Favite Inc. FC:35:E6 Visteon # Visteon corp FC:3F:AB HenanLan # Henan Lanxin Technology Co., Ltd -FC:44:63 Universa # Universal Audio +FC:44:63 Universa # Universal Audio, Inc FC:44:99 SwarcoLe # Swarco LEA d.o.o. FC:45:5F JiangxiS # JIANGXI SHANSHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD FC:48:EF HuaweiTe # HUAWEI TECHNOLOGIES CO.,LTD @@ -23932,8 +24423,10 @@ FC:62:6E BeijingM # Beijing MDC Telecom FC:68:3E Directed # Directed Perception, Inc FC:6C:31 Lxinstru # LXinstruments GmbH +FC:6D:C0 Bme # BME CORPORATION FC:75:16 D-LinkIn # D-Link International FC:75:E6 Handream # Handreamnet +FC:79:0B HitachiH # Hitachi High Technologies America, Inc. FC:7C:E7 FciUsaLl # FCI USA LLC FC:83:29 TreiTech # Trei technics FC:83:99 Avaya # Avaya, Inc @@ -23945,9 +24438,11 @@ FC:94:E3 Technico # Technicolor USA Inc. FC:99:47 Cisco FC:9F:AE Fidus # Fidus Systems Inc +FC:9F:E1 ConwinTe # CONWIN.Tech. Ltd FC:A1:3E SamsungE # Samsung Electronics FC:A8:41 Avaya # Avaya, Inc FC:A9:B0 Miartech # MIARTECH (SHANGHAI),INC. +FC:AA:14 Giga-Byt # GIGA-BYTE TECHNOLOGY CO.,LTD. FC:AD:0F QtsNetwo # QTS NETWORKS FC:AF:6A Conemtec # Conemtech AB FC:B0:C4 Shanghai # Shanghai DareGlobal Technologies Co., Ltd @@ -23960,9 +24455,11 @@ FC:CF:62 Ibm # IBM Corp FC:D4:F2 CocaCola # The Coca Cola Company FC:D4:F6 MessanaA # Messana Air.Ray Conditioning s.r.l. +FC:D5:D9 Shenzhen # Shenzhen SDMC Technology Co., Ltd. FC:D6:BD RobertBo # Robert Bosch GmbH FC:D8:17 BeijingH # Beijing Hesun Technologies Co.Ltd. FC:DB:96 Enervall # ENERVALLEY CO., LTD +FC:DB:B3 MurataMa # Murata Manufacturing Co., Ltd. FC:DD:55 Shenzhen # Shenzhen WeWins wireless Co.,Ltd FC:E1:86 A3m # A3M Co., LTD FC:E1:92 SichuanJ # Sichuan Jinwangtong Electronic Science&Technology Co,.Ltd @@ -23980,6 +24477,7 @@ FC:FA:F7 Shanghai # Shanghai Baud Data Communication Co.,Ltd. FC:FB:FB Cisco # CISCO SYSTEMS, INC. FC:FE:77 HitachiR # Hitachi Reftechno, Inc. +FC:FF:AA IeeeRegi # IEEE REGISTRATION AUTHORITY - Please see MAL public listing for more information. # # Well-known addresses. @@ -24075,6 +24573,8 @@ 01-80-C2-00-00-12 Loadable-Device 01-80-C2-00-00-14 ISIS-all-level-1-IS's 01-80-C2-00-00-15 ISIS-all-level-2-IS's +01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1 +01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/ChmodBPF/ChmodBPF ^
@@ -2,34 +2,20 @@ # # $Id$ -. /etc/rc.common - -StartService () -{ - # - # Unfortunately, Mac OS X's devfs is based on the old FreeBSD - # one, not the current one, so there's no way to configure it - # to create BPF devices with particular owners or groups. - # This startup item will make it owned by the admin group, - # with permissions rw-rw----, so that anybody in the admin - # group can use programs that capture or send raw packets. - # - # Change this as appropriate for your site, e.g. to make - # it owned by a particular user without changing the permissions, - # so only that user and the super-user can capture or send raw - # packets, or give it the permissions rw-r-----, so that - # only the super-user can send raw packets but anybody in the - # admin group can capture packets. - # - chgrp access_bpf /dev/bpf* - chmod g+rw /dev/bpf* -} - -StopService () -{ - return 0; -} - -RestartService () { StartService; } - -RunService "$1" +# +# Unfortunately, Mac OS X's devfs is based on the old FreeBSD +# one, not the current one, so there's no way to configure it +# to create BPF devices with particular owners or groups. +# This startup item will make it owned by the admin group, +# with permissions rw-rw----, so that anybody in the admin +# group can use programs that capture or send raw packets. +# +# Change this as appropriate for your site, e.g. to make +# it owned by a particular user without changing the permissions, +# so only that user and the super-user can capture or send raw +# packets, or give it the permissions rw-r-----, so that +# only the super-user can send raw packets but anybody in the +# admin group can capture packets. +# +chgrp access_bpf /dev/bpf* +chmod g+rw /dev/bpf*
[-] [+]	Added	wireshark-1.10.8.tar.bz2/packaging/macosx/ChmodBPF/org.wireshark.ChmodBPF.plist ^
@@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>Label</key> + <string>org.wireshark.ChmodBPF</string> + <key>RunAtLoad</key> + <true/> + <key>Program</key> + <string>/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF</string> +</dict> +</plist>
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Info.plist ^
@@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.10.6, Copyright 1998-2014 Wireshark Development Team</string> + <string>1.10.8, Copyright 1998-2014 Wireshark Development Team</string> <key>CFBundleIconFile</key> <string>Wireshark.icns</string> <key>CFBundleIdentifier</key> @@ -56,11 +56,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.10.6</string> + <string>1.10.8</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.10.6</string> + <string>1.10.8</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2014 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Makefile.am ^
@@ -13,8 +13,7 @@ EXTRA_DIST = \ ChmodBPF/ChmodBPF \ - ChmodBPF/README.macosx \ - ChmodBPF/StartupParameters.plist \ + ChmodBPF/org.wireshark.ChmodBPF.plist \ dmg_background.png \ dmg_background.svg \ util_background.png \
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Makefile.in ^
@@ -335,8 +335,7 @@ EXTRA_DIST = \ ChmodBPF/ChmodBPF \ - ChmodBPF/README.macosx \ - ChmodBPF/StartupParameters.plist \ + ChmodBPF/org.wireshark.ChmodBPF.plist \ dmg_background.png \ dmg_background.svg \ util_background.png \
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Read_me_first.rtf ^
@@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370 +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400 \cocoascreenfonts1{\fonttbl\f0\froman\fcharset0 TimesNewRomanPSMT;\f1\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} {\\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid1} @@ -36,14 +36,17 @@ \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural \ls2\ilvl0\cf0 {\listtext \'95 } -\i /Applications/Wireshark +\i /Applications/Wireshark.app \i0 . The main Wireshark application.\ {\listtext \'95 } -\i /Library/StartupItems/ChmodBPF -\i0 . A script which adjusts permissions on the system's packet capture devices ( +\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist +\i0 . A launch daemon that adjusts permissions on the system's packet capture devices ( \i /dev/bpf \i0 *) when the system starts up.\ {\listtext \'95 } +\i /Library/Application Support/Wireshark/ChmodBPF +\i0 A copy of the launch daemon property list, and the script that the launch daemon runs.\ +{\listtext \'95 } \i /usr/local/bin \i0 . A wrapper script and symbolic links which will let you run Wireshark and its associated utilities from the command line. You can access them directly or by adding /usr/local/bin to your PATH if it's not already in your PATH.\ \pard\tx560\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural @@ -63,13 +66,19 @@ \f1 \cf0 {\listtext 1. }Remove \i /Applications/Wireshark \i0 \ -{\listtext 2. }Remove the wrapper scripts from +{\listtext 2. }Remove +\i /Library/Application Support/Wireshark +\i0 \ +{\listtext 3. }Remove the wrapper scripts from \i /usr/local/bin \i0 \ -{\listtext 3. }Remove -\i /Library/StartupItems/ChmodBPF +{\listtext 4. }Unload the +\i org.wireshark.ChmodBPF.plist +\i0 launchd job\ +{\listtext 5. }Remove +\i /Library/LaunchDaemons/org.wireshark.ChmodBPF.plist \i0 \ -{\listtext 4. }Remove the +{\listtext 6. }Remove the \i access_bpf \i0 group.\ } \ No newline at end of file
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Scripts/chmodbpf-postinstall.sh ^
@@ -1,7 +1,6 @@ #!/bin/sh -CHMOD_BPF_DIR="/Library/StartupItems/ChmodBPF" -CHMOD_BPF="$CHMOD_BPF_DIR/ChmodBPF" +CHMOD_BPF="/Library/LaunchDaemons/org.wireshark.ChmodBPF.plist" BPF_GROUP="access_bpf" BPF_GROUP_NAME="BPF device access ACL" @@ -9,6 +8,11 @@ dseditgroup -q -o create "$BPF_GROUP" dseditgroup -q -o edit -a "$USER" -t user "$BPF_GROUP" -chmod -R go-w "$CHMOD_BPF_DIR" +cp "/Library/Application Support/Wireshark/ChmodBPF/org.wireshark.ChmodBPF.plist" \ + "$CHMOD_BPF" +chmod 755 "$CHMOD_BPF" +chown root:wheel "$CHMOD_BPF" -sh "$CHMOD_BPF" start +rm -rf /Library/StartupItems/ChmodBPF + +launchctl load "$CHMOD_BPF"
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Wireshark_package.pmdoc/02chmodbpf.xml ^
@@ -1 +1 @@ -<pkgref spec="1.12" uuid="67B4E446-7EE6-4D65-9616-CECAA7FB2094"><config><identifier>org.wireshark.ChmodBPF.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">ChmodBPF</installFrom><installTo mod="true">/Library/StartupItems</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>extraFiles</mod><mod>installTo.path</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/chmodbpf-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/><additionalPkgInfoXML><pkg-info><scripts><postinstall file="./postinstall"/></scripts></pkg-info></additionalPkgInfoXML></pkgref> \ No newline at end of file +<pkgref spec="1.12" uuid="67B4E446-7EE6-4D65-9616-CECAA7FB2094"><config><identifier>org.wireshark.ChmodBPF.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">ChmodBPF</installFrom><installTo mod="true">/Library/Application Support/Wireshark</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>extraFiles</mod><mod>installTo.path</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/chmodbpf-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/><additionalPkgInfoXML><pkg-info><scripts><postinstall file="./postinstall"/></scripts></pkg-info></additionalPkgInfoXML></pkgref>
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/packaging/macosx/Wireshark_package.pmdoc/index.xml.in ^
@@ -1 +1 @@ -<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF startup item and add an access_bpf group" description="This installs a startup item (ChmodBPF) that changes the group permissions of each BPF device to allow access for the "access_bpf" group. It creates the "access_bpf" group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires Mac OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc> +<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF launch daemon and add an access_bpf group" description="This installs a launch daemon (org.wireshark.ChmodBPF.plist) that changes the group permissions of each BPF device to allow access for the "access_bpf" group. It creates the "access_bpf" group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires Mac OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/plugins/gryphon/packet-gryphon.c ^
@@ -311,7 +311,7 @@ { FR_RESP_AFTER_PERIOD, "Send response(s) after the specified period expires following a conforming message" }, { FR_IGNORE_DURING_PER, - "Send response(s) for a conforming message and ignore\nfurther messages until the specified period expires" }, + "Send response(s) for a conforming message and ignore further messages until the specified period expires" }, { 0, NULL } };
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/print.c ^
@@ -91,7 +91,7 @@ static gboolean write_headers = FALSE; -static const gchar get_field_hex_value(GSList src_list, field_info fi); +static gchar get_field_hex_value(GSList src_list, field_info fi); static void proto_tree_print_node(proto_node node, gpointer data); static void proto_tree_write_node_pdml(proto_node node, gpointer data); static const guint8 get_field_data(GSList src_list, field_info fi); @@ -297,7 +297,6 @@ const gchar label_ptr; gchar label_str[ITEM_LABEL_LENGTH]; char dfilter_string; - size_t chop_len; int i; gboolean wrap_in_fake_protocol; @@ -428,26 +427,13 @@ fputs("\" show=\"\" value=\"", pdata->fh); break; default: - / XXX - this is a hack until we can just call - * fvalue_to_string_repr() for all FT_* types. / - dfilter_string = proto_construct_match_selected_string(fi, - pdata->edt); + dfilter_string = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); if (dfilter_string != NULL) { - chop_len = strlen(fi->hfinfo->abbrev) + 4; / for " == " / - - / XXX - Remove double-quotes. Again, once we - * can call fvalue_to_string_repr(), we can - * ask it not to produce the version for - * display-filters, and thus, no - * double-quotes. / - if (dfilter_string[strlen(dfilter_string)-1] == '"') { - dfilter_string[strlen(dfilter_string)-1] = '\0'; - chop_len++; - } fputs("\" show=\"", pdata->fh); - print_escaped_xml(pdata->fh, &dfilter_string[chop_len]); + print_escaped_xml(pdata->fh, dfilter_string); } + g_free(dfilter_string); / * XXX - should we omit "value" for any fields? @@ -1584,7 +1570,7 @@ /* print the value of all accurrences of the field / / If not the first, add the 'aggregator' / if (g_ptr_array_len(fv_p) > 0) { - g_ptr_array_add(fv_p, (gpointer)ep_strdup_printf("%c", fields->aggregator)); + g_ptr_array_add(fv_p, (gpointer)g_strdup_printf("%c", fields->aggregator)); } break; default: @@ -1610,7 +1596,7 @@ field_index = g_hash_table_lookup(call_data->fields->field_indicies, fi->hfinfo->abbrev); if (NULL != field_index) { format_field_values(call_data->fields, field_index, - get_node_field_value(fi, call_data->edt) / static or ep_alloc'd string / + get_node_field_value(fi, call_data->edt) / g_ alloc'd string / ); } @@ -1672,7 +1658,7 @@ field_index = g_hash_table_lookup(fields->field_indicies, col_name); if (NULL != field_index) { - format_field_values(fields, field_index, cinfo->col_data[col]); + format_field_values(fields, field_index, g_strdup(cinfo->col_data[col])); } } } @@ -1683,6 +1669,7 @@ } if (NULL != fields->field_values[i]) { GPtrArray fv_p; + gchar * str; gsize j; fv_p = fields->field_values[i]; if (fields->quote != '\0') { @@ -1691,7 +1678,9 @@ /* Output the array of (partial) field values / for (j = 0; j < g_ptr_array_len(fv_p); j++ ) { - fputs((gchar )g_ptr_array_index(fv_p, j), fh); + str = (gchar )g_ptr_array_index(fv_p, j); + fputs(str, fh); + g_free(str); } if (fields->quote != '\0') { fputc(fields->quote, fh); @@ -1707,14 +1696,14 @@ / Nothing to do / } -/ Returns an ep_alloced string or a static constant/ -const gchar get_node_field_value(field_info* fi, epan_dissect_t* edt) +/* Returns an g_malloced string / +gchar get_node_field_value(field_info* fi, epan_dissect_t* edt) { if (fi->hfinfo->id == hf_text_only) { /* Text label. * Get the text / if (fi->rep) { - return fi->rep->representation; + return g_strdup(fi->rep->representation); } else { return get_field_hex_value(edt->pi.data_src, fi); @@ -1728,41 +1717,25 @@ else { / Normal protocols and fields / gchar dfilter_string; - size_t chop_len; switch (fi->hfinfo->type) { case FT_PROTOCOL: /* Print out the full details for the protocol. / if (fi->rep) { - return fi->rep->representation; + return g_strdup(fi->rep->representation); } else { / Just print out the protocol abbreviation / - return fi->hfinfo->abbrev; + return g_strdup(fi->hfinfo->abbrev); } case FT_NONE: / Return "1" so that the presence of a field of type * FT_NONE can be checked when using -T fields / - return "1"; + return g_strdup("1"); default: - / XXX - this is a hack until we can just call - * fvalue_to_string_repr() for all FT_* types. / - dfilter_string = proto_construct_match_selected_string(fi, - edt); + dfilter_string = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, NULL); if (dfilter_string != NULL) { - chop_len = strlen(fi->hfinfo->abbrev) + 4; / for " == " / - - / XXX - Remove double-quotes. Again, once we - * can call fvalue_to_string_repr(), we can - * ask it not to produce the version for - * display-filters, and thus, no - * double-quotes. / - if (dfilter_string[strlen(dfilter_string)-1] == '"') { - dfilter_string[strlen(dfilter_string)-1] = '\0'; - chop_len++; - } - - return &(dfilter_string[chop_len]); + return dfilter_string; } else { return get_field_hex_value(edt->pi.data_src, fi); } @@ -1770,7 +1743,7 @@ } } -static const gchar +static gchar* get_field_hex_value(GSList src_list, field_info fi) { const guint8 pd; @@ -1779,7 +1752,7 @@ return NULL; if (fi->length > tvb_length_remaining(fi->ds_tvb, fi->start)) { - return "field length invalid!"; + return g_strdup("field length invalid!"); } / Find the data for this field. / @@ -1793,7 +1766,7 @@ const int chars_per_byte = 2; len = chars_per_byte fi->length; - buffer = ep_alloc_array(gchar, len + 1); + buffer = (gchar )g_malloc(sizeof(gchar)(len + 1)); buffer[len] = '\0'; /* Ensure NULL termination in bad cases / p = buffer; / Print a simple hex dump */
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/print.h ^
@@ -158,7 +158,7 @@ extern void proto_tree_write_fields(output_fields_t* fields, epan_dissect_t edt, column_info cinfo, FILE fh); extern void write_fields_finale(output_fields_t fields, FILE fh); -extern const gchar get_node_field_value(field_info* fi, epan_dissect_t* edt); +extern gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt); #ifdef __cplusplus }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/rawshark.c ^
@@ -900,9 +900,8 @@ guchar ptr = (guchar) &disk_hdr; static gchar err_str[100]; - memset(&mem_hdr, 0, sizeof(mem_hdr)); - if (want_pcap_pkthdr) { + bytes_needed = sizeof(mem_hdr); ptr = (guchar*) &mem_hdr; }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/services ^
@@ -1368,8 +1368,8 @@ dhcp-failover2 847/udp # dhcp-failover 2 [Bernard_Volz] [Bernard_Volz] gdoi 848/tcp # GDOI [RFC3547] gdoi 848/udp # GDOI [RFC3547] -iscsi 860/tcp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] -iscsi 860/udp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] +iscsi 860/tcp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC7143] +iscsi 860/udp # iSCSI [IESG] [IETF_Chair] 2013-08-27 [RFC7143] owamp-control 861/tcp # OWAMP-Control [RFC4656] owamp-control 861/udp # OWAMP-Control [RFC4656] twamp-control 862/tcp # Two-way Active Measurement Protocol (TWAMP) Control [RFC5357] @@ -1605,8 +1605,8 @@ icp 1112/tcp # Intelligent Communication Protocol [Mark_H_David] [Mark_H_David] icp 1112/udp # Intelligent Communication Protocol [Mark_H_David] [Mark_H_David] ltp-deepspace 1113/tcp # Licklider Transmission Protocol [RFC5326] -ltp-deepspace 1113/udp # Licklider Transmission Protocol 2014-02-21 [RFC5326][RFC-irtf-dtnrg-dgram-clayer] -ltp-deepspace 1113/dccp # Licklider Transmission Protocol 2013-11-12 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer-05] 7107696 +ltp-deepspace 1113/udp # Licklider Transmission Protocol 2014-02-21 [RFC5326][RFC7122] +ltp-deepspace 1113/dccp # Licklider Transmission Protocol 2013-11-12 2014-02-21 [RFC7122] 7107696 mini-sql 1114/tcp # Mini SQL [David_Hughes] [David_Hughes] mini-sql 1114/udp # Mini SQL [David_Hughes] [David_Hughes] ardus-trns 1115/tcp # ARDUS Transfer @@ -1934,8 +1934,6 @@ t1distproc 1274/udp # t1distproc [Julian_Biddle] [Julian_Biddle] ivcollector 1275/tcp # ivcollector ivcollector 1275/udp # ivcollector -ivmanager 1276/tcp # ivmanager [Xavier_Roques] [Xavier_Roques] -ivmanager 1276/udp # ivmanager [Xavier_Roques] [Xavier_Roques] miva-mqs 1277/tcp # mqs [Miva_Corporation] [Miva_Corporation] miva-mqs 1277/udp # mqs [Miva_Corporation] [Miva_Corporation] dellwebadmin-1 1278/tcp # Dell Web Admin 1 @@ -2720,8 +2718,8 @@ dec-mbadmin-h 1656/udp # dec-mbadmin-h [Nick_Shipman] [Nick_Shipman] fujitsu-mmpdc 1657/tcp # fujitsu-mmpdc [Katsumi_Oomuro] [Katsumi_Oomuro] fujitsu-mmpdc 1657/udp # fujitsu-mmpdc [Katsumi_Oomuro] [Katsumi_Oomuro] -sixnetudr 1658/tcp # sixnetudr [Bob_Rennie] [Bob_Rennie] -sixnetudr 1658/udp # sixnetudr [Bob_Rennie] [Bob_Rennie] +sixnetudr 1658/tcp # sixnetudr [Red_Lion_Controls] [Denis_Aull] 2014-05-21 +sixnetudr 1658/udp # sixnetudr [Red_Lion_Controls] [Denis_Aull] 2014-05-21 sg-lm 1659/tcp # Silicon Grail License Manager [William_R_Bishop] [William_R_Bishop] sg-lm 1659/udp # Silicon Grail License Manager [William_R_Bishop] [William_R_Bishop] skip-mc-gikreq 1660/tcp # skip-mc-gikreq [Tom_Markson] [Tom_Markson] @@ -2955,6 +2953,7 @@ kmscontrol 1773/udp # KMSControl [Roy_Chastain] [Roy_Chastain] global-dtserv 1774/tcp # global-dtserv [Nicholas_Davies] [Nicholas_Davies] global-dtserv 1774/udp # global-dtserv [Nicholas_Davies] [Nicholas_Davies] +vdab 1775/tcp # data interchange between visual processing containers [MJA_Technology_LLC] [Mark_J._App] 2014-04-23 femis 1776/tcp # Federal Emergency Management Information System [Larry_Gerhardstein] [Larry_Gerhardstein] femis 1776/udp # Federal Emergency Management Information System [Larry_Gerhardstein] [Larry_Gerhardstein] powerguardian 1777/tcp # powerguardian [Charles_Bennett] [Charles_Bennett] 2008-08-29 @@ -4145,14 +4144,15 @@ service-ctrl 2367/udp # Service Control [Humberto_Sanchez] [Humberto_Sanchez] opentable 2368/tcp # OpenTable [Brett_Goldstein] [Brett_Goldstein] opentable 2368/udp # OpenTable [Brett_Goldstein] [Brett_Goldstein] -l3-hbmon 2370/tcp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Port 2370 Unofficially used by Compaq -l3-hbmon 2370/udp # L3-HBMon [Dolores_Scott] [Dolores_Scott] Port 2370 Unofficially used by Compaq -worldwire 2371/tcp # Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] -worldwire 2371/udp # Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] +l3-hbmon 2370/tcp # L3-HBMon [Dolores_Scott] [Dolores_Scott] 2014-04-09 +l3-hbmon 2370/udp # L3-HBMon [Dolores_Scott] [Dolores_Scott] 2014-04-09 +hp-rda 2371/tcp # HP Remote Device Access [Hewlett_Packard_3] [Michael_Spratte][Steve_Roscio] 2014-04-09 lanmessenger 2372/tcp # LanMessenger [Garrett_Padera] [Garrett_Padera] 2008-02-01 lanmessenger 2372/udp # LanMessenger [Garrett_Padera] [Garrett_Padera] 2008-02-01 remographlm 2373/tcp # Remograph License Manager [Per_Fahlberg] [Per_Fahlberg] 2009-01-21 hydra 2374/tcp # Hydra RPC [Jacob_Feisley] [Jacob_Feisley] 2009-01-21 +docker 2375/tcp # Docker REST API (plain text) [DOCKER] [Christopher_Liljenstolpe] 2014-04-17 +docker-s 2376/tcp # Docker REST API (ssl) [DOCKER] [Christopher_Liljenstolpe] 2014-04-17 compaq-https 2381/tcp # Compaq HTTPS [Scott_Shaffer] [Scott_Shaffer] compaq-https 2381/udp # Compaq HTTPS [Scott_Shaffer] [Scott_Shaffer] ms-olap3 2382/tcp # Microsoft OLAP @@ -5100,8 +5100,7 @@ ispipes 2853/udp # ISPipes [Rajesh_Nandyalam] [Rajesh_Nandyalam] infomover 2854/tcp # InfoMover [Carla_Caputo] [Carla_Caputo] infomover 2854/udp # InfoMover [Carla_Caputo] [Carla_Caputo] -msrp 2855/tcp # MSRP over TCP [RFC4975] -msrp 2855/udp # MSRP [RFC4975] +msrp 2855/tcp # MSRP over TCP 2014-04-09 [RFC4976] cesdinv 2856/tcp # cesdinv [Yoshiaki_Tokumoto] [Yoshiaki_Tokumoto] cesdinv 2856/udp # cesdinv [Yoshiaki_Tokumoto] [Yoshiaki_Tokumoto] simctlp 2857/tcp # SimCtIP [Christian_Zietz] [Christian_Zietz] @@ -5536,8 +5535,8 @@ videobeans 3058/udp # videobeans [Hiroyuki_Takahashi] [Hiroyuki_Takahashi] qsoft 3059/tcp # qsoft [James_Kunz] [James_Kunz] qsoft 3059/udp # qsoft [James_Kunz] [James_Kunz] -interserver 3060/tcp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] -interserver 3060/udp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] +interserver 3060/tcp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] Known Unauthorized Use on port 3060 +interserver 3060/udp # interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] Known Unauthorized Use on port 3060 cautcpd 3061/tcp # cautcpd cautcpd 3061/udp # cautcpd ncacn-ip-tcp 3062/tcp # ncacn-ip-tcp @@ -5674,8 +5673,8 @@ netport-id 3129/udp # NetPort Discovery Port [P_T_K_Farrar] [P_T_K_Farrar] icpv2 3130/tcp # ICPv2 [Duane_Wessels] [Duane_Wessels] icpv2 3130/udp # ICPv2 [Duane_Wessels] [Duane_Wessels] -netbookmark 3131/tcp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] -netbookmark 3131/udp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] +netbookmark 3131/tcp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] Known Unauthorized Use on port 3131 +netbookmark 3131/udp # Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] Known Unauthorized Use on port 3131 ms-rule-engine 3132/tcp # Microsoft Business Rule Engine Update Service [Anush_Kumar] [Anush_Kumar] ms-rule-engine 3132/udp # Microsoft Business Rule Engine Update Service [Anush_Kumar] [Anush_Kumar] prism-deploy 3133/tcp # Prism Deploy User Port [Joan_Linck] [Joan_Linck] @@ -5932,8 +5931,8 @@ ivecon-port 3258/udp # Ivecon Server Port [Serguei_Tevs] [Serguei_Tevs] 2002-02 epncdp2 3259/tcp # Epson Network Common Devi [Oishi_Toshiaki] [Oishi_Toshiaki] 2002-02 epncdp2 3259/udp # Epson Network Common Devi [Oishi_Toshiaki] [Oishi_Toshiaki] 2002-02 -iscsi-target 3260/tcp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] -iscsi-target 3260/udp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC-ietf-storm-iscsi-cons-10] +iscsi-target 3260/tcp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC7143] +iscsi-target 3260/udp # iSCSI port [IESG] [IETF_Chair] 2013-08-27 [RFC7143] winshadow 3261/tcp # winShadow [Colin_Barry] [Colin_Barry] winshadow 3261/udp # winShadow [Colin_Barry] [Colin_Barry] necp 3262/tcp # NECP [Alberto_Cerpa] [Alberto_Cerpa] @@ -6916,6 +6915,7 @@ mni-prot-rout 3764/udp # MNI Protected Routing [Tim_Behne] [Tim_Behne] 2003-06 rtraceroute 3765/tcp # Remote Traceroute [A_Blake_Cooper] [A_Blake_Cooper] 2003-06 rtraceroute 3765/udp # Remote Traceroute [A_Blake_Cooper] [A_Blake_Cooper] 2003-06 +sitewatch-s 3766/tcp # SSL e-watch sitewatch server [e-Watch_Corporation] [John_M_Baird_2] 2014-05-13 this port was previously updated on 2009-06-19 listmgr-port 3767/tcp # ListMGR Port [Takashi_Kubota] [Takashi_Kubota] 2003-06 listmgr-port 3767/udp # ListMGR Port [Takashi_Kubota] [Takashi_Kubota] 2003-06 rblcheckd 3768/tcp # rblcheckd server daemon [Sabri_Berisha] [Sabri_Berisha] 2003-06 @@ -7819,6 +7819,10 @@ jaxer-manager 4328/udp # Jaxer Manager Command Protocol [Uri_Sarid] [Uri_Sarid] 2008-01-22 publiqare-sync 4329/tcp # PubliQare Distributed Environment Synchronisation Engine [Tom_Maaswinkel] [Tom_Maaswinkel] 2011-02-07 dey-sapi 4330/tcp # DEY Storage Administration REST API [DEY_Storage_Systems_Inc] [Garrett_D_Amore] 2013-03-01 +ktickets-rest 4331/tcp # ktickets REST API for event management and ticketing systems (embedded POS devices) [KeyTicket_Solutions] [MANG_Ioan-Alexandru] 2014-04-04 +ahsp 4333/tcp # ArrowHead Service Protocol (AHSP) [QuantuMatriX_Technologies] [Matthew_Schultz] 2014-04-10 +ahsp 4333/udp # ArrowHead Service Protocol (AHSP) [QuantuMatriX_Technologies] [Matthew_Schultz] 2014-04-10 +ahsp 4333/sctp # ArrowHead Service Protocol (AHSP) [QuantuMatriX_Technologies] [Matthew_Schultz] 2014-04-10 gaia 4340/tcp # Gaia Connector Protocol [Philippe_Detournay] [Philippe_Detournay] 2007-11-12 gaia 4340/udp # Gaia Connector Protocol [Philippe_Detournay] [Philippe_Detournay] 2007-11-12 lisp-data 4341/tcp # LISP Data Packets [Dino_Farinacci] [Dino_Farinacci] 2007-11-12 @@ -7934,8 +7938,8 @@ netblox 4441/udp # Netblox Protocol [Brian_S_Locke] [Brian_S_Locke] 2008-07-10 saris 4442/tcp # Saris saris 4442/udp # Saris -pharos 4443/tcp # Pharos [TeleConsult] [TeleConsult] -pharos 4443/udp # Pharos [TeleConsult] [TeleConsult] +pharos 4443/tcp # Pharos [TeleConsult] [TeleConsult] Known Unauthorized Use on port 4443 +pharos 4443/udp # Pharos [TeleConsult] [TeleConsult] Known Unauthorized Use on port 4443 krb524 4444/tcp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] krb524 assigned the port, nv used it without an assignment krb524 4444/udp # KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] krb524 assigned the port, nv used it without an assignment nv-video 4444/tcp # NV Video default [Ron_Frederick] [Ron_Frederick] krb524 assigned the port, nv used it without an assignment @@ -8009,9 +8013,9 @@ msfrs 4554/udp # MS FRS Replication [Kev_George] [Kev_George] 2006-09 rsip 4555/tcp # RSIP Port [RFC3103] rsip 4555/udp # RSIP Port [RFC3103] -dtn-bundle-tcp 4556/tcp # DTN Bundle TCP CL Protocol -dtn-bundle 4556/udp # DTN Bundle UDP CL Protocol 2006-11 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer] -dtn-bundle 4556/dccp # DTN Bundle DCCP CL Protocol 2013-11-12 2014-02-21 [RFC-irtf-dtnrg-dgram-clayer] 1685351985 +dtn-bundle 4556/tcp # DTN Bundle TCP CL Protocol [Simon_Perreault] [Simon_Perreault] 2014-03-12 [draft-irtf-dtnrg-tcp-clayer] +dtn-bundle 4556/udp # DTN Bundle UDP CL Protocol 2006-11 2014-02-21 [RFC7122] +dtn-bundle 4556/dccp # DTN Bundle DCCP CL Protocol 2013-11-12 2014-02-21 [RFC7122] 1685351985 mtcevrunqss 4557/udp # Marathon everRun Quorum Service Server [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 mtcevrunqman 4558/udp # Marathon everRun Quorum Service Manager [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 hylafax 4559/tcp # HylaFAX [Lee_Howard] [Lee_Howard] 2002-03 @@ -8050,6 +8054,7 @@ piranha2 4601/udp # Piranha2 [Primark_Corporation] [Primark_Corporation] mtsserver 4602/tcp # EAX MTS Server [Pedro_A_Rodriguez] [Pedro_A_Rodriguez] 2008-08-06 menandmice-upg 4603/tcp # Men & Mice Upgrade Agent [Eggert_Thorlacius_2] [Eggert_Thorlacius_2] 2010-01-27 +irp 4604/tcp # Identity Registration Protocol [Sixscape_Communications_Ltd] [Lawrence_E._Hughes] 2014-03-17 playsta2-app 4658/tcp # PlayStation2 App Port playsta2-app 4658/udp # PlayStation2 App Port playsta2-lob 4659/tcp # PlayStation2 Lobby Port [Noam_Rimon] [Noam_Rimon] 2004-12 @@ -8260,6 +8265,7 @@ bones 4914/tcp # Bones Remote Control [Andreas_Foedrowitz] [Andreas_Foedrowitz] 2008-06-18 bones 4914/udp # Bones Remote Control [Andreas_Foedrowitz] [Andreas_Foedrowitz] 2008-06-18 frcs 4915/tcp # Fibics Remote Control Service [Ken_Lagarec] [Ken_Lagarec] 2009-04-17 +an-signaling 4936/udp # Signal protocol port for autonomic networking [Cisco_systems_3] [Toerless_Eckert_2] 2014-06-06 atsc-mh-ssc 4937/udp # ATSC-M/H Service Signaling Channel [Jerry_Whitaker] [Jerry_Whitaker] 2008-10-27 eq-office-4940 4940/tcp # Equitrac Office eq-office-4940 4940/udp # Equitrac Office @@ -8381,10 +8387,12 @@ locus-disc 5058/udp # Locus Discovery [Alan_King] [Alan_King] 2009-08-13 sds 5059/tcp # SIP Directory Services [Arthur_Wilton] [Arthur_Wilton] 2006-03 sds 5059/udp # SIP Directory Services [Arthur_Wilton] [Arthur_Wilton] 2006-03 -sip 5060/tcp # SIP [Henning_Schulzrinne] [Henning_Schulzrinne] -sip 5060/udp # SIP [Henning_Schulzrinne] [Henning_Schulzrinne] -sip-tls 5061/tcp # SIP-TLS [Henning_Schulzrinne] [Henning_Schulzrinne] -sip-tls 5061/udp # SIP-TLS [Henning_Schulzrinne] [Henning_Schulzrinne] +sip 5060/tcp # SIP 2014-04-09 [RFC3263] +sip 5060/udp # SIP 2014-04-09 [RFC3263] +sip 5060/sctp # SIP [RFC4168] +sips 5061/tcp # SIP-TLS 2014-04-09 [RFC3263] +sips 5061/udp # SIP-TLS 2014-04-09 [RFC3263] +sips 5061/sctp # SIP-TLS [RFC4168] na-localise 5062/tcp # Localisation access [Jean_Pierre_Garcia_2] [Jean_Pierre_Garcia_2] 2009-10-28 na-localise 5062/udp # Localisation access [Jean_Pierre_Garcia_2] [Jean_Pierre_Garcia_2] 2009-10-28 csrpc 5063/tcp # centrify secure RPC [Paul_Moore] [Paul_Moore] 2009-10-28 @@ -8442,6 +8450,7 @@ actifio-c2c 5103/tcp # Actifio C2C [Ravi_Kollipara] [Ravi_Kollipara] 2010-06-18 tinymessage 5104/udp # TinyMessage [Josip_Medved] [Josip_Medved] 2010-10-20 hughes-ap 5105/udp # Hughes Association Protocol [Varun_Santosh] [Varun_Santosh] 2010-10-20 +actifioudsagent 5106/tcp # Actifio UDS Agent [Actifio] [Madhav_Mutalik] 2014-06-05 taep-as-svc 5111/tcp # TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05 taep-as-svc 5111/udp # TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05 pm-cmdsvr 5112/tcp # PeerMe Msg Cmd Service [Marcos_Della] [Marcos_Della] 2005-08 @@ -8480,7 +8489,7 @@ rugameonline 5156/tcp # Russian Online Game [Andrey_Mohov] [Andrey_Mohov] 2010-08-17 mediat 5157/tcp # Mediat Remote Object Exchange [Oliver_Anan] [Oliver_Anan] 2010-09-02 snmpssh 5161/tcp # SNMP over SSH Transport Model [RFC5592] -snmpssh-trap 5162/tcp # SNMP Notification over SSH Transport Model [RFC5592] +snmpssh-trap 5162/tcp # SNMP Notification over SSH Transport Model [RFC5592] Known Unauthorized Use on port 5162 sbackup 5163/tcp # Shadow Backup [Glenn_Allen] [Glenn_Allen] 2009-08-05 vpa 5164/tcp # Virtual Protocol Adapter [Douglas_Goodall] [Douglas_Goodall] 2009-08-05 vpa-disc 5164/udp # Virtual Protocol Adapter Discovery [Douglas_Goodall] [Douglas_Goodall] 2009-08-05 @@ -8494,6 +8503,7 @@ scte104 5167/udp # SCTE104 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 scte30 5168/tcp # SCTE30 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 scte30 5168/udp # SCTE30 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 +pcoip-mgmt 5172/tcp # PC over IP Endpoint Management [Teradici_2] [Paul_Helter] 2014-04-28 aol 5190/tcp # America-Online [Marty_Lyons] [Marty_Lyons] aol 5190/udp # America-Online [Marty_Lyons] [Marty_Lyons] aol-1 5191/tcp # AmericaOnline1 [Bruce_Mackey] [Bruce_Mackey] @@ -8765,8 +8775,8 @@ sgi-esphttp 5554/udp # SGI ESP HTTP [Vladimir_Legalov] [Vladimir_Legalov] personal-agent 5555/tcp # Personal Agent [Jackie_Wu] [Jackie_Wu] Known UNAUTHORIZED USEs on port 5555 personal-agent 5555/udp # Personal Agent [Jackie_Wu] [Jackie_Wu] Known UNAUTHORIZED USEs on port 5555 -freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 -freeciv 5556/udp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 +freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 Known Unauthorized Use on port 5556 +freeciv 5556/udp # Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 Known Unauthorized Use on port 5556 farenet 5557/tcp # Sandlab FARENET [Kay_T_Labinsky] [Kay_T_Labinsky] 2010-05-03 westec-connect 5566/tcp # Westec Connect [Jon_Bolen] [Jon_Bolen] 2009-03-18 enc-eps-mc-sec 5567/tcp # EMIT protocol stack multicast/secure transport [Panasonic_Intranet_Panasonic_North_America_PEWLA] [Bryant_Eastham] 2004-11 2012-11-12 @@ -9004,8 +9014,8 @@ consul-insight 5992/udp # Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01 cvsup 5999/tcp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] cvsup 5999/udp # CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] -x11 6000-6063/tcp # X Window System [Stephen_Gildea] [Stephen_Gildea] -x11 6000-6063/udp # X Window System [Stephen_Gildea] [Stephen_Gildea] +x11 6000-6063/tcp # X Window System [Stephen_Gildea] [Stephen_Gildea] Known Unauthorized Use on port 6003 +x11 6000-6063/udp # X Window System [Stephen_Gildea] [Stephen_Gildea] Known Unauthorized Use on port 6003 ndl-ahp-svc 6064/tcp # NDL-AHP-SVC [John_Richmond_2] [John_Richmond_2] ndl-ahp-svc 6064/udp # NDL-AHP-SVC [John_Richmond_2] [John_Richmond_2] winpharaoh 6065/tcp # WinPharaoh [Basil_Lee] [Basil_Lee] @@ -9028,6 +9038,7 @@ dpm-acm 6075/tcp # Microsoft DPM Access Control Manager [Prabu_Ambravaneswara] [Prabu_Ambravaneswara] 2009-10-29 msft-dpm-cert 6076/tcp # Microsoft DPM WCF Certificates [Microsoft_Corporation] [Prateek_Sharma] 2011-08-04 iconstructsrv 6077/tcp # iConstruct Server [iConstruct_Aus_Pty_Ltd] [Afshin_Jafari] 2012-12-21 +geneve 6081/udp # Generic Network Virtualization Encapsulation (Geneve) [Jesse_Gross] [Jesse_Gross] 2014-03-27 [draft-gross-geneve-00] p25cai 6082/udp # APCO Project 25 Common Air Interface - UDP encapsulation [APCO_Project] [APCO_Project] 2011-05-13 miami-bcast 6083/udp # telecomsoftware miami broadcast [Peter_Steiner] [Peter_Steiner] 2011-02-22 reload-config 6084/tcp # Peer to Peer Infrastructure Configuration [IESG] [IETF_Chair] 2009-01-29 2013-03-26 [RFC6940] @@ -9040,8 +9051,8 @@ doglms 6088/tcp # SuperDog License Manager [SafeNet] [Rob_Tao] 2012-07-26 doglms-notify 6088/udp # SuperDog License Manager Notifier [SafeNet] [Rob_Tao] 2012-07-26 raxa-mgmt 6099/tcp # RAXA Management [Sukanta_Ganguly] [Sukanta_Ganguly] -synchronet-db 6100/tcp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] -synchronet-db 6100/udp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] +synchronet-db 6100/tcp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] Known Unauthorized Use on port 6100 +synchronet-db 6100/udp # SynchroNet-db [Arne_Haugland] [Arne_Haugland] Known Unauthorized Use on port 6100 synchronet-rtc 6101/tcp # SynchroNet-rtc [Arne_Haugland] [Arne_Haugland] synchronet-rtc 6101/udp # SynchroNet-rtc [Arne_Haugland] [Arne_Haugland] synchronet-upd 6102/tcp # SynchroNet-upd [Arne_Haugland] [Arne_Haugland] @@ -9111,8 +9122,8 @@ patrol-coll 6162/udp # PATROL Collector [Portnoy_Boxman] [Portnoy_Boxman] 2005-01 pscribe 6163/tcp # Precision Scribe Cnx Port [Robert_W_Hodges] [Robert_W_Hodges] 2005-01 pscribe 6163/udp # Precision Scribe Cnx Port [Robert_W_Hodges] [Robert_W_Hodges] 2005-01 -lm-x 6200/tcp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 -lm-x 6200/udp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 +lm-x 6200/tcp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 Known Unauthorized Use on port 6200 +lm-x 6200/udp # LM-X License Manager by X-Formation [Henrik_Goldman] [Henrik_Goldman] 2006-10 Known Unauthorized Use on port 6200 thermo-calc 6201/udp # Management of service nodes in a processing grid for thermodynamic calculations [Thermo-Calc_Software] [Thomas_Revesz] 2012-06-28 radmind 6222/tcp # Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 radmind 6222/udp # Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 @@ -9190,6 +9201,7 @@ nim-wan 6421/tcp # NIM_WAN [Rik_Ditter] [Rik_Ditter] 2006-02 nim-wan 6421/udp # NIM_WAN [Rik_Ditter] [Rik_Ditter] 2006-02 pgbouncer 6432/tcp # PgBouncer [Marko_Kreen] [Marko_Kreen] 2009-02-13 +tarp 6442/tcp # Transitory Application Request Protocol [Chris_Peel_2] [Chris_Peel_2] 2014-05-16 sun-sr-https 6443/tcp # Service Registry Default HTTPS Domain [Paul_Sterk] [Paul_Sterk] 2006-03 sun-sr-https 6443/udp # Service Registry Default HTTPS Domain [Paul_Sterk] [Paul_Sterk] 2006-03 sge-qmaster 6444/tcp # Grid Engine Qmaster ServiceIANA assigned this well-formed service name as a replacement for "sge_qmaster". [Andreas_Haas] [Andreas_Haas] 2006-08 @@ -9230,8 +9242,8 @@ sun-sr-admin 6489/udp # Service Registry Default Admin Domain [Paul_Sterk] [Paul_Sterk] 2006-03 boks 6500/tcp # BoKS Master [Magnus_Nystrom] [Magnus_Nystrom] boks 6500/udp # BoKS Master [Magnus_Nystrom] [Magnus_Nystrom] -boks-servc 6501/tcp # BoKS ServcIANA assigned this well-formed service name as a replacement for "boks_servc". [Magnus_Nystrom] [Magnus_Nystrom] -boks_servc 6501/tcp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] This entry is an alias to "boks-servc".This entry is now historic, not usable for use with manycommon service discovery mechanisms. +boks-servc 6501/tcp # BoKS ServcIANA assigned this well-formed service name as a replacement for "boks_servc". [Magnus_Nystrom] [Magnus_Nystrom] Known Unauthorized Use on port 6501 +boks_servc 6501/tcp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] Known Unauthorized Use on port 6501 This entry is an alias to "boks-servc".This entry is now historic, not usable for use with manycommon service discovery mechanisms. boks-servc 6501/udp # BoKS ServcIANA assigned this well-formed service name as a replacement for "boks_servc". [Magnus_Nystrom] [Magnus_Nystrom] boks_servc 6501/udp # BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] This entry is an alias to "boks-servc".This entry is now historic, not usable for use with manycommon service discovery mechanisms. boks-servm 6502/tcp # BoKS ServmIANA assigned this well-formed service name as a replacement for "boks_servm". [Magnus_Nystrom] [Magnus_Nystrom] @@ -9439,16 +9451,16 @@ iatp-normalpri 6999/udp # IATP-normalPri [John_Murphy] [John_Murphy] afs3-fileserver 7000/tcp # file server itself afs3-fileserver 7000/udp # file server itself -afs3-callback 7001/tcp # callbacks to cache managers -afs3-callback 7001/udp # callbacks to cache managers -afs3-prserver 7002/tcp # users & groups database -afs3-prserver 7002/udp # users & groups database +afs3-callback 7001/tcp # callbacks to cache managers Known Unauthorized Use on port 7001 +afs3-callback 7001/udp # callbacks to cache managers Known Unauthorized Use on port 7001 +afs3-prserver 7002/tcp # users & groups database Known Unauthorized Use on port 7002 +afs3-prserver 7002/udp # users & groups database Known Unauthorized Use on port 7002 afs3-vlserver 7003/tcp # volume location database afs3-vlserver 7003/udp # volume location database afs3-kaserver 7004/tcp # AFS/Kerberos authentication service afs3-kaserver 7004/udp # AFS/Kerberos authentication service -afs3-volser 7005/tcp # volume managment server -afs3-volser 7005/udp # volume managment server +afs3-volser 7005/tcp # volume managment server Known Unauthorized Use on port 7005 +afs3-volser 7005/udp # volume managment server Known Unauthorized Use on port 7005 afs3-errors 7006/tcp # error interpretation service afs3-errors 7006/udp # error interpretation service afs3-bos 7007/tcp # basic overseer process @@ -9612,6 +9624,7 @@ faximum 7437/udp # Faximum [George_Pajari] [George_Pajari] oracleas-https 7443/tcp # Oracle Application Server HTTPS [David_McMarlin] [David_McMarlin] 2006-08 oracleas-https 7443/udp # Oracle Application Server HTTPS [David_McMarlin] [David_McMarlin] 2006-08 +sttunnel 7471/tcp # Stateless Transport Tunneling Protocol [Bruce_Davie_3] [Bruce_Davie_3] 2014-04-28 rise 7473/tcp # Rise: The Vieneo Province [Jason_Reskin] [Jason_Reskin] 2007-03 rise 7473/udp # Rise: The Vieneo Province [Jason_Reskin] [Jason_Reskin] 2007-03 neo4j 7474/tcp # Neo4j Graph Database [Neo_Technology_Inc] [Julian_Simpson] 2013-02-08 @@ -9619,8 +9632,8 @@ telops-lmd 7491/udp # telops-lmd [David_Spencer] [David_Spencer] silhouette 7500/tcp # Silhouette User [Anthony_Payne] [Anthony_Payne] 2004-02 silhouette 7500/udp # Silhouette User [Anthony_Payne] [Anthony_Payne] 2004-02 -ovbus 7501/tcp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] -ovbus 7501/udp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] +ovbus 7501/tcp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] Known Unauthorized Use on port 7501 +ovbus 7501/udp # HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] Known Unauthorized Use on port 7501 adcp 7508/tcp # Automation Device Configuration Protocol [Festo_AG] [Joerg_Ullmann] 2011-05-27 2012-07-26 acplt 7509/tcp # ACPLT - process automation service [Chair_for_Process_Control_Engineering] [Ulrich_Epple] 2010-12-07 2012-08-07 ovhpas 7510/tcp # HP OpenView Application Server [Jeff_Conrad] [Jeff_Conrad] @@ -9714,20 +9727,20 @@ raqmon-pdu 7744/udp # RAQMON PDU [RFC4712] prgp 7747/tcp # Put/Run/Get Protocol [Jayasooriah] [Jayasooriah] 2008-02-22 prgp 7747/udp # Put/Run/Get Protocol [Jayasooriah] [Jayasooriah] 2008-02-22 -cbt 7777/tcp # cbt [Tony_Ballardie] [Tony_Ballardie] -cbt 7777/udp # cbt [Tony_Ballardie] [Tony_Ballardie] +cbt 7777/tcp # cbt [Tony_Ballardie] [Tony_Ballardie] Known Unauthorized Use on port 7777 +cbt 7777/udp # cbt [Tony_Ballardie] [Tony_Ballardie] Known Unauthorized Use on port 7777 interwise 7778/tcp # Interwise [Joseph_Gray] [Joseph_Gray] interwise 7778/udp # Interwise [Joseph_Gray] [Joseph_Gray] vstat 7779/tcp # VSTAT [Vinh_Nguyn] [Vinh_Nguyn] vstat 7779/udp # VSTAT [Vinh_Nguyn] [Vinh_Nguyn] accu-lmgr 7781/tcp # accu-lmgr [Moises_E_Hernandez] [Moises_E_Hernandez] accu-lmgr 7781/udp # accu-lmgr [Moises_E_Hernandez] [Moises_E_Hernandez] -minivend 7786/tcp # MINIVEND [Mike_Heins] [Mike_Heins] -minivend 7786/udp # MINIVEND [Mike_Heins] [Mike_Heins] -popup-reminders 7787/tcp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 -popup-reminders 7787/udp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 -office-tools 7789/tcp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 -office-tools 7789/udp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 +minivend 7786/tcp # MINIVEND [Mike_Heins] [Mike_Heins] Known Unauthorized Use on port 7786 +minivend 7786/udp # MINIVEND [Mike_Heins] [Mike_Heins] Known Unauthorized Use on port 7786 +popup-reminders 7787/tcp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7787 +popup-reminders 7787/udp # Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7787 +office-tools 7789/tcp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7789 +office-tools 7789/udp # Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 Known Unauthorized Use on port 7789 q3ade 7794/tcp # Q3ADE Cluster Service [Uffe_Harksen] [Uffe_Harksen] 2005-08 q3ade 7794/udp # Q3ADE Cluster Service [Uffe_Harksen] [Uffe_Harksen] 2005-08 pnet-conn 7797/tcp # Propel Connector port @@ -9771,6 +9784,8 @@ t2-drm 7932/udp # Tier 2 Data Resource Manager [Peter_Carlson] [Peter_Carlson] t2-brm 7933/tcp # Tier 2 Business Rules Manager [Peter_Carlson] [Peter_Carlson] t2-brm 7933/udp # Tier 2 Business Rules Manager [Peter_Carlson] [Peter_Carlson] +generalsync 7962/tcp # Encrypted, extendable, general-purpose synchronization protocol [Dirk_Steinmetz] [Dirk_Steinmetz] 2014-04-17 +generalsync 7962/udp # Encrypted, extendable, general-purpose synchronization protocol [Dirk_Steinmetz] [Dirk_Steinmetz] 2014-04-17 supercell 7967/tcp # Supercell [Kevin_Nakagawa] [Kevin_Nakagawa] supercell 7967/udp # Supercell [Kevin_Nakagawa] [Kevin_Nakagawa] micromuse-ncps 7979/tcp # Micromuse-ncps [Hing_Wing_To] [Hing_Wing_To] @@ -9786,8 +9801,8 @@ irdmi2 7999/udp # iRDMI2 irdmi 8000/tcp # iRDMI [Gil_Shafriri] [Gil_Shafriri] irdmi 8000/udp # iRDMI [Gil_Shafriri] [Gil_Shafriri] -vcom-tunnel 8001/tcp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] -vcom-tunnel 8001/udp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] +vcom-tunnel 8001/tcp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] Known Unauthorized Use on port 8001 +vcom-tunnel 8001/udp # VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] Known Unauthorized Use on port 8001 teradataordbms 8002/tcp # Teradata ORDBMS [Curt_Ellmann] [Curt_Ellmann] teradataordbms 8002/udp # Teradata ORDBMS [Curt_Ellmann] [Curt_Ellmann] mcreport 8003/tcp # Mulberry Connect Reporting Service [Dave_Stoneham] [Dave_Stoneham] 2008-03-10 @@ -10058,12 +10073,12 @@ galaxy4d 8881/tcp # Galaxy4D Online Game Engine [Galaxy4D] [Olivier_St-Laurent] 2012-06-18 secure-mqtt 8883/tcp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 secure-mqtt 8883/udp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 -ddi-tcp-1 8888/tcp # NewsEDGE server TCP (TCP 1) [Fred_Yao] [Fred_Yao] -ddi-udp-1 8888/udp # NewsEDGE server UDP (UDP 1) [Fred_Yao] [Fred_Yao] -ddi-tcp-2 8889/tcp # Desktop Data TCP 1 [Fred_Yao] [Fred_Yao] -ddi-udp-2 8889/udp # NewsEDGE server broadcast [Fred_Yao] [Fred_Yao] -ddi-tcp-3 8890/tcp # Desktop Data TCP 2 [Fred_Yao] [Fred_Yao] -ddi-udp-3 8890/udp # NewsEDGE client broadcast [Fred_Yao] [Fred_Yao] +ddi-tcp-1 8888/tcp # NewsEDGE server TCP (TCP 1) [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8888 +ddi-udp-1 8888/udp # NewsEDGE server UDP (UDP 1) [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8888 +ddi-tcp-2 8889/tcp # Desktop Data TCP 1 [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8889 +ddi-udp-2 8889/udp # NewsEDGE server broadcast [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8889 +ddi-tcp-3 8890/tcp # Desktop Data TCP 2 [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8890 +ddi-udp-3 8890/udp # NewsEDGE client broadcast [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8890 ddi-tcp-4 8891/tcp # Desktop Data TCP 3: NESS application [Fred_Yao] [Fred_Yao] ddi-udp-4 8891/udp # Desktop Data UDP 3: NESS application [Fred_Yao] [Fred_Yao] ddi-tcp-5 8892/tcp # Desktop Data TCP 4: FARM product [Fred_Yao] [Fred_Yao] @@ -10101,8 +10116,8 @@ bctp 8999/udp # Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02 cslistener 9000/tcp # CSlistener [David_Jones] [David_Jones] cslistener 9000/udp # CSlistener [David_Jones] [David_Jones] -etlservicemgr 9001/tcp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 -etlservicemgr 9001/udp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 +etlservicemgr 9001/tcp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 Known Unauthorized Use on port 9001 +etlservicemgr 9001/udp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 Known Unauthorized Use on port 9001 dynamid 9002/tcp # DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03 dynamid 9002/udp # DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03 ogs-client 9007/udp # Open Grid Services Client [Gareth_Nelson_2] [Gareth_Nelson_2] 2008-08-22 @@ -10497,6 +10512,7 @@ blocks 10288/tcp # Blocks [Carl_Malamud] [Carl_Malamud] blocks 10288/udp # Blocks [Carl_Malamud] [Carl_Malamud] cosir 10321/tcp # Computer Op System Information Report [Kevin_C_Barber] [Kevin_C_Barber] 2009-01-13 +bngsync 10439/udp # BalanceNG session table synchronization protocol [Inlab_Software_GmbH] [Thomas_G._Obermair] 2014-05-02 hip-nat-t 10500/udp # HIP NAT-Traversal [Ari_Keranen] [Ari_Keranen] [RFC5770] MOS-lower 10540/tcp # MOS Media Object Metadata Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 MOS-lower 10540/udp # MOS Media Object Metadata Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 @@ -10572,6 +10588,7 @@ atm-uhas 11367/udp # ATM UHAS [Todd_Barker] [Todd_Barker] hkp 11371/tcp # OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 hkp 11371/udp # OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 +lsdp 11430/udp # Lenbrook Service Discovery Protocol [Lenbrook_Industries_Limited] [Kevin_Groeneveld] 2014-03-27 asgcypresstcps 11489/tcp # ASG Cypress Secure Only [David_Luxford] [David_Luxford] 2010-07-01 tempest-port 11600/tcp # Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] tempest-port 11600/udp # Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] @@ -10727,7 +10744,7 @@ ptp 15740/udp # Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> 2ping 15998/udp # 2ping Bi-Directional Ping Service [Ryan_Finnie] [Ryan_Finnie] 2010-10-06 programmar 15999/tcp # ProGrammar Enterprise [Norman_Wilson] [Norman_Wilson] 2010-10-06 -fmsas 16000/tcp # Administration Server Access [Mark_Davidson] [Mark_Davidson] 2010-10-06 +fmsas 16000/tcp # Administration Server Access [Mark_Davidson] [Mark_Davidson] 2010-10-06 Known Unauthorized Use on port 16000 fmsascon 16001/tcp # Administration Server Connector [Mark_Davidson] [Mark_Davidson] 2010-10-06 gsms 16002/tcp # GoodSync Mediation Service [Vadim_Maslov] [Vadim_Maslov] 2010-10-06 alfin 16003/udp # Automation and Control by REGULACE.ORG [Ing_Tomas_Halabala] [Ing_Tomas_Halabala] 2010-10-06 @@ -10775,6 +10792,8 @@ soundsvirtual 17185/udp # Sounds Virtual [Richard_Snider] [Richard_Snider] chipper 17219/tcp # Chipper [Ronald_Jimmink] [Ronald_Jimmink] chipper 17219/udp # Chipper [Ronald_Jimmink] [Ronald_Jimmink] +avtp 17220/tcp # IEEE 1722 Transport Protocol for Time Sensitive Applications [Transport_Protocol_for_Time-Sensitive_Networking_TG] [Ashley_Butterworth] 2014-03-07 +avtp 17220/udp # IEEE 1722 Transport Protocol for Time Sensitive Applications [Transport_Protocol_for_Time-Sensitive_Networking_TG] [Ashley_Butterworth] 2014-03-07 avdecc 17221/tcp # IEEE 1722.1 AVB Discovery, Enumeration, Connection management, and Control [IEEE_1722_1] [Jeffrey_Daniel_Koftinoff] 2011-11-01 avdecc 17221/udp # IEEE 1722.1 AVB Discovery, Enumeration, Connection management, and Control [IEEE_1722_1] [Jeffrey_Daniel_Koftinoff] 2011-11-01 cpsp 17222/udp # Control Plane Synchronization Protocol (SPSP) [Randall_Stewart_2] [Randall_Stewart_2] 2011-11-10 @@ -10784,6 +10803,7 @@ ssh-mgmt 17235/udp # SSH Tectia Manager [Ville_Laurikari] [Ville_Laurikari] 2005-08 db-lsp 17500/tcp # Dropbox LanSync Protocol [Paul_Bohm] [Paul_Bohm] 2010-01-21 db-lsp-disc 17500/udp # Dropbox LanSync Discovery [Paul_Bohm] [Paul_Bohm] 2010-01-21 +ailith 17555/tcp # Ailith management of routers [Thomas_Boje] [Thomas_Boje] 2014-03-27 ea 17729/tcp # Eclipse Aviation [William_Schmidt] [William_Schmidt] 2006-03 ea 17729/udp # Eclipse Aviation [William_Schmidt] [William_Schmidt] 2006-03 zep 17754/tcp # Encap. ZigBee Packets [Fred_Fierling] [Fred_Fierling] 2006-02 @@ -10831,6 +10851,8 @@ apc-necmp 18888/udp # APCNECMP [Michael_Yip] [Michael_Yip] igrid 19000/tcp # iGrid Server [Massimo_Cafaro] [Massimo_Cafaro] 2004-11 igrid 19000/udp # iGrid Server [Massimo_Cafaro] [Massimo_Cafaro] 2004-11 +scintilla 19007/tcp # Scintilla protocol for device services [Veejansh_Inc] [Chirag_Patel] 2014-03-04 +scintilla 19007/udp # Scintilla protocol for device services [Veejansh_Inc] [Chirag_Patel] 2014-03-04 j-link 19020/tcp # J-Link TCP/IP Protocol [SEGGER] [SEGGER] opsec-uaa 19191/tcp # OPSEC UAA [Reuven_Harrison] [Reuven_Harrison] opsec-uaa 19191/udp # OPSEC UAA [Reuven_Harrison] [Reuven_Harrison] @@ -10929,6 +10951,7 @@ optohost004 22005/udp # Opto Host Port 5 [Doug_Leany] [Doug_Leany] 2006-09 dcap 22125/tcp # dCache Access Protocol [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2009-03-10 gsidcap 22128/tcp # GSI dCache Access Protocol [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2009-03-10 +easyengine 22222/tcp # EasyEngine is CLI tool to manage WordPress Sites on Nginx server [rtCamp_Solutions_Private_Limited] [Rahul_Bansal] 2014-03-10 wnn6 22273/tcp # wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] wnn6 22273/udp # wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] cis 22305/tcp # CompactIS Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16 @@ -11110,6 +11133,7 @@ ovobs 30999/udp # OpenView Service Desk Client [Service_Desk_Product] [Service_Desk_Product] 2006-05 autotrac-acp 31020/tcp # Autotrac ACP 245 [Roberto_Jorge_Dino] [Roberto_Jorge_Dino] yawn 31029/udp # YaWN - Yet Another Windows Notifier [David_Spivey] [David_Spivey] 2010-08-30 +pace-licensed 31400/tcp # PACE license server [PACE_Anti-Piracy] [Allen_Cronce] 2014-04-28 xqosd 31416/tcp # XQoS network monitor [Joe_Elliott] [Joe_Elliott] 2002-06 xqosd 31416/udp # XQoS network monitor [Joe_Elliott] [Joe_Elliott] 2002-06 tetrinet 31457/tcp # TetriNET Protocol [Emmanuel_Bourg] [Emmanuel_Bourg] 2004-11 @@ -11220,6 +11244,8 @@ gdrive-sync 37483/tcp # Google Drive Sync [Google] [Fil_Zembowicz] 2013-02-01 unisys-eportal 37654/tcp # Unisys ClearPath ePortal [Sung_U_Ro] [Sung_U_Ro] 2006-01 unisys-eportal 37654/udp # Unisys ClearPath ePortal [Sung_U_Ro] [Sung_U_Ro] 2006-01 +ivs-database 38000/tcp # InfoVista Server Database [InfoVista] [Sebastien_Bouchex_Bellomie] 2014-05-23 +ivs-insertion 38001/tcp # InfoVista Server Insertion [InfoVista] [Sebastien_Bouchex_Bellomie] 2014-05-23 galaxy7-data 38201/tcp # Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 galaxy7-data 38201/udp # Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 fairview 38202/tcp # Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, DevStat=<device status> @@ -11266,8 +11292,8 @@ noit-transport 43191/tcp # Reconnoiter Agent Data Transport [Theo_Schlossnagle] [Theo_Schlossnagle] 2009-05-19 shaperai 43210/tcp # Shaper Automation Server Management [Shaper_Automation] [Yohann_Sulaiman] 2012-06-22 shaperai-disc 43210/udp # Shaper Automation Server Management Discovery [Shaper_Automation] [Yohann_Sulaiman] 2012-06-22 -eq3-update 43439/tcp # EQ3 firmware update [eQ-3_AG] [Falk_Werner] 2012-02-10 -eq3-config 43439/udp # EQ3 discovery and configuration [eQ-3_AG] [Falk_Werner] 2012-02-10 +eq3-update 43439/tcp # EQ3 firmware update [eQ-3_Entwicklung_GmbH] [Tido_de_Vries] 2012-02-10 2014-05-09 +eq3-config 43439/udp # EQ3 discovery and configuration [eQ-3_Entwicklung_GmbH] [Tido_de_Vries] 2012-02-10 2014-05-09 ew-mgmt 43440/tcp # Cisco EnergyWise Management ew-disc-cmd 43440/udp # Cisco EnergyWise Discovery and Command Flooding [John_Parello] [John_Parello] 2009-05-19 ciscocsdb 43441/tcp # Cisco NetMgmt DB Ports [Cisco_Systems] [Cisco_Systems] 2005-11
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/tools/checkhf.pl ^
@@ -563,6 +563,7 @@ ##print "==> $title\n"; for my $k (sort keys %{$href}) { - printf "%-40.40s %5.5s %s\n", $title, $href->{$k} // "undef", $k; + my $h = defined($href->{$k}) ? $href->{$k} : "undef"; + printf "%-40.40s %5.5s %s\n", $title, $h, $k; } }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/tools/make-sminmpec.pl ^
@@ -2,8 +2,6 @@ # create the sminmpec.c file from # http://www.iana.org/assignments/enterprise-numbers # -# $Id$ -# # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 2004 Gerald Combs @@ -21,16 +19,23 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + use strict; +use File::Spec; + +my ($vol, $script_dir, $file) = File::Spec->splitpath( __FILE__ ); +my $epan_dir = File::Spec->catpath($vol, $script_dir, '../epan'); +chdir($epan_dir) \|\| die("Can't find $epan_dir"); my $in = shift; $in = "http://www.iana.org/assignments/enterprise-numbers" unless(defined $in); my @in_lines; +my $revision = '2014-04-27'; -my $revision = '$Revision$'; -if ($revision !~ /[0-9]/ ) { $revision = "unknown"; } +my $min_entries = 100; +my $smi_total = 0; if($in =~ m/^http:/i) { eval "require LWP::UserAgent;"; @@ -44,13 +49,6 @@ my $request = HTTP::Request->new(GET => $in); - - if (-f "enterprise-numbers") { - my $mtime; - (undef,undef,undef,undef,undef,undef,undef,undef,undef,$mtime,undef,undef,undef) = stat("enterprise-numbers"); - $request->if_modified_since( $mtime ); - } - my $result = $agent->request($request); if ($result->code eq 200) { @@ -80,8 +78,6 @@ } -open OUT, "> sminmpec.c"; - my $body = ''; my $code; my $prev_code = -1; ## Assumption: First code in enterprise file is 0; @@ -112,20 +108,28 @@ } $prev_code = $code; $body .= " { $code, \"$name\" },\n"; + $smi_total++; } } +# If this happens check what IANA is serving. +# XXX We already overwrote enterprise-numbers above. +if ($smi_total < $smi_total) { die "Too few SMI entries ($smi_total)\n"; } + +open OUT, "> sminmpec.c"; + print OUT <<"_SMINMPEC"; /* - * \$Id\$ - * * THIS FILE IS AUTOGENERATED, DO NOT EDIT * generated from http://www.iana.org/assignments/enterprise-numbers - * run "tools/make-sminmspec <infile> <outfile>" to regenerate + * run "tools/make-sminmpec.pl <infile> <outfile>" to regenerate + * + * Note 1: "Gaps" in the iana enterprise-numbers list have been "filled in" + * with "(Unknown)" as the name so that direct (indexed) access to + * the list is possible. * - * Note: "Gaps" in the iana enterprise-numbers list have been "filled in" - * with "(Unknown)" as the name so that direct (indexed) access - * to the list is possible. + * Note 2: We should probably parse "enterprise-numbers" at program start + * instead of generating this file. */ #include "config.h"
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/tshark.c ^
@@ -1692,7 +1692,7 @@ /* When capturing, we only support writing pcap or pcap-ng format. / if (out_file_type != WTAP_FILE_PCAP && out_file_type != WTAP_FILE_PCAPNG) { - cmdarg_err("Live captures can only be saved in libpcap format."); + cmdarg_err("Live captures can only be saved in pcap or pcapng format."); return 1; } if (global_capture_opts.multi_files_on) { @@ -1727,6 +1727,7 @@ cmdarg_err("Display filters aren't supported when capturing and saving the captured packets."); return 1; } + global_capture_opts.use_pcapng = (out_file_type == WTAP_FILE_PCAPNG) ? TRUE : FALSE; } else { / They didn't specify a "-w" flag, so we won't be saving to a capture file. Check for options that only make sense if
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/gtk/follow_ssl.c ^
@@ -230,7 +230,7 @@ struct e_in6_addr ipaddr; memcpy(&ipaddr, stats.ip_address[0], 16); hostname0 = get_hostname6(&ipaddr); - memcpy(&ipaddr, stats.ip_address[0], 16); + memcpy(&ipaddr, stats.ip_address[1], 16); hostname1 = get_hostname6(&ipaddr); } else { guint32 ipaddr; @@ -248,7 +248,9 @@ /* Both Stream Directions */ both_directions_string = g_strdup_printf("Entire conversation (%u bytes)", follow_info->bytes_written[0] + follow_info->bytes_written[1]); - if(follow_info->client_port == stats.port[0]) { + if ((follow_info->client_port == stats.port[0]) && + ((stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 16) == 0)) \|\| + (!stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 4) == 0)))) { server_to_client_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0,
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/gtk/follow_tcp.c ^
@@ -268,7 +268,9 @@ port1 = get_tcp_port(stats.port[1]); /* Host 0 --> Host 1 / - if(sc.src_port == stats.port[0]) { + if ((sc.src_port == stats.port[0]) && + ((stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[0], 16) == 0)) \|\| + (!stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[0], 4) == 0)))) { server_to_client_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0, @@ -283,7 +285,9 @@ } / Host 1 --> Host 0 */ - if(sc.src_port == stats.port[1]) { + if ((sc.src_port == stats.port[1]) && + ((stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[1], 16) == 0)) \|\| + (!stats.is_ipv6 && (memcmp(sc.src_addr, stats.ip_address[1], 4) == 0)))) { client_to_server_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0,
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/gtk/follow_udp.c ^
@@ -179,7 +179,7 @@ struct e_in6_addr ipaddr; memcpy(&ipaddr, stats.ip_address[0], 16); hostname0 = get_hostname6(&ipaddr); - memcpy(&ipaddr, stats.ip_address[0], 16); + memcpy(&ipaddr, stats.ip_address[1], 16); hostname1 = get_hostname6(&ipaddr); } else { guint32 ipaddr; @@ -197,7 +197,9 @@ /* Both Stream Directions */ both_directions_string = g_strdup_printf("Entire conversation (%u bytes)", follow_info->bytes_written[0] + follow_info->bytes_written[1]); - if(follow_info->client_port == stats.port[0]) { + if ((follow_info->client_port == stats.port[0]) && + ((stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 16) == 0)) \|\| + (!stats.is_ipv6 && (memcmp(follow_info->client_ip.data, stats.ip_address[0], 4) == 0)))) { server_to_client_string = g_strdup_printf("%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)", hostname0, port0,
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/gtk/graph_analysis.c ^
@@ -67,8 +67,6 @@ #include "ui/gtk/old-gtk-compat.h" -#include "../../image/voip_bg.xpm" - /***************************************************************************/ #define MAX_LABEL 50 @@ -628,6 +626,8 @@ GdkRGBA grey_color0 = {0.3945, 0.3945, 0.3945, 1.0}; GdkRGBA grey_color1 = {0.1484, 0.1484, 0.1484, 1.0}; + GdkRGBA bg_color = {0.9137, 0.8901, 0.8705, 1.0}; + static GdkRGBA background_color[MAX_NUM_COL_CONV+1] = { / Red, Green, Blue Alpha / {0.0039, 0.0039, 1.0000, 1.0}, @@ -643,9 +643,6 @@ {0.8281, 0.8281, 0.8281, 1.0} }; - / XXX can't we just set the background color ? / - GdkPixbuf bg_pixbuf; - /* Dashed line pattern / static const double dashed1[] = {5.0, 4.0}; static int len1 = sizeof(dashed1) / sizeof(dashed1[0]); @@ -656,7 +653,6 @@ return; } - bg_pixbuf = gdk_pixbuf_new_from_xpm_data(voip_bg_xpm); time_str = (gchar )g_malloc(COL_MAX_LEN); user_data->dlg.needs_redraw = FALSE; @@ -804,24 +800,21 @@ #if GTK_CHECK_VERSION(2,22,0) /* Paint time title background / cr = cairo_create (user_data->dlg.surface_time); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); / Paint main title background / cr = cairo_create (user_data->dlg.surface_main); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); / Paint main comment background / cr = cairo_create (user_data->dlg.surface_comments); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); @@ -829,8 +822,7 @@ / Paint time title background / if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_time) ) { cr = gdk_cairo_create (user_data->dlg.pixmap_time); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_time_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); @@ -839,8 +831,7 @@ / Paint main title background / if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_main) ) { cr = gdk_cairo_create (user_data->dlg.pixmap_main); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr); @@ -849,8 +840,7 @@ / Paint main comment background */ if ( GDK_IS_DRAWABLE(user_data->dlg.pixmap_comments) ) { cr = gdk_cairo_create (user_data->dlg.pixmap_comments); - gdk_cairo_set_source_pixbuf (cr, bg_pixbuf, 0, 0); - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, 0, draw_area_comments_alloc.width, top_y_border); cairo_fill (cr); cairo_destroy (cr);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/gtk/gsm_map_summary.c ^
@@ -81,6 +81,10 @@ int tot_invokes, tot_rr; double tot_invokes_size, tot_rr_size; + if (cfile.state == FILE_CLOSED) { + return; + } + /* initialize the tally */ summary_fill_in(&cfile, &summary);
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/gtk/main.c ^
@@ -666,8 +666,9 @@ break; case COPY_SELECTED_VALUE: if (cfile.edt !=0 ) { - g_string_append(gtk_text_str, - get_node_field_value(cfile.finfo_selected, cfile.edt)); + gchar* field_str = get_node_field_value(cfile.finfo_selected, cfile.edt); + g_string_append(gtk_text_str, field_str); + g_free(field_str); } break; default:
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ui/qt/main_window_slots.cpp ^
@@ -1243,7 +1243,9 @@ break; case CopySelectedValue: if (cap_file_->edt != 0) { - clip.append(get_node_field_value(cap_file_->finfo_selected, cap_file_->edt)); + gchar* field_str = get_node_field_value(cap_file_->finfo_selected, cap_file_->edt); + clip.append(field_str); + g_free(field_str); } break; }
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/version.h ^
@@ -1,2 +1,2 @@ -#define GITVERSION "v1.10.6" +#define GITVERSION "v1.10.8-2-g52a5244" #define GITBRANCH "master-1.10"
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/wiretap/Makefile.am ^
@@ -30,7 +30,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:6:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:8:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/wiretap/Makefile.in ^
@@ -647,7 +647,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:6:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:8:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS = -DWS_BUILD_DLL $(am__append_1) AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/wiretap/pcapng.c ^
@@ -1037,12 +1037,6 @@ } } - if (wblock->data.packet.cap_len > wblock->data.packet.packet_len) { - err = WTAP_ERR_BAD_FILE; - err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than packet_len %u.", - wblock->data.packet.cap_len, wblock->data.packet.packet_len); - return 0; - } if (wblock->data.packet.cap_len > WTAP_MAX_PACKET_SIZE) { err = WTAP_ERR_BAD_FILE; err_info = g_strdup_printf("pcapng_read_packet_block: cap_len %u is larger than WTAP_MAX_PACKET_SIZE %u.",
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/wka.tmpl ^
@@ -92,6 +92,8 @@ 01-80-C2-00-00-12 Loadable-Device 01-80-C2-00-00-14 ISIS-all-level-1-IS's 01-80-C2-00-00-15 ISIS-all-level-2-IS's +01-80-C2-00-00-30/45 OAM-Multicast-DA-Class-1 +01-80-C2-00-00-38/45 OAM-Multicast-DA-Class-2 01-80-C2-00-01-00 FDDI-RMT-Directed-Beacon 01-80-C2-00-01-10 FDDI-status-report-frame 01-DD-00-FF-FF-FF Ungermann-Bass-boot-me-requests
[-] [+]	Changed	wireshark-1.10.8.tar.bz2/ws_symbol_export.h ^
@@ -51,33 +51,96 @@ /* Originally copied from GCC Wiki at http://gcc.gnu.org/wiki/Visibility / #if defined _WIN32 \|\| defined __CYGWIN__ + / Compiling for Windows, so we use the Windows DLL declarations. / #ifdef WS_BUILD_DLL + / + * Building a DLL; for all definitions, we want dllexport, and + * (presumably so source from DLL and source from a program using the + * DLL can both include a header that declares APIs and exported data + * for the DLL), for declarations, either dllexport or dllimport will + * work (they mean the same thing for a declaration when building a DLL). + / #ifdef __GNUC__ -#define WS_DLL_PUBLIC __attribute__ ((dllexport)) + / GCC / +#define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((dllexport)) #else / ! __GNUC__ / -#define WS_DLL_PUBLIC __declspec(dllexport) / Note: actually gcc seems to also support this syntax. / + / + * Presumably MSVC. + * Note: actually gcc seems to also support this syntax. + / +#define WS_DLL_PUBLIC_NOEXTERN __declspec(dllexport) #endif / __GNUC__ / - #else + #else / WS_BUILD_DLL / + / + * Building a program; we should only see declarations, not definitions, + * with WS_DLL_PUBLIC, and they all represent APIs or data imported + * from a DLL, so use dllimport. + * + * For functions, export shouldn't be necessary; for data, it might + * be necessary, e.g. if what's declared is an array whose size is + * not given in the declaration. + / #ifdef __GNUC__ -#define WS_DLL_PUBLIC __attribute__ ((dllimport)) + / GCC / +#define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((dllimport)) #elif ! (defined ENABLE_STATIC) / ! __GNUC__ / -#define WS_DLL_PUBLIC __declspec(dllimport) / Note: actually gcc seems to also support this syntax. / + / + * Presumably MSVC, and we're not building all-static. + * Note: actually gcc seems to also support this syntax. + / +#define WS_DLL_PUBLIC_NOEXTERN __declspec(dllimport) #else / ! __GNUC__ && ENABLE_STATIC / -#define WS_DLL_PUBLIC + / + * Presumably MSVC, and we're building all-static, so we're + * not building any DLLs. + / +#define WS_DLL_PUBLIC_NOEXTERN #endif / __GNUC__ / #endif / WS_BUILD_DLL / - #define WS_DLL_PUBLIC_NOEXTERN WS_DLL_PUBLIC + + / + * Symbols in a DLL are not exported unless they're specifically + * flagged as exported, so, for a non-static but non-exported + * symbol, we don't have to do anything. + / #define WS_DLL_LOCAL -#else +#else / defined _WIN32 \|\| defined __CYGWIN__ / + / + * Compiling for UNX, where the dllimport and dllexport stuff + is neither necessary nor supported; just specify the + * visibility if we have a compiler that claims compatibility + * with GCC 4 or later. + / #if __GNUC__ >= 4 -#define WS_DLL_PUBLIC __attribute__ ((visibility ("default"))) extern + / + * Symbols exported from libraries. + / #define WS_DLL_PUBLIC_NOEXTERN __attribute__ ((visibility ("default"))) + + / + * Non-static symbols not exported from libraries. + / #define WS_DLL_LOCAL __attribute__ ((visibility ("hidden"))) #else / ! __GNUC__ >= 4 / - #define WS_DLL_PUBLIC + / + * We have no way to control visibility. + / #define WS_DLL_PUBLIC_NOEXTERN - #define WS_DLL_LOCAL extern + #define WS_DLL_LOCAL #endif / __GNUC__ >= 4 / #endif +/ + * You must use this for exported data declarations; if you use + * WS_DLL_PUBLIC_NOEXTERN, some compilers, such as MSVC++, will complain + * about array definitions with no size. + * + * You must not use this for exported data definitions, as that + * will, for some compilers, cause warnings about items being initialized + * and declared extern. + * + * Either can be used for exported function declarations and definitions. + / +#define WS_DLL_PUBLIC WS_DLL_PUBLIC_NOEXTERN extern + #endif / SYMBOL_EXPORT_H */

Changes of Revision 7