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,894 +1,395 @@ -commit 3ba1968e8445b0019e02271cd7fcf568008b4f75 +commit 4e00be942cb32206efa44ba823fb1f3bdd5ce83e Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 13:51:54 2014 -0800 +Date: Thu Jun 12 12:11:49 2014 -0700 - Add a CVE ID and attribution. + Build 1.8.15. - Change-Id: I5aef30dfab1fa551adf1de3bbb1c16056a3ce0ac - Reviewed-on: https://code.wireshark.org/review/542 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 7987a36747220d03bcfb9fa6cf1e9dc30375d47c -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 12:33:21 2014 -0800 + Change-Id: Ic93910a0090879461a285ab793367b2e9c786e54 - Add wnpa-sec-2014-04. - - Change-Id: I0c6f5a30e746df4f2471a7b93dffd1b22a639a9d - Reviewed-on: https://code.wireshark.org/review/539 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f567435ac7140c96a5de56dbce3d5e7659af4d09 -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> - (cherry picked from commit 34144b8d4da141e8aa9b99221855edc9f4c73ad8) - Reviewed-on: https://code.wireshark.org/review/534 - -commit 3b72014e95aa4d2853a4d701ac25f4b074529105 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Mar 5 17:10:30 2014 -0800 +commit 6d29becdcd80abc4bcbd9db20d542c596b6cce11 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Jun 11 10:51:21 2014 +0200 - Add CVE IDs. + Revert "Revert "Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8940"" - Change-Id: I9a99fb3b4ffef46ef90103032e1a78aa9f8f68c1 - Reviewed-on: https://code.wireshark.org/review/524 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 80bc0476e6c613b438c2b7b36d12c6139a2ed921 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Mar 4 11:08:28 2014 -0800 - - Update the release notes. + This reverts commit c34a63b29e3527a7951d7f49a67113e700b358a5. - Change-Id: Ia939f89cf89c56cbdd26755b98c16fe265bd1dd9 - Reviewed-on: https://code.wireshark.org/review/504 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 3d87b897a43a89beaf576d857e12dde7c5723e91 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 15:03:41 2014 -0800 - - Switch to "rc" instead of "pre" to match our tags. + Revert of commit c34a63b29e3527a7951d7f49a67113e700b358a5 reintroduced the fuzz failure (as one could expect). + Instead let's do the real fix... - Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e - Reviewed-on: https://code.wireshark.org/review/489 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit 31187b1c5d863e2338f0050ff897512b92ebf774) - Reviewed-on: https://code.wireshark.org/review/490 + Bug: 8940 + Change-Id: I184b8be858507afa26a229bf4860e3a0d4e01c60 + Reviewed-on: https://code.wireshark.org/review/2134 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 7bb4ec81a7912a785758cd63570dab1d00da2647 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 14:26:15 2014 -0800 +commit 83ca675f54c6f106ae6edc9fa4e52e3dcaa63927 +Author: Bill Meier <wmeier@newsguy.com> +Date: Mon Jun 9 23:07:36 2014 -0400 - Don't append "-dirty" to the version string. + Update info re Bug # 9991: '-F libpcap' (not '-F pcap') is used in Wireshark-1.8. - Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301 - Reviewed-on: https://code.wireshark.org/review/485 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I9798f90cc96c725ebf89e7339c76497ae597c6ee + Reviewed-on: https://code.wireshark.org/review/2093 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0 +commit ebaeacd8e9e7e1d14ec9d1f8e966ef2d442055cc Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 13:52:57 2014 -0800 +Date: Mon Jun 9 15:32:34 2014 -0700 - 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. + Release note updates for 1.8.15. - Check pkg_enable using an integer comparison as an extra level of - protection. - - (We need to handle CRs better in general but for now we need to get - version stamping working for the next release.) - - Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b - Reviewed-on: https://code.wireshark.org/review/483 + Change-Id: I77dd5ea9c37c7ffc2f75efe9bfe4cdc0bede3130 + Reviewed-on: https://code.wireshark.org/review/2090 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit aff99aa5414e5df92a6714f4998518d3342a161e -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 10 22:20:31 2013 +0000 - - More git revision updates. - - Includes a partial cherry-pick of gf8002de. - - Change-Id: I2d641001610aa1c46f64a9929e3114a76ba3ce2c - Reviewed-on: https://code.wireshark.org/review/480 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 40c4e98e6217109bd9d8834492612f059859d53e -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Sep 10 16:00:58 2012 +0000 - - Update svnversion.h with (short) SHA-1 commit id and branch when use git repository - - svn path=/trunk/; revision=44850 - (cherry picked from commit 8f4a2e5f28f241f2afb6004833528db20ff5e013) - - Change-Id: I989390f9c4d96d434571193aa923c95cf110c8bb - Reviewed-on: https://code.wireshark.org/review/477 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b6e571f1bc6207d1a285dc89cff5ec7c79a94c78 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jun 29 21:58:46 2013 +0000 +commit aa50774d3f2e3ea98021a7621cf01e7d6f93a01f +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Jun 9 11:26:45 2014 +0200 - Update .gitignore to add some Windows specific build stuff to ignore list. - - svn path=/trunk/; revision=50231 - (cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b) + Fix a typo in release notes - Change-Id: Iaeaacaacafc4a829e693f8b4c66614748d0e67ca - Reviewed-on: https://code.wireshark.org/review/469 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Icd45019f257c07482ba3a510b2a66e75e634e55e + Reviewed-on: https://code.wireshark.org/review/2057 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 04806a88a1b06413b01a04b68956bd08a1cce5cc -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Mar 2 08:11:08 2014 -0800 +commit ac2b854e27cc8d37ec298d97c08d146e70bebf46 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Jun 8 22:46:45 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2014-03-02] + IEEE 80211: fix dissection of HT Capabilities - Change-Id: Idc5b60d4aaac166b0b434562ba6e900254455755 - Reviewed-on: https://code.wireshark.org/review/446 + 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> - -commit 358ce3d5ce36e50545d00a80a74a4200c3d53575 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jun 5 16:38:20 2013 +0000 - - Quick fix for bug 8768. For now assume that only three logical channels - are valid. If we run into more add expert item and cap the channel - count. - - svn path=/trunk/; revision=49787 - - Conflicts: - epan/dissectors/packet-tetra.c - - (cherry picked from commit c891784de783cf23b8cf2957929af162480e0c73) - - Change-Id: I6974d755be544730fb4320b680299ce4040a47dc - Reviewed-on: https://code.wireshark.org/review/439 + (cherry picked from commit 89960510e30b9b96a0d0b84619df099fd8a707f1) + Reviewed-on: https://code.wireshark.org/review/2056 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6d54ab69ffd8f6f57dbdc89036de8a4485b9dbcd +commit adc0d9fb53b79b1451848fc23d222c24341ba43c Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Feb 28 17:21:29 2014 -0800 - - Copy git-compare-abis from ge635d3f / master-1.10. - - 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. - - Change-Id: Ie9d35057fe14bcb75736b54b7efb5f0a8deda39a - Reviewed-on: https://code.wireshark.org/review/437 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 217293ba4a0353bf5d657e74fe8623dd3c86fe08 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Feb 26 13:00:03 2014 -0500 +Date: Sun Jun 8 08:11:56 2014 -0700 - 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). + [Automatic manuf, services and enterprise-numbers update for 2014-06-08] - 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: I1536fcb8e96f5560ad366169e815f62967b3e40d - Reviewed-on: https://code.wireshark.org/review/407 + Change-Id: I3fc4cdc2f43dfd07075af0a3cb00d26322626295 + Reviewed-on: https://code.wireshark.org/review/2039 Reviewed-by: Evan Huus <eapache@gmail.com> -commit fc51c557e687351281592ea8d53fa51e0a2a61b6 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 29 18:45:09 2013 +0000 +commit c34a63b29e3527a7951d7f49a67113e700b358a5 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Jun 7 10:28:23 2014 +0200 - From stcook - - clear the temporary buffer after each DXM channel data line + Revert "Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8940" - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 + While the bugfix makes sense, it requires a huge amount of work to get the messages decoded again (backport of gae61fe0 and ge8c305f; see http://ask.wireshark.org/questions/33502/why-cannot-fully-decode-nas-field-on-s1ap-protocol). + As I do not feel courageous enough to backport everything, let's go back to the old code for this soon to be dead branch. - svn path=/trunk/; revision=54488 - cherry-picked from 745c8660be2707df41d7cea3cd2725d18b9d6ff0 with - release note updates. + This reverts commit 9f46f19b276ed3b166ef7931b971caa7c4eaa082. - Change-Id: I80f0ed958517c90525def329b8fbdab26afe8f19 - Reviewed-on: https://code.wireshark.org/review/343 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I3251044d0ed7607badce3679a1af89d15e00e458 + Reviewed-on: https://code.wireshark.org/review/2020 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 31e7202fd227b1c0202408bd0c4dc382e927c168 -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 with - manual intervention) - - Change-Id: I38cf7946969972a9ab03a56966b10f880476f55c - Reviewed-on: https://code.wireshark.org/review/341 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 6c858b21aca6ea820f766b3457c9714778bb29db -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Feb 23 23:36:11 2014 +0100 +commit 0e8a2bb22c2ca6e7dcfbf461ee5a063e15decebc +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Jun 7 12:00:31 2014 -0700 - NAS EPS: fix dissection of CS service notification message + PEEKREMOTE packets don't appear to have Atheros padding. - Fixes bug 9789 + Call the without-Atheros-padding dissector for the payload. - Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee - Reviewed-on: https://code.wireshark.org/review/330 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - - (cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682) - - Change-Id: Ie5875149bc246840bf7d610420b2b2a1d15d2805 - Reviewed-on: https://code.wireshark.org/review/334 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 19d95602bb568a6abc43d1c7f3ce59ef05174bf2 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 23 08:10:46 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-23] + Fixes bug 10139. - Change-Id: Icbade2cf84449a950f0dcafd16730d419480885d - Reviewed-on: https://code.wireshark.org/review/318 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I3b5dd25953113fe30b9278e4533561933304ae5b + Reviewed-on: https://code.wireshark.org/review/2030 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 348942c0f0f240ddca469c016d6f0698e47e99c8) + Reviewed-on: https://code.wireshark.org/review/2031 -commit ba2b412fee2bbddba0e7d8bdd17944e5aa397581 +commit b8e54bce21e7376a4e7639d47814d2d322012be4 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Feb 21 16:47:55 2014 -0800 +Date: Sat Jun 7 10:44:17 2014 -0700 - Add bug 9492. + Only nuke the startup item once we've installed the launch daemon. + + 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: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 - Reviewed-on: https://code.wireshark.org/review/306 + Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 + Reviewed-on: https://code.wireshark.org/review/2023 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/309 + (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 + (cherry picked from commit 9afa5d6166790661ddc5b44e1e8cb0c2f18fa83e) + Reviewed-on: https://code.wireshark.org/review/2026 -commit e6540b550486fc9604575d4cb85140ceddca2d33 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 1 13:47:11 2013 +0000 +commit ec607cd614911a51d1fe5be87b3d47ea75d6e3c7 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Jun 6 23:41:51 2014 -0700 - Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) + When installing the launch daemon, get rid of the old startup item. - From Peter Paluch + Only one is necessary; get rid of the startup item. - svn path=/trunk/; revision=53694 - - Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204 - Reviewed-on: https://code.wireshark.org/review/304 + Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 + Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/305 + (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 + (cherry picked from commit 648766952bf188c3a77c2482d25041694a0dd423) + Reviewed-on: https://code.wireshark.org/review/2019 -commit 13321ccc4781b9e1a2d3eb4c7ac8e9578b7fdfaf +commit 97898a24597d752ac35a22f678db2e2ed9f6f0e9 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: Iedfef3812d9dca2e2af5aa18ebaeaa7a3510bdeb + Reviewed-on: https://code.wireshark.org/review/2008 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/281 -commit 468760ec8da2c0d8c933ad9bc24f4aa866becce5 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 17:11:00 2014 -0800 +commit 4ee4fc1154f8758c2a2bc3d64c7e2aa79fd217cd +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 23:55:06 2014 -0400 - More SVN → Git conversion. + tshark.c: 'tshark -F libpcap -w ...' should create a libpcap (not pcapng) file; fixes Bug #9991. - Change-Id: If89b3c752dfd92d9f1d22456a064dd2e0b45dc96 - Reviewed-on: https://code.wireshark.org/review/266 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I98d6c7c8cb9721ccbfb0220ae3f8550df2e49a1d + Reviewed-on: https://code.wireshark.org/review/1970 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 90b34ae3db7cc39c80c5d1a372b7432fc884556c -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 23 22:18:49 2013 +0000 +commit be509e29c1b2a6b17c53a133794d0c779bd79f10 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 23:42:11 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. - - svn path=/trunk/; revision=51497 - (cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c) + tshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in libpcap or pcapng format" - Change-Id: Icf7e26f2df5a01a19ed1e652e9b668f4175148a9 - Reviewed-on: https://code.wireshark.org/review/264 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I4f83995ec6b9fcb98dcbe332d0fa42b96edbddc9 + Reviewed-on: https://code.wireshark.org/review/1969 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 5f4468c4e002e885fc4d79d5b60ec2d5619b1c78 +commit 6cfa2b66301b1c87c3e3702ddedf373447d20296 Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 15:16:44 2014 -0800 +Date: Sun Jun 1 08:12:04 2014 -0700 - 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. + [Automatic manuf, services and enterprise-numbers update for 2014-06-01] - Cherry-picked from g5086c0e with some manual intervention. - - Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102 - Reviewed-on: https://code.wireshark.org/review/261 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit 5086c0e21d734612e12173acbee6a98b1a5df2ed) - Reviewed-on: https://code.wireshark.org/review/263 + Change-Id: Iaf6420aaedd0ee909e4c86f39eab785e5faec700 + Reviewed-on: https://code.wireshark.org/review/1910 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 6d66c8023eddffdcb9fe4323d8b88d2480a7923e +commit 6d2796f2784c5bb325b8740cb2a3a2936eb32ba5 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 16 08:10:35 2014 -0800 +Date: Sun May 25 08:11:25 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-16] + [Automatic manuf, services and enterprise-numbers update for 2014-05-25] - Change-Id: I92fd7ad702c4f7974bbe9b770293e6d0fa9217df - Reviewed-on: https://code.wireshark.org/review/231 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I87588b512a643a5c560a8d71a30a7f36db2c04c0 + Reviewed-on: https://code.wireshark.org/review/1792 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 593dbbb853ab83bc748dc0ddd1b19aadd18c6843 +commit 4a916546202f8edfa4e8d4b5c4fd5e872246514d Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 11 08:56:15 2014 -0800 +Date: Sun May 18 08:09:23 2014 -0700 - Fix the host entry. + [Automatic manuf, services and enterprise-numbers update for 2014-05-18] - 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/173 + Change-Id: I77274e7a1ab31a097666a0e2d122bf8db88df5c6 + Reviewed-on: https://code.wireshark.org/review/1681 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 04da0319ce57ff161365c49275131de39e1720f6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 9 08:10:22 2014 -0800 +commit 378455665d078759d8a5eaf961b18885e4ba7584 +Author: Gerald Combs <gerald@zing.org> +Date: Sun May 11 09:47:09 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-09] + Don't build update-sminmpec by default when using CMake. - Change-Id: I914b0c5e7b427ac7201bcd4a062055036c802b5f - Reviewed-on: https://code.wireshark.org/review/154 + 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 + (cherry picked from commit ccce29a936d15dfdfea4f81df90f99150b189ad9) + Reviewed-on: https://code.wireshark.org/review/1594 -commit dd8afe56f9dfaaeb9649bff1d8f8c68c8676c736 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Feb 6 16:51:57 2014 -0800 - - Pass the caplen from the struct wtap_pkthdr to pcap_read_post_process(). - - 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). - - Change-Id: I431738942b4dd10ee0951d549ebf8d12c941c439 - Reviewed-on: https://code.wireshark.org/review/135 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 7065ca5b933380b0b1ae67ad8685912083d5bfa1 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Feb 4 22:28:21 2014 +0100 - - Introduce end-of-line normalization - - Change-Id: If92ef2ceb5f1311d52c66710db9491d7ed4427c2 - Reviewed-on: https://code.wireshark.org/review/116 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 5f5c122d5b975b372f66644b4f9bf17a359d2e72 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Feb 4 10:28:06 2014 -0500 - - Fix dissection of GTP MM Context RAND field. - - As suggested by Lükő Bálint to fix bug #9722. - - Change-Id: Ie6b801a9660716c2c6efa6fd09b50a2481f5acd7 - Reviewed-on: https://code.wireshark.org/review/110 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - (cherry picked from commit 1de44d769cd205a49446ac1fd09ddd196fedb6a8) - Reviewed-on: https://code.wireshark.org/review/112 - -commit d81206ac58486fe45faa74213b1aa5ae01b5a9b1 -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: I15832d91824087a2fed50a3968cb2801cc30cf91 - Reviewed-on: https://code.wireshark.org/review/105 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit fc38bf4821bba4e36b584b331f3e34cdad81ff0a -Author: Anders Broman <anders.broman@ericsson.com> -Date: Tue Sep 10 06:06:55 2013 +0000 - - 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. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - - svn path=/trunk/; revision=51918 - - Conflicts: - epan/dissectors/packet-ieee802a.c - - Change-Id: I431292a67f0d96341389f2220993b7362daf48ab - Reviewed-on: https://code.wireshark.org/review/93 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 302dcf09e7e26fc26d2c076509c0f5157ea23089 +commit c143130a73d706fad16807f3bdb54895eaa0a19a Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 2 08:10:52 2014 -0800 +Date: Sun May 11 08:09:31 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-02] + [Automatic manuf, services and enterprise-numbers update for 2014-05-11] - Change-Id: Ic2a83608a64d7bdf9fbde99f6d96d872dd0edcd9 - Reviewed-on: https://code.wireshark.org/review/77 + Change-Id: Ia71c9eb1ad0290702c8b0701e43fafb8bfcf1d67 + Reviewed-on: https://code.wireshark.org/review/1591 Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - -commit 7d10462e4c3ec9fde3b1a9721267b0f7df3610ab -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 31 18:54:43 2014 -0500 - - Add gitreview file for master-1.8 - - Change-Id: I4d837c0eeab61d131e5e50b0b0a54a271f84b60e - Reviewed-on: https://code.wireshark.org/review/68 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - -commit 65b55ae6107a7bf3578d6689192c10da8de46112 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 29 13:12:39 2014 -0500 - - Add missing gitignore entries - - Change-Id: Ifc6a35924e4a725a9bfa73d35cb6bd11c72660e5 - -commit 24a0832cfeff78d15eafb339a4f07e0f61b8c619 -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. - - svn path=/trunk-1.10/; revision=54966 - - Conflicts: - ui/export_object_smb.c - - Change-Id: Id91522cab64fa5bbe40f0538049401b2c2f24c1a - -commit b1b1b86c08b5afb79e32e0cb0e8a9cc599735de8 -Merge: 3bba4ea 6788dad -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 29 11:24:26 2014 +0000 - - Merge "Fix bug 9649: SMPP: source_telematics_id value length is 1 byte" into master-1.8 - -commit 3bba4ea70b8698d675ae7eb802e3741de1426490 -Merge: 2fb9848 6df7bb0 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 29 11:18:46 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.8 -commit 2fb984892099d81e54e4a69158ae4fb270028eb1 -Merge: 1c9e42e b532ef4 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 29 02:14:04 2014 +0000 - - Merge "Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe Kaplan for the report." into master-1.8 - -commit 1c9e42e4006862841eca6ae49360c1e3b3ab683b +commit 78563c2bcd967093cfc37a27534c02aa37a1019d Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 26 09:11:10 2014 -0800 +Date: Mon May 5 11:50:24 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-26] + Be less aggressive about rebuilding sminmpec.c. - Change-Id: Ie93cc40e6af4ce8c961dbead8937a87ad4361d1e - -commit 12bc6a65aa9b9b159709939e8f92013898073789 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 24 07:57:47 2014 +0000 - - Copy over r54938 from trunk: - - ------------------------------------------------------------------------ - r54938 | guy | 2014-01-23 23:55:03 -0800 (Thu, 23 Jan 2014) | 5 lines - - 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. - - svn path=/trunk-1.8/; revision=54940 - -commit 1728b5996dda43b6318f8359ceaf12760525e423 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 22 02:25:27 2014 +0000 - - Copy over r54884 from trunk, with manual intervention: + 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. - ------------------------------------------------------------------------ - r54884 | guy | 2014-01-21 17:22:01 -0800 (Tue, 21 Jan 2014) | 4 lines + Change the Autotools, CMake, and Nmake sminmpec.c target name to + "update-sminmpec". - It's not a string, it's a byte array (bit array, really). + Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers + and sminmpec.c while we're here. - Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. + Tested with an in-tree Autotools build and an out-of-tree CMake build. - svn path=/trunk-1.8/; revision=54888 - -commit b532ef412765c1a56db7eee560400081bceba776 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Jan 21 18:48:01 2014 +0000 - - Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe - Kaplan for the report. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some - other cases in the same vein. - - svn path=/trunk/; revision=54875 - - Conflicts: - epan/dissectors/packet-nfs.c - - Change-Id: I7b64ad4475ef7701dd064cad98d5567ae3847735 - -commit 6788dad31e66db6cfc4b5c378669ff3af41d2b1d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 17 22:18:50 2014 +0000 - - Fix bug 9649: SMPP: source_telematics_id value length is 1 byte - - svn path=/trunk/; revision=54837 - - (cherry picked from commit 642949701501d313059c3e7de888af266e00d0d1) - - Change-Id: I6ebc94bfe3aed22bdc1f1d8759c5b5c7e236bf95 + 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 fixups) + Reviewed-on: https://code.wireshark.org/review/1577 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 6df7bb0669383479f00521cc09edae9734b8047d +commit 46df3d691588feddf348f987e3419af3d5f34e42 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 12 20:52:19 2014 +0000 +Date: Thu May 8 12:38:34 2014 +0200 - Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded + TCAP: set a fence on info column after calling sub dissector - svn path=/trunk/; revision=54707 + Bug: 10091 + Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 + Reviewed-on: https://code.wireshark.org/review/1555 + Reviewed-by: Anders Broman <a.broman58@gmail.com> Conflicts: - epan/dissectors/packet-h264.c + asn1/tcap/packet-tcap-template.c + epan/dissectors/packet-tcap.c - (cherry picked from commit 527071fb0dba0b8cae5ed8baa58b19ebf1996b89) + (cherry picked from commit 54be3eaaec057c44a4b42e4cf538cd07ee247bce) - Change-Id: I59b78a1509ba942f26f9b0ebb0b4e833d0522c7b - -commit 0fa1fb17cf9e7e00f63d85db669b0e80a46ec03e -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 19 15:35:07 2014 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2014-01-19] - - svn path=/trunk-1.8/; revision=54846 + Change-Id: I4b2f1b1195cbbd80067af84b58ebdd19b7b306b3 + Reviewed-on: https://code.wireshark.org/review/1559 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit c7a18b39f9ddae1437c0ff56d3acb4a00fd93d70 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 15 00:35:34 2014 +0000 +commit 8ad08b956dcca3c490c5f6de70f5cdb5e35b30ce +Author: Jakub Zawadzki <darkjames@darkjames.pl> +Date: Sun May 4 23:06:54 2014 +0200 - Start using the output of 'git describe'. + Fix possible buffer overflow in col_append_sep_fstr() - svn path=/trunk-1.8/; revision=54807 - -commit 2d59e78cae1111eed03cad7d4b167da2bd9d1edd -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 14 23:50:45 2014 +0000 - - Remove a debugging print. + After appending separator it might happen that len > max_len, in such case + g_vsnprintf() will overflow the col_buf buffer. - svn path=/trunk-1.8/; revision=54806 + 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/1513 -commit 01ab5b207a248965d1901cef198a25a32fcb4543 +commit d0728583eb04eae01031b6a5f5de2d1eeab00561 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 14 23:38:16 2014 +0000 +Date: Sun May 4 08:09:20 2014 -0700 - Start adding support for plain git. + [Automatic manuf, services and enterprise-numbers update for 2014-05-04] - svn path=/trunk-1.8/; revision=54805 + Change-Id: I1396634ab367b84f7d3ebc0846cc5db537c7287d + Reviewed-on: https://code.wireshark.org/review/1490 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1ddc83849075addb0cac69a6fe3782f4325337b9 +commit 7c13c4fba8160289451f69d3cf6105ba4595ae9b Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 14 00:14:34 2014 +0000 +Date: Wed Apr 30 13:20:42 2014 -0400 - Copy over r54694. - - ------------------------------------------------------------------------ - r54694 | gerald | 2014-01-10 14:57:28 -0800 (Fri, 10 Jan 2014) | 2 lines - - Update the enterprise-numbers URL. - ------------------------------------------------------------------------ + Copy make-sminmpec.pl from master. + The previous cherry-pick didn't have the desired effect. - svn path=/trunk-1.8/; revision=54740 + Change-Id: If2bf6ae59eb374db393afc73d2bf17eb0874ced7 + Reviewed-on: https://code.wireshark.org/review/1444 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 339d238a0374ec7ccc73f8720e1c534625a74d35 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 13 20:03:36 2014 +0000 +commit e3b96d7227bc7a3fb719f1bb8e055f7ed840caf0 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Apr 27 13:26:17 2014 -0700 - Copy over r54714 from trunk: - - ------------------------------------------------------------------------ - r54714 | guy | 2014-01-13 11:49:12 -0800 (Mon, 13 Jan 2014) | 17 lines - - 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. + make-sminmpec.pl fixups. - They *didn't* match; fix that. + Enforce a minimum number of entries and do our work in the epan + directory. - 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. - - Make dissect_cbs_message_identifier() return the new offset as well, for - consistency, and don't add *its* return value to the offset. - - svn path=/trunk-1.8/; revision=54716 + 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/1442 -commit 56c6fefcf22451c159078ba027d60740b8178d96 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 12 15:35:10 2014 +0000 +commit 2d85bc58e924d9dc2cf23d04c958ae6e78b48a70 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Apr 27 15:33:13 2014 -0400 - [Automatic manuf, services and enterprise-numbers update for 2014-01-12] + Remove support for SHIM6 on protocol 61 - svn path=/trunk-1.8/; revision=54704 + bug:9995 + Change-Id: I3c6ff189c4f9cca83b18ea2f057a1bca0c6809c4 + Reviewed-on: https://code.wireshark.org/review/1391 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a15168cd8e11711f083d667834231d8a714d6f55 +commit 8d2895f423c6fe267ebe67fe8f8f3f6a9abf130f Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 5 15:35:00 2014 +0000 +Date: Sun Apr 27 08:10:45 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-05] + [Automatic manuf, services and enterprise-numbers update for 2014-04-27] - svn path=/trunk-1.8/; revision=54603 + Change-Id: Ic6e99a88414d7d7901b923b19491c4ef3905dfa4 + Reviewed-on: https://code.wireshark.org/review/1386 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit f7f547c779f8d1ceb86bd39ba20202b38b3565a9 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 2 09:42:31 2014 +0000 +commit 9aae3c5bd0f2522d6c9bebec61066f84e54e71ec +Author: Jaap Keuter <jaap.keuter@xs4all.nl> +Date: Wed Apr 23 23:59:19 2014 +0200 - 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 + Adding two well known OAM related multicast address ranges. - Happy new year! - - ------------------------------------------------------------------------ - - svn path=/trunk-1.8/; revision=54551 + 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/1332 + Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> -commit 1421983681ae3054307d922ab4b1904237803133 +commit ef4023009c43291d8b83a740ce061af39465b0a7 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 1 23:26:04 2014 +0000 - - Copy over r54544 from trunk: - - ------------------------------------------------------------------------ - r54544 | guy | 2014-01-01 15:22:53 -0800 (Wed, 01 Jan 2014) | 11 lines - - 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. - - 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.8/; revision=54546 - -commit 6437ddd5ba55a91e8f18f18b6a7e3fe99f1250f0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 17:31:08 2013 +0000 - - 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 - - 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.8/; revision=54487 - -commit b5121c5dc5f9774f1d5344ece45cfd7da82573e4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 15:34:50 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-29] - - svn path=/trunk-1.8/; revision=54483 - -commit 82530e9efdf315d8a285ee92b5fda5d5789e4976 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 22 15:34:54 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-22] - - svn path=/trunk-1.8/; revision=54363 +Date: Fri Apr 25 10:44:11 2014 -0700 -commit 13eb45b2fa6154b6fd854014b5b79c3ed3038b96 -Author: Chris Maynard <Christopher.Maynard@GTECH.COM> -Date: Fri Dec 20 15:14:38 2013 +0000 - - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54227 | cmaynard | 2013-12-18 13:27:07 -0500 (Wed, 18 Dec 2013) | 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-homeplug.c - - Call ptvcursor_new() to initialize cursor whether tree is NULL or not. - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - #BACKPORT(1.10, 1.8) + 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() will ensure that caplen <= len. + Fixes bug 10037. - svn path=/trunk-1.8/; revision=54302 - -commit 2c0db318a0adadafedf94f56ba9b34eec6e630bb -Author: Balint Reczey <balint@balintreczey.hu> -Date: Thu Dec 19 18:52:48 2013 +0000 - - Copy over r49145 with manual intervention: - ------------------------------------------------------------------------ - r49145 | mmann | 2013-05-03 07:54:39 -0700 (Fri, 03 May 2013) | 1 line - Changed paths: - M /trunk/epan/dissectors/packet-bssgp.c - M /trunk/epan/dissectors/packet-gsm_a_bssmap.c - M /trunk/epan/dissectors/packet-gsm_bssmap_le.c - M /trunk/epan/dissectors/packet-gsm_sms.c - M /trunk/epan/dissectors/packet-nas_eps.c - M /trunk/epan/dissectors/packet-sgsap.c - - Remove static packet_info *gpinfo and just use the packet_info provided by the function. - ------------------------------------------------------------------------ - - Update the release notes. - - svn path=/trunk-1.8/; revision=54263 - -commit 17615a5a5fdf51d3c332d0ae6fbbe710288aab26 -Author: Chris Maynard <Christopher.Maynard@GTECH.COM> -Date: Thu Dec 19 18:11:14 2013 +0000 - - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54257 | cmaynard | 2013-12-19 12:48:58 -0500 (Thu, 19 Dec 2013) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-roofnet.c - - Need to call ptvcursor_current_offset() BEFORE ptvcursor_free(). - - ------------------------------------------------------------------------ - - - svn path=/trunk-1.8/; revision=54261 - -commit 9a4a3becd28d5bd796b352022b1a693341feef7a -Author: Chris Maynard <Christopher.Maynard@GTECH.COM> -Date: Thu Dec 19 18:10:53 2013 +0000 - - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54255 | cmaynard | 2013-12-19 12:48:11 -0500 (Thu, 19 Dec 2013) | 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-omapi.c - M /trunk/epan/dissectors/packet-pgm.c - - Fix leaks where ptvcursor_free() wasn't being called. - - ------------------------------------------------------------------------ - - - svn path=/trunk-1.8/; revision=54260 - -commit a297b86486dd22d031003e18ca52da770b632b28 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Dec 17 21:16:17 2013 +0000 - - Copy over from the trunk: - - ------------------------------------------------------------------------ - r54181 | wmeier | 2013-12-17 10:02:47 -0500 (Tue, 17 Dec 2013) | 8 lines - - From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file" - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - - From me: Fixed in a slightly different manner than sugested in the patch attached to the bug. - ------------------------------------------------------------------------ - - - svn path=/trunk-1.8/; revision=54195 + Change-Id: I28908674d5a6ee4bb76e01cd4c7b463fa9d155f6 + Reviewed-on: https://code.wireshark.org/review/1357 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit be039e36458050b2da7edbe40ab882868362b68d +commit 6e7f9df4290da6a99aa89305653cc7794866f256 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Dec 17 20:06:38 2013 +0000 +Date: Tue Apr 22 12:05:39 2014 -0700 - 1.8.12 → 1.8.13. + 1.8.14 → 1.8.15. - svn path=/trunk-1.8/; revision=54194 + Change-Id: Ib2d4a6272ce97c6cb0436ec79597fc5889e5579f + Reviewed-on: https://code.wireshark.org/review/1282 + 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.8.13 Release Notes + Wireshark 1.8.15 Release Notes __________________________________________________________ What is Wireshark? @@ -10,43 +10,25 @@ What's New - Bug Fixes + Wireshark 1.8 will reach end of life on June 21, 2014. This is + the last official release of that branch. If you are still + running Wireshark 1.8 or earlier we strongly recommend + upgrading to Wireshark 1.12 or 1.10. - 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-03 - The RLC dissector could crash. ([5]Bug 9730) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [6]CVE-2014-2283 - * [7]wnpa-sec-2014-04 - The MPEG file parser could overflow a buffer. Discovered by - Wesley Neelen. ([8]Bug 9843) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [9]CVE-2014-2299 + Bug Fixes The following bugs have been fixed: - * Customized OUI is not recognized correctly during - dissection. ([10]Bug 9122) - * MPLS dissector no longer registers itself in "ppp.protocol" - table. ([11]Bug 9492) - * Wireshark stops showing new packets but dumpcap keeps - writing them to the temp file. ([12]Bug 9571) - * Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector - accessed an invalid memory address. ([13]Bug 9578) - * DMX-CHAN disector does not clear strbuf between rows. - ([14]Bug 9598) - * Dissector bug, protocol SDP: proto.c:4214: failed assertion - "length >= 0". ([15]Bug 9633) - * SMPP field source_telematics_id field length different from - spec. ([16]Bug 9649) - * GTPv1-C / MM Context / Authentication quintuplet / RAND is - not correct. ([17]Bug 9722) - * nas-eps dissector: CS Service notification dissection stops - after Paging identity IE. ([18]Bug 9789) + * Tshark with "-F libpcap" still generates a pcapng file. + ([1]Bug 9991) + * IPv6 Next Header 0x3d recognized as SHIM6. ([2]Bug 9995) + * Pcap-ng PB/EPB with caplen > len shouldn't be treated as an + error. ([3]Bug 10037) + * TCAP: set a fence on info column after calling sub + dissector ([4]Bug 10091) + * Wireshark PEEKREMOTE incorrectly decoding QoS data packets + from Cisco Sniffer APs. ([5]Bug 10139) + * IEEE 802.11: fix dissection of HT Capabilities ([6]Bug + 10166) New and Updated Features @@ -58,26 +40,24 @@ Updated Protocol Support - AppleTalk, BSSGP, DMX-CHAN, DSI, DVB-CI, ESS, GSM BSSMAP, GSM - BSSMAP LE, GSM CBS, GSM SMS, GTPv1, HomePlug, IEEE 802a, MPLS, - NAS-EPS, NFS, SGSAP, SMPP, T.124, and TETRA + IEEE 802.11, IPv6, and TCAP New and Updated Capture File Support - MPEG, NG Sniffer, and pcap-ng + pcap-ng, and PEEKREMOTE Getting Wireshark Wireshark source code and installation packages are available - from [19]http://www.wireshark.org/download.html. + from [7]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 [20]download page - on the Wireshark web site. + of third-party packages can be found on the [8]download page on + the Wireshark web site. __________________________________________________________ File Locations @@ -90,85 +70,76 @@ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([21]Bug + Dumpcap might not quit if Wireshark or TShark crashes. ([9]Bug 1419) - The BER dissector might infinitely loop. ([22]Bug 1516) + The BER dissector might infinitely loop. ([10]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([23]Bug 1814) + ([11]Bug 1814) Filtering tshark captures with display filters (-R) no longer - works. ([24]Bug 2234) + works. ([12]Bug 2234) The 64-bit Windows installer does not support Kerberos - decryption. ([25]Win64 development page) + decryption. ([13]Win64 development page) - Application crash when changing real-time option. ([26]Bug + Application crash when changing real-time option. ([14]Bug 4035) - Hex pane display issue after startup. ([27]Bug 4056) + Hex pane display issue after startup. ([15]Bug 4056) - Packet list rows are oversized. ([28]Bug 4357) + Packet list rows are oversized. ([16]Bug 4357) Summary pane selected frame highlighting not maintained. - ([29]Bug 4445) + ([17]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. ([30]Bug 4985) + cases. ([18]Bug 4985) + + Wireshark may not dissect GSM A packets correctly. + (ws-buglink:8940) __________________________________________________________ Getting Help - Community support is available on [31]Wireshark's Q&A site and + Community support is available on [19]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 [32]the web site. + on [20]the web site. Official Wireshark training and certification are available - from [33]Wireshark University. + from [21]Wireshark University. __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [34]Wireshark web site. + A complete FAQ is available on the [22]Wireshark web site. __________________________________________________________ - Last updated 2014-03-07 10:09:55 PST + Last updated 2014-06-12 11:44:08 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-03.html - 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9730 - 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2283 - 7. https://www.wireshark.org/security/wnpa-sec-2014-04.html - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9843 - 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2299 - 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492 - 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 - 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9722 - 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9789 - 19. http://www.wireshark.org/download.html - 20. http://www.wireshark.org/download.html#thirdparty - 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 25. https://wiki.wireshark.org/Development/Win64 - 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 - 30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 31. http://ask.wireshark.org/ - 32. http://www.wireshark.org/lists/ - 33. http://www.wiresharktraining.com/ - 34. http://www.wireshark.org/faq.html + 1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9991 + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9995 + 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10037 + 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10091 + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10139 + 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10166 + 7. http://www.wireshark.org/download.html + 8. http://www.wireshark.org/download.html#thirdparty + 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 13. https://wiki.wireshark.org/Development/Win64 + 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 19. http://ask.wireshark.org/ + 20. http://www.wireshark.org/lists/ + 21. http://www.wiresharktraining.com/ + 22. http://www.wireshark.org/faq.html

@@ -36,7 +36,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. @@ -50,7 +50,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

@@ -635,8 +635,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; }

@@ -13,13 +13,13 @@ ##### Versions ##### # The Git description of our build. Updated by make-version.pl -GIT_REVISION=7979 +GIT_REVISION=0 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=8 -VERSION_MICRO=13 +VERSION_MICRO=15 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.8.13. +# Generated by GNU Autoconf 2.68 for wireshark 1.8.15. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.8.13' -PACKAGE_STRING='wireshark 1.8.13' +PACKAGE_VERSION='1.8.15' +PACKAGE_STRING='wireshark 1.8.15' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1522,7 +1522,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wireshark 1.8.13 to adapt to many kinds of systems. +\`configure' configures wireshark 1.8.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1593,7 +1593,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wireshark 1.8.13:";; + short | recursive ) echo "Configuration of wireshark 1.8.15:";; esac cat <<\_ACEOF @@ -1792,7 +1792,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.8.13 +wireshark configure 1.8.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2332,7 +2332,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wireshark $as_me 1.8.13, which was +It was created by wireshark $as_me 1.8.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3260,7 +3260,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.8.13' + VERSION='1.8.15' cat >>confdefs.h <<_ACEOF @@ -29473,7 +29473,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wireshark $as_me 1.8.13, which was +This file was extended by wireshark $as_me 1.8.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29539,7 +29539,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wireshark config.status 1.8.13 +wireshark config.status 1.8.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"

@@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.8.13) +AC_INIT(wireshark, 1.8.15) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or

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

@@ -7,9 +7,9 @@ /usr/bin/rawshark /usr/bin/text2pcap /usr/lib/wireshark/libwireshark.so.2 -/usr/lib/wireshark/libwireshark.so.2.0.13 +/usr/lib/wireshark/libwireshark.so.2.0.15 /usr/lib/wireshark/libwiretap.so.2 -/usr/lib/wireshark/libwiretap.so.2.1.13 +/usr/lib/wireshark/libwiretap.so.2.1.15 /usr/lib/wireshark/libwsutil.so.2 /usr/lib/wireshark/libwsutil.so.2.0.0 /usr/lib/wireshark/plugins/*

@@ -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.8.13 +wireshark-version:\[\]=1.8.15 [macros]

@@ -1 +1 @@ -<!ENTITY GitVersion "wireshark-1.8.13-dirty"> +<!ENTITY GitVersion "wireshark-1.8.15">

@@ -7,67 +7,44 @@ == What's New +Wireshark 1.8 will reach end of life on June 21, 2014. This is the last official +release of that branch. If you are still running Wireshark 1.8 or earlier we +strongly recommend upgrading to Wireshark 1.12 or 1.10. + === Bug Fixes -The following vulnerabilities have been fixed. +//The following vulnerabilities have been fixed. //* ws-buglink:5000[] //* ws-buglink:6000[Wireshark bug] //* ws-salink:2013-11[] //* cve-idlink:2013-2486[] -* ws-salink:2014-01[] -+ -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[]) -+ -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -+ -cve-idlink:2014-2281[] - -* 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[] +//* ws-salink:2014-07[] +//+ +//A dissector went awry. +// Fixed in master: ga1b2c3d4 +// Fixed in master-1.10: ga1b2c3d4 +// Fixed in master-1.8: ga1b2c3d4 +//(ws-buglink:0000[]) +//+ +//Versions affected: 1.10.0 to 1.10.7, 1.8.0 to 1.8.14 +//+ +//cve-idlink:2014-0000[] The following bugs have been fixed: +// Should be sorted numerically. //* Wireshark will strip the paint off your car, then apply a hideous //flame job to the hood and fenders using gray, red, and black primer. //(ws-buglink:0000[]) -* Customized OUI is not recognized correctly during dissection. (ws-buglink:9122[]) -* MPLS dissector no longer registers itself in "ppp.protocol" table. (ws-buglink:9492[]) -* Wireshark stops showing new packets but dumpcap keeps writing them to the temp file. (ws-buglink:9571[]) -* Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector accessed an invalid memory address. (ws-buglink:9578[]) -* 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[]) -* SMPP field source_telematics_id field length different from spec. (ws-buglink:9649[]) -* GTPv1-C / MM Context / Authentication quintuplet / RAND is not correct. (ws-buglink:9722[]) -* nas-eps dissector: CS Service notification dissection stops after Paging identity IE. (ws-buglink:9789[]) +* Tshark with "-F libpcap" still generates a pcapng file. (ws-buglink:9991[]) +* IPv6 Next Header 0x3d recognized as SHIM6. (ws-buglink:9995[]) +* Pcap-ng PB/EPB with caplen > len shouldn't be treated as an error. (ws-buglink:10037[]) +* TCAP: set a fence on info column after calling sub dissector (ws-buglink:10091[]) +* 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 @@ -81,26 +58,9 @@ --sort-and-group-- -AppleTalk -BSSGP -DMX-CHAN -DSI -DVB-CI -ESS -GSM BSSMAP -GSM BSSMAP LE -GSM CBS -GSM SMS -GTPv1 -HomePlug -IEEE 802a -MPLS -NAS-EPS -NFS -SGSAP -SMPP -T.124 -TETRA +IEEE 802.11 +TCAP +IPv6 --sort-and-group-- @@ -108,8 +68,7 @@ --sort-and-group-- -MPEG -NG Sniffer +PEEKREMOTE pcap-ng --sort-and-group-- @@ -166,6 +125,8 @@ Wireshark and TShark will display incorrect delta times in some cases. (ws-buglink:4985[]) +Wireshark may not dissect GSM A packets correctly. (ws-buglink:8940) + == Getting Help Community support is available on http://ask.wireshark.org/[Wireshark's

@@ -1307,13 +1307,10 @@ ftypes/ftype-tvbuff.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 2:13:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:15:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ include Makefile.common @@ -126,8 +126,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ - Makefile.in \ - sminmpec.c + Makefile.in # # Add the object files for missing routines, if any. @@ -186,8 +185,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 def_sym_filter_symbols =

@@ -573,7 +573,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 2:13:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:15:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ @@ -878,8 +878,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ - Makefile.in \ - sminmpec.c + Makefile.in # @@ -2051,8 +2050,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

@@ -143,7 +143,7 @@ $(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ - dtd_grammar.out sminmpec.c + dtd_grammar.out distclean: distclean-local cd crypt @@ -301,8 +301,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

@@ -334,9 +334,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); + } } } }

@@ -949,7 +949,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); /*

@@ -3225,156 +3225,6 @@ * 11.3.113 Redirection Completed */ - -const value_string bssgp_elem_strings[] = { - { 0x00, "Alignment Octets" }, /* 11.3.1 Alignment octets */ - { 0x01, "Bmax default MS" }, /* 11.3.2 Bmax default MS */ - { 0x02, "BSS Area Indication" }, /* 11.3.3 BSS Area Indication */ - { 0x03, "Bucket Leak Rate (R)" }, /* 11.3.4 Bucket Leak Rate (R) */ - { 0x04, "BVCI (BSSGP Virtual Connection Identifier)" }, /* 11.3.6 BVCI (BSSGP Virtual Connection Identifier) */ - { 0x05, "BVC Bucket size" }, /* 11.3.5 BVC Bucket Size */ - { 0x06, "BVC Measurement" }, /* 11.3.7 BVC Measurement */ - { 0x07, "Cause" }, /* 11.3.8 Cause */ - { 0x08, "Cell Identifier" }, /* 11.3.9 Cell Identifier */ - { 0x09, "Channel needed" }, /* 11.3.10 Channel needed */ - { 0x0a, "DRX Parameters" }, /* 11.3.11 DRX Parameters */ - { 0x0b, "eMLPP-Priority" }, /* 11.3.12 eMLPP-Priority */ - { 0x0c, "Flush Action" }, /* 11.3.13 Flush Action */ - { 0x0d, "IMSI" }, /* 11.3.14 IMSI */ - { 0x0e, "LLC-PDU" }, /* 11.3.15 LLC-PDU */ - { 0x0f, "LLC Frames Discarded" }, /* 11.3.16 LLC Frames Discarded */ - { 0x10, "Location Area" }, /* 11.3.17 Location Area */ - { 0x11, "Mobile Id" }, /* 11.3.20 Mobile Id */ - { 0x12, "MS Bucket Size" }, /* 11.3.21 MS Bucket Size */ - { 0x13, "MS Radio Access Capability" }, /* 11.3.22 MS Radio Access Capability GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP */ - { 0x14, "OMC Id" }, /* 11.3.23 OMC Id */ - { 0x15, "PDU In Error" }, /* 11.3.24 PDU In Error */ - { 0x16, "PDU Lifetime" }, /* 11.3.25 PDU Lifetime */ - { 0x17, "Priority" }, /* 11.3.27 Priority */ - { 0x18, "QoS Profile" }, /* 11.3.28 QoS Profile */ - { 0x19, "Radio Cause" }, /* 11.3.29 Radio Cause */ - { 0x1a, "RA-Cap-UPD-Cause" }, /* 11.3.30 RA-Cap-UPD-Cause */ - { 0x1b, "Routeing Area" }, /* 11.3.31 Routeing Area */ - { 0x1c, "R_default_MS" }, /* 11.3.32 R_default_MS */ - { 0x1d, "Suspend Reference Number" }, /* 11.3.33 Suspend Reference Number */ - { 0x1e, "Tag" }, /* 11.3.34 Tag */ - { 0x1f, "Temporary logical link Identity (TLLI)" }, /* 11.3.35 Temporary logical link Identity (TLLI) GSM_A_PDU_TYPE_RR, DE_RR_TLLI*/ - { 0x20, "Temporary Mobile Subscriber Identity (TMSI)" }, /* 11.3.36 Temporary Mobile Subscriber Identity (TMSI)GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI */ - { 0x21, "Trace Reference" }, /* 11.3.37 Trace Reference */ - { 0x22, "Trace Type" }, /* 11.3.38 Trace Type */ - { 0x23, "Transaction Id" }, /* 11.3.39 Transaction Id */ - { 0x24, "Trigger Id" }, /* 11.3.40 Trigger Id */ - { 0x25, "Number of octets affected" }, /* 11.3.41 Number of octets affected */ - { 0x26, "LSA Identifier List" }, /* 11.3.18 LSA Identifier List */ - { 0x27, "LSA Information" }, /* 11.3.19 LSA Information */ - { 0x28, "Packet Flow Identifier (PFI)" }, /* 11.3.42 Packet Flow Identifier (PFI) GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID*/ - /* 11.3.42a (void) */ - { 0x29, "GPRS Timer" }, /* 11.3.44 GPRS Timer */ - { 0x3a, "Aggregate BSS QoS Profile" }, /* 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS*/ - { 0x3b, "Feature Bitmap" }, /* 11.3.45 Feature Bitmap */ - { 0x3c, "Bucket Full Ratio" }, /* 11.3.46 Bucket Full Ratio */ - { 0x3d, "Service UTRAN CCO" }, /* 11.3.47 Service UTRAN CCO */ - { 0x3e, "NSEI (Network Service Entity Identifier)" }, /* 11.3.48 NSEI (Network Service Entity Identifier) */ - { 0x00, "RRLP APDU" }, /* 11.3.49 RRLP APDU */ - /* 11.3.50 LCS QoS BSSGP_IEI_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS*/ - /* 11.3.51 LCS Client Type BSSGP_IEI_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE*/ - /* 11.3.52 Requested GPS Assistance Data BSSGP_IEI_REQUESTED_GPS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GPS_ASSIST_D*/ - /* 11.3.53 Location Type 0x7c, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE*/ - /* 11.3.54 Location Estimate BSSGP_IEI_LOCATION_ESTIMATE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST*/ - /* 11.3.55 Positioning Data 0x7d, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA*/ - /* 11.3.56 Deciphering Keys BSSGP_IEI_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS */ - /* 11.3.57 LCS Priority BSSGP_IEI_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO;*/ - /* 11.3.58 LCS Cause BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE */ - /* 11.3.59 LCS Capability 0x49 , GSM_A_PDU_TYPE_GM, DE_PS_LCS_CAP*/ - { 0x00, "RRLP Flags" }, /* 11.3.60 RRLP Flags */ - { 0x00, "RIM Application Identity" }, /* 11.3.61 RIM Application Identity */ - { 0x00, "RIM Sequence Number" }, /* 11.3.62 RIM Sequence Number */ - /* 11.3.62a RIM Container */ - /* 11.3.62a.0 General */ - { 0x00, "RAN-INFORMATION-REQUEST RIM Container" }, /* 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container */ - { 0x00, "RAN-INFORMATION RIM Container" }, /* 11.3.62a.2 RAN-INFORMATION RIM Container */ - { 0x00, "RAN-INFORMATION-ACK RIM Container" }, /* 11.3.62a.3 RAN-INFORMATION-ACK RIM Container */ - { 0x00, "RAN-INFORMATION-ERROR RIM Container" }, /* 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container */ - { 0x00, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, /* 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container */ - /* 11.3.63 Application Container */ - { 0x00, "RAN-INFORMATION-REQUEST Application Container" }, /* 11.3.63.1 RAN-INFORMATION-REQUEST Application Container */ - /* 11.3.63.1.0 General */ - /* 11.3.63.1.1 RAN-INFORMATION-REQUEST Application Container for the NACC Application */ - /* 11.3.63.1.2 RAN-INFORMATION-REQUEST Application Container for the SI3 Application */ - /* 11.3.63.1.3 RAN-INFORMATION-REQUEST Application Container for the MBMS data channel Application */ - /* 11.3.63.1.4 RAN-INFORMATION-REQUEST Application Container for the SON Transfer Application */ - { 0x00, "RAN-INFORMATION Application Container Unit" }, /* 11.3.63.2 RAN-INFORMATION Application Container Unit */ - /* 11.3.63.2.0 General */ - /* 11.3.63.2.1 RAN-INFORMATION Application Container for the NACC Application */ - /* 11.3.63.2.2 RAN-INFORMATION Application Container for the SI3 Application */ - /* 11.3.63.2.3 RAN-INFORMATION Application Container for the MBMS data channel Application */ - /* 11.3.63.2.4 RAN-INFORMATION Application Container for the SON Transfer Application */ - { 0x00, "Application Error Container" }, /* 11.3.64 Application Error Container */ - /* 11.3.64.1 Application Error Container layout for the NACC application */ - /* 11.3.64.2 Application Error Container for the SI3 application */ - /* 11.3.64.3 Application Error Container for the MBMS data channel application */ - /* 11.3.64.4 Application Error Container for the SON Transfer Application */ - { 0x00, "RIM PDU Indications" }, /* 11.3.65 RIM PDU Indications */ - /* 11.3.65.0 General */ - /* 11.3.65.1 RAN-INFORMATION-REQUEST RIM PDU Indications */ - /* 11.3.65.2 RAN-INFORMATION RIM PDU Indications */ - /* 11.3.65.3 RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications */ - /* 11.3.66 (void) */ - { 0x00, "RIM Protocol Version Number" }, /* 11.3.67 RIM Protocol Version Number */ - { 0x00, "PFC Flow Control parameters" }, /* 11.3.68 PFC Flow Control parameters */ - /* 0x53, SGSAP_PDU_TYPE, DE_SGSAP_GLOBAL_CN_ID */ /* 11.3.69 Global CN-Id */ - { 0x00, "RIM Routing Information" }, /* 11.3.70 RIM Routing Information */ - { 0x00, "MBMS Session Identity" }, /* 11.3.71 MBMS Session Identity */ - { 0x00, "MBMS Session Duration" }, /* 11.3.72 MBMS Session Duration */ - { 0x00, "MBMS Service Area Identity List" }, /* 11.3.73 MBMS Service Area Identity List */ - { 0x00, "MBMS Response" }, /* 11.3.74 MBMS Response */ - { 0x00, "MBMS Routing Area List" }, /* 11.3.75 MBMS Routing Area List */ - { 0x00, "MBMS Session Information" }, /* 11.3.76 MBMS Session Information */ - { 0x00, "TMGI" }, /* 11.3.77 TMGI (Temporary Mobile Group Identity) */ - { 0x00, "MBMS Stop Cause" }, /* 11.3.78 MBMS Stop Cause */ - { 0x00, "Source BSS to Target BSS Transparent Container" }, /* 11.3.79 Source BSS to Target BSS Transparent Container */ - { 0x00, "Target BSS to Source BSS Transparent Container" }, /* 11.3.80 Target BSS to Source BSS Transparent Container */ - /* 11.3.81 NAS container for PS Handover */ - { 0x00, "PFCs to be set-up list" }, /* 11.3.82 PFCs to be set-up list */ - { 0x00, "List of set-up PFCs" }, /* 11.3.83 List of set-up PFCs */ - { 0x00, "Extended Feature Bitmap" }, /* 11.3.84 Extended Feature Bitmap */ - { 0x00, "Source to Target Transparent Container" }, /* 11.3.85 Source to Target Transparent Container */ - { 0x00, "Target to Source Transparent Container" }, /* 11.3.86 Target to Source Transparent Container */ - { 0x00, "RNC Identifier" }, /* 11.3.87 RNC Identifier */ - { 0x00, "Page Mode" }, /* 11.3.88 Page Mode */ - { 0x00, "Container ID" }, /* 11.3.89 Container ID */ - { 0x00, "Global TFI" }, /* 11.3.90 Global TFI */ - /* 11.3.91 IMEI */ - { 0x00, "Time to MBMS Data Transfer" }, /* 11.3.92 Time to MBMS Data Transfer */ - { 0x00, "MBMS Session Repetition Number" }, /* 11.3.93 MBMS Session Repetition Number */ - { 0x00, "Inter RAT Handover Info" }, /* 11.3.94 Inter RAT Handover Info */ - { 0x00, "PS Handover Command" }, /* 11.3.95 PS Handover Command */ - { 0x00, "PS Handover Indications" }, /* 11.3.95a PS Handover Indications */ - { 0x00, "SI/PSI Container" }, /* 11.3.95b SI/PSI Container */ - { 0x00, "Active PFCs List" }, /* 11.3.95c Active PFCs List */ - { 0x00, "Velocity Data" }, /* 11.3.96 Velocity Data */ - { 0x00, "DTM Handover Command" }, /* 11.3.97 DTM Handover Command */ - { 0x00, "PS Handover Indications" }, /* 11.3.98 CS Indication */ - /* 11.3.99 Requested GANSS Assistance Data 0x7b, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA*/ - /* 11.3.100 GANSS Location Type 0x7c, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP*/ - /* 11.3.101 GANSS Positioning Data ENC_BIG_ENDIAN);*/ - { 0x00, "Flow Control Granularity" }, /* 11.3.102 Flow Control Granularity */ - { 0x00, "eNB Identifier" }, /* 11.3.103 eNB Identifier */ - { 0x00, "E-UTRAN Inter RAT Handover Info" }, /* 11.3.104 E-UTRAN Inter RAT Handover Info */ - { 0x00, "Subscriber Profile ID for RAT/Frequency priority" }, /* 11.3.105 Subscriber Profile ID for RAT/Frequency priority */ - { 0x00, "Request for Inter-RAT Handover Info" }, /* 11.3.106 Request for Inter-RAT Handover Info */ - { 0x00, "Reliable Inter-RAT Handover Info" }, /* 11.3.107 Reliable Inter-RAT Handover Info */ - { 0x00, "Son transfer application identity" }, /* 11.3.108 SON Transfer Application Identity */ - { 0x00, "CSG Identifier" }, /* 11.3.109 CSG Identifier */ -/* 11.3.110 Tracking Area Code */ - - { 0, NULL } -}; - -#define NUM_BSSGP_ELEM (sizeof(bssgp_elem_strings)/sizeof(value_string)) -gint ett_bssgp_elem[NUM_BSSGP_ELEM]; - - typedef enum { DE_BSSGP_ALIGNMENT_OCTETS, /* 11.3.1 0x00 Alignment octets */ @@ -3485,6 +3335,155 @@ } bssgp_elem_idx_t; +const value_string bssgp_elem_strings[] = { + { DE_BSSGP_ALIGNMENT_OCTETS, "Alignment Octets" }, /* 11.3.1 Alignment octets */ + { DE_BSSGP_BMAX_DEFAULT_MS, "Bmax default MS" }, /* 11.3.2 Bmax default MS */ + { DE_BSSGP_BSS_AREA_IND, "BSS Area Indication" }, /* 11.3.3 BSS Area Indication */ + { DE_BSSGP_BUCKET_LEAK_RATE, "Bucket Leak Rate (R)" }, /* 11.3.4 Bucket Leak Rate (R) */ + { DE_BSSGP_BVCI, "BVCI (BSSGP Virtual Connection Identifier)" }, /* 11.3.6 BVCI (BSSGP Virtual Connection Identifier) */ + { DE_BSSGP_BVC_BUCKET_SIZE, "BVC Bucket size" }, /* 11.3.5 BVC Bucket Size */ + { DE_BSSGP_BVC_MEAS, "BVC Measurement" }, /* 11.3.7 BVC Measurement */ + { DE_BSSGP_CAUSE, "Cause" }, /* 11.3.8 Cause */ + { DE_BSSGP_CELL_ID, "Cell Identifier" }, /* 11.3.9 Cell Identifier */ + { DE_BSSGP_CHLN_NEEDED, "Channel needed" }, /* 11.3.10 Channel needed */ + { DE_BBSGP_DRX_PARAM, "DRX Parameters" }, /* 11.3.11 DRX Parameters */ + { DE_BBSGP_EMLPP_PRIO, "eMLPP-Priority" }, /* 11.3.12 eMLPP-Priority */ + { DE_BSSGP_FLUSH_ACTION, "Flush Action" }, /* 11.3.13 Flush Action */ + { DE_BSSGP_IMSI, "IMSI" }, /* 11.3.14 IMSI */ + { DE_BSSGP_LLC_PDU, "LLC-PDU" }, /* 11.3.15 LLC-PDU */ + { DE_BSSGP_LLC_FRAMES_DISC, "LLC Frames Discarded" }, /* 11.3.16 LLC Frames Discarded */ + { DE_BSSGP_LAI, "Location Area" }, /* 11.3.17 Location Area */ + { DE_BSSGP_MID, "Mobile Id" }, /* 11.3.20 Mobile Id */ + { DE_BSSGP_MS_BUCKET_SIZE, "MS Bucket Size" }, /* 11.3.21 MS Bucket Size */ + { DE_BSSGP_MS_RAD_ACC_CAP, "MS Radio Access Capability" }, /* 11.3.22 MS Radio Access Capability GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP */ + { DE_BSSGP_OMC_ID, "OMC Id" }, /* 11.3.23 OMC Id */ + { DE_BSSGP_PDU_IN_ERROR, "PDU In Error" }, /* 11.3.24 PDU In Error */ + { DE_BSSGP_PDU_LIFETIME, "PDU Lifetime" }, /* 11.3.25 PDU Lifetime */ + { DE_BSSP_PRIORITY, "Priority" }, /* 11.3.27 Priority */ + { DE_BSSGP_QOS_PROFILE, "QoS Profile" }, /* 11.3.28 QoS Profile */ + { DE_BSSGP_RA_CAUSE, "Radio Cause" }, /* 11.3.29 Radio Cause */ + { DE_BSSGP_RA_CAP_UPD_CAUSE, "RA-Cap-UPD-Cause" }, /* 11.3.30 RA-Cap-UPD-Cause */ + { DE_BSSGP_RAI, "Routeing Area" }, /* 11.3.31 Routeing Area */ + { DE_BSSGP_R_DEFAULT_MS, "R_default_MS" }, /* 11.3.32 R_default_MS */ + { DE_BBSGP_SUSPEND_REF_NO, "Suspend Reference Number" }, /* 11.3.33 Suspend Reference Number */ + { DE_BSSGP_TAG, "Tag" }, /* 11.3.34 Tag */ + { DE_BSSGP_TLLI, "Temporary logical link Identity (TLLI)" }, /* 11.3.35 Temporary logical link Identity (TLLI) GSM_A_PDU_TYPE_RR, DE_RR_TLLI*/ + { DE_BSSGP_TMSI_PTMSI, "Temporary Mobile Subscriber Identity (TMSI)" }, /* 11.3.36 Temporary Mobile Subscriber Identity (TMSI)GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI */ + { DE_BSSGP_TRACE_REF, "Trace Reference" }, /* 11.3.37 Trace Reference */ + { DE_BSSGP_TRACE_TYPE, "Trace Type" }, /* 11.3.38 Trace Type */ + { DE_BSSGP_TRANSACTION_ID, "Transaction Id" }, /* 11.3.39 Transaction Id */ + { DE_BSSGP_TRIGGER_ID, "Trigger Id" }, /* 11.3.40 Trigger Id */ + { DE_BSSGP_NO_OF_OCT_AFFECTED, "Number of octets affected" }, /* 11.3.41 Number of octets affected */ + { DE_BSSGP_LSA_ID_LIST, "LSA Identifier List" }, /* 11.3.18 LSA Identifier List */ + { DE_BSSGP_LSA_INFO, "LSA Information" }, /* 11.3.19 LSA Information */ + { DE_BSSGP_ACKET_FLOW_ID, "Packet Flow Identifier (PFI)" }, /* 11.3.42 Packet Flow Identifier (PFI) GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID*/ + /* 11.3.42a (void) */ + { DE_BSSGP_GPRS_TIMER, "GPRS Timer" }, /* 11.3.44 GPRS Timer */ + { DE_BSSGP_QOS, "Aggregate BSS QoS Profile" }, /* 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS*/ + { DE_BSSGP_FEATURE_BITMAP, "Feature Bitmap" }, /* 11.3.45 Feature Bitmap */ + { DE_BSSGP_BUCKET_FULL_RATIO, "Bucket Full Ratio" }, /* 11.3.46 Bucket Full Ratio */ + { DE_BSSGP_SERV_UTRAN_CCO, "Service UTRAN CCO" }, /* 11.3.47 Service UTRAN CCO */ + { DE_BSSGP_NSEI, "NSEI (Network Service Entity Identifier)" }, /* 11.3.48 NSEI (Network Service Entity Identifier) */ + { DE_BSSGP_RRLP_APDU, "RRLP APDU" }, /* 11.3.49 RRLP APDU */ + /* 11.3.50 LCS QoS BSSGP_IEI_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS*/ + /* 11.3.51 LCS Client Type BSSGP_IEI_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE*/ + /* 11.3.52 Requested GPS Assistance Data BSSGP_IEI_REQUESTED_GPS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GPS_ASSIST_D*/ + /* 11.3.53 Location Type 0x7c, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE*/ + /* 11.3.54 Location Estimate BSSGP_IEI_LOCATION_ESTIMATE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST*/ + /* 11.3.55 Positioning Data 0x7d, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA*/ + /* 11.3.56 Deciphering Keys BSSGP_IEI_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS */ + /* 11.3.57 LCS Priority BSSGP_IEI_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO;*/ + /* 11.3.58 LCS Cause BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE */ + /* 11.3.59 LCS Capability 0x49 , GSM_A_PDU_TYPE_GM, DE_PS_LCS_CAP*/ + { DE_BSSGP_RRLP_FLAGS, "RRLP Flags" }, /* 11.3.60 RRLP Flags */ + { DE_BSSGP_RIM_APP_ID, "RIM Application Identity" }, /* 11.3.61 RIM Application Identity */ + { DE_BSSGP_RIM_SEQ_NO, "RIM Sequence Number" }, /* 11.3.62 RIM Sequence Number */ + /* 11.3.62a RIM Container */ + /* 11.3.62a.0 General */ + { DE_BSSGP_RAN_INF_REQUEST_RIM_CONT, "RAN-INFORMATION-REQUEST RIM Container" }, /* 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container */ + { DE_BSSGP_RAN_INF_RIM_CONT, "RAN-INFORMATION RIM Container" }, /* 11.3.62a.2 RAN-INFORMATION RIM Container */ + { DE_BSSGP_RAN_INFORMATION_ACK_RIM_CONT, "RAN-INFORMATION-ACK RIM Container" }, /* 11.3.62a.3 RAN-INFORMATION-ACK RIM Container */ + { DE_BSSGP_RAN_INFORMATION_ERROR_RIM_CONT, "RAN-INFORMATION-ERROR RIM Container" }, /* 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container */ + { DE_BSSGP_RAN_INF_APP_ERROR_RIM_CONT, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, /* 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container */ + /* 11.3.63 Application Container */ + { DE_BSSGP_RAN_INFORMATION_REQUEST_APP_CONT, "RAN-INFORMATION-REQUEST Application Container" }, /* 11.3.63.1 RAN-INFORMATION-REQUEST Application Container */ + /* 11.3.63.1.0 General */ + /* 11.3.63.1.1 RAN-INFORMATION-REQUEST Application Container for the NACC Application */ + /* 11.3.63.1.2 RAN-INFORMATION-REQUEST Application Container for the SI3 Application */ + /* 11.3.63.1.3 RAN-INFORMATION-REQUEST Application Container for the MBMS data channel Application */ + /* 11.3.63.1.4 RAN-INFORMATION-REQUEST Application Container for the SON Transfer Application */ + { DE_BSSGP_RAN_INFORMATION_APP_CONT_UNIT, "RAN-INFORMATION Application Container Unit" }, /* 11.3.63.2 RAN-INFORMATION Application Container Unit */ + /* 11.3.63.2.0 General */ + /* 11.3.63.2.1 RAN-INFORMATION Application Container for the NACC Application */ + /* 11.3.63.2.2 RAN-INFORMATION Application Container for the SI3 Application */ + /* 11.3.63.2.3 RAN-INFORMATION Application Container for the MBMS data channel Application */ + /* 11.3.63.2.4 RAN-INFORMATION Application Container for the SON Transfer Application */ + { DE_BSSGP_RAN_APP_ERROR_CONT, "Application Error Container" }, /* 11.3.64 Application Error Container */ + /* 11.3.64.1 Application Error Container layout for the NACC application */ + /* 11.3.64.2 Application Error Container for the SI3 application */ + /* 11.3.64.3 Application Error Container for the MBMS data channel application */ + /* 11.3.64.4 Application Error Container for the SON Transfer Application */ + { DE_BSSGP_RIM_PDU_INDICATIONS, "RIM PDU Indications" }, /* 11.3.65 RIM PDU Indications */ + /* 11.3.65.0 General */ + /* 11.3.65.1 RAN-INFORMATION-REQUEST RIM PDU Indications */ + /* 11.3.65.2 RAN-INFORMATION RIM PDU Indications */ + /* 11.3.65.3 RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications */ + /* 11.3.66 (void) */ + { DE_BSSGP_RIM_PROTO_VER_NO, "RIM Protocol Version Number" }, /* 11.3.67 RIM Protocol Version Number */ + { DE_BSSGP_PFC_FLOW_CTRL, "PFC Flow Control parameters" }, /* 11.3.68 PFC Flow Control parameters */ + /* 0x53, SGSAP_PDU_TYPE, DE_SGSAP_GLOBAL_CN_ID */ /* 11.3.69 Global CN-Id */ + { DE_BSSGP_RIM_ROUTING_INF, "RIM Routing Information" }, /* 11.3.70 RIM Routing Information */ + { DE_BSSGP_MBMS_SESSION_ID, "MBMS Session Identity" }, /* 11.3.71 MBMS Session Identity */ + { DE_BSSGP_MBMS_SESSION_DUR, "MBMS Session Duration" }, /* 11.3.72 MBMS Session Duration */ + { DE_BSSGP_MBMS_SAI_LIST, "MBMS Service Area Identity List" }, /* 11.3.73 MBMS Service Area Identity List */ + { DE_BSSGP_MBMS_RESPONSE, "MBMS Response" }, /* 11.3.74 MBMS Response */ + { DE_BSSGP_MBMS_RA_LIST, "MBMS Routing Area List" }, /* 11.3.75 MBMS Routing Area List */ + { DE_BSSGP_MBMS_SESSION_INF, "MBMS Session Information" }, /* 11.3.76 MBMS Session Information */ + { DE_BSSGP_TMGI, "TMGI" }, /* 11.3.77 TMGI (Temporary Mobile Group Identity) */ + { DE_BSSGP_MBMS_STOP_CAUSE, "MBMS Stop Cause" }, /* 11.3.78 MBMS Stop Cause */ + { DE_BSSGP_SOURCE_BSS_TO_TARGET_BSS_TRANSP_CONT, "Source BSS to Target BSS Transparent Container" }, /* 11.3.79 Source BSS to Target BSS Transparent Container */ + { DE_BSSGP_TARGET_BSS_TO_SOURCE_BSS_TRANSP_CONT, "Target BSS to Source BSS Transparent Container" }, /* 11.3.80 Target BSS to Source BSS Transparent Container */ + /* 11.3.81 NAS container for PS Handover */ + { DE_BSSGP_PFCS_TO_BE_SET_UP_LIST, "PFCs to be set-up list" }, /* 11.3.82 PFCs to be set-up list */ + { DE_BSSGP_LIST_OF_SETUP_PFCS, "List of set-up PFCs" }, /* 11.3.83 List of set-up PFCs */ + { DE_BSSGP_EXT_FEATURE_BITMAP, "Extended Feature Bitmap" }, /* 11.3.84 Extended Feature Bitmap */ + { DE_BSSGP_SRC_TO_TRG_TRANSP_CONT, "Source to Target Transparent Container" }, /* 11.3.85 Source to Target Transparent Container */ + { DE_BSSGP_TRG_TO_SRC_TRANSP_CONT, "Target to Source Transparent Container" }, /* 11.3.86 Target to Source Transparent Container */ + { BE_BSSGP_RNC_ID, "RNC Identifier" }, /* 11.3.87 RNC Identifier */ + { DE_BSSGP_PAGE_MODE, "Page Mode" }, /* 11.3.88 Page Mode */ + { DE_BSSGP_CONTAINER_ID, "Container ID" }, /* 11.3.89 Container ID */ + { DE_BSSGP_GLOBAL_TFI, "Global TFI" }, /* 11.3.90 Global TFI */ + /* 11.3.91 IMEI */ + { DE_BSSGP_TIME_TO_MBMS_DATA_TRAN, "Time to MBMS Data Transfer" }, /* 11.3.92 Time to MBMS Data Transfer */ + { DE_BSSGP_MBMS_SESSION_REP_NO, "MBMS Session Repetition Number" }, /* 11.3.93 MBMS Session Repetition Number */ + { DE_BSSGP_INTER_RAT_HO_INFO, "Inter RAT Handover Info" }, /* 11.3.94 Inter RAT Handover Info */ + { DE_BSSGP_PS_HO_CMD, "PS Handover Command" }, /* 11.3.95 PS Handover Command */ + { DE_BSSGP_PS_HO_INDICATIONS, "PS Handover Indications" }, /* 11.3.95a PS Handover Indications */ + { DE_BSSGP_SIPSI_CONTAINER, "SI/PSI Container" }, /* 11.3.95b SI/PSI Container */ + { DE_BSSGP_ACTIVE_PFCS_LIST, "Active PFCs List" }, /* 11.3.95c Active PFCs List */ + { DE_BSSGP_VELOCITY_DATA, "Velocity Data" }, /* 11.3.96 Velocity Data */ + { DE_BBSGP_DTM_HO_CMD, "DTM Handover Command" }, /* 11.3.97 DTM Handover Command */ + { DE_BSSGP_CS_INDICATION, "CS Indication" }, /* 11.3.98 CS Indication */ + /* 11.3.99 Requested GANSS Assistance Data 0x7b, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA*/ + /* 11.3.100 GANSS Location Type 0x7c, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP*/ + /* 11.3.101 GANSS Positioning Data ENC_BIG_ENDIAN);*/ + { DE_BSSGP_FLOW_CONTROL_GRAN, "Flow Control Granularity" }, /* 11.3.102 Flow Control Granularity */ + { DE_BSSGP_ENB_ID, "eNB Identifier" }, /* 11.3.103 eNB Identifier */ + { DE_BSSGP_E_UTRAN_INTER_RAT_HO_INFO, "E-UTRAN Inter RAT Handover Info" }, /* 11.3.104 E-UTRAN Inter RAT Handover Info */ + { DE_BSSGP_SUB_PROF_ID_F_RAT_FRQ_PRIO, "Subscriber Profile ID for RAT/Frequency priority" }, /* 11.3.105 Subscriber Profile ID for RAT/Frequency priority */ + { DE_BSSGP_REQ_FOR_INTER_RAT_HO_INFO, "Request for Inter-RAT Handover Info" }, /* 11.3.106 Request for Inter-RAT Handover Info */ + { DE_BSSGP_RELIABLE_INTER_RAT_HO_INF, "Reliable Inter-RAT Handover Info" }, /* 11.3.107 Reliable Inter-RAT Handover Info */ + { DE_BSSGP_SON_TRANSFER_APP_ID, "Son transfer application identity" }, /* 11.3.108 SON Transfer Application Identity */ + { DE_BSSGP_CSG_ID, "CSG Identifier" }, /* 11.3.109 CSG Identifier */ +/* 11.3.110 Tracking Area Code */ + + { 0, NULL } +}; + +#define NUM_BSSGP_ELEM (sizeof(bssgp_elem_strings)/sizeof(value_string)) +gint ett_bssgp_elem[NUM_BSSGP_ELEM]; + + guint16 (*bssgp_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { de_bssgp_aligment_octets, /* 11.3.1 0x00 Alignment octets */ de_bssgp_bmax_default_ms, /* 11.3.2 0x01 Bmax default MS */

@@ -1862,7 +1862,7 @@ { int key_string_len; int i, j; - char input[2]; + char input[3]; if (!key_string || !key_bin) return -1; @@ -1870,6 +1870,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) {

@@ -76,8 +76,8 @@ /* ------------------------------------------------------------------------ */ const value_string gmr1_ie_common_strings[] = { - { 0, "Mobile Earth Station Classmark 2" }, /* [1] 11.5.1.6 */ - { 0, "Spare Half Octet" }, /* [1] 11.5.1.8 */ + { GMR1_IE_COM_CM2, "Mobile Earth Station Classmark 2" }, /* [1] 11.5.1.6 */ + { GMR1_IE_COM_SPARE_NIBBLE, "Spare Half Octet" }, /* [1] 11.5.1.8 */ { 0, NULL} };

@@ -95,37 +95,68 @@ }; const value_string gmr1_ie_rr_strings[] = { - { 0, "Channel Description" }, /* [1] 11.5.2.5 */ - { 0, "Channel Mode" }, /* [1] 11.5.2.6 */ - { 0, "Cipher Mode Setting" }, /* [4] 10.5.2.9 */ - { 0, "Cipher Response" }, /* [4] 10.5.2.10 */ - { 0, "L2 Pseudo Length" }, /* [1] 11.5.2.19 */ - { 0, "Page Mode" }, /* [1] 11.5.2.26 */ - { 0, "Request Reference" }, /* [1] 11.5.2.30 */ - { 0, "RR Cause" }, /* [1] 11.5.2.31 */ - { 0, "Timing Offset" }, /* [1] 11.5.2.40 */ - { 0, "TMSI/P-TMSI" }, /* [4] 10.5.2.42 */ - { 0, "Wait Indication" }, /* [4] 10.5.2.43 */ - { 0, "MES Information Flag" }, /* [1] 11.5.2.44 */ - { 0, "Frequency Offset" }, /* [1] 11.5.2.49 */ - { 0, "Paging Information" }, /* [1] 11.5.2.51 */ - { 0, "Position Display" }, /* [1] 11.5.2.52 */ - { 0, "Position Update Information" }, /* [1] 11.5.2.54 */ - { 0, "BCCH Carrier Specification"}, /* [1] 11.5.2.55 */ - { 0, "Reject Cause" }, /* [1] 11.5.2.56 */ - { 0, "GPS timestamp" }, /* [1] 11.5.2.57 */ - { 0, "TMSI Availability Mask" }, /* [1] 11.5.2.62 */ - { 0, "GPS Almanac Data" }, /* [1] 11.5.2.63 */ - { 0, "MSC ID" }, /* [1] 11.5.2.100 */ - { 0, "GPS Discriminator" }, /* [1] 11.5.2.101 */ - { 0, "Packet Imm. Ass. Type 3 Params" },/* [3] 11.5.2.105 */ - { 0, "Packet Frequency Parameters" }, /* [3] 11.5.2.106 */ - { 0, "Packet Imm. Ass. Type 2 Params" },/* [3] 11.5.2.107 */ - { 0, "USF" }, /* [3] 11.5.2.110 */ - { 0, "Timing Advance Index" }, /* [3] 10.1.18.3.4 */ - { 0, "TLLI" }, /* [5] 12.16 */ - { 0, "Packet Power Control Params" }, /* [3] 10.1.18.3.3 */ - { 0, "Persistence Level" }, /* [3] 10.1.18.4.2 */ + { GMR1_IE_RR_CHAN_DESC, + "Channel Description" }, /* [1] 11.5.2.5 */ + { GMR1_IE_RR_CHAN_MODE, + "Channel Mode" }, /* [1] 11.5.2.6 */ + { GMR1_IE_RR_CIPH_MODE_SETTING, + "Cipher Mode Setting" }, /* [4] 10.5.2.9 */ + { GMR1_IE_RR_CIPH_RESP, + "Cipher Response" }, /* [4] 10.5.2.10 */ + { GMR1_IE_RR_L2_PSEUDO_LEN, + "L2 Pseudo Length" }, /* [1] 11.5.2.19 */ + { GMR1_IE_RR_PAGE_MODE, + "Page Mode" }, /* [1] 11.5.2.26 */ + { GMR1_IE_RR_REQ_REF, + "Request Reference" }, /* [1] 11.5.2.30 */ + { GMR1_IE_RR_CAUSE, + "RR Cause" }, /* [1] 11.5.2.31 */ + { GMR1_IE_RR_TIMING_OFS, + "Timing Offset" }, /* [1] 11.5.2.40 */ + { GMR1_IE_RR_TMSI_PTMSI, + "TMSI/P-TMSI" }, /* [4] 10.5.2.42 */ + { GMR1_IE_RR_WAIT_IND, + "Wait Indication" }, /* [4] 10.5.2.43 */ + { GMR1_IE_RR_MES_INFO_FLG, + "MES Information Flag" }, /* [1] 11.5.2.44 */ + { GMR1_IE_RR_FREQ_OFS, + "Frequency Offset" }, /* [1] 11.5.2.49 */ + { GMR1_IE_RR_PAGE_INFO, + "Paging Information" }, /* [1] 11.5.2.51 */ + { GMR1_IE_RR_POS_DISPLAY, + "Position Display" }, /* [1] 11.5.2.52 */ + { GMR1_IE_RR_POS_UPD_INFO, + "Position Update Information" }, /* [1] 11.5.2.54 */ + { GMR1_IE_RR_BCCH_CARRIER, + "BCCH Carrier Specification"}, /* [1] 11.5.2.55 */ + { GMR1_IE_RR_REJECT_CAUSE, + "Reject Cause" }, /* [1] 11.5.2.56 */ + { GMR1_IE_RR_GPS_TIMESTAMP, + "GPS timestamp" }, /* [1] 11.5.2.57 */ + { GMR1_IE_RR_TMSI_AVAIL_MSK, + "TMSI Availability Mask" }, /* [1] 11.5.2.62 */ + { GMR1_IE_RR_GPS_ALMANAC, + "GPS Almanac Data" }, /* [1] 11.5.2.63 */ + { GMR1_IE_RR_MSC_ID, + "MSC ID" }, /* [1] 11.5.2.100 */ + { GMR1_IE_RR_GPS_DISCR, + "GPS Discriminator" }, /* [1] 11.5.2.101 */ + { GMR1_IE_RR_PKT_IMM_ASS_3_PRM, + "Packet Imm. Ass. Type 3 Params" }, /* [3] 11.5.2.105 */ + { GMR1_IE_RR_PKT_FREQ_PRM, + "Packet Frequency Parameters" }, /* [3] 11.5.2.106 */ + { GMR1_IE_RR_PKT_IMM_ASS_2_PRM, + "Packet Imm. Ass. Type 2 Params" }, /* [3] 11.5.2.107 */ + { GMR1_IE_RR_USF, + "USF" }, /* [3] 11.5.2.110 */ + { GMR1_IE_RR_TIMING_ADV_IDX, + "Timing Advance Index" }, /* [3] 10.1.18.3.4 */ + { GMR1_IE_RR_TLLI, + "TLLI" }, /* [5] 12.16 */ + { GMR1_IE_RR_PKT_PWR_CTRL_PRM, + "Packet Power Control Params" }, /* [3] 10.1.18.3.3 */ + { GMR1_IE_RR_PERSISTENCE_LVL, + "Persistence Level" }, /* [3] 10.1.18.4.2 */ { 0, NULL }, };

@@ -193,119 +193,135 @@ static value_string_ext gsm_a_bssmap_msg_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_bssmap_msg_strings); const value_string gsm_bssmap_elem_strings[] = { - { 0x01, "Circuit Identity Code" }, - { 0x02, "Reserved" }, - { 0x03, "Resource Available" }, - { 0x04, "Cause" }, - { 0x05, "Cell Identifier" }, - { 0x06, "Priority" }, - { 0x07, "Layer 3 Header Information" }, - { 0x08, "IMSI" }, - { 0x09, "TMSI" }, - { 0x0a, "Encryption Information" }, - { 0x0b, "Channel Type" }, - { 0x0c, "Periodicity" }, - { 0x0d, "Extended Resource Indicator" }, - { 0x0e, "Number Of MSs" }, - { 0x0f, "Reserved" }, - { 0x10, "Reserved" }, - { 0x11, "Reserved" }, - { 0x12, "Classmark Information Type 2" }, - { 0x13, "Classmark Information Type 3" }, - { 0x14, "Interference Band To Be Used" }, - { 0x15, "RR Cause" }, - { 0x16, "Reserved" }, - { 0x17, "Layer 3 Information" }, - { 0x18, "DLCI" }, - { 0x19, "Downlink DTX Flag" }, - { 0x1a, "Cell Identifier List" }, - { 0x1b, "Response Request" }, - { 0x1c, "Resource Indication Method" }, - { 0x1d, "Classmark Information Type 1" }, - { 0x1e, "Circuit Identity Code List" }, - { 0x1f, "Diagnostic" }, - { 0x20, "Layer 3 Message Contents" }, - { 0x21, "Chosen Channel" }, - { 0x22, "Total Resource Accessible" }, - { 0x23, "Cipher Response Mode" }, - { 0x24, "Channel Needed" }, - { 0x25, "Trace Type" }, - { 0x26, "TriggerID" }, - { 0x27, "Trace Reference" }, - { 0x28, "TransactionID" }, - { 0x29, "Mobile Identity" }, - { 0x2a, "OMCID" }, - { 0x2b, "Forward Indicator" }, - { 0x2c, "Chosen Encryption Algorithm" }, - { 0x2d, "Circuit Pool" }, - { 0x2e, "Circuit Pool List" }, - { 0x2f, "Time Indication" }, - { 0x30, "Resource Situation" }, - { 0x31, "Current Channel Type 1" }, - { 0x32, "Queuing Indicator" }, - { 0x40, "Speech Version" }, - { 0x33, "Assignment Requirement" }, - { 0x35, "Talker Flag" }, - { 0x36, "Connection Release Requested" }, - { 0x37, "Group Call Reference" }, - { 0x38, "eMLPP Priority" }, - { 0x39, "Configuration Evolution Indication" }, - { 0x3a, "Old BSS to New BSS Information" }, - { 0x3b, "LSA Identifier" }, - { 0x3c, "LSA Identifier List" }, - { 0x3d, "LSA Information" }, - { 0x3e, "LCS QoS" }, - { 0x3f, "LSA access control suppression" }, - { 0x43, "LCS Priority" }, - { 0x44, "Location Type" }, - { 0x45, "Location Estimate" }, - { 0x46, "Positioning Data" }, - { 0x47, "LCS Cause" }, - { 0x48, "LCS Client Type" }, - { GSM_BSSMAP_APDU_IE, "APDU" }, - { 0x4a, "Network Element Identity" }, - { 0x4b, "GPS Assistance Data" }, - { 0x4c, "Deciphering Keys" }, - { 0x4d, "Return Error Request" }, - { 0x4e, "Return Error Cause" }, - { 0x4f, "Segmentation" }, - { 0x50, "Service Handover" }, - { 0x51, "Source RNC to target RNC transparent information (UMTS)" }, - { 0x52, "Source RNC to target RNC transparent information (cdma2000)" }, - { 0x53, "GERAN Classmark" }, - { 0x54, "GERAN BSC Container" }, - { 0x61, "New BSS to Old BSS Information" }, - { 0x63, "Inter-System Information" }, - { 0x64, "SNA Access Information" }, - { 0x65, "VSTK_RAND Information" }, - { 0x66, "VSTK Information" }, - { 0x67, "Paging Information" }, - { 0x68, "IMEI" }, - { 0x55, "Velocity Estimate" }, - { 0x69, "VGCS Feature Flags" }, - { 0x6a, "Talker Priority" }, - { 0x6b, "Emergency Set Indication" }, - { 0x6c, "Talker Identity" }, - { 0x6d, "Cell Identifier List Segment" }, - { 0x6e, "SMS to VGCS" }, - { 0x6f, "VGCS Talker Mode" }, - { 0x70, "VGCS/VBS Cell Status" }, - { 0x71, "Cell Identifier List Segment for established cells" }, - { 0x72, "Cell Identifier List Segment for cells to be established" }, - { 0x73, "Cell Identifier List Segment for released cells - no user present" }, - { 0x74, "Cell Identifier List Segment for not established cells - no establishment possible" }, - { 0x75, "GANSS Assistance Data" }, - { 0x76, "GANSS Positioning Data" }, - { 0x77, "GANSS Location Type" }, - { 0x78, "Application Data" }, - { 0x79, "Data Identity" }, - { 0x7a, "Application Data Information" }, - { 0x7b, "MSISDN" }, - { 0x7c, "AoIP Transport Layer Address" }, - { 0x7d, "Speech Codec List" }, - { 0x7e, "Speech Codec" }, - { 0x7f, "Call Identifier" }, - { 0x80, "Call Identifier List" }, + { BE_UDEF_0, "Undefined" }, + { BE_CIC, "Circuit Identity Code" }, + { BE_RSVD_1, "Reserved" }, + { BE_RES_AVAIL, "Resource Available" }, + { BE_CAUSE, "Cause" }, + { BE_CELL_ID, "Cell Identifier" }, + { BE_PRIO, "Priority" }, + { BE_L3_HEADER_INFO, "Layer 3 Header Information" }, + { BE_IMSI, "IMSI" }, + { BE_TMSI, "TMSI" }, + { BE_ENC_INFO, "Encryption Information" }, + { BE_CHAN_TYPE, "Channel Type" }, + { BE_PERIODICITY, "Periodicity" }, + { BE_EXT_RES_IND, "Extended Resource Indicator" }, + { BE_NUM_MS, "Number Of MSs" }, + { BE_RSVD_2, "Reserved" }, + { BE_RSVD_3, "Reserved" }, + { BE_RSVD_4, "Reserved" }, + { BE_CM_INFO_2, "Classmark Information Type 2" }, + { BE_CM_INFO_3, "Classmark Information Type 3" }, + { BE_INT_BAND, "Interference Band To Be Used" }, + { BE_RR_CAUSE, "RR Cause" }, + { BE_RSVD_5, "Reserved" }, + { BE_L3_INFO, "Layer 3 Information" }, + { BE_DLCI, "DLCI" }, + { BE_DOWN_DTX_FLAG, "Downlink DTX Flag" }, + { BE_CELL_ID_LIST, "Cell Identifier List" }, + { BE_RESP_REQ, "Response Request" }, + { BE_RES_IND_METHOD, "Resource Indication Method" }, + { BE_CM_INFO_1, "Classmark Information Type 1" }, + { BE_CIC_LIST, "Circuit Identity Code List" }, + { BE_DIAG, "Diagnostic" }, + { BE_L3_MSG, "Layer 3 Message Contents" }, + { BE_CHOSEN_CHAN, "Chosen Channel" }, + { BE_TOT_RES_ACC, "Total Resource Accessible" }, + { BE_CIPH_RESP_MODE, "Cipher Response Mode" }, + { BE_CHAN_NEEDED, "Channel Needed" }, + { BE_TRACE_TYPE, "Trace Type" }, + { BE_TRIGGERID, "TriggerID" }, + { BE_TRACE_REF, "Trace Reference" }, + { BE_TRANSID, "TransactionID" }, + { BE_MID, "Mobile Identity" }, + { BE_OMCID, "OMCID" }, + { BE_FOR_IND, "Forward Indicator" }, + { BE_CHOSEN_ENC_ALG, "Chosen Encryption Algorithm" }, + { BE_CCT_POOL, "Circuit Pool" }, + { BE_CCT_POOL_LIST, "Circuit Pool List" }, + { BE_TIME_IND, "Time Indication" }, + { BE_RES_SIT, "Resource Situation" }, + { BE_CURR_CHAN_1, "Current Channel Type 1" }, + { BE_QUE_IND, "Queuing Indicator" }, + { BE_ASS_REQ, "Assignment Requirement" }, + { BE_UDEF_52, "Undefined" }, + { BE_TALKER_FLAG, "Talker Flag" }, + { BE_CONN_REL_REQ, "Connection Release Requested" }, + { BE_GROUP_CALL_REF, "Group Call Reference" }, + { BE_EMLPP_PRIO, "eMLPP Priority" }, + { BE_CONF_EVO_IND, "Configuration Evolution Indication" }, + { BE_OLD2NEW_INFO, "Old BSS to New BSS Information" }, + { BE_LSA_ID, "LSA Identifier" }, + { BE_LSA_ID_LIST, "LSA Identifier List" }, + { BE_LSA_INFO, "LSA Information" }, + { BE_LCS_QOS, "LCS QoS" }, + { BE_LSA_ACC_CTRL, "LSA access control suppression" }, + { BE_SPEECH_VER, "Speech Version" }, + { BE_UDEF_65, "Undefined" }, + { BE_UDEF_66, "Undefined" }, + { BE_LCS_PRIO, "LCS Priority" }, + { BE_LOC_TYPE, "Location Type" }, + { BE_LOC_EST, "Location Estimate" }, + { BE_POS_DATA, "Positioning Data" }, + { BE_LCS_CAUSE, "LCS Cause" }, + { BE_LCS_CLIENT, "LCS Client Type" }, + { BE_APDU, "APDU" }, + { BE_NE_ID, "Network Element Identity" }, + { BE_GPS_ASSIST_DATA, "GPS Assistance Data" }, + { BE_DECIPH_KEYS, "Deciphering Keys" }, + { BE_RET_ERR_REQ, "Return Error Request" }, + { BE_RET_ERR_CAUSE, "Return Error Cause" }, + { BE_SEG, "Segmentation" }, + { BE_SERV_HO, "Service Handover" }, + { BE_SRC_RNC_TO_TAR_RNC_UMTS, "Source RNC to target RNC transparent information (UMTS)" }, + { BE_SRC_RNC_TO_TAR_RNC_CDMA, "Source RNC to target RNC transparent information (cdma2000)" }, + { BE_GERAN_CLS_M, "GERAN Classmark" }, + { BE_GERAN_BSC_CONT, "GERAN BSC Container" }, + { BE_VEL_EST, "Velocity Estimate" }, + { BE_UDEF_86, "Undefined" }, + { BE_UDEF_87, "Undefined" }, + { BE_UDEF_88, "Undefined" }, + { BE_UDEF_89, "Undefined" }, + { BE_UDEF_90, "Undefined" }, + { BE_UDEF_91, "Undefined" }, + { BE_UDEF_92, "Undefined" }, + { BE_UDEF_93, "Undefined" }, + { BE_UDEF_94, "Undefined" }, + { BE_UDEF_95, "Undefined" }, + { BE_UDEF_96, "Undefined" }, + { BE_NEW_BSS_TO_OLD_BSS_INF, "New BSS to Old BSS Information" }, + { BE_UDEF_98, "Undefined" }, + { BE_INTER_SYS_INF, "Inter-System Information" }, + { BE_SNA_ACC_INF, "SNA Access Information" }, + { BE_VSTK_RAND_INF, "VSTK_RAND Information" }, + { BE_VSTK_INF, "VSTK Information" }, + { BE_PAGING_INF, "Paging Information" }, + { BE_IMEI, "IMEI" }, + { BE_VGCS_FEAT_FLG, "VGCS Feature Flags" }, + { BE_TALKER_PRI, "Talker Priority" }, + { BE_EMRG_SET_IND, "Emergency Set Indication" }, + { BE_TALKER_ID, "Talker Identity" }, + { BE_CELL_ID_LIST_SEG, "Cell Identifier List Segment" }, + { BE_SMS_TO_VGCS, "SMS to VGCS" }, + { BE_VGCS_TALKER_MOD, "VGCS Talker Mode" }, + { BE_VGS_VBS_CELL_STAT, "VGCS/VBS Cell Status" }, + { BE_CELL_ID_LST_SEG_F_EST_CELLS, "Cell Identifier List Segment for established cells" }, + { BE_CELL_ID_LST_SEG_F_CELL_TB_EST, "Cell Identifier List Segment for cells to be established" }, + { BE_CELL_ID_LST_SEG_F_REL_CELL, "Cell Identifier List Segment for released cells - no user present" }, + { BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, "Cell Identifier List Segment for not established cells - no establishment possible" }, + { BE_GANSS_ASS_DTA, "GANSS Assistance Data" }, + { BE_GANSS_POS_DTA, "GANSS Positioning Data" }, + { BE_GANSS_LOC_TYP, "GANSS Location Type" }, + { BE_APP_DATA, "Application Data" }, + { BE_DATA_ID, "Data Identity" }, + { BE_APP_DATA_INF, "Application Data Information" }, + { BE_MSISDN, "MSISDN" }, + { BE_AOIP_TRANS_LAY_ADD, "AoIP Transport Layer Address" }, + { BE_SPEECH_CODEC_LST, "Speech Codec List" }, + { BE_SPEECH_CODEC, "Speech Codec" }, + { BE_CALL_ID, "Call Identifier" }, + { BE_CALL_ID_LST, "Call Identifier List" }, { 0, NULL } }; @@ -593,120 +609,136 @@ typedef enum { - BE_CIC, /* Circuit Identity Code */ - BE_RSVD_1, /* Reserved */ - BE_RES_AVAIL, /* Resource Available */ - BE_CAUSE, /* Cause */ - BE_CELL_ID, /* Cell Identifier */ - BE_PRIO, /* Priority */ - BE_L3_HEADER_INFO, /* Layer 3 Header Information */ - BE_IMSI, /* IMSI */ - BE_TMSI, /* TMSI */ - BE_ENC_INFO, /* Encryption Information */ - BE_CHAN_TYPE, /* Channel Type */ - BE_PERIODICITY, /* Periodicity */ - BE_EXT_RES_IND, /* Extended Resource Indicator */ - BE_NUM_MS, /* Number Of MSs */ - BE_RSVD_2, /* Reserved */ - BE_RSVD_3, /* Reserved */ - BE_RSVD_4, /* Reserved */ - BE_CM_INFO_2, /* Classmark Information Type 2 */ - BE_CM_INFO_3, /* Classmark Information Type 3 */ - BE_INT_BAND, /* Interference Band To Be Used */ - BE_RR_CAUSE, /* RR Cause */ - BE_RSVD_5, /* Reserved */ - BE_L3_INFO, /* Layer 3 Information */ - BE_DLCI, /* DLCI */ - BE_DOWN_DTX_FLAG, /* Downlink DTX Flag */ - BE_CELL_ID_LIST, /* Cell Identifier List */ - BE_RESP_REQ, /* Response Request */ - BE_RES_IND_METHOD, /* Resource Indication Method */ - BE_CM_INFO_1, /* Classmark Information Type 1 */ - BE_CIC_LIST, /* Circuit Identity Code List */ - BE_DIAG, /* Diagnostic */ - BE_L3_MSG, /* Layer 3 Message Contents */ - BE_CHOSEN_CHAN, /* Chosen Channel */ - BE_TOT_RES_ACC, /* Total Resource Accessible */ - BE_CIPH_RESP_MODE, /* Cipher Response Mode */ - BE_CHAN_NEEDED, /* Channel Needed */ - BE_TRACE_TYPE, /* Trace Type */ - BE_TRIGGERID, /* TriggerID */ - BE_TRACE_REF, /* Trace Reference */ - BE_TRANSID, /* TransactionID */ - BE_MID, /* Mobile Identity */ - BE_OMCID, /* OMCID */ - BE_FOR_IND, /* Forward Indicator */ - BE_CHOSEN_ENC_ALG, /* Chosen Encryption Algorithm */ - BE_CCT_POOL, /* Circuit Pool */ - BE_CCT_POOL_LIST, /* Circuit Pool List */ - BE_TIME_IND, /* Time Indication */ - BE_RES_SIT, /* Resource Situation */ - BE_CURR_CHAN_1, /* Current Channel Type 1 */ - BE_QUE_IND, /* Queueing Indicator */ - BE_SPEECH_VER, /* Speech Version */ - BE_ASS_REQ, /* Assignment Requirement */ - BE_TALKER_FLAG, /* Talker Flag */ - BE_CONN_REL_REQ, /* Connection Release Requested */ - BE_GROUP_CALL_REF, /* Group Call Reference */ - BE_EMLPP_PRIO, /* eMLPP Priority */ - BE_CONF_EVO_IND, /* Configuration Evolution Indication */ - BE_OLD2NEW_INFO, /* Old BSS to New BSS Information */ - BE_LSA_ID, /* LSA Identifier */ - BE_LSA_ID_LIST, /* LSA Identifier List */ - BE_LSA_INFO, /* LSA Information */ - BE_LCS_QOS, /* LCS QoS */ - BE_LSA_ACC_CTRL, /* LSA access control suppression */ - BE_LCS_PRIO, /* LCS Priority */ - BE_LOC_TYPE, /* Location Type */ - BE_LOC_EST, /* Location Estimate */ - BE_POS_DATA, /* Positioning Data */ - BE_LCS_CAUSE, /* 3*2*2*66 LCS Cause */ - BE_LCS_CLIENT, /* LCS Client Type */ - BE_APDU, /* APDU */ - BE_NE_ID, /* Network Element Identity */ - BE_GPS_ASSIST_DATA, /* GPS Assistance Data */ - BE_DECIPH_KEYS, /* Deciphering Keys */ - BE_RET_ERR_REQ, /* Return Error Request */ - BE_RET_ERR_CAUSE, /* Return Error Cause */ - BE_SEG, /* Segmentation */ - BE_SERV_HO, /* Service Handover */ - BE_SRC_RNC_TO_TAR_RNC_UMTS, /* Source RNC to target RNC transparent information (UMTS) */ - BE_SRC_RNC_TO_TAR_RNC_CDMA, /* Source RNC to target RNC transparent information (cdma2000) */ - BE_GERAN_CLS_M, /* GERAN Classmark */ - BE_GRAN_BSC_CONT, /* GERAN BSC Container */ - BE_NEW_BSS_TO_OLD_BSS_INF, /* New BSS to Old BSS Information */ - BE_INTER_SYS_INF, /* Inter-System Information */ - BE_SNA_ACC_INF, /* SNA Access Information */ - BE_VSTK_RAND_INF, /* VSTK_RAND Information */ - BE_VSTK_INF, /* VSTK Information */ - BE_PAGING_INF, /* Paging Information */ - BE_IMEI, /* IMEI */ - BE_VEL_EST, /* Velocity Estimate */ - BE_VGCS_FEAT_FLG, /* VGCS Feature Flags */ - BE_TALKER_PRI, /* Talker Priority */ - BE_EMRG_SET_IND, /* Emergency Set Indication */ - BE_TALKER_ID, /* Talker Identity */ - BE_CELL_ID_LIST_SEG, /* Cell Identifier List Segment */ - BE_SMS_TO_VGCS, /* SMS to VGCS */ - BE_VGCS_TALKER_MOD, /* VGCS Talker Mode */ - BE_VGS_VBS_CELL_STAT, /* VGCS/VBS Cell Status */ - BE_CELL_ID_LST_SEG_F_EST_CELLS, /* Cell Identifier List Segment for established cells */ - BE_CELL_ID_LST_SEG_F_CELL_TB_EST, /* Cell Identifier List Segment for cells to be established */ - BE_CELL_ID_LST_SEG_F_REL_CELL, /* Cell Identifier List Segment for released cells - no user present */ - BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, /* Cell Identifier List Segment for not established cells - no establishment possible */ - BE_GANSS_ASS_DTA, /* GANSS Assistance Data */ - BE_GANSS_POS_DTA, /* GANSS Positioning Data */ - BE_GANSS_LOC_TYP, /* GANSS Location Type */ - BE_APP_DATA, /* Application Data */ - BE_DATA_ID /* Data Identity */ - BE_APP_DATA_INF, /* Application Data Information */ - BE_MSISDN, /* MSISDN */ - BE_AOIP_TRANS_LAY_ADD, /* AoIP Transport Layer Address */ - BE_SPEECH_CODEC_LST, /* Speech Codec List */ - BE_SPEECH_CODEC, /* Speech Codec */ - BE_CALL_ID, /* Call Identifier */ - BE_CALL_ID_LST, /* Call Identifier List */ - BE_NONE /* NONE */ + BE_UDEF_0, /* Undefined */ + BE_CIC, /* Circuit Identity Code */ + BE_RSVD_1, /* Reserved */ + BE_RES_AVAIL, /* Resource Available */ + BE_CAUSE, /* Cause */ + BE_CELL_ID, /* Cell Identifier */ + BE_PRIO, /* Priority */ + BE_L3_HEADER_INFO, /* Layer 3 Header Information */ + BE_IMSI, /* IMSI */ + BE_TMSI, /* TMSI */ + BE_ENC_INFO, /* Encryption Information */ + BE_CHAN_TYPE, /* Channel Type */ + BE_PERIODICITY, /* Periodicity */ + BE_EXT_RES_IND, /* Extended Resource Indicator */ + BE_NUM_MS, /* Number Of MSs */ + BE_RSVD_2, /* Reserved */ + BE_RSVD_3, /* Reserved */ + BE_RSVD_4, /* Reserved */ + BE_CM_INFO_2, /* Classmark Information Type 2 */ + BE_CM_INFO_3, /* Classmark Information Type 3 */ + BE_INT_BAND, /* Interference Band To Be Used */ + BE_RR_CAUSE, /* RR Cause */ + BE_RSVD_5, /* Reserved */ + BE_L3_INFO, /* Layer 3 Information */ + BE_DLCI, /* DLCI */ + BE_DOWN_DTX_FLAG, /* Downlink DTX Flag */ + BE_CELL_ID_LIST, /* Cell Identifier List */ + BE_RESP_REQ, /* Response Request */ + BE_RES_IND_METHOD, /* Resource Indication Method */ + BE_CM_INFO_1, /* Classmark Information Type 1 */ + BE_CIC_LIST, /* Circuit Identity Code List */ + BE_DIAG, /* Diagnostic */ + BE_L3_MSG, /* Layer 3 Message Contents */ + BE_CHOSEN_CHAN, /* Chosen Channel */ + BE_TOT_RES_ACC, /* Total Resource Accessible */ + BE_CIPH_RESP_MODE, /* Cipher Response Mode */ + BE_CHAN_NEEDED, /* Channel Needed */ + BE_TRACE_TYPE, /* Trace Type */ + BE_TRIGGERID, /* TriggerID */ + BE_TRACE_REF, /* Trace Reference */ + BE_TRANSID, /* TransactionID */ + BE_MID, /* Mobile Identity */ + BE_OMCID, /* OMCID */ + BE_FOR_IND, /* Forward Indicator */ + BE_CHOSEN_ENC_ALG, /* Chosen Encryption Algorithm */ + BE_CCT_POOL, /* Circuit Pool */ + BE_CCT_POOL_LIST, /* Circuit Pool List */ + BE_TIME_IND, /* Time Indication */ + BE_RES_SIT, /* Resource Situation */ + BE_CURR_CHAN_1, /* Current Channel Type 1 */ + BE_QUE_IND, /* Queueing Indicator */ + BE_ASS_REQ, /* Assignment Requirement */ + BE_UDEF_52, /* Undefined */ + BE_TALKER_FLAG, /* Talker Flag */ + BE_CONN_REL_REQ, /* Connection Release Requested */ + BE_GROUP_CALL_REF, /* Group Call Reference */ + BE_EMLPP_PRIO, /* eMLPP Priority */ + BE_CONF_EVO_IND, /* Configuration Evolution Indication */ + BE_OLD2NEW_INFO, /* Old BSS to New BSS Information */ + BE_LSA_ID, /* LSA Identifier */ + BE_LSA_ID_LIST, /* LSA Identifier List */ + BE_LSA_INFO, /* LSA Information */ + BE_LCS_QOS, /* LCS QoS */ + BE_LSA_ACC_CTRL, /* LSA access control suppression */ + BE_SPEECH_VER, /* Speech Version */ + BE_UDEF_65, /* Undefined */ + BE_UDEF_66, /* Undefined */ + BE_LCS_PRIO, /* LCS Priority */ + BE_LOC_TYPE, /* Location Type */ + BE_LOC_EST, /* Location Estimate */ + BE_POS_DATA, /* Positioning Data */ + BE_LCS_CAUSE, /* 3.2.2.66 LCS Cause */ + BE_LCS_CLIENT, /* 10.14 LCS Client Type */ + BE_APDU, /* APDU */ + BE_NE_ID, /* Network Element Identity */ + BE_GPS_ASSIST_DATA, /* GPS Assistance Data */ + BE_DECIPH_KEYS, /* Deciphering Keys */ + BE_RET_ERR_REQ, /* Return Error Request */ + BE_RET_ERR_CAUSE, /* Return Error Cause */ + BE_SEG, /* Segmentation */ + BE_SERV_HO, /* Service Handover */ + BE_SRC_RNC_TO_TAR_RNC_UMTS, /* Source RNC to target RNC transparent information (UMTS) */ + BE_SRC_RNC_TO_TAR_RNC_CDMA, /* Source RNC to target RNC transparent information (cdma2000) */ + BE_GERAN_CLS_M, /* GERAN Classmark */ + BE_GERAN_BSC_CONT, /* GERAN BSC Container */ + BE_VEL_EST, /* Velocity Estimate */ + BE_UDEF_86, /* Undefined */ + BE_UDEF_87, /* Undefined */ + BE_UDEF_88, /* Undefined */ + BE_UDEF_89, /* Undefined */ + BE_UDEF_90, /* Undefined */ + BE_UDEF_91, /* Undefined */ + BE_UDEF_92, /* Undefined */ + BE_UDEF_93, /* Undefined */ + BE_UDEF_94, /* Undefined */ + BE_UDEF_95, /* Undefined */ + BE_UDEF_96, /* Undefined */ + BE_NEW_BSS_TO_OLD_BSS_INF, /* New BSS to Old BSS Information */ + BE_UDEF_98, /* Undefined */ + BE_INTER_SYS_INF, /* Inter-System Information */ + BE_SNA_ACC_INF, /* SNA Access Information */ + BE_VSTK_RAND_INF, /* VSTK_RAND Information */ + BE_VSTK_INF, /* VSTK Information */ + BE_PAGING_INF, /* Paging Information */ + BE_IMEI, /* IMEI */ + BE_VGCS_FEAT_FLG, /* VGCS Feature Flags */ + BE_TALKER_PRI, /* Talker Priority */ + BE_EMRG_SET_IND, /* Emergency Set Indication */ + BE_TALKER_ID, /* Talker Identity */ + BE_CELL_ID_LIST_SEG, /* Cell Identifier List Segment */ + BE_SMS_TO_VGCS, /* SMS to VGCS */ + BE_VGCS_TALKER_MOD, /* VGCS Talker Mode */ + BE_VGS_VBS_CELL_STAT, /* VGCS/VBS Cell Status */ + BE_CELL_ID_LST_SEG_F_EST_CELLS, /* Cell Identifier List Segment for established cells */ + BE_CELL_ID_LST_SEG_F_CELL_TB_EST, /* Cell Identifier List Segment for cells to be established */ + BE_CELL_ID_LST_SEG_F_REL_CELL, /* Cell Identifier List Segment for released cells - no user present */ + BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, /* Cell Identifier List Segment for not established cells - no establishment possible */ + BE_GANSS_ASS_DTA, /* GANSS Assistance Data */ + BE_GANSS_POS_DTA, /* GANSS Positioning Data */ + BE_GANSS_LOC_TYP, /* GANSS Location Type */ + BE_APP_DATA, /* Application Data */ + BE_DATA_ID, /* Data Identity */ + BE_APP_DATA_INF, /* Application Data Information */ + BE_MSISDN, /* MSISDN */ + BE_AOIP_TRANS_LAY_ADD, /* AoIP Transport Layer Address */ + BE_SPEECH_CODEC_LST, /* Speech Codec List */ + BE_SPEECH_CODEC, /* Speech Codec */ + BE_CALL_ID, /* Call Identifier */ + BE_CALL_ID_LST, /* Call Identifier List */ + BE_NONE /* NONE */ } bssmap_elem_idx_t; #endif @@ -4013,6 +4045,7 @@ } guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { + NULL, /* Undefined */ be_cic, /* Circuit Identity Code */ NULL, /* Reserved */ be_res_avail, /* Resource Available */ @@ -4063,8 +4096,8 @@ NULL, /* Resource Situation */ be_curr_chan_1, /* Current Channel Type 1 */ be_que_ind, /* Queueing Indicator */ - be_speech_ver, /* Speech Version */ be_ass_req, /* Assignment Requirement */ + NULL, /* Undefined */ NULL /* no associated data */, /* Talker Flag */ NULL /* no associated data */, /* Connection Release Requested */ de_d_gb_call_ref, /* Group Call Reference */ @@ -4076,6 +4109,9 @@ be_lsa_info, /* LSA Information */ NULL, /* LCS QoS Dissected in packet-gsm_bssmap_le.c*/ NULL, /* LSA access control suppression */ + be_speech_ver, /* Speech Version */ + NULL, /* Undefined */ + NULL, /* Undefined */ be_lcs_prio, /* LCS Priority */ be_loc_type, /* Location Type */ be_loc_est, /* Location Estimate */ @@ -4094,14 +4130,26 @@ be_src_rnc_to_tar_rnc_cdma, /* Source RNC to target RNC transparent information (cdma2000) */ be_geran_cls_m, /* GERAN Classmark */ NULL, /* GERAN BSC Container */ + be_vel_est, /* Velocity Estimate */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ be_field_element_dissect, /* New BSS to Old BSS Information */ + NULL, /* Undefined */ be_inter_sys_inf, /* Inter-System Information */ be_sna_acc_inf, /* SNA Access Information */ NULL, /* VSTK_RAND Information */ NULL, /* VSTK Information */ be_paging_inf, /* Paging Information */ de_mid, /* 3.2.2.86 IMEI (use same dissector as IMSI)*/ - be_vel_est, /* Velocity Estimate */ be_vgcs_feat_flg, /* VGCS Feature Flags */ be_talker_pri, /* Talker Priority */ NULL, /* no data Emergency Set Indication */

@@ -47,24 +47,24 @@ const value_string gsm_common_elem_strings[] = { /* Common Information Elements 10.5.1 */ - { 0x00, "Cell Identity" }, - { 0x00, "Ciphering Key Sequence Number" }, - { 0x00, "Location Area Identification (LAI)" }, - { 0x00, "Mobile Identity" }, - { 0x00, "Mobile Station Classmark 1" }, - { 0x00, "Mobile Station Classmark 2" }, - { 0x00, "Mobile Station Classmark 3" }, - { 0x00, "Spare Half Octet" }, - { 0x00, "Descriptive group or broadcast call reference" }, - { 0x00, "Group Cipher Key Number" }, - { 0x00, "PD and SAPI $(CCBS)$" }, - { 0x00, "Priority Level" }, - { 0x00, "CN Common GSM-MAP NAS system information" }, - { 0x00, "CS domain specific system information" }, - { 0x00, "PS domain specific system information" }, - { 0x00, "PLMN List" }, - { 0x00, "NAS container for PS HO" }, - { 0x00, "MS network feature support" }, + { DE_CELL_ID, "Cell Identity" }, + { DE_CIPH_KEY_SEQ_NUM, "Ciphering Key Sequence Number" }, + { DE_LAI, "Location Area Identification (LAI)" }, + { DE_MID, "Mobile Identity" }, + { DE_MS_CM_1, "Mobile Station Classmark 1" }, + { DE_MS_CM_2, "Mobile Station Classmark 2" }, + { DE_MS_CM_3, "Mobile Station Classmark 3" }, + { DE_SPARE_NIBBLE, "Spare Half Octet" }, + { DE_D_GB_CALL_REF, "Descriptive group or broadcast call reference" }, + { DE_G_CIPH_KEY_NUM, "Group Cipher Key Number" }, + { DE_PD_SAPI, "PD and SAPI $(CCBS)$" }, + { DE_PRIO, "Priority Level" }, + { DE_CN_COMMON_GSM_MAP_NAS_SYS_INFO, "CN Common GSM-MAP NAS system information" }, + { DE_CS_DOMAIN_SPEC_SYS_INFO, "CS domain specific system information" }, + { DE_PS_DOMAIN_SPEC_SYS_INFO, "PS domain specific system information" }, + { DE_PLMN_LIST, "PLMN List" }, + { DE_NAS_CONT_FOR_PS_HO, "NAS container for PS HO" }, + { DE_MS_NET_FEAT_SUP, "MS network feature support" }, { 0, NULL } };

@@ -264,7 +264,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, SEV_elem_ett, SEV_elem_funcs) \ switch (SEV_pdu_type) \ @@ -785,6 +785,7 @@ typedef enum { + BE_UDEF_0, /* Undefined */ BE_CIC, /* Circuit Identity Code */ BE_RSVD_1, /* Reserved */ BE_RES_AVAIL, /* Resource Available */ @@ -835,8 +836,8 @@ BE_RES_SIT, /* Resource Situation */ BE_CURR_CHAN_1, /* Current Channel Type 1 */ BE_QUE_IND, /* Queueing Indicator */ - BE_SPEECH_VER, /* Speech Version */ BE_ASS_REQ, /* Assignment Requirement */ + BE_UDEF_52, /* Undefined */ BE_TALKER_FLAG, /* Talker Flag */ BE_CONN_REL_REQ, /* Connection Release Requested */ BE_GROUP_CALL_REF, /* Group Call Reference */ @@ -848,6 +849,9 @@ BE_LSA_INFO, /* LSA Information */ BE_LCS_QOS, /* LCS QoS */ BE_LSA_ACC_CTRL, /* LSA access control suppression */ + BE_SPEECH_VER, /* Speech Version */ + BE_UDEF_65, /* Undefined */ + BE_UDEF_66, /* Undefined */ BE_LCS_PRIO, /* LCS Priority */ BE_LOC_TYPE, /* Location Type */ BE_LOC_EST, /* Location Estimate */ @@ -865,15 +869,27 @@ BE_SRC_RNC_TO_TAR_RNC_UMTS, /* Source RNC to target RNC transparent information (UMTS) */ BE_SRC_RNC_TO_TAR_RNC_CDMA, /* Source RNC to target RNC transparent information (cdma2000) */ BE_GERAN_CLS_M, /* GERAN Classmark */ - BE_GRAN_BSC_CONT, /* GERAN BSC Container */ + BE_GERAN_BSC_CONT, /* GERAN BSC Container */ + BE_VEL_EST, /* Velocity Estimate */ + BE_UDEF_86, /* Undefined */ + BE_UDEF_87, /* Undefined */ + BE_UDEF_88, /* Undefined */ + BE_UDEF_89, /* Undefined */ + BE_UDEF_90, /* Undefined */ + BE_UDEF_91, /* Undefined */ + BE_UDEF_92, /* Undefined */ + BE_UDEF_93, /* Undefined */ + BE_UDEF_94, /* Undefined */ + BE_UDEF_95, /* Undefined */ + BE_UDEF_96, /* Undefined */ BE_NEW_BSS_TO_OLD_BSS_INF, /* New BSS to Old BSS Information */ + BE_UDEF_98, /* Undefined */ BE_INTER_SYS_INF, /* Inter-System Information */ BE_SNA_ACC_INF, /* SNA Access Information */ BE_VSTK_RAND_INF, /* VSTK_RAND Information */ BE_VSTK_INF, /* VSTK Information */ BE_PAGING_INF, /* Paging Information */ BE_IMEI, /* IMEI */ - BE_VEL_EST, /* Velocity Estimate */ BE_VGCS_FEAT_FLG, /* VGCS Feature Flags */ BE_TALKER_PRI, /* Talker Priority */ BE_EMRG_SET_IND, /* Emergency Set Indication */ @@ -898,7 +914,7 @@ BE_SPEECH_CODEC, /* Speech Codec */ BE_CALL_ID, /* Call Identifier */ BE_CALL_ID_LST, /* Call Identifier List */ - BE_NONE /* NONE */ + BE_NONE /* NONE */ } bssmap_elem_idx_t; @@ -1350,8 +1366,8 @@ DE_SGSAP_EPS_LOC_UPD_TYPE, /* 9.4.2 EPS location update type*/ DE_SGSAP_GLOBAL_CN_ID, /* 9.4.4 Global CN-Id*/ + DE_SGSAP_UDEF_11, /* Undefined */ DE_SGSAP_UDEF_12, /* Undefined */ - DE_SGSAP_UDEF_13, /* Undefined */ DE_SGSAP_MID, /* 9.4.14 Mobile identity*/ DE_SGSAP_REJ_CAUSE, /* 9.4.16 Reject cause */ @@ -1362,9 +1378,9 @@ DE_SGSAP_NAS_MSG_CONTAINER, /* 9.4.15 NAS message container*/ DE_SGSAP_MM_INFO, /* 9.4.12 MM information*/ - DE_SGSAP_UDEF_24, /* Undefined */ - DE_SGSAP_UDEF_25, /* Undefined */ - DE_SGSAP_UDEF_26, /* Undefined */ + DE_SGSAP_UDEF_20, /* Undefined */ + DE_SGSAP_UDEF_21, /* Undefined */ + DE_SGSAP_UDEF_22, /* Undefined */ DE_SGSAP_ERR_MSG, /* 9.4.3 Erroneous message*/ DE_SGSAP_CLI, /* 9.4.1 CLI */

@@ -240,89 +240,89 @@ const value_string gsm_dtap_elem_strings[] = { /* Mobility Management Information Elements 10.5.3 */ - { 0x00, "Authentication Parameter RAND" }, - { 0x00, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, - { 0x00, "Authentication Response Parameter" }, - { 0x00, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, - { 0x00, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, - { 0x00, "CM Service Type" }, - { 0x00, "Identity Type" }, - { 0x00, "Location Updating Type" }, - { 0x00, "Network Name" }, - { 0x00, "Reject Cause" }, - { 0x00, "Follow-on Proceed" }, - { 0x00, "Time Zone" }, - { 0x00, "Time Zone and Time" }, - { 0x00, "CTS Permission" }, - { 0x00, "LSA Identifier" }, - { 0x00, "Daylight Saving Time" }, - { 0x00, "Emergency Number List" }, - { 0x00, "Additional update parameters" }, - { 0x00, "MM Timer" }, + { DE_AUTH_PARAM_RAND, "Authentication Parameter RAND" }, + { DE_AUTH_PARAM_AUTN, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, + { DE_AUTH_RESP_PARAM, "Authentication Response Parameter" }, + { DE_AUTH_RESP_PARAM_EXT, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, + { DE_AUTH_FAIL_PARAM, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, + { DE_CM_SRVC_TYPE, "CM Service Type" }, + { DE_ID_TYPE, "Identity Type" }, + { DE_LOC_UPD_TYPE, "Location Updating Type" }, + { DE_NETWORK_NAME, "Network Name" }, + { DE_REJ_CAUSE, "Reject Cause" }, + { DE_FOP, "Follow-on Proceed" }, + { DE_TIME_ZONE, "Time Zone" }, + { DE_TIME_ZONE_TIME, "Time Zone and Time" }, + { DE_CTS_PERM, "CTS Permission" }, + { DE_LSA_ID, "LSA Identifier" }, + { DE_DAY_SAVING_TIME, "Daylight Saving Time" }, + { DE_EMERGENCY_NUM_LIST, "Emergency Number List" }, + { DE_ADD_UPD_PARAMS, "Additional update parameters" }, + { DE_MM_TIMER, "MM Timer" }, /* Call Control Information Elements 10.5.4 */ - { 0x00, "Auxiliary States" }, /* 10.5.4.4 Auxiliary states */ - { 0x00, "Bearer Capability" }, /* 10.5.4.4a Backup bearer capability */ - { 0x00, "Call Control Capabilities" }, - { 0x00, "Call State" }, - { 0x00, "Called Party BCD Number" }, - { 0x00, "Called Party Subaddress" }, - { 0x00, "Calling Party BCD Number" }, - { 0x00, "Calling Party Subaddress" }, - { 0x00, "Cause" }, - { 0x00, "CLIR Suppression" }, - { 0x00, "CLIR Invocation" }, - { 0x00, "Congestion Level" }, - { 0x00, "Connected Number" }, - { 0x00, "Connected Subaddress" }, - { 0x00, "Facility" }, - { 0x00, "High Layer Compatibility" }, - { 0x00, "Keypad Facility" }, - { 0x00, "Low Layer Compatibility" }, - { 0x00, "More Data" }, - { 0x00, "Notification Indicator" }, - { 0x00, "Progress Indicator" }, - { 0x00, "Recall type $(CCBS)$" }, - { 0x00, "Redirecting Party BCD Number" }, - { 0x00, "Redirecting Party Subaddress" }, - { 0x00, "Repeat Indicator" }, - { 0x00, "Reverse Call Setup Direction" }, - { 0x00, "SETUP Container $(CCBS)$" }, - { 0x00, "Signal" }, - { 0x00, "SS Version Indicator" }, - { 0x00, "User-user" }, - { 0x00, "Alerting Pattern $(NIA)$" }, /* 10.5.4.26 Alerting Pattern $(NIA)$ */ - { 0x00, "Allowed Actions $(CCBS)$" }, - { 0x00, "Stream Identifier" }, - { 0x00, "Network Call Control Capabilities" }, - { 0x00, "Cause of No CLI" }, /* 10.5.4.30 Cause of No CLI */ + { DE_AUX_STATES, "Auxiliary States" }, /* 10.5.4.4 Auxiliary states */ + { DE_BEARER_CAP, "Bearer Capability" }, /* 10.5.4.4a Backup bearer capability */ + { DE_CC_CAP, "Call Control Capabilities" }, + { DE_CALL_STATE, "Call State" }, + { DE_CLD_PARTY_BCD_NUM, "Called Party BCD Number" }, + { DE_CLD_PARTY_SUB_ADDR, "Called Party Subaddress" }, + { DE_CLG_PARTY_BCD_NUM, "Calling Party BCD Number" }, + { DE_CLG_PARTY_SUB_ADDR, "Calling Party Subaddress" }, + { DE_CAUSE, "Cause" }, + { DE_CLIR_SUP, "CLIR Suppression" }, + { DE_CLIR_INV, "CLIR Invocation" }, + { DE_CONGESTION, "Congestion Level" }, + { DE_CONN_NUM, "Connected Number" }, + { DE_CONN_SUB_ADDR, "Connected Subaddress" }, + { DE_FACILITY, "Facility" }, + { DE_HLC, "High Layer Compatibility" }, + { DE_KEYPAD_FACILITY, "Keypad Facility" }, + { DE_LLC, "Low Layer Compatibility" }, + { DE_MORE_DATA, "More Data" }, + { DE_NOT_IND, "Notification Indicator" }, + { DE_PROG_IND, "Progress Indicator" }, + { DE_RECALL_TYPE, "Recall type $(CCBS)$" }, + { DE_RED_PARTY_BCD_NUM, "Redirecting Party BCD Number" }, + { DE_RED_PARTY_SUB_ADDR, "Redirecting Party Subaddress" }, + { DE_REPEAT_IND, "Repeat Indicator" }, + { DE_REV_CALL_SETUP_DIR, "Reverse Call Setup Direction" }, + { DE_SETUP_CONTAINER, "SETUP Container $(CCBS)$" }, + { DE_SIGNAL, "Signal" }, + { DE_SS_VER_IND, "SS Version Indicator" }, + { DE_USER_USER, "User-user" }, + { DE_ALERT_PATTERN, "Alerting Pattern $(NIA)$" }, /* 10.5.4.26 Alerting Pattern $(NIA)$ */ + { DE_ALLOWED_ACTIONS, "Allowed Actions $(CCBS)$" }, + { DE_SI, "Stream Identifier" }, + { DE_NET_CC_CAP, "Network Call Control Capabilities" }, + { DE_CAUSE_NO_CLI, "Cause of No CLI" }, /* 10.5.4.30 Cause of No CLI */ /* 10.5.4.31 Void */ - { 0x00, "Supported Codec List" }, /* 10.5.4.32 Supported codec list */ - { 0x00, "Service Category" }, /* 10.5.4.33 Service category */ - { 0x00, "Redial" }, /* 10.5.4.34 Redial */ - { 0x00, "Network-initiated Service Upgrade indicator" }, + { DE_SUP_CODEC_LIST, "Supported Codec List" }, /* 10.5.4.32 Supported codec list */ + { DE_SERV_CAT, "Service Category" }, /* 10.5.4.33 Service category */ + { DE_REDIAL, "Redial" }, /* 10.5.4.34 Redial */ + { DE_NET_INIT_SERV_UPG, "Network-initiated Service Upgrade indicator" }, /* 10.5.4.35 Network-initiated Service Upgrade indicator */ /* Short Message Service Information Elements [5] 8.1.4 */ - { 0x00, "CP-User Data" }, - { 0x00, "CP-Cause" }, + { DE_CP_USER_DATA, "CP-User Data" }, + { DE_CP_CAUSE, "CP-Cause" }, /* Tests procedures information elements 3GPP TS 44.014 6.4.0, 3GPP TS 34.109 6.4.0 and 3GPP TS 36.509 9.1.0*/ - { 0x00, "Close TCH Loop Cmd Sub-channel"}, - { 0x00, "Open Loop Cmd Ack"}, - { 0x00, "Close Multi-slot Loop Cmd Loop type"}, - { 0x00, "Close Multi-slot Loop Ack Result"}, - { 0x00, "Test Interface Tested device"}, - { 0x00, "GPRS Test Mode Cmd PDU description"}, - { 0x00, "GPRS Test Mode Cmd Mode flag"}, - { 0x00, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, - { 0x00, "MS Positioning Technology"}, - { 0x00, "Close UE Test Loop Mode"}, - { 0x00, "UE Positioning Technology"}, - { 0x00, "RLC SDU Counter Value"}, - { 0x00, "UE Test Loop Mode"}, - { 0x00, "UE Test Loop Mode A LB Setup"}, - { 0x00, "UE Test Loop Mode B LB Setup"}, - { 0x00, "UE Test Loop Mode C Setup"}, - { 0x00, "UE Positioning Technology"}, - { 0x00, "MBMS Packet Counter Value"}, + { DE_TP_SUB_CHANNEL, "Close TCH Loop Cmd Sub-channel"}, + { DE_TP_ACK, "Open Loop Cmd Ack"}, + { DE_TP_LOOP_TYPE, "Close Multi-slot Loop Cmd Loop type"}, + { DE_TP_LOOP_ACK, "Close Multi-slot Loop Ack Result"}, + { DE_TP_TESTED_DEVICE, "Test Interface Tested device"}, + { DE_TP_PDU_DESCRIPTION, "GPRS Test Mode Cmd PDU description"}, + { DE_TP_MODE_FLAG, "GPRS Test Mode Cmd Mode flag"}, + { DE_TP_EGPRS_MODE_FLAG, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, + { DE_TP_MS_POSITIONING_TECHNOLOGY, "MS Positioning Technology"}, + { DE_TP_UE_TEST_LOOP_MODE, "Close UE Test Loop Mode"}, + { DE_TP_UE_POSITIONING_TECHNOLOGY, "UE Positioning Technology"}, + { DE_TP_RLC_SDU_COUNTER_VALUE, "RLC SDU Counter Value"}, + { DE_TP_EPC_UE_TEST_LOOP_MODE, "UE Test Loop Mode"}, + { DE_TP_EPC_UE_TL_A_LB_SETUP, "UE Test Loop Mode A LB Setup"}, + { DE_TP_EPC_UE_TL_B_LB_SETUP, "UE Test Loop Mode B LB Setup"}, + { DE_TP_EPC_UE_TL_C_SETUP, "UE Test Loop Mode C Setup"}, + { DE_TP_EPC_UE_POSITIONING_TECHNOLOGY, "UE Positioning Technology"}, + { DE_TP_EPC_MBMS_PACKET_COUNTER_VALUE, "MBMS Packet Counter Value"}, { 0, NULL } };

@@ -147,69 +147,69 @@ const value_string gsm_gm_elem_strings[] = { /* GPRS Mobility Management Information Elements 10.5.5 */ - { 0x00, "Attach Result" }, - { 0x00, "Attach Type" }, - { 0x00, "Cipher Algorithm" }, - { 0x00, "TMSI Status" }, - { 0x00, "Detach Type" }, - { 0x00, "DRX Parameter" }, - { 0x00, "Force to Standby" }, - { 0x00, "Force to Standby" }, - { 0x00, "P-TMSI Signature" }, - { 0x00, "P-TMSI Signature 2" }, - { 0x00, "Identity Type 2" }, - { 0x00, "IMEISV Request" }, - { 0x00, "Receive N-PDU Numbers List" }, - { 0x00, "MS Network Capability" }, - { 0x00, "MS Radio Access Capability" }, - { 0x00, "GMM Cause" }, - { 0x00, "Routing Area Identification" }, - { 0x00, "Routing Area Identification 2" }, - { 0x00, "Update Result" }, - { 0x00, "Update Type" }, - { 0x00, "A&C Reference Number" }, - { 0x00, "A&C Reference Number" }, - { 0x00, "Service Type" }, - { 0x00, "Cell Notification" }, - { 0x00, "PS LCS Capability" }, - { 0x00, "Network Feature Support" }, - { 0x00, "Inter RAT information container" }, - { 0x00, "Requested MS information" }, - { 0x00, "UE network capability" }, - { 0x00, "E-UTRAN inter RAT information container" }, - { 0x00, "Voice domain preference and UE's usage setting" }, - { 0x00, "P-TMSI type" }, - { 0x00, "Location Area Identification 2" }, + { DE_ATTACH_RES, "Attach Result" }, + { DE_ATTACH_TYPE, "Attach Type" }, + { DE_CIPH_ALG, "Cipher Algorithm" }, + { DE_TMSI_STAT, "TMSI Status" }, + { DE_DETACH_TYPE, "Detach Type" }, + { DE_DRX_PARAM, "DRX Parameter" }, + { DE_FORCE_TO_STAND, "Force to Standby" }, + { DE_FORCE_TO_STAND_H, "Force to Standby" }, + { DE_P_TMSI_SIG, "P-TMSI Signature" }, + { DE_P_TMSI_SIG_2, "P-TMSI Signature 2" }, + { DE_ID_TYPE_2, "Identity Type 2" }, + { DE_IMEISV_REQ, "IMEISV Request" }, + { DE_REC_N_PDU_NUM_LIST, "Receive N-PDU Numbers List" }, + { DE_MS_NET_CAP, "MS Network Capability" }, + { DE_MS_RAD_ACC_CAP, "MS Radio Access Capability" }, + { DE_GMM_CAUSE, "GMM Cause" }, + { DE_RAI, "Routing Area Identification" }, + { DE_RAI_2, "Routing Area Identification 2" }, + { DE_UPD_RES, "Update Result" }, + { DE_UPD_TYPE, "Update Type" }, + { DE_AC_REF_NUM, "A&C Reference Number" }, + { DE_AC_REF_NUM_H, "A&C Reference Number" }, + { DE_SRVC_TYPE, "Service Type" }, + { DE_CELL_NOT, "Cell Notification" }, + { DE_PS_LCS_CAP, "PS LCS Capability" }, + { DE_NET_FEAT_SUP, "Network Feature Support" }, + { DE_RAT_INFO_CONTAINER, "Inter RAT information container" }, + { DE_REQ_MS_INFO, "Requested MS information" }, + { DE_UE_NETWORK_CAP, "UE network capability" }, + { DE_EUTRAN_IRAT_INFO_CONTAINER, "E-UTRAN inter RAT information container" }, + { DE_VOICE_DOMAIN_PREF, "Voice domain preference and UE's usage setting" }, + { DE_PTMSI_TYPE, "P-TMSI type" }, + { DE_LAI_2, "Location Area Identification 2" }, /* Session Management Information Elements 10.5.6 */ - { 0x00, "Access Point Name" }, - { 0x00, "Network Service Access Point Identifier" }, - { 0x00, "Protocol Configuration Options" }, - { 0x00, "Packet Data Protocol Address" }, - { 0x00, "Quality Of Service" }, - { 0x00, "SM Cause" }, - { 0x00, "SM Cause 2" }, - { 0x00, "Linked TI" }, - { 0x00, "LLC Service Access Point Identifier" }, - { 0x00, "Tear Down Indicator" }, - { 0x00, "Packet Flow Identifier" }, - { 0x00, "Traffic Flow Template" }, - { 0x00, "Temporary Mobile Group Identity (TMGI)" }, - { 0x00, "MBMS bearer capabilities" }, - { 0x00, "MBMS protocol configuration options" }, - { 0x00, "Enhanced network service access point identifier" }, - { 0x00, "Request type" }, - { 0x00, "Notification indicator" }, - { 0x00, "Connectivity type" }, + { DE_ACC_POINT_NAME, "Access Point Name" }, + { DE_NET_SAPI, "Network Service Access Point Identifier" }, + { DE_PRO_CONF_OPT, "Protocol Configuration Options" }, + { DE_PD_PRO_ADDR, "Packet Data Protocol Address" }, + { DE_QOS, "Quality Of Service" }, + { DE_SM_CAUSE, "SM Cause" }, + { DE_SM_CAUSE_2, "SM Cause 2" }, + { DE_LINKED_TI, "Linked TI" }, + { DE_LLC_SAPI, "LLC Service Access Point Identifier" }, + { DE_TEAR_DOWN_IND, "Tear Down Indicator" }, + { DE_PACKET_FLOW_ID, "Packet Flow Identifier" }, + { DE_TRAFFIC_FLOW_TEMPLATE, "Traffic Flow Template" }, + { DE_TMGI, "Temporary Mobile Group Identity (TMGI)" }, + { DE_MBMS_BEARER_CAP, "MBMS bearer capabilities" }, + { DE_MBMS_PROT_CONF_OPT, "MBMS protocol configuration options" }, + { DE_ENH_NSAPI, "Enhanced network service access point identifier" }, + { DE_REQ_TYPE, "Request type" }, + { DE_SM_NOTIF_IND, "Notification indicator" }, + { DE_SM_CONNECTIVITY_TYPE, "Connectivity type" }, /* GPRS Common Information Elements 10.5.7 */ - { 0x00, "PDP Context Status" }, - { 0x00, "Radio Priority" }, - { 0x00, "GPRS Timer" }, - { 0x00, "GPRS Timer 2" }, - { 0x00, "GPRS Timer 3" }, - { 0x00, "Radio Priority 2"}, - { 0x00, "MBMS context status"}, - { 0x00, "Uplink data status"}, - { 0x00, "Device properties"}, + { DE_PDP_CONTEXT_STAT, "PDP Context Status" }, + { DE_RAD_PRIO, "Radio Priority" }, + { DE_GPRS_TIMER, "GPRS Timer" }, + { DE_GPRS_TIMER_2, "GPRS Timer 2" }, + { DE_GPRS_TIMER_3, "GPRS Timer 3" }, + { DE_RAD_PRIO_2, "Radio Priority 2"}, + { DE_MBMS_CTX_STATUS, "MBMS context status"}, + { DE_UPLINK_DATA_STATUS, "Uplink data status"}, + { DE_DEVICE_PROPERTIES, "Device properties"}, { 0x00, "Spare Nibble"}, { 0, NULL } };

@@ -57,13 +57,25 @@ { 0, NULL } }; +typedef enum +{ + /* Short Message Service Information Elements [5] 8.2 */ + DE_RP_MESSAGE_REF, /* RP-Message Reference */ + DE_RP_ORIG_ADDR, /* RP-Originator Address */ + DE_RP_DEST_ADDR, /* RP-Destination Address */ + DE_RP_USER_DATA, /* RP-User Data */ + DE_RP_CAUSE, /* RP-Cause */ + DE_RP_NONE /* NONE */ +} +rp_elem_idx_t; + const value_string gsm_rp_elem_strings[] = { /* Short Message Service RP Information Elements [5] 8.2 */ - { 0x00, "RP-Message Reference" }, - { 0x00, "RP-Origination Address" }, - { 0x00, "RP-Destination Address" }, - { 0x00, "RP-User Data" }, - { 0x00, "RP-Cause" }, + { DE_RP_MESSAGE_REF, "RP-Message Reference" }, + { DE_RP_ORIG_ADDR, "RP-Originator Address" }, + { DE_RP_DEST_ADDR, "RP-Destination Address" }, + { DE_RP_USER_DATA, "RP-User Data" }, + { DE_RP_CAUSE, "RP-Cause" }, { 0, NULL } }; @@ -82,17 +94,6 @@ static proto_tree *g_tree; -typedef enum -{ - /* Short Message Service Information Elements [5] 8.2 */ - DE_RP_MESSAGE_REF, /* RP-Message Reference */ - DE_RP_ORIG_ADDR, /* RP-Origination Address */ - DE_RP_DEST_ADDR, /* RP-Destination Address */ - DE_RP_USER_DATA, /* RP-User Data */ - DE_RP_CAUSE, /* RP-Cause */ - DE_RP_NONE /* NONE */ -} -rp_elem_idx_t; #define NUM_GSM_RP_ELEM (sizeof(gsm_rp_elem_strings)/sizeof(value_string)) gint ett_gsm_rp_elem[NUM_GSM_RP_ELEM];

@@ -176,92 +176,92 @@ const value_string gsm_rr_elem_strings[] = { /* Radio Resource Management Information Elements 10.5.2, most are from 10.5.1 */ - { 0x00, "BA Range" }, /* [3] 10.5.2.1a BA Range */ - { 0x00, "Cell Channel Description" }, /* [3] 10.5.2.1b */ - { 0x00, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ - { 0x00, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ - { 0x00, "Cell Selection Indicator after Release of all TCH and SDCCH" }, /* [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE */ - { 0x00, "Cell Description" }, /* 10.5.2.2 */ - { 0x00, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ - { 0x00, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ - { 0x00, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ + { DE_RR_BA_RANGE, "BA Range" }, /* [3] 10.5.2.1a BA Range */ + { DE_RR_CELL_CH_DSC, "Cell Channel Description" }, /* [3] 10.5.2.1b */ + { DE_RR_BA_LIST_PREF, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ + { DE_RR_UTRAN_FREQ_LIST, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ + { DE_RR_CELL_SELECT_INDIC, "Cell Selection Indicator after Release of all TCH and SDCCH" }, /* [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE */ + { DE_RR_CELL_DSC, "Cell Description" }, /* 10.5.2.2 */ + { DE_RR_CELL_OPT_BCCH, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ + { DE_RR_CELL_OPT_SACCH, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ + { DE_RR_CELL_SEL_PARAM, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ /* [3] 10.5.2.4a (void) */ - { 0x00, "Channel Description" }, /* 10.5.2.5 */ - { 0x00, "Channel Description 2" }, /* 10.5.2.5a */ - { 0x00, "Channel Description 3" }, /* 10.5.2.5c */ - { 0x00, "Channel Mode" }, /* [3] 10.5.2.6 */ - { 0x00, "Channel Mode 2" }, /* [3] 10.5.2.7 */ - { 0x00, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ + { DE_RR_CH_DSC, "Channel Description" }, /* 10.5.2.5 */ + { DE_RR_CH_DSC2, "Channel Description 2" }, /* 10.5.2.5a */ + { DE_RR_CH_DSC3, "Channel Description 3" }, /* 10.5.2.5c */ + { DE_RR_CH_MODE, "Channel Mode" }, /* [3] 10.5.2.6 */ + { DE_RR_CH_MODE2, "Channel Mode 2" }, /* [3] 10.5.2.7 */ + { DE_RR_UTRAN_CM, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ /* [3] 10.5.2.7b (void) */ - { 0x00, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ + { DE_RR_CM_ENQ_MASK, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ /* [3] 10.5.2.7d GERAN Iu Mode Classmark information element */ - { 0x00, "Channel Needed"}, /* [3] 10.5.2.8 */ + { DE_RR_CHNL_NEEDED, "Channel Needed"}, /* [3] 10.5.2.8 */ /* [3] 10.5.2.8a (void) */ /* [3] 10.5.2.8b Channel Request Description 2 */ /* Pos 20 */ - { 0x00, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ - { 0x00, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ - { 0x00, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ + { DE_RR_CIP_MODE_SET, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ + { DE_RR_CIP_MODE_RESP, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ + { DE_RR_CTRL_CH_DESC, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ /* [3] 10.5.2.11a DTM Information Details */ - { 0x00, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ - { 0x00, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ - { 0x00, "Frequency List" }, /* 10.5.2.13 */ - { 0x00, "Frequency Short List" }, /* 10.5.2.14 */ - { 0x00, "Frequency Short List2" }, /* 10.5.2.14a */ + { DE_RR_DYN_ARFCN_MAP, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ + { DE_RR_FREQ_CH_SEQ, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ + { DE_RR_FREQ_LIST, "Frequency List" }, /* 10.5.2.13 */ + { DE_RR_FREQ_SHORT_LIST, "Frequency Short List" }, /* 10.5.2.14 */ + { DE_RR_FREQ_SHORT_LIST2, "Frequency Short List 2" }, /* 10.5.2.14a */ /* [3] 10.5.2.14b Group Channel Description */ - { 0x00, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ - { 0x00, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ + { DE_RR_GPRS_RESUMPTION, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ + { DE_RR_GPRS_BROADCAST_INFORMATION, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ /* [3] 10.5.2.14e Enhanced DTM CS Release Indication */ - { 0x00, "Handover Reference" }, /* 10.5.2.15 */ - { 0x00, "IA Rest Octets" }, /* [3] 10.5.2.16 */ - { 0x00, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ - { 0x00, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ - { 0x00, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ - { 0x00, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ + { DE_RR_HO_REF, "Handover Reference" }, /* 10.5.2.15 */ + { DE_RR_IA_REST_OCT, "IA Rest Octets" }, /* [3] 10.5.2.16 */ + { DE_RR_IAR_REST_OCT, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ + { DE_RR_IAX_REST_OCT, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ + { DE_RR_L2_PSEUDO_LEN, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ + { DE_RR_MEAS_RES, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ /* * [3] 10.5.2.20a GPRS Measurement Results */ - { 0x00, "Mobile Allocation" }, /* [3] 10.5.2.21 */ - { 0x00, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ - { 0x00, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ + { DE_RR_MOB_ALL, "Mobile Allocation" }, /* [3] 10.5.2.21 */ + { DE_RR_MOB_TIME_DIFF, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ + { DE_RR_MULTIRATE_CONF, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ /* Pos 30 */ - { 0x00, "Multislot Allocation" }, /* [3] 10.5.2.21b */ + { DE_RR_MULT_ALL, "Multislot Allocation" }, /* [3] 10.5.2.21b */ /* * [3] 10.5.2.21c NC mode */ - { 0x00, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ - { 0x00, "Neighbour Cell Description 2" }, /* [3] 10.5.2.22a Neighbour Cell Description 2 */ + { DE_RR_NEIGH_CELL_DESC, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ + { DE_RR_NEIGH_CELL_DESC2, "Neighbour Cell Description 2" }, /* [3] 10.5.2.22a Neighbour Cell Description 2 */ /* * [3] 10.5.2.22b (void) * [3] 10.5.2.22c NT/N Rest Octets */ - { 0x00, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ - { 0x00, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ - { 0x00, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ - { 0x00, "Packet Channel Description" }, /* [3] 10.5.2.25a */ - { 0x00, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ - { 0x00, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ - { 0x00, "Packet Uplink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ - { 0x00, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ - { 0x00, "Page Mode" }, /* [3] 10.5.2.26 */ - { 0x00, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ - { 0x00, "Power Command" }, /* 10.5.2.28 */ - { 0x00, "Power Command and access type" }, /* 10.5.2.28a */ - { 0x00, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ - { 0x00, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ - { 0x00, "RR Cause" }, /* 10.5.2.31 */ - { 0x00, "Synchronization Indication" }, /* 10.5.2.39 */ - { 0x00, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ + { DE_RR_P1_REST_OCT, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ + { DE_RR_P2_REST_OCT, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ + { DE_RR_P3_REST_OCT, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ + { DE_RR_PACKET_CH_DESC, "Packet Channel Description" }, /* [3] 10.5.2.25a */ + { DE_RR_DED_MOD_OR_TBF, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ + { DE_RR_PKT_UL_ASS, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ + { DE_RR_PKT_DL_ASS, "Packet Downlink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ + { DE_RR_PKT_DL_ASS_TYPE2, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ + { DE_RR_PAGE_MODE, "Page Mode" }, /* [3] 10.5.2.26 */ + { DE_RR_NCC_PERM, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ + { DE_RR_POW_CMD, "Power Command" }, /* 10.5.2.28 */ + { DE_RR_POW_CMD_AND_ACC_TYPE, "Power Command and access type" }, /* 10.5.2.28a */ + { DE_RR_RACH_CTRL_PARAM, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ + { DE_RR_REQ_REF, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ + { DE_RR_CAUSE, "RR Cause" }, /* 10.5.2.31 */ + { DE_RR_SYNC_IND, "Synchronization Indication" }, /* 10.5.2.39 */ + { DE_RR_SI1_REST_OCT, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ /* [3] 10.5.2.33 SI 2bis Rest Octets */ - { 0x00, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ - { 0x00, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ - { 0x00, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ - { 0x00, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ - { 0x00, "SI 6 Rest Octets" }, /* [3] 10.5.2.35a */ + { DE_RR_SI2TER_REST_OCT, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ + { DE_RR_SI2QUATER_REST_OCT, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ + { DE_RR_SI3_REST_OCT, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ + { DE_RR_SI4_REST_OCT, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ + { DE_RR_SI6_REST_OCT, "SI 6 Rest Octets" }, /* [3] 10.5.2.35a */ /* [3] 10.5.2.36 SI 7 Rest Octets * [3] 10.5.2.37 SI 8 Rest Octets * [3] 10.5.2.37a SI 9 Rest Octets */ - { 0x00, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ + { DE_RR_SI13_REST_OCT, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ /* [3] 10.5.2.37c (void) * [3] 10.5.2.37d (void) * [3] 10.5.2.37e SI 16 Rest Octets @@ -269,31 +269,31 @@ * [3] 10.5.2.37g SI 19 Rest Octets * [3] 10.5.2.37h SI 18 Rest Octets * [3] 10.5.2.37i SI 20 Rest Octets */ - { 0x00, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ - { 0x00, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ - { 0x00, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ - { 0x00, "TLLI" }, /* [3] 10.5.2.41a TLLI */ - { 0x00, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ - { 0x00, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ + { DE_RR_STARTING_TIME, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ + { DE_RR_TIMING_ADV, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ + { DE_RR_TIME_DIFF, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ + { DE_RR_TLLI, "TLLI" }, /* [3] 10.5.2.41a TLLI */ + { DE_RR_TMSI_PTMSI, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ + { DE_RR_VGCS_TAR_MODE_IND, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ /* Pos 40 */ - { 0x00, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ - { 0x00, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ + { DE_RR_VGCS_CIP_PAR, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ + { DE_RR_WAIT_IND, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ /* [3] 10.5.2.44 SI10 rest octets $(ASCI)$ */ - { 0x00, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ - { 0x00, "Extended Measurement Frequency List" }, /* [3] 10.5.2.46 Extended Measurement Frequency List */ - { 0x00, "Suspension Cause" }, /* [3] 10.5.2.47 */ - { 0x00, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ - { 0x00, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ - { 0x00, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ - { 0x00, "Handover to UTRAN Command" }, /* [3] 10.5.2.51 Handover To UTRAN Command */ + { DE_RR_EXT_MEAS_RESULT, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ + { DE_RR_EXT_MEAS_FREQ_LIST, "Extended Measurement Frequency List" },/* [3] 10.5.2.46 Extended Measurement Frequency List */ + { DE_RR_SUS_CAU, "Suspension Cause" }, /* [3] 10.5.2.47 */ + { DE_RR_APDU_ID, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ + { DE_RR_APDU_FLAGS, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ + { DE_RR_APDU_DATA, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ + { DE_RR_HO_TO_UTRAN_CMD, "Handover to UTRAN Command" }, /* [3] 10.5.2.51 Handover To UTRAN Command */ /* [3] 10.5.2.52 Handover To cdma2000 Command * [3] 10.5.2.53 (void) * [3] 10.5.2.54 (void) * [3] 10.5.2.55 (void) * [3] 10.5.2.56 3G Target Cell */ - { 0x00, "Service Support" }, /* [3] 10.5.2.57 */ + { DE_RR_SERV_SUP, "Service Support" }, /* [3] 10.5.2.57 */ /* 10.5.2.58 MBMS p-t-m Channel Description */ - { 0x00, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ + { DE_RR_DED_SERV_INF, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ /* * 10.5.2.60 MPRACH Description * 10.5.2.61 Restriction Timer @@ -305,7 +305,7 @@ * 10.5.2.67 PS Cause * 10.5.2.68 VGCS AMR Configuration */ - { 0x00, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ + { DE_RR_CARRIER_IND, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ { 0, NULL } };

@@ -89,38 +89,37 @@ #define BSSLAP_PARAM_STARTING_TIME 0x2D const value_string gsm_bsslap_elem_strings[] = { - { 0x00, "Reserved" }, - { BSSLAP_PARAM_TIMING_ADVANCE, "Timing Advance" }, - { BSSLAP_PARAM_RESERVED_01, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CELL_IDENTITY, "Cell Identity" }, - { BSSLAP_PARAM_RESERVED_02, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_03, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_04, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CHANNEL_DESCRIPTION, "Channel Description" }, - { BSSLAP_PARAM_RESERVED_05, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_06, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_07, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_MEASUREMENT_REPORT, "Measurement Report" }, - { BSSLAP_PARAM_RESERVED_08, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CAUSE, "Cause" }, - { BSSLAP_PARAM_RRLP_FLAG, "RRLP Flag" }, - { BSSLAP_PARAM_RRLP_IE, "RRLP IE" }, - { BSSLAP_PARAM_CELL_IDENTITY_LIST, "Cell Identity List" }, - { BSSLAP_PARAM_ENHANCED_MEASUREMENT_REPORT, "Enhanced Measurement Report" }, - { BSSLAP_PARAM_LOCATION_AREA_CODE, "Location Area Code" }, - { BSSLAP_PARAM_FREQUENCY_LIST, "Frequency List" }, - { BSSLAP_PARAM_MS_POWER, "MS Power" }, - { BSSLAP_PARAM_DELTA_TIMER, "Delta Timer" }, - { BSSLAP_PARAM_SERVING_CELL_IDENTIFIER, "Serving Cell Identifier" }, - { BSSLAP_PARAM_ENCRYPTION_KEY, "Encryption Key (Kc)" }, - { BSSLAP_PARAM_CIPHER_MODE_SETTING, "Cipher Mode Setting" }, - { BSSLAP_PARAM_CHANNEL_MODE, "Channel Mode" }, - { BSSLAP_PARAM_MULTIRATE_CONFIGURATION, "MultiRate Configuration" }, - { BSSLAP_PARAM_POLLING_REPETITION, "Polling Repetition" }, - { BSSLAP_PARAM_PACKET_CHANNEL_DESCRIPTION, "Packet Channel Description" }, - { BSSLAP_PARAM_TLLI, "TLLI" }, - { BSSLAP_PARAM_TFI, "TFI" }, - { BSSLAP_PARAM_STARTING_TIME, "Starting Time" }, + { DE_BLAP_RES1, "Reserved" }, + { DE_BLAP_TA, "Timing Advance" }, + { DE_BLAP_RES3, "Reserved" }, /* (note) */ + { DE_BLAP_RES4, "Cell Identity" }, + { DE_BLAP_RES5, "Reserved" }, /* (note) */ + { DE_BLAP_RES6, "Reserved" }, /* (note) */ + { DE_BLAP_RES7, "Reserved" }, /* (note) */ + { DE_BLAP_CH_DESC, "Channel Description" }, + { DE_BLAP_RES9, "Reserved" }, /* (note) */ + { DE_BLAP_RES10, "Reserved" }, /* (note) */ + { DE_BLAP_RES11, "Reserved" }, /* (note) */ + { DE_BLAP_MEAS_REP, "Measurement Report" }, + { DE_BLAP_RES13, "Reserved" }, /* (note) */ + { DE_BLAP_CAUSE, "Cause" }, + { DE_BLAP_RRLP_FLG, "RRLP Flag" }, + { DE_BLAP_RRLP_IE, "RRLP IE" }, + { DE_BLAP_CELL_ID_LIST, "Cell Identity List" }, + { DE_BLAP_ENH_MEAS_REP, "Enhanced Measurement Report" }, + { DE_BLAP_LAC, "Location Area Code" }, + { DE_BLAP_FREQ_LIST, "Frequency List" }, + { DE_BLAP_MS_POW, "MS Power" }, + { DE_BLAP_DELTA_TIME, "Delta Timer" }, + { DE_BLAP_SERV_CELL_ID, "Serving Cell Identifier" }, + { DE_BLAP_ENC_KEY, "Encryption Key (Kc)" }, + { DE_BLAP_CIP_M_SET, "Cipher Mode Setting" }, + { DE_BLAP_CH_MODE, "Channel Mode" }, + { DE_BLAP_POLL_REP, "Polling Repetition" }, + { DE_BLAP_PKT_CH_DESC, "Packet Channel Description" }, + { DE_BLAP_TLLI, "TLLI" }, + { DE_BLAP_TFI, "TFI" }, + { DE_BLAP_START_TIME, "Starting Time" }, { 0, NULL }, };

@@ -103,36 +103,36 @@ #define BSSMAP_LE_IMEI 128 const value_string gsm_bssmap_le_elem_strings[] = { - { BSSMAP_LE_LCS_QOS, "LCS QoS" }, - { BSSMAP_LE_LCS_PRIORITY, "LCS Priority" }, - { BSSMAP_LE_LOCATION_TYPE, "Location Type" }, - { BSSMAP_LE_GANSS_LOCATION_TYPE, "GANSS Location Type" }, - { BSSMAP_LE_GEOGRAPHIC_LOCATION, "Geographic Location" }, - { BSSMAP_LE_POSITIONING_DATA, "Positioning Data" }, - { BSSMAP_LE_GANSS_POSITIONING_DATA, "GANSS Positioning Data" }, - { BSSMAP_LE_VELOCITY_DATA, "Velocity Data" }, - { BSSMAP_LE_LCS_CAUSE, "LCS Cause" }, - { BSSMAP_LE_LCS_CLIENT_TYPE, "LCS Client Type" }, - { BSSMAP_LE_APDU, "APDU" }, - { BSSMAP_LE_NETWORK_ELEMENT_IDENTITY, "Network Element Identity" }, - { BSSMAP_LE_REQUESTED_GPS_ASSISTANCE_DATA, "Requested GPS Assistance Data" }, - { BSSMAP_LE_REQUESTED_GANSS_ASSISTANCE_DATA, "Requested GANSS Assistance Data" }, - { BSSMAP_LE_DECIPHERING_KEYS, "Deciphering Keys" }, - { BSSMAP_LE_RETURN_ERROR_REQUEST, "Return Error Request" }, - { BSSMAP_LE_RETURN_ERROR_CAUSE, "Return Error Cause" }, - { BSSMAP_LE_SEGMENTATION, "Segmentation" }, - { BSSMAP_LE_CLASSMARK_INFORMATION_TYPE_3, "Classmark Information Type 3" }, - { BSSMAP_LE_CAUSE, "Cause" }, - { BSSMAP_LE_CELL_IDENTIFIER, "Cell Identifier" }, - { BSSMAP_LE_CHOSEN_CHANNEL, "Chosen Channel" }, - { BSSMAP_LE_IMSI, "IMSI" }, - { BSSMAP_LE_RESERVED_NOTE1, "Reserved" }, - { BSSMAP_LE_RESERVED_NOTE2, "Reserved" }, - { BSSMAP_LE_RESERVED_NOTE3, "Reserved" }, - { BSSMAP_LE_LCS_CAPABILITY, "LCS Capability" }, - { BSSMAP_LE_PACKET_MEASUREMENT_REPORT, "Packet Measurement Report" }, - { BSSMAP_LE_CELL_IDENTITY_LIST, "Cell Identity List" }, - { BSSMAP_LE_IMEI, "IMEI" }, + { DE_BMAPLE_LCSQOS, "LCS QoS" }, + { DE_BMAPLE_LCS_PRIO, "LCS Priority" }, + { DE_BMAPLE_LOC_TYPE, "Location Type" }, + { DE_BMAPLE_GANSS_LOC_TYPE, "GANSS Location Type" }, + { DE_BMAPLE_GEO_LOC, "Geographic Location" }, + { DE_BMAPLE_POS_DATA, "Positioning Data" }, + { DE_BMAPLE_GANSS_POS_DATA, "GANSS Positioning Data" }, + { DE_BMAPLE_VELOC_DATA, "Velocity Data" }, + { DE_BMAPLE_LCS_CAUSE, "LCS Cause" }, + { DE_BMAPLE_LCS_CLIENT_TYPE, "LCS Client Type" }, + { DE_BMAPLE_APDU, "APDU" }, + { DE_BMAPLE_NETWORK_ELEM_ID, "Network Element Identity" }, + { DE_BMAPLE_REQ_GPS_ASSIST_D, "Requested GPS Assistance Data" }, + { DE_BMAPLE_REQ_GNSS_ASSIST_D, "Requested GANSS Assistance Data" }, + { DE_BMAPLE_DECIPH_KEYS, "Deciphering Keys" }, + { DE_BMAPLE_RETURN_ERROR_REQ, "Return Error Request" }, + { DE_BMAPLE_RETURN_ERROR_CAUSE, "Return Error Cause" }, + { DE_BMAPLE_SEGMENTATION, "Segmentation" }, + { DE_BMAPLE_CLASSMARK_TYPE_3, "Classmark Information Type 3" }, + { DE_BMAPLE_CAUSE, "Cause" }, + { DE_BMAPLE_CELL_IDENTIFIER, "Cell Identifier" }, + { DE_BMAPLE_CHOSEN_CHANNEL, "Chosen Channel" }, + { DE_BMAPLE_IMSI, "IMSI" }, + { DE_BMAPLE_RES1, "Reserved" }, + { DE_BMAPLE_RES2, "Reserved" }, + { DE_BMAPLE_RES3, "Reserved" }, + { DE_BMAPLE_LCS_CAPABILITY, "LCS Capability" }, + { DE_BMAPLE_PACKET_MEAS_REP, "Packet Measurement Report" }, + { DE_BMAPLE_MEAS_CELL_ID, "Cell Identity List" }, + { DE_BMAPLE_IMEI, "IMEI" }, { 0, NULL } }; @@ -759,37 +759,37 @@ curr_len = len; /* Location Type 9.1.1 M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_LOC_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE, NULL) + ELEM_MAND_TLV(BSSMAP_LE_LOCATION_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE, NULL) /* Cell Identifier 9.1.2 O 5-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BSSMAP_LE_CELL_IDENTIFIER, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Classmark Information Type 3 9.1.3 O 3-14 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CM_INFO_3].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); + ELEM_OPT_TLV(BSSMAP_LE_CLASSMARK_INFORMATION_TYPE_3, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); /* LCS Client Type 9.1.4 C (note 3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CLIENT_TYPE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); /* Chosen Channel 9.1.5 O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BSSMAP_LE_CHOSEN_CHANNEL, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* LCS Priority 9.1.6 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); /* LCS QoS 9.1.6a C (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCSQOS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); /* GPS Assistance Data 9.1.7 C (note 2) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GPS_ASSIST_DATA].value, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_REQUESTED_GPS_ASSISTANCE_DATA, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); /* APDU 9.1.8 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_OPT_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); /* LCS Capability 9.1.9 O */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CAPABILITY].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAPABILITY, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CAPABILITY, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAPABILITY, NULL); /* Packet Measurement Report 9.1.10 O*/ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_PACKET_MEAS_REP].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_PACKET_MEAS_REP, NULL); + ELEM_OPT_TLV(BSSMAP_LE_PACKET_MEASUREMENT_REPORT, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_PACKET_MEAS_REP, NULL); /* Measured Cell Identity List 9.1.11 O*/ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_MEAS_CELL_ID].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_MEAS_CELL_ID, NULL); + ELEM_OPT_TLV(BSSMAP_LE_CELL_IDENTITY_LIST, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_MEAS_CELL_ID, NULL); /* IMSI 9.1.12 O (note 4) 5-10 */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_IMSI].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMSI, NULL); + ELEM_OPT_TLV(BSSMAP_LE_IMSI, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMSI, NULL); /* IMEI 9.1.13 O (note 4) 10 (use same decode as IMSI) */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_IMEI].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMEI, NULL); + ELEM_OPT_TLV(BSSMAP_LE_IMEI, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMEI, NULL); /* GANSS Location Type 9.1.14 C 3 */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_GANSS_LOC_TYPE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GANSS_LOCATION_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE, NULL); /* GANSS Assistance Data 9.1.15 C (note 5) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_REQ_GNSS_ASSIST_D].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GNSS_ASSIST_D, NULL); + ELEM_OPT_TLV(BSSMAP_LE_REQUESTED_GANSS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GNSS_ASSIST_D, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); @@ -809,17 +809,17 @@ curr_len = len; /* Location Estimate 9.2.1 C (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LOC_EST].value, BSSAP_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GEOGRAPHIC_LOCATION, BSSAP_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); /* Positioning Data 9.2.2 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_POS_DATA].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_POSITIONING_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA, NULL); /* Deciphering Keys 9.2.3 C (note 2) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_DECIPH_KEYS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); + ELEM_OPT_TLV(BSSMAP_LE_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); /* LCS Cause 9.2.4 C (note 3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CAUSE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); /* Velocity Estimate 9.2.5 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VEL_EST].value, BSSAP_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); + ELEM_OPT_TLV(BSSMAP_LE_VELOCITY_DATA, BSSAP_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); /* GANSS Positioning Data 9.2.6 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_GANSS_POS_DATA].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_POS_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GANSS_POSITIONING_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_POS_DATA, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -838,9 +838,9 @@ curr_len = len; /* APDU 9.8.1 M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_MAND_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); /* Segmentation 9.8.2 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SEG].value, BSSAP_PDU_TYPE_BSSMAP, BE_SEG, NULL); + ELEM_OPT_TLV(BSSMAP_LE_SEGMENTATION, BSSAP_PDU_TYPE_BSSMAP, BE_SEG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -875,9 +875,9 @@ curr_len = len; /* Cell Identifier 9.12.1 M */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BSSMAP_LE_CELL_IDENTIFIER, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* APDU 9.1.8 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_OPT_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); }

@@ -262,6 +262,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) { @@ -270,6 +288,7 @@ tvbuff_t *next_tvb; int offset; guint32 msgcode, msglen, did; + guint byte_order; guint16 status; guint8 *devname; @@ -290,12 +309,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; } @@ -310,16 +335,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 */ @@ -331,7 +356,6 @@ col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname, msgcode, msglen); - while(offset < PRISM_HEADER_LENGTH) { /* DID */ @@ -339,23 +363,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; @@ -365,89 +389,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; }

@@ -7183,13 +7183,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 */ @@ -7200,33 +7200,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) @@ -14530,11 +14527,11 @@ NULL, HFILL }}, {&hf_ieee80211_txbf, - {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", FT_UINT16, BASE_HEX, + {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", 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, + {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf", FT_UINT32, BASE_HEX, NULL, 0, "Vendor Specific Transmit Beam Forming (TxBF) Capabilities", HFILL }}, {&hf_ieee80211_txbf_cap,

@@ -404,7 +404,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; @@ -1995,7 +1994,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);

@@ -498,7 +498,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"},

@@ -313,19 +313,37 @@ }; static value_string_ext security_header_type_vals_ext = VALUE_STRING_EXT_INIT(security_header_type_vals); +typedef enum +{ + DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information */ + DE_EPS_CMN_DEVICE_PROPERTIES, /* 9.9.2.0A Device properties */ + DE_EPS_CMN_EPS_BE_CTX_STATUS, /* 9.9.2.1 EPS bearer context status */ + DE_EPS_CMN_LOC_AREA_ID, /* 9.9.2.2 Location area identification */ + DE_EPS_CMN_MOB_ID, /* 9.9.2.3 Mobile identity */ + DE_EPS_MS_CM_2, /* 9.9.2.4 Mobile station classmark 2 */ + DE_EPS_MS_CM_3, /* 9.9.2.5 Mobile station classmark 3 */ + DE_EPS_NAS_SEC_PAR_FROM_EUTRA, /* 9.9.2.6 NAS security parameters from E-UTRA */ + DE_EPS_NAS_SEC_PAR_TO_EUTRA, /* 9.9.2.7 NAS security parameters to E-UTRA */ + + DE_EPS_CMN_PLM_LST, /* 9.9.2.8 PLMN list */ + DE_EPS_CMN_SUP_CODEC_LST, /* 9.9.2.6 9.9.2.10 Supported codec list */ + DE_EPS_COMMON_NONE /* NONE */ +} +nas_eps_common_elem_idx_t; + const value_string nas_eps_common_elem_strings[] = { - { 0x00, "Additional information" }, /* 9.9.2.0 Additional information */ - { 0x00, "Device properties" }, /* 9.9.2.0A Device properties */ - { 0x00, "EPS bearer context status" }, /* 9.9.2.1 EPS bearer context status */ - { 0x00, "Location area identification" }, /* 9.9.2.2 Location area identification */ - { 0x00, "Mobile identity" }, /* 9.9.2.3 Mobile identity */ - { 0x00, "Mobile station classmark 2" }, /* 9.9.2.4 Mobile station classmark 2 */ - { 0x00, "Mobile station classmark 3" }, /* 9.9.2.5 Mobile station classmark 3 */ - { 0x00, "NAS security parameters from E-UTRA" }, /* 9.9.2.6 NAS security parameters from E-UTRA */ - { 0x00, "NAS security parameters to E-UTRA" }, /* 9.9.2.7 NAS security parameters to E-UTRA */ - { 0x00, "PLMN list" }, /* 9.9.2.8 PLMN list */ - /* 9.9.2.9 Spare half octet */ - { 0x00, "Supported codec list" }, /* 9.9.2.10 Supported codec list */ + { DE_EPS_CMN_ADD_INFO, "Additional information" }, /* 9.9.2.0 Additional information */ + { DE_EPS_CMN_DEVICE_PROPERTIES, "Device properties" }, /* 9.9.2.0A Device properties */ + { DE_EPS_CMN_EPS_BE_CTX_STATUS, "EPS bearer context status" }, /* 9.9.2.1 EPS bearer context status */ + { DE_EPS_CMN_LOC_AREA_ID, "Location area identification" }, /* 9.9.2.2 Location area identification */ + { DE_EPS_CMN_MOB_ID, "Mobile identity" }, /* 9.9.2.3 Mobile identity */ + { DE_EPS_MS_CM_2, "Mobile station classmark 2" }, /* 9.9.2.4 Mobile station classmark 2 */ + { DE_EPS_MS_CM_3, "Mobile station classmark 3" }, /* 9.9.2.5 Mobile station classmark 3 */ + { DE_EPS_NAS_SEC_PAR_FROM_EUTRA, "NAS security parameters from E-UTRA" },/* 9.9.2.6 NAS security parameters from E-UTRA */ + { DE_EPS_NAS_SEC_PAR_TO_EUTRA, "NAS security parameters to E-UTRA" }, /* 9.9.2.7 NAS security parameters to E-UTRA */ + { DE_EPS_CMN_PLM_LST, "PLMN list" }, /* 9.9.2.8 PLMN list */ + /* 9.9.2.9 Spare half octet */ + { DE_EPS_CMN_SUP_CODEC_LST, "Supported codec list" }, /* 9.9.2.10 Supported codec list */ { 0, NULL } }; @@ -368,24 +386,6 @@ #define NUM_NAS_EPS_COMMON_ELEM (sizeof(nas_eps_common_elem_strings)/sizeof(value_string)) gint ett_nas_eps_common_elem[NUM_NAS_EPS_COMMON_ELEM]; -typedef enum -{ - DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information */ - DE_EPS_CMN_DEVICE_PROPERTIES, /* 9.9.2.0A Device properties */ - DE_EPS_CMN_EPS_BE_CTX_STATUS, /* 9.9.2.1 EPS bearer context status */ - DE_EPS_CMN_LOC_AREA_ID, /* 9.9.2.2 Location area identification */ - DE_EPS_CMN_MOB_ID, /* 9.9.2.3 Mobile identity */ - DE_EPS_MS_CM_2, /* 9.9.2.4 Mobile station classmark 2 */ - DE_EPS_MS_CM_3, /* 9.9.2.5 Mobile station classmark 3 */ - DE_EPS_NAS_SEC_PAR_FROM_EUTRA, /* 9.9.2.6 NAS security parameters from E-UTRA */ - DE_EPS_NAS_SEC_PAR_TO_EUTRA, /* 9.9.2.7 NAS security parameters to E-UTRA */ - - DE_EPS_CMN_PLM_LST, /* 9.9.2.8 PLMN list */ - DE_EPS_CMN_SUP_CODEC_LST, /* 9.9.2.6 9.9.2.10 Supported codec list */ - DE_EPS_COMMON_NONE /* NONE */ -} -nas_eps_common_elem_idx_t; - /* * 9.9.2 Common information elements */ @@ -570,58 +570,58 @@ const value_string nas_emm_elem_strings[] = { /* 9.9.3 EPS Mobility Management (EMM) information elements */ - { 0x00, "Additional update result" }, /* 9.9.3.0A Additional update result */ - { 0x00, "Additional update type" }, /* 9.9.3.0B Additional update type */ - { 0x00, "Authentication failure parameter" }, /* 9.9.3.1 Authentication failure parameter */ - { 0x00, "Authentication parameter AUTN" }, /* 9.9.3.2 Authentication parameter AUTN */ - { 0x00, "Authentication parameter RAND" }, /* 9.9.3.3 Authentication parameter RAND */ - { 0x00, "Authentication response parameter" }, /* 9.9.3.4 Authentication response parameter */ - { 0x00, "CSFB response" }, /* 9.9.3.5 CSFB response */ - { 0x00, "Daylight saving time" }, /* 9.9.3.6 Daylight saving time */ - { 0x00, "Detach type" }, /* 9.9.3.7 Detach type */ - { 0x00, "DRX parameter" }, /* 9.9.3.8 DRX parameter */ - { 0x00, "EMM cause" }, /* 9.9.3.9 EMM cause */ - { 0x00, "EPS attach result" }, /* 9.9.3.10 EPS attach result */ - { 0x00, "EPS attach type" }, /* 9.9.3.11 EPS attach type */ - { 0x00, "EPS mobile identity" }, /* 9.9.3.12 EPS mobile identity */ - { 0x00, "EPS network feature support" }, /* 9.9.3.12 EPS mobile identity */ - { 0x00, "EPS update result" }, /* 9.9.3.13 EPS update result */ - { 0x00, "EPS update type" }, /* 9.9.3.14 EPS update type */ - { 0x00, "ESM message container" }, /* 9.9.3.15 ESM message conta */ - { 0x00, "GPRS timer" }, /* 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. */ - { 0x00, "GPRS timer 2" }, /* 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. */ - { 0x00, "GPRS timer 3" }, /* 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. */ - { 0x00, "Identity type 2" }, /* 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. */ - { 0x00, "IMEISV request" }, /* 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. */ - { 0x00, "KSI and sequence number" }, /* 9.9.3.19 KSI and sequence number */ - { 0x00, "MS network capability" }, /* 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. */ - { 0x00, "MS network feature support" }, /* 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. */ - { 0x00, "NAS key set identifier" }, /* 9.9.3.21 NAS key set identifier */ - { 0x00, "NAS message container" }, /* 9.9.3.22 NAS message container */ - { 0x00, "NAS security algorithms" }, /* 9.9.3.23 NAS security algorithms */ - { 0x00, "Network name" }, /* 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. */ - { 0x00, "Nonce" }, /* 9.9.3.25 Nonce */ - { 0x00, "Paging identity" }, /* 9.9.3.25A Paging identity */ - { 0x00, "P-TMSI signature" }, /* 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. */ - { 0x00, "Service type" }, /* 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. */ - { 0x00, "Short MAC" }, /* 9.9.3.28 Short MAC */ - { 0x00, "Time zone" }, /* 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. */ - { 0x00, "Time zone and time" }, /* 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. */ - { 0x00, "TMSI status" }, /* 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. */ - { 0x00, "Tracking area identity" }, /* 9.9.3.32 Tracking area identity */ - { 0x00, "Tracking area identity list" }, /* 9.9.3.33 Tracking area identity list */ - { 0x00, "UE network capability" }, /* 9.9.3.34 UE network capability */ - { 0x00, "UE radio capability information update needed" }, /* 9.9.3.35 UE radio capability information update needed */ - { 0x00, "UE security capability" }, /* 9.9.3.36 UE security capability */ - { 0x00, "Emergency Number List" }, /* 9.9.3.37 Emergency Number List */ - { 0x00, "CLI" }, /* 9.9.3.38 CLI */ - { 0x00, "SS Code" }, /* 9.9.3.39 SS Code */ - { 0x00, "LCS indicator" }, /* 9.9.3.40 LCS indicator */ - { 0x00, "LCS client identity" }, /* 9.9.3.41 LCS client identity */ - { 0x00, "Generic message container type" }, /* 9.9.3.42 Generic message container type */ - { 0x00, "Generic message container" }, /* 9.9.3.43 Generic message container */ - { 0x00, "Voice domain preference and UEs usage setting" }, /* 9.9.3.44 Voice domain preference and UEs usage setting */ - { 0x00, "GUTI type" }, /* 9.9.3.45 GUTI type */ + { DE_EMM_ADD_UPD_RES, "Additional update result" }, /* 9.9.3.0A Additional update result */ + { DE_EMM_ADD_UPD_TYPE, "Additional update type" }, /* 9.9.3.0B Additional update type */ + { DE_EMM_AUTH_FAIL_PAR, "Authentication failure parameter" }, /* 9.9.3.1 Authentication failure parameter */ + { DE_EMM_AUTN, "Authentication parameter AUTN" }, /* 9.9.3.2 Authentication parameter AUTN */ + { DE_EMM_AUTH_PAR_RAND, "Authentication parameter RAND" }, /* 9.9.3.3 Authentication parameter RAND */ + { DE_EMM_AUTH_RESP_PAR, "Authentication response parameter" }, /* 9.9.3.4 Authentication response parameter */ + { DE_EMM_CSFB_RESP, "CSFB response" }, /* 9.9.3.5 CSFB response */ + { DE_EMM_DAYL_SAV_T, "Daylight saving time" }, /* 9.9.3.6 Daylight saving time */ + { DE_EMM_DET_TYPE, "Detach type" }, /* 9.9.3.7 Detach type */ + { DE_EMM_DRX_PAR, "DRX parameter" }, /* 9.9.3.8 DRX parameter */ + { DE_EMM_CAUSE, "EMM cause" }, /* 9.9.3.9 EMM cause */ + { DE_EMM_ATT_RES, "EPS attach result" }, /* 9.9.3.10 EPS attach result */ + { DE_EMM_ATT_TYPE, "EPS attach type" }, /* 9.9.3.11 EPS attach type */ + { DE_EMM_EPS_MID, "EPS mobile identity" }, /* 9.9.3.12 EPS mobile identity */ + { DE_EMM_EPS_NET_FEATURE_SUP, "EPS network feature support" }, /* 9.9.3.12A EPS network feature support */ + { DE_EMM_EPS_UPD_RES, "EPS update result" }, /* 9.9.3.13 EPS update result */ + { DE_EMM_EPS_UPD_TYPE, "EPS update type" }, /* 9.9.3.14 EPS update type */ + { DE_EMM_ESM_MSG_CONT, "ESM message container" }, /* 9.9.3.15 ESM message conta */ + { DE_EMM_GPRS_TIMER, "GPRS timer" }, /* 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. */ + { DE_EMM_GPRS_TIMER_2, "GPRS timer 2" }, /* 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. */ + { DE_EMM_GPRS_TIMER_3, "GPRS timer 3" }, /* 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. */ + { DE_EMM_ID_TYPE_2, "Identity type 2" }, /* 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. */ + { DE_EMM_IMEISV_REQ, "IMEISV request" }, /* 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. */ + { DE_EMM_KSI_AND_SEQ_NO, "KSI and sequence number" }, /* 9.9.3.19 KSI and sequence number */ + { DE_EMM_MS_NET_CAP, "MS network capability" }, /* 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. */ + { DE_EMM_MS_NET_FEAT_SUP, "MS network feature support" }, /* 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. */ + { DE_EMM_NAS_KEY_SET_ID, "NAS key set identifier" }, /* 9.9.3.21 NAS key set identifier */ + { DE_EMM_NAS_MSG_CONT, "NAS message container" }, /* 9.9.3.22 NAS message container */ + { DE_EMM_NAS_SEC_ALGS, "NAS security algorithms" }, /* 9.9.3.23 NAS security algorithms */ + { DE_EMM_NET_NAME, "Network name" }, /* 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. */ + { DE_EMM_NONCE, "Nonce" }, /* 9.9.3.25 Nonce */ + { DE_EMM_PAGING_ID, "Paging identity" }, /* 9.9.3.25A Paging identity */ + { DE_EMM_P_TMSI_SIGN, "P-TMSI signature" }, /* 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. */ + { DE_EMM_SERV_TYPE, "Service type" }, /* 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. */ + { DE_EMM_SHORT_MAC, "Short MAC" }, /* 9.9.3.28 Short MAC */ + { DE_EMM_TZ, "Time zone" }, /* 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. */ + { DE_EMM_TZ_AND_T, "Time zone and time" }, /* 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. */ + { DE_EMM_TMSI_STAT, "TMSI status" }, /* 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. */ + { DE_EMM_TRAC_AREA_ID, "Tracking area identity" }, /* 9.9.3.32 Tracking area identity */ + { DE_EMM_TRAC_AREA_ID_LST, "Tracking area identity list" }, /* 9.9.3.33 Tracking area identity list */ + { DE_EMM_UE_NET_CAP, "UE network capability" }, /* 9.9.3.34 UE network capability */ + { DE_EMM_UE_RA_CAP_INF_UPD_NEED, "UE radio capability information update needed" },/* 9.9.3.35 UE radio capability information update needed */ + { DE_EMM_UE_SEC_CAP, "UE security capability" }, /* 9.9.3.36 UE security capability */ + { DE_EMM_EMERG_NUM_LST, "Emergency Number List" }, /* 9.9.3.37 Emergency Number List */ + { DE_EMM_CLI, "CLI" }, /* 9.9.3.38 CLI */ + { DE_EMM_SS_CODE, "SS Code" }, /* 9.9.3.39 SS Code */ + { DE_EMM_LCS_IND, "LCS indicator" }, /* 9.9.3.40 LCS indicator */ + { DE_EMM_LCS_CLIENT_ID, "LCS client identity" }, /* 9.9.3.41 LCS client identity */ + { DE_EMM_GEN_MSG_CONT_TYPE, "Generic message container type" }, /* 9.9.3.42 Generic message container type */ + { DE_EMM_GEN_MSG_CONT, "Generic message container" }, /* 9.9.3.43 Generic message container */ + { DE_EMM_VOICE_DMN_PREF, "Voice domain preference and UEs usage setting" },/* 9.9.3.44 Voice domain preference and UEs usage setting */ + { DE_EMM_GUTI_TYPE, "GUTI type" }, /* 9.9.3.45 GUTI type */ { 0, NULL } }; #define NUM_NAS_EMM_ELEM (sizeof(nas_emm_elem_strings)/sizeof(value_string)) @@ -2642,33 +2642,6 @@ }; /* 9.9.4 EPS Session Management (ESM) information elements */ -const value_string nas_esm_elem_strings[] = { - { 0x00, "Access point name" }, /* 9.9.4.1 Access point name */ - { 0x00, "APN aggregate maximum bit rate" }, /* 9.9.4.2 APN aggregate maximum bit rate */ - { 0x00, "Connectivity type" }, /* 9.9.4.2A Connectivity type */ - { 0x00, "EPS quality of service" }, /* 9.9.4.3 EPS quality of service */ - { 0x00, "ESM cause" }, /* 9.9.4.4 ESM cause */ - { 0x00, "ESM information transfer flag" }, /* 9.9.4.5 ESM information transfer flag */ - { 0x00, "Linked EPS bearer identity" }, /* 9.9.4.6 Linked EPS bearer identity */ - { 0x00, "LLC service access point identifier" }, /* 9.9.4.7 LLC service access point identifier */ - { 0x00, "Notification indicator" }, /* 9.9.4.7a Notification indicator */ - { 0x00, "Packet flow identifier" }, /* 9.9.4.8 Packet flow identifier */ - { 0x00, "PDN address" }, /* 9.9.4.9 PDN address */ - { 0x00, "PDN type" }, /* 9.9.4.10 PDN type */ - { 0x00, "Protocol configuration options" }, /* 9.9.4.11 Protocol configuration options */ - { 0x00, "Quality of service" }, /* 9.9.4.12 Quality of service */ - { 0x00, "Radio priority" }, /* 9.9.4.13 Radio priority */ - { 0x00, "Request type" }, /* 9.9.4.14 Request type */ - { 0x00, "Traffic flow aggregate description" }, /* 9.9.4.15 Traffic flow aggregate description */ - { 0x00, "Traffic flow templat" }, /* 9.9.4.16 Traffic flow template */ - { 0x00, "Transaction identifier" }, /* 9.9.4.17 Transaction identifier */ - { 0, NULL } -}; - - -#define NUM_NAS_ESM_ELEM (sizeof(nas_esm_elem_strings)/sizeof(value_string)) -gint ett_nas_eps_esm_elem[NUM_NAS_ESM_ELEM]; - typedef enum { DE_ESM_APN, /* 9.9.4.1 Access point name */ @@ -2695,6 +2668,34 @@ nas_esm_elem_idx_t; +const value_string nas_esm_elem_strings[] = { + { DE_ESM_APN, "Access point name" }, /* 9.9.4.1 Access point name */ + { DE_ESM_APN_AGR_MAX_BR, "APN aggregate maximum bit rate" }, /* 9.9.4.2 APN aggregate maximum bit rate */ + { DE_ESM_CONNECTIVITY_TYPE, "Connectivity type" }, /* 9.9.4.2A Connectivity type */ + { DE_ESM_EPS_QOS, "EPS quality of service" }, /* 9.9.4.3 EPS quality of service */ + { DE_ESM_CAUSE, "ESM cause" }, /* 9.9.4.4 ESM cause */ + { DE_ESM_INF_TRF_FLG, "ESM information transfer flag" }, /* 9.9.4.5 ESM information transfer flag */ + { DE_ESM_LNKED_EPS_B_ID, "Linked EPS bearer identity" }, /* 9.9.4.6 Linked EPS bearer identity */ + { DE_ESM_LLC_SAPI, "LLC service access point identifier" }, /* 9.9.4.7 LLC service access point identifier */ + { DE_ESM_NOTIF_IND, "Notification indicator" }, /* 9.9.4.7a Notification indicator */ + { DE_ESM_P_FLW_ID, "Packet flow identifier" }, /* 9.9.4.8 Packet flow identifier */ + { DE_ESM_PDN_ADDR, "PDN address" }, /* 9.9.4.9 PDN address */ + { DE_ESM_PDN_TYPE, "PDN type" }, /* 9.9.4.10 PDN type */ + { DE_ESM_PROT_CONF_OPT, "Protocol configuration options" }, /* 9.9.4.11 Protocol configuration options */ + { DE_ESM_QOS, "Quality of service" }, /* 9.9.4.12 Quality of service */ + { DE_ESM_RA_PRI, "Radio priority" }, /* 9.9.4.13 Radio priority */ + { DE_ESM_REQ_TYPE, "Request type" }, /* 9.9.4.14 Request type */ + { DE_ESM_TRAF_FLOW_AGR_DESC, "Traffic flow aggregate description" },/* 9.9.4.15 Traffic flow aggregate description */ + { DE_ESM_TRAF_FLOW_TEMPL, "Traffic flow template" }, /* 9.9.4.16 Traffic flow template */ + { DE_ESM_TID, "Transaction identifier" }, /* 9.9.4.17 Transaction identifier */ + { 0, NULL } +}; + + +#define NUM_NAS_ESM_ELEM (sizeof(nas_esm_elem_strings)/sizeof(value_string)) +gint ett_nas_eps_esm_elem[NUM_NAS_ESM_ELEM]; + + guint16 (*esm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { NULL, /* 9.9.4.1 Access point name */ de_esm_apn_aggr_max_br, /* 9.9.4.2 APN aggregate maximum bit rate */

@@ -149,7 +149,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);

@@ -570,45 +570,45 @@ */ const value_string sgsap_elem_strings[] = { - { 0x01, "IMSI" }, /* 9.4.6 */ - { 0x02, "VLR name" }, /* 9.4.22 */ - { 0x03, "TMSI" }, /* 9.4.20 */ - { 0x04, "Location area identifier" }, /* 9.4.11 */ - { 0x05, "Channel Needed" }, /* 9.4.23 */ - { 0x06, "eMLPP Priority" }, /* 9.4.24 */ - { 0x07, "TMSI status" }, /* 9.4.21 */ - { 0x08, "SGs cause" }, /* 9.4.18 */ - { 0x09, "MME name" }, /* 9.4.13 */ - { 0x0a, "EPS location update type" }, /* 9.4.2 */ - { 0x0b, "Global CN-Id" }, /* 9.4.4 */ - - { 0x0c, "Undefined" }, /* */ - { 0x0d, "Undefined" }, /* */ - - { 0x0e, "Mobile identity" }, /* 9.4.14 */ - { 0x0f, "Reject cause" }, /* 9.4.16 */ - { 0x10, "IMSI detach from EPS service type" }, /* 9.4.7 */ - { 0x11, "IMSI detach from non-EPS service type" }, /* 9.4.8 */ - - { 0x15, "IMEISV" }, /* 9.4.5 */ - { 0x16, "NAS message container" }, /* 9.4.15 */ - { 0x17, "MM information" }, /* 9.4.12 */ - - { 0x18, "Undefined" }, /* */ - { 0x19, "Undefined" }, /* */ - { 0x1a, "Undefined" }, /* */ - - { 0x1b, "Erroneous message" }, /* 9.4.3 */ - { 0x1c, "CLI" }, /* 9.4.1 */ - { 0x1d, "LCS client identity" }, /* 9.4.9 */ - { 0x1e, "LCS indicator" }, /* 9.4.10 */ - { 0x1f, "SS code" }, /* 9.4.19 */ - { 0x20, "Service indicator" }, /* 9.4.17 */ - { 0x21, "UE Time Zone" }, /* 9.4.21b */ - { 0x22, "Mobile Station Classmark 2" }, /* 9.4.14a */ - { 0x23, "Tracking Area Identity" }, /* 9.4.21a */ - { 0x24, "E-UTRAN Cell Global Identity" }, /* 9.4.3a */ - { 0x25, "UE EMM mode" }, /* 9.4.21c */ + { DE_SGSAP_IMSI, "IMSI" }, /* 9.4.6 */ + { DE_SGSAP_VLR_NAME, "VLR name" }, /* 9.4.22 */ + { DE_SGSAP_TMSI, "TMSI" }, /* 9.4.20 */ + { DE_SGSAP_LOC_AREA_ID, "Location area identifier" }, /* 9.4.11 */ + { DE_SGSAP_CH_NEEDED, "Channel Needed" }, /* 9.4.23 */ + { DE_SGSAP_EMLPP_PRIO, "eMLPP Priority" }, /* 9.4.24 */ + { DE_SGSAP_TMSI_STATUS, "TMSI status" }, /* 9.4.21 */ + { DE_SGSAP_SGS_CAUSE, "SGs cause" }, /* 9.4.18 */ + { DE_SGSAP_MME_NAME, "MME name" }, /* 9.4.13 */ + { DE_SGSAP_EPS_LOC_UPD_TYPE, "EPS location update type" }, /* 9.4.2 */ + { DE_SGSAP_GLOBAL_CN_ID, "Global CN-Id" }, /* 9.4.4 */ + + { DE_SGSAP_UDEF_11, "Undefined" }, /* */ + { DE_SGSAP_UDEF_12, "Undefined" }, /* */ + + { DE_SGSAP_MID, "Mobile identity" }, /* 9.4.14 */ + { DE_SGSAP_REJ_CAUSE, "Reject cause" }, /* 9.4.16 */ + { DE_SGSAP_IMSI_DET_EPS, "IMSI detach from EPS service type" }, /* 9.4.7 */ + { DE_SGSAP_IMSI_DET_NON_EPS, "IMSI detach from non-EPS service type" }, /* 9.4.8 */ + + { DE_SGSAP_IMEISV, "IMEISV" }, /* 9.4.5 */ + { DE_SGSAP_NAS_MSG_CONTAINER, "NAS message container" }, /* 9.4.15 */ + { DE_SGSAP_MM_INFO, "MM information" }, /* 9.4.12 */ + + { DE_SGSAP_UDEF_20, "Undefined" }, /* */ + { DE_SGSAP_UDEF_21, "Undefined" }, /* */ + { DE_SGSAP_UDEF_22, "Undefined" }, /* */ + + { DE_SGSAP_ERR_MSG, "Erroneous message" }, /* 9.4.3 */ + { DE_SGSAP_CLI, "CLI" }, /* 9.4.1 */ + { DE_SGSAP_LCS_CLIENT_ID, "LCS client identity" }, /* 9.4.9 */ + { DE_SGSAP_LCS_INDIC, "LCS indicator" }, /* 9.4.10 */ + { DE_SGSAP_SS_CODE, "SS code" }, /* 9.4.19 */ + { DE_SGSAP_SERV_INDIC, "Service indicator" }, /* 9.4.17 */ + { DE_SGSAP_UE_TZ, "UE Time Zone" }, /* 9.4.21b */ + { DE_SGSAP_MSC_2, "Mobile Station Classmark 2" }, /* 9.4.14a */ + { DE_SGSAP_TAID, "Tracking Area Identity" }, /* 9.4.21a */ + { DE_SGSAP_ECGI, "E-UTRAN Cell Global Identity" }, /* 9.4.3a */ + { DE_SGSAP_UE_EMM_MODE, "UE EMM mode" }, /* 9.4.21c */ { 0, NULL } }; @@ -638,8 +638,8 @@ DE_SGSAP_EPS_LOC_UPD_TYPE, /. 9.4.2 EPS location update type./ DE_SGSAP_GLOBAL_CN_ID, /. 9.4.4 Global CN-Id./ - DE_SGSAP_UDEF_12, /. Undefined ./ - DE_SGSAP_UDEF_13, /. Undefined ./ + DE_SGSAP_UDEF_11, /. Undefined ./ + DE_SGSAP_UDEF_12, /. Undefined ./ DE_SGSAP_MID, /. 9.4.14 Mobile identity./ DE_SGSAP_REJ_CAUSE, /. 9.4.16 Reject cause ./ @@ -650,9 +650,9 @@ DE_SGSAP_NAS_MSG_CONTAINER, /. 9.4.15 NAS message container./ DE_SGSAP_MM_INFO, /. 9.4.12 MM information./ - DE_SGSAP_UDEF_24, /. Undefined ./ - DE_SGSAP_UDEF_25, /. Undefined ./ - DE_SGSAP_UDEF_26, /. Undefined ./ + DE_SGSAP_UDEF_20, /. Undefined ./ + DE_SGSAP_UDEF_21, /. Undefined ./ + DE_SGSAP_UDEF_22, /. Undefined ./ DE_SGSAP_ERR_MSG, /. 9.4.3 Erroneous message./ DE_SGSAP_CLI, /. 9.4.1 CLI ./

@@ -2236,8 +2236,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; }

@@ -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

@@ -103,7 +103,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] */

@@ -95,8 +95,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

@@ -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} };

@@ -298,18 +298,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; @@ -392,6 +392,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 {

@@ -2,8 +2,6 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id$ -# # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs @@ -78,7 +76,7 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 8, - "version_micro" => 13, + "version_micro" => 15, "version_build" => 0, "enable" => 1, @@ -168,11 +166,11 @@ $last_change = $line; } - # Commits in current (master-1.8) branch. We may want to use - # a different number. - chomp($line = qx{git --git-dir=$srcdir/.git describe --long --match v1.8.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]; } @@ -189,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.8.13, Copyright 1998-2014 Wireshark Development Team</string> + <string>1.8.15, 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.8.13</string> + <string>1.8.15</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.8.13</string> + <string>1.8.15</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 \

@@ -315,8 +315,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="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 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> \ No newline at end of file +<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="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 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>

@@ -1461,7 +1461,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 } };

@@ -897,9 +897,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

@@ -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/enterprise-numbers" unless(defined $in); +$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"

@@ -1565,7 +1565,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 libpcap or pcapng format."); return 1; } if (global_capture_opts.multi_files_on) { @@ -1596,6 +1596,7 @@ cmdarg_err("Read 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

@@ -1,2 +1,2 @@ -#define GITVERSION "v1.8.13" +#define GITVERSION "v1.8.15-0-g50a182c" #define GITBRANCH "master-1.8"

@@ -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:13:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:15:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ if HAVE_WARNINGS_AS_ERRORS AM_NON_GENERATED_CFLAGS = -Werror

@@ -611,7 +611,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:13:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:15:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \

@@ -1036,12 +1036,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

[-] [+]	Changed	wireshark.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Jun 14 21:38:01 UTC 2014 - cs@linux-administrator.com + +- update to release 1.8.15 + +------------------------------------------------------------------- Tue Mar 11 17:19:26 UTC 2014 - cs@linux-administrator.com - update to release 1.8.13
[-] [+]	Changed	wireshark.spec ^
@@ -22,7 +22,7 @@ License: GPLv2+ Group: Productivity/Networking/Diagnostic Summary: A Network Traffic Analyser -Version: 1.8.13 +Version: 1.8.15 Release: 1 Url: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
[-] [+]	Deleted	wireshark-1.8.13.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.8.13.tar.bz2/packaging/macosx/ChmodBPF/StartupParameters.plist ^
@@ -1,4 +0,0 @@ -{ - Description = "Change BPF permissions"; - Provides = ("ChmodBPF"); -}
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/ChangeLog ^
@@ -1,894 +1,395 @@ -commit 3ba1968e8445b0019e02271cd7fcf568008b4f75 +commit 4e00be942cb32206efa44ba823fb1f3bdd5ce83e Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 13:51:54 2014 -0800 +Date: Thu Jun 12 12:11:49 2014 -0700 - Add a CVE ID and attribution. + Build 1.8.15. - Change-Id: I5aef30dfab1fa551adf1de3bbb1c16056a3ce0ac - Reviewed-on: https://code.wireshark.org/review/542 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 7987a36747220d03bcfb9fa6cf1e9dc30375d47c -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Mar 6 12:33:21 2014 -0800 + Change-Id: Ic93910a0090879461a285ab793367b2e9c786e54 - Add wnpa-sec-2014-04. - - Change-Id: I0c6f5a30e746df4f2471a7b93dffd1b22a639a9d - Reviewed-on: https://code.wireshark.org/review/539 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f567435ac7140c96a5de56dbce3d5e7659af4d09 -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> - (cherry picked from commit 34144b8d4da141e8aa9b99221855edc9f4c73ad8) - Reviewed-on: https://code.wireshark.org/review/534 - -commit 3b72014e95aa4d2853a4d701ac25f4b074529105 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Mar 5 17:10:30 2014 -0800 +commit 6d29becdcd80abc4bcbd9db20d542c596b6cce11 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Jun 11 10:51:21 2014 +0200 - Add CVE IDs. + Revert "Revert "Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8940"" - Change-Id: I9a99fb3b4ffef46ef90103032e1a78aa9f8f68c1 - Reviewed-on: https://code.wireshark.org/review/524 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 80bc0476e6c613b438c2b7b36d12c6139a2ed921 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Mar 4 11:08:28 2014 -0800 - - Update the release notes. + This reverts commit c34a63b29e3527a7951d7f49a67113e700b358a5. - Change-Id: Ia939f89cf89c56cbdd26755b98c16fe265bd1dd9 - Reviewed-on: https://code.wireshark.org/review/504 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 3d87b897a43a89beaf576d857e12dde7c5723e91 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 15:03:41 2014 -0800 - - Switch to "rc" instead of "pre" to match our tags. + Revert of commit c34a63b29e3527a7951d7f49a67113e700b358a5 reintroduced the fuzz failure (as one could expect). + Instead let's do the real fix... - Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e - Reviewed-on: https://code.wireshark.org/review/489 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit 31187b1c5d863e2338f0050ff897512b92ebf774) - Reviewed-on: https://code.wireshark.org/review/490 + Bug: 8940 + Change-Id: I184b8be858507afa26a229bf4860e3a0d4e01c60 + Reviewed-on: https://code.wireshark.org/review/2134 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 7bb4ec81a7912a785758cd63570dab1d00da2647 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 14:26:15 2014 -0800 +commit 83ca675f54c6f106ae6edc9fa4e52e3dcaa63927 +Author: Bill Meier <wmeier@newsguy.com> +Date: Mon Jun 9 23:07:36 2014 -0400 - Don't append "-dirty" to the version string. + Update info re Bug # 9991: '-F libpcap' (not '-F pcap') is used in Wireshark-1.8. - Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301 - Reviewed-on: https://code.wireshark.org/review/485 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I9798f90cc96c725ebf89e7339c76497ae597c6ee + Reviewed-on: https://code.wireshark.org/review/2093 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0 +commit ebaeacd8e9e7e1d14ec9d1f8e966ef2d442055cc Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Mar 3 13:52:57 2014 -0800 +Date: Mon Jun 9 15:32:34 2014 -0700 - 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. + Release note updates for 1.8.15. - Check pkg_enable using an integer comparison as an extra level of - protection. - - (We need to handle CRs better in general but for now we need to get - version stamping working for the next release.) - - Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b - Reviewed-on: https://code.wireshark.org/review/483 + Change-Id: I77dd5ea9c37c7ffc2f75efe9bfe4cdc0bede3130 + Reviewed-on: https://code.wireshark.org/review/2090 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit aff99aa5414e5df92a6714f4998518d3342a161e -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 10 22:20:31 2013 +0000 - - More git revision updates. - - Includes a partial cherry-pick of gf8002de. - - Change-Id: I2d641001610aa1c46f64a9929e3114a76ba3ce2c - Reviewed-on: https://code.wireshark.org/review/480 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 40c4e98e6217109bd9d8834492612f059859d53e -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Sep 10 16:00:58 2012 +0000 - - Update svnversion.h with (short) SHA-1 commit id and branch when use git repository - - svn path=/trunk/; revision=44850 - (cherry picked from commit 8f4a2e5f28f241f2afb6004833528db20ff5e013) - - Change-Id: I989390f9c4d96d434571193aa923c95cf110c8bb - Reviewed-on: https://code.wireshark.org/review/477 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b6e571f1bc6207d1a285dc89cff5ec7c79a94c78 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jun 29 21:58:46 2013 +0000 +commit aa50774d3f2e3ea98021a7621cf01e7d6f93a01f +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Jun 9 11:26:45 2014 +0200 - Update .gitignore to add some Windows specific build stuff to ignore list. - - svn path=/trunk/; revision=50231 - (cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b) + Fix a typo in release notes - Change-Id: Iaeaacaacafc4a829e693f8b4c66614748d0e67ca - Reviewed-on: https://code.wireshark.org/review/469 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Icd45019f257c07482ba3a510b2a66e75e634e55e + Reviewed-on: https://code.wireshark.org/review/2057 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 04806a88a1b06413b01a04b68956bd08a1cce5cc -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Mar 2 08:11:08 2014 -0800 +commit ac2b854e27cc8d37ec298d97c08d146e70bebf46 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Jun 8 22:46:45 2014 +0200 - [Automatic manuf, services and enterprise-numbers update for 2014-03-02] + IEEE 80211: fix dissection of HT Capabilities - Change-Id: Idc5b60d4aaac166b0b434562ba6e900254455755 - Reviewed-on: https://code.wireshark.org/review/446 + 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> - -commit 358ce3d5ce36e50545d00a80a74a4200c3d53575 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jun 5 16:38:20 2013 +0000 - - Quick fix for bug 8768. For now assume that only three logical channels - are valid. If we run into more add expert item and cap the channel - count. - - svn path=/trunk/; revision=49787 - - Conflicts: - epan/dissectors/packet-tetra.c - - (cherry picked from commit c891784de783cf23b8cf2957929af162480e0c73) - - Change-Id: I6974d755be544730fb4320b680299ce4040a47dc - Reviewed-on: https://code.wireshark.org/review/439 + (cherry picked from commit 89960510e30b9b96a0d0b84619df099fd8a707f1) + Reviewed-on: https://code.wireshark.org/review/2056 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6d54ab69ffd8f6f57dbdc89036de8a4485b9dbcd +commit adc0d9fb53b79b1451848fc23d222c24341ba43c Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Feb 28 17:21:29 2014 -0800 - - Copy git-compare-abis from ge635d3f / master-1.10. - - 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. - - Change-Id: Ie9d35057fe14bcb75736b54b7efb5f0a8deda39a - Reviewed-on: https://code.wireshark.org/review/437 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 217293ba4a0353bf5d657e74fe8623dd3c86fe08 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Feb 26 13:00:03 2014 -0500 +Date: Sun Jun 8 08:11:56 2014 -0700 - 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). + [Automatic manuf, services and enterprise-numbers update for 2014-06-08] - 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: I1536fcb8e96f5560ad366169e815f62967b3e40d - Reviewed-on: https://code.wireshark.org/review/407 + Change-Id: I3fc4cdc2f43dfd07075af0a3cb00d26322626295 + Reviewed-on: https://code.wireshark.org/review/2039 Reviewed-by: Evan Huus <eapache@gmail.com> -commit fc51c557e687351281592ea8d53fa51e0a2a61b6 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 29 18:45:09 2013 +0000 +commit c34a63b29e3527a7951d7f49a67113e700b358a5 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Jun 7 10:28:23 2014 +0200 - From stcook - - clear the temporary buffer after each DXM channel data line + Revert "Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8940" - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 + While the bugfix makes sense, it requires a huge amount of work to get the messages decoded again (backport of gae61fe0 and ge8c305f; see http://ask.wireshark.org/questions/33502/why-cannot-fully-decode-nas-field-on-s1ap-protocol). + As I do not feel courageous enough to backport everything, let's go back to the old code for this soon to be dead branch. - svn path=/trunk/; revision=54488 - cherry-picked from 745c8660be2707df41d7cea3cd2725d18b9d6ff0 with - release note updates. + This reverts commit 9f46f19b276ed3b166ef7931b971caa7c4eaa082. - Change-Id: I80f0ed958517c90525def329b8fbdab26afe8f19 - Reviewed-on: https://code.wireshark.org/review/343 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I3251044d0ed7607badce3679a1af89d15e00e458 + Reviewed-on: https://code.wireshark.org/review/2020 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 31e7202fd227b1c0202408bd0c4dc382e927c168 -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 with - manual intervention) - - Change-Id: I38cf7946969972a9ab03a56966b10f880476f55c - Reviewed-on: https://code.wireshark.org/review/341 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 6c858b21aca6ea820f766b3457c9714778bb29db -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Feb 23 23:36:11 2014 +0100 +commit 0e8a2bb22c2ca6e7dcfbf461ee5a063e15decebc +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Jun 7 12:00:31 2014 -0700 - NAS EPS: fix dissection of CS service notification message + PEEKREMOTE packets don't appear to have Atheros padding. - Fixes bug 9789 + Call the without-Atheros-padding dissector for the payload. - Change-Id: I26ed1e9d8bb5b662af97d19f64b5f4b39374a5ee - Reviewed-on: https://code.wireshark.org/review/330 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - - (cherry picked from commit dd4e5fcbdd1c54afd9da2764b00f8fef2febb682) - - Change-Id: Ie5875149bc246840bf7d610420b2b2a1d15d2805 - Reviewed-on: https://code.wireshark.org/review/334 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 19d95602bb568a6abc43d1c7f3ce59ef05174bf2 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 23 08:10:46 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-02-23] + Fixes bug 10139. - Change-Id: Icbade2cf84449a950f0dcafd16730d419480885d - Reviewed-on: https://code.wireshark.org/review/318 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I3b5dd25953113fe30b9278e4533561933304ae5b + Reviewed-on: https://code.wireshark.org/review/2030 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 348942c0f0f240ddca469c016d6f0698e47e99c8) + Reviewed-on: https://code.wireshark.org/review/2031 -commit ba2b412fee2bbddba0e7d8bdd17944e5aa397581 +commit b8e54bce21e7376a4e7639d47814d2d322012be4 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Feb 21 16:47:55 2014 -0800 +Date: Sat Jun 7 10:44:17 2014 -0700 - Add bug 9492. + Only nuke the startup item once we've installed the launch daemon. + + 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: I412d5c56848f2a19c8bf2c2e50f1ad1db86ce793 - Reviewed-on: https://code.wireshark.org/review/306 + Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 + Reviewed-on: https://code.wireshark.org/review/2023 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/309 + (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 + (cherry picked from commit 9afa5d6166790661ddc5b44e1e8cb0c2f18fa83e) + Reviewed-on: https://code.wireshark.org/review/2026 -commit e6540b550486fc9604575d4cb85140ceddca2d33 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 1 13:47:11 2013 +0000 +commit ec607cd614911a51d1fe5be87b3d47ea75d6e3c7 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Jun 6 23:41:51 2014 -0700 - Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492) + When installing the launch daemon, get rid of the old startup item. - From Peter Paluch + Only one is necessary; get rid of the startup item. - svn path=/trunk/; revision=53694 - - Change-Id: Iee6b51807491170967a2822db8ccbab9b1e36204 - Reviewed-on: https://code.wireshark.org/review/304 + Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 + Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/305 + (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 + (cherry picked from commit 648766952bf188c3a77c2482d25041694a0dd423) + Reviewed-on: https://code.wireshark.org/review/2019 -commit 13321ccc4781b9e1a2d3eb4c7ac8e9578b7fdfaf +commit 97898a24597d752ac35a22f678db2e2ed9f6f0e9 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: Iedfef3812d9dca2e2af5aa18ebaeaa7a3510bdeb + Reviewed-on: https://code.wireshark.org/review/2008 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-on: https://code.wireshark.org/review/281 -commit 468760ec8da2c0d8c933ad9bc24f4aa866becce5 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 17:11:00 2014 -0800 +commit 4ee4fc1154f8758c2a2bc3d64c7e2aa79fd217cd +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 23:55:06 2014 -0400 - More SVN → Git conversion. + tshark.c: 'tshark -F libpcap -w ...' should create a libpcap (not pcapng) file; fixes Bug #9991. - Change-Id: If89b3c752dfd92d9f1d22456a064dd2e0b45dc96 - Reviewed-on: https://code.wireshark.org/review/266 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I98d6c7c8cb9721ccbfb0220ae3f8550df2e49a1d + Reviewed-on: https://code.wireshark.org/review/1970 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 90b34ae3db7cc39c80c5d1a372b7432fc884556c -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 23 22:18:49 2013 +0000 +commit be509e29c1b2a6b17c53a133794d0c779bd79f10 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Jun 4 23:42:11 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. - - svn path=/trunk/; revision=51497 - (cherry picked from commit dc87fa2d68a5dbc7693b5cc93e044a62af5ce39c) + tshark.c: Change "Live captures can only be saved in libpcap format" to "[...] in libpcap or pcapng format" - Change-Id: Icf7e26f2df5a01a19ed1e652e9b668f4175148a9 - Reviewed-on: https://code.wireshark.org/review/264 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I4f83995ec6b9fcb98dcbe332d0fa42b96edbddc9 + Reviewed-on: https://code.wireshark.org/review/1969 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 5f4468c4e002e885fc4d79d5b60ec2d5619b1c78 +commit 6cfa2b66301b1c87c3e3702ddedf373447d20296 Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 19 15:16:44 2014 -0800 +Date: Sun Jun 1 08:12:04 2014 -0700 - 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. + [Automatic manuf, services and enterprise-numbers update for 2014-06-01] - Cherry-picked from g5086c0e with some manual intervention. - - Change-Id: Ib4b3e52e10557e803d603aa2b1ea5d826845a102 - Reviewed-on: https://code.wireshark.org/review/261 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - (cherry picked from commit 5086c0e21d734612e12173acbee6a98b1a5df2ed) - Reviewed-on: https://code.wireshark.org/review/263 + Change-Id: Iaf6420aaedd0ee909e4c86f39eab785e5faec700 + Reviewed-on: https://code.wireshark.org/review/1910 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 6d66c8023eddffdcb9fe4323d8b88d2480a7923e +commit 6d2796f2784c5bb325b8740cb2a3a2936eb32ba5 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 16 08:10:35 2014 -0800 +Date: Sun May 25 08:11:25 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-16] + [Automatic manuf, services and enterprise-numbers update for 2014-05-25] - Change-Id: I92fd7ad702c4f7974bbe9b770293e6d0fa9217df - Reviewed-on: https://code.wireshark.org/review/231 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I87588b512a643a5c560a8d71a30a7f36db2c04c0 + Reviewed-on: https://code.wireshark.org/review/1792 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 593dbbb853ab83bc748dc0ddd1b19aadd18c6843 +commit 4a916546202f8edfa4e8d4b5c4fd5e872246514d Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 11 08:56:15 2014 -0800 +Date: Sun May 18 08:09:23 2014 -0700 - Fix the host entry. + [Automatic manuf, services and enterprise-numbers update for 2014-05-18] - 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/173 + Change-Id: I77274e7a1ab31a097666a0e2d122bf8db88df5c6 + Reviewed-on: https://code.wireshark.org/review/1681 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 04da0319ce57ff161365c49275131de39e1720f6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 9 08:10:22 2014 -0800 +commit 378455665d078759d8a5eaf961b18885e4ba7584 +Author: Gerald Combs <gerald@zing.org> +Date: Sun May 11 09:47:09 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-09] + Don't build update-sminmpec by default when using CMake. - Change-Id: I914b0c5e7b427ac7201bcd4a062055036c802b5f - Reviewed-on: https://code.wireshark.org/review/154 + 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 + (cherry picked from commit ccce29a936d15dfdfea4f81df90f99150b189ad9) + Reviewed-on: https://code.wireshark.org/review/1594 -commit dd8afe56f9dfaaeb9649bff1d8f8c68c8676c736 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Feb 6 16:51:57 2014 -0800 - - Pass the caplen from the struct wtap_pkthdr to pcap_read_post_process(). - - 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). - - Change-Id: I431738942b4dd10ee0951d549ebf8d12c941c439 - Reviewed-on: https://code.wireshark.org/review/135 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 7065ca5b933380b0b1ae67ad8685912083d5bfa1 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Feb 4 22:28:21 2014 +0100 - - Introduce end-of-line normalization - - Change-Id: If92ef2ceb5f1311d52c66710db9491d7ed4427c2 - Reviewed-on: https://code.wireshark.org/review/116 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 5f5c122d5b975b372f66644b4f9bf17a359d2e72 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Feb 4 10:28:06 2014 -0500 - - Fix dissection of GTP MM Context RAND field. - - As suggested by Lükő Bálint to fix bug #9722. - - Change-Id: Ie6b801a9660716c2c6efa6fd09b50a2481f5acd7 - Reviewed-on: https://code.wireshark.org/review/110 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - (cherry picked from commit 1de44d769cd205a49446ac1fd09ddd196fedb6a8) - Reviewed-on: https://code.wireshark.org/review/112 - -commit d81206ac58486fe45faa74213b1aa5ae01b5a9b1 -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: I15832d91824087a2fed50a3968cb2801cc30cf91 - Reviewed-on: https://code.wireshark.org/review/105 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit fc38bf4821bba4e36b584b331f3e34cdad81ff0a -Author: Anders Broman <anders.broman@ericsson.com> -Date: Tue Sep 10 06:06:55 2013 +0000 - - 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. - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - - svn path=/trunk/; revision=51918 - - Conflicts: - epan/dissectors/packet-ieee802a.c - - Change-Id: I431292a67f0d96341389f2220993b7362daf48ab - Reviewed-on: https://code.wireshark.org/review/93 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 302dcf09e7e26fc26d2c076509c0f5157ea23089 +commit c143130a73d706fad16807f3bdb54895eaa0a19a Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 2 08:10:52 2014 -0800 +Date: Sun May 11 08:09:31 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-02-02] + [Automatic manuf, services and enterprise-numbers update for 2014-05-11] - Change-Id: Ic2a83608a64d7bdf9fbde99f6d96d872dd0edcd9 - Reviewed-on: https://code.wireshark.org/review/77 + Change-Id: Ia71c9eb1ad0290702c8b0701e43fafb8bfcf1d67 + Reviewed-on: https://code.wireshark.org/review/1591 Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - -commit 7d10462e4c3ec9fde3b1a9721267b0f7df3610ab -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 31 18:54:43 2014 -0500 - - Add gitreview file for master-1.8 - - Change-Id: I4d837c0eeab61d131e5e50b0b0a54a271f84b60e - Reviewed-on: https://code.wireshark.org/review/68 - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Evan Huus <eapache@gmail.com> - -commit 65b55ae6107a7bf3578d6689192c10da8de46112 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 29 13:12:39 2014 -0500 - - Add missing gitignore entries - - Change-Id: Ifc6a35924e4a725a9bfa73d35cb6bd11c72660e5 - -commit 24a0832cfeff78d15eafb339a4f07e0f61b8c619 -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. - - svn path=/trunk-1.10/; revision=54966 - - Conflicts: - ui/export_object_smb.c - - Change-Id: Id91522cab64fa5bbe40f0538049401b2c2f24c1a - -commit b1b1b86c08b5afb79e32e0cb0e8a9cc599735de8 -Merge: 3bba4ea 6788dad -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 29 11:24:26 2014 +0000 - - Merge "Fix bug 9649: SMPP: source_telematics_id value length is 1 byte" into master-1.8 - -commit 3bba4ea70b8698d675ae7eb802e3741de1426490 -Merge: 2fb9848 6df7bb0 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 29 11:18:46 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.8 -commit 2fb984892099d81e54e4a69158ae4fb270028eb1 -Merge: 1c9e42e b532ef4 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 29 02:14:04 2014 +0000 - - Merge "Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe Kaplan for the report." into master-1.8 - -commit 1c9e42e4006862841eca6ae49360c1e3b3ab683b +commit 78563c2bcd967093cfc37a27534c02aa37a1019d Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 26 09:11:10 2014 -0800 +Date: Mon May 5 11:50:24 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-26] + Be less aggressive about rebuilding sminmpec.c. - Change-Id: Ie93cc40e6af4ce8c961dbead8937a87ad4361d1e - -commit 12bc6a65aa9b9b159709939e8f92013898073789 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 24 07:57:47 2014 +0000 - - Copy over r54938 from trunk: - - ------------------------------------------------------------------------ - r54938 \| guy \| 2014-01-23 23:55:03 -0800 (Thu, 23 Jan 2014) \| 5 lines - - 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. - - svn path=/trunk-1.8/; revision=54940 - -commit 1728b5996dda43b6318f8359ceaf12760525e423 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 22 02:25:27 2014 +0000 - - Copy over r54884 from trunk, with manual intervention: + 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. - ------------------------------------------------------------------------ - r54884 \| guy \| 2014-01-21 17:22:01 -0800 (Tue, 21 Jan 2014) \| 4 lines + Change the Autotools, CMake, and Nmake sminmpec.c target name to + "update-sminmpec". - It's not a string, it's a byte array (bit array, really). + Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers + and sminmpec.c while we're here. - Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. + Tested with an in-tree Autotools build and an out-of-tree CMake build. - svn path=/trunk-1.8/; revision=54888 - -commit b532ef412765c1a56db7eee560400081bceba776 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Jan 21 18:48:01 2014 +0000 - - Harden nfs_name_snoop_add_name against various malformed inputs. Thanks to Moshe - Kaplan for the report. - - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9672 and some - other cases in the same vein. - - svn path=/trunk/; revision=54875 - - Conflicts: - epan/dissectors/packet-nfs.c - - Change-Id: I7b64ad4475ef7701dd064cad98d5567ae3847735 - -commit 6788dad31e66db6cfc4b5c378669ff3af41d2b1d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 17 22:18:50 2014 +0000 - - Fix bug 9649: SMPP: source_telematics_id value length is 1 byte - - svn path=/trunk/; revision=54837 - - (cherry picked from commit 642949701501d313059c3e7de888af266e00d0d1) - - Change-Id: I6ebc94bfe3aed22bdc1f1d8759c5b5c7e236bf95 + 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 fixups) + Reviewed-on: https://code.wireshark.org/review/1577 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 6df7bb0669383479f00521cc09edae9734b8047d +commit 46df3d691588feddf348f987e3419af3d5f34e42 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 12 20:52:19 2014 +0000 +Date: Thu May 8 12:38:34 2014 +0200 - Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded + TCAP: set a fence on info column after calling sub dissector - svn path=/trunk/; revision=54707 + Bug: 10091 + Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5 + Reviewed-on: https://code.wireshark.org/review/1555 + Reviewed-by: Anders Broman <a.broman58@gmail.com> Conflicts: - epan/dissectors/packet-h264.c + asn1/tcap/packet-tcap-template.c + epan/dissectors/packet-tcap.c - (cherry picked from commit 527071fb0dba0b8cae5ed8baa58b19ebf1996b89) + (cherry picked from commit 54be3eaaec057c44a4b42e4cf538cd07ee247bce) - Change-Id: I59b78a1509ba942f26f9b0ebb0b4e833d0522c7b - -commit 0fa1fb17cf9e7e00f63d85db669b0e80a46ec03e -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 19 15:35:07 2014 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2014-01-19] - - svn path=/trunk-1.8/; revision=54846 + Change-Id: I4b2f1b1195cbbd80067af84b58ebdd19b7b306b3 + Reviewed-on: https://code.wireshark.org/review/1559 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit c7a18b39f9ddae1437c0ff56d3acb4a00fd93d70 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 15 00:35:34 2014 +0000 +commit 8ad08b956dcca3c490c5f6de70f5cdb5e35b30ce +Author: Jakub Zawadzki <darkjames@darkjames.pl> +Date: Sun May 4 23:06:54 2014 +0200 - Start using the output of 'git describe'. + Fix possible buffer overflow in col_append_sep_fstr() - svn path=/trunk-1.8/; revision=54807 - -commit 2d59e78cae1111eed03cad7d4b167da2bd9d1edd -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 14 23:50:45 2014 +0000 - - Remove a debugging print. + After appending separator it might happen that len > max_len, in such case + g_vsnprintf() will overflow the col_buf buffer. - svn path=/trunk-1.8/; revision=54806 + 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/1513 -commit 01ab5b207a248965d1901cef198a25a32fcb4543 +commit d0728583eb04eae01031b6a5f5de2d1eeab00561 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 14 23:38:16 2014 +0000 +Date: Sun May 4 08:09:20 2014 -0700 - Start adding support for plain git. + [Automatic manuf, services and enterprise-numbers update for 2014-05-04] - svn path=/trunk-1.8/; revision=54805 + Change-Id: I1396634ab367b84f7d3ebc0846cc5db537c7287d + Reviewed-on: https://code.wireshark.org/review/1490 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1ddc83849075addb0cac69a6fe3782f4325337b9 +commit 7c13c4fba8160289451f69d3cf6105ba4595ae9b Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 14 00:14:34 2014 +0000 +Date: Wed Apr 30 13:20:42 2014 -0400 - Copy over r54694. - - ------------------------------------------------------------------------ - r54694 \| gerald \| 2014-01-10 14:57:28 -0800 (Fri, 10 Jan 2014) \| 2 lines - - Update the enterprise-numbers URL. - ------------------------------------------------------------------------ + Copy make-sminmpec.pl from master. + The previous cherry-pick didn't have the desired effect. - svn path=/trunk-1.8/; revision=54740 + Change-Id: If2bf6ae59eb374db393afc73d2bf17eb0874ced7 + Reviewed-on: https://code.wireshark.org/review/1444 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 339d238a0374ec7ccc73f8720e1c534625a74d35 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 13 20:03:36 2014 +0000 +commit e3b96d7227bc7a3fb719f1bb8e055f7ed840caf0 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Apr 27 13:26:17 2014 -0700 - Copy over r54714 from trunk: - - ------------------------------------------------------------------------ - r54714 \| guy \| 2014-01-13 11:49:12 -0800 (Mon, 13 Jan 2014) \| 17 lines - - 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. + make-sminmpec.pl fixups. - They didn't match; fix that. + Enforce a minimum number of entries and do our work in the epan + directory. - 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. - - Make dissect_cbs_message_identifier() return the new offset as well, for - consistency, and don't add its return value to the offset. - - svn path=/trunk-1.8/; revision=54716 + 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/1442 -commit 56c6fefcf22451c159078ba027d60740b8178d96 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 12 15:35:10 2014 +0000 +commit 2d85bc58e924d9dc2cf23d04c958ae6e78b48a70 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Apr 27 15:33:13 2014 -0400 - [Automatic manuf, services and enterprise-numbers update for 2014-01-12] + Remove support for SHIM6 on protocol 61 - svn path=/trunk-1.8/; revision=54704 + bug:9995 + Change-Id: I3c6ff189c4f9cca83b18ea2f057a1bca0c6809c4 + Reviewed-on: https://code.wireshark.org/review/1391 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a15168cd8e11711f083d667834231d8a714d6f55 +commit 8d2895f423c6fe267ebe67fe8f8f3f6a9abf130f Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 5 15:35:00 2014 +0000 +Date: Sun Apr 27 08:10:45 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-01-05] + [Automatic manuf, services and enterprise-numbers update for 2014-04-27] - svn path=/trunk-1.8/; revision=54603 + Change-Id: Ic6e99a88414d7d7901b923b19491c4ef3905dfa4 + Reviewed-on: https://code.wireshark.org/review/1386 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit f7f547c779f8d1ceb86bd39ba20202b38b3565a9 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 2 09:42:31 2014 +0000 +commit 9aae3c5bd0f2522d6c9bebec61066f84e54e71ec +Author: Jaap Keuter <jaap.keuter@xs4all.nl> +Date: Wed Apr 23 23:59:19 2014 +0200 - 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 + Adding two well known OAM related multicast address ranges. - Happy new year! - - ------------------------------------------------------------------------ - - svn path=/trunk-1.8/; revision=54551 + 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/1332 + Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> -commit 1421983681ae3054307d922ab4b1904237803133 +commit ef4023009c43291d8b83a740ce061af39465b0a7 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 1 23:26:04 2014 +0000 - - Copy over r54544 from trunk: - - ------------------------------------------------------------------------ - r54544 \| guy \| 2014-01-01 15:22:53 -0800 (Wed, 01 Jan 2014) \| 11 lines - - 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. - - 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.8/; revision=54546 - -commit 6437ddd5ba55a91e8f18f18b6a7e3fe99f1250f0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 17:31:08 2013 +0000 - - 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 - - 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.8/; revision=54487 - -commit b5121c5dc5f9774f1d5344ece45cfd7da82573e4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 29 15:34:50 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-29] - - svn path=/trunk-1.8/; revision=54483 - -commit 82530e9efdf315d8a285ee92b5fda5d5789e4976 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 22 15:34:54 2013 +0000 - - [Automatic manuf, services and enterprise-numbers update for 2013-12-22] - - svn path=/trunk-1.8/; revision=54363 +Date: Fri Apr 25 10:44:11 2014 -0700 -commit 13eb45b2fa6154b6fd854014b5b79c3ed3038b96 -Author: Chris Maynard <Christopher.Maynard@GTECH.COM> -Date: Fri Dec 20 15:14:38 2013 +0000 - - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54227 \| cmaynard \| 2013-12-18 13:27:07 -0500 (Wed, 18 Dec 2013) \| 4 lines - Changed paths: - M /trunk/epan/dissectors/packet-homeplug.c - - Call ptvcursor_new() to initialize cursor whether tree is NULL or not. - Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - #BACKPORT(1.10, 1.8) + 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() will ensure that caplen <= len. + Fixes bug 10037. - svn path=/trunk-1.8/; revision=54302 - -commit 2c0db318a0adadafedf94f56ba9b34eec6e630bb -Author: Balint Reczey <balint@balintreczey.hu> -Date: Thu Dec 19 18:52:48 2013 +0000 - - Copy over r49145 with manual intervention: - ------------------------------------------------------------------------ - r49145 \| mmann \| 2013-05-03 07:54:39 -0700 (Fri, 03 May 2013) \| 1 line - Changed paths: - M /trunk/epan/dissectors/packet-bssgp.c - M /trunk/epan/dissectors/packet-gsm_a_bssmap.c - M /trunk/epan/dissectors/packet-gsm_bssmap_le.c - M /trunk/epan/dissectors/packet-gsm_sms.c - M /trunk/epan/dissectors/packet-nas_eps.c - M /trunk/epan/dissectors/packet-sgsap.c - - Remove static packet_info *gpinfo and just use the packet_info provided by the function. - ------------------------------------------------------------------------ - - Update the release notes. - - svn path=/trunk-1.8/; revision=54263 - -commit 17615a5a5fdf51d3c332d0ae6fbbe710288aab26 -Author: Chris Maynard <Christopher.Maynard@GTECH.COM> -Date: Thu Dec 19 18:11:14 2013 +0000 - - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54257 \| cmaynard \| 2013-12-19 12:48:58 -0500 (Thu, 19 Dec 2013) \| 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-roofnet.c - - Need to call ptvcursor_current_offset() BEFORE ptvcursor_free(). - - ------------------------------------------------------------------------ - - - svn path=/trunk-1.8/; revision=54261 - -commit 9a4a3becd28d5bd796b352022b1a693341feef7a -Author: Chris Maynard <Christopher.Maynard@GTECH.COM> -Date: Thu Dec 19 18:10:53 2013 +0000 - - Copy over revisions from the trunk: - - ------------------------------------------------------------------------ - r54255 \| cmaynard \| 2013-12-19 12:48:11 -0500 (Thu, 19 Dec 2013) \| 2 lines - Changed paths: - M /trunk/epan/dissectors/packet-omapi.c - M /trunk/epan/dissectors/packet-pgm.c - - Fix leaks where ptvcursor_free() wasn't being called. - - ------------------------------------------------------------------------ - - - svn path=/trunk-1.8/; revision=54260 - -commit a297b86486dd22d031003e18ca52da770b632b28 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Dec 17 21:16:17 2013 +0000 - - Copy over from the trunk: - - ------------------------------------------------------------------------ - r54181 \| wmeier \| 2013-12-17 10:02:47 -0500 (Tue, 17 Dec 2013) \| 8 lines - - From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file" - - https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - - From me: Fixed in a slightly different manner than sugested in the patch attached to the bug. - ------------------------------------------------------------------------ - - - svn path=/trunk-1.8/; revision=54195 + Change-Id: I28908674d5a6ee4bb76e01cd4c7b463fa9d155f6 + Reviewed-on: https://code.wireshark.org/review/1357 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit be039e36458050b2da7edbe40ab882868362b68d +commit 6e7f9df4290da6a99aa89305653cc7794866f256 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Dec 17 20:06:38 2013 +0000 +Date: Tue Apr 22 12:05:39 2014 -0700 - 1.8.12 → 1.8.13. + 1.8.14 → 1.8.15. - svn path=/trunk-1.8/; revision=54194 + Change-Id: Ib2d4a6272ce97c6cb0436ec79597fc5889e5579f + Reviewed-on: https://code.wireshark.org/review/1282 + Reviewed-by: Gerald Combs <gerald@wireshark.org>
[-] [+]	Changed	wireshark-1.8.15.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.8.15.tar.bz2/NEWS ^
@@ -1,4 +1,4 @@ - Wireshark 1.8.13 Release Notes + Wireshark 1.8.15 Release Notes __________________________________________________________ What is Wireshark? @@ -10,43 +10,25 @@ What's New - Bug Fixes + Wireshark 1.8 will reach end of life on June 21, 2014. This is + the last official release of that branch. If you are still + running Wireshark 1.8 or earlier we strongly recommend + upgrading to Wireshark 1.12 or 1.10. - 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-03 - The RLC dissector could crash. ([5]Bug 9730) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [6]CVE-2014-2283 - * [7]wnpa-sec-2014-04 - The MPEG file parser could overflow a buffer. Discovered by - Wesley Neelen. ([8]Bug 9843) - Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 - [9]CVE-2014-2299 + Bug Fixes The following bugs have been fixed: - * Customized OUI is not recognized correctly during - dissection. ([10]Bug 9122) - * MPLS dissector no longer registers itself in "ppp.protocol" - table. ([11]Bug 9492) - * Wireshark stops showing new packets but dumpcap keeps - writing them to the temp file. ([12]Bug 9571) - * Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector - accessed an invalid memory address. ([13]Bug 9578) - * DMX-CHAN disector does not clear strbuf between rows. - ([14]Bug 9598) - * Dissector bug, protocol SDP: proto.c:4214: failed assertion - "length >= 0". ([15]Bug 9633) - * SMPP field source_telematics_id field length different from - spec. ([16]Bug 9649) - * GTPv1-C / MM Context / Authentication quintuplet / RAND is - not correct. ([17]Bug 9722) - * nas-eps dissector: CS Service notification dissection stops - after Paging identity IE. ([18]Bug 9789) + * Tshark with "-F libpcap" still generates a pcapng file. + ([1]Bug 9991) + * IPv6 Next Header 0x3d recognized as SHIM6. ([2]Bug 9995) + * Pcap-ng PB/EPB with caplen > len shouldn't be treated as an + error. ([3]Bug 10037) + * TCAP: set a fence on info column after calling sub + dissector ([4]Bug 10091) + * Wireshark PEEKREMOTE incorrectly decoding QoS data packets + from Cisco Sniffer APs. ([5]Bug 10139) + * IEEE 802.11: fix dissection of HT Capabilities ([6]Bug + 10166) New and Updated Features @@ -58,26 +40,24 @@ Updated Protocol Support - AppleTalk, BSSGP, DMX-CHAN, DSI, DVB-CI, ESS, GSM BSSMAP, GSM - BSSMAP LE, GSM CBS, GSM SMS, GTPv1, HomePlug, IEEE 802a, MPLS, - NAS-EPS, NFS, SGSAP, SMPP, T.124, and TETRA + IEEE 802.11, IPv6, and TCAP New and Updated Capture File Support - MPEG, NG Sniffer, and pcap-ng + pcap-ng, and PEEKREMOTE Getting Wireshark Wireshark source code and installation packages are available - from [19]http://www.wireshark.org/download.html. + from [7]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 [20]download page - on the Wireshark web site. + of third-party packages can be found on the [8]download page on + the Wireshark web site. __________________________________________________________ File Locations @@ -90,85 +70,76 @@ Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([21]Bug + Dumpcap might not quit if Wireshark or TShark crashes. ([9]Bug 1419) - The BER dissector might infinitely loop. ([22]Bug 1516) + The BER dissector might infinitely loop. ([10]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([23]Bug 1814) + ([11]Bug 1814) Filtering tshark captures with display filters (-R) no longer - works. ([24]Bug 2234) + works. ([12]Bug 2234) The 64-bit Windows installer does not support Kerberos - decryption. ([25]Win64 development page) + decryption. ([13]Win64 development page) - Application crash when changing real-time option. ([26]Bug + Application crash when changing real-time option. ([14]Bug 4035) - Hex pane display issue after startup. ([27]Bug 4056) + Hex pane display issue after startup. ([15]Bug 4056) - Packet list rows are oversized. ([28]Bug 4357) + Packet list rows are oversized. ([16]Bug 4357) Summary pane selected frame highlighting not maintained. - ([29]Bug 4445) + ([17]Bug 4445) Wireshark and TShark will display incorrect delta times in some - cases. ([30]Bug 4985) + cases. ([18]Bug 4985) + + Wireshark may not dissect GSM A packets correctly. + (ws-buglink:8940) __________________________________________________________ Getting Help - Community support is available on [31]Wireshark's Q&A site and + Community support is available on [19]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 [32]the web site. + on [20]the web site. Official Wireshark training and certification are available - from [33]Wireshark University. + from [21]Wireshark University. __________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [34]Wireshark web site. + A complete FAQ is available on the [22]Wireshark web site. __________________________________________________________ - Last updated 2014-03-07 10:09:55 PST + Last updated 2014-06-12 11:44:08 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-03.html - 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9730 - 6. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2283 - 7. https://www.wireshark.org/security/wnpa-sec-2014-04.html - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9843 - 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-2299 - 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9122 - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492 - 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9578 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9598 - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9633 - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9649 - 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9722 - 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9789 - 19. http://www.wireshark.org/download.html - 20. http://www.wireshark.org/download.html#thirdparty - 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 25. https://wiki.wireshark.org/Development/Win64 - 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 - 30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 31. http://ask.wireshark.org/ - 32. http://www.wireshark.org/lists/ - 33. http://www.wiresharktraining.com/ - 34. http://www.wireshark.org/faq.html + 1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9991 + 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9995 + 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10037 + 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10091 + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10139 + 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10166 + 7. http://www.wireshark.org/download.html + 8. http://www.wireshark.org/download.html#thirdparty + 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 13. https://wiki.wireshark.org/Development/Win64 + 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4445 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 19. http://ask.wireshark.org/ + 20. http://www.wireshark.org/lists/ + 21. http://www.wiresharktraining.com/ + 22. http://www.wireshark.org/faq.html
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/README.macos ^
@@ -36,7 +36,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. @@ -50,7 +50,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.8.15.tar.bz2/asn1/tcap/packet-tcap-template.c ^
@@ -635,8 +635,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.8.15.tar.bz2/config.nmake ^
@@ -13,13 +13,13 @@ ##### Versions ##### # The Git description of our build. Updated by make-version.pl -GIT_REVISION=7979 +GIT_REVISION=0 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=8 -VERSION_MICRO=13 +VERSION_MICRO=15 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for wireshark 1.8.13. +# Generated by GNU Autoconf 2.68 for wireshark 1.8.15. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='wireshark' PACKAGE_TARNAME='wireshark' -PACKAGE_VERSION='1.8.13' -PACKAGE_STRING='wireshark 1.8.13' +PACKAGE_VERSION='1.8.15' +PACKAGE_STRING='wireshark 1.8.15' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1522,7 +1522,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wireshark 1.8.13 to adapt to many kinds of systems. +\`configure' configures wireshark 1.8.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1593,7 +1593,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of wireshark 1.8.13:";; + short \| recursive ) echo "Configuration of wireshark 1.8.15:";; esac cat <<\_ACEOF @@ -1792,7 +1792,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wireshark configure 1.8.13 +wireshark configure 1.8.15 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2332,7 +2332,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wireshark $as_me 1.8.13, which was +It was created by wireshark $as_me 1.8.15, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3260,7 +3260,7 @@ # Define the identity of the package. PACKAGE='wireshark' - VERSION='1.8.13' + VERSION='1.8.15' cat >>confdefs.h <<_ACEOF @@ -29473,7 +29473,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wireshark $as_me 1.8.13, which was +This file was extended by wireshark $as_me 1.8.15, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29539,7 +29539,7 @@ cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wireshark config.status 1.8.13 +wireshark config.status 1.8.15 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/configure.in ^
@@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.8.13) +AC_INIT(wireshark, 1.8.15) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/debian/changelog ^
@@ -1,4 +1,4 @@ -wireshark (1.8.13) unstable; urgency=low +wireshark (1.8.15) unstable; urgency=low * Self-made package
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/debian/wireshark-common.files ^
@@ -7,9 +7,9 @@ /usr/bin/rawshark /usr/bin/text2pcap /usr/lib/wireshark/libwireshark.so.2 -/usr/lib/wireshark/libwireshark.so.2.0.13 +/usr/lib/wireshark/libwireshark.so.2.0.15 /usr/lib/wireshark/libwiretap.so.2 -/usr/lib/wireshark/libwiretap.so.2.1.13 +/usr/lib/wireshark/libwiretap.so.2.1.15 /usr/lib/wireshark/libwsutil.so.2 /usr/lib/wireshark/libwsutil.so.2.0.0 /usr/lib/wireshark/plugins/*
[-] [+]	Changed	wireshark-1.8.15.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.8.15.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.8.15.tar.bz2/docbook/asciidoc.conf ^
@@ -4,7 +4,7 @@ [replacements] # Yes, this is a fake macro. -wireshark-version:\[\]=1.8.13 +wireshark-version:\[\]=1.8.15 [macros]
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/docbook/git_version.xml ^
@@ -1 +1 @@ -<!ENTITY GitVersion "wireshark-1.8.13-dirty"> +<!ENTITY GitVersion "wireshark-1.8.15">
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/docbook/release-notes.asciidoc ^
@@ -7,67 +7,44 @@ == What's New +Wireshark 1.8 will reach end of life on June 21, 2014. This is the last official +release of that branch. If you are still running Wireshark 1.8 or earlier we +strongly recommend upgrading to Wireshark 1.12 or 1.10. + === Bug Fixes -The following vulnerabilities have been fixed. +//The following vulnerabilities have been fixed. //* ws-buglink:5000[] //* ws-buglink:6000[Wireshark bug] //* ws-salink:2013-11[] //* cve-idlink:2013-2486[] -* ws-salink:2014-01[] -+ -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[]) -+ -Versions affected: 1.10.0 to 1.10.5, 1.8.0 to 1.8.12 -+ -cve-idlink:2014-2281[] - -* 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[] +//* ws-salink:2014-07[] +//+ +//A dissector went awry. +// Fixed in master: ga1b2c3d4 +// Fixed in master-1.10: ga1b2c3d4 +// Fixed in master-1.8: ga1b2c3d4 +//(ws-buglink:0000[]) +//+ +//Versions affected: 1.10.0 to 1.10.7, 1.8.0 to 1.8.14 +//+ +//cve-idlink:2014-0000[] The following bugs have been fixed: +// Should be sorted numerically. //* Wireshark will strip the paint off your car, then apply a hideous //flame job to the hood and fenders using gray, red, and black primer. //(ws-buglink:0000[]) -* Customized OUI is not recognized correctly during dissection. (ws-buglink:9122[]) -* MPLS dissector no longer registers itself in "ppp.protocol" table. (ws-buglink:9492[]) -* Wireshark stops showing new packets but dumpcap keeps writing them to the temp file. (ws-buglink:9571[]) -* Homeplug dissector bug: STATUS_ACCESS_VIOLATION: dissector accessed an invalid memory address. (ws-buglink:9578[]) -* 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[]) -* SMPP field source_telematics_id field length different from spec. (ws-buglink:9649[]) -* GTPv1-C / MM Context / Authentication quintuplet / RAND is not correct. (ws-buglink:9722[]) -* nas-eps dissector: CS Service notification dissection stops after Paging identity IE. (ws-buglink:9789[]) +* Tshark with "-F libpcap" still generates a pcapng file. (ws-buglink:9991[]) +* IPv6 Next Header 0x3d recognized as SHIM6. (ws-buglink:9995[]) +* Pcap-ng PB/EPB with caplen > len shouldn't be treated as an error. (ws-buglink:10037[]) +* TCAP: set a fence on info column after calling sub dissector (ws-buglink:10091[]) +* 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 @@ -81,26 +58,9 @@ --sort-and-group-- -AppleTalk -BSSGP -DMX-CHAN -DSI -DVB-CI -ESS -GSM BSSMAP -GSM BSSMAP LE -GSM CBS -GSM SMS -GTPv1 -HomePlug -IEEE 802a -MPLS -NAS-EPS -NFS -SGSAP -SMPP -T.124 -TETRA +IEEE 802.11 +TCAP +IPv6 --sort-and-group-- @@ -108,8 +68,7 @@ --sort-and-group-- -MPEG -NG Sniffer +PEEKREMOTE pcap-ng --sort-and-group-- @@ -166,6 +125,8 @@ Wireshark and TShark will display incorrect delta times in some cases. (ws-buglink:4985[]) +Wireshark may not dissect GSM A packets correctly. (ws-buglink:8940) + == Getting Help Community support is available on http://ask.wireshark.org/[Wireshark's
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/CMakeLists.txt ^
@@ -1307,13 +1307,10 @@ ftypes/ftype-tvbuff.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.8.15.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 2:13:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:15:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ include Makefile.common @@ -126,8 +126,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ - Makefile.in \ - sminmpec.c + Makefile.in # # Add the object files for missing routines, if any. @@ -186,8 +185,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 def_sym_filter_symbols =
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/Makefile.in ^
@@ -573,7 +573,7 @@ noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 2:13:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 2:15:0 -export-symbols libwireshark.sym @LDFLAGS_SHAREDLIB@ LIBWIRESHARK_SRC = \ addr_and_mask.c \ addr_resolv.c \ @@ -878,8 +878,7 @@ MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ - Makefile.in \ - sminmpec.c + Makefile.in # @@ -2051,8 +2050,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.8.15.tar.bz2/epan/Makefile.nmake ^
@@ -143,7 +143,7 @@ $(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \ $(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \ - dtd_grammar.out sminmpec.c + dtd_grammar.out distclean: distclean-local cd crypt @@ -301,8 +301,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.8.15.tar.bz2/epan/column-utils.c ^
@@ -334,9 +334,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.8.15.tar.bz2/epan/dissectors/packet-ansi_a.c ^
@@ -949,7 +949,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.8.15.tar.bz2/epan/dissectors/packet-bssgp.c ^
@@ -3225,156 +3225,6 @@ * 11.3.113 Redirection Completed / - -const value_string bssgp_elem_strings[] = { - { 0x00, "Alignment Octets" }, / 11.3.1 Alignment octets / - { 0x01, "Bmax default MS" }, / 11.3.2 Bmax default MS / - { 0x02, "BSS Area Indication" }, / 11.3.3 BSS Area Indication / - { 0x03, "Bucket Leak Rate (R)" }, / 11.3.4 Bucket Leak Rate (R) / - { 0x04, "BVCI (BSSGP Virtual Connection Identifier)" }, / 11.3.6 BVCI (BSSGP Virtual Connection Identifier) / - { 0x05, "BVC Bucket size" }, / 11.3.5 BVC Bucket Size / - { 0x06, "BVC Measurement" }, / 11.3.7 BVC Measurement / - { 0x07, "Cause" }, / 11.3.8 Cause / - { 0x08, "Cell Identifier" }, / 11.3.9 Cell Identifier / - { 0x09, "Channel needed" }, / 11.3.10 Channel needed / - { 0x0a, "DRX Parameters" }, / 11.3.11 DRX Parameters / - { 0x0b, "eMLPP-Priority" }, / 11.3.12 eMLPP-Priority / - { 0x0c, "Flush Action" }, / 11.3.13 Flush Action / - { 0x0d, "IMSI" }, / 11.3.14 IMSI / - { 0x0e, "LLC-PDU" }, / 11.3.15 LLC-PDU / - { 0x0f, "LLC Frames Discarded" }, / 11.3.16 LLC Frames Discarded / - { 0x10, "Location Area" }, / 11.3.17 Location Area / - { 0x11, "Mobile Id" }, / 11.3.20 Mobile Id / - { 0x12, "MS Bucket Size" }, / 11.3.21 MS Bucket Size / - { 0x13, "MS Radio Access Capability" }, / 11.3.22 MS Radio Access Capability GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP / - { 0x14, "OMC Id" }, / 11.3.23 OMC Id / - { 0x15, "PDU In Error" }, / 11.3.24 PDU In Error / - { 0x16, "PDU Lifetime" }, / 11.3.25 PDU Lifetime / - { 0x17, "Priority" }, / 11.3.27 Priority / - { 0x18, "QoS Profile" }, / 11.3.28 QoS Profile / - { 0x19, "Radio Cause" }, / 11.3.29 Radio Cause / - { 0x1a, "RA-Cap-UPD-Cause" }, / 11.3.30 RA-Cap-UPD-Cause / - { 0x1b, "Routeing Area" }, / 11.3.31 Routeing Area / - { 0x1c, "R_default_MS" }, / 11.3.32 R_default_MS / - { 0x1d, "Suspend Reference Number" }, / 11.3.33 Suspend Reference Number / - { 0x1e, "Tag" }, / 11.3.34 Tag / - { 0x1f, "Temporary logical link Identity (TLLI)" }, / 11.3.35 Temporary logical link Identity (TLLI) GSM_A_PDU_TYPE_RR, DE_RR_TLLI/ - { 0x20, "Temporary Mobile Subscriber Identity (TMSI)" }, / 11.3.36 Temporary Mobile Subscriber Identity (TMSI)GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI / - { 0x21, "Trace Reference" }, / 11.3.37 Trace Reference / - { 0x22, "Trace Type" }, / 11.3.38 Trace Type / - { 0x23, "Transaction Id" }, / 11.3.39 Transaction Id / - { 0x24, "Trigger Id" }, / 11.3.40 Trigger Id / - { 0x25, "Number of octets affected" }, / 11.3.41 Number of octets affected / - { 0x26, "LSA Identifier List" }, / 11.3.18 LSA Identifier List / - { 0x27, "LSA Information" }, / 11.3.19 LSA Information / - { 0x28, "Packet Flow Identifier (PFI)" }, / 11.3.42 Packet Flow Identifier (PFI) GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID/ - / 11.3.42a (void) / - { 0x29, "GPRS Timer" }, / 11.3.44 GPRS Timer / - { 0x3a, "Aggregate BSS QoS Profile" }, / 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS/ - { 0x3b, "Feature Bitmap" }, / 11.3.45 Feature Bitmap / - { 0x3c, "Bucket Full Ratio" }, / 11.3.46 Bucket Full Ratio / - { 0x3d, "Service UTRAN CCO" }, / 11.3.47 Service UTRAN CCO / - { 0x3e, "NSEI (Network Service Entity Identifier)" }, / 11.3.48 NSEI (Network Service Entity Identifier) / - { 0x00, "RRLP APDU" }, / 11.3.49 RRLP APDU / - / 11.3.50 LCS QoS BSSGP_IEI_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS/ - / 11.3.51 LCS Client Type BSSGP_IEI_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE/ - / 11.3.52 Requested GPS Assistance Data BSSGP_IEI_REQUESTED_GPS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GPS_ASSIST_D/ - / 11.3.53 Location Type 0x7c, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE/ - / 11.3.54 Location Estimate BSSGP_IEI_LOCATION_ESTIMATE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST/ - / 11.3.55 Positioning Data 0x7d, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA/ - / 11.3.56 Deciphering Keys BSSGP_IEI_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS / - / 11.3.57 LCS Priority BSSGP_IEI_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO;/ - / 11.3.58 LCS Cause BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE / - / 11.3.59 LCS Capability 0x49 , GSM_A_PDU_TYPE_GM, DE_PS_LCS_CAP/ - { 0x00, "RRLP Flags" }, / 11.3.60 RRLP Flags / - { 0x00, "RIM Application Identity" }, / 11.3.61 RIM Application Identity / - { 0x00, "RIM Sequence Number" }, / 11.3.62 RIM Sequence Number / - / 11.3.62a RIM Container / - / 11.3.62a.0 General / - { 0x00, "RAN-INFORMATION-REQUEST RIM Container" }, / 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container / - { 0x00, "RAN-INFORMATION RIM Container" }, / 11.3.62a.2 RAN-INFORMATION RIM Container / - { 0x00, "RAN-INFORMATION-ACK RIM Container" }, / 11.3.62a.3 RAN-INFORMATION-ACK RIM Container / - { 0x00, "RAN-INFORMATION-ERROR RIM Container" }, / 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container / - { 0x00, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, / 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container / - / 11.3.63 Application Container / - { 0x00, "RAN-INFORMATION-REQUEST Application Container" }, / 11.3.63.1 RAN-INFORMATION-REQUEST Application Container / - / 11.3.63.1.0 General / - / 11.3.63.1.1 RAN-INFORMATION-REQUEST Application Container for the NACC Application / - / 11.3.63.1.2 RAN-INFORMATION-REQUEST Application Container for the SI3 Application / - / 11.3.63.1.3 RAN-INFORMATION-REQUEST Application Container for the MBMS data channel Application / - / 11.3.63.1.4 RAN-INFORMATION-REQUEST Application Container for the SON Transfer Application / - { 0x00, "RAN-INFORMATION Application Container Unit" }, / 11.3.63.2 RAN-INFORMATION Application Container Unit / - / 11.3.63.2.0 General / - / 11.3.63.2.1 RAN-INFORMATION Application Container for the NACC Application / - / 11.3.63.2.2 RAN-INFORMATION Application Container for the SI3 Application / - / 11.3.63.2.3 RAN-INFORMATION Application Container for the MBMS data channel Application / - / 11.3.63.2.4 RAN-INFORMATION Application Container for the SON Transfer Application / - { 0x00, "Application Error Container" }, / 11.3.64 Application Error Container / - / 11.3.64.1 Application Error Container layout for the NACC application / - / 11.3.64.2 Application Error Container for the SI3 application / - / 11.3.64.3 Application Error Container for the MBMS data channel application / - / 11.3.64.4 Application Error Container for the SON Transfer Application / - { 0x00, "RIM PDU Indications" }, / 11.3.65 RIM PDU Indications / - / 11.3.65.0 General / - / 11.3.65.1 RAN-INFORMATION-REQUEST RIM PDU Indications / - / 11.3.65.2 RAN-INFORMATION RIM PDU Indications / - / 11.3.65.3 RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications / - / 11.3.66 (void) / - { 0x00, "RIM Protocol Version Number" }, / 11.3.67 RIM Protocol Version Number / - { 0x00, "PFC Flow Control parameters" }, / 11.3.68 PFC Flow Control parameters / - / 0x53, SGSAP_PDU_TYPE, DE_SGSAP_GLOBAL_CN_ID / / 11.3.69 Global CN-Id / - { 0x00, "RIM Routing Information" }, / 11.3.70 RIM Routing Information / - { 0x00, "MBMS Session Identity" }, / 11.3.71 MBMS Session Identity / - { 0x00, "MBMS Session Duration" }, / 11.3.72 MBMS Session Duration / - { 0x00, "MBMS Service Area Identity List" }, / 11.3.73 MBMS Service Area Identity List / - { 0x00, "MBMS Response" }, / 11.3.74 MBMS Response / - { 0x00, "MBMS Routing Area List" }, / 11.3.75 MBMS Routing Area List / - { 0x00, "MBMS Session Information" }, / 11.3.76 MBMS Session Information / - { 0x00, "TMGI" }, / 11.3.77 TMGI (Temporary Mobile Group Identity) / - { 0x00, "MBMS Stop Cause" }, / 11.3.78 MBMS Stop Cause / - { 0x00, "Source BSS to Target BSS Transparent Container" }, / 11.3.79 Source BSS to Target BSS Transparent Container / - { 0x00, "Target BSS to Source BSS Transparent Container" }, / 11.3.80 Target BSS to Source BSS Transparent Container / - / 11.3.81 NAS container for PS Handover / - { 0x00, "PFCs to be set-up list" }, / 11.3.82 PFCs to be set-up list / - { 0x00, "List of set-up PFCs" }, / 11.3.83 List of set-up PFCs / - { 0x00, "Extended Feature Bitmap" }, / 11.3.84 Extended Feature Bitmap / - { 0x00, "Source to Target Transparent Container" }, / 11.3.85 Source to Target Transparent Container / - { 0x00, "Target to Source Transparent Container" }, / 11.3.86 Target to Source Transparent Container / - { 0x00, "RNC Identifier" }, / 11.3.87 RNC Identifier / - { 0x00, "Page Mode" }, / 11.3.88 Page Mode / - { 0x00, "Container ID" }, / 11.3.89 Container ID / - { 0x00, "Global TFI" }, / 11.3.90 Global TFI / - / 11.3.91 IMEI / - { 0x00, "Time to MBMS Data Transfer" }, / 11.3.92 Time to MBMS Data Transfer / - { 0x00, "MBMS Session Repetition Number" }, / 11.3.93 MBMS Session Repetition Number / - { 0x00, "Inter RAT Handover Info" }, / 11.3.94 Inter RAT Handover Info / - { 0x00, "PS Handover Command" }, / 11.3.95 PS Handover Command / - { 0x00, "PS Handover Indications" }, / 11.3.95a PS Handover Indications / - { 0x00, "SI/PSI Container" }, / 11.3.95b SI/PSI Container / - { 0x00, "Active PFCs List" }, / 11.3.95c Active PFCs List / - { 0x00, "Velocity Data" }, / 11.3.96 Velocity Data / - { 0x00, "DTM Handover Command" }, / 11.3.97 DTM Handover Command / - { 0x00, "PS Handover Indications" }, / 11.3.98 CS Indication / - / 11.3.99 Requested GANSS Assistance Data 0x7b, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA/ - / 11.3.100 GANSS Location Type 0x7c, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP/ - / 11.3.101 GANSS Positioning Data ENC_BIG_ENDIAN);/ - { 0x00, "Flow Control Granularity" }, / 11.3.102 Flow Control Granularity / - { 0x00, "eNB Identifier" }, / 11.3.103 eNB Identifier / - { 0x00, "E-UTRAN Inter RAT Handover Info" }, / 11.3.104 E-UTRAN Inter RAT Handover Info / - { 0x00, "Subscriber Profile ID for RAT/Frequency priority" }, / 11.3.105 Subscriber Profile ID for RAT/Frequency priority / - { 0x00, "Request for Inter-RAT Handover Info" }, / 11.3.106 Request for Inter-RAT Handover Info / - { 0x00, "Reliable Inter-RAT Handover Info" }, / 11.3.107 Reliable Inter-RAT Handover Info / - { 0x00, "Son transfer application identity" }, / 11.3.108 SON Transfer Application Identity / - { 0x00, "CSG Identifier" }, / 11.3.109 CSG Identifier / -/ 11.3.110 Tracking Area Code / - - { 0, NULL } -}; - -#define NUM_BSSGP_ELEM (sizeof(bssgp_elem_strings)/sizeof(value_string)) -gint ett_bssgp_elem[NUM_BSSGP_ELEM]; - - typedef enum { DE_BSSGP_ALIGNMENT_OCTETS, / 11.3.1 0x00 Alignment octets / @@ -3485,6 +3335,155 @@ } bssgp_elem_idx_t; +const value_string bssgp_elem_strings[] = { + { DE_BSSGP_ALIGNMENT_OCTETS, "Alignment Octets" }, / 11.3.1 Alignment octets / + { DE_BSSGP_BMAX_DEFAULT_MS, "Bmax default MS" }, / 11.3.2 Bmax default MS / + { DE_BSSGP_BSS_AREA_IND, "BSS Area Indication" }, / 11.3.3 BSS Area Indication / + { DE_BSSGP_BUCKET_LEAK_RATE, "Bucket Leak Rate (R)" }, / 11.3.4 Bucket Leak Rate (R) / + { DE_BSSGP_BVCI, "BVCI (BSSGP Virtual Connection Identifier)" }, / 11.3.6 BVCI (BSSGP Virtual Connection Identifier) / + { DE_BSSGP_BVC_BUCKET_SIZE, "BVC Bucket size" }, / 11.3.5 BVC Bucket Size / + { DE_BSSGP_BVC_MEAS, "BVC Measurement" }, / 11.3.7 BVC Measurement / + { DE_BSSGP_CAUSE, "Cause" }, / 11.3.8 Cause / + { DE_BSSGP_CELL_ID, "Cell Identifier" }, / 11.3.9 Cell Identifier / + { DE_BSSGP_CHLN_NEEDED, "Channel needed" }, / 11.3.10 Channel needed / + { DE_BBSGP_DRX_PARAM, "DRX Parameters" }, / 11.3.11 DRX Parameters / + { DE_BBSGP_EMLPP_PRIO, "eMLPP-Priority" }, / 11.3.12 eMLPP-Priority / + { DE_BSSGP_FLUSH_ACTION, "Flush Action" }, / 11.3.13 Flush Action / + { DE_BSSGP_IMSI, "IMSI" }, / 11.3.14 IMSI / + { DE_BSSGP_LLC_PDU, "LLC-PDU" }, / 11.3.15 LLC-PDU / + { DE_BSSGP_LLC_FRAMES_DISC, "LLC Frames Discarded" }, / 11.3.16 LLC Frames Discarded / + { DE_BSSGP_LAI, "Location Area" }, / 11.3.17 Location Area / + { DE_BSSGP_MID, "Mobile Id" }, / 11.3.20 Mobile Id / + { DE_BSSGP_MS_BUCKET_SIZE, "MS Bucket Size" }, / 11.3.21 MS Bucket Size / + { DE_BSSGP_MS_RAD_ACC_CAP, "MS Radio Access Capability" }, / 11.3.22 MS Radio Access Capability GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP / + { DE_BSSGP_OMC_ID, "OMC Id" }, / 11.3.23 OMC Id / + { DE_BSSGP_PDU_IN_ERROR, "PDU In Error" }, / 11.3.24 PDU In Error / + { DE_BSSGP_PDU_LIFETIME, "PDU Lifetime" }, / 11.3.25 PDU Lifetime / + { DE_BSSP_PRIORITY, "Priority" }, / 11.3.27 Priority / + { DE_BSSGP_QOS_PROFILE, "QoS Profile" }, / 11.3.28 QoS Profile / + { DE_BSSGP_RA_CAUSE, "Radio Cause" }, / 11.3.29 Radio Cause / + { DE_BSSGP_RA_CAP_UPD_CAUSE, "RA-Cap-UPD-Cause" }, / 11.3.30 RA-Cap-UPD-Cause / + { DE_BSSGP_RAI, "Routeing Area" }, / 11.3.31 Routeing Area / + { DE_BSSGP_R_DEFAULT_MS, "R_default_MS" }, / 11.3.32 R_default_MS / + { DE_BBSGP_SUSPEND_REF_NO, "Suspend Reference Number" }, / 11.3.33 Suspend Reference Number / + { DE_BSSGP_TAG, "Tag" }, / 11.3.34 Tag / + { DE_BSSGP_TLLI, "Temporary logical link Identity (TLLI)" }, / 11.3.35 Temporary logical link Identity (TLLI) GSM_A_PDU_TYPE_RR, DE_RR_TLLI/ + { DE_BSSGP_TMSI_PTMSI, "Temporary Mobile Subscriber Identity (TMSI)" }, / 11.3.36 Temporary Mobile Subscriber Identity (TMSI)GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI / + { DE_BSSGP_TRACE_REF, "Trace Reference" }, / 11.3.37 Trace Reference / + { DE_BSSGP_TRACE_TYPE, "Trace Type" }, / 11.3.38 Trace Type / + { DE_BSSGP_TRANSACTION_ID, "Transaction Id" }, / 11.3.39 Transaction Id / + { DE_BSSGP_TRIGGER_ID, "Trigger Id" }, / 11.3.40 Trigger Id / + { DE_BSSGP_NO_OF_OCT_AFFECTED, "Number of octets affected" }, / 11.3.41 Number of octets affected / + { DE_BSSGP_LSA_ID_LIST, "LSA Identifier List" }, / 11.3.18 LSA Identifier List / + { DE_BSSGP_LSA_INFO, "LSA Information" }, / 11.3.19 LSA Information / + { DE_BSSGP_ACKET_FLOW_ID, "Packet Flow Identifier (PFI)" }, / 11.3.42 Packet Flow Identifier (PFI) GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID/ + / 11.3.42a (void) / + { DE_BSSGP_GPRS_TIMER, "GPRS Timer" }, / 11.3.44 GPRS Timer / + { DE_BSSGP_QOS, "Aggregate BSS QoS Profile" }, / 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS/ + { DE_BSSGP_FEATURE_BITMAP, "Feature Bitmap" }, / 11.3.45 Feature Bitmap / + { DE_BSSGP_BUCKET_FULL_RATIO, "Bucket Full Ratio" }, / 11.3.46 Bucket Full Ratio / + { DE_BSSGP_SERV_UTRAN_CCO, "Service UTRAN CCO" }, / 11.3.47 Service UTRAN CCO / + { DE_BSSGP_NSEI, "NSEI (Network Service Entity Identifier)" }, / 11.3.48 NSEI (Network Service Entity Identifier) / + { DE_BSSGP_RRLP_APDU, "RRLP APDU" }, / 11.3.49 RRLP APDU / + / 11.3.50 LCS QoS BSSGP_IEI_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS/ + / 11.3.51 LCS Client Type BSSGP_IEI_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE/ + / 11.3.52 Requested GPS Assistance Data BSSGP_IEI_REQUESTED_GPS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GPS_ASSIST_D/ + / 11.3.53 Location Type 0x7c, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE/ + / 11.3.54 Location Estimate BSSGP_IEI_LOCATION_ESTIMATE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST/ + / 11.3.55 Positioning Data 0x7d, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA/ + / 11.3.56 Deciphering Keys BSSGP_IEI_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS / + / 11.3.57 LCS Priority BSSGP_IEI_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO;/ + / 11.3.58 LCS Cause BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE / + / 11.3.59 LCS Capability 0x49 , GSM_A_PDU_TYPE_GM, DE_PS_LCS_CAP/ + { DE_BSSGP_RRLP_FLAGS, "RRLP Flags" }, / 11.3.60 RRLP Flags / + { DE_BSSGP_RIM_APP_ID, "RIM Application Identity" }, / 11.3.61 RIM Application Identity / + { DE_BSSGP_RIM_SEQ_NO, "RIM Sequence Number" }, / 11.3.62 RIM Sequence Number / + / 11.3.62a RIM Container / + / 11.3.62a.0 General / + { DE_BSSGP_RAN_INF_REQUEST_RIM_CONT, "RAN-INFORMATION-REQUEST RIM Container" }, / 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container / + { DE_BSSGP_RAN_INF_RIM_CONT, "RAN-INFORMATION RIM Container" }, / 11.3.62a.2 RAN-INFORMATION RIM Container / + { DE_BSSGP_RAN_INFORMATION_ACK_RIM_CONT, "RAN-INFORMATION-ACK RIM Container" }, / 11.3.62a.3 RAN-INFORMATION-ACK RIM Container / + { DE_BSSGP_RAN_INFORMATION_ERROR_RIM_CONT, "RAN-INFORMATION-ERROR RIM Container" }, / 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container / + { DE_BSSGP_RAN_INF_APP_ERROR_RIM_CONT, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, / 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container / + / 11.3.63 Application Container / + { DE_BSSGP_RAN_INFORMATION_REQUEST_APP_CONT, "RAN-INFORMATION-REQUEST Application Container" }, / 11.3.63.1 RAN-INFORMATION-REQUEST Application Container / + / 11.3.63.1.0 General / + / 11.3.63.1.1 RAN-INFORMATION-REQUEST Application Container for the NACC Application / + / 11.3.63.1.2 RAN-INFORMATION-REQUEST Application Container for the SI3 Application / + / 11.3.63.1.3 RAN-INFORMATION-REQUEST Application Container for the MBMS data channel Application / + / 11.3.63.1.4 RAN-INFORMATION-REQUEST Application Container for the SON Transfer Application / + { DE_BSSGP_RAN_INFORMATION_APP_CONT_UNIT, "RAN-INFORMATION Application Container Unit" }, / 11.3.63.2 RAN-INFORMATION Application Container Unit / + / 11.3.63.2.0 General / + / 11.3.63.2.1 RAN-INFORMATION Application Container for the NACC Application / + / 11.3.63.2.2 RAN-INFORMATION Application Container for the SI3 Application / + / 11.3.63.2.3 RAN-INFORMATION Application Container for the MBMS data channel Application / + / 11.3.63.2.4 RAN-INFORMATION Application Container for the SON Transfer Application / + { DE_BSSGP_RAN_APP_ERROR_CONT, "Application Error Container" }, / 11.3.64 Application Error Container / + / 11.3.64.1 Application Error Container layout for the NACC application / + / 11.3.64.2 Application Error Container for the SI3 application / + / 11.3.64.3 Application Error Container for the MBMS data channel application / + / 11.3.64.4 Application Error Container for the SON Transfer Application / + { DE_BSSGP_RIM_PDU_INDICATIONS, "RIM PDU Indications" }, / 11.3.65 RIM PDU Indications / + / 11.3.65.0 General / + / 11.3.65.1 RAN-INFORMATION-REQUEST RIM PDU Indications / + / 11.3.65.2 RAN-INFORMATION RIM PDU Indications / + / 11.3.65.3 RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications / + / 11.3.66 (void) / + { DE_BSSGP_RIM_PROTO_VER_NO, "RIM Protocol Version Number" }, / 11.3.67 RIM Protocol Version Number / + { DE_BSSGP_PFC_FLOW_CTRL, "PFC Flow Control parameters" }, / 11.3.68 PFC Flow Control parameters / + / 0x53, SGSAP_PDU_TYPE, DE_SGSAP_GLOBAL_CN_ID / / 11.3.69 Global CN-Id / + { DE_BSSGP_RIM_ROUTING_INF, "RIM Routing Information" }, / 11.3.70 RIM Routing Information / + { DE_BSSGP_MBMS_SESSION_ID, "MBMS Session Identity" }, / 11.3.71 MBMS Session Identity / + { DE_BSSGP_MBMS_SESSION_DUR, "MBMS Session Duration" }, / 11.3.72 MBMS Session Duration / + { DE_BSSGP_MBMS_SAI_LIST, "MBMS Service Area Identity List" }, / 11.3.73 MBMS Service Area Identity List / + { DE_BSSGP_MBMS_RESPONSE, "MBMS Response" }, / 11.3.74 MBMS Response / + { DE_BSSGP_MBMS_RA_LIST, "MBMS Routing Area List" }, / 11.3.75 MBMS Routing Area List / + { DE_BSSGP_MBMS_SESSION_INF, "MBMS Session Information" }, / 11.3.76 MBMS Session Information / + { DE_BSSGP_TMGI, "TMGI" }, / 11.3.77 TMGI (Temporary Mobile Group Identity) / + { DE_BSSGP_MBMS_STOP_CAUSE, "MBMS Stop Cause" }, / 11.3.78 MBMS Stop Cause / + { DE_BSSGP_SOURCE_BSS_TO_TARGET_BSS_TRANSP_CONT, "Source BSS to Target BSS Transparent Container" }, / 11.3.79 Source BSS to Target BSS Transparent Container / + { DE_BSSGP_TARGET_BSS_TO_SOURCE_BSS_TRANSP_CONT, "Target BSS to Source BSS Transparent Container" }, / 11.3.80 Target BSS to Source BSS Transparent Container / + / 11.3.81 NAS container for PS Handover / + { DE_BSSGP_PFCS_TO_BE_SET_UP_LIST, "PFCs to be set-up list" }, / 11.3.82 PFCs to be set-up list / + { DE_BSSGP_LIST_OF_SETUP_PFCS, "List of set-up PFCs" }, / 11.3.83 List of set-up PFCs / + { DE_BSSGP_EXT_FEATURE_BITMAP, "Extended Feature Bitmap" }, / 11.3.84 Extended Feature Bitmap / + { DE_BSSGP_SRC_TO_TRG_TRANSP_CONT, "Source to Target Transparent Container" }, / 11.3.85 Source to Target Transparent Container / + { DE_BSSGP_TRG_TO_SRC_TRANSP_CONT, "Target to Source Transparent Container" }, / 11.3.86 Target to Source Transparent Container / + { BE_BSSGP_RNC_ID, "RNC Identifier" }, / 11.3.87 RNC Identifier / + { DE_BSSGP_PAGE_MODE, "Page Mode" }, / 11.3.88 Page Mode / + { DE_BSSGP_CONTAINER_ID, "Container ID" }, / 11.3.89 Container ID / + { DE_BSSGP_GLOBAL_TFI, "Global TFI" }, / 11.3.90 Global TFI / + / 11.3.91 IMEI / + { DE_BSSGP_TIME_TO_MBMS_DATA_TRAN, "Time to MBMS Data Transfer" }, / 11.3.92 Time to MBMS Data Transfer / + { DE_BSSGP_MBMS_SESSION_REP_NO, "MBMS Session Repetition Number" }, / 11.3.93 MBMS Session Repetition Number / + { DE_BSSGP_INTER_RAT_HO_INFO, "Inter RAT Handover Info" }, / 11.3.94 Inter RAT Handover Info / + { DE_BSSGP_PS_HO_CMD, "PS Handover Command" }, / 11.3.95 PS Handover Command / + { DE_BSSGP_PS_HO_INDICATIONS, "PS Handover Indications" }, / 11.3.95a PS Handover Indications / + { DE_BSSGP_SIPSI_CONTAINER, "SI/PSI Container" }, / 11.3.95b SI/PSI Container / + { DE_BSSGP_ACTIVE_PFCS_LIST, "Active PFCs List" }, / 11.3.95c Active PFCs List / + { DE_BSSGP_VELOCITY_DATA, "Velocity Data" }, / 11.3.96 Velocity Data / + { DE_BBSGP_DTM_HO_CMD, "DTM Handover Command" }, / 11.3.97 DTM Handover Command / + { DE_BSSGP_CS_INDICATION, "CS Indication" }, / 11.3.98 CS Indication / + / 11.3.99 Requested GANSS Assistance Data 0x7b, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA/ + / 11.3.100 GANSS Location Type 0x7c, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP/ + / 11.3.101 GANSS Positioning Data ENC_BIG_ENDIAN);/ + { DE_BSSGP_FLOW_CONTROL_GRAN, "Flow Control Granularity" }, / 11.3.102 Flow Control Granularity / + { DE_BSSGP_ENB_ID, "eNB Identifier" }, / 11.3.103 eNB Identifier / + { DE_BSSGP_E_UTRAN_INTER_RAT_HO_INFO, "E-UTRAN Inter RAT Handover Info" }, / 11.3.104 E-UTRAN Inter RAT Handover Info / + { DE_BSSGP_SUB_PROF_ID_F_RAT_FRQ_PRIO, "Subscriber Profile ID for RAT/Frequency priority" }, / 11.3.105 Subscriber Profile ID for RAT/Frequency priority / + { DE_BSSGP_REQ_FOR_INTER_RAT_HO_INFO, "Request for Inter-RAT Handover Info" }, / 11.3.106 Request for Inter-RAT Handover Info / + { DE_BSSGP_RELIABLE_INTER_RAT_HO_INF, "Reliable Inter-RAT Handover Info" }, / 11.3.107 Reliable Inter-RAT Handover Info / + { DE_BSSGP_SON_TRANSFER_APP_ID, "Son transfer application identity" }, / 11.3.108 SON Transfer Application Identity / + { DE_BSSGP_CSG_ID, "CSG Identifier" }, / 11.3.109 CSG Identifier / +/ 11.3.110 Tracking Area Code / + + { 0, NULL } +}; + +#define NUM_BSSGP_ELEM (sizeof(bssgp_elem_strings)/sizeof(value_string)) +gint ett_bssgp_elem[NUM_BSSGP_ELEM]; + + guint16 (bssgp_elem_fcn[])(tvbuff_t tvb, proto_tree tree, packet_info pinfo _U_, guint32 offset, guint len, gchar add_string, int string_len) = { de_bssgp_aligment_octets, /* 11.3.1 0x00 Alignment octets / de_bssgp_bmax_default_ms, / 11.3.2 0x01 Bmax default MS */
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-dvbci.c ^
@@ -1862,7 +1862,7 @@ { int key_string_len; int i, j; - char input[2]; + char input[3]; if (!key_string \|\| !key_bin) return -1; @@ -1870,6 +1870,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.8.15.tar.bz2/epan/dissectors/packet-gmr1_common.c ^
@@ -76,8 +76,8 @@ /* ------------------------------------------------------------------------ / const value_string gmr1_ie_common_strings[] = { - { 0, "Mobile Earth Station Classmark 2" }, / [1] 11.5.1.6 / - { 0, "Spare Half Octet" }, / [1] 11.5.1.8 / + { GMR1_IE_COM_CM2, "Mobile Earth Station Classmark 2" }, / [1] 11.5.1.6 / + { GMR1_IE_COM_SPARE_NIBBLE, "Spare Half Octet" }, / [1] 11.5.1.8 */ { 0, NULL} };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gmr1_rr.c ^
@@ -95,37 +95,68 @@ }; const value_string gmr1_ie_rr_strings[] = { - { 0, "Channel Description" }, /* [1] 11.5.2.5 / - { 0, "Channel Mode" }, / [1] 11.5.2.6 / - { 0, "Cipher Mode Setting" }, / [4] 10.5.2.9 / - { 0, "Cipher Response" }, / [4] 10.5.2.10 / - { 0, "L2 Pseudo Length" }, / [1] 11.5.2.19 / - { 0, "Page Mode" }, / [1] 11.5.2.26 / - { 0, "Request Reference" }, / [1] 11.5.2.30 / - { 0, "RR Cause" }, / [1] 11.5.2.31 / - { 0, "Timing Offset" }, / [1] 11.5.2.40 / - { 0, "TMSI/P-TMSI" }, / [4] 10.5.2.42 / - { 0, "Wait Indication" }, / [4] 10.5.2.43 / - { 0, "MES Information Flag" }, / [1] 11.5.2.44 / - { 0, "Frequency Offset" }, / [1] 11.5.2.49 / - { 0, "Paging Information" }, / [1] 11.5.2.51 / - { 0, "Position Display" }, / [1] 11.5.2.52 / - { 0, "Position Update Information" }, / [1] 11.5.2.54 / - { 0, "BCCH Carrier Specification"}, / [1] 11.5.2.55 / - { 0, "Reject Cause" }, / [1] 11.5.2.56 / - { 0, "GPS timestamp" }, / [1] 11.5.2.57 / - { 0, "TMSI Availability Mask" }, / [1] 11.5.2.62 / - { 0, "GPS Almanac Data" }, / [1] 11.5.2.63 / - { 0, "MSC ID" }, / [1] 11.5.2.100 / - { 0, "GPS Discriminator" }, / [1] 11.5.2.101 / - { 0, "Packet Imm. Ass. Type 3 Params" },/ [3] 11.5.2.105 / - { 0, "Packet Frequency Parameters" }, / [3] 11.5.2.106 / - { 0, "Packet Imm. Ass. Type 2 Params" },/ [3] 11.5.2.107 / - { 0, "USF" }, / [3] 11.5.2.110 / - { 0, "Timing Advance Index" }, / [3] 10.1.18.3.4 / - { 0, "TLLI" }, / [5] 12.16 / - { 0, "Packet Power Control Params" }, / [3] 10.1.18.3.3 / - { 0, "Persistence Level" }, / [3] 10.1.18.4.2 / + { GMR1_IE_RR_CHAN_DESC, + "Channel Description" }, / [1] 11.5.2.5 / + { GMR1_IE_RR_CHAN_MODE, + "Channel Mode" }, / [1] 11.5.2.6 / + { GMR1_IE_RR_CIPH_MODE_SETTING, + "Cipher Mode Setting" }, / [4] 10.5.2.9 / + { GMR1_IE_RR_CIPH_RESP, + "Cipher Response" }, / [4] 10.5.2.10 / + { GMR1_IE_RR_L2_PSEUDO_LEN, + "L2 Pseudo Length" }, / [1] 11.5.2.19 / + { GMR1_IE_RR_PAGE_MODE, + "Page Mode" }, / [1] 11.5.2.26 / + { GMR1_IE_RR_REQ_REF, + "Request Reference" }, / [1] 11.5.2.30 / + { GMR1_IE_RR_CAUSE, + "RR Cause" }, / [1] 11.5.2.31 / + { GMR1_IE_RR_TIMING_OFS, + "Timing Offset" }, / [1] 11.5.2.40 / + { GMR1_IE_RR_TMSI_PTMSI, + "TMSI/P-TMSI" }, / [4] 10.5.2.42 / + { GMR1_IE_RR_WAIT_IND, + "Wait Indication" }, / [4] 10.5.2.43 / + { GMR1_IE_RR_MES_INFO_FLG, + "MES Information Flag" }, / [1] 11.5.2.44 / + { GMR1_IE_RR_FREQ_OFS, + "Frequency Offset" }, / [1] 11.5.2.49 / + { GMR1_IE_RR_PAGE_INFO, + "Paging Information" }, / [1] 11.5.2.51 / + { GMR1_IE_RR_POS_DISPLAY, + "Position Display" }, / [1] 11.5.2.52 / + { GMR1_IE_RR_POS_UPD_INFO, + "Position Update Information" }, / [1] 11.5.2.54 / + { GMR1_IE_RR_BCCH_CARRIER, + "BCCH Carrier Specification"}, / [1] 11.5.2.55 / + { GMR1_IE_RR_REJECT_CAUSE, + "Reject Cause" }, / [1] 11.5.2.56 / + { GMR1_IE_RR_GPS_TIMESTAMP, + "GPS timestamp" }, / [1] 11.5.2.57 / + { GMR1_IE_RR_TMSI_AVAIL_MSK, + "TMSI Availability Mask" }, / [1] 11.5.2.62 / + { GMR1_IE_RR_GPS_ALMANAC, + "GPS Almanac Data" }, / [1] 11.5.2.63 / + { GMR1_IE_RR_MSC_ID, + "MSC ID" }, / [1] 11.5.2.100 / + { GMR1_IE_RR_GPS_DISCR, + "GPS Discriminator" }, / [1] 11.5.2.101 / + { GMR1_IE_RR_PKT_IMM_ASS_3_PRM, + "Packet Imm. Ass. Type 3 Params" }, / [3] 11.5.2.105 / + { GMR1_IE_RR_PKT_FREQ_PRM, + "Packet Frequency Parameters" }, / [3] 11.5.2.106 / + { GMR1_IE_RR_PKT_IMM_ASS_2_PRM, + "Packet Imm. Ass. Type 2 Params" }, / [3] 11.5.2.107 / + { GMR1_IE_RR_USF, + "USF" }, / [3] 11.5.2.110 / + { GMR1_IE_RR_TIMING_ADV_IDX, + "Timing Advance Index" }, / [3] 10.1.18.3.4 / + { GMR1_IE_RR_TLLI, + "TLLI" }, / [5] 12.16 / + { GMR1_IE_RR_PKT_PWR_CTRL_PRM, + "Packet Power Control Params" }, / [3] 10.1.18.3.3 / + { GMR1_IE_RR_PERSISTENCE_LVL, + "Persistence Level" }, / [3] 10.1.18.4.2 */ { 0, NULL }, };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_bssmap.c ^
@@ -193,119 +193,135 @@ static value_string_ext gsm_a_bssmap_msg_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_bssmap_msg_strings); const value_string gsm_bssmap_elem_strings[] = { - { 0x01, "Circuit Identity Code" }, - { 0x02, "Reserved" }, - { 0x03, "Resource Available" }, - { 0x04, "Cause" }, - { 0x05, "Cell Identifier" }, - { 0x06, "Priority" }, - { 0x07, "Layer 3 Header Information" }, - { 0x08, "IMSI" }, - { 0x09, "TMSI" }, - { 0x0a, "Encryption Information" }, - { 0x0b, "Channel Type" }, - { 0x0c, "Periodicity" }, - { 0x0d, "Extended Resource Indicator" }, - { 0x0e, "Number Of MSs" }, - { 0x0f, "Reserved" }, - { 0x10, "Reserved" }, - { 0x11, "Reserved" }, - { 0x12, "Classmark Information Type 2" }, - { 0x13, "Classmark Information Type 3" }, - { 0x14, "Interference Band To Be Used" }, - { 0x15, "RR Cause" }, - { 0x16, "Reserved" }, - { 0x17, "Layer 3 Information" }, - { 0x18, "DLCI" }, - { 0x19, "Downlink DTX Flag" }, - { 0x1a, "Cell Identifier List" }, - { 0x1b, "Response Request" }, - { 0x1c, "Resource Indication Method" }, - { 0x1d, "Classmark Information Type 1" }, - { 0x1e, "Circuit Identity Code List" }, - { 0x1f, "Diagnostic" }, - { 0x20, "Layer 3 Message Contents" }, - { 0x21, "Chosen Channel" }, - { 0x22, "Total Resource Accessible" }, - { 0x23, "Cipher Response Mode" }, - { 0x24, "Channel Needed" }, - { 0x25, "Trace Type" }, - { 0x26, "TriggerID" }, - { 0x27, "Trace Reference" }, - { 0x28, "TransactionID" }, - { 0x29, "Mobile Identity" }, - { 0x2a, "OMCID" }, - { 0x2b, "Forward Indicator" }, - { 0x2c, "Chosen Encryption Algorithm" }, - { 0x2d, "Circuit Pool" }, - { 0x2e, "Circuit Pool List" }, - { 0x2f, "Time Indication" }, - { 0x30, "Resource Situation" }, - { 0x31, "Current Channel Type 1" }, - { 0x32, "Queuing Indicator" }, - { 0x40, "Speech Version" }, - { 0x33, "Assignment Requirement" }, - { 0x35, "Talker Flag" }, - { 0x36, "Connection Release Requested" }, - { 0x37, "Group Call Reference" }, - { 0x38, "eMLPP Priority" }, - { 0x39, "Configuration Evolution Indication" }, - { 0x3a, "Old BSS to New BSS Information" }, - { 0x3b, "LSA Identifier" }, - { 0x3c, "LSA Identifier List" }, - { 0x3d, "LSA Information" }, - { 0x3e, "LCS QoS" }, - { 0x3f, "LSA access control suppression" }, - { 0x43, "LCS Priority" }, - { 0x44, "Location Type" }, - { 0x45, "Location Estimate" }, - { 0x46, "Positioning Data" }, - { 0x47, "LCS Cause" }, - { 0x48, "LCS Client Type" }, - { GSM_BSSMAP_APDU_IE, "APDU" }, - { 0x4a, "Network Element Identity" }, - { 0x4b, "GPS Assistance Data" }, - { 0x4c, "Deciphering Keys" }, - { 0x4d, "Return Error Request" }, - { 0x4e, "Return Error Cause" }, - { 0x4f, "Segmentation" }, - { 0x50, "Service Handover" }, - { 0x51, "Source RNC to target RNC transparent information (UMTS)" }, - { 0x52, "Source RNC to target RNC transparent information (cdma2000)" }, - { 0x53, "GERAN Classmark" }, - { 0x54, "GERAN BSC Container" }, - { 0x61, "New BSS to Old BSS Information" }, - { 0x63, "Inter-System Information" }, - { 0x64, "SNA Access Information" }, - { 0x65, "VSTK_RAND Information" }, - { 0x66, "VSTK Information" }, - { 0x67, "Paging Information" }, - { 0x68, "IMEI" }, - { 0x55, "Velocity Estimate" }, - { 0x69, "VGCS Feature Flags" }, - { 0x6a, "Talker Priority" }, - { 0x6b, "Emergency Set Indication" }, - { 0x6c, "Talker Identity" }, - { 0x6d, "Cell Identifier List Segment" }, - { 0x6e, "SMS to VGCS" }, - { 0x6f, "VGCS Talker Mode" }, - { 0x70, "VGCS/VBS Cell Status" }, - { 0x71, "Cell Identifier List Segment for established cells" }, - { 0x72, "Cell Identifier List Segment for cells to be established" }, - { 0x73, "Cell Identifier List Segment for released cells - no user present" }, - { 0x74, "Cell Identifier List Segment for not established cells - no establishment possible" }, - { 0x75, "GANSS Assistance Data" }, - { 0x76, "GANSS Positioning Data" }, - { 0x77, "GANSS Location Type" }, - { 0x78, "Application Data" }, - { 0x79, "Data Identity" }, - { 0x7a, "Application Data Information" }, - { 0x7b, "MSISDN" }, - { 0x7c, "AoIP Transport Layer Address" }, - { 0x7d, "Speech Codec List" }, - { 0x7e, "Speech Codec" }, - { 0x7f, "Call Identifier" }, - { 0x80, "Call Identifier List" }, + { BE_UDEF_0, "Undefined" }, + { BE_CIC, "Circuit Identity Code" }, + { BE_RSVD_1, "Reserved" }, + { BE_RES_AVAIL, "Resource Available" }, + { BE_CAUSE, "Cause" }, + { BE_CELL_ID, "Cell Identifier" }, + { BE_PRIO, "Priority" }, + { BE_L3_HEADER_INFO, "Layer 3 Header Information" }, + { BE_IMSI, "IMSI" }, + { BE_TMSI, "TMSI" }, + { BE_ENC_INFO, "Encryption Information" }, + { BE_CHAN_TYPE, "Channel Type" }, + { BE_PERIODICITY, "Periodicity" }, + { BE_EXT_RES_IND, "Extended Resource Indicator" }, + { BE_NUM_MS, "Number Of MSs" }, + { BE_RSVD_2, "Reserved" }, + { BE_RSVD_3, "Reserved" }, + { BE_RSVD_4, "Reserved" }, + { BE_CM_INFO_2, "Classmark Information Type 2" }, + { BE_CM_INFO_3, "Classmark Information Type 3" }, + { BE_INT_BAND, "Interference Band To Be Used" }, + { BE_RR_CAUSE, "RR Cause" }, + { BE_RSVD_5, "Reserved" }, + { BE_L3_INFO, "Layer 3 Information" }, + { BE_DLCI, "DLCI" }, + { BE_DOWN_DTX_FLAG, "Downlink DTX Flag" }, + { BE_CELL_ID_LIST, "Cell Identifier List" }, + { BE_RESP_REQ, "Response Request" }, + { BE_RES_IND_METHOD, "Resource Indication Method" }, + { BE_CM_INFO_1, "Classmark Information Type 1" }, + { BE_CIC_LIST, "Circuit Identity Code List" }, + { BE_DIAG, "Diagnostic" }, + { BE_L3_MSG, "Layer 3 Message Contents" }, + { BE_CHOSEN_CHAN, "Chosen Channel" }, + { BE_TOT_RES_ACC, "Total Resource Accessible" }, + { BE_CIPH_RESP_MODE, "Cipher Response Mode" }, + { BE_CHAN_NEEDED, "Channel Needed" }, + { BE_TRACE_TYPE, "Trace Type" }, + { BE_TRIGGERID, "TriggerID" }, + { BE_TRACE_REF, "Trace Reference" }, + { BE_TRANSID, "TransactionID" }, + { BE_MID, "Mobile Identity" }, + { BE_OMCID, "OMCID" }, + { BE_FOR_IND, "Forward Indicator" }, + { BE_CHOSEN_ENC_ALG, "Chosen Encryption Algorithm" }, + { BE_CCT_POOL, "Circuit Pool" }, + { BE_CCT_POOL_LIST, "Circuit Pool List" }, + { BE_TIME_IND, "Time Indication" }, + { BE_RES_SIT, "Resource Situation" }, + { BE_CURR_CHAN_1, "Current Channel Type 1" }, + { BE_QUE_IND, "Queuing Indicator" }, + { BE_ASS_REQ, "Assignment Requirement" }, + { BE_UDEF_52, "Undefined" }, + { BE_TALKER_FLAG, "Talker Flag" }, + { BE_CONN_REL_REQ, "Connection Release Requested" }, + { BE_GROUP_CALL_REF, "Group Call Reference" }, + { BE_EMLPP_PRIO, "eMLPP Priority" }, + { BE_CONF_EVO_IND, "Configuration Evolution Indication" }, + { BE_OLD2NEW_INFO, "Old BSS to New BSS Information" }, + { BE_LSA_ID, "LSA Identifier" }, + { BE_LSA_ID_LIST, "LSA Identifier List" }, + { BE_LSA_INFO, "LSA Information" }, + { BE_LCS_QOS, "LCS QoS" }, + { BE_LSA_ACC_CTRL, "LSA access control suppression" }, + { BE_SPEECH_VER, "Speech Version" }, + { BE_UDEF_65, "Undefined" }, + { BE_UDEF_66, "Undefined" }, + { BE_LCS_PRIO, "LCS Priority" }, + { BE_LOC_TYPE, "Location Type" }, + { BE_LOC_EST, "Location Estimate" }, + { BE_POS_DATA, "Positioning Data" }, + { BE_LCS_CAUSE, "LCS Cause" }, + { BE_LCS_CLIENT, "LCS Client Type" }, + { BE_APDU, "APDU" }, + { BE_NE_ID, "Network Element Identity" }, + { BE_GPS_ASSIST_DATA, "GPS Assistance Data" }, + { BE_DECIPH_KEYS, "Deciphering Keys" }, + { BE_RET_ERR_REQ, "Return Error Request" }, + { BE_RET_ERR_CAUSE, "Return Error Cause" }, + { BE_SEG, "Segmentation" }, + { BE_SERV_HO, "Service Handover" }, + { BE_SRC_RNC_TO_TAR_RNC_UMTS, "Source RNC to target RNC transparent information (UMTS)" }, + { BE_SRC_RNC_TO_TAR_RNC_CDMA, "Source RNC to target RNC transparent information (cdma2000)" }, + { BE_GERAN_CLS_M, "GERAN Classmark" }, + { BE_GERAN_BSC_CONT, "GERAN BSC Container" }, + { BE_VEL_EST, "Velocity Estimate" }, + { BE_UDEF_86, "Undefined" }, + { BE_UDEF_87, "Undefined" }, + { BE_UDEF_88, "Undefined" }, + { BE_UDEF_89, "Undefined" }, + { BE_UDEF_90, "Undefined" }, + { BE_UDEF_91, "Undefined" }, + { BE_UDEF_92, "Undefined" }, + { BE_UDEF_93, "Undefined" }, + { BE_UDEF_94, "Undefined" }, + { BE_UDEF_95, "Undefined" }, + { BE_UDEF_96, "Undefined" }, + { BE_NEW_BSS_TO_OLD_BSS_INF, "New BSS to Old BSS Information" }, + { BE_UDEF_98, "Undefined" }, + { BE_INTER_SYS_INF, "Inter-System Information" }, + { BE_SNA_ACC_INF, "SNA Access Information" }, + { BE_VSTK_RAND_INF, "VSTK_RAND Information" }, + { BE_VSTK_INF, "VSTK Information" }, + { BE_PAGING_INF, "Paging Information" }, + { BE_IMEI, "IMEI" }, + { BE_VGCS_FEAT_FLG, "VGCS Feature Flags" }, + { BE_TALKER_PRI, "Talker Priority" }, + { BE_EMRG_SET_IND, "Emergency Set Indication" }, + { BE_TALKER_ID, "Talker Identity" }, + { BE_CELL_ID_LIST_SEG, "Cell Identifier List Segment" }, + { BE_SMS_TO_VGCS, "SMS to VGCS" }, + { BE_VGCS_TALKER_MOD, "VGCS Talker Mode" }, + { BE_VGS_VBS_CELL_STAT, "VGCS/VBS Cell Status" }, + { BE_CELL_ID_LST_SEG_F_EST_CELLS, "Cell Identifier List Segment for established cells" }, + { BE_CELL_ID_LST_SEG_F_CELL_TB_EST, "Cell Identifier List Segment for cells to be established" }, + { BE_CELL_ID_LST_SEG_F_REL_CELL, "Cell Identifier List Segment for released cells - no user present" }, + { BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, "Cell Identifier List Segment for not established cells - no establishment possible" }, + { BE_GANSS_ASS_DTA, "GANSS Assistance Data" }, + { BE_GANSS_POS_DTA, "GANSS Positioning Data" }, + { BE_GANSS_LOC_TYP, "GANSS Location Type" }, + { BE_APP_DATA, "Application Data" }, + { BE_DATA_ID, "Data Identity" }, + { BE_APP_DATA_INF, "Application Data Information" }, + { BE_MSISDN, "MSISDN" }, + { BE_AOIP_TRANS_LAY_ADD, "AoIP Transport Layer Address" }, + { BE_SPEECH_CODEC_LST, "Speech Codec List" }, + { BE_SPEECH_CODEC, "Speech Codec" }, + { BE_CALL_ID, "Call Identifier" }, + { BE_CALL_ID_LST, "Call Identifier List" }, { 0, NULL } }; @@ -593,120 +609,136 @@ typedef enum { - BE_CIC, /* Circuit Identity Code / - BE_RSVD_1, / Reserved / - BE_RES_AVAIL, / Resource Available / - BE_CAUSE, / Cause / - BE_CELL_ID, / Cell Identifier / - BE_PRIO, / Priority / - BE_L3_HEADER_INFO, / Layer 3 Header Information / - BE_IMSI, / IMSI / - BE_TMSI, / TMSI / - BE_ENC_INFO, / Encryption Information / - BE_CHAN_TYPE, / Channel Type / - BE_PERIODICITY, / Periodicity / - BE_EXT_RES_IND, / Extended Resource Indicator / - BE_NUM_MS, / Number Of MSs / - BE_RSVD_2, / Reserved / - BE_RSVD_3, / Reserved / - BE_RSVD_4, / Reserved / - BE_CM_INFO_2, / Classmark Information Type 2 / - BE_CM_INFO_3, / Classmark Information Type 3 / - BE_INT_BAND, / Interference Band To Be Used / - BE_RR_CAUSE, / RR Cause / - BE_RSVD_5, / Reserved / - BE_L3_INFO, / Layer 3 Information / - BE_DLCI, / DLCI / - BE_DOWN_DTX_FLAG, / Downlink DTX Flag / - BE_CELL_ID_LIST, / Cell Identifier List / - BE_RESP_REQ, / Response Request / - BE_RES_IND_METHOD, / Resource Indication Method / - BE_CM_INFO_1, / Classmark Information Type 1 / - BE_CIC_LIST, / Circuit Identity Code List / - BE_DIAG, / Diagnostic / - BE_L3_MSG, / Layer 3 Message Contents / - BE_CHOSEN_CHAN, / Chosen Channel / - BE_TOT_RES_ACC, / Total Resource Accessible / - BE_CIPH_RESP_MODE, / Cipher Response Mode / - BE_CHAN_NEEDED, / Channel Needed / - BE_TRACE_TYPE, / Trace Type / - BE_TRIGGERID, / TriggerID / - BE_TRACE_REF, / Trace Reference / - BE_TRANSID, / TransactionID / - BE_MID, / Mobile Identity / - BE_OMCID, / OMCID / - BE_FOR_IND, / Forward Indicator / - BE_CHOSEN_ENC_ALG, / Chosen Encryption Algorithm / - BE_CCT_POOL, / Circuit Pool / - BE_CCT_POOL_LIST, / Circuit Pool List / - BE_TIME_IND, / Time Indication / - BE_RES_SIT, / Resource Situation / - BE_CURR_CHAN_1, / Current Channel Type 1 / - BE_QUE_IND, / Queueing Indicator / - BE_SPEECH_VER, / Speech Version / - BE_ASS_REQ, / Assignment Requirement / - BE_TALKER_FLAG, / Talker Flag / - BE_CONN_REL_REQ, / Connection Release Requested / - BE_GROUP_CALL_REF, / Group Call Reference / - BE_EMLPP_PRIO, / eMLPP Priority / - BE_CONF_EVO_IND, / Configuration Evolution Indication / - BE_OLD2NEW_INFO, / Old BSS to New BSS Information / - BE_LSA_ID, / LSA Identifier / - BE_LSA_ID_LIST, / LSA Identifier List / - BE_LSA_INFO, / LSA Information / - BE_LCS_QOS, / LCS QoS / - BE_LSA_ACC_CTRL, / LSA access control suppression / - BE_LCS_PRIO, / LCS Priority / - BE_LOC_TYPE, / Location Type / - BE_LOC_EST, / Location Estimate / - BE_POS_DATA, / Positioning Data / - BE_LCS_CAUSE, / 32266 LCS Cause / - BE_LCS_CLIENT, /* LCS Client Type / - BE_APDU, / APDU / - BE_NE_ID, / Network Element Identity / - BE_GPS_ASSIST_DATA, / GPS Assistance Data / - BE_DECIPH_KEYS, / Deciphering Keys / - BE_RET_ERR_REQ, / Return Error Request / - BE_RET_ERR_CAUSE, / Return Error Cause / - BE_SEG, / Segmentation / - BE_SERV_HO, / Service Handover / - BE_SRC_RNC_TO_TAR_RNC_UMTS, / Source RNC to target RNC transparent information (UMTS) / - BE_SRC_RNC_TO_TAR_RNC_CDMA, / Source RNC to target RNC transparent information (cdma2000) / - BE_GERAN_CLS_M, / GERAN Classmark / - BE_GRAN_BSC_CONT, / GERAN BSC Container / - BE_NEW_BSS_TO_OLD_BSS_INF, / New BSS to Old BSS Information / - BE_INTER_SYS_INF, / Inter-System Information / - BE_SNA_ACC_INF, / SNA Access Information / - BE_VSTK_RAND_INF, / VSTK_RAND Information / - BE_VSTK_INF, / VSTK Information / - BE_PAGING_INF, / Paging Information / - BE_IMEI, / IMEI / - BE_VEL_EST, / Velocity Estimate / - BE_VGCS_FEAT_FLG, / VGCS Feature Flags / - BE_TALKER_PRI, / Talker Priority / - BE_EMRG_SET_IND, / Emergency Set Indication / - BE_TALKER_ID, / Talker Identity / - BE_CELL_ID_LIST_SEG, / Cell Identifier List Segment / - BE_SMS_TO_VGCS, / SMS to VGCS / - BE_VGCS_TALKER_MOD, / VGCS Talker Mode / - BE_VGS_VBS_CELL_STAT, / VGCS/VBS Cell Status / - BE_CELL_ID_LST_SEG_F_EST_CELLS, / Cell Identifier List Segment for established cells / - BE_CELL_ID_LST_SEG_F_CELL_TB_EST, / Cell Identifier List Segment for cells to be established / - BE_CELL_ID_LST_SEG_F_REL_CELL, / Cell Identifier List Segment for released cells - no user present / - BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, / Cell Identifier List Segment for not established cells - no establishment possible / - BE_GANSS_ASS_DTA, / GANSS Assistance Data / - BE_GANSS_POS_DTA, / GANSS Positioning Data / - BE_GANSS_LOC_TYP, / GANSS Location Type / - BE_APP_DATA, / Application Data / - BE_DATA_ID / Data Identity / - BE_APP_DATA_INF, / Application Data Information / - BE_MSISDN, / MSISDN / - BE_AOIP_TRANS_LAY_ADD, / AoIP Transport Layer Address / - BE_SPEECH_CODEC_LST, / Speech Codec List / - BE_SPEECH_CODEC, / Speech Codec / - BE_CALL_ID, / Call Identifier / - BE_CALL_ID_LST, / Call Identifier List / - BE_NONE / NONE / + BE_UDEF_0, / Undefined / + BE_CIC, / Circuit Identity Code / + BE_RSVD_1, / Reserved / + BE_RES_AVAIL, / Resource Available / + BE_CAUSE, / Cause / + BE_CELL_ID, / Cell Identifier / + BE_PRIO, / Priority / + BE_L3_HEADER_INFO, / Layer 3 Header Information / + BE_IMSI, / IMSI / + BE_TMSI, / TMSI / + BE_ENC_INFO, / Encryption Information / + BE_CHAN_TYPE, / Channel Type / + BE_PERIODICITY, / Periodicity / + BE_EXT_RES_IND, / Extended Resource Indicator / + BE_NUM_MS, / Number Of MSs / + BE_RSVD_2, / Reserved / + BE_RSVD_3, / Reserved / + BE_RSVD_4, / Reserved / + BE_CM_INFO_2, / Classmark Information Type 2 / + BE_CM_INFO_3, / Classmark Information Type 3 / + BE_INT_BAND, / Interference Band To Be Used / + BE_RR_CAUSE, / RR Cause / + BE_RSVD_5, / Reserved / + BE_L3_INFO, / Layer 3 Information / + BE_DLCI, / DLCI / + BE_DOWN_DTX_FLAG, / Downlink DTX Flag / + BE_CELL_ID_LIST, / Cell Identifier List / + BE_RESP_REQ, / Response Request / + BE_RES_IND_METHOD, / Resource Indication Method / + BE_CM_INFO_1, / Classmark Information Type 1 / + BE_CIC_LIST, / Circuit Identity Code List / + BE_DIAG, / Diagnostic / + BE_L3_MSG, / Layer 3 Message Contents / + BE_CHOSEN_CHAN, / Chosen Channel / + BE_TOT_RES_ACC, / Total Resource Accessible / + BE_CIPH_RESP_MODE, / Cipher Response Mode / + BE_CHAN_NEEDED, / Channel Needed / + BE_TRACE_TYPE, / Trace Type / + BE_TRIGGERID, / TriggerID / + BE_TRACE_REF, / Trace Reference / + BE_TRANSID, / TransactionID / + BE_MID, / Mobile Identity / + BE_OMCID, / OMCID / + BE_FOR_IND, / Forward Indicator / + BE_CHOSEN_ENC_ALG, / Chosen Encryption Algorithm / + BE_CCT_POOL, / Circuit Pool / + BE_CCT_POOL_LIST, / Circuit Pool List / + BE_TIME_IND, / Time Indication / + BE_RES_SIT, / Resource Situation / + BE_CURR_CHAN_1, / Current Channel Type 1 / + BE_QUE_IND, / Queueing Indicator / + BE_ASS_REQ, / Assignment Requirement / + BE_UDEF_52, / Undefined / + BE_TALKER_FLAG, / Talker Flag / + BE_CONN_REL_REQ, / Connection Release Requested / + BE_GROUP_CALL_REF, / Group Call Reference / + BE_EMLPP_PRIO, / eMLPP Priority / + BE_CONF_EVO_IND, / Configuration Evolution Indication / + BE_OLD2NEW_INFO, / Old BSS to New BSS Information / + BE_LSA_ID, / LSA Identifier / + BE_LSA_ID_LIST, / LSA Identifier List / + BE_LSA_INFO, / LSA Information / + BE_LCS_QOS, / LCS QoS / + BE_LSA_ACC_CTRL, / LSA access control suppression / + BE_SPEECH_VER, / Speech Version / + BE_UDEF_65, / Undefined / + BE_UDEF_66, / Undefined / + BE_LCS_PRIO, / LCS Priority / + BE_LOC_TYPE, / Location Type / + BE_LOC_EST, / Location Estimate / + BE_POS_DATA, / Positioning Data / + BE_LCS_CAUSE, / 3.2.2.66 LCS Cause / + BE_LCS_CLIENT, / 10.14 LCS Client Type / + BE_APDU, / APDU / + BE_NE_ID, / Network Element Identity / + BE_GPS_ASSIST_DATA, / GPS Assistance Data / + BE_DECIPH_KEYS, / Deciphering Keys / + BE_RET_ERR_REQ, / Return Error Request / + BE_RET_ERR_CAUSE, / Return Error Cause / + BE_SEG, / Segmentation / + BE_SERV_HO, / Service Handover / + BE_SRC_RNC_TO_TAR_RNC_UMTS, / Source RNC to target RNC transparent information (UMTS) / + BE_SRC_RNC_TO_TAR_RNC_CDMA, / Source RNC to target RNC transparent information (cdma2000) / + BE_GERAN_CLS_M, / GERAN Classmark / + BE_GERAN_BSC_CONT, / GERAN BSC Container / + BE_VEL_EST, / Velocity Estimate / + BE_UDEF_86, / Undefined / + BE_UDEF_87, / Undefined / + BE_UDEF_88, / Undefined / + BE_UDEF_89, / Undefined / + BE_UDEF_90, / Undefined / + BE_UDEF_91, / Undefined / + BE_UDEF_92, / Undefined / + BE_UDEF_93, / Undefined / + BE_UDEF_94, / Undefined / + BE_UDEF_95, / Undefined / + BE_UDEF_96, / Undefined / + BE_NEW_BSS_TO_OLD_BSS_INF, / New BSS to Old BSS Information / + BE_UDEF_98, / Undefined / + BE_INTER_SYS_INF, / Inter-System Information / + BE_SNA_ACC_INF, / SNA Access Information / + BE_VSTK_RAND_INF, / VSTK_RAND Information / + BE_VSTK_INF, / VSTK Information / + BE_PAGING_INF, / Paging Information / + BE_IMEI, / IMEI / + BE_VGCS_FEAT_FLG, / VGCS Feature Flags / + BE_TALKER_PRI, / Talker Priority / + BE_EMRG_SET_IND, / Emergency Set Indication / + BE_TALKER_ID, / Talker Identity / + BE_CELL_ID_LIST_SEG, / Cell Identifier List Segment / + BE_SMS_TO_VGCS, / SMS to VGCS / + BE_VGCS_TALKER_MOD, / VGCS Talker Mode / + BE_VGS_VBS_CELL_STAT, / VGCS/VBS Cell Status / + BE_CELL_ID_LST_SEG_F_EST_CELLS, / Cell Identifier List Segment for established cells / + BE_CELL_ID_LST_SEG_F_CELL_TB_EST, / Cell Identifier List Segment for cells to be established / + BE_CELL_ID_LST_SEG_F_REL_CELL, / Cell Identifier List Segment for released cells - no user present / + BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, / Cell Identifier List Segment for not established cells - no establishment possible / + BE_GANSS_ASS_DTA, / GANSS Assistance Data / + BE_GANSS_POS_DTA, / GANSS Positioning Data / + BE_GANSS_LOC_TYP, / GANSS Location Type / + BE_APP_DATA, / Application Data / + BE_DATA_ID, / Data Identity / + BE_APP_DATA_INF, / Application Data Information / + BE_MSISDN, / MSISDN / + BE_AOIP_TRANS_LAY_ADD, / AoIP Transport Layer Address / + BE_SPEECH_CODEC_LST, / Speech Codec List / + BE_SPEECH_CODEC, / Speech Codec / + BE_CALL_ID, / Call Identifier / + BE_CALL_ID_LST, / Call Identifier List / + BE_NONE / NONE / } bssmap_elem_idx_t; #endif @@ -4013,6 +4045,7 @@ } guint16 (bssmap_elem_fcn[])(tvbuff_t tvb, proto_tree tree, packet_info pinfo _U_, guint32 offset, guint len, gchar add_string, int string_len) = { + NULL, /* Undefined / be_cic, / Circuit Identity Code / NULL, / Reserved / be_res_avail, / Resource Available / @@ -4063,8 +4096,8 @@ NULL, / Resource Situation / be_curr_chan_1, / Current Channel Type 1 / be_que_ind, / Queueing Indicator / - be_speech_ver, / Speech Version / be_ass_req, / Assignment Requirement / + NULL, / Undefined / NULL / no associated data /, / Talker Flag / NULL / no associated data /, / Connection Release Requested / de_d_gb_call_ref, / Group Call Reference / @@ -4076,6 +4109,9 @@ be_lsa_info, / LSA Information / NULL, / LCS QoS Dissected in packet-gsm_bssmap_le.c/ NULL, / LSA access control suppression / + be_speech_ver, / Speech Version / + NULL, / Undefined / + NULL, / Undefined / be_lcs_prio, / LCS Priority / be_loc_type, / Location Type / be_loc_est, / Location Estimate / @@ -4094,14 +4130,26 @@ be_src_rnc_to_tar_rnc_cdma, / Source RNC to target RNC transparent information (cdma2000) / be_geran_cls_m, / GERAN Classmark / NULL, / GERAN BSC Container / + be_vel_est, / Velocity Estimate / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / + NULL, / Undefined / be_field_element_dissect, / New BSS to Old BSS Information / + NULL, / Undefined / be_inter_sys_inf, / Inter-System Information / be_sna_acc_inf, / SNA Access Information / NULL, / VSTK_RAND Information / NULL, / VSTK Information / be_paging_inf, / Paging Information / de_mid, / 3.2.2.86 IMEI (use same dissector as IMSI)/ - be_vel_est, / Velocity Estimate / be_vgcs_feat_flg, / VGCS Feature Flags / be_talker_pri, / Talker Priority / NULL, / no data Emergency Set Indication */
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_common.c ^
@@ -47,24 +47,24 @@ const value_string gsm_common_elem_strings[] = { /* Common Information Elements 10.5.1 */ - { 0x00, "Cell Identity" }, - { 0x00, "Ciphering Key Sequence Number" }, - { 0x00, "Location Area Identification (LAI)" }, - { 0x00, "Mobile Identity" }, - { 0x00, "Mobile Station Classmark 1" }, - { 0x00, "Mobile Station Classmark 2" }, - { 0x00, "Mobile Station Classmark 3" }, - { 0x00, "Spare Half Octet" }, - { 0x00, "Descriptive group or broadcast call reference" }, - { 0x00, "Group Cipher Key Number" }, - { 0x00, "PD and SAPI $(CCBS)$" }, - { 0x00, "Priority Level" }, - { 0x00, "CN Common GSM-MAP NAS system information" }, - { 0x00, "CS domain specific system information" }, - { 0x00, "PS domain specific system information" }, - { 0x00, "PLMN List" }, - { 0x00, "NAS container for PS HO" }, - { 0x00, "MS network feature support" }, + { DE_CELL_ID, "Cell Identity" }, + { DE_CIPH_KEY_SEQ_NUM, "Ciphering Key Sequence Number" }, + { DE_LAI, "Location Area Identification (LAI)" }, + { DE_MID, "Mobile Identity" }, + { DE_MS_CM_1, "Mobile Station Classmark 1" }, + { DE_MS_CM_2, "Mobile Station Classmark 2" }, + { DE_MS_CM_3, "Mobile Station Classmark 3" }, + { DE_SPARE_NIBBLE, "Spare Half Octet" }, + { DE_D_GB_CALL_REF, "Descriptive group or broadcast call reference" }, + { DE_G_CIPH_KEY_NUM, "Group Cipher Key Number" }, + { DE_PD_SAPI, "PD and SAPI $(CCBS)$" }, + { DE_PRIO, "Priority Level" }, + { DE_CN_COMMON_GSM_MAP_NAS_SYS_INFO, "CN Common GSM-MAP NAS system information" }, + { DE_CS_DOMAIN_SPEC_SYS_INFO, "CS domain specific system information" }, + { DE_PS_DOMAIN_SPEC_SYS_INFO, "PS domain specific system information" }, + { DE_PLMN_LIST, "PLMN List" }, + { DE_NAS_CONT_FOR_PS_HO, "NAS container for PS HO" }, + { DE_MS_NET_FEAT_SUP, "MS network feature support" }, { 0, NULL } };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_common.h ^
@@ -264,7 +264,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, SEV_elem_ett, SEV_elem_funcs) \ switch (SEV_pdu_type) \ @@ -785,6 +785,7 @@ typedef enum { + BE_UDEF_0, /* Undefined / BE_CIC, / Circuit Identity Code / BE_RSVD_1, / Reserved / BE_RES_AVAIL, / Resource Available / @@ -835,8 +836,8 @@ BE_RES_SIT, / Resource Situation / BE_CURR_CHAN_1, / Current Channel Type 1 / BE_QUE_IND, / Queueing Indicator / - BE_SPEECH_VER, / Speech Version / BE_ASS_REQ, / Assignment Requirement / + BE_UDEF_52, / Undefined / BE_TALKER_FLAG, / Talker Flag / BE_CONN_REL_REQ, / Connection Release Requested / BE_GROUP_CALL_REF, / Group Call Reference / @@ -848,6 +849,9 @@ BE_LSA_INFO, / LSA Information / BE_LCS_QOS, / LCS QoS / BE_LSA_ACC_CTRL, / LSA access control suppression / + BE_SPEECH_VER, / Speech Version / + BE_UDEF_65, / Undefined / + BE_UDEF_66, / Undefined / BE_LCS_PRIO, / LCS Priority / BE_LOC_TYPE, / Location Type / BE_LOC_EST, / Location Estimate / @@ -865,15 +869,27 @@ BE_SRC_RNC_TO_TAR_RNC_UMTS, / Source RNC to target RNC transparent information (UMTS) / BE_SRC_RNC_TO_TAR_RNC_CDMA, / Source RNC to target RNC transparent information (cdma2000) / BE_GERAN_CLS_M, / GERAN Classmark / - BE_GRAN_BSC_CONT, / GERAN BSC Container / + BE_GERAN_BSC_CONT, / GERAN BSC Container / + BE_VEL_EST, / Velocity Estimate / + BE_UDEF_86, / Undefined / + BE_UDEF_87, / Undefined / + BE_UDEF_88, / Undefined / + BE_UDEF_89, / Undefined / + BE_UDEF_90, / Undefined / + BE_UDEF_91, / Undefined / + BE_UDEF_92, / Undefined / + BE_UDEF_93, / Undefined / + BE_UDEF_94, / Undefined / + BE_UDEF_95, / Undefined / + BE_UDEF_96, / Undefined / BE_NEW_BSS_TO_OLD_BSS_INF, / New BSS to Old BSS Information / + BE_UDEF_98, / Undefined / BE_INTER_SYS_INF, / Inter-System Information / BE_SNA_ACC_INF, / SNA Access Information / BE_VSTK_RAND_INF, / VSTK_RAND Information / BE_VSTK_INF, / VSTK Information / BE_PAGING_INF, / Paging Information / BE_IMEI, / IMEI / - BE_VEL_EST, / Velocity Estimate / BE_VGCS_FEAT_FLG, / VGCS Feature Flags / BE_TALKER_PRI, / Talker Priority / BE_EMRG_SET_IND, / Emergency Set Indication / @@ -898,7 +914,7 @@ BE_SPEECH_CODEC, / Speech Codec / BE_CALL_ID, / Call Identifier / BE_CALL_ID_LST, / Call Identifier List / - BE_NONE / NONE / + BE_NONE / NONE / } bssmap_elem_idx_t; @@ -1350,8 +1366,8 @@ DE_SGSAP_EPS_LOC_UPD_TYPE, / 9.4.2 EPS location update type/ DE_SGSAP_GLOBAL_CN_ID, / 9.4.4 Global CN-Id/ + DE_SGSAP_UDEF_11, / Undefined / DE_SGSAP_UDEF_12, / Undefined / - DE_SGSAP_UDEF_13, / Undefined / DE_SGSAP_MID, / 9.4.14 Mobile identity/ DE_SGSAP_REJ_CAUSE, / 9.4.16 Reject cause / @@ -1362,9 +1378,9 @@ DE_SGSAP_NAS_MSG_CONTAINER, / 9.4.15 NAS message container/ DE_SGSAP_MM_INFO, / 9.4.12 MM information/ - DE_SGSAP_UDEF_24, / Undefined / - DE_SGSAP_UDEF_25, / Undefined / - DE_SGSAP_UDEF_26, / Undefined / + DE_SGSAP_UDEF_20, / Undefined / + DE_SGSAP_UDEF_21, / Undefined / + DE_SGSAP_UDEF_22, / Undefined / DE_SGSAP_ERR_MSG, / 9.4.3 Erroneous message/ DE_SGSAP_CLI, / 9.4.1 CLI */
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_dtap.c ^
@@ -240,89 +240,89 @@ const value_string gsm_dtap_elem_strings[] = { /* Mobility Management Information Elements 10.5.3 / - { 0x00, "Authentication Parameter RAND" }, - { 0x00, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, - { 0x00, "Authentication Response Parameter" }, - { 0x00, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, - { 0x00, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, - { 0x00, "CM Service Type" }, - { 0x00, "Identity Type" }, - { 0x00, "Location Updating Type" }, - { 0x00, "Network Name" }, - { 0x00, "Reject Cause" }, - { 0x00, "Follow-on Proceed" }, - { 0x00, "Time Zone" }, - { 0x00, "Time Zone and Time" }, - { 0x00, "CTS Permission" }, - { 0x00, "LSA Identifier" }, - { 0x00, "Daylight Saving Time" }, - { 0x00, "Emergency Number List" }, - { 0x00, "Additional update parameters" }, - { 0x00, "MM Timer" }, + { DE_AUTH_PARAM_RAND, "Authentication Parameter RAND" }, + { DE_AUTH_PARAM_AUTN, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, + { DE_AUTH_RESP_PARAM, "Authentication Response Parameter" }, + { DE_AUTH_RESP_PARAM_EXT, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, + { DE_AUTH_FAIL_PARAM, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, + { DE_CM_SRVC_TYPE, "CM Service Type" }, + { DE_ID_TYPE, "Identity Type" }, + { DE_LOC_UPD_TYPE, "Location Updating Type" }, + { DE_NETWORK_NAME, "Network Name" }, + { DE_REJ_CAUSE, "Reject Cause" }, + { DE_FOP, "Follow-on Proceed" }, + { DE_TIME_ZONE, "Time Zone" }, + { DE_TIME_ZONE_TIME, "Time Zone and Time" }, + { DE_CTS_PERM, "CTS Permission" }, + { DE_LSA_ID, "LSA Identifier" }, + { DE_DAY_SAVING_TIME, "Daylight Saving Time" }, + { DE_EMERGENCY_NUM_LIST, "Emergency Number List" }, + { DE_ADD_UPD_PARAMS, "Additional update parameters" }, + { DE_MM_TIMER, "MM Timer" }, / Call Control Information Elements 10.5.4 / - { 0x00, "Auxiliary States" }, / 10.5.4.4 Auxiliary states / - { 0x00, "Bearer Capability" }, / 10.5.4.4a Backup bearer capability / - { 0x00, "Call Control Capabilities" }, - { 0x00, "Call State" }, - { 0x00, "Called Party BCD Number" }, - { 0x00, "Called Party Subaddress" }, - { 0x00, "Calling Party BCD Number" }, - { 0x00, "Calling Party Subaddress" }, - { 0x00, "Cause" }, - { 0x00, "CLIR Suppression" }, - { 0x00, "CLIR Invocation" }, - { 0x00, "Congestion Level" }, - { 0x00, "Connected Number" }, - { 0x00, "Connected Subaddress" }, - { 0x00, "Facility" }, - { 0x00, "High Layer Compatibility" }, - { 0x00, "Keypad Facility" }, - { 0x00, "Low Layer Compatibility" }, - { 0x00, "More Data" }, - { 0x00, "Notification Indicator" }, - { 0x00, "Progress Indicator" }, - { 0x00, "Recall type $(CCBS)$" }, - { 0x00, "Redirecting Party BCD Number" }, - { 0x00, "Redirecting Party Subaddress" }, - { 0x00, "Repeat Indicator" }, - { 0x00, "Reverse Call Setup Direction" }, - { 0x00, "SETUP Container $(CCBS)$" }, - { 0x00, "Signal" }, - { 0x00, "SS Version Indicator" }, - { 0x00, "User-user" }, - { 0x00, "Alerting Pattern $(NIA)$" }, / 10.5.4.26 Alerting Pattern $(NIA)$ / - { 0x00, "Allowed Actions $(CCBS)$" }, - { 0x00, "Stream Identifier" }, - { 0x00, "Network Call Control Capabilities" }, - { 0x00, "Cause of No CLI" }, / 10.5.4.30 Cause of No CLI / + { DE_AUX_STATES, "Auxiliary States" }, / 10.5.4.4 Auxiliary states / + { DE_BEARER_CAP, "Bearer Capability" }, / 10.5.4.4a Backup bearer capability / + { DE_CC_CAP, "Call Control Capabilities" }, + { DE_CALL_STATE, "Call State" }, + { DE_CLD_PARTY_BCD_NUM, "Called Party BCD Number" }, + { DE_CLD_PARTY_SUB_ADDR, "Called Party Subaddress" }, + { DE_CLG_PARTY_BCD_NUM, "Calling Party BCD Number" }, + { DE_CLG_PARTY_SUB_ADDR, "Calling Party Subaddress" }, + { DE_CAUSE, "Cause" }, + { DE_CLIR_SUP, "CLIR Suppression" }, + { DE_CLIR_INV, "CLIR Invocation" }, + { DE_CONGESTION, "Congestion Level" }, + { DE_CONN_NUM, "Connected Number" }, + { DE_CONN_SUB_ADDR, "Connected Subaddress" }, + { DE_FACILITY, "Facility" }, + { DE_HLC, "High Layer Compatibility" }, + { DE_KEYPAD_FACILITY, "Keypad Facility" }, + { DE_LLC, "Low Layer Compatibility" }, + { DE_MORE_DATA, "More Data" }, + { DE_NOT_IND, "Notification Indicator" }, + { DE_PROG_IND, "Progress Indicator" }, + { DE_RECALL_TYPE, "Recall type $(CCBS)$" }, + { DE_RED_PARTY_BCD_NUM, "Redirecting Party BCD Number" }, + { DE_RED_PARTY_SUB_ADDR, "Redirecting Party Subaddress" }, + { DE_REPEAT_IND, "Repeat Indicator" }, + { DE_REV_CALL_SETUP_DIR, "Reverse Call Setup Direction" }, + { DE_SETUP_CONTAINER, "SETUP Container $(CCBS)$" }, + { DE_SIGNAL, "Signal" }, + { DE_SS_VER_IND, "SS Version Indicator" }, + { DE_USER_USER, "User-user" }, + { DE_ALERT_PATTERN, "Alerting Pattern $(NIA)$" }, / 10.5.4.26 Alerting Pattern $(NIA)$ / + { DE_ALLOWED_ACTIONS, "Allowed Actions $(CCBS)$" }, + { DE_SI, "Stream Identifier" }, + { DE_NET_CC_CAP, "Network Call Control Capabilities" }, + { DE_CAUSE_NO_CLI, "Cause of No CLI" }, / 10.5.4.30 Cause of No CLI / / 10.5.4.31 Void / - { 0x00, "Supported Codec List" }, / 10.5.4.32 Supported codec list / - { 0x00, "Service Category" }, / 10.5.4.33 Service category / - { 0x00, "Redial" }, / 10.5.4.34 Redial / - { 0x00, "Network-initiated Service Upgrade indicator" }, + { DE_SUP_CODEC_LIST, "Supported Codec List" }, / 10.5.4.32 Supported codec list / + { DE_SERV_CAT, "Service Category" }, / 10.5.4.33 Service category / + { DE_REDIAL, "Redial" }, / 10.5.4.34 Redial / + { DE_NET_INIT_SERV_UPG, "Network-initiated Service Upgrade indicator" }, / 10.5.4.35 Network-initiated Service Upgrade indicator / / Short Message Service Information Elements [5] 8.1.4 / - { 0x00, "CP-User Data" }, - { 0x00, "CP-Cause" }, + { DE_CP_USER_DATA, "CP-User Data" }, + { DE_CP_CAUSE, "CP-Cause" }, / Tests procedures information elements 3GPP TS 44.014 6.4.0, 3GPP TS 34.109 6.4.0 and 3GPP TS 36.509 9.1.0*/ - { 0x00, "Close TCH Loop Cmd Sub-channel"}, - { 0x00, "Open Loop Cmd Ack"}, - { 0x00, "Close Multi-slot Loop Cmd Loop type"}, - { 0x00, "Close Multi-slot Loop Ack Result"}, - { 0x00, "Test Interface Tested device"}, - { 0x00, "GPRS Test Mode Cmd PDU description"}, - { 0x00, "GPRS Test Mode Cmd Mode flag"}, - { 0x00, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, - { 0x00, "MS Positioning Technology"}, - { 0x00, "Close UE Test Loop Mode"}, - { 0x00, "UE Positioning Technology"}, - { 0x00, "RLC SDU Counter Value"}, - { 0x00, "UE Test Loop Mode"}, - { 0x00, "UE Test Loop Mode A LB Setup"}, - { 0x00, "UE Test Loop Mode B LB Setup"}, - { 0x00, "UE Test Loop Mode C Setup"}, - { 0x00, "UE Positioning Technology"}, - { 0x00, "MBMS Packet Counter Value"}, + { DE_TP_SUB_CHANNEL, "Close TCH Loop Cmd Sub-channel"}, + { DE_TP_ACK, "Open Loop Cmd Ack"}, + { DE_TP_LOOP_TYPE, "Close Multi-slot Loop Cmd Loop type"}, + { DE_TP_LOOP_ACK, "Close Multi-slot Loop Ack Result"}, + { DE_TP_TESTED_DEVICE, "Test Interface Tested device"}, + { DE_TP_PDU_DESCRIPTION, "GPRS Test Mode Cmd PDU description"}, + { DE_TP_MODE_FLAG, "GPRS Test Mode Cmd Mode flag"}, + { DE_TP_EGPRS_MODE_FLAG, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, + { DE_TP_MS_POSITIONING_TECHNOLOGY, "MS Positioning Technology"}, + { DE_TP_UE_TEST_LOOP_MODE, "Close UE Test Loop Mode"}, + { DE_TP_UE_POSITIONING_TECHNOLOGY, "UE Positioning Technology"}, + { DE_TP_RLC_SDU_COUNTER_VALUE, "RLC SDU Counter Value"}, + { DE_TP_EPC_UE_TEST_LOOP_MODE, "UE Test Loop Mode"}, + { DE_TP_EPC_UE_TL_A_LB_SETUP, "UE Test Loop Mode A LB Setup"}, + { DE_TP_EPC_UE_TL_B_LB_SETUP, "UE Test Loop Mode B LB Setup"}, + { DE_TP_EPC_UE_TL_C_SETUP, "UE Test Loop Mode C Setup"}, + { DE_TP_EPC_UE_POSITIONING_TECHNOLOGY, "UE Positioning Technology"}, + { DE_TP_EPC_MBMS_PACKET_COUNTER_VALUE, "MBMS Packet Counter Value"}, { 0, NULL } };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_gm.c ^
@@ -147,69 +147,69 @@ const value_string gsm_gm_elem_strings[] = { /* GPRS Mobility Management Information Elements 10.5.5 / - { 0x00, "Attach Result" }, - { 0x00, "Attach Type" }, - { 0x00, "Cipher Algorithm" }, - { 0x00, "TMSI Status" }, - { 0x00, "Detach Type" }, - { 0x00, "DRX Parameter" }, - { 0x00, "Force to Standby" }, - { 0x00, "Force to Standby" }, - { 0x00, "P-TMSI Signature" }, - { 0x00, "P-TMSI Signature 2" }, - { 0x00, "Identity Type 2" }, - { 0x00, "IMEISV Request" }, - { 0x00, "Receive N-PDU Numbers List" }, - { 0x00, "MS Network Capability" }, - { 0x00, "MS Radio Access Capability" }, - { 0x00, "GMM Cause" }, - { 0x00, "Routing Area Identification" }, - { 0x00, "Routing Area Identification 2" }, - { 0x00, "Update Result" }, - { 0x00, "Update Type" }, - { 0x00, "A&C Reference Number" }, - { 0x00, "A&C Reference Number" }, - { 0x00, "Service Type" }, - { 0x00, "Cell Notification" }, - { 0x00, "PS LCS Capability" }, - { 0x00, "Network Feature Support" }, - { 0x00, "Inter RAT information container" }, - { 0x00, "Requested MS information" }, - { 0x00, "UE network capability" }, - { 0x00, "E-UTRAN inter RAT information container" }, - { 0x00, "Voice domain preference and UE's usage setting" }, - { 0x00, "P-TMSI type" }, - { 0x00, "Location Area Identification 2" }, + { DE_ATTACH_RES, "Attach Result" }, + { DE_ATTACH_TYPE, "Attach Type" }, + { DE_CIPH_ALG, "Cipher Algorithm" }, + { DE_TMSI_STAT, "TMSI Status" }, + { DE_DETACH_TYPE, "Detach Type" }, + { DE_DRX_PARAM, "DRX Parameter" }, + { DE_FORCE_TO_STAND, "Force to Standby" }, + { DE_FORCE_TO_STAND_H, "Force to Standby" }, + { DE_P_TMSI_SIG, "P-TMSI Signature" }, + { DE_P_TMSI_SIG_2, "P-TMSI Signature 2" }, + { DE_ID_TYPE_2, "Identity Type 2" }, + { DE_IMEISV_REQ, "IMEISV Request" }, + { DE_REC_N_PDU_NUM_LIST, "Receive N-PDU Numbers List" }, + { DE_MS_NET_CAP, "MS Network Capability" }, + { DE_MS_RAD_ACC_CAP, "MS Radio Access Capability" }, + { DE_GMM_CAUSE, "GMM Cause" }, + { DE_RAI, "Routing Area Identification" }, + { DE_RAI_2, "Routing Area Identification 2" }, + { DE_UPD_RES, "Update Result" }, + { DE_UPD_TYPE, "Update Type" }, + { DE_AC_REF_NUM, "A&C Reference Number" }, + { DE_AC_REF_NUM_H, "A&C Reference Number" }, + { DE_SRVC_TYPE, "Service Type" }, + { DE_CELL_NOT, "Cell Notification" }, + { DE_PS_LCS_CAP, "PS LCS Capability" }, + { DE_NET_FEAT_SUP, "Network Feature Support" }, + { DE_RAT_INFO_CONTAINER, "Inter RAT information container" }, + { DE_REQ_MS_INFO, "Requested MS information" }, + { DE_UE_NETWORK_CAP, "UE network capability" }, + { DE_EUTRAN_IRAT_INFO_CONTAINER, "E-UTRAN inter RAT information container" }, + { DE_VOICE_DOMAIN_PREF, "Voice domain preference and UE's usage setting" }, + { DE_PTMSI_TYPE, "P-TMSI type" }, + { DE_LAI_2, "Location Area Identification 2" }, / Session Management Information Elements 10.5.6 / - { 0x00, "Access Point Name" }, - { 0x00, "Network Service Access Point Identifier" }, - { 0x00, "Protocol Configuration Options" }, - { 0x00, "Packet Data Protocol Address" }, - { 0x00, "Quality Of Service" }, - { 0x00, "SM Cause" }, - { 0x00, "SM Cause 2" }, - { 0x00, "Linked TI" }, - { 0x00, "LLC Service Access Point Identifier" }, - { 0x00, "Tear Down Indicator" }, - { 0x00, "Packet Flow Identifier" }, - { 0x00, "Traffic Flow Template" }, - { 0x00, "Temporary Mobile Group Identity (TMGI)" }, - { 0x00, "MBMS bearer capabilities" }, - { 0x00, "MBMS protocol configuration options" }, - { 0x00, "Enhanced network service access point identifier" }, - { 0x00, "Request type" }, - { 0x00, "Notification indicator" }, - { 0x00, "Connectivity type" }, + { DE_ACC_POINT_NAME, "Access Point Name" }, + { DE_NET_SAPI, "Network Service Access Point Identifier" }, + { DE_PRO_CONF_OPT, "Protocol Configuration Options" }, + { DE_PD_PRO_ADDR, "Packet Data Protocol Address" }, + { DE_QOS, "Quality Of Service" }, + { DE_SM_CAUSE, "SM Cause" }, + { DE_SM_CAUSE_2, "SM Cause 2" }, + { DE_LINKED_TI, "Linked TI" }, + { DE_LLC_SAPI, "LLC Service Access Point Identifier" }, + { DE_TEAR_DOWN_IND, "Tear Down Indicator" }, + { DE_PACKET_FLOW_ID, "Packet Flow Identifier" }, + { DE_TRAFFIC_FLOW_TEMPLATE, "Traffic Flow Template" }, + { DE_TMGI, "Temporary Mobile Group Identity (TMGI)" }, + { DE_MBMS_BEARER_CAP, "MBMS bearer capabilities" }, + { DE_MBMS_PROT_CONF_OPT, "MBMS protocol configuration options" }, + { DE_ENH_NSAPI, "Enhanced network service access point identifier" }, + { DE_REQ_TYPE, "Request type" }, + { DE_SM_NOTIF_IND, "Notification indicator" }, + { DE_SM_CONNECTIVITY_TYPE, "Connectivity type" }, / GPRS Common Information Elements 10.5.7 */ - { 0x00, "PDP Context Status" }, - { 0x00, "Radio Priority" }, - { 0x00, "GPRS Timer" }, - { 0x00, "GPRS Timer 2" }, - { 0x00, "GPRS Timer 3" }, - { 0x00, "Radio Priority 2"}, - { 0x00, "MBMS context status"}, - { 0x00, "Uplink data status"}, - { 0x00, "Device properties"}, + { DE_PDP_CONTEXT_STAT, "PDP Context Status" }, + { DE_RAD_PRIO, "Radio Priority" }, + { DE_GPRS_TIMER, "GPRS Timer" }, + { DE_GPRS_TIMER_2, "GPRS Timer 2" }, + { DE_GPRS_TIMER_3, "GPRS Timer 3" }, + { DE_RAD_PRIO_2, "Radio Priority 2"}, + { DE_MBMS_CTX_STATUS, "MBMS context status"}, + { DE_UPLINK_DATA_STATUS, "Uplink data status"}, + { DE_DEVICE_PROPERTIES, "Device properties"}, { 0x00, "Spare Nibble"}, { 0, NULL } };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_rp.c ^
@@ -57,13 +57,25 @@ { 0, NULL } }; +typedef enum +{ + /* Short Message Service Information Elements [5] 8.2 / + DE_RP_MESSAGE_REF, / RP-Message Reference / + DE_RP_ORIG_ADDR, / RP-Originator Address / + DE_RP_DEST_ADDR, / RP-Destination Address / + DE_RP_USER_DATA, / RP-User Data / + DE_RP_CAUSE, / RP-Cause / + DE_RP_NONE / NONE / +} +rp_elem_idx_t; + const value_string gsm_rp_elem_strings[] = { / Short Message Service RP Information Elements [5] 8.2 / - { 0x00, "RP-Message Reference" }, - { 0x00, "RP-Origination Address" }, - { 0x00, "RP-Destination Address" }, - { 0x00, "RP-User Data" }, - { 0x00, "RP-Cause" }, + { DE_RP_MESSAGE_REF, "RP-Message Reference" }, + { DE_RP_ORIG_ADDR, "RP-Originator Address" }, + { DE_RP_DEST_ADDR, "RP-Destination Address" }, + { DE_RP_USER_DATA, "RP-User Data" }, + { DE_RP_CAUSE, "RP-Cause" }, { 0, NULL } }; @@ -82,17 +94,6 @@ static proto_tree g_tree; -typedef enum -{ - /* Short Message Service Information Elements [5] 8.2 / - DE_RP_MESSAGE_REF, / RP-Message Reference / - DE_RP_ORIG_ADDR, / RP-Origination Address / - DE_RP_DEST_ADDR, / RP-Destination Address / - DE_RP_USER_DATA, / RP-User Data / - DE_RP_CAUSE, / RP-Cause / - DE_RP_NONE / NONE */ -} -rp_elem_idx_t; #define NUM_GSM_RP_ELEM (sizeof(gsm_rp_elem_strings)/sizeof(value_string)) gint ett_gsm_rp_elem[NUM_GSM_RP_ELEM];
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_a_rr.c ^
@@ -176,92 +176,92 @@ const value_string gsm_rr_elem_strings[] = { /* Radio Resource Management Information Elements 10.5.2, most are from 10.5.1 / - { 0x00, "BA Range" }, / [3] 10.5.2.1a BA Range / - { 0x00, "Cell Channel Description" }, / [3] 10.5.2.1b / - { 0x00, "BA List Pref" }, / [3] 10.5.2.1c BA List Pref / - { 0x00, "UTRAN Frequency List" }, / [3] 10.5.2.1d UTRAN Frequency List / - { 0x00, "Cell Selection Indicator after Release of all TCH and SDCCH" }, / [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE / - { 0x00, "Cell Description" }, / 10.5.2.2 / - { 0x00, "Cell Options (BCCH)" }, / [3] 10.5.2.3 Cell Options (BCCH) / - { 0x00, "Cell Options (SACCH)" }, / [3] 10.5.2.3a Cell Options (SACCH) / - { 0x00, "Cell Selection Parameters" }, / [3] 10.5.2.4 Cell Selection Parameters / + { DE_RR_BA_RANGE, "BA Range" }, / [3] 10.5.2.1a BA Range / + { DE_RR_CELL_CH_DSC, "Cell Channel Description" }, / [3] 10.5.2.1b / + { DE_RR_BA_LIST_PREF, "BA List Pref" }, / [3] 10.5.2.1c BA List Pref / + { DE_RR_UTRAN_FREQ_LIST, "UTRAN Frequency List" }, / [3] 10.5.2.1d UTRAN Frequency List / + { DE_RR_CELL_SELECT_INDIC, "Cell Selection Indicator after Release of all TCH and SDCCH" }, / [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE / + { DE_RR_CELL_DSC, "Cell Description" }, / 10.5.2.2 / + { DE_RR_CELL_OPT_BCCH, "Cell Options (BCCH)" }, / [3] 10.5.2.3 Cell Options (BCCH) / + { DE_RR_CELL_OPT_SACCH, "Cell Options (SACCH)" }, / [3] 10.5.2.3a Cell Options (SACCH) / + { DE_RR_CELL_SEL_PARAM, "Cell Selection Parameters" }, / [3] 10.5.2.4 Cell Selection Parameters / / [3] 10.5.2.4a (void) / - { 0x00, "Channel Description" }, / 10.5.2.5 / - { 0x00, "Channel Description 2" }, / 10.5.2.5a / - { 0x00, "Channel Description 3" }, / 10.5.2.5c / - { 0x00, "Channel Mode" }, / [3] 10.5.2.6 / - { 0x00, "Channel Mode 2" }, / [3] 10.5.2.7 / - { 0x00, "UTRAN Classmark" }, / [3] 10.5.2.7a / + { DE_RR_CH_DSC, "Channel Description" }, / 10.5.2.5 / + { DE_RR_CH_DSC2, "Channel Description 2" }, / 10.5.2.5a / + { DE_RR_CH_DSC3, "Channel Description 3" }, / 10.5.2.5c / + { DE_RR_CH_MODE, "Channel Mode" }, / [3] 10.5.2.6 / + { DE_RR_CH_MODE2, "Channel Mode 2" }, / [3] 10.5.2.7 / + { DE_RR_UTRAN_CM, "UTRAN Classmark" }, / [3] 10.5.2.7a / / [3] 10.5.2.7b (void) / - { 0x00, "Classmark Enquiry Mask" }, / [3] 10.5.2.7c / + { DE_RR_CM_ENQ_MASK, "Classmark Enquiry Mask" }, / [3] 10.5.2.7c / / [3] 10.5.2.7d GERAN Iu Mode Classmark information element / - { 0x00, "Channel Needed"}, / [3] 10.5.2.8 / + { DE_RR_CHNL_NEEDED, "Channel Needed"}, / [3] 10.5.2.8 / / [3] 10.5.2.8a (void) / / [3] 10.5.2.8b Channel Request Description 2 / / Pos 20 / - { 0x00, "Cipher Mode Setting" }, / [3] 10.5.2.9 / - { 0x00, "Cipher Mode Response" }, / [3] 10.5.2.10 / - { 0x00, "Control Channel Description" }, / [3] 10.5.2.11 Control Channel Description / + { DE_RR_CIP_MODE_SET, "Cipher Mode Setting" }, / [3] 10.5.2.9 / + { DE_RR_CIP_MODE_RESP, "Cipher Mode Response" }, / [3] 10.5.2.10 / + { DE_RR_CTRL_CH_DESC, "Control Channel Description" }, / [3] 10.5.2.11 Control Channel Description / / [3] 10.5.2.11a DTM Information Details / - { 0x00, "Dynamic ARFCN Mapping" }, / [3] 10.5.2.11b / - { 0x00, "Frequency Channel Sequence" }, / [3] 10.5.2.12 / - { 0x00, "Frequency List" }, / 10.5.2.13 / - { 0x00, "Frequency Short List" }, / 10.5.2.14 / - { 0x00, "Frequency Short List2" }, / 10.5.2.14a / + { DE_RR_DYN_ARFCN_MAP, "Dynamic ARFCN Mapping" }, / [3] 10.5.2.11b / + { DE_RR_FREQ_CH_SEQ, "Frequency Channel Sequence" }, / [3] 10.5.2.12 / + { DE_RR_FREQ_LIST, "Frequency List" }, / 10.5.2.13 / + { DE_RR_FREQ_SHORT_LIST, "Frequency Short List" }, / 10.5.2.14 / + { DE_RR_FREQ_SHORT_LIST2, "Frequency Short List 2" }, / 10.5.2.14a / / [3] 10.5.2.14b Group Channel Description / - { 0x00, "GPRS Resumption" }, / [3] 10.5.2.14c GPRS Resumption / - { 0x00, "GPRS Broadcast Information" }, / [3] 10.5.2.14d GPRS broadcast information / + { DE_RR_GPRS_RESUMPTION, "GPRS Resumption" }, / [3] 10.5.2.14c GPRS Resumption / + { DE_RR_GPRS_BROADCAST_INFORMATION, "GPRS Broadcast Information" }, / [3] 10.5.2.14d GPRS broadcast information / / [3] 10.5.2.14e Enhanced DTM CS Release Indication / - { 0x00, "Handover Reference" }, / 10.5.2.15 / - { 0x00, "IA Rest Octets" }, / [3] 10.5.2.16 / - { 0x00, "IAR Rest Octets" }, / [3] 10.5.2.17 IAR Rest Octets / - { 0x00, "IAX Rest Octets" }, / [3] 10.5.2.18 IAX Rest Octets / - { 0x00, "L2 Pseudo Length" }, / [3] 10.5.2.19 / - { 0x00, "Measurement Results" }, / [3] 10.5.2.20 Measurement Results / + { DE_RR_HO_REF, "Handover Reference" }, / 10.5.2.15 / + { DE_RR_IA_REST_OCT, "IA Rest Octets" }, / [3] 10.5.2.16 / + { DE_RR_IAR_REST_OCT, "IAR Rest Octets" }, / [3] 10.5.2.17 IAR Rest Octets / + { DE_RR_IAX_REST_OCT, "IAX Rest Octets" }, / [3] 10.5.2.18 IAX Rest Octets / + { DE_RR_L2_PSEUDO_LEN, "L2 Pseudo Length" }, / [3] 10.5.2.19 / + { DE_RR_MEAS_RES, "Measurement Results" }, / [3] 10.5.2.20 Measurement Results / / * [3] 10.5.2.20a GPRS Measurement Results / - { 0x00, "Mobile Allocation" }, / [3] 10.5.2.21 / - { 0x00, "Mobile Time Difference" }, / [3] 10.5.2.21a / - { 0x00, "MultiRate configuration" }, / [3] 10.5.2.21aa / + { DE_RR_MOB_ALL, "Mobile Allocation" }, / [3] 10.5.2.21 / + { DE_RR_MOB_TIME_DIFF, "Mobile Time Difference" }, / [3] 10.5.2.21a / + { DE_RR_MULTIRATE_CONF, "MultiRate configuration" }, / [3] 10.5.2.21aa / / Pos 30 / - { 0x00, "Multislot Allocation" }, / [3] 10.5.2.21b / + { DE_RR_MULT_ALL, "Multislot Allocation" }, / [3] 10.5.2.21b / / * [3] 10.5.2.21c NC mode / - { 0x00, "Neighbour Cell Description" }, / [3] 10.5.2.22 Neighbour Cell Description / - { 0x00, "Neighbour Cell Description 2" }, / [3] 10.5.2.22a Neighbour Cell Description 2 / + { DE_RR_NEIGH_CELL_DESC, "Neighbour Cell Description" }, / [3] 10.5.2.22 Neighbour Cell Description / + { DE_RR_NEIGH_CELL_DESC2, "Neighbour Cell Description 2" }, / [3] 10.5.2.22a Neighbour Cell Description 2 / / * [3] 10.5.2.22b (void) * [3] 10.5.2.22c NT/N Rest Octets / - { 0x00, "P1 Rest Octets" }, / [3] 10.5.2.23 P1 Rest Octets / - { 0x00, "P2 Rest Octets" }, / [3] 10.5.2.24 P2 Rest Octets / - { 0x00, "P3 Rest Octets" }, / [3] 10.5.2.25 P3 Rest Octets / - { 0x00, "Packet Channel Description" }, / [3] 10.5.2.25a / - { 0x00, "Dedicated mode or TBF" }, / [3] 10.5.2.25b / - { 0x00, "Packet Uplink Assignment" }, / [3] 10.5.2.25c RR Packet Uplink Assignment / - { 0x00, "Packet Uplink Assignment" }, / [3] 10.5.2.25d RR Packet Downlink Assignment / - { 0x00, "Packet Downlink Assignment Type 2" }, / [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 / - { 0x00, "Page Mode" }, / [3] 10.5.2.26 / - { 0x00, "NCC Permitted" }, / [3] 10.5.2.27 NCC Permitted / - { 0x00, "Power Command" }, / 10.5.2.28 / - { 0x00, "Power Command and access type" }, / 10.5.2.28a / - { 0x00, "RACH Control Parameters" }, / [3] 10.5.2.29 RACH Control Parameters / - { 0x00, "Request Reference" }, / [3] 10.5.2.30 Request Reference / - { 0x00, "RR Cause" }, / 10.5.2.31 / - { 0x00, "Synchronization Indication" }, / 10.5.2.39 / - { 0x00, "SI 1 Rest Octets" }, / [3] 10.5.2.32 / + { DE_RR_P1_REST_OCT, "P1 Rest Octets" }, / [3] 10.5.2.23 P1 Rest Octets / + { DE_RR_P2_REST_OCT, "P2 Rest Octets" }, / [3] 10.5.2.24 P2 Rest Octets / + { DE_RR_P3_REST_OCT, "P3 Rest Octets" }, / [3] 10.5.2.25 P3 Rest Octets / + { DE_RR_PACKET_CH_DESC, "Packet Channel Description" }, / [3] 10.5.2.25a / + { DE_RR_DED_MOD_OR_TBF, "Dedicated mode or TBF" }, / [3] 10.5.2.25b / + { DE_RR_PKT_UL_ASS, "Packet Uplink Assignment" }, / [3] 10.5.2.25c RR Packet Uplink Assignment / + { DE_RR_PKT_DL_ASS, "Packet Downlink Assignment" }, / [3] 10.5.2.25d RR Packet Downlink Assignment / + { DE_RR_PKT_DL_ASS_TYPE2, "Packet Downlink Assignment Type 2" }, / [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 / + { DE_RR_PAGE_MODE, "Page Mode" }, / [3] 10.5.2.26 / + { DE_RR_NCC_PERM, "NCC Permitted" }, / [3] 10.5.2.27 NCC Permitted / + { DE_RR_POW_CMD, "Power Command" }, / 10.5.2.28 / + { DE_RR_POW_CMD_AND_ACC_TYPE, "Power Command and access type" }, / 10.5.2.28a / + { DE_RR_RACH_CTRL_PARAM, "RACH Control Parameters" }, / [3] 10.5.2.29 RACH Control Parameters / + { DE_RR_REQ_REF, "Request Reference" }, / [3] 10.5.2.30 Request Reference / + { DE_RR_CAUSE, "RR Cause" }, / 10.5.2.31 / + { DE_RR_SYNC_IND, "Synchronization Indication" }, / 10.5.2.39 / + { DE_RR_SI1_REST_OCT, "SI 1 Rest Octets" }, / [3] 10.5.2.32 / / [3] 10.5.2.33 SI 2bis Rest Octets / - { 0x00, "SI 2ter Rest Octets" }, / [3] 10.5.2.33a / - { 0x00, "SI 2quater Rest Octets" }, / [3] 10.5.2.33b / - { 0x00, "SI 3 Rest Octets" }, / [3] 10.5.2.34 / - { 0x00, "SI 4 Rest Octets" }, / [3] 10.5.2.35 / - { 0x00, "SI 6 Rest Octets" }, / [3] 10.5.2.35a / + { DE_RR_SI2TER_REST_OCT, "SI 2ter Rest Octets" }, / [3] 10.5.2.33a / + { DE_RR_SI2QUATER_REST_OCT, "SI 2quater Rest Octets" }, / [3] 10.5.2.33b / + { DE_RR_SI3_REST_OCT, "SI 3 Rest Octets" }, / [3] 10.5.2.34 / + { DE_RR_SI4_REST_OCT, "SI 4 Rest Octets" }, / [3] 10.5.2.35 / + { DE_RR_SI6_REST_OCT, "SI 6 Rest Octets" }, / [3] 10.5.2.35a / / [3] 10.5.2.36 SI 7 Rest Octets * [3] 10.5.2.37 SI 8 Rest Octets * [3] 10.5.2.37a SI 9 Rest Octets / - { 0x00, "SI 13 Rest Octets" }, / [3] 10.5.2.37b / + { DE_RR_SI13_REST_OCT, "SI 13 Rest Octets" }, / [3] 10.5.2.37b / / [3] 10.5.2.37c (void) * [3] 10.5.2.37d (void) * [3] 10.5.2.37e SI 16 Rest Octets @@ -269,31 +269,31 @@ * [3] 10.5.2.37g SI 19 Rest Octets * [3] 10.5.2.37h SI 18 Rest Octets * [3] 10.5.2.37i SI 20 Rest Octets / - { 0x00, "Starting Time" }, / [3] 10.5.2.38 Starting Time / - { 0x00, "Timing Advance" }, / [3] 10.5.2.40 Timing Advance / - { 0x00, "Time Difference" }, / [3] 10.5.2.41 Time Difference / - { 0x00, "TLLI" }, / [3] 10.5.2.41a TLLI / - { 0x00, "TMSI/P-TMSI" }, / [3] 10.5.2.42 TMSI/P-TMSI / - { 0x00, "VGCS target mode Indication" }, / [3] 10.5.2.42a / + { DE_RR_STARTING_TIME, "Starting Time" }, / [3] 10.5.2.38 Starting Time / + { DE_RR_TIMING_ADV, "Timing Advance" }, / [3] 10.5.2.40 Timing Advance / + { DE_RR_TIME_DIFF, "Time Difference" }, / [3] 10.5.2.41 Time Difference / + { DE_RR_TLLI, "TLLI" }, / [3] 10.5.2.41a TLLI / + { DE_RR_TMSI_PTMSI, "TMSI/P-TMSI" }, / [3] 10.5.2.42 TMSI/P-TMSI / + { DE_RR_VGCS_TAR_MODE_IND, "VGCS target mode Indication" }, / [3] 10.5.2.42a / / Pos 40 / - { 0x00, "VGCS Ciphering Parameters" }, / [3] 10.5.2.42b / - { 0x00, "Wait Indication" }, / [3] 10.5.2.43 Wait Indication / + { DE_RR_VGCS_CIP_PAR, "VGCS Ciphering Parameters" }, / [3] 10.5.2.42b / + { DE_RR_WAIT_IND, "Wait Indication" }, / [3] 10.5.2.43 Wait Indication / / [3] 10.5.2.44 SI10 rest octets $(ASCI)$ / - { 0x00, "Extended Measurement Results" }, / [3] 10.5.2.45 Extended Measurement Results / - { 0x00, "Extended Measurement Frequency List" }, / [3] 10.5.2.46 Extended Measurement Frequency List / - { 0x00, "Suspension Cause" }, / [3] 10.5.2.47 / - { 0x00, "APDU ID" }, / [3] 10.5.2.48 APDU ID / - { 0x00, "APDU Flags" }, / [3] 10.5.2.49 APDU Flags / - { 0x00, "APDU Data" }, / [3] 10.5.2.50 APDU Data / - { 0x00, "Handover to UTRAN Command" }, / [3] 10.5.2.51 Handover To UTRAN Command / + { DE_RR_EXT_MEAS_RESULT, "Extended Measurement Results" }, / [3] 10.5.2.45 Extended Measurement Results / + { DE_RR_EXT_MEAS_FREQ_LIST, "Extended Measurement Frequency List" },/ [3] 10.5.2.46 Extended Measurement Frequency List / + { DE_RR_SUS_CAU, "Suspension Cause" }, / [3] 10.5.2.47 / + { DE_RR_APDU_ID, "APDU ID" }, / [3] 10.5.2.48 APDU ID / + { DE_RR_APDU_FLAGS, "APDU Flags" }, / [3] 10.5.2.49 APDU Flags / + { DE_RR_APDU_DATA, "APDU Data" }, / [3] 10.5.2.50 APDU Data / + { DE_RR_HO_TO_UTRAN_CMD, "Handover to UTRAN Command" }, / [3] 10.5.2.51 Handover To UTRAN Command / / [3] 10.5.2.52 Handover To cdma2000 Command * [3] 10.5.2.53 (void) * [3] 10.5.2.54 (void) * [3] 10.5.2.55 (void) * [3] 10.5.2.56 3G Target Cell / - { 0x00, "Service Support" }, / [3] 10.5.2.57 / + { DE_RR_SERV_SUP, "Service Support" }, / [3] 10.5.2.57 / / 10.5.2.58 MBMS p-t-m Channel Description / - { 0x00, "Dedicated Service Information" }, / [3] 10.5.2.59 / + { DE_RR_DED_SERV_INF, "Dedicated Service Information" }, / [3] 10.5.2.59 / / * 10.5.2.60 MPRACH Description * 10.5.2.61 Restriction Timer @@ -305,7 +305,7 @@ * 10.5.2.67 PS Cause * 10.5.2.68 VGCS AMR Configuration / - { 0x00, "Carrier Indication" }, / 10.5.2.69 Carrier Indication / + { DE_RR_CARRIER_IND, "Carrier Indication" }, / 10.5.2.69 Carrier Indication */ { 0, NULL } };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_bsslap.c ^
@@ -89,38 +89,37 @@ #define BSSLAP_PARAM_STARTING_TIME 0x2D const value_string gsm_bsslap_elem_strings[] = { - { 0x00, "Reserved" }, - { BSSLAP_PARAM_TIMING_ADVANCE, "Timing Advance" }, - { BSSLAP_PARAM_RESERVED_01, "Reserved" }, /* (note) / - { BSSLAP_PARAM_CELL_IDENTITY, "Cell Identity" }, - { BSSLAP_PARAM_RESERVED_02, "Reserved" }, / (note) / - { BSSLAP_PARAM_RESERVED_03, "Reserved" }, / (note) / - { BSSLAP_PARAM_RESERVED_04, "Reserved" }, / (note) / - { BSSLAP_PARAM_CHANNEL_DESCRIPTION, "Channel Description" }, - { BSSLAP_PARAM_RESERVED_05, "Reserved" }, / (note) / - { BSSLAP_PARAM_RESERVED_06, "Reserved" }, / (note) / - { BSSLAP_PARAM_RESERVED_07, "Reserved" }, / (note) / - { BSSLAP_PARAM_MEASUREMENT_REPORT, "Measurement Report" }, - { BSSLAP_PARAM_RESERVED_08, "Reserved" }, / (note) / - { BSSLAP_PARAM_CAUSE, "Cause" }, - { BSSLAP_PARAM_RRLP_FLAG, "RRLP Flag" }, - { BSSLAP_PARAM_RRLP_IE, "RRLP IE" }, - { BSSLAP_PARAM_CELL_IDENTITY_LIST, "Cell Identity List" }, - { BSSLAP_PARAM_ENHANCED_MEASUREMENT_REPORT, "Enhanced Measurement Report" }, - { BSSLAP_PARAM_LOCATION_AREA_CODE, "Location Area Code" }, - { BSSLAP_PARAM_FREQUENCY_LIST, "Frequency List" }, - { BSSLAP_PARAM_MS_POWER, "MS Power" }, - { BSSLAP_PARAM_DELTA_TIMER, "Delta Timer" }, - { BSSLAP_PARAM_SERVING_CELL_IDENTIFIER, "Serving Cell Identifier" }, - { BSSLAP_PARAM_ENCRYPTION_KEY, "Encryption Key (Kc)" }, - { BSSLAP_PARAM_CIPHER_MODE_SETTING, "Cipher Mode Setting" }, - { BSSLAP_PARAM_CHANNEL_MODE, "Channel Mode" }, - { BSSLAP_PARAM_MULTIRATE_CONFIGURATION, "MultiRate Configuration" }, - { BSSLAP_PARAM_POLLING_REPETITION, "Polling Repetition" }, - { BSSLAP_PARAM_PACKET_CHANNEL_DESCRIPTION, "Packet Channel Description" }, - { BSSLAP_PARAM_TLLI, "TLLI" }, - { BSSLAP_PARAM_TFI, "TFI" }, - { BSSLAP_PARAM_STARTING_TIME, "Starting Time" }, + { DE_BLAP_RES1, "Reserved" }, + { DE_BLAP_TA, "Timing Advance" }, + { DE_BLAP_RES3, "Reserved" }, / (note) / + { DE_BLAP_RES4, "Cell Identity" }, + { DE_BLAP_RES5, "Reserved" }, / (note) / + { DE_BLAP_RES6, "Reserved" }, / (note) / + { DE_BLAP_RES7, "Reserved" }, / (note) / + { DE_BLAP_CH_DESC, "Channel Description" }, + { DE_BLAP_RES9, "Reserved" }, / (note) / + { DE_BLAP_RES10, "Reserved" }, / (note) / + { DE_BLAP_RES11, "Reserved" }, / (note) / + { DE_BLAP_MEAS_REP, "Measurement Report" }, + { DE_BLAP_RES13, "Reserved" }, / (note) */ + { DE_BLAP_CAUSE, "Cause" }, + { DE_BLAP_RRLP_FLG, "RRLP Flag" }, + { DE_BLAP_RRLP_IE, "RRLP IE" }, + { DE_BLAP_CELL_ID_LIST, "Cell Identity List" }, + { DE_BLAP_ENH_MEAS_REP, "Enhanced Measurement Report" }, + { DE_BLAP_LAC, "Location Area Code" }, + { DE_BLAP_FREQ_LIST, "Frequency List" }, + { DE_BLAP_MS_POW, "MS Power" }, + { DE_BLAP_DELTA_TIME, "Delta Timer" }, + { DE_BLAP_SERV_CELL_ID, "Serving Cell Identifier" }, + { DE_BLAP_ENC_KEY, "Encryption Key (Kc)" }, + { DE_BLAP_CIP_M_SET, "Cipher Mode Setting" }, + { DE_BLAP_CH_MODE, "Channel Mode" }, + { DE_BLAP_POLL_REP, "Polling Repetition" }, + { DE_BLAP_PKT_CH_DESC, "Packet Channel Description" }, + { DE_BLAP_TLLI, "TLLI" }, + { DE_BLAP_TFI, "TFI" }, + { DE_BLAP_START_TIME, "Starting Time" }, { 0, NULL }, };
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-gsm_bssmap_le.c ^
@@ -103,36 +103,36 @@ #define BSSMAP_LE_IMEI 128 const value_string gsm_bssmap_le_elem_strings[] = { - { BSSMAP_LE_LCS_QOS, "LCS QoS" }, - { BSSMAP_LE_LCS_PRIORITY, "LCS Priority" }, - { BSSMAP_LE_LOCATION_TYPE, "Location Type" }, - { BSSMAP_LE_GANSS_LOCATION_TYPE, "GANSS Location Type" }, - { BSSMAP_LE_GEOGRAPHIC_LOCATION, "Geographic Location" }, - { BSSMAP_LE_POSITIONING_DATA, "Positioning Data" }, - { BSSMAP_LE_GANSS_POSITIONING_DATA, "GANSS Positioning Data" }, - { BSSMAP_LE_VELOCITY_DATA, "Velocity Data" }, - { BSSMAP_LE_LCS_CAUSE, "LCS Cause" }, - { BSSMAP_LE_LCS_CLIENT_TYPE, "LCS Client Type" }, - { BSSMAP_LE_APDU, "APDU" }, - { BSSMAP_LE_NETWORK_ELEMENT_IDENTITY, "Network Element Identity" }, - { BSSMAP_LE_REQUESTED_GPS_ASSISTANCE_DATA, "Requested GPS Assistance Data" }, - { BSSMAP_LE_REQUESTED_GANSS_ASSISTANCE_DATA, "Requested GANSS Assistance Data" }, - { BSSMAP_LE_DECIPHERING_KEYS, "Deciphering Keys" }, - { BSSMAP_LE_RETURN_ERROR_REQUEST, "Return Error Request" }, - { BSSMAP_LE_RETURN_ERROR_CAUSE, "Return Error Cause" }, - { BSSMAP_LE_SEGMENTATION, "Segmentation" }, - { BSSMAP_LE_CLASSMARK_INFORMATION_TYPE_3, "Classmark Information Type 3" }, - { BSSMAP_LE_CAUSE, "Cause" }, - { BSSMAP_LE_CELL_IDENTIFIER, "Cell Identifier" }, - { BSSMAP_LE_CHOSEN_CHANNEL, "Chosen Channel" }, - { BSSMAP_LE_IMSI, "IMSI" }, - { BSSMAP_LE_RESERVED_NOTE1, "Reserved" }, - { BSSMAP_LE_RESERVED_NOTE2, "Reserved" }, - { BSSMAP_LE_RESERVED_NOTE3, "Reserved" }, - { BSSMAP_LE_LCS_CAPABILITY, "LCS Capability" }, - { BSSMAP_LE_PACKET_MEASUREMENT_REPORT, "Packet Measurement Report" }, - { BSSMAP_LE_CELL_IDENTITY_LIST, "Cell Identity List" }, - { BSSMAP_LE_IMEI, "IMEI" }, + { DE_BMAPLE_LCSQOS, "LCS QoS" }, + { DE_BMAPLE_LCS_PRIO, "LCS Priority" }, + { DE_BMAPLE_LOC_TYPE, "Location Type" }, + { DE_BMAPLE_GANSS_LOC_TYPE, "GANSS Location Type" }, + { DE_BMAPLE_GEO_LOC, "Geographic Location" }, + { DE_BMAPLE_POS_DATA, "Positioning Data" }, + { DE_BMAPLE_GANSS_POS_DATA, "GANSS Positioning Data" }, + { DE_BMAPLE_VELOC_DATA, "Velocity Data" }, + { DE_BMAPLE_LCS_CAUSE, "LCS Cause" }, + { DE_BMAPLE_LCS_CLIENT_TYPE, "LCS Client Type" }, + { DE_BMAPLE_APDU, "APDU" }, + { DE_BMAPLE_NETWORK_ELEM_ID, "Network Element Identity" }, + { DE_BMAPLE_REQ_GPS_ASSIST_D, "Requested GPS Assistance Data" }, + { DE_BMAPLE_REQ_GNSS_ASSIST_D, "Requested GANSS Assistance Data" }, + { DE_BMAPLE_DECIPH_KEYS, "Deciphering Keys" }, + { DE_BMAPLE_RETURN_ERROR_REQ, "Return Error Request" }, + { DE_BMAPLE_RETURN_ERROR_CAUSE, "Return Error Cause" }, + { DE_BMAPLE_SEGMENTATION, "Segmentation" }, + { DE_BMAPLE_CLASSMARK_TYPE_3, "Classmark Information Type 3" }, + { DE_BMAPLE_CAUSE, "Cause" }, + { DE_BMAPLE_CELL_IDENTIFIER, "Cell Identifier" }, + { DE_BMAPLE_CHOSEN_CHANNEL, "Chosen Channel" }, + { DE_BMAPLE_IMSI, "IMSI" }, + { DE_BMAPLE_RES1, "Reserved" }, + { DE_BMAPLE_RES2, "Reserved" }, + { DE_BMAPLE_RES3, "Reserved" }, + { DE_BMAPLE_LCS_CAPABILITY, "LCS Capability" }, + { DE_BMAPLE_PACKET_MEAS_REP, "Packet Measurement Report" }, + { DE_BMAPLE_MEAS_CELL_ID, "Cell Identity List" }, + { DE_BMAPLE_IMEI, "IMEI" }, { 0, NULL } }; @@ -759,37 +759,37 @@ curr_len = len; /* Location Type 9.1.1 M 3-n / - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_LOC_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE, NULL) + ELEM_MAND_TLV(BSSMAP_LE_LOCATION_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE, NULL) / Cell Identifier 9.1.2 O 5-10 / - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BSSMAP_LE_CELL_IDENTIFIER, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); / Classmark Information Type 3 9.1.3 O 3-14 / - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CM_INFO_3].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); + ELEM_OPT_TLV(BSSMAP_LE_CLASSMARK_INFORMATION_TYPE_3, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); / LCS Client Type 9.1.4 C (note 3) 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CLIENT_TYPE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); / Chosen Channel 9.1.5 O 2 / - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BSSMAP_LE_CHOSEN_CHANNEL, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); / LCS Priority 9.1.6 O 3-n / - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); / LCS QoS 9.1.6a C (note 1) 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCSQOS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); / GPS Assistance Data 9.1.7 C (note 2) 3-n / - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GPS_ASSIST_DATA].value, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_REQUESTED_GPS_ASSISTANCE_DATA, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); / APDU 9.1.8 O 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_OPT_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); / LCS Capability 9.1.9 O / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CAPABILITY].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAPABILITY, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CAPABILITY, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAPABILITY, NULL); / Packet Measurement Report 9.1.10 O/ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_PACKET_MEAS_REP].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_PACKET_MEAS_REP, NULL); + ELEM_OPT_TLV(BSSMAP_LE_PACKET_MEASUREMENT_REPORT, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_PACKET_MEAS_REP, NULL); / Measured Cell Identity List 9.1.11 O/ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_MEAS_CELL_ID].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_MEAS_CELL_ID, NULL); + ELEM_OPT_TLV(BSSMAP_LE_CELL_IDENTITY_LIST, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_MEAS_CELL_ID, NULL); / IMSI 9.1.12 O (note 4) 5-10 / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_IMSI].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMSI, NULL); + ELEM_OPT_TLV(BSSMAP_LE_IMSI, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMSI, NULL); / IMEI 9.1.13 O (note 4) 10 (use same decode as IMSI) / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_IMEI].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMEI, NULL); + ELEM_OPT_TLV(BSSMAP_LE_IMEI, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMEI, NULL); / GANSS Location Type 9.1.14 C 3 / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_GANSS_LOC_TYPE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GANSS_LOCATION_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE, NULL); / GANSS Assistance Data 9.1.15 C (note 5) 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_REQ_GNSS_ASSIST_D].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GNSS_ASSIST_D, NULL); + ELEM_OPT_TLV(BSSMAP_LE_REQUESTED_GANSS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GNSS_ASSIST_D, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); @@ -809,17 +809,17 @@ curr_len = len; / Location Estimate 9.2.1 C (note 1) 3-n / - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LOC_EST].value, BSSAP_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GEOGRAPHIC_LOCATION, BSSAP_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); / Positioning Data 9.2.2 O 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_POS_DATA].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_POSITIONING_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA, NULL); / Deciphering Keys 9.2.3 C (note 2) 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_DECIPH_KEYS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); + ELEM_OPT_TLV(BSSMAP_LE_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); / LCS Cause 9.2.4 C (note 3) 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CAUSE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); / Velocity Estimate 9.2.5 O 3-n / - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VEL_EST].value, BSSAP_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); + ELEM_OPT_TLV(BSSMAP_LE_VELOCITY_DATA, BSSAP_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); / GANSS Positioning Data 9.2.6 O 3-n / - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_GANSS_POS_DATA].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_POS_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GANSS_POSITIONING_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_POS_DATA, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -838,9 +838,9 @@ curr_len = len; / APDU 9.8.1 M 3-n / - ELEM_MAND_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_MAND_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); / Segmentation 9.8.2 / - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SEG].value, BSSAP_PDU_TYPE_BSSMAP, BE_SEG, NULL); + ELEM_OPT_TLV(BSSMAP_LE_SEGMENTATION, BSSAP_PDU_TYPE_BSSMAP, BE_SEG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -875,9 +875,9 @@ curr_len = len; / Cell Identifier 9.12.1 M / - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BSSMAP_LE_CELL_IDENTIFIER, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); / APDU 9.1.8 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_OPT_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); }
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-ieee80211-prism.c ^
@@ -262,6 +262,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) { @@ -270,6 +288,7 @@ tvbuff_t next_tvb; int offset; guint32 msgcode, msglen, did; + guint byte_order; guint16 status; guint8 devname; @@ -290,12 +309,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; } @@ -310,16 +335,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 / @@ -331,7 +356,6 @@ col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname, msgcode, msglen); - while(offset < PRISM_HEADER_LENGTH) { / DID / @@ -339,23 +363,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; @@ -365,89 +389,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.8.15.tar.bz2/epan/dissectors/packet-ieee80211.c ^
@@ -7183,13 +7183,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 / @@ -7200,33 +7200,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) @@ -14530,11 +14527,11 @@ NULL, HFILL }}, {&hf_ieee80211_txbf, - {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", FT_UINT16, BASE_HEX, + {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", 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, + {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf", FT_UINT32, BASE_HEX, NULL, 0, "Vendor Specific Transmit Beam Forming (TxBF) Capabilities", HFILL }}, {&hf_ieee80211_txbf_cap,
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-ipv6.c ^
@@ -404,7 +404,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; @@ -1995,7 +1994,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.8.15.tar.bz2/epan/dissectors/packet-mac-lte.c ^
@@ -498,7 +498,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.8.15.tar.bz2/epan/dissectors/packet-nas_eps.c ^
@@ -313,19 +313,37 @@ }; static value_string_ext security_header_type_vals_ext = VALUE_STRING_EXT_INIT(security_header_type_vals); +typedef enum +{ + DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information / + DE_EPS_CMN_DEVICE_PROPERTIES, / 9.9.2.0A Device properties / + DE_EPS_CMN_EPS_BE_CTX_STATUS, / 9.9.2.1 EPS bearer context status / + DE_EPS_CMN_LOC_AREA_ID, / 9.9.2.2 Location area identification / + DE_EPS_CMN_MOB_ID, / 9.9.2.3 Mobile identity / + DE_EPS_MS_CM_2, / 9.9.2.4 Mobile station classmark 2 / + DE_EPS_MS_CM_3, / 9.9.2.5 Mobile station classmark 3 / + DE_EPS_NAS_SEC_PAR_FROM_EUTRA, / 9.9.2.6 NAS security parameters from E-UTRA / + DE_EPS_NAS_SEC_PAR_TO_EUTRA, / 9.9.2.7 NAS security parameters to E-UTRA / + + DE_EPS_CMN_PLM_LST, / 9.9.2.8 PLMN list / + DE_EPS_CMN_SUP_CODEC_LST, / 9.9.2.6 9.9.2.10 Supported codec list / + DE_EPS_COMMON_NONE / NONE / +} +nas_eps_common_elem_idx_t; + const value_string nas_eps_common_elem_strings[] = { - { 0x00, "Additional information" }, / 9.9.2.0 Additional information / - { 0x00, "Device properties" }, / 9.9.2.0A Device properties / - { 0x00, "EPS bearer context status" }, / 9.9.2.1 EPS bearer context status / - { 0x00, "Location area identification" }, / 9.9.2.2 Location area identification / - { 0x00, "Mobile identity" }, / 9.9.2.3 Mobile identity / - { 0x00, "Mobile station classmark 2" }, / 9.9.2.4 Mobile station classmark 2 / - { 0x00, "Mobile station classmark 3" }, / 9.9.2.5 Mobile station classmark 3 / - { 0x00, "NAS security parameters from E-UTRA" }, / 9.9.2.6 NAS security parameters from E-UTRA / - { 0x00, "NAS security parameters to E-UTRA" }, / 9.9.2.7 NAS security parameters to E-UTRA / - { 0x00, "PLMN list" }, / 9.9.2.8 PLMN list / - / 9.9.2.9 Spare half octet / - { 0x00, "Supported codec list" }, / 9.9.2.10 Supported codec list / + { DE_EPS_CMN_ADD_INFO, "Additional information" }, / 9.9.2.0 Additional information / + { DE_EPS_CMN_DEVICE_PROPERTIES, "Device properties" }, / 9.9.2.0A Device properties / + { DE_EPS_CMN_EPS_BE_CTX_STATUS, "EPS bearer context status" }, / 9.9.2.1 EPS bearer context status / + { DE_EPS_CMN_LOC_AREA_ID, "Location area identification" }, / 9.9.2.2 Location area identification / + { DE_EPS_CMN_MOB_ID, "Mobile identity" }, / 9.9.2.3 Mobile identity / + { DE_EPS_MS_CM_2, "Mobile station classmark 2" }, / 9.9.2.4 Mobile station classmark 2 / + { DE_EPS_MS_CM_3, "Mobile station classmark 3" }, / 9.9.2.5 Mobile station classmark 3 / + { DE_EPS_NAS_SEC_PAR_FROM_EUTRA, "NAS security parameters from E-UTRA" },/ 9.9.2.6 NAS security parameters from E-UTRA / + { DE_EPS_NAS_SEC_PAR_TO_EUTRA, "NAS security parameters to E-UTRA" }, / 9.9.2.7 NAS security parameters to E-UTRA / + { DE_EPS_CMN_PLM_LST, "PLMN list" }, / 9.9.2.8 PLMN list / + / 9.9.2.9 Spare half octet / + { DE_EPS_CMN_SUP_CODEC_LST, "Supported codec list" }, / 9.9.2.10 Supported codec list / { 0, NULL } }; @@ -368,24 +386,6 @@ #define NUM_NAS_EPS_COMMON_ELEM (sizeof(nas_eps_common_elem_strings)/sizeof(value_string)) gint ett_nas_eps_common_elem[NUM_NAS_EPS_COMMON_ELEM]; -typedef enum -{ - DE_EPS_CMN_ADD_INFO, / 9.9.2.0 Additional information / - DE_EPS_CMN_DEVICE_PROPERTIES, / 9.9.2.0A Device properties / - DE_EPS_CMN_EPS_BE_CTX_STATUS, / 9.9.2.1 EPS bearer context status / - DE_EPS_CMN_LOC_AREA_ID, / 9.9.2.2 Location area identification / - DE_EPS_CMN_MOB_ID, / 9.9.2.3 Mobile identity / - DE_EPS_MS_CM_2, / 9.9.2.4 Mobile station classmark 2 / - DE_EPS_MS_CM_3, / 9.9.2.5 Mobile station classmark 3 / - DE_EPS_NAS_SEC_PAR_FROM_EUTRA, / 9.9.2.6 NAS security parameters from E-UTRA / - DE_EPS_NAS_SEC_PAR_TO_EUTRA, / 9.9.2.7 NAS security parameters to E-UTRA / - - DE_EPS_CMN_PLM_LST, / 9.9.2.8 PLMN list / - DE_EPS_CMN_SUP_CODEC_LST, / 9.9.2.6 9.9.2.10 Supported codec list / - DE_EPS_COMMON_NONE / NONE / -} -nas_eps_common_elem_idx_t; - / * 9.9.2 Common information elements / @@ -570,58 +570,58 @@ const value_string nas_emm_elem_strings[] = { / 9.9.3 EPS Mobility Management (EMM) information elements / - { 0x00, "Additional update result" }, / 9.9.3.0A Additional update result / - { 0x00, "Additional update type" }, / 9.9.3.0B Additional update type / - { 0x00, "Authentication failure parameter" }, / 9.9.3.1 Authentication failure parameter / - { 0x00, "Authentication parameter AUTN" }, / 9.9.3.2 Authentication parameter AUTN / - { 0x00, "Authentication parameter RAND" }, / 9.9.3.3 Authentication parameter RAND / - { 0x00, "Authentication response parameter" }, / 9.9.3.4 Authentication response parameter / - { 0x00, "CSFB response" }, / 9.9.3.5 CSFB response / - { 0x00, "Daylight saving time" }, / 9.9.3.6 Daylight saving time / - { 0x00, "Detach type" }, / 9.9.3.7 Detach type / - { 0x00, "DRX parameter" }, / 9.9.3.8 DRX parameter / - { 0x00, "EMM cause" }, / 9.9.3.9 EMM cause / - { 0x00, "EPS attach result" }, / 9.9.3.10 EPS attach result / - { 0x00, "EPS attach type" }, / 9.9.3.11 EPS attach type / - { 0x00, "EPS mobile identity" }, / 9.9.3.12 EPS mobile identity / - { 0x00, "EPS network feature support" }, / 9.9.3.12 EPS mobile identity / - { 0x00, "EPS update result" }, / 9.9.3.13 EPS update result / - { 0x00, "EPS update type" }, / 9.9.3.14 EPS update type / - { 0x00, "ESM message container" }, / 9.9.3.15 ESM message conta / - { 0x00, "GPRS timer" }, / 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. / - { 0x00, "GPRS timer 2" }, / 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. / - { 0x00, "GPRS timer 3" }, / 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. / - { 0x00, "Identity type 2" }, / 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. / - { 0x00, "IMEISV request" }, / 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. / - { 0x00, "KSI and sequence number" }, / 9.9.3.19 KSI and sequence number / - { 0x00, "MS network capability" }, / 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. / - { 0x00, "MS network feature support" }, / 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. / - { 0x00, "NAS key set identifier" }, / 9.9.3.21 NAS key set identifier / - { 0x00, "NAS message container" }, / 9.9.3.22 NAS message container / - { 0x00, "NAS security algorithms" }, / 9.9.3.23 NAS security algorithms / - { 0x00, "Network name" }, / 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. / - { 0x00, "Nonce" }, / 9.9.3.25 Nonce / - { 0x00, "Paging identity" }, / 9.9.3.25A Paging identity / - { 0x00, "P-TMSI signature" }, / 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. / - { 0x00, "Service type" }, / 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. / - { 0x00, "Short MAC" }, / 9.9.3.28 Short MAC / - { 0x00, "Time zone" }, / 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. / - { 0x00, "Time zone and time" }, / 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. / - { 0x00, "TMSI status" }, / 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. / - { 0x00, "Tracking area identity" }, / 9.9.3.32 Tracking area identity / - { 0x00, "Tracking area identity list" }, / 9.9.3.33 Tracking area identity list / - { 0x00, "UE network capability" }, / 9.9.3.34 UE network capability / - { 0x00, "UE radio capability information update needed" }, / 9.9.3.35 UE radio capability information update needed / - { 0x00, "UE security capability" }, / 9.9.3.36 UE security capability / - { 0x00, "Emergency Number List" }, / 9.9.3.37 Emergency Number List / - { 0x00, "CLI" }, / 9.9.3.38 CLI / - { 0x00, "SS Code" }, / 9.9.3.39 SS Code / - { 0x00, "LCS indicator" }, / 9.9.3.40 LCS indicator / - { 0x00, "LCS client identity" }, / 9.9.3.41 LCS client identity / - { 0x00, "Generic message container type" }, / 9.9.3.42 Generic message container type / - { 0x00, "Generic message container" }, / 9.9.3.43 Generic message container / - { 0x00, "Voice domain preference and UEs usage setting" }, / 9.9.3.44 Voice domain preference and UEs usage setting / - { 0x00, "GUTI type" }, / 9.9.3.45 GUTI type / + { DE_EMM_ADD_UPD_RES, "Additional update result" }, / 9.9.3.0A Additional update result / + { DE_EMM_ADD_UPD_TYPE, "Additional update type" }, / 9.9.3.0B Additional update type / + { DE_EMM_AUTH_FAIL_PAR, "Authentication failure parameter" }, / 9.9.3.1 Authentication failure parameter / + { DE_EMM_AUTN, "Authentication parameter AUTN" }, / 9.9.3.2 Authentication parameter AUTN / + { DE_EMM_AUTH_PAR_RAND, "Authentication parameter RAND" }, / 9.9.3.3 Authentication parameter RAND / + { DE_EMM_AUTH_RESP_PAR, "Authentication response parameter" }, / 9.9.3.4 Authentication response parameter / + { DE_EMM_CSFB_RESP, "CSFB response" }, / 9.9.3.5 CSFB response / + { DE_EMM_DAYL_SAV_T, "Daylight saving time" }, / 9.9.3.6 Daylight saving time / + { DE_EMM_DET_TYPE, "Detach type" }, / 9.9.3.7 Detach type / + { DE_EMM_DRX_PAR, "DRX parameter" }, / 9.9.3.8 DRX parameter / + { DE_EMM_CAUSE, "EMM cause" }, / 9.9.3.9 EMM cause / + { DE_EMM_ATT_RES, "EPS attach result" }, / 9.9.3.10 EPS attach result / + { DE_EMM_ATT_TYPE, "EPS attach type" }, / 9.9.3.11 EPS attach type / + { DE_EMM_EPS_MID, "EPS mobile identity" }, / 9.9.3.12 EPS mobile identity / + { DE_EMM_EPS_NET_FEATURE_SUP, "EPS network feature support" }, / 9.9.3.12A EPS network feature support / + { DE_EMM_EPS_UPD_RES, "EPS update result" }, / 9.9.3.13 EPS update result / + { DE_EMM_EPS_UPD_TYPE, "EPS update type" }, / 9.9.3.14 EPS update type / + { DE_EMM_ESM_MSG_CONT, "ESM message container" }, / 9.9.3.15 ESM message conta / + { DE_EMM_GPRS_TIMER, "GPRS timer" }, / 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. / + { DE_EMM_GPRS_TIMER_2, "GPRS timer 2" }, / 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. / + { DE_EMM_GPRS_TIMER_3, "GPRS timer 3" }, / 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. / + { DE_EMM_ID_TYPE_2, "Identity type 2" }, / 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. / + { DE_EMM_IMEISV_REQ, "IMEISV request" }, / 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. / + { DE_EMM_KSI_AND_SEQ_NO, "KSI and sequence number" }, / 9.9.3.19 KSI and sequence number / + { DE_EMM_MS_NET_CAP, "MS network capability" }, / 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. / + { DE_EMM_MS_NET_FEAT_SUP, "MS network feature support" }, / 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. / + { DE_EMM_NAS_KEY_SET_ID, "NAS key set identifier" }, / 9.9.3.21 NAS key set identifier / + { DE_EMM_NAS_MSG_CONT, "NAS message container" }, / 9.9.3.22 NAS message container / + { DE_EMM_NAS_SEC_ALGS, "NAS security algorithms" }, / 9.9.3.23 NAS security algorithms / + { DE_EMM_NET_NAME, "Network name" }, / 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. / + { DE_EMM_NONCE, "Nonce" }, / 9.9.3.25 Nonce / + { DE_EMM_PAGING_ID, "Paging identity" }, / 9.9.3.25A Paging identity / + { DE_EMM_P_TMSI_SIGN, "P-TMSI signature" }, / 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. / + { DE_EMM_SERV_TYPE, "Service type" }, / 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. / + { DE_EMM_SHORT_MAC, "Short MAC" }, / 9.9.3.28 Short MAC / + { DE_EMM_TZ, "Time zone" }, / 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. / + { DE_EMM_TZ_AND_T, "Time zone and time" }, / 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. / + { DE_EMM_TMSI_STAT, "TMSI status" }, / 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. / + { DE_EMM_TRAC_AREA_ID, "Tracking area identity" }, / 9.9.3.32 Tracking area identity / + { DE_EMM_TRAC_AREA_ID_LST, "Tracking area identity list" }, / 9.9.3.33 Tracking area identity list / + { DE_EMM_UE_NET_CAP, "UE network capability" }, / 9.9.3.34 UE network capability / + { DE_EMM_UE_RA_CAP_INF_UPD_NEED, "UE radio capability information update needed" },/ 9.9.3.35 UE radio capability information update needed / + { DE_EMM_UE_SEC_CAP, "UE security capability" }, / 9.9.3.36 UE security capability / + { DE_EMM_EMERG_NUM_LST, "Emergency Number List" }, / 9.9.3.37 Emergency Number List / + { DE_EMM_CLI, "CLI" }, / 9.9.3.38 CLI / + { DE_EMM_SS_CODE, "SS Code" }, / 9.9.3.39 SS Code / + { DE_EMM_LCS_IND, "LCS indicator" }, / 9.9.3.40 LCS indicator / + { DE_EMM_LCS_CLIENT_ID, "LCS client identity" }, / 9.9.3.41 LCS client identity / + { DE_EMM_GEN_MSG_CONT_TYPE, "Generic message container type" }, / 9.9.3.42 Generic message container type / + { DE_EMM_GEN_MSG_CONT, "Generic message container" }, / 9.9.3.43 Generic message container / + { DE_EMM_VOICE_DMN_PREF, "Voice domain preference and UEs usage setting" },/ 9.9.3.44 Voice domain preference and UEs usage setting / + { DE_EMM_GUTI_TYPE, "GUTI type" }, / 9.9.3.45 GUTI type / { 0, NULL } }; #define NUM_NAS_EMM_ELEM (sizeof(nas_emm_elem_strings)/sizeof(value_string)) @@ -2642,33 +2642,6 @@ }; / 9.9.4 EPS Session Management (ESM) information elements / -const value_string nas_esm_elem_strings[] = { - { 0x00, "Access point name" }, / 9.9.4.1 Access point name / - { 0x00, "APN aggregate maximum bit rate" }, / 9.9.4.2 APN aggregate maximum bit rate / - { 0x00, "Connectivity type" }, / 9.9.4.2A Connectivity type / - { 0x00, "EPS quality of service" }, / 9.9.4.3 EPS quality of service / - { 0x00, "ESM cause" }, / 9.9.4.4 ESM cause / - { 0x00, "ESM information transfer flag" }, / 9.9.4.5 ESM information transfer flag / - { 0x00, "Linked EPS bearer identity" }, / 9.9.4.6 Linked EPS bearer identity / - { 0x00, "LLC service access point identifier" }, / 9.9.4.7 LLC service access point identifier / - { 0x00, "Notification indicator" }, / 9.9.4.7a Notification indicator / - { 0x00, "Packet flow identifier" }, / 9.9.4.8 Packet flow identifier / - { 0x00, "PDN address" }, / 9.9.4.9 PDN address / - { 0x00, "PDN type" }, / 9.9.4.10 PDN type / - { 0x00, "Protocol configuration options" }, / 9.9.4.11 Protocol configuration options / - { 0x00, "Quality of service" }, / 9.9.4.12 Quality of service / - { 0x00, "Radio priority" }, / 9.9.4.13 Radio priority / - { 0x00, "Request type" }, / 9.9.4.14 Request type / - { 0x00, "Traffic flow aggregate description" }, / 9.9.4.15 Traffic flow aggregate description / - { 0x00, "Traffic flow templat" }, / 9.9.4.16 Traffic flow template / - { 0x00, "Transaction identifier" }, / 9.9.4.17 Transaction identifier / - { 0, NULL } -}; - - -#define NUM_NAS_ESM_ELEM (sizeof(nas_esm_elem_strings)/sizeof(value_string)) -gint ett_nas_eps_esm_elem[NUM_NAS_ESM_ELEM]; - typedef enum { DE_ESM_APN, / 9.9.4.1 Access point name / @@ -2695,6 +2668,34 @@ nas_esm_elem_idx_t; +const value_string nas_esm_elem_strings[] = { + { DE_ESM_APN, "Access point name" }, / 9.9.4.1 Access point name / + { DE_ESM_APN_AGR_MAX_BR, "APN aggregate maximum bit rate" }, / 9.9.4.2 APN aggregate maximum bit rate / + { DE_ESM_CONNECTIVITY_TYPE, "Connectivity type" }, / 9.9.4.2A Connectivity type / + { DE_ESM_EPS_QOS, "EPS quality of service" }, / 9.9.4.3 EPS quality of service / + { DE_ESM_CAUSE, "ESM cause" }, / 9.9.4.4 ESM cause / + { DE_ESM_INF_TRF_FLG, "ESM information transfer flag" }, / 9.9.4.5 ESM information transfer flag / + { DE_ESM_LNKED_EPS_B_ID, "Linked EPS bearer identity" }, / 9.9.4.6 Linked EPS bearer identity / + { DE_ESM_LLC_SAPI, "LLC service access point identifier" }, / 9.9.4.7 LLC service access point identifier / + { DE_ESM_NOTIF_IND, "Notification indicator" }, / 9.9.4.7a Notification indicator / + { DE_ESM_P_FLW_ID, "Packet flow identifier" }, / 9.9.4.8 Packet flow identifier / + { DE_ESM_PDN_ADDR, "PDN address" }, / 9.9.4.9 PDN address / + { DE_ESM_PDN_TYPE, "PDN type" }, / 9.9.4.10 PDN type / + { DE_ESM_PROT_CONF_OPT, "Protocol configuration options" }, / 9.9.4.11 Protocol configuration options / + { DE_ESM_QOS, "Quality of service" }, / 9.9.4.12 Quality of service / + { DE_ESM_RA_PRI, "Radio priority" }, / 9.9.4.13 Radio priority / + { DE_ESM_REQ_TYPE, "Request type" }, / 9.9.4.14 Request type / + { DE_ESM_TRAF_FLOW_AGR_DESC, "Traffic flow aggregate description" },/ 9.9.4.15 Traffic flow aggregate description / + { DE_ESM_TRAF_FLOW_TEMPL, "Traffic flow template" }, / 9.9.4.16 Traffic flow template / + { DE_ESM_TID, "Transaction identifier" }, / 9.9.4.17 Transaction identifier / + { 0, NULL } +}; + + +#define NUM_NAS_ESM_ELEM (sizeof(nas_esm_elem_strings)/sizeof(value_string)) +gint ett_nas_eps_esm_elem[NUM_NAS_ESM_ELEM]; + + guint16 (esm_elem_fcn[])(tvbuff_t tvb, proto_tree tree, packet_info pinfo _U_, guint32 offset, guint len, gchar add_string, int string_len) = { NULL, /* 9.9.4.1 Access point name / de_esm_apn_aggr_max_br, / 9.9.4.2 APN aggregate maximum bit rate */
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-peekremote.c ^
@@ -149,7 +149,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.8.15.tar.bz2/epan/dissectors/packet-sgsap.c ^
@@ -570,45 +570,45 @@ / const value_string sgsap_elem_strings[] = { - { 0x01, "IMSI" }, / 9.4.6 / - { 0x02, "VLR name" }, / 9.4.22 / - { 0x03, "TMSI" }, / 9.4.20 / - { 0x04, "Location area identifier" }, / 9.4.11 / - { 0x05, "Channel Needed" }, / 9.4.23 / - { 0x06, "eMLPP Priority" }, / 9.4.24 / - { 0x07, "TMSI status" }, / 9.4.21 / - { 0x08, "SGs cause" }, / 9.4.18 / - { 0x09, "MME name" }, / 9.4.13 / - { 0x0a, "EPS location update type" }, / 9.4.2 / - { 0x0b, "Global CN-Id" }, / 9.4.4 / - - { 0x0c, "Undefined" }, / / - { 0x0d, "Undefined" }, / / - - { 0x0e, "Mobile identity" }, / 9.4.14 / - { 0x0f, "Reject cause" }, / 9.4.16 / - { 0x10, "IMSI detach from EPS service type" }, / 9.4.7 / - { 0x11, "IMSI detach from non-EPS service type" }, / 9.4.8 / - - { 0x15, "IMEISV" }, / 9.4.5 / - { 0x16, "NAS message container" }, / 9.4.15 / - { 0x17, "MM information" }, / 9.4.12 / - - { 0x18, "Undefined" }, / / - { 0x19, "Undefined" }, / / - { 0x1a, "Undefined" }, / / - - { 0x1b, "Erroneous message" }, / 9.4.3 / - { 0x1c, "CLI" }, / 9.4.1 / - { 0x1d, "LCS client identity" }, / 9.4.9 / - { 0x1e, "LCS indicator" }, / 9.4.10 / - { 0x1f, "SS code" }, / 9.4.19 / - { 0x20, "Service indicator" }, / 9.4.17 / - { 0x21, "UE Time Zone" }, / 9.4.21b / - { 0x22, "Mobile Station Classmark 2" }, / 9.4.14a / - { 0x23, "Tracking Area Identity" }, / 9.4.21a / - { 0x24, "E-UTRAN Cell Global Identity" }, / 9.4.3a / - { 0x25, "UE EMM mode" }, / 9.4.21c / + { DE_SGSAP_IMSI, "IMSI" }, / 9.4.6 / + { DE_SGSAP_VLR_NAME, "VLR name" }, / 9.4.22 / + { DE_SGSAP_TMSI, "TMSI" }, / 9.4.20 / + { DE_SGSAP_LOC_AREA_ID, "Location area identifier" }, / 9.4.11 / + { DE_SGSAP_CH_NEEDED, "Channel Needed" }, / 9.4.23 / + { DE_SGSAP_EMLPP_PRIO, "eMLPP Priority" }, / 9.4.24 / + { DE_SGSAP_TMSI_STATUS, "TMSI status" }, / 9.4.21 / + { DE_SGSAP_SGS_CAUSE, "SGs cause" }, / 9.4.18 / + { DE_SGSAP_MME_NAME, "MME name" }, / 9.4.13 / + { DE_SGSAP_EPS_LOC_UPD_TYPE, "EPS location update type" }, / 9.4.2 / + { DE_SGSAP_GLOBAL_CN_ID, "Global CN-Id" }, / 9.4.4 / + + { DE_SGSAP_UDEF_11, "Undefined" }, / / + { DE_SGSAP_UDEF_12, "Undefined" }, / / + + { DE_SGSAP_MID, "Mobile identity" }, / 9.4.14 / + { DE_SGSAP_REJ_CAUSE, "Reject cause" }, / 9.4.16 / + { DE_SGSAP_IMSI_DET_EPS, "IMSI detach from EPS service type" }, / 9.4.7 / + { DE_SGSAP_IMSI_DET_NON_EPS, "IMSI detach from non-EPS service type" }, / 9.4.8 / + + { DE_SGSAP_IMEISV, "IMEISV" }, / 9.4.5 / + { DE_SGSAP_NAS_MSG_CONTAINER, "NAS message container" }, / 9.4.15 / + { DE_SGSAP_MM_INFO, "MM information" }, / 9.4.12 / + + { DE_SGSAP_UDEF_20, "Undefined" }, / / + { DE_SGSAP_UDEF_21, "Undefined" }, / / + { DE_SGSAP_UDEF_22, "Undefined" }, / / + + { DE_SGSAP_ERR_MSG, "Erroneous message" }, / 9.4.3 / + { DE_SGSAP_CLI, "CLI" }, / 9.4.1 / + { DE_SGSAP_LCS_CLIENT_ID, "LCS client identity" }, / 9.4.9 / + { DE_SGSAP_LCS_INDIC, "LCS indicator" }, / 9.4.10 / + { DE_SGSAP_SS_CODE, "SS code" }, / 9.4.19 / + { DE_SGSAP_SERV_INDIC, "Service indicator" }, / 9.4.17 / + { DE_SGSAP_UE_TZ, "UE Time Zone" }, / 9.4.21b / + { DE_SGSAP_MSC_2, "Mobile Station Classmark 2" }, / 9.4.14a / + { DE_SGSAP_TAID, "Tracking Area Identity" }, / 9.4.21a / + { DE_SGSAP_ECGI, "E-UTRAN Cell Global Identity" }, / 9.4.3a / + { DE_SGSAP_UE_EMM_MODE, "UE EMM mode" }, / 9.4.21c */ { 0, NULL } }; @@ -638,8 +638,8 @@ DE_SGSAP_EPS_LOC_UPD_TYPE, /. 9.4.2 EPS location update type./ DE_SGSAP_GLOBAL_CN_ID, /. 9.4.4 Global CN-Id./ - DE_SGSAP_UDEF_12, /. Undefined ./ - DE_SGSAP_UDEF_13, /. Undefined ./ + DE_SGSAP_UDEF_11, /. Undefined ./ + DE_SGSAP_UDEF_12, /. Undefined ./ DE_SGSAP_MID, /. 9.4.14 Mobile identity./ DE_SGSAP_REJ_CAUSE, /. 9.4.16 Reject cause ./ @@ -650,9 +650,9 @@ DE_SGSAP_NAS_MSG_CONTAINER, /. 9.4.15 NAS message container./ DE_SGSAP_MM_INFO, /. 9.4.12 MM information./ - DE_SGSAP_UDEF_24, /. Undefined ./ - DE_SGSAP_UDEF_25, /. Undefined ./ - DE_SGSAP_UDEF_26, /. Undefined ./ + DE_SGSAP_UDEF_20, /. Undefined ./ + DE_SGSAP_UDEF_21, /. Undefined ./ + DE_SGSAP_UDEF_22, /. Undefined ./ DE_SGSAP_ERR_MSG, /. 9.4.3 Erroneous message./ DE_SGSAP_CLI, /. 9.4.1 CLI ./
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/epan/dissectors/packet-tcap.c ^
@@ -2236,8 +2236,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.8.15.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.8.15.tar.bz2/epan/ipproto.c ^
@@ -103,7 +103,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.8.15.tar.bz2/epan/ipproto.h ^
@@ -95,8 +95,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.8.15.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.8.15.tar.bz2/epan/wslua/wslua_proto.c ^
@@ -298,18 +298,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; @@ -392,6 +392,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 {
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/make-version.pl ^
@@ -2,8 +2,6 @@ # # Copyright 2004 Jörg Mayer (see AUTHORS file) # -# $Id$ -# # Wireshark - Network traffic analyzer # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs @@ -78,7 +76,7 @@ my %version_pref = ( "version_major" => 1, "version_minor" => 8, - "version_micro" => 13, + "version_micro" => 15, "version_build" => 0, "enable" => 1, @@ -168,11 +166,11 @@ $last_change = $line; } - # Commits in current (master-1.8) branch. We may want to use - # a different number. - chomp($line = qx{git --git-dir=$srcdir/.git describe --long --match v1.8.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]; } @@ -189,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.8.15.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.8.15.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.8.15.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.8.15.tar.bz2/packaging/macosx/Info.plist ^
@@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>Wireshark</string> <key>CFBundleGetInfoString</key> - <string>1.8.13, Copyright 1998-2014 Wireshark Development Team</string> + <string>1.8.15, 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.8.13</string> + <string>1.8.15</string> <key>CFBundleSignature</key> <string>Wshk</string> <key>CFBundleVersion</key> - <string>1.8.13</string> + <string>1.8.15</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2014 Wireshark Developers, GNU General Public License.</string> <key>LSMinimumSystemVersion</key>
[-] [+]	Changed	wireshark-1.8.15.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.8.15.tar.bz2/packaging/macosx/Makefile.in ^
@@ -315,8 +315,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.8.15.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.8.15.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.8.15.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.8.15.tar.bz2/packaging/macosx/Wireshark_package.pmdoc/index.xml ^
@@ -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="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 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> \ No newline at end of file +<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="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 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.8.15.tar.bz2/plugins/gryphon/packet-gryphon.c ^
@@ -1461,7 +1461,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.8.15.tar.bz2/rawshark.c ^
@@ -897,9 +897,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.8.15.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.8.15.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/enterprise-numbers" unless(defined $in); +$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.8.15.tar.bz2/tshark.c ^
@@ -1565,7 +1565,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 libpcap or pcapng format."); return 1; } if (global_capture_opts.multi_files_on) { @@ -1596,6 +1596,7 @@ cmdarg_err("Read 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.8.15.tar.bz2/version.h ^
@@ -1,2 +1,2 @@ -#define GITVERSION "v1.8.13" +#define GITVERSION "v1.8.15-0-g50a182c" #define GITBRANCH "master-1.8"
[-] [+]	Changed	wireshark-1.8.15.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:13:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:15:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ if HAVE_WARNINGS_AS_ERRORS AM_NON_GENERATED_CFLAGS = -Werror
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/wiretap/Makefile.in ^
@@ -611,7 +611,7 @@ noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 3:13:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 3:15:1 -export-symbols wtap.sym @LDFLAGS_SHAREDLIB@ @HAVE_WARNINGS_AS_ERRORS_TRUE@AM_NON_GENERATED_CFLAGS = -Werror AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \
[-] [+]	Changed	wireshark-1.8.15.tar.bz2/wiretap/pcapng.c ^
@@ -1036,12 +1036,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.8.15.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

Changes of Revision 18