Merge pull request #13300 from mrc0mmand/test-execreload

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Tue, 17 Sep 2019 08:54:18 +0000 (10:54 +0200)

committer GitHub <noreply@github.com>

Tue, 17 Sep 2019 08:54:18 +0000 (10:54 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 17 Sep 2019 08:54:18 +0000 (10:54 +0200)
committer GitHub <noreply@github.com>
Tue, 17 Sep 2019 08:54:18 +0000 (10:54 +0200)
diff --git a/.travis.yml b/.travis.yml

index d46e2be6f75457d9cc4efd61ab542ece0d06db16..ba20097fdf69dc0011e06ffbe0275192f8ddef17 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ stages:
      - name: Fuzzit-Fuzzing
        if: type = cron
  
-    - name: Fuzzit-Sanity
+    - name: Fuzzit-Regression
        if: type != cron
  
      # Run Coverity periodically instead of for each commit/PR
@@ -100,16 +100,16 @@ jobs:
            after_script:
                - $CI_MANAGERS/debian.sh CLEANUP
  
-        - stage: Fuzzit-Sanity
-          name:  Continuous Fuzzing Sanity via Fuzzit (sanity)
+        - stage: Fuzzit-Regression
+          name:  Continuous Fuzzing via Fuzzit (regression)
            language: bash
            script:
              - set -e
-            - $CI_MANAGERS/fuzzit.sh sanity
+            - $CI_MANAGERS/fuzzit.sh regression
              - set +e
  
          - stage: Fuzzit-Fuzzing
-          name: Continuous Fuzzing Sanity via Fuzzit (fuzzing daily)
+          name: Continuous Fuzzing via Fuzzit (fuzzing daily)
            language: bash
            script:
              - set -e
diff --git a/NEWS b/NEWS

index df303d329e97c2f921eb7f986891d92a28809164..de4f93a79b92b4e11ae5faa65c9df26f4ee09a7a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
  systemd System and Service Manager
  
-CHANGES WITH 243 in spe:
+CHANGES WITH 243:
  
          * This release enables unprivileged programs (i.e. requiring neither
            setuid nor file capabilities) to send ICMP Echo (i.e. ping) requests
@@ -279,6 +279,16 @@ CHANGES WITH 243 in spe:
            been renamed to LinkLayerAddress=, and it now allows configuration of
            IP addresses, too.
  
+        * systemd-networkd's handling of the kernel's disable_ipv6 sysctl is
+          simplified: systemd-networkd will disable the sysctl (enable IPv6) if
+          IPv6 configuration (static or DHCPv6) was found for a given
+          interface. It will not touch the sysctl otherwise.
+
+        * The order of entries is $PATH used by the user manager instance was
+          changed to put bin/ entries before the corresponding sbin/ entries.
+          It is recommended to not rely on this order, and only ever have one
+          binary with a given name in the system paths under /usr.
+
          * A new tool systemd-network-generator has been added that may generate
            .network, .netdev and .link files from IP configuration specified on
            the kernel command line in the format used by Dracut.
@@ -429,32 +439,44 @@ CHANGES WITH 243 in spe:
            option that permits selecting the timout how long to wait for a
            device with an encryption key before asking for the password.
  
-        Contributions from: Aaron Barany, Adrian Bunk, Alan Jenkins, Andrej
-        Valek, Anita Zhang, Arian van Putten, Balint Reczey, Bastien Nocera,
-        Ben Boeckel, Benjamin Robin, camoz, Chen Qi, Chris Chiu, Chris Down,
-        Christian Kellner, Clinton Roy, Connor Reeder, Daniele Medri, Dan
-        Streetman, Dave Reisner, Dave Ross, David Art, David Tardon, Debarshi
-        Ray, Dominick Grift, Donald Buczek, Douglas Christman, Eric DeVolder,
-        Evgeny Vereshchagin, Feldwor, Felix Riemann, Florian Dollinger, Franck
-        Bui, Frantisek Sumsal, Franz Pletz, Hans de Goede, Iago López Galeiras,
-        Insun Pyo, Ivan Shapovalov, Iwan Timmer, Jack, Jakob Unterwurzacher,
-        Jan Klötzke, Jan Pokorný, Jan Synacek, Jeka Pats, Jérémy Rosen, Jiri
-        Pirko, Joe Lin, Joerg Behrmann, Joe Richey, Jóhann B. Guðmundsson,
-        Johannes Schmitz, Jonathan Rouleau, Jorge Niedbalski, Kai Lüke, Karel
-        Zak, Kashyap Chamarthy, Krayushkin Konstantin, Lennart Poettering,
-        Lubomir Rintel, Luca Boccassi, Luís Ferreira, Marc-André Lureau, Markus
-        Felten, Martin Pitt, Michael Biebl, Michael Olbrich, Michael Prokop,
-        Michael Stapelberg, Michael Zhivich, Michal Koutný, Michal Sekletar,
-        Mike Gilbert, Milan Broz, mpe85, Network Silence, Oliver Harley,
-        pan93412, Paul Menzel, pEJipE, Peter A. Bigot, Philip Withnall, Piotr
-        Drąg, Rafael Fontenelle, Roberto Santalla, root, RussianNeuroMancer,
-        Sebastian Jennen, shinygold, Shreyas Behera, Simon Schricker, Susant
-        Sahani, Thadeu Lima de Souza Cascardo, Theo Ouzhinski, Thiebaud
-        Weksteen, Thomas Haller, Thomas Weißschuh, Tomas Mraz, Topi Miettinen,
-        ven, Wieland Hoffmann, Xi Ruoyao, Yuri Chornoivan, Yu Watanabe, Zach
-        Smith, Zbigniew Jędrzejewski-Szmek, Zhang Xianwei
-
-        – Somewhere, SOME-TI-ME
+        * IOWeight= has learnt to properly set the IO weight when using the
+          BFQ scheduler officially found in kernels 5.0+.
+
+        * A new mailing list has been created for reporting of security issues:
+          systemd-security@redhat.com. For mode details, see
+          https://systemd.io/CONTRIBUTING#security-vulnerability-reports.
+
+        Contributions from: Aaron Barany, Adrian Bunk, Alan Jenkins, Albrecht
+        Lohofener, Andrej Valek, Anita Zhang, Arian van Putten, Balint Reczey,
+        Bastien Nocera, Ben Boeckel, Benjamin Robin, camoz, Chen Qi, Chris
+        Chiu, Chris Down, Christian Kellner, Clinton Roy, Connor Reeder, Daniel
+        Black, Daniele Medri, Dan Streetman, Dave Reisner, Dave Ross, David
+        Art, David Tardon, Debarshi Ray, Dimitri John Ledkov, Dominick Grift,
+        Donald Buczek, Douglas Christman, Eric DeVolder, EtherGraf, Evgeny
+        Vereshchagin, Feldwor, Felix Riemann, Florian Dollinger, Francesco
+        Pennica, Franck Bui, Frantisek Sumsal, Franz Pletz, frederik, Hans
+        de Goede, Iago López Galeiras, Insun Pyo, Ivan Shapovalov, Iwan Timmer,
+        Jack, Jakob Unterwurzacher, Jan Chren, Jan Klötzke, Jan Losinski, Jan
+        Pokorný, Jan Synacek, Jan-Michael Brummer, Jeka Pats, Jeremy Soller,
+        Jérémy Rosen, Jiri Pirko, Joe Lin, Joerg Behrmann, Joe Richey, Jóhann
+        B. Guðmundsson, Johannes Christ, Johannes Schmitz, Jonathan Rouleau,
+        Jorge Niedbalski, Kai Krakow, Kai Lüke, Karel Zak, Kashyap Chamarthy,
+        Krayushkin Konstantin, Lennart Poettering, Lubomir Rintel, Luca
+        Boccassi, Luís Ferreira, Marc-André Lureau, Markus Felten, Martin Pitt,
+        Matthew Leeds, Mattias Jernberg, Michael Biebl, Michael Olbrich,
+        Michael Prokop, Michael Stapelberg, Michael Zhivich, Michal Koutný,
+        Michal Sekletar, Mike Gilbert, Milan Broz, Miroslav Lichvar, mpe85,
+        Mr-Foo, Network Silence, Oliver Harley, pan93412, Paul Menzel, pEJipE,
+        Peter A. Bigot, Philip Withnall, Piotr Drąg, Rafael Fontenelle, Roberto
+        Santalla, Ronan Pigott, root, RussianNeuroMancer, Sebastian Jennen,
+        shinygold, Shreyas Behera, Simon Schricker, Susant Sahani, Thadeu Lima
+        de Souza Cascardo, Theo Ouzhinski, Thiebaud Weksteen, Thomas Haller,
+        Thomas Weißschuh, Tomas Mraz, Tommi Rantala, Topi Miettinen, VD-Lycos,
+        ven, Wieland Hoffmann, William A. Kennington III, William Wold, Xi
+        Ruoyao, Yuri Chornoivan, Yu Watanabe, Your Name, Zach Smith, Zbigniew
+        Jędrzejewski-Szmek, Zhang Xianwei
+
+        – Camerino, 2019-09-03
  
  CHANGES WITH 242:
  
diff --git a/README b/README

index fcf20ed9f8c95f73a570453c93704d0c424e88af..98da2d6dcbdd3267c7a1b596afb00a4b684b66ff 100644 (file)
--- a/README
+++ b/README
@@ -173,9 +173,7 @@ REQUIREMENTS:
          dependencies:
  
          util-linux >= v2.27.1 required
-        dbus >= 1.4.0 (strictly speaking optional, but recommended)
-                NOTE: If using dbus < 1.9.18, you should override the default
-                policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d).
+        dbus >= 1.11.0 (strictly speaking optional, but recommended)
          dracut (optional)
          polkit (optional)
  
diff --git a/README.md b/README.md

index 3cde9d201870ffce6b93b31012050c8fae11fa8d..688d24b498c1f87ba55e85b983b503f1092adf4f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
  [![Semaphore CI Build Status](https://semaphoreci.com/api/v1/projects/28a5a3ca-3c56-4078-8b5e-7ed6ef912e14/443470/shields_badge.svg)](https://semaphoreci.com/systemd/systemd)<br/>
  [![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)<br/>
  [![Fuzzit Status](https://app.fuzzit.dev/badge?org_id=systemd&branch=master)](https://app.fuzzit.dev/orgs/systemd/dashboard)<br/>
+[![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/systemd.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html)<br/>
  [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1369/badge)](https://bestpractices.coreinfrastructure.org/projects/1369)<br/>
  [![Travis CI Build Status](https://travis-ci.org/systemd/systemd.svg?branch=master)](https://travis-ci.org/systemd/systemd)<br/>
  [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/systemd/systemd.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/systemd/systemd/context:cpp)<br/>
diff --git a/TODO b/TODO

index b10eafe66340df80d7beb03bff3262199b4574a8..4679be1e6515d3a35559e131cf006260afc96e42 100644 (file)
--- a/TODO
+++ b/TODO
@@ -19,6 +19,13 @@ Janitorial Clean-ups:
  
  Features:
  
+* coredump: maybe when coredumping read a new xattr from /proc/$PID/exe that
+  may be used to mark a whole binary as non-coredumpable. Would fix:
+  https://bugs.freedesktop.org/show_bug.cgi?id=69447
+
+* beef up hibernation to optionally do swapon/swapoff immediately before/after
+  the hibernation
+
  * beef up s2h to implement a battery watch loop: instead of entering
    hibernation unconditionally after coming back from resume make a decision
    based on the battery load level: if battery level is above a specific
@@ -449,9 +456,6 @@ Features:
  * mount: automatically search for "main" partition of an image has multiple
    partitions
  
-* expose the "privileged" flag of ExecCommand on the bus, and open it up to
-  transient units
-
  * in nss-systemd, if we run inside of RootDirectory= with PrivateUsers= set,
    find a way to map the User=/Group= of the service to the right name. This way
    a user/group for a service only has to exist on the host for the right
@@ -754,7 +758,6 @@ Features:
  
  * journal:
    - consider introducing implicit _TTY= + _PPID= + _EUID= + _EGID= + _FSUID= + _FSGID= fields
-  - import and delete pstore filesystem content at startup
    - journald: also get thread ID from client, plus thread name
    - journal: when waiting for journal additions in the client always sleep at least 1s or so, in order to minimize wakeups
    - add API to close/reopen/get fd for journal client fd in libsystemd-journal.
@@ -1024,7 +1027,6 @@ Features:
     - Make sure ID_PATH is always exported and complete for
       network devices where possible, so we can safely rely
       on Path= matching
-   - check MTUBytes parsing (expecting size_t but we are using unsigned)
  
  * sd-rtnl:
     - add support for more attribute types
@@ -1105,6 +1107,11 @@ External:
    - <command> <verb> -<TAB> should complete options, but currently does not
    - systemctl add-wants,add-requires
  
+* systemctl status foo.service should say that it is trigger by foo.timer
+* systemctl status should know about 'systemd-analyze calendar ... --iterations='
+* systemctl list-timers foo should use .timer suffix by default
+* If timer has just OnInactiveSec=..., it should fire after a specified time
+  after being started.
  
  Regularly:
  
diff --git a/docs/BOOT_LOADER_INTERFACE.md b/docs/BOOT_LOADER_INTERFACE.md

index cbd66876af860015990d83da6f89c91abdef792e..c0ed099845ce6ae6feda60d6bdf346a318b1a117 100644 (file)
--- a/docs/BOOT_LOADER_INTERFACE.md
+++ b/docs/BOOT_LOADER_INTERFACE.md
@@ -71,7 +71,7 @@ variables. All EFI variables use the vendor UUID
    * `1 << 3` → The boot loader honours `LoaderEntryOneShot` when set.
    * `1 << 4` → The boot loader supports boot counting as described in [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT).
    * `1 << 5` → The boot loader supports looking for boot menu entries in the Extended Boot Loader Partition.
-  * `1 << 6` → The boot loader spports passing a random seed to the OS.
+  * `1 << 6` → The boot loader supports passing a random seed to the OS.
  
  * The EFI variable `LoaderRandomSeed` contains a binary random seed if set. It
    is set by the boot loader to pass an entropy seed read from the ESP partition
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md

index f40d9a010a6412dda4f5e68ef2e5696f8c6c7162..565acdd1cba9a0062b9440aa8c8148e0371a195f 100644 (file)
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -8,7 +8,7 @@ We welcome contributions from everyone. However, please follow the following gui
  
  ## Filing Issues
  
-* We use GitHub Issues **exclusively** for tracking **bugs** and **feature** **requests** of systemd. If you are looking for help, please contact our [mailing list](https://lists.freedesktop.org/mailman/listinfo/systemd-devel) instead.
+* We use [GitHub Issues](https://github.com/systemd/systemd/issues) **exclusively** for tracking **bugs** and **feature** **requests** of systemd. If you are looking for help, please contact [systemd-devel mailing list](https://lists.freedesktop.org/mailman/listinfo/systemd-devel) instead.
  * We only track bugs in the **two** **most** **recently** **released** **versions** of systemd in the GitHub Issue tracker. If you are using an older version of systemd, please contact your distribution's bug tracker instead.
  * When filing an issue, specify the **systemd** **version** you are experiencing the issue with. Also, indicate which **distribution** you are using.
  * Please include an explanation how to reproduce the issue you are pointing out.
@@ -23,7 +23,7 @@ For older versions that are still supported by your distribution please use resp
  
  ## Security vulnerability reports
  
-If you discover a security vulnerability, we'd appreciate a non-public disclosure. The issue tracker and mailing list listed above are fully public. If you need to reach systemd developers in a non-public way, report the issue in one of the "big" distributions using systemd: [Fedora](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=systemd) (be sure to check "Security Sensitive Bug" under "Show Advanced Fields"), [Ubuntu](https://launchpad.net/ubuntu/+source/systemd/+filebug) (be sure to change "This bug contains information that is" from "Public" to "Private Security"), or [Debian](mailto:security@debian.org). Various systemd developers are active distribution maintainers and will propagate the information about the bug to other parties.
+See [reporting of security vulnerabilities](SECURITY.md).
  
  ## Posting Pull Requests
  
diff --git a/docs/RANDOM_SEEDS.md b/docs/RANDOM_SEEDS.md

index 7edf7c2d6a51072f730eb38034a3fd74265eee55..926238a3aedf3715f83fe2abc01b6bc4796502a7 100644 (file)
--- a/docs/RANDOM_SEEDS.md
+++ b/docs/RANDOM_SEEDS.md
@@ -190,12 +190,12 @@ boot, in order to ensure the entropy pool is filled up quickly.
     master images of an OS are created, and thus replicated into every
     installation. If OS image builders carefully reset the random seed file
     before generating the image it should be safe to credit entropy, which can
-   be enabled by setting the `$SYSTEMD_RANDOM_SEED` environment variable for
-   the service to `1`. Note however, that this service typically runs
-   relatively late during early boot: long after the initial RAM disk
-   (`initrd`) completed, and after the `/var/` file system became
-   writable. This is usually too late for many applications, it is hence not
-   advised to rely exclusively on this functionality to seed the kernel's
+   be enabled by setting the `$SYSTEMD_RANDOM_SEED_CREDIT` environment variable
+   for the service to `1` (or even `force`, see man page). Note however, that
+   this service typically runs relatively late during early boot: long after
+   the initial RAM disk (`initrd`) completed, and after the `/var/` file system
+   became writable. This is usually too late for many applications, it is hence
+   not advised to rely exclusively on this functionality to seed the kernel's
     entropy pool. Also note that this service synchronously waits until the
     kernel's entropy pool is initialized before completing start-up. It may thus
     be used by other services as synchronization point to order against, if they
diff --git a/docs/RELEASE.md b/docs/RELEASE.md

index d842afcd345923289ea4566eb2db45aaecaf2b5a..56debd68d2695d9f3b75bcbe965260a413d85af5 100644 (file)
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -16,4 +16,4 @@ title: Steps to a Successful Release
  10. "Draft" a new release on github (https://github.com/systemd/systemd/releases/new), mark "This is a pre-release" if appropriate.
  11. Check that announcement to systemd-devel, with a copy&paste from NEWS, was sent. This should happen automatically.
  12. Update IRC topic (`/msg chanserv TOPIC #systemd Version NNN released`)
-13. [After final release] Also push commits to stable, create an empty -stable branch: `git push systemd-stable origin/master:master origin/master:v${version}-stable`, and change the default branch to latest release (https://github.com/systemd/systemd-stable/settings/branches).
+13. [After final release] Also push commits to stable, create an empty -stable branch: `git push systemd-stable origin/master:master origin/master:refs/heads/${version}-stable`, and change the default branch to latest release (https://github.com/systemd/systemd-stable/settings/branches).
diff --git a/docs/SECURITY.md b/docs/SECURITY.md

new file mode 100644 (file)

index 0000000..93847dc
--- /dev/null
+++ b/docs/SECURITY.md
@@ -0,0 +1,7 @@
+---
+title: Reporting of security vulnerabilities
+---
+
+# Reporting of security vulnerabilities
+
+If you discover a security vulnerability, we'd appreciate a non-public disclosure. The [issue tracker](https://github.com/systemd/systemd/issues) and [systemd-devel mailing list](https://lists.freedesktop.org/mailman/listinfo/systemd-devel) are fully public. If you need to reach systemd developers in a non-public way, report the issue to the [systemd-security@redhat.com](mailto:systemd-security@redhat.com) mailing list. The disclosure will be coordinated with distributions.
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb

index c3507e7711c6cdb8b4c6a288bf18dab002d6ef45..6ef84b441632b831616d573622b7115d0d777a0c 100644 (file)
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -2919,7 +2919,7 @@ OUI:0003CA*
   ID_OUI_FROM_DATABASE=MTS Systems Corp.
  
  OUI:0003CB*
- ID_OUI_FROM_DATABASE=Nippon Systems Development Co., Ltd.
+ ID_OUI_FROM_DATABASE=SystemGear Co., Ltd.
  
  OUI:0003CC*
   ID_OUI_FROM_DATABASE=Momentum Computer, Inc.
@@ -6273,7 +6273,7 @@ OUI:000828*
   ID_OUI_FROM_DATABASE=Koei Engineering Ltd.
  
  OUI:000829*
- ID_OUI_FROM_DATABASE=Aval Nagasaki Corporation
+ ID_OUI_FROM_DATABASE=TOKYO ELECTRON DEVICE NAGASAKI LIMITED
  
  OUI:00082A*
   ID_OUI_FROM_DATABASE=Powerwallz Network Security
@@ -28566,7 +28566,7 @@ OUI:002486*
   ID_OUI_FROM_DATABASE=DesignArt Networks
  
  OUI:002487*
- ID_OUI_FROM_DATABASE=Blackboard Inc.
+ ID_OUI_FROM_DATABASE=Transact Campus, Inc.
  
  OUI:002488*
   ID_OUI_FROM_DATABASE=Centre For Development Of Telematics
@@ -30858,7 +30858,7 @@ OUI:003055*
   ID_OUI_FROM_DATABASE=Renesas Technology America, Inc.
  
  OUI:003056*
- ID_OUI_FROM_DATABASE=Beck IPC GmbH
+ ID_OUI_FROM_DATABASE=HMS Industrial Networks
  
  OUI:003057*
   ID_OUI_FROM_DATABASE=QTelNet, Inc.
@@ -31038,7 +31038,7 @@ OUI:003091*
   ID_OUI_FROM_DATABASE=TAIWAN FIRST LINE ELEC. CORP.
  
  OUI:003092*
- ID_OUI_FROM_DATABASE=ModuNORM GmbH
+ ID_OUI_FROM_DATABASE=Kontron Electronics AG
  
  OUI:003093*
   ID_OUI_FROM_DATABASE=Sonnet Technologies, Inc
@@ -36467,6 +36467,9 @@ OUI:00AA6E*
  OUI:00AA70*
   ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
  
+OUI:00AB48*
+ ID_OUI_FROM_DATABASE=eero inc.
+
  OUI:00ACE0*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
@@ -38294,6 +38297,9 @@ OUI:00D11C*
  OUI:00D279*
   ID_OUI_FROM_DATABASE=VINGROUP JOINT STOCK COMPANY
  
+OUI:00D2B1*
+ ID_OUI_FROM_DATABASE=TPV Display Technology (Xiamen) Co.,Ltd.
+
  OUI:00D318*
   ID_OUI_FROM_DATABASE=SPG Controls
  
@@ -39344,6 +39350,9 @@ OUI:040AE0*
  OUI:040CCE*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:040E3C*
+ ID_OUI_FROM_DATABASE=HP Inc.
+
  OUI:040EC2*
   ID_OUI_FROM_DATABASE=ViewSonic Mobile China Limited
  
@@ -39779,9 +39788,15 @@ OUI:04B0E7*
  OUI:04B167*
   ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
  
+OUI:04B1A1*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:04B3B6*
   ID_OUI_FROM_DATABASE=Seamap (UK) Ltd
  
+OUI:04B429*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:04B466*
   ID_OUI_FROM_DATABASE=BSP Co., Ltd.
  
@@ -39911,6 +39926,51 @@ OUI:04CF8C*
  OUI:04D13A*
   ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
  
+OUI:04D16E0*
+ ID_OUI_FROM_DATABASE=INTRIPLE, a.s.
+
+OUI:04D16E1*
+ ID_OUI_FROM_DATABASE=Launch Tech Co., Ltd.
+
+OUI:04D16E2*
+ ID_OUI_FROM_DATABASE=s.d.i. s.p.a.
+
+OUI:04D16E3*
+ ID_OUI_FROM_DATABASE=Beijing Huaxia Qixin Technology Co., Ltd.
+
+OUI:04D16E4*
+ ID_OUI_FROM_DATABASE=ShenZhen Huafu Information technology Co.?Ltd
+
+OUI:04D16E5*
+ ID_OUI_FROM_DATABASE=Dspread Technology (Beijing) Inc.
+
+OUI:04D16E6*
+ ID_OUI_FROM_DATABASE=ETL Elektrotechnik Lauter GmbH
+
+OUI:04D16E7*
+ ID_OUI_FROM_DATABASE=Envision Energy
+
+OUI:04D16E8*
+ ID_OUI_FROM_DATABASE=CHENGDU INTERLINK SCIENCE AND TECHNOLOGY CO.,LTD
+
+OUI:04D16E9*
+ ID_OUI_FROM_DATABASE=FUZHOU ZHUOYI ELECTRONIC CO.,LTD
+
+OUI:04D16EA*
+ ID_OUI_FROM_DATABASE=Metra Electronics
+
+OUI:04D16EB*
+ ID_OUI_FROM_DATABASE=National Radio & Telecommunication Corporation - NRTC
+
+OUI:04D16EC*
+ ID_OUI_FROM_DATABASE=PacPort Corporation
+
+OUI:04D16ED*
+ ID_OUI_FROM_DATABASE=Elotec Fischer Elektronik GmbH
+
+OUI:04D16EE*
+ ID_OUI_FROM_DATABASE=Evolute Systems Private Limited
+
  OUI:04D3B0*
   ID_OUI_FROM_DATABASE=Intel Corporate
  
@@ -40535,6 +40595,9 @@ OUI:08115E*
  OUI:081196*
   ID_OUI_FROM_DATABASE=Intel Corporate
  
+OUI:0812A5*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
  OUI:081443*
   ID_OUI_FROM_DATABASE=UNIBRAIN S.A.
  
@@ -41234,6 +41297,9 @@ OUI:0C2C54*
  OUI:0C2D89*
   ID_OUI_FROM_DATABASE=QiiQ Communications Inc.
  
+OUI:0C2FB0*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:0C3021*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
@@ -42479,6 +42545,9 @@ OUI:10C60C*
  OUI:10C61F*
   ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
  
+OUI:10C65E*
+ ID_OUI_FROM_DATABASE=Adapt-IP
+
  OUI:10C67E*
   ID_OUI_FROM_DATABASE=SHENZHEN JUCHIN TECHNOLOGY CO., LTD
  
@@ -42536,12 +42605,33 @@ OUI:10DC4A*
  OUI:10DCB60*
   ID_OUI_FROM_DATABASE=Private
  
+OUI:10DCB61*
+ ID_OUI_FROM_DATABASE=ABB Switzerland Ltd.
+
+OUI:10DCB62*
+ ID_OUI_FROM_DATABASE=CAL-COMP INDUSTRIA E COMERCIO DE ELETRONICOS E INFORMATICA LTDA
+
  OUI:10DCB63*
   ID_OUI_FROM_DATABASE=HANACNS
  
  OUI:10DCB64*
   ID_OUI_FROM_DATABASE=Annapurna labs
  
+OUI:10DCB65*
+ ID_OUI_FROM_DATABASE=Milesight Taiwan
+
+OUI:10DCB66*
+ ID_OUI_FROM_DATABASE=Prolan Zrt.
+
+OUI:10DCB67*
+ ID_OUI_FROM_DATABASE=Moya Commumication Technology (Shenzhen) Co.,Ltd.
+
+OUI:10DCB68*
+ ID_OUI_FROM_DATABASE=Sanofi (Beijing) Pharmaceutical Co., Ltd.
+
+OUI:10DCB69*
+ ID_OUI_FROM_DATABASE=Fuzhou Rockchip Electronics Co.,Ltd
+
  OUI:10DCB6A*
   ID_OUI_FROM_DATABASE=Pickering Interfaces Ltd
  
@@ -42554,6 +42644,9 @@ OUI:10DCB6C*
  OUI:10DCB6D*
   ID_OUI_FROM_DATABASE=LeoLabs
  
+OUI:10DCB6E*
+ ID_OUI_FROM_DATABASE=Shenzhen Sunwoda intelligent hardware Co.,Ltd
+
  OUI:10DDB1*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
@@ -42593,6 +42686,9 @@ OUI:10E878*
  OUI:10E8EE*
   ID_OUI_FROM_DATABASE=PhaseSpace
  
+OUI:10E953*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:10EA59*
   ID_OUI_FROM_DATABASE=Cisco SPVTG
  
@@ -43598,6 +43694,9 @@ OUI:18550F*
  OUI:1855E3*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:185644*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:185680*
   ID_OUI_FROM_DATABASE=Intel Corporate
  
@@ -43607,6 +43706,9 @@ OUI:185933*
  OUI:185936*
   ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
  
+OUI:185A58*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
  OUI:185AE8*
   ID_OUI_FROM_DATABASE=Zenotech.Co.,Ltd
  
@@ -43670,6 +43772,9 @@ OUI:1869DA*
  OUI:186D99*
   ID_OUI_FROM_DATABASE=Adanis Inc.
  
+OUI:18703B*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:187117*
   ID_OUI_FROM_DATABASE=eta plus electronic gmbh
  
@@ -43970,6 +44075,9 @@ OUI:18CF5E*
  OUI:18D071*
   ID_OUI_FROM_DATABASE=DASAN CO., LTD.
  
+OUI:18D0C5*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
  OUI:18D225*
   ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
  
@@ -44075,6 +44183,9 @@ OUI:18F76B*
  OUI:18F87A*
   ID_OUI_FROM_DATABASE=i3 International Inc.
  
+OUI:18F9C4*
+ ID_OUI_FROM_DATABASE=BAE Systems
+
  OUI:18FA6F*
   ID_OUI_FROM_DATABASE=ISC applied systems corp
  
@@ -44123,6 +44234,9 @@ OUI:1C129D*
  OUI:1C12B0*
   ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
  
+OUI:1C1386*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:1C1448*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
@@ -44144,6 +44258,9 @@ OUI:1C19DE*
  OUI:1C1AC0*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:1C1ADF*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
  OUI:1C1B0D*
   ID_OUI_FROM_DATABASE=GIGA-BYTE TECHNOLOGY CO.,LTD.
  
@@ -44240,6 +44357,9 @@ OUI:1C2704*
  OUI:1C27DD*
   ID_OUI_FROM_DATABASE=Datang Gohighsec(zhejiang)Information Technology Co.,Ltd.
  
+OUI:1C2AA3*
+ ID_OUI_FROM_DATABASE=Shenzhen HongRui Optical Technology Co., Ltd.
+
  OUI:1C2E1B*
   ID_OUI_FROM_DATABASE=Suzhou Tremenet Communication Technology Co., Ltd.
  
@@ -44312,6 +44432,9 @@ OUI:1C43EC*
  OUI:1C4419*
   ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
  
+OUI:1C4455*
+ ID_OUI_FROM_DATABASE=Sieb & Meyer AG
+
  OUI:1C4593*
   ID_OUI_FROM_DATABASE=Texas Instruments
  
@@ -44957,6 +45080,9 @@ OUI:1CC0E1E*
  OUI:1CC11A*
   ID_OUI_FROM_DATABASE=Wavetronix
  
+OUI:1CC1BC*
+ ID_OUI_FROM_DATABASE=Yichip Microelectronics (Hangzhou) Co.,Ltd
+
  OUI:1CC1DE*
   ID_OUI_FROM_DATABASE=Hewlett Packard
  
@@ -45272,6 +45398,9 @@ OUI:202D23*
  OUI:202DF8*
   ID_OUI_FROM_DATABASE=Digital Media Cartridge Ltd.
  
+OUI:20311C*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
  OUI:2031EB*
   ID_OUI_FROM_DATABASE=HDSN
  
@@ -46089,7 +46218,7 @@ OUI:244E7BC*
   ID_OUI_FROM_DATABASE=CHUNGHSIN TECHNOLOGY GROUP CO.,LTD
  
  OUI:244E7BD*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Church & Dwight Co., Inc.
  
  OUI:244E7BE*
   ID_OUI_FROM_DATABASE=WithWin Technology ShenZhen CO.,LTD
@@ -46175,12 +46304,18 @@ OUI:246E96*
  OUI:246F28*
   ID_OUI_FROM_DATABASE=Espressif Inc.
  
+OUI:246F8C*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:247189*
   ID_OUI_FROM_DATABASE=Texas Instruments
  
  OUI:247260*
   ID_OUI_FROM_DATABASE=IOTTECH Corp
  
+OUI:2474F7*
+ ID_OUI_FROM_DATABASE=GoPro
+
  OUI:247656*
   ID_OUI_FROM_DATABASE=Shanghai Net Miles Fiber Optics Technology Co., LTD.
  
@@ -46823,6 +46958,9 @@ OUI:285261*
  OUI:2852E0*
   ID_OUI_FROM_DATABASE=Layon international Electronic & Telecom Co.,Ltd
  
+OUI:2852F9*
+ ID_OUI_FROM_DATABASE=Zhongxin Intelligent Times (Shenzhen) Co., Ltd.
+
  OUI:28565A*
   ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
  
@@ -47768,6 +47906,9 @@ OUI:2C4835D*
  OUI:2C4835E*
   ID_OUI_FROM_DATABASE=IROOTECH TECHNOLOGY CO.,LTD
  
+OUI:2C4CC6*
+ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
+
  OUI:2C4D54*
   ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
  
@@ -48074,6 +48215,9 @@ OUI:2CAB00*
  OUI:2CAB25*
   ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
  
+OUI:2CAB33*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
  OUI:2CABA4*
   ID_OUI_FROM_DATABASE=Cisco SPVTG
  
@@ -48560,6 +48704,9 @@ OUI:3039F2*
  OUI:303A64*
   ID_OUI_FROM_DATABASE=Intel Corporate
  
+OUI:303ABA*
+ ID_OUI_FROM_DATABASE=Guangzhou BaoLun Electronics Co., Ltd
+
  OUI:303D08*
   ID_OUI_FROM_DATABASE=GLINTT TES S.A.
  
@@ -48680,6 +48827,9 @@ OUI:306CBE*
  OUI:306E5C*
   ID_OUI_FROM_DATABASE=Validus Technologies
  
+OUI:306F07*
+ ID_OUI_FROM_DATABASE=Nations Technologies Inc.
+
  OUI:3071B2*
   ID_OUI_FROM_DATABASE=Hangzhou Prevail Optoelectronic Equipment Co.,LTD.
  
@@ -48935,6 +49085,9 @@ OUI:30E48E*
  OUI:30E4DB*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
+OUI:30E98E*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:30EA26*
   ID_OUI_FROM_DATABASE=Sycada BV
  
@@ -49448,6 +49601,9 @@ OUI:347A60*
  OUI:347C25*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:347E00*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:347E39*
   ID_OUI_FROM_DATABASE=Nokia Danmark A/S
  
@@ -49679,6 +49835,9 @@ OUI:34C99D*
  OUI:34C9F0*
   ID_OUI_FROM_DATABASE=LM Technologies Ltd
  
+OUI:34CB1A*
+ ID_OUI_FROM_DATABASE=Procter & Gamble Company
+
  OUI:34CC28*
   ID_OUI_FROM_DATABASE=Nexpring Co. LTD.,
  
@@ -49742,6 +49901,9 @@ OUI:34D0B8D*
  OUI:34D0B8E*
   ID_OUI_FROM_DATABASE=Kongqiguanjia (Beijing)Technology co.，ltd
  
+OUI:34D262*
+ ID_OUI_FROM_DATABASE=SZ DJI TECHNOLOGY CO.,LTD
+
  OUI:34D270*
   ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
  
@@ -49751,6 +49913,9 @@ OUI:34D2C4*
  OUI:34D712*
   ID_OUI_FROM_DATABASE=Smartisan Digital Co., Ltd
  
+OUI:34D772*
+ ID_OUI_FROM_DATABASE=Xiamen Yudian Automation Technology Co., Ltd
+
  OUI:34D7B4*
   ID_OUI_FROM_DATABASE=Tributary Systems, Inc.
  
@@ -50345,6 +50510,9 @@ OUI:388B59*
  OUI:388C50*
   ID_OUI_FROM_DATABASE=LG Electronics
  
+OUI:388E7A*
+ ID_OUI_FROM_DATABASE=AUTOIT
+
  OUI:388EE7*
   ID_OUI_FROM_DATABASE=Fanhattan LLC
  
@@ -52490,6 +52658,45 @@ OUI:44004D*
  OUI:44032C*
   ID_OUI_FROM_DATABASE=Intel Corporate
  
+OUI:4403770*
+ ID_OUI_FROM_DATABASE=Musashi Seimitsu Industry Co.,Ltd
+
+OUI:4403771*
+ ID_OUI_FROM_DATABASE=Atari, Inc.
+
+OUI:4403772*
+ ID_OUI_FROM_DATABASE=Exsom Computers LLC
+
+OUI:4403774*
+ ID_OUI_FROM_DATABASE=Lenovo Image(Tianjin) Technology Ltd.
+
+OUI:4403775*
+ ID_OUI_FROM_DATABASE=Norden Communication UK Ltd.
+
+OUI:4403776*
+ ID_OUI_FROM_DATABASE=SHEN ZHEN HUAWANG TECHNOLOGY CO; LTD
+
+OUI:4403777*
+ ID_OUI_FROM_DATABASE=Stara S/A Indústria de Implementos Agrícolas
+
+OUI:4403778*
+ ID_OUI_FROM_DATABASE=Gemmy Electronics (Shenzhen) Co, Ltd
+
+OUI:4403779*
+ ID_OUI_FROM_DATABASE=SHENZHEN UT-KING TECHNOLOGY CO.,LTD
+
+OUI:440377A*
+ ID_OUI_FROM_DATABASE=symplr
+
+OUI:440377B*
+ ID_OUI_FROM_DATABASE=Hangzhou Asia Infrastructure Tech. Co., Ltd.
+
+OUI:440377C*
+ ID_OUI_FROM_DATABASE=BIG Climatic Manufacture, Co. LTD, Zhongshan Branch
+
+OUI:440377D*
+ ID_OUI_FROM_DATABASE=OMNISENSE SYSTEMS PRIVATE LIMITED TAIWAN BRANCH
+
  OUI:4403A7*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
@@ -52520,6 +52727,9 @@ OUI:4413D0*
  OUI:441441*
   ID_OUI_FROM_DATABASE=AudioControl Inc.
  
+OUI:441847*
+ ID_OUI_FROM_DATABASE=HUNAN SCROWN ELECTRONIC INFORMATION TECH.CO.,LTD
+
  OUI:44184F*
   ID_OUI_FROM_DATABASE=Fitview
  
@@ -52547,6 +52757,9 @@ OUI:441E98*
  OUI:441EA1*
   ID_OUI_FROM_DATABASE=Hewlett Packard
  
+OUI:442295*
+ ID_OUI_FROM_DATABASE=China Mobile Iot Limited company
+
  OUI:4422F1*
   ID_OUI_FROM_DATABASE=S.FAC, INC
  
@@ -52682,6 +52895,9 @@ OUI:4454C0*
  OUI:4455B1*
   ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
  
+OUI:4455C4*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:44568D*
   ID_OUI_FROM_DATABASE=PNC Technologies  Co., Ltd.
  
@@ -53144,6 +53360,9 @@ OUI:44F477*
  OUI:44F849*
   ID_OUI_FROM_DATABASE=Union Pacific Railroad
  
+OUI:44F971*
+ ID_OUI_FROM_DATABASE=SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
+
  OUI:44FB42*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
@@ -53501,6 +53720,9 @@ OUI:487604*
  OUI:487746*
   ID_OUI_FROM_DATABASE=Calix Inc.
  
+OUI:48794D*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:487A55*
   ID_OUI_FROM_DATABASE=ALE International
  
@@ -54197,6 +54419,12 @@ OUI:4C6E6E*
  OUI:4C6F9C*
   ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
  
+OUI:4C710C*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
+OUI:4C710D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
  OUI:4C72B9*
   ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
  
@@ -54383,6 +54611,9 @@ OUI:4CABFC*
  OUI:4CAC0A*
   ID_OUI_FROM_DATABASE=zte corporation
  
+OUI:4CADA8*
+ ID_OUI_FROM_DATABASE=PANOPTICS CORP.
+
  OUI:4CAE1C*
   ID_OUI_FROM_DATABASE=SaiNXT Technologies LLP
  
@@ -55571,6 +55802,9 @@ OUI:54112F*
  OUI:54115F*
   ID_OUI_FROM_DATABASE=Atamo Pty Ltd
  
+OUI:541310*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:541379*
   ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
  
@@ -55958,6 +56192,51 @@ OUI:54A31B*
  OUI:54A3FA*
   ID_OUI_FROM_DATABASE=BQT Solutions (Australia)Pty Ltd
  
+OUI:54A4930*
+ ID_OUI_FROM_DATABASE=Intelligent Surveillance Corp
+
+OUI:54A4931*
+ ID_OUI_FROM_DATABASE=ShenZhen Smart&Aspiration Co.,LTD
+
+OUI:54A4932*
+ ID_OUI_FROM_DATABASE=genua GmbH
+
+OUI:54A4933*
+ ID_OUI_FROM_DATABASE=I-MOON TECHNOLOGY CO., LIMITED
+
+OUI:54A4934*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:54A4935*
+ ID_OUI_FROM_DATABASE=AUSOUNDS INTELLIGENCE, LLC
+
+OUI:54A4936*
+ ID_OUI_FROM_DATABASE=Hannto Technology Co., Ltd
+
+OUI:54A4937*
+ ID_OUI_FROM_DATABASE=RED Hydrogen LLC
+
+OUI:54A4938*
+ ID_OUI_FROM_DATABASE=Chengdu EVECCA Technology Co.,Ltd.
+
+OUI:54A4939*
+ ID_OUI_FROM_DATABASE=Do Easy International Limited
+
+OUI:54A493A*
+ ID_OUI_FROM_DATABASE=Wonders Technology Co., Ltd.
+
+OUI:54A493B*
+ ID_OUI_FROM_DATABASE=Advice
+
+OUI:54A493C*
+ ID_OUI_FROM_DATABASE=BJ COTYTECH TECHNOLOGY CO.,LTD
+
+OUI:54A493D*
+ ID_OUI_FROM_DATABASE=ASSEM TECHNOLOGY CO.,LTD.
+
+OUI:54A493E*
+ ID_OUI_FROM_DATABASE=Nederman Holding AB
+
  OUI:54A51B*
   ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
  
@@ -57098,6 +57377,9 @@ OUI:5C6F4F*
  OUI:5C70A3*
   ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
  
+OUI:5C710D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
  OUI:5C75AF*
   ID_OUI_FROM_DATABASE=Fitbit, Inc.
  
@@ -57230,6 +57512,9 @@ OUI:5CAF06*
  OUI:5CB066*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
+OUI:5CB13E*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
  OUI:5CB15F*
   ID_OUI_FROM_DATABASE=Oceanblue Cloud Technology Limited
  
@@ -57374,6 +57659,12 @@ OUI:5CE30E*
  OUI:5CE3B6*
   ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
  
+OUI:5CE50C*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
+OUI:5CE7A0*
+ ID_OUI_FROM_DATABASE=Nokia
+
  OUI:5CE7BF*
   ID_OUI_FROM_DATABASE=New Singularity International Technical Development Co.,Ltd
  
@@ -57803,6 +58094,9 @@ OUI:60748D*
  OUI:607688*
   ID_OUI_FROM_DATABASE=Velodyne
  
+OUI:607771*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
  OUI:6077E2*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
@@ -57980,6 +58274,9 @@ OUI:60AB14*
  OUI:60AB67*
   ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
  
+OUI:60ABD2*
+ ID_OUI_FROM_DATABASE=Bose Corporation
+
  OUI:60ACC8*
   ID_OUI_FROM_DATABASE=KunTeng Inc.
  
@@ -59063,6 +59360,9 @@ OUI:6836B5*
  OUI:6837E9*
   ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
  
+OUI:683943*
+ ID_OUI_FROM_DATABASE=ittim
+
  OUI:683A1E*
   ID_OUI_FROM_DATABASE=Cisco Meraki
  
@@ -59159,6 +59459,9 @@ OUI:685D43*
  OUI:685E6B*
   ID_OUI_FROM_DATABASE=PowerRay Co., Ltd.
  
+OUI:686350*
+ ID_OUI_FROM_DATABASE=Hella India Automotive Pvt Ltd
+
  OUI:686359*
   ID_OUI_FROM_DATABASE=Advanced Digital Broadcast SA
  
@@ -59435,6 +59738,9 @@ OUI:68BC0C*
  OUI:68BDAB*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
+OUI:68BFC4*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:68C44D*
   ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
  
@@ -59627,6 +59933,9 @@ OUI:6C198F*
  OUI:6C19C0*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:6C1C71*
+ ID_OUI_FROM_DATABASE=Zhejiang Dahua Technology Co., Ltd.
+
  OUI:6C1DEB*
   ID_OUI_FROM_DATABASE=u-blox AG
  
@@ -59654,6 +59963,9 @@ OUI:6C23CB*
  OUI:6C2483*
   ID_OUI_FROM_DATABASE=Microsoft Mobile Oy
  
+OUI:6C24A6*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
  OUI:6C25B9*
   ID_OUI_FROM_DATABASE=BBK EDUCATIONAL ELECTRONICS CORP.,LTD.
  
@@ -59876,6 +60188,9 @@ OUI:6C7039*
  OUI:6C709F*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:6C710D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
  OUI:6C71BD*
   ID_OUI_FROM_DATABASE=EZELINK TELECOM
  
@@ -60110,6 +60425,9 @@ OUI:6CD146*
  OUI:6CD1B0*
   ID_OUI_FROM_DATABASE=WING SING ELECTRONICS HONG KONG LIMITED
  
+OUI:6CD2BA*
+ ID_OUI_FROM_DATABASE=zte corporation
+
  OUI:6CD68A*
   ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
  
@@ -61028,6 +61346,9 @@ OUI:70B3D5043*
  OUI:70B3D5044*
   ID_OUI_FROM_DATABASE=Don Electronics Ltd
  
+OUI:70B3D5045*
+ ID_OUI_FROM_DATABASE=Navaero Avionics AB
+
  OUI:70B3D5046*
   ID_OUI_FROM_DATABASE=Shenzhen Rihuida Electronics Co,. Ltd
  
@@ -61109,6 +61430,9 @@ OUI:70B3D5064*
  OUI:70B3D5066*
   ID_OUI_FROM_DATABASE=North Pole Engineering, Inc.
  
+OUI:70B3D5067*
+ ID_OUI_FROM_DATABASE=NEOPATH INTEGRATED SYSTEMS LTDA
+
  OUI:70B3D5068*
   ID_OUI_FROM_DATABASE=Onethinx BV
  
@@ -61541,6 +61865,9 @@ OUI:70B3D5111*
  OUI:70B3D5112*
   ID_OUI_FROM_DATABASE=DiTEST Fahrzeugdiagnose GmbH
  
+OUI:70B3D5113*
+ ID_OUI_FROM_DATABASE=iREA System Industry
+
  OUI:70B3D5114*
   ID_OUI_FROM_DATABASE=Project H Pty Ltd
  
@@ -61940,6 +62267,9 @@ OUI:70B3D51BE*
  OUI:70B3D51C0*
   ID_OUI_FROM_DATABASE=W. H. Leary Co., Inc.
  
+OUI:70B3D51C2*
+ ID_OUI_FROM_DATABASE=CENSIS, Uiversity of Glasgow
+
  OUI:70B3D51C4*
   ID_OUI_FROM_DATABASE=Smeg S.p.A.
  
@@ -62165,6 +62495,9 @@ OUI:70B3D521F*
  OUI:70B3D5220*
   ID_OUI_FROM_DATABASE=Private
  
+OUI:70B3D5221*
+ ID_OUI_FROM_DATABASE=LX Design House
+
  OUI:70B3D5222*
   ID_OUI_FROM_DATABASE=Marioff Corporation Oy
  
@@ -62357,6 +62690,9 @@ OUI:70B3D526E*
  OUI:70B3D526F*
   ID_OUI_FROM_DATABASE=COMPAL ELECTRONICS, INC.
  
+OUI:70B3D5270*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
  OUI:70B3D5272*
   ID_OUI_FROM_DATABASE=TELECOM SANTE
  
@@ -62759,6 +63095,9 @@ OUI:70B3D531E*
  OUI:70B3D531F*
   ID_OUI_FROM_DATABASE=Elcoma
  
+OUI:70B3D5320*
+ ID_OUI_FROM_DATABASE=CYNIX Systems Inc
+
  OUI:70B3D5323*
   ID_OUI_FROM_DATABASE=TATTILE SRL
  
@@ -62930,6 +63269,9 @@ OUI:70B3D5364*
  OUI:70B3D5365*
   ID_OUI_FROM_DATABASE=CircuitMeter Inc.
  
+OUI:70B3D5366*
+ ID_OUI_FROM_DATABASE=Solarlytics, Inc.
+
  OUI:70B3D5367*
   ID_OUI_FROM_DATABASE=Living Water
  
@@ -62957,6 +63299,9 @@ OUI:70B3D5370*
  OUI:70B3D5371*
   ID_OUI_FROM_DATABASE=BEDEROV GmbH
  
+OUI:70B3D5372*
+ ID_OUI_FROM_DATABASE=MATELEX
+
  OUI:70B3D5374*
   ID_OUI_FROM_DATABASE=OOO NPP Mars-Energo
  
@@ -63014,6 +63359,9 @@ OUI:70B3D5388*
  OUI:70B3D5389*
   ID_OUI_FROM_DATABASE=Private
  
+OUI:70B3D538A*
+ ID_OUI_FROM_DATABASE=KSE GmbH
+
  OUI:70B3D538B*
   ID_OUI_FROM_DATABASE=Lookman Electroplast Industries Ltd
  
@@ -63341,9 +63689,15 @@ OUI:70B3D541A*
  OUI:70B3D541B*
   ID_OUI_FROM_DATABASE=SYS TEC electronic GmbH
  
+OUI:70B3D541D*
+ ID_OUI_FROM_DATABASE=Azmoon Keifiat
+
  OUI:70B3D541E*
   ID_OUI_FROM_DATABASE=Redler Computers
  
+OUI:70B3D541F*
+ ID_OUI_FROM_DATABASE=Orion S.r.l.
+
  OUI:70B3D5420*
   ID_OUI_FROM_DATABASE=ECOINET
  
@@ -63473,6 +63827,9 @@ OUI:70B3D5458*
  OUI:70B3D5459*
   ID_OUI_FROM_DATABASE=Protium Technologies, Inc.
  
+OUI:70B3D545A*
+ ID_OUI_FROM_DATABASE=Palarum LLC
+
  OUI:70B3D545B*
   ID_OUI_FROM_DATABASE=KOMZ - IZMERENIYA
  
@@ -63617,6 +63974,9 @@ OUI:70B3D549A*
  OUI:70B3D549B*
   ID_OUI_FROM_DATABASE=Algodue Elettronica Srl
  
+OUI:70B3D549D*
+ ID_OUI_FROM_DATABASE=Shenzhen Chanslink Network Technology Co., Ltd
+
  OUI:70B3D549E*
   ID_OUI_FROM_DATABASE=CAPTEMP, Lda
  
@@ -63710,6 +64070,9 @@ OUI:70B3D54BD*
  OUI:70B3D54BE*
   ID_OUI_FROM_DATABASE=GY-FX SAS
  
+OUI:70B3D54BF*
+ ID_OUI_FROM_DATABASE=Exsom Computers LLC
+
  OUI:70B3D54C0*
   ID_OUI_FROM_DATABASE=Technica Engineering GmbH
  
@@ -63827,6 +64190,9 @@ OUI:70B3D54F4*
  OUI:70B3D54F6*
   ID_OUI_FROM_DATABASE=DORLET SAU
  
+OUI:70B3D54F7*
+ ID_OUI_FROM_DATABASE=Foxtel srl
+
  OUI:70B3D54F8*
   ID_OUI_FROM_DATABASE=Private
  
@@ -63842,6 +64208,9 @@ OUI:70B3D54FC*
  OUI:70B3D54FE*
   ID_OUI_FROM_DATABASE=WiTagg, Inc
  
+OUI:70B3D54FF*
+ ID_OUI_FROM_DATABASE=Shanghai AiGentoo Information Technology Co.,Ltd.
+
  OUI:70B3D5500*
   ID_OUI_FROM_DATABASE=Mistral Solutions Pvt. LTD
  
@@ -63902,6 +64271,9 @@ OUI:70B3D5517*
  OUI:70B3D5518*
   ID_OUI_FROM_DATABASE=CRUXELL Corp.
  
+OUI:70B3D5519*
+ ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
+
  OUI:70B3D551B*
   ID_OUI_FROM_DATABASE=Vitrea Smart Home Technologies
  
@@ -63935,6 +64307,9 @@ OUI:70B3D5526*
  OUI:70B3D5528*
   ID_OUI_FROM_DATABASE=Aplex Technology Inc.
  
+OUI:70B3D552A*
+ ID_OUI_FROM_DATABASE=Dataflex International BV
+
  OUI:70B3D552B*
   ID_OUI_FROM_DATABASE=GE Aviation Cheltenham
  
@@ -64079,6 +64454,12 @@ OUI:70B3D5564*
  OUI:70B3D5566*
   ID_OUI_FROM_DATABASE=Data Informs LLC
  
+OUI:70B3D5568*
+ ID_OUI_FROM_DATABASE=Small Data Garden Oy
+
+OUI:70B3D5569*
+ ID_OUI_FROM_DATABASE=Nuance Hearing Ltd.
+
  OUI:70B3D556A*
   ID_OUI_FROM_DATABASE=Harvard Technology Ltd
  
@@ -64298,6 +64679,9 @@ OUI:70B3D55CD*
  OUI:70B3D55CF*
   ID_OUI_FROM_DATABASE=PROEL TSI s.r.l.
  
+OUI:70B3D55D0*
+ ID_OUI_FROM_DATABASE=InterTalk Critical Information Systems
+
  OUI:70B3D55D1*
   ID_OUI_FROM_DATABASE=Software Motor Corp
  
@@ -64787,6 +65171,9 @@ OUI:70B3D56A8*
  OUI:70B3D56A9*
   ID_OUI_FROM_DATABASE=OHMORI ELECTRIC INDUSTRIES CO.LTD
  
+OUI:70B3D56AB*
+ ID_OUI_FROM_DATABASE=ARROW (CHINA) ELECTRONICS TRADING CO., LTD.
+
  OUI:70B3D56AD*
   ID_OUI_FROM_DATABASE=CONNIT
  
@@ -64817,6 +65204,9 @@ OUI:70B3D56B7*
  OUI:70B3D56B8*
   ID_OUI_FROM_DATABASE=BT9
  
+OUI:70B3D56B9*
+ ID_OUI_FROM_DATABASE=Becton Dickinson
+
  OUI:70B3D56BA*
   ID_OUI_FROM_DATABASE=Integrotech sp. z o.o.
  
@@ -65450,9 +65840,15 @@ OUI:70B3D57B9*
  OUI:70B3D57BA*
   ID_OUI_FROM_DATABASE=Decentlab GmbH
  
+OUI:70B3D57BB*
+ ID_OUI_FROM_DATABASE=Aloxy
+
  OUI:70B3D57BC*
   ID_OUI_FROM_DATABASE=FIRST RF Corporation
  
+OUI:70B3D57BE*
+ ID_OUI_FROM_DATABASE=Phytron GmbH
+
  OUI:70B3D57BF*
   ID_OUI_FROM_DATABASE=Stone Three
  
@@ -65660,6 +66056,9 @@ OUI:70B3D5813*
  OUI:70B3D5814*
   ID_OUI_FROM_DATABASE=Ingenieurbuero SOMTRONIK
  
+OUI:70B3D5815*
+ ID_OUI_FROM_DATABASE=Waco Giken Co.,  Ltd.
+
  OUI:70B3D5816*
   ID_OUI_FROM_DATABASE=Smith Meter, Inc.
  
@@ -65975,6 +66374,9 @@ OUI:70B3D589A*
  OUI:70B3D589B*
   ID_OUI_FROM_DATABASE=ControlWorks, Inc.
  
+OUI:70B3D589C*
+ ID_OUI_FROM_DATABASE=IHI Rotating Machinery Engineering Co.,Ltd.
+
  OUI:70B3D58A0*
   ID_OUI_FROM_DATABASE=DM RADIOCOM
  
@@ -66071,6 +66473,9 @@ OUI:70B3D58CA*
  OUI:70B3D58CB*
   ID_OUI_FROM_DATABASE=WELT Corporation
  
+OUI:70B3D58CC*
+ ID_OUI_FROM_DATABASE=Piranha EMS Inc.
+
  OUI:70B3D58CD*
   ID_OUI_FROM_DATABASE=EA Elektroautomatik GmbH & Co. KG
  
@@ -66201,7 +66606,7 @@ OUI:70B3D590D*
   ID_OUI_FROM_DATABASE=Modtronix Engineering
  
  OUI:70B3D590E*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Maytronics Ltd.
  
  OUI:70B3D590F*
   ID_OUI_FROM_DATABASE=DTRON Communications (Pty) Ltd
@@ -66392,6 +66797,9 @@ OUI:70B3D595C*
  OUI:70B3D595E*
   ID_OUI_FROM_DATABASE=BLOCKSI LLC
  
+OUI:70B3D595F*
+ ID_OUI_FROM_DATABASE=WiFi Nation Ltd
+
  OUI:70B3D5960*
   ID_OUI_FROM_DATABASE=HORIZON TELECOM
  
@@ -66557,6 +66965,9 @@ OUI:70B3D59AA*
  OUI:70B3D59AB*
   ID_OUI_FROM_DATABASE=Groupe Paris-Turf
  
+OUI:70B3D59AC*
+ ID_OUI_FROM_DATABASE=Suzhou Sapa Automotive Technology Co.,Ltd
+
  OUI:70B3D59AD*
   ID_OUI_FROM_DATABASE=Fortuna Impex Pvt ltd
  
@@ -66689,6 +67100,9 @@ OUI:70B3D59DF*
  OUI:70B3D59E0*
   ID_OUI_FROM_DATABASE=ES Industrial Systems Co., Ltd.
  
+OUI:70B3D59E1*
+ ID_OUI_FROM_DATABASE=Bolide Technology Group, Inc.
+
  OUI:70B3D59E2*
   ID_OUI_FROM_DATABASE=Ofil USA
  
@@ -67019,6 +67433,9 @@ OUI:70B3D5A64*
  OUI:70B3D5A66*
   ID_OUI_FROM_DATABASE=Trapeze Software Group Inc
  
+OUI:70B3D5A67*
+ ID_OUI_FROM_DATABASE=Gstar Creation Co .,Ltd
+
  OUI:70B3D5A68*
   ID_OUI_FROM_DATABASE=Zhejiang Zhaolong Interconnect Technology Co.,Ltd
  
@@ -67358,6 +67775,9 @@ OUI:70B3D5AEB*
  OUI:70B3D5AEC*
   ID_OUI_FROM_DATABASE=Paratec Ltd.
  
+OUI:70B3D5AED*
+ ID_OUI_FROM_DATABASE=Cubitech
+
  OUI:70B3D5AEE*
   ID_OUI_FROM_DATABASE=DiTEST Fahrzeugdiagnose GmbH
  
@@ -67607,6 +68027,12 @@ OUI:70B3D5B58*
  OUI:70B3D5B59*
   ID_OUI_FROM_DATABASE=FutureTechnologyLaboratories INC.
  
+OUI:70B3D5B5A*
+ ID_OUI_FROM_DATABASE=GTI Technologies Inc
+
+OUI:70B3D5B5B*
+ ID_OUI_FROM_DATABASE=DynaMount LLC
+
  OUI:70B3D5B5C*
   ID_OUI_FROM_DATABASE=Prozess Technologie
  
@@ -67763,6 +68189,9 @@ OUI:70B3D5BA3*
  OUI:70B3D5BA4*
   ID_OUI_FROM_DATABASE=EIWA GIKEN INC.
  
+OUI:70B3D5BA5*
+ ID_OUI_FROM_DATABASE=fpgalabs.com
+
  OUI:70B3D5BA6*
   ID_OUI_FROM_DATABASE=Gluon Solutions Inc.
  
@@ -67964,6 +68393,9 @@ OUI:70B3D5BF5*
  OUI:70B3D5BF6*
   ID_OUI_FROM_DATABASE=comtac AG
  
+OUI:70B3D5BF8*
+ ID_OUI_FROM_DATABASE=RCH ITALIA SPA
+
  OUI:70B3D5BF9*
   ID_OUI_FROM_DATABASE=Okolab Srl
  
@@ -67982,6 +68414,9 @@ OUI:70B3D5BFD*
  OUI:70B3D5BFE*
   ID_OUI_FROM_DATABASE=Aplex Technology Inc.
  
+OUI:70B3D5BFF*
+ ID_OUI_FROM_DATABASE=Sunsa, Inc
+
  OUI:70B3D5C00*
   ID_OUI_FROM_DATABASE=BESO sp. z o.o.
  
@@ -68165,6 +68600,9 @@ OUI:70B3D5C4E*
  OUI:70B3D5C4F*
   ID_OUI_FROM_DATABASE=AE Van de Vliet BVBA
  
+OUI:70B3D5C50*
+ ID_OUI_FROM_DATABASE=Combilent
+
  OUI:70B3D5C51*
   ID_OUI_FROM_DATABASE=Innotas Elektronik GmbH
  
@@ -68228,6 +68666,9 @@ OUI:70B3D5C67*
  OUI:70B3D5C68*
   ID_OUI_FROM_DATABASE=Mini Solution Co. Ltd.
  
+OUI:70B3D5C69*
+ ID_OUI_FROM_DATABASE=AZ-TECHNOLOGY SDN BHD
+
  OUI:70B3D5C6A*
   ID_OUI_FROM_DATABASE=Private
  
@@ -68342,6 +68783,9 @@ OUI:70B3D5C97*
  OUI:70B3D5C9B*
   ID_OUI_FROM_DATABASE=Tieto Sweden AB
  
+OUI:70B3D5C9C*
+ ID_OUI_FROM_DATABASE=Connected Response
+
  OUI:70B3D5C9D*
   ID_OUI_FROM_DATABASE=APG Cash Drawer, LLC
  
@@ -68363,6 +68807,9 @@ OUI:70B3D5CA3*
  OUI:70B3D5CA4*
   ID_OUI_FROM_DATABASE=Netemera Sp. z o.o.
  
+OUI:70B3D5CA7*
+ ID_OUI_FROM_DATABASE=i-View Communication Inc.
+
  OUI:70B3D5CA8*
   ID_OUI_FROM_DATABASE=Grupo Epelsa S.L.
  
@@ -68381,6 +68828,9 @@ OUI:70B3D5CAC*
  OUI:70B3D5CAE*
   ID_OUI_FROM_DATABASE=THEMA
  
+OUI:70B3D5CB0*
+ ID_OUI_FROM_DATABASE=Ossiaco
+
  OUI:70B3D5CB1*
   ID_OUI_FROM_DATABASE=RADAR
  
@@ -68402,6 +68852,9 @@ OUI:70B3D5CB7*
  OUI:70B3D5CB8*
   ID_OUI_FROM_DATABASE=Verti Tecnologia
  
+OUI:70B3D5CB9*
+ ID_OUI_FROM_DATABASE=JSC «SATIS-TL-94»
+
  OUI:70B3D5CBA*
   ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
  
@@ -68543,6 +68996,9 @@ OUI:70B3D5CF5*
  OUI:70B3D5CF6*
   ID_OUI_FROM_DATABASE=Tornado Modular Systems
  
+OUI:70B3D5CF7*
+ ID_OUI_FROM_DATABASE=GENTEC ELECTRO-OPTICS
+
  OUI:70B3D5CF8*
   ID_OUI_FROM_DATABASE=Idneo Technologies S.A.U.
  
@@ -68603,6 +69059,9 @@ OUI:70B3D5D12*
  OUI:70B3D5D15*
   ID_OUI_FROM_DATABASE=3DGence sp. z o.o.
  
+OUI:70B3D5D16*
+ ID_OUI_FROM_DATABASE=Monnit Corporation
+
  OUI:70B3D5D1A*
   ID_OUI_FROM_DATABASE=Monnit Corporation
  
@@ -68636,6 +69095,9 @@ OUI:70B3D5D25*
  OUI:70B3D5D26*
   ID_OUI_FROM_DATABASE=MI Inc.
  
+OUI:70B3D5D27*
+ ID_OUI_FROM_DATABASE=Light field Lab
+
  OUI:70B3D5D28*
   ID_OUI_FROM_DATABASE=Toshiba Electron Tubes & Devices Co., Ltd.
  
@@ -68687,6 +69149,9 @@ OUI:70B3D5D3B*
  OUI:70B3D5D3C*
   ID_OUI_FROM_DATABASE=HRT
  
+OUI:70B3D5D3D*
+ ID_OUI_FROM_DATABASE=Netzikon GmbH
+
  OUI:70B3D5D3F*
   ID_OUI_FROM_DATABASE=GLOBALCOM ENGINEERING SPA
  
@@ -69035,9 +69500,15 @@ OUI:70B3D5DD2*
  OUI:70B3D5DD3*
   ID_OUI_FROM_DATABASE=VITEC
  
+OUI:70B3D5DD4*
+ ID_OUI_FROM_DATABASE=ResIOT UBLSOFTWARE SRL
+
  OUI:70B3D5DD5*
   ID_OUI_FROM_DATABASE=Cooltera Limited
  
+OUI:70B3D5DD6*
+ ID_OUI_FROM_DATABASE=Umweltanalytik Holbach GmbH
+
  OUI:70B3D5DD7*
   ID_OUI_FROM_DATABASE=DETECT Australia
  
@@ -69065,6 +69536,9 @@ OUI:70B3D5DE0*
  OUI:70B3D5DE2*
   ID_OUI_FROM_DATABASE=ACD Elekronik GmbH
  
+OUI:70B3D5DE3*
+ ID_OUI_FROM_DATABASE=ETL Elektrotechnik Lauter GmbH
+
  OUI:70B3D5DE4*
   ID_OUI_FROM_DATABASE=MAVILI ELEKTRONIK TIC. VE SAN. A.S.
  
@@ -69176,6 +69650,9 @@ OUI:70B3D5E0D*
  OUI:70B3D5E0F*
   ID_OUI_FROM_DATABASE=Vtron Pty Ltd
  
+OUI:70B3D5E10*
+ ID_OUI_FROM_DATABASE=Leidos
+
  OUI:70B3D5E14*
   ID_OUI_FROM_DATABASE=Automata Spa
  
@@ -69273,7 +69750,7 @@ OUI:70B3D5E3B*
   ID_OUI_FROM_DATABASE=ComNav Technology Ltd.
  
  OUI:70B3D5E3C*
- ID_OUI_FROM_DATABASE=Independent Project Engineering Lmited
+ ID_OUI_FROM_DATABASE=Densitron Technologies Ltd
  
  OUI:70B3D5E3D*
   ID_OUI_FROM_DATABASE=Leo Bodnar Electronics Ltd
@@ -69416,6 +69893,9 @@ OUI:70B3D5E7D*
  OUI:70B3D5E7E*
   ID_OUI_FROM_DATABASE=Groupe Citypassenger Inc
  
+OUI:70B3D5E80*
+ ID_OUI_FROM_DATABASE=Changzhou Rapid Information Technology Co,Ltd
+
  OUI:70B3D5E81*
   ID_OUI_FROM_DATABASE=SLAT
  
@@ -69434,6 +69914,9 @@ OUI:70B3D5E86*
  OUI:70B3D5E88*
   ID_OUI_FROM_DATABASE=Breas Medical AB
  
+OUI:70B3D5E89*
+ ID_OUI_FROM_DATABASE=JSC Kaluga Astral
+
  OUI:70B3D5E8A*
   ID_OUI_FROM_DATABASE=Melecs EWS GmbH
  
@@ -69575,6 +70058,9 @@ OUI:70B3D5EC3*
  OUI:70B3D5EC4*
   ID_OUI_FROM_DATABASE=hmt telematik GmbH
  
+OUI:70B3D5EC5*
+ ID_OUI_FROM_DATABASE=TATTILE SRL
+
  OUI:70B3D5EC6*
   ID_OUI_FROM_DATABASE=ESII
  
@@ -69590,6 +70076,9 @@ OUI:70B3D5ECA*
  OUI:70B3D5ECB*
   ID_OUI_FROM_DATABASE=Re spa - Controlli Industriali - IT01782300154
  
+OUI:70B3D5ECC*
+ ID_OUI_FROM_DATABASE=Digifocus Technology Inc.
+
  OUI:70B3D5ECD*
   ID_OUI_FROM_DATABASE=SBS-Feintechnik GmbH & Co. KG
  
@@ -69647,6 +70136,9 @@ OUI:70B3D5EE7*
  OUI:70B3D5EE8*
   ID_OUI_FROM_DATABASE=robert juliat
  
+OUI:70B3D5EE9*
+ ID_OUI_FROM_DATABASE=SC3 Automation
+
  OUI:70B3D5EEA*
   ID_OUI_FROM_DATABASE=Dameca a/s
  
@@ -70760,6 +71252,9 @@ OUI:7438B7*
  OUI:743A65*
   ID_OUI_FROM_DATABASE=NEC Corporation
  
+OUI:743C18*
+ ID_OUI_FROM_DATABASE=Taicang T&W Electronics
+
  OUI:743E2B*
   ID_OUI_FROM_DATABASE=Ruckus Wireless
  
@@ -71015,6 +71510,9 @@ OUI:748A0D*
  OUI:748A69*
   ID_OUI_FROM_DATABASE=Korea Image Technology Co., Ltd
  
+OUI:748B34*
+ ID_OUI_FROM_DATABASE=Shanghai Smart System Technology Co., Ltd
+
  OUI:748D08*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
@@ -71078,6 +71576,9 @@ OUI:749EA5*
  OUI:749EAF*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:749EF5*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:74A02F*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
@@ -72422,6 +72923,9 @@ OUI:7C2048*
  OUI:7C2064*
   ID_OUI_FROM_DATABASE=Alcatel-Lucent IPD
  
+OUI:7C210D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
  OUI:7C21D8*
   ID_OUI_FROM_DATABASE=Shenzhen Think Will Communication Technology co., LTD.
  
@@ -72551,6 +73055,9 @@ OUI:7C477CD*
  OUI:7C477CE*
   ID_OUI_FROM_DATABASE=I-Convergence.com
  
+OUI:7C48B2*
+ ID_OUI_FROM_DATABASE=Vida Resources Lte Ltd
+
  OUI:7C49B9*
   ID_OUI_FROM_DATABASE=Plexus Manufacturing Sdn Bhd
  
@@ -72854,6 +73361,9 @@ OUI:7CA29B*
  OUI:7CA61D*
   ID_OUI_FROM_DATABASE=MHL, LLC
  
+OUI:7CA7B0*
+ ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
+
  OUI:7CA97D*
   ID_OUI_FROM_DATABASE=Objenious
  
@@ -73112,6 +73622,9 @@ OUI:7CD1C3*
  OUI:7CD30A*
   ID_OUI_FROM_DATABASE=INVENTEC CORPORATION
  
+OUI:7CD566*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
  OUI:7CD661*
   ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
  
@@ -73388,6 +73901,9 @@ OUI:8030E0*
  OUI:8031F0*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
+OUI:803253*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
  OUI:803457*
   ID_OUI_FROM_DATABASE=OT Systems Limited
  
@@ -73568,6 +74084,9 @@ OUI:80739F*
  OUI:807459*
   ID_OUI_FROM_DATABASE=K's Co.,Ltd.
  
+OUI:80751F*
+ ID_OUI_FROM_DATABASE=BSkyB Ltd
+
  OUI:807693*
   ID_OUI_FROM_DATABASE=Newag SA
  
@@ -73646,6 +74165,9 @@ OUI:807D3A*
  OUI:807DE3*
   ID_OUI_FROM_DATABASE=Chongqing Sichuan Instrument Microcircuit Co.LTD.
  
+OUI:807FF8*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
  OUI:8081A5*
   ID_OUI_FROM_DATABASE=TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd
  
@@ -73889,6 +74411,9 @@ OUI:80DB31*
  OUI:80E01D*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
+OUI:80E455*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
  OUI:80E4DA0*
   ID_OUI_FROM_DATABASE=Wheatstone Corporation
  
@@ -74504,6 +75029,9 @@ OUI:8497B8*
  OUI:849866*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
+OUI:849A40*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
  OUI:849CA6*
   ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation
  
@@ -75641,6 +76169,9 @@ OUI:88FED6*
  OUI:8C006D*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:8C02FA*
+ ID_OUI_FROM_DATABASE=COMMANDO Networks Limited
+
  OUI:8C04BA*
   ID_OUI_FROM_DATABASE=Dell Inc.
  
@@ -76289,6 +76820,9 @@ OUI:8CC7AA*
  OUI:8CC7D0*
   ID_OUI_FROM_DATABASE=zhejiang ebang communication co.,ltd
  
+OUI:8CC84B*
+ ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
+
  OUI:8CC8CD*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
@@ -76370,6 +76904,9 @@ OUI:8CD628*
  OUI:8CDB25*
   ID_OUI_FROM_DATABASE=ESG Solutions
  
+OUI:8CDC02*
+ ID_OUI_FROM_DATABASE=zte corporation
+
  OUI:8CDCD4*
   ID_OUI_FROM_DATABASE=Hewlett Packard
  
@@ -76400,6 +76937,9 @@ OUI:8CE38E*
  OUI:8CE5C0*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
+OUI:8CE5EF*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:8CE748*
   ID_OUI_FROM_DATABASE=Private
  
@@ -76556,6 +77096,9 @@ OUI:9018AE*
  OUI:901900*
   ID_OUI_FROM_DATABASE=SCS SA
  
+OUI:901A4F*
+ ID_OUI_FROM_DATABASE=EM Microelectronic
+
  OUI:901ACA*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
@@ -77033,6 +77576,9 @@ OUI:90B832*
  OUI:90B8D0*
   ID_OUI_FROM_DATABASE=Joyent, Inc.
  
+OUI:90B8E0*
+ ID_OUI_FROM_DATABASE=SHENZHEN YANRAY TECHNOLOGY CO.,LTD
+
  OUI:90B931*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
@@ -78458,6 +79004,9 @@ OUI:98AAFCE*
  OUI:98AE71*
   ID_OUI_FROM_DATABASE=VVDN Technologies Pvt Ltd
  
+OUI:98AF65*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
  OUI:98B039*
   ID_OUI_FROM_DATABASE=Nokia
  
@@ -78812,6 +79361,9 @@ OUI:9C3178*
  OUI:9C31B6*
   ID_OUI_FROM_DATABASE=Kulite Semiconductor Products Inc
  
+OUI:9C31C3*
+ ID_OUI_FROM_DATABASE=BSkyB Ltd
+
  OUI:9C32A9*
   ID_OUI_FROM_DATABASE=SICHUAN TIANYI COMHEART TELECOMCO., LTD
  
@@ -78974,6 +79526,9 @@ OUI:9C5D95*
  OUI:9C5E73*
   ID_OUI_FROM_DATABASE=Calibre UK LTD
  
+OUI:9C5F5A*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
  OUI:9C611D*
   ID_OUI_FROM_DATABASE=Omni-ID USA, Inc.
  
@@ -79055,6 +79610,9 @@ OUI:9C69B4D*
  OUI:9C69B4E*
   ID_OUI_FROM_DATABASE=NINGBO SHEN LINK COMMUNICATION TECHNOLOGY CO., LTD
  
+OUI:9C69D1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:9C6ABE*
   ID_OUI_FROM_DATABASE=QEES ApS.
  
@@ -79391,6 +79949,9 @@ OUI:9CF387*
  OUI:9CF48E*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:9CF531*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
  OUI:9CF61A*
   ID_OUI_FROM_DATABASE=UTC Fire and Security
  
@@ -79979,6 +80540,9 @@ OUI:A09347*
  OUI:A09351*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
+OUI:A0946A*
+ ID_OUI_FROM_DATABASE=Shenzhen XGTEC Technology Co,.Ltd.
+
  OUI:A0950C*
   ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
  
@@ -80261,6 +80825,9 @@ OUI:A0DDE5*
  OUI:A0DE05*
   ID_OUI_FROM_DATABASE=JSC Irbis-T
  
+OUI:A0DF15*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:A0E0AF*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
@@ -81074,12 +81641,18 @@ OUI:A4C64F*
  OUI:A4C7DE*
   ID_OUI_FROM_DATABASE=Cambridge Industries(Group) Co.,Ltd.
  
+OUI:A4C939*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
  OUI:A4CAA0*
   ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
  
  OUI:A4CC32*
   ID_OUI_FROM_DATABASE=Inficomm Co., Ltd
  
+OUI:A4CD23*
+ ID_OUI_FROM_DATABASE=Shenzhenshi Xinzhongxin  Co., Ltd
+
  OUI:A4CF12*
   ID_OUI_FROM_DATABASE=Espressif Inc.
  
@@ -81536,6 +82109,9 @@ OUI:A85BF3*
  OUI:A85C2C*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:A85E45*
+ ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
+
  OUI:A85EE4*
   ID_OUI_FROM_DATABASE=12Sided Technology, LLC
  
@@ -82385,6 +82961,9 @@ OUI:AC8ACD*
  OUI:AC8D14*
   ID_OUI_FROM_DATABASE=Smartrove Inc
  
+OUI:AC8D34*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:AC8FF8*
   ID_OUI_FROM_DATABASE=Nokia
  
@@ -82487,6 +83066,9 @@ OUI:ACBC32*
  OUI:ACBD0B*
   ID_OUI_FROM_DATABASE=IMAC CO.,LTD
  
+OUI:ACBD70*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:ACBE75*
   ID_OUI_FROM_DATABASE=Ufine Technologies Co.,Ltd.
  
@@ -84026,6 +84608,9 @@ OUI:B4B859*
  OUI:B4B88D*
   ID_OUI_FROM_DATABASE=Thuh Company
  
+OUI:B4BC7C*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
  OUI:B4BFF6*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
@@ -84143,6 +84728,12 @@ OUI:B4E62D*
  OUI:B4E782*
   ID_OUI_FROM_DATABASE=Vivalnk
  
+OUI:B4E842*
+ ID_OUI_FROM_DATABASE=Hong Kong Bouffalo Lab Limited
+
+OUI:B4E8C9*
+ ID_OUI_FROM_DATABASE=XADA Technologies
+
  OUI:B4E9A3*
   ID_OUI_FROM_DATABASE=port GmbH
  
@@ -84341,6 +84932,9 @@ OUI:B838CA*
  OUI:B83A08*
   ID_OUI_FROM_DATABASE=Tenda Technology Co.,Ltd.Dongguan branch
  
+OUI:B83A5A*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
  OUI:B83A7B*
   ID_OUI_FROM_DATABASE=Worldplay (Canada) Inc.
  
@@ -84506,6 +85100,9 @@ OUI:B8871E*
  OUI:B887A8*
   ID_OUI_FROM_DATABASE=Step Ahead Innovations Inc.
  
+OUI:B887C6*
+ ID_OUI_FROM_DATABASE=Prudential Technology co.,LTD
+
  OUI:B888E3*
   ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD.
  
@@ -84884,6 +85481,9 @@ OUI:B8F74A*
  OUI:B8F828*
   ID_OUI_FROM_DATABASE=Changshu Gaoshida Optoelectronic Technology Co. Ltd.
  
+OUI:B8F853*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
  OUI:B8F883*
   ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
  
@@ -85013,6 +85613,9 @@ OUI:BC2D98*
  OUI:BC2E48*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
+OUI:BC2EF6*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:BC2F3D*
   ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
  
@@ -85775,6 +86378,9 @@ OUI:C02DEE*
  OUI:C02E25*
   ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
  
+OUI:C02E26*
+ ID_OUI_FROM_DATABASE=Private
+
  OUI:C02FF1*
   ID_OUI_FROM_DATABASE=Volta Networks
  
@@ -86267,6 +86873,9 @@ OUI:C0DA74*
  OUI:C0DC6A*
   ID_OUI_FROM_DATABASE=Qingdao Eastsoft Communication Technology Co.,LTD
  
+OUI:C0DCDA*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:C0DF77*
   ID_OUI_FROM_DATABASE=Conrad Electronic SE
  
@@ -86276,6 +86885,9 @@ OUI:C0E422*
  OUI:C0E42D*
   ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
  
+OUI:C0E434*
+ ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
+
  OUI:C0E54E*
   ID_OUI_FROM_DATABASE=ARIES Embedded GmbH
  
@@ -86483,6 +87095,9 @@ OUI:C438D3*
  OUI:C4393A*
   ID_OUI_FROM_DATABASE=SMC Networks Inc
  
+OUI:C43A35*
+ ID_OUI_FROM_DATABASE=FN-LINK TECHNOLOGY LIMITED
+
  OUI:C43A9F*
   ID_OUI_FROM_DATABASE=Siconix Inc.
  
@@ -86507,6 +87122,9 @@ OUI:C44202*
  OUI:C4438F*
   ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
  
+OUI:C4447D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:C444A0*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
@@ -86834,6 +87452,9 @@ OUI:C4AC59*
  OUI:C4AD21*
   ID_OUI_FROM_DATABASE=MEDIAEDGE Corporation
  
+OUI:C4AD34*
+ ID_OUI_FROM_DATABASE=Routerboard.com
+
  OUI:C4ADF1*
   ID_OUI_FROM_DATABASE=GOPEACE Inc.
  
@@ -86921,6 +87542,9 @@ OUI:C4D489*
  OUI:C4D655*
   ID_OUI_FROM_DATABASE=Tercel technology co.,ltd
  
+OUI:C4D8F3*
+ ID_OUI_FROM_DATABASE=iZotope
+
  OUI:C4D987*
   ID_OUI_FROM_DATABASE=Intel Corporate
  
@@ -86933,6 +87557,9 @@ OUI:C4DA7D*
  OUI:C4E032*
   ID_OUI_FROM_DATABASE=IEEE 1904.1 Working Group
  
+OUI:C4E0DE*
+ ID_OUI_FROM_DATABASE=Zhengzhou XindaJiean Information Technology Co.,Ltd.
+
  OUI:C4E17C*
   ID_OUI_FROM_DATABASE=U2S co.
  
@@ -86951,6 +87578,9 @@ OUI:C4E510*
  OUI:C4E7BE*
   ID_OUI_FROM_DATABASE=SCSpro Co.,Ltd
  
+OUI:C4E90A*
+ ID_OUI_FROM_DATABASE=D-Link International
+
  OUI:C4E92F*
   ID_OUI_FROM_DATABASE=AB Sciex
  
@@ -87083,6 +87713,9 @@ OUI:C80873*
  OUI:C808E9*
   ID_OUI_FROM_DATABASE=LG Electronics
  
+OUI:C809A8*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
  OUI:C80AA9*
   ID_OUI_FROM_DATABASE=QUANTA COMPUTER INC.
  
@@ -87296,6 +87929,9 @@ OUI:C848F5*
  OUI:C84C75*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
+OUI:C84F0E*
+ ID_OUI_FROM_DATABASE=Integrated Device Technology (Malaysia) Sdn. Bhd.
+
  OUI:C84F86*
   ID_OUI_FROM_DATABASE=Sophos Ltd
  
@@ -88109,6 +88745,9 @@ OUI:CC4463*
  OUI:CC4639*
   ID_OUI_FROM_DATABASE=WAAV, Inc.
  
+OUI:CC464E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:CC46D6*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
@@ -88199,6 +88838,9 @@ OUI:CC66B2*
  OUI:CC69B0*
   ID_OUI_FROM_DATABASE=Global Traffic Technologies, LLC
  
+OUI:CC6A10*
+ ID_OUI_FROM_DATABASE=The Chamberlain Group, Inc
+
  OUI:CC6B98*
   ID_OUI_FROM_DATABASE=Minetec Wireless Technologies
  
@@ -88838,6 +89480,9 @@ OUI:D039B3*
  OUI:D039EA*
   ID_OUI_FROM_DATABASE=NetApp
  
+OUI:D03D52*
+ ID_OUI_FROM_DATABASE=Vaion Limited
+
  OUI:D03DC3*
   ID_OUI_FROM_DATABASE=AQ Corporation
  
@@ -89897,6 +90542,9 @@ OUI:D4741B*
  OUI:D476EA*
   ID_OUI_FROM_DATABASE=zte corporation
  
+OUI:D4772B*
+ ID_OUI_FROM_DATABASE=Nanjing Ztlink Network Technology Co.,Ltd
+
  OUI:D47856*
   ID_OUI_FROM_DATABASE=Avaya Inc
  
@@ -90281,6 +90929,9 @@ OUI:D4F513*
  OUI:D4F527*
   ID_OUI_FROM_DATABASE=SIEMENS AG
  
+OUI:D4F547*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
  OUI:D4F5EF*
   ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
  
@@ -90314,6 +90965,9 @@ OUI:D808F5*
  OUI:D809C3*
   ID_OUI_FROM_DATABASE=Cercacor Labs
  
+OUI:D80B9A*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:D80CCF*
   ID_OUI_FROM_DATABASE=C.G.V. S.A.S.
  
@@ -90683,6 +91337,9 @@ OUI:D888CE*
  OUI:D88A3B*
   ID_OUI_FROM_DATABASE=UNIT-EM
  
+OUI:D88ADC*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:D88B4C*
   ID_OUI_FROM_DATABASE=KingTing Tech.
  
@@ -90752,6 +91409,9 @@ OUI:D89DB9*
  OUI:D89E3F*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:D89E61*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
  OUI:D89EF3*
   ID_OUI_FROM_DATABASE=Dell Inc.
  
@@ -91808,6 +92468,9 @@ OUI:E01E07*
  OUI:E01F0A*
   ID_OUI_FROM_DATABASE=Xslent Energy Technologies. LLC
  
+OUI:E01F88*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
  OUI:E02202*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
@@ -92172,7 +92835,7 @@ OUI:E0AA96*
   ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
  
  OUI:E0AAB0*
- ID_OUI_FROM_DATABASE=GENERAL VISION ELECTRONICS CO. LTD.
+ ID_OUI_FROM_DATABASE=SUNTAILI ENTERPRISE CO. LTD,
  
  OUI:E0AADB*
   ID_OUI_FROM_DATABASE=Nanjing PANENG Technology Development Co.,Ltd
@@ -92342,6 +93005,9 @@ OUI:E0CEC3*
  OUI:E0CF2D*
   ID_OUI_FROM_DATABASE=Gemintek Corporation
  
+OUI:E0D083*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
  OUI:E0D10A*
   ID_OUI_FROM_DATABASE=Katoudenkikougyousyo co ltd
  
@@ -92645,6 +93311,9 @@ OUI:E446DA*
  OUI:E44790*
   ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
  
+OUI:E447B3*
+ ID_OUI_FROM_DATABASE=zte corporation
+
  OUI:E448C7*
   ID_OUI_FROM_DATABASE=Cisco SPVTG
  
@@ -92978,6 +93647,9 @@ OUI:E4A8B6*
  OUI:E4AA5D*
   ID_OUI_FROM_DATABASE=Cisco Systems, Inc
  
+OUI:E4AAEA*
+ ID_OUI_FROM_DATABASE=Liteon Technology Corporation
+
  OUI:E4AB46*
   ID_OUI_FROM_DATABASE=UAB Selteka
  
@@ -93014,6 +93686,9 @@ OUI:E4BD4B*
  OUI:E4BEED*
   ID_OUI_FROM_DATABASE=Netcore Technology Inc.
  
+OUI:E4C0CC*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
  OUI:E4C146*
   ID_OUI_FROM_DATABASE=Objetivos y Servicios de Valor A
  
@@ -93428,6 +94103,9 @@ OUI:E85659*
  OUI:E856D6*
   ID_OUI_FROM_DATABASE=NCTech Ltd
  
+OUI:E85A8B*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
  OUI:E85AA7*
   ID_OUI_FROM_DATABASE=LLC Emzior
  
@@ -94193,6 +94871,9 @@ OUI:EC9B8B*
  OUI:EC9BF3*
   ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
  
+OUI:EC9C32*
+ ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
+
  OUI:EC9ECD*
   ID_OUI_FROM_DATABASE=Artesyn Embedded Technologies
  
@@ -94590,7 +95271,7 @@ OUI:F02624*
   ID_OUI_FROM_DATABASE=WAFA TECHNOLOGIES CO., LTD.
  
  OUI:F0264C*
- ID_OUI_FROM_DATABASE=Dr. Sigrist AG
+ ID_OUI_FROM_DATABASE=Sigrist-Photometer AG
  
  OUI:F0272D*
   ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
@@ -94643,6 +95324,9 @@ OUI:F03E90*
  OUI:F03EBF*
   ID_OUI_FROM_DATABASE=GOGORO TAIWAN LIMITED
  
+OUI:F03F95*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:F03FF8*
   ID_OUI_FROM_DATABASE=R L Drake
  
@@ -95177,6 +95861,9 @@ OUI:F0EE58*
  OUI:F0EEBB*
   ID_OUI_FROM_DATABASE=VIPAR GmbH
  
+OUI:F0EF86*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
  OUI:F0EFD2*
   ID_OUI_FROM_DATABASE=TF PAYMENT SERVICE CO., LTD
  
@@ -95858,6 +96545,9 @@ OUI:F4E3FB*
  OUI:F4E4AD*
   ID_OUI_FROM_DATABASE=zte corporation
  
+OUI:F4E5F2*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
  OUI:F4E6D7*
   ID_OUI_FROM_DATABASE=Solar Power Technologies, Inc.
  
@@ -96263,6 +96953,9 @@ OUI:F854AF*
  OUI:F854B8*
   ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
  
+OUI:F855CD*
+ ID_OUI_FROM_DATABASE=Visteon Corporation
+
  OUI:F8572E*
   ID_OUI_FROM_DATABASE=Core Brands, LLC
  
@@ -96344,6 +97037,9 @@ OUI:F873A2*
  OUI:F87588*
   ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
  
+OUI:F875A4*
+ ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology co., ltd
+
  OUI:F8769B*
   ID_OUI_FROM_DATABASE=Neopis Co., Ltd.
  
@@ -96380,6 +97076,9 @@ OUI:F884F2*
  OUI:F887F1*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:F8893C*
+ ID_OUI_FROM_DATABASE=Inventec Appliances Corp.
+
  OUI:F88A3C0*
   ID_OUI_FROM_DATABASE=ART SPA
  
@@ -96425,6 +97124,9 @@ OUI:F88A3CD*
  OUI:F88A3CE*
   ID_OUI_FROM_DATABASE=Avateq Corp.
  
+OUI:F88A5E*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
  OUI:F88B37*
   ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
  
@@ -96653,6 +97355,9 @@ OUI:F8C397*
  OUI:F8C39E*
   ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
  
+OUI:F8C4F3*
+ ID_OUI_FROM_DATABASE=Shanghai Infinity Wireless Technologies Co.,Ltd.
+
  OUI:F8C678*
   ID_OUI_FROM_DATABASE=Carefusion
  
@@ -96902,6 +97607,9 @@ OUI:FC1A11*
  OUI:FC1BFF*
   ID_OUI_FROM_DATABASE=V-ZUG AG
  
+OUI:FC1CA1*
+ ID_OUI_FROM_DATABASE=Nokia
+
  OUI:FC1D43*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
@@ -97427,6 +98135,9 @@ OUI:FCD817*
  OUI:FCD848*
   ID_OUI_FROM_DATABASE=Apple, Inc.
  
+OUI:FCDB21*
+ ID_OUI_FROM_DATABASE=SAMSARA NETWORKS INC
+
  OUI:FCDB96*
   ID_OUI_FROM_DATABASE=ENERVALLEY CO., LTD
  
diff --git a/hwdb/20-acpi-vendor.hwdb.patch b/hwdb/20-acpi-vendor.hwdb.patch

index 26d3ba979141c0ca4e37add88edcfa5add556778..edccae1ebcf88bf9a82c0375d72eca71a2d6e7e4 100644 (file)
--- a/hwdb/20-acpi-vendor.hwdb.patch
+++ b/hwdb/20-acpi-vendor.hwdb.patch
@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base   2019-07-23 14:53:58.491938552 +0200
-+++ 20-acpi-vendor.hwdb        2019-07-23 14:53:58.497938538 +0200
+--- 20-acpi-vendor.hwdb.base   2019-08-22 09:17:21.083026269 +0200
++++ 20-acpi-vendor.hwdb        2019-08-22 09:17:21.101026408 +0200
  @@ -3,6 +3,8 @@
   # Data imported from:
   #     https://uefi.org/uefi-pnp-export
diff --git a/hwdb/20-pci-classes.hwdb b/hwdb/20-pci-classes.hwdb

index c994679c3704844dfb3d184768d97a29833a1aea..b81fa2c3c416172f086242f3c8cad780c4f1bfd9 100644 (file)
--- a/hwdb/20-pci-classes.hwdb
+++ b/hwdb/20-pci-classes.hwdb
@@ -587,6 +587,9 @@ pci:v*d*sv*sd*bc12*
  pci:v*d*sv*sd*bc12sc00*
   ID_PCI_SUBCLASS_FROM_DATABASE=Processing accelerators
  
+pci:v*d*sv*sd*bc12sc01*
+ ID_PCI_SUBCLASS_FROM_DATABASE=AI Inference Accelerator
+
  pci:v*d*sv*sd*bc13*
   ID_PCI_CLASS_FROM_DATABASE=Non-Essential Instrumentation
  
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb

index 0e1b4e862cefe957026f8238790486d7a9fde930..b6588f0ae64000892567cac61b7013065360c73c 100644 (file)
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -1742,6 +1742,9 @@ pci:v00001000d00000087sv00001014sd00000472*
  pci:v00001000d00000087sv00001590sd00000041*
   ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (H220i)
  
+pci:v00001000d00000087sv00001590sd00000042*
+ ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (H221 / 9207-8e)
+
  pci:v00001000d00000087sv00001590sd00000044*
   ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (H220i)
  
@@ -1964,9 +1967,21 @@ pci:v00001000d000000E5sv00001028sd0000200D*
  pci:v00001000d000000E5sv00001028sd0000200E*
   ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe SAS38xx (HBA355i MX)
  
+pci:v00001000d000000E5sv00001D49sd00000205*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe SAS38xx (ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA)
+
+pci:v00001000d000000E5sv00001D49sd00000206*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe SAS38xx (ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA)
+
  pci:v00001000d000000E6*
   ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx
  
+pci:v00001000d000000E6sv00001D49sd00000205*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA)
+
+pci:v00001000d000000E6sv00001D49sd00000206*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA)
+
  pci:v00001000d000000E7*
   ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
  
@@ -2213,6 +2228,24 @@ pci:v00001000d000010E1sv00001028sd00001AE2*
  pci:v00001000d000010E1sv00001028sd00001AE3*
   ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (PERC H755 MX)
  
+pci:v00001000d000010E1sv00001D49sd0000060A*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (ThinkSystem RAID 940-8i 4GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E1sv00001D49sd0000060B*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (ThinkSystem RAID 940-8i 8GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E1sv00001D49sd0000060C*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E1sv00001D49sd0000060D*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Internal Adapter)
+
+pci:v00001000d000010E1sv00001D49sd0000060E*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E1sv00001D49sd0000060F*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe SAS39xx (ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter)
+
  pci:v00001000d000010E2*
   ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx
  
@@ -2228,6 +2261,24 @@ pci:v00001000d000010E2sv00001028sd00001AE2*
  pci:v00001000d000010E2sv00001028sd00001AE3*
   ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (PERC H755 MX)
  
+pci:v00001000d000010E2sv00001D49sd0000060A*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-8i 4GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E2sv00001D49sd0000060B*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-8i 8GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E2sv00001D49sd0000060C*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E2sv00001D49sd0000060D*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Internal Adapter)
+
+pci:v00001000d000010E2sv00001D49sd0000060E*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E2sv00001D49sd0000060F*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter)
+
  pci:v00001000d000010E3*
   ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Unsupported SAS39xx
  
@@ -7448,6 +7499,9 @@ pci:v00001002d000067FFsv0000103Csd00008479*
  pci:v00001002d000067FFsv00001043sd000004BC*
   ID_MODEL_FROM_DATABASE=Baffin [Radeon RX 550 640SP / RX 560/560X] (Radeon RX 560)
  
+pci:v00001002d000067FFsv00001043sd0000052F*
+ ID_MODEL_FROM_DATABASE=Baffin [Radeon RX 550 640SP / RX 560/560X] (Radeon RX 560)
+
  pci:v00001002d000067FFsv00001458sd000022ED*
   ID_MODEL_FROM_DATABASE=Baffin [Radeon RX 550 640SP / RX 560/560X] (Radeon RX 560)
  
@@ -9519,88 +9573,88 @@ pci:v00001002d000068FE*
   ID_MODEL_FROM_DATABASE=Cedar LE
  
  pci:v00001002d00006900*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445]
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile]
  
  pci:v00001002d00006900sv00001025sd00001056*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360 / R8 M365DX)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360 / R8 M365DX)
  
  pci:v00001002d00006900sv00001028sd00000640*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260/M265)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260/M265)
  
  pci:v00001002d00006900sv00001028sd00000643*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260/M265)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260/M265)
  
  pci:v00001002d00006900sv00001028sd0000067F*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv00001028sd00000767*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M445)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M445)
  
  pci:v00001002d00006900sv00001028sd00000810*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon 530)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon 530)
  
  pci:v00001002d00006900sv00001028sd0000130A*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv0000103Csd00002263*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv0000103Csd00002269*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv0000103Csd000022C6*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv0000103Csd000022C8*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv0000103Csd00002B45*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 A360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 A360)
  
  pci:v00001002d00006900sv0000103Csd0000808C*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv0000103Csd00008099*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360)
  
  pci:v00001002d00006900sv0000103Csd000080B5*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360)
  
  pci:v00001002d00006900sv0000103Csd000080B9*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360)
  
  pci:v00001002d00006900sv0000103Csd0000811C*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M340)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M340)
  
  pci:v00001002d00006900sv0000103Csd00008226*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M440)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M440)
  
  pci:v00001002d00006900sv000010CFsd00001906*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv00001170sd00009979*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360)
  
  pci:v00001002d00006900sv00001179sd0000F903*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv00001179sd0000F922*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv00001179sd0000F923*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv00001179sd0000F934*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006900sv000017AAsd00003822*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360)
  
  pci:v00001002d00006900sv000017AAsd00003824*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M360)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M360)
  
  pci:v00001002d00006900sv000017AAsd00005021*
- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] (Radeon R7 M260)
+ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile] (Radeon R7 M260)
  
  pci:v00001002d00006901*
   ID_MODEL_FROM_DATABASE=Topaz PRO [Radeon R5 M255]
@@ -10149,7 +10203,7 @@ pci:v00001002d00007310*
   ID_MODEL_FROM_DATABASE=Navi 10
  
  pci:v00001002d0000731F*
- ID_MODEL_FROM_DATABASE=Navi 10
+ ID_MODEL_FROM_DATABASE=Navi 10 [Radeon RX 5700 / 5700 XT]
  
  pci:v00001002d00007833*
   ID_MODEL_FROM_DATABASE=RS350 Host Bridge
@@ -18503,6 +18557,9 @@ pci:v0000104Dd000081CE*
  pci:v0000104Dd000081FF*
   ID_MODEL_FROM_DATABASE=PS3 TOOL MRP
  
+pci:v0000104Dd00008200*
+ ID_MODEL_FROM_DATABASE=PS3 TOOL RSX Tracing FPGA
+
  pci:v0000104Dd0000820E*
   ID_MODEL_FROM_DATABASE=CXD9208GP [PS3 PS2 emulation subsystem adapter]
  
@@ -32070,7 +32127,7 @@ pci:v000010DEd00000FC2*
   ID_MODEL_FROM_DATABASE=GK107 [GeForce GT 630 OEM]
  
  pci:v000010DEd00000FC5*
- ID_MODEL_FROM_DATABASE=GK107
+ ID_MODEL_FROM_DATABASE=GK107 [GeForce GT 1030]
  
  pci:v000010DEd00000FC6*
   ID_MODEL_FROM_DATABASE=GK107 [GeForce GTX 650]
@@ -34832,9 +34889,15 @@ pci:v000010DEd00001E3D*
  pci:v000010DEd00001E3E*
   ID_MODEL_FROM_DATABASE=TU102GL
  
+pci:v000010DEd00001E81*
+ ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2080 SUPER]
+
  pci:v000010DEd00001E82*
   ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2080]
  
+pci:v000010DEd00001E84*
+ ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2070 SUPER]
+
  pci:v000010DEd00001E87*
   ID_MODEL_FROM_DATABASE=TU104 [GeForce RTX 2080 Rev. A]
  
@@ -34880,6 +34943,9 @@ pci:v000010DEd00001F02sv00001043sd00008673*
  pci:v000010DEd00001F04*
   ID_MODEL_FROM_DATABASE=TU106
  
+pci:v000010DEd00001F06*
+ ID_MODEL_FROM_DATABASE=TU106 [GeForce RTX 2060 SUPER]
+
  pci:v000010DEd00001F07*
   ID_MODEL_FROM_DATABASE=TU106 [GeForce RTX 2070 Rev. A]
  
@@ -55709,6 +55775,9 @@ pci:v000014E4d00004430*
  pci:v000014E4d00004432*
   ID_MODEL_FROM_DATABASE=BCM4432 CardBus 10/100BaseT
  
+pci:v000014E4d00004464*
+ ID_MODEL_FROM_DATABASE=BCM4464 802.11ac Wireless Network Adapter
+
  pci:v000014E4d00004610*
   ID_MODEL_FROM_DATABASE=BCM4610 Sentry5 PCI to SB Bridge
  
@@ -55928,6 +55997,9 @@ pci:v000014E4d0000D802sv000014E4sd00008024*
  pci:v000014E4d0000D802sv000014E4sd00008028*
   ID_MODEL_FROM_DATABASE=BCM58802 Stingray 50Gb Ethernet SoC (Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w8GB DRAM (Part No BCM958802A8048C))
  
+pci:v000014E4d0000D802sv00001BB0sd00000021*
+ ID_MODEL_FROM_DATABASE=BCM58802 Stingray 50Gb Ethernet SoC (HPE SimpliVity Accelerator)
+
  pci:v000014E4d0000D804*
   ID_MODEL_FROM_DATABASE=BCM58804 Stingray 100Gb Ethernet SoC
  
@@ -57335,6 +57407,15 @@ pci:v00001542d00009287*
  pci:v00001542d00009290*
   ID_MODEL_FROM_DATABASE=FPGA Card
  
+pci:v00001542d00009300*
+ ID_MODEL_FROM_DATABASE=Universal Exhaust Gas Oxygen Sensor Simulator
+
+pci:v00001542d00009310*
+ ID_MODEL_FROM_DATABASE=Digital Programmable Resistor
+
+pci:v00001542d00009350*
+ ID_MODEL_FROM_DATABASE=Analog Input Card
+
  pci:v00001543*
   ID_VENDOR_FROM_DATABASE=SILICON Laboratories
  
@@ -58172,6 +58253,12 @@ pci:v000015B3d00001974*
  pci:v000015B3d00001975*
   ID_MODEL_FROM_DATABASE=MT416842 Family [BlueField SoC PCIe Bridge]
  
+pci:v000015B3d00001976*
+ ID_MODEL_FROM_DATABASE=MT28908 Family [ConnectX-6 PCIe Bridge]
+
+pci:v000015B3d00001977*
+ ID_MODEL_FROM_DATABASE=MT2892 Family [ConnectX-6 Dx PCIe Bridge]
+
  pci:v000015B3d00001978*
   ID_MODEL_FROM_DATABASE=MT42822 Family [BlueField-2 SoC PCIe Bridge]
  
@@ -64541,6 +64628,9 @@ pci:v00001ADEd00003038sv00004254sd00000552*
  pci:v00001AE0*
   ID_VENDOR_FROM_DATABASE=Google, Inc.
  
+pci:v00001AE0d00000042*
+ ID_MODEL_FROM_DATABASE=Compute Engine Virtual Ethernet [gVNIC]
+
  pci:v00001AE3*
   ID_VENDOR_FROM_DATABASE=SANBlaze Technology, Inc.
  
@@ -65510,6 +65600,9 @@ pci:v00001C58d00000003sv00001014sd000004F5*
  pci:v00001C58d00000003sv00001014sd000004F6*
   ID_MODEL_FROM_DATABASE=Ultrastar SN100 Series NVMe SSD (PCIe3 3.2TB NVMe Flash Adapter)
  
+pci:v00001C58d00000003sv00001C58sd00000003*
+ ID_MODEL_FROM_DATABASE=Ultrastar SN100 Series NVMe SSD (Ultrastar SN100/SN150 NVMe SSD)
+
  pci:v00001C58d00000023*
   ID_MODEL_FROM_DATABASE=Ultrastar SN200 Series NVMe SSD
  
@@ -65669,6 +65762,12 @@ pci:v00001CE4d00000008*
  pci:v00001CE4d00000009*
   ID_MODEL_FROM_DATABASE=ExaNIC X25
  
+pci:v00001CE4d0000000A*
+ ID_MODEL_FROM_DATABASE=ExaNIC X100
+
+pci:v00001CE4d0000000B*
+ ID_MODEL_FROM_DATABASE=ExaNIC V9P
+
  pci:v00001CE4d00000100*
   ID_MODEL_FROM_DATABASE=ExaDISK FX1
  
@@ -65724,28 +65823,28 @@ pci:v00001D17d00000716*
   ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
  
  pci:v00001D17d00000717*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d00000718*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d00000719*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d0000071A*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d0000071B*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d0000071C*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d0000071D*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d0000071E*
- ID_MODEL_FROM_DATABASE=ZX-D PCI Express Root Port
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E PCI Express Root Port
  
  pci:v00001D17d0000071F*
   ID_MODEL_FROM_DATABASE=ZX-200 Upstream Port of PCI Express Switch
@@ -65763,7 +65862,7 @@ pci:v00001D17d00001000*
   ID_MODEL_FROM_DATABASE=ZX-D Standard Host Bridge
  
  pci:v00001D17d00001001*
- ID_MODEL_FROM_DATABASE=ZX-D Miscellaneous Bus
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E Miscellaneous Bus
  
  pci:v00001D17d00003001*
   ID_MODEL_FROM_DATABASE=ZX-100 Standard Host Bridge
@@ -65772,10 +65871,10 @@ pci:v00001D17d0000300A*
   ID_MODEL_FROM_DATABASE=ZX-100 Miscellaneous Bus
  
  pci:v00001D17d00003038*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-200 Standard Universal PCI to USB Host Controller
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-200/ZX-E Standard Universal PCI to USB Host Controller
  
  pci:v00001D17d00003104*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-200 Standard Enhanced PCI to USB Host Controller
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-200/ZX-E Standard Enhanced PCI to USB Host Controller
  
  pci:v00001D17d000031B0*
   ID_MODEL_FROM_DATABASE=ZX-100/ZX-D Standard Host Bridge
@@ -65796,16 +65895,16 @@ pci:v00001D17d000031B5*
   ID_MODEL_FROM_DATABASE=ZX-100/ZX-D Scratch Device
  
  pci:v00001D17d000031B7*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-D Standard Host Bridge
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-D/ZX-E Standard Host Bridge
  
  pci:v00001D17d000031B8*
   ID_MODEL_FROM_DATABASE=ZX-100/ZX-D PCI to PCI Bridge
  
  pci:v00001D17d00003288*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-D High Definition Audio Controller
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-D/ZX-E High Definition Audio Controller
  
  pci:v00001D17d0000345B*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-D Miscellaneous Bus
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-D/ZX-E Miscellaneous Bus
  
  pci:v00001D17d00003A02*
   ID_MODEL_FROM_DATABASE=ZX-100 C-320 GPU
@@ -65817,16 +65916,16 @@ pci:v00001D17d00009002*
   ID_MODEL_FROM_DATABASE=ZX-100/ZX-200 EIDE Controller
  
  pci:v00001D17d00009003*
- ID_MODEL_FROM_DATABASE=ZX-100 EIDE Controller
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-E EIDE Controller
  
  pci:v00001D17d00009045*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-D RAID Accelerator
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-D/ZX-E RAID Accelerator 0
  
  pci:v00001D17d00009046*
- ID_MODEL_FROM_DATABASE=ZX-D RAID Accelerator
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E RAID Accelerator 1
  
  pci:v00001D17d00009083*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-200 StorX AHCI Controller
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-200/ZX-E StorX AHCI Controller
  
  pci:v00001D17d00009084*
   ID_MODEL_FROM_DATABASE=ZX-100 StorX AHCI Controller
@@ -65852,17 +65951,20 @@ pci:v00001D17d00009202*
  pci:v00001D17d00009203*
   ID_MODEL_FROM_DATABASE=ZX-200 USB eXtensible Host Controller
  
+pci:v00001D17d00009204*
+ ID_MODEL_FROM_DATABASE=ZX-E USB eXtensible Host Controller
+
  pci:v00001D17d00009286*
   ID_MODEL_FROM_DATABASE=ZX-D eMMC Host Controller
  
  pci:v00001D17d00009300*
- ID_MODEL_FROM_DATABASE=ZX-D eSPI Host Controller
+ ID_MODEL_FROM_DATABASE=ZX-D/ZX-E eSPI Host Controller
  
  pci:v00001D17d000095D0*
   ID_MODEL_FROM_DATABASE=ZX-100 Universal SD Host Controller
  
  pci:v00001D17d0000F410*
- ID_MODEL_FROM_DATABASE=ZX-100/ZX-D PCI Com Port
+ ID_MODEL_FROM_DATABASE=ZX-100/ZX-D/ZX-E PCI Com Port
  
  pci:v00001D18*
   ID_VENDOR_FROM_DATABASE=RME
@@ -65906,6 +66008,21 @@ pci:v00001D26d00000140*
  pci:v00001D26d0000E004*
   ID_MODEL_FROM_DATABASE=AB01/EMB01 Development Board
  
+pci:v00001D37*
+ ID_VENDOR_FROM_DATABASE=NovaSparks
+
+pci:v00001D37d00000013*
+ ID_MODEL_FROM_DATABASE=PM3
+
+pci:v00001D37d00000014*
+ ID_MODEL_FROM_DATABASE=PM4
+
+pci:v00001D37d00000015*
+ ID_MODEL_FROM_DATABASE=PM4edge
+
+pci:v00001D37d00000016*
+ ID_MODEL_FROM_DATABASE=PM4edge User Device
+
  pci:v00001D40*
   ID_VENDOR_FROM_DATABASE=Techman Electronics (Changshu) Co., Ltd.
  
@@ -66017,6 +66134,12 @@ pci:v00001D6Cd0000100E*
  pci:v00001D6Cd0000100Esv00001D6Csd00002001*
   ID_MODEL_FROM_DATABASE=AR-ARKA-FX1 [Arkville 64B DPDK Data Mover] (DPDK-Aware Virtual Function [Arkville VF])
  
+pci:v00001D6Cd0000100F*
+ ID_MODEL_FROM_DATABASE=AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Versal]
+
+pci:v00001D6Cd00001010*
+ ID_MODEL_FROM_DATABASE=AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Agilex]
+
  pci:v00001D6Cd00004200*
   ID_MODEL_FROM_DATABASE=A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
  
@@ -66317,6 +66440,15 @@ pci:v00001E24d0000021F*
  pci:v00001E24d00001525*
   ID_MODEL_FROM_DATABASE=Xilinx BCU-1525
  
+pci:v00001E24d00001533*
+ ID_MODEL_FROM_DATABASE=ForestKitten 33
+
+pci:v00001E24d00001633*
+ ID_MODEL_FROM_DATABASE=JCM33
+
+pci:v00001E24d00001635*
+ ID_MODEL_FROM_DATABASE=JCM35
+
  pci:v00001E26*
   ID_VENDOR_FROM_DATABASE=Fujitsu Client Computing Limited
  
@@ -66347,6 +66479,9 @@ pci:v00001E57d00000100*
  pci:v00001E57d00000100sv00000000sd00000100*
   ID_MODEL_FROM_DATABASE=PY8800 (64GB Accelerator)
  
+pci:v00001E6B*
+ ID_VENDOR_FROM_DATABASE=Axiado Corp.
+
  pci:v00001FC0*
   ID_VENDOR_FROM_DATABASE=Ascom (Finland) Oy
  
@@ -66563,6 +66698,9 @@ pci:v00002116*
  pci:v000021C3*
   ID_VENDOR_FROM_DATABASE=21st Century Computer Corp.
  
+pci:v000022B8*
+ ID_VENDOR_FROM_DATABASE=Flex-Logix Technologies
+
  pci:v000022DB*
   ID_VENDOR_FROM_DATABASE=Missing Link Electronics, Inc.
  
@@ -67739,6 +67877,21 @@ pci:v00004DDC*
  pci:v00004DDCd00000100*
   ID_MODEL_FROM_DATABASE=DD-42924I5-300 (ARINC 429 Data Bus)
  
+pci:v00004DDCd00000300*
+ ID_MODEL_FROM_DATABASE=SB-3620 Motion Feedback Device
+
+pci:v00004DDCd00000340*
+ ID_MODEL_FROM_DATABASE=SB-3623 Motion Feedback Device
+
+pci:v00004DDCd00000400*
+ ID_MODEL_FROM_DATABASE=SB-3622 Motion Feedback Device
+
+pci:v00004DDCd00000500*
+ ID_MODEL_FROM_DATABASE=SB-3621 Motion Feedback Device
+
+pci:v00004DDCd00000510*
+ ID_MODEL_FROM_DATABASE=SB-3624 Motion Feedback Device
+
  pci:v00004DDCd00000801*
   ID_MODEL_FROM_DATABASE=BU-65570I1 MIL-STD-1553 Test and Simulation
  
@@ -67787,6 +67940,18 @@ pci:v00004DDCd00000B03*
  pci:v00004DDCd00000B04*
   ID_MODEL_FROM_DATABASE=BU-65569I4 MIL-STD-1553 Data Bus
  
+pci:v00004DDCd00000D01*
+ ID_MODEL_FROM_DATABASE=SB-3641 Motion Feedback Device
+
+pci:v00004DDCd00000D10*
+ ID_MODEL_FROM_DATABASE=SB-365x Motion Feedback Device
+
+pci:v00004DDCd00002F00*
+ ID_MODEL_FROM_DATABASE=SB-3642 Motion Feedback Device
+
+pci:v00004DDCd00003000*
+ ID_MODEL_FROM_DATABASE=SB-3644 Motion Feedback Device
+
  pci:v00005045*
   ID_VENDOR_FROM_DATABASE=University of Toronto
  
@@ -70166,6 +70331,18 @@ pci:v00008086d00000A54sv00001590sd00000265*
  pci:v00008086d00000A54sv00001590sd0000026C*
   ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [3DNAND, Beta Rock Controller] (NVMe Datacenter SSD [3DNAND] 4.0TB AIC (P4500))
  
+pci:v00008086d00000A54sv00001D49sd00004702*
+ ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [3DNAND, Beta Rock Controller] (Thinksystem Intel P4500 NVMe U.2)
+
+pci:v00008086d00000A54sv00001D49sd00004704*
+ ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [3DNAND, Beta Rock Controller] (Thinksystem Intel P4500 NVMe AIC)
+
+pci:v00008086d00000A54sv00001D49sd00004712*
+ ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [3DNAND, Beta Rock Controller] (Thinksystem Intel P4600 NVMe U.2)
+
+pci:v00008086d00000A54sv00001D49sd00004714*
+ ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [3DNAND, Beta Rock Controller] (Thinksystem Intel P4600 NVMe AIC)
+
  pci:v00008086d00000A54sv00001D49sd00004802*
   ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [3DNAND, Beta Rock Controller] (Thinksystem U.2 P4510 NVMe SSD)
  
@@ -73883,6 +74060,12 @@ pci:v00008086d00001563sv00001028sd00001FA8*
  pci:v00008086d00001563sv00001028sd00001FA9*
   ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (Ethernet 10G 4P X550 rNDC)
  
+pci:v00008086d00001563sv00001137sd000002B2*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (X550-TX 10 Gig LOM)
+
+pci:v00008086d00001563sv00001137sd000002B3*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (X550-TX 10 Gig LOM)
+
  pci:v00008086d00001563sv00001170sd00000001*
   ID_MODEL_FROM_DATABASE=Ethernet Controller 10G X550T (Intel Ethernet Controller X550-T2 OCP card)
  
@@ -74093,6 +74276,9 @@ pci:v00008086d00001572sv00008086sd00004006*
  pci:v00008086d00001572sv00008086sd00004007*
   ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+
  
+pci:v00008086d00001574*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 Emulation
+
  pci:v00008086d00001575*
   ID_MODEL_FROM_DATABASE=DSL6340 Thunderbolt 3 NHI [Alpine Ridge 2C 2015]
  
@@ -74162,6 +74348,9 @@ pci:v00008086d00001583sv0000108Esd00000000*
  pci:v00008086d00001583sv0000108Esd00007B1B*
   ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (10 Gb/40 Gb Ethernet Adapter)
  
+pci:v00008086d00001583sv0000108Esd00007B1D*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (10Gb/40Gb Ethernet Adapter)
+
  pci:v00008086d00001583sv00001137sd00000000*
   ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged NIC XL710-QDA2)
  
@@ -74276,6 +74465,9 @@ pci:v00008086d0000158Asv00001590sd00000000*
  pci:v00008086d0000158Asv00001590sd00000286*
   ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE backplane (Synergy 4610C 10/25Gb Ethernet Adapter)
  
+pci:v00008086d0000158Asv00008086sd00000000*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE backplane
+
  pci:v00008086d0000158Asv00008086sd0000000A*
   ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE backplane (Ethernet 25G 2P XXV710 Mezz)
  
@@ -74291,6 +74483,12 @@ pci:v00008086d0000158Bsv00001137sd00000225*
  pci:v00008086d0000158Bsv00001137sd000002B4*
   ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet Network Adapter XXV710 OCP 2.0)
  
+pci:v00008086d0000158Bsv00001590sd00000000*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet Network Adapter XXV710-2)
+
+pci:v00008086d0000158Bsv00001590sd00000253*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet 10/25/Gb 2-port 661SFP28 Adapter)
+
  pci:v00008086d0000158Bsv00008086sd00000000*
   ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 for 25GbE SFP28 (Ethernet Network Adapter XXV710)
  
@@ -74714,6 +74912,12 @@ pci:v00008086d0000163E*
  pci:v00008086d00001889*
   ID_MODEL_FROM_DATABASE=Ethernet Adaptive Virtual Function
  
+pci:v00008086d000018A0*
+ ID_MODEL_FROM_DATABASE=C4xxx Series QAT
+
+pci:v00008086d000018A1*
+ ID_MODEL_FROM_DATABASE=C4XXX Series QAT Virtual Function
+
  pci:v00008086d00001900*
   ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
  
@@ -76538,6 +76742,9 @@ pci:v00008086d00002085*
  pci:v00008086d00002086*
   ID_MODEL_FROM_DATABASE=Sky Lake-E PCU Registers
  
+pci:v00008086d00002088*
+ ID_MODEL_FROM_DATABASE=Sky Lake-E DDRIO Registers
+
  pci:v00008086d0000208D*
   ID_MODEL_FROM_DATABASE=Sky Lake-E CHA Registers
  
@@ -80282,6 +80489,12 @@ pci:v00008086d00002701sv00008086sd00003904*
  pci:v00008086d00002701sv00008086sd00003905*
   ID_MODEL_FROM_DATABASE=NVMe Datacenter SSD [Optane] (15mm 2.5" U.2 (P4800X))
  
+pci:v00008086d00002723*
+ ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX200
+
+pci:v00008086d00002723sv00008086sd00002723*
+ ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX200 (Wireless AX200)
+
  pci:v00008086d00002770*
   ID_MODEL_FROM_DATABASE=82945G/GZ/P/PL Memory Controller Hub
  
@@ -84578,18 +84791,27 @@ pci:v00008086d00003166*
  pci:v00008086d00003184*
   ID_MODEL_FROM_DATABASE=UHD Graphics 605
  
+pci:v00008086d00003185*
+ ID_MODEL_FROM_DATABASE=UHD Graphics 605
+
  pci:v00008086d0000318C*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor Dynamic Platform and Thermal Framework Processor Participant
  
  pci:v00008086d0000318E*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor NorthPeak
  
+pci:v00008086d00003192*
+ ID_MODEL_FROM_DATABASE=Gemini Lake P2SB
+
  pci:v00008086d00003197*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor PCI-default ISA-bridge
  
  pci:v00008086d0000319A*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor Trusted Execution Engine Interface
  
+pci:v00008086d000031A2*
+ ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor Integrated Sensor Solution
+
  pci:v00008086d000031AC*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor Serial IO I2C Host Controller
  
@@ -84620,9 +84842,30 @@ pci:v00008086d000031CC*
  pci:v00008086d000031D4*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor Gaussian Mixture Model
  
+pci:v00008086d000031D6*
+ ID_MODEL_FROM_DATABASE=Gemini Lake PCI Express Root Port
+
+pci:v00008086d000031D7*
+ ID_MODEL_FROM_DATABASE=Gemini Lake PCI Express Root Port
+
+pci:v00008086d000031D8*
+ ID_MODEL_FROM_DATABASE=Gemini Lake PCI Express Root Port
+
+pci:v00008086d000031D9*
+ ID_MODEL_FROM_DATABASE=Gemini Lake PCI Express Root Port
+
+pci:v00008086d000031DA*
+ ID_MODEL_FROM_DATABASE=Gemini Lake PCI Express Root Port
+
+pci:v00008086d000031DB*
+ ID_MODEL_FROM_DATABASE=Gemini Lake PCI Express Root Port
+
  pci:v00008086d000031EE*
   ID_MODEL_FROM_DATABASE=Celeron/Pentium Silver Processor Serial IO UART Host Controller
  
+pci:v00008086d000031F0*
+ ID_MODEL_FROM_DATABASE=Gemini Lake Host Bridge
+
  pci:v00008086d00003200*
   ID_MODEL_FROM_DATABASE=GD31244 PCI-X SATA HBA
  
@@ -85550,6 +85793,9 @@ pci:v00008086d000037D1sv000017AAsd00004021*
  pci:v00008086d000037D1sv000017AAsd00004022*
   ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 1GbE
  
+pci:v00008086d000037D1sv000017AAsd00004024*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 1GbE
+
  pci:v00008086d000037D2*
   ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 10GBASE-T
  
@@ -85571,6 +85817,9 @@ pci:v00008086d000037D2sv000017AAsd00004021*
  pci:v00008086d000037D2sv000017AAsd00004022*
   ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 10GBASE-T
  
+pci:v00008086d000037D2sv000017AAsd00004024*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 10GBASE-T
+
  pci:v00008086d000037D2sv000017AAsd00004025*
   ID_MODEL_FROM_DATABASE=Ethernet Connection X722 for 10GBASE-T
  
@@ -86705,6 +86954,9 @@ pci:v00008086d00003E1Fsv00001458sd00005000*
  pci:v00008086d00003E30*
   ID_MODEL_FROM_DATABASE=8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
  
+pci:v00008086d00003E34*
+ ID_MODEL_FROM_DATABASE=Coffee Lake HOST and DRAM Controller
+
  pci:v00008086d00003E81*
   ID_MODEL_FROM_DATABASE=8th Gen Core Processor PCIe Controller (x16)
  
@@ -87764,6 +88016,9 @@ pci:v00008086d00006F53*
  pci:v00008086d00006F54*
   ID_MODEL_FROM_DATABASE=Xeon Processor D Family QuickAssist Technology
  
+pci:v00008086d00006F55*
+ ID_MODEL_FROM_DATABASE=Xeon Processor D Family QuickAssist Technology Virtual Fuction
+
  pci:v00008086d00006F60*
   ID_MODEL_FROM_DATABASE=Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1
  
@@ -88538,6 +88793,27 @@ pci:v00008086d00008818*
  pci:v00008086d00008819*
   ID_MODEL_FROM_DATABASE=Platform Controller Hub EG20T IEEE 1588 Hardware Assist
  
+pci:v00008086d00008A0D*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 NHI #1
+
+pci:v00008086d00008A13*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 USB Controller
+
+pci:v00008086d00008A17*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 NHI #0
+
+pci:v00008086d00008A1D*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 PCI Express Root Port #0
+
+pci:v00008086d00008A1F*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 PCI Express Root Port #1
+
+pci:v00008086d00008A21*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 PCI Express Root Port #2
+
+pci:v00008086d00008A23*
+ ID_MODEL_FROM_DATABASE=Ice Lake Thunderbolt 3 PCI Express Root Port #3
+
  pci:v00008086d00008C00*
   ID_MODEL_FROM_DATABASE=8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
  
@@ -90828,10 +91104,7 @@ pci:v00008086d0000F1A6*
   ID_MODEL_FROM_DATABASE=SSD Pro 7600p/760p/E 6100p Series
  
  pci:v00008086d0000F1A8*
- ID_MODEL_FROM_DATABASE=SSDPEKNW020T8 [660p, 2TB]
-
-pci:v00008086d0000F1A8sv00008086sd0000390D*
- ID_MODEL_FROM_DATABASE=SSDPEKNW020T8 [660p, 2TB]
+ ID_MODEL_FROM_DATABASE=SSD 660P Series
  
  pci:v00008088*
   ID_VENDOR_FROM_DATABASE=Beijing Wangxun Technology Co., Ltd.
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb

index c3e76d2e6cd68ab1c558315a65e39ec576a702b7..8718306c637b0851278e9ba1b2358fe91405e0d5 100644 (file)
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -22874,6 +22874,18 @@ usb:v05A6p0003*
  usb:v05A6p0004*
   ID_MODEL_FROM_DATABASE=CVA122E Cable Voice Adapter (WDM)
  
+usb:v05A6p0A00*
+ ID_MODEL_FROM_DATABASE=Integrated Management Controller Hub
+
+usb:v05A6p0A01*
+ ID_MODEL_FROM_DATABASE=Virtual Keyboard/Mouse
+
+usb:v05A6p0A02*
+ ID_MODEL_FROM_DATABASE=Virtual Mass Storage
+
+usb:v05A6p0A03*
+ ID_MODEL_FROM_DATABASE=Virtual Ethernet/RNDIS
+
  usb:v05A7*
   ID_VENDOR_FROM_DATABASE=Bose Corp.
  
@@ -57527,6 +57539,9 @@ usb:v2357p0103*
  usb:v2357p0105*
   ID_MODEL_FROM_DATABASE=Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U]
  
+usb:v2357p0106*
+ ID_MODEL_FROM_DATABASE=Archer T9UH v1 [Realtek RTL8814AU]
+
  usb:v2357p0107*
   ID_MODEL_FROM_DATABASE=TL-WN821N Version 5 RTL8192EU
  
@@ -58265,6 +58280,12 @@ usb:v30A4*
  usb:v30A4p0001*
   ID_MODEL_FROM_DATABASE=Notecard
  
+usb:v30C2*
+ ID_VENDOR_FROM_DATABASE=UNPARALLEL Innovation, Lda
+
+usb:v30C2p1388*
+ ID_MODEL_FROM_DATABASE=SPL Meter
+
  usb:v30EE*
   ID_VENDOR_FROM_DATABASE=Fujitsu Connected Technologies Limited
  
diff --git a/hwdb/60-evdev.hwdb b/hwdb/60-evdev.hwdb

index afde1dd44794d32cc92444d29a3cc6d5ec88fce0..5142ef16c3cdc46373ce758a60b5007dda4cbc70 100644 (file)
--- a/hwdb/60-evdev.hwdb
+++ b/hwdb/60-evdev.hwdb
@@ -267,6 +267,13 @@ evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:*svnDellInc.:pnPrecisionM4700*
   EVDEV_ABS_35=0:1960:24
   EVDEV_ABS_36=113:1436:30
  
+# Dell XPS13 9360
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnDellInc.:pnXPS139360:cvr:*
+ EVDEV_ABS_00=::42
+ EVDEV_ABS_01=::60
+ EVDEV_ABS_35=::42
+ EVDEV_ABS_36=::60
+
  # Dell XPS15 9550
  evdev:name:SynPS/2 Synaptics TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnXPS159550*
   EVDEV_ABS_00=::41
@@ -345,6 +352,13 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnHP:pnHPSpectreNotebook*
   EVDEV_ABS_35=1205:5691:47
   EVDEV_ABS_36=1083:4808:65
  
+# HP Envy x360
+evdev:name:SynPS/2 Synaptics TouchPad:*svnHP:pnHPENVYx360Convertible15m-cn0xxx*
+ EVDEV_ABS_00=1302:5640:36
+ EVDEV_ABS_01=1119:4741:61
+ EVDEV_ABS_35=1302:5640:36
+ EVDEV_ABS_36=1119:4741:61
+
  #########################################
  # Lenovo
  #########################################
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb

index 8edd5d19592de95089168db40101434c7b8635cd..ee40e12692a1e0a36590aae7ba58079c91033bc0 100644 (file)
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -510,6 +510,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*Pavilion*dv7*Notebook*PC:
  
  # Pavilion and Spectre x360 13 (Prevents random airplane mode activation)
  evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[sS][pP][eE][cC][tT][rR][eE]*x360*13*:pvr*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pn*[sS][pP][eE][cC][tT][rR][eE]*x360Convertible*:pvr*
  evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr*
   KEYBOARD_KEY_d7=unknown
  
@@ -1474,6 +1475,14 @@ evdev:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVPC*:pvr*
   KEYBOARD_KEY_0d=down                                   # Fn+F9 zoomout
   KEYBOARD_KEY_0e=up                                     # Fn+F10 zoomin
  
+###########################################################
+# System76
+###########################################################
+
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnSystem76*:pn*
+ KEYBOARD_KEY_f7=f21                                    # Touchpad toggle
+ KEYBOARD_KEY_f8=f21                                    # Touchpad toggle
+
  ###########################################################
  # T-bao
  ###########################################################
diff --git a/hwdb/60-sensor.hwdb b/hwdb/60-sensor.hwdb

index df7ad251d0708adc863e5fe1866f876872247e31..97e8dc8aa7e6bf041a5a580bbc0efee6226b8eb1 100644 (file)
--- a/hwdb/60-sensor.hwdb
+++ b/hwdb/60-sensor.hwdb
@@ -160,6 +160,10 @@ sensor:modalias:acpi:BMA250E*:dmi:bvnINSYDECorp.:bvrG1D_S165*:svnilife:pnS165:*
  sensor:modalias:acpi:BOSC0200*:dmi:*:svnHampoo:pnX1D3_C806N:*
   ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
  
+# Chuwi Hi10 (CWI1515)
+sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvrP02A_C106.60E:*:svnDefaultstring:pnDefaultstring:* 
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
  # Chuwi Hi10 Pro
  sensor:modalias:acpi:BOSC0200*:dmi:*:svn*CHUWIINNOVATIONANDTECHNOLOGY*:pnHi10protablet:*
   ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
@@ -254,24 +258,43 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svnEVE*:pnEveV:*
  sensor:modalias:acpi:KIOX000A*:dmi:bvnINSYDECorp.:bvrBYT70A.YNCHENG.WIN.007:*:svnInsyde:pnT701:*
   ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
  
+#########################################
+# GPD
+#########################################
+
+# GPD win (version 1, with the X5-Z8750 CPU)
+# Note we match all dmi fields including the BIOS date checking for all known
+# BIOS dates, since the strings are unfortunately very generic.
+# Out of a sample set of 15 similar boards only the GPDwin has board_vendor=AMI
+# and no other devices have both board_name *and* product_name set to
+# "Default string". So combined with the sensor modalias and BIOS date this
+# should be unique enough to identify the GPDwin
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd10/25/2016:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd11/18/2016:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd12/23/2016:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd12/26/2016:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd02/21/2017:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd03/20/2017:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd05/25/2017:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnAMICorporation:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+ ACCEL_LOCATION=base
+
  #########################################
  # HP
  #########################################
  
-# Laptops using the lis3lv02d device should have a first quirk applied
-# to them in the drivers/platform/x86/hp_accel.c in the kernel. The
-# quirk from "can play neverball" to "matches Windows 8 orientation"
-# is then applied below.
+# Most HP Laptop using the lis3lv02d device have it in the base,
+# mark these sensors as such.
  sensor:modalias:platform:lis3lv02d:dmi:*svn*Hewlett-Packard*:*
-  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, 0, -1; 0, 1, 0
+sensor:modalias:platform:lis3lv02d:dmi:*svn*HP*:*
+ ACCEL_LOCATION=base
  
  sensor:modalias:acpi:SMO8500*:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
  sensor:modalias:acpi:SMO8500*:dmi:*:svnHewlett-Packard:pnHPStream8Tablet:*
-  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
  
  # HP Pavillion X2 10-n000nd
  sensor:modalias:i2c:bmc150_accel:dmi:*:svnHewlett-Packard:pnHPPavilionx2Detachable:*:rn815D:*
-  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
  
  #########################################
  # I.T.Works
@@ -386,10 +409,22 @@ sensor:modalias:acpi:SMO8500*:dmi:*:svnMEDION:pnAkoyaE2212TMD99720:*
  sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION*:pnE3216*:*
   ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
  
+# Medion Akoya E3221 MD61237
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE3221MD61237:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
  # Medion Akoya E3222 MD62450
  sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION*:pnE3222*:*
   ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
  
+# Medion Akoya E2292 MD63390
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE2292MD63390:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
+# Medion Akoya E2293 MD61130
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnMEDION:pnE2293MD61130:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
  #########################################
  # MSI
  #########################################
@@ -519,6 +554,14 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svnTREKSTOR:pnPrimetabT13B:*
  sensor:modalias:acpi:BOSC0200*:dmi:*:svnTrekStor*:pnSurfTabtwin11.6:*
   ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
  
+sensor:modalias:acpi:KIOX010A*:dmi:*:svnTREKSTOR:pnPRIMEBOOKC11B:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, -1
+ ACCEL_LOCATION=display
+
+sensor:modalias:acpi:KIOX020A*:dmi:*:svnTREKSTOR:pnPRIMEBOOKC11B:*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+ ACCEL_LOCATION=base
+
  #########################################
  # Umax
  #########################################
diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb

index 47eb9df95ed8d040c4c9992c2e5bd80c009e0d20..8194d983587df17f1c8684d5af5fdb4c7acce38b 100644 (file)
--- a/hwdb/70-touchpad.hwdb
+++ b/hwdb/70-touchpad.hwdb
@@ -50,6 +50,12 @@ touchpad:usb:v05acp030e:*
  touchpad:usb:v05acp0265:*
   ID_INPUT_TOUCHPAD_INTEGRATION=external
  
+###########################################################
+# HP Elite x2 1013 G3
+###########################################################
+touchpad:usb:v044ep1221:*
+ ID_INPUT_TOUCHPAD_INTEGRATION=external
+
  ###########################################################
  # Logitech
  ###########################################################
diff --git a/hwdb/ma-large.txt b/hwdb/ma-large.txt

index 42121e19c2faa017474ac156ad2d33c87cb5ed9e..302d12fab15e1b039fac087f9112bfa604d9abe9 100644 (file)
--- a/hwdb/ma-large.txt
+++ b/hwdb/ma-large.txt
@@ -32360,12 +32360,180 @@ D44F68     (base 16)         Eidetic Communications Inc
                                 Hanover  NH  03755\r
                                 US\r
  \r
+8C-C8-4B   (hex)               CHONGQING FUGUI ELECTRONICS CO.,LTD.\r
+8CC84B     (base 16)           CHONGQING FUGUI ELECTRONICS CO.,LTD.\r
+                               Building D21,No.1, East Zone 1st Road,Xiyong Town,Shapingba District\r
+                               Chongqing  Chongqing  401332\r
+                               CN\r
+\r
+0C-2F-B0   (hex)               Samsung Electronics Co.,Ltd\r
+0C2FB0     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
  B4-02-16   (hex)               Cisco Systems, Inc\r
  B40216     (base 16)           Cisco Systems, Inc\r
                                 80 West Tasman Drive\r
                                 San Jose  CA  94568\r
                                 US\r
  \r
+54-A4-93   (hex)               IEEE Registration Authority\r
+54A493     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+6C-1C-71   (hex)               Zhejiang Dahua Technology Co., Ltd.\r
+6C1C71     (base 16)           Zhejiang Dahua Technology Co., Ltd.\r
+                               No.1199,Waterfront Road \r
+                               Hangzhou  Zhejiang  310053\r
+                               CN\r
+\r
+CC-6A-10   (hex)               The Chamberlain Group, Inc\r
+CC6A10     (base 16)           The Chamberlain Group, Inc\r
+                               300 Windsor Drive\r
+                               Oak Brook  IL  60523\r
+                               US\r
+\r
+F0-3F-95   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F03F95     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+18-56-44   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+185644     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+9C-69-D1   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+9C69D1     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+18-5A-58   (hex)               Dell Inc.\r
+185A58     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+C4-3A-35   (hex)               FN-LINK TECHNOLOGY LIMITED\r
+C43A35     (base 16)           FN-LINK TECHNOLOGY LIMITED\r
+                               A Building,HuiXin industial park,No 31, YongHe road, Fuyong town, Bao'an District\r
+                               SHENZHEN  GUANGDONG  518100\r
+                               CN\r
+\r
+04-D1-6E   (hex)               IEEE Registration Authority\r
+04D16E     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+04-0E-3C   (hex)               HP Inc.\r
+040E3C     (base 16)           HP Inc.\r
+                               10300 Energy Dr\r
+                               Spring  TX  77389\r
+                               US\r
+\r
+C4-E0-DE   (hex)               Zhengzhou XindaJiean Information Technology Co.,Ltd.\r
+C4E0DE     (base 16)           Zhengzhou XindaJiean Information Technology Co.,Ltd.\r
+                               Tianli building A, wisdom park, no. 139, yangjin road, jinshui district\r
+                               Zhengzhou  Henan  450003\r
+                               CN\r
+\r
+90-1A-4F   (hex)               EM Microelectronic\r
+901A4F     (base 16)           EM Microelectronic\r
+                               Rue des Sors 3\r
+                               Marin-Epagnier  Neuchatel  2074\r
+                               CH\r
+\r
+C8-4F-0E   (hex)               Integrated Device Technology (Malaysia) Sdn. Bhd.\r
+C84F0E     (base 16)           Integrated Device Technology (Malaysia) Sdn. Bhd.\r
+                               Phase 3, Bayan Lepas FIZ\r
+                               Bayan Lepas  Penang  11900\r
+                               MY\r
+\r
+6C-D2-BA   (hex)               zte corporation\r
+6CD2BA     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+30-3A-BA   (hex)               Guangzhou BaoLun Electronics Co., Ltd\r
+303ABA     (base 16)           Guangzhou BaoLun Electronics Co., Ltd\r
+                               No.1 Building B Block, Zhongcun Street, Panyu District\r
+                               Guangzhou  guangdong  511400\r
+                               CN\r
+\r
+D8-8A-DC   (hex)               Huawei Device Co., Ltd.\r
+D88ADC     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+10-E9-53   (hex)               Huawei Device Co., Ltd.\r
+10E953     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+7C-48-B2   (hex)               Vida Resources Lte Ltd\r
+7C48B2     (base 16)           Vida Resources Lte Ltd\r
+                               10 Anson road, unit #16-20 International Plaza\r
+                               Singapore    079903\r
+                               SG\r
+\r
+2C-AB-33   (hex)               Texas Instruments\r
+2CAB33     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+B8-87-C6   (hex)               Prudential Technology co.,LTD\r
+B887C6     (base 16)           Prudential Technology co.,LTD\r
+                               UNIT 4,7/F BRIGHT WAY TOWER, NO33 MONG KOK RD, \r
+                               Hong Kong    999077 \r
+                               CN\r
+\r
+EC-9C-32   (hex)               Sichuan AI-Link Technology Co., Ltd.\r
+EC9C32     (base 16)           Sichuan AI-Link Technology Co., Ltd.\r
+                               Anzhou,Industrial Park\r
+                               Anzhou,Industrial Park  Sichuan  621000\r
+                               CN\r
+\r
+4C-AD-A8   (hex)               PANOPTICS CORP.\r
+4CADA8     (base 16)           PANOPTICS CORP.\r
+                               D-908 Bundang Technopark, 700 Pangyoro, Bundang\r
+                               Seongnam  Gyeonggi  13516\r
+                               KR\r
+\r
+FC-1C-A1   (hex)               Nokia\r
+FC1CA1     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+34-CB-1A   (hex)               Procter & Gamble Company\r
+34CB1A     (base 16)           Procter & Gamble Company\r
+                               2 Procter & Gamble Plaza\r
+                               Cincinnati  OH  45202\r
+                               US\r
+\r
+1C-1A-DF   (hex)               Microsoft Corporation\r
+1C1ADF     (base 16)           Microsoft Corporation\r
+                               One Microsoft Way\r
+                               REDMOND  WA  98052\r
+                               US\r
+\r
+D4-F5-47   (hex)               Google, Inc.\r
+D4F547     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
  9C-FF-C2   (hex)               AVI Systems GmbH\r
  9CFFC2     (base 16)           AVI Systems GmbH\r
                                 Dr. Franz Wilhelmstraße 2A\r
@@ -46727,12 +46895,6 @@ D410CF     (base 16)           Huanshun Network Science and Technology Co., Ltd.
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-D8-D5-B9   (hex)               Rainforest Automation, Inc.\r
-D8D5B9     (base 16)           Rainforest Automation, Inc.\r
-                               34 West 7th Ave\r
-                               Vancouver  British Columbia  V5Y 1L6\r
-                               CA\r
-\r
  24-11-D0   (hex)               Chongqing Ehs Science and Technology Development Co.,Ltd.\r
  2411D0     (base 16)           Chongqing Ehs Science and Technology Development Co.,Ltd.\r
                                 Saturn Business Center C3-15-7,Starlight No.5 Street\r
@@ -60104,12 +60266,6 @@ AC8317     (base 16)           Shenzhen Furtunetel Communication Co., Ltd
                                 CHUNG-HO CITY TAIPEI    \r
                                 TW\r
  \r
-00-30-56   (hex)               Beck IPC GmbH\r
-003056     (base 16)           Beck IPC GmbH\r
-                               Grüninger Weg 24\r
-                               D-35415  Pohlheim  \r
-                               DE\r
-\r
  00-30-50   (hex)               Versa Technology\r
  003050     (base 16)           Versa Technology\r
                                 4430 E. Miraloma Ave., - Ste.\r
@@ -60134,12 +60290,6 @@ AC8317     (base 16)           Shenzhen Furtunetel Communication Co., Ltd
                                 Monrovia  CA  91016\r
                                 US\r
  \r
-00-30-92   (hex)               ModuNORM GmbH\r
-003092     (base 16)           ModuNORM GmbH\r
-                               Langrutistrasse 33\r
-                               CH-8840 Einsledeln    \r
-                               CH\r
-\r
  00-30-5C   (hex)               SMAR Laboratories Corp.\r
  00305C     (base 16)           SMAR Laboratories Corp.\r
                                 10960 Millridge North - Ste. #107\r
@@ -63752,12 +63902,192 @@ B43939     (base 16)         Shenzhen TINNO Mobile Technology Corp.
                                 Shenzhen   guangdong  518053\r
                                 CN\r
  \r
+74-9E-F5   (hex)               Samsung Electronics Co.,Ltd\r
+749EF5     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+68-BF-C4   (hex)               Samsung Electronics Co.,Ltd\r
+68BFC4     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+04-B1-A1   (hex)               Samsung Electronics Co.,Ltd\r
+04B1A1     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+CC-46-4E   (hex)               Samsung Electronics Co.,Ltd\r
+CC464E     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
  64-C9-01   (hex)               INVENTEC Corporation\r
  64C901     (base 16)           INVENTEC Corporation\r
                                 No.66, Hougang St., Shilin Dist., Taipei City 111, Taiwan (R.O.C.)\r
                                 Taipei    111\r
                                 TW\r
  \r
+30-6F-07   (hex)               Nations Technologies Inc.\r
+306F07     (base 16)           Nations Technologies Inc.\r
+                               18F, Nations Tower, Nanshan District\r
+                               Shenzhen    518057\r
+                               CN\r
+\r
+5C-E5-0C   (hex)               Beijing Xiaomi Mobile Software Co., Ltd\r
+5CE50C     (base 16)           Beijing Xiaomi Mobile Software Co., Ltd\r
+                               The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+A8-5E-45   (hex)               ASUSTek COMPUTER INC.\r
+A85E45     (base 16)           ASUSTek COMPUTER INC.\r
+                               15,Li-Te Rd., Peitou, Taipei 112, Taiwan\r
+                               Taipei  Taiwan  112\r
+                               TW\r
+\r
+84-9A-40   (hex)               Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+849A40     (base 16)           Hangzhou Hikvision Digital Technology Co.,Ltd.\r
+                               No.555 Qianmo Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+18-70-3B   (hex)               Huawei Device Co., Ltd.\r
+18703B     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+D8-9E-61   (hex)               Huawei Device Co., Ltd.\r
+D89E61     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+34-7E-00   (hex)               Huawei Device Co., Ltd.\r
+347E00     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+F8-89-3C   (hex)               Inventec Appliances Corp.\r
+F8893C     (base 16)           Inventec Appliances Corp.\r
+                               37 Wugong 5th road, New Taipei Industrial Park,\r
+                               New Taipei City  Wugu District  24890\r
+                               TW\r
+\r
+A0-DF-15   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+A0DF15     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+D8-D5-B9   (hex)               Rainforest Automation, Inc.\r
+D8D5B9     (base 16)           Rainforest Automation, Inc.\r
+                               Unit #L4100, 4225 Kincaid Stree\r
+                               Burnaby  British Columbia  V5G 4P5\r
+                               CA\r
+\r
+C4-AD-34   (hex)               Routerboard.com\r
+C4AD34     (base 16)           Routerboard.com\r
+                               Mikrotikls SIA\r
+                               Riga  Riga  LV1009\r
+                               LV\r
+\r
+5C-71-0D   (hex)               Cisco Systems, Inc\r
+5C710D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Dr.\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+7C-D5-66   (hex)               Amazon Technologies Inc.\r
+7CD566     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102\r
+                               Reno  NV  89507\r
+                               US\r
+\r
+68-63-50   (hex)               Hella India Automotive Pvt Ltd\r
+686350     (base 16)           Hella India Automotive Pvt Ltd\r
+                               Unit no 201A to 201B  Nano Space Surveyno.5/1B/2 BanerBaner Pashan Link road\r
+                               Pune  Maharastra  411045\r
+                               IN\r
+\r
+98-AF-65   (hex)               Intel Corporate\r
+98AF65     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+80-75-1F   (hex)               BSkyB Ltd\r
+80751F     (base 16)           BSkyB Ltd\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
+\r
+24-74-F7   (hex)               GoPro\r
+2474F7     (base 16)           GoPro\r
+                               3000 Clearview Way\r
+                               San Mateo  CA  94402\r
+                               US\r
+\r
+00-30-92   (hex)               Kontron Electronics AG\r
+003092     (base 16)           Kontron Electronics AG\r
+                               Riedstrasse 1\r
+                               Rotkreuz    CH-6343\r
+                               CH\r
+\r
+F8-55-CD   (hex)               Visteon Corporation\r
+F855CD     (base 16)           Visteon Corporation\r
+                               One Village Center Drive\r
+                               Van Buren Twp  MI  48111\r
+                               US\r
+\r
+44-18-47   (hex)               HUNAN SCROWN ELECTRONIC INFORMATION TECH.CO.,LTD\r
+441847     (base 16)           HUNAN SCROWN ELECTRONIC INFORMATION TECH.CO.,LTD\r
+                               Building No.4,Changsha Zhongdian Software Park No.39,Jianshan Road\r
+                               Changsha  Hunan  410006\r
+                               CN\r
+\r
+E8-5A-8B   (hex)               Xiaomi Communications Co Ltd\r
+E85A8B     (base 16)           Xiaomi Communications Co Ltd\r
+                               The Rainbow City of China Resources\r
+                               NO.68, Qinghe Middle Street  Haidian District, Beijing  100085\r
+                               CN\r
+\r
+44-22-95   (hex)               China Mobile Iot Limited company\r
+442295     (base 16)           China Mobile Iot Limited company\r
+                               No. 8 Yangliu North Road, Yubei District, Chongqing, China\r
+                               Chong Qing  Chong Qing  401120\r
+                               CN\r
+\r
+00-AB-48   (hex)               eero inc.\r
+00AB48     (base 16)           eero inc.\r
+                               660 3rd Street\r
+                               San Francisco  CA  94107\r
+                               US\r
+\r
+00-30-56   (hex)               HMS Industrial Networks\r
+003056     (base 16)           HMS Industrial Networks\r
+                               P O Box 4126\r
+                               Halmstad  Halland  300 04\r
+                               SE\r
+\r
+C4-D8-F3   (hex)               iZotope\r
+C4D8F3     (base 16)           iZotope\r
+                               60 Hampshire St\r
+                               Cambridge  MA  02139\r
+                               US\r
+\r
+1C-C1-BC   (hex)               Yichip Microelectronics (Hangzhou) Co.,Ltd\r
+1CC1BC     (base 16)           Yichip Microelectronics (Hangzhou) Co.,Ltd\r
+                               Room 401, Building 15, No.498 Guoshoujing Road, Pudong Software Park\r
+                               Shanghai    200120\r
+                               CN\r
+\r
  84-80-94   (hex)               Meter, Inc.\r
  848094     (base 16)           Meter, Inc.\r
                                 148 Townsend St\r
@@ -79331,12 +79661,6 @@ C438D3     (base 16)           TAGATEC CO.,LTD
                                 Goyang-si  Kyunggi-do  410-704\r
                                 KR\r
  \r
-E0-AA-B0   (hex)               GENERAL VISION ELECTRONICS CO. LTD.\r
-E0AAB0     (base 16)           GENERAL VISION ELECTRONICS CO. LTD.\r
-                               ROOM 528 5 Floor , MINLE BUILDING 117-13 , OLD MINLE Village ,MINZI STREET , LONGHUA NEW ZONE\r
-                               SHENZHEN  Guangdong  518040\r
-                               CN\r
-\r
  50-2E-CE   (hex)               Asahi Electronics Co.,Ltd\r
  502ECE     (base 16)           Asahi Electronics Co.,Ltd\r
                                 29-25 Kariyado\r
@@ -79820,12 +80144,6 @@ CCEED9     (base 16)           VAHLE Automation GmbH
                                 Kufstein   Schwoich Tirol  6334\r
                                 AT\r
  \r
-64-52-99   (hex)               The Chamberlain Group, Inc\r
-645299     (base 16)           The Chamberlain Group, Inc\r
-                               845 N Larch Ave\r
-                               Elmhurst  Illinois  60126\r
-                               US\r
-\r
  00-5C-B1   (hex)               Gospell DIGITAL TECHNOLOGY CO., LTD\r
  005CB1     (base 16)           Gospell DIGITAL TECHNOLOGY CO., LTD\r
                                 Block F10-F13Â¡Â¢F518 Idea land Â¡Â¢Bao Yuan Road\r
@@ -82112,12 +82430,6 @@ F47626     (base 16)           Viltechmeda UAB
                                 St. Georgen    78112\r
                                 DE\r
  \r
-F0-26-4C   (hex)               Dr. Sigrist AG\r
-F0264C     (base 16)           Dr. Sigrist AG\r
-                               Hofurlistrasse 1\r
-                               Ennetbürgen    6373\r
-                               CH\r
-\r
  5C-87-78   (hex)               Cybertelbridge co.,ltd\r
  5C8778     (base 16)           Cybertelbridge co.,ltd\r
                                 #901 Acehighend tower 2\r
@@ -89864,12 +90176,6 @@ D8D67E     (base 16)           GSK CNC EQUIPMENT CO.,LTD
                                 Fremont  CA  94538\r
                                 US\r
  \r
-00-08-29   (hex)               Aval Nagasaki Corporation\r
-000829     (base 16)           Aval Nagasaki Corporation\r
-                               6-42 Tukuba Isahaya\r
-                                   854-0065\r
-                               JP\r
-\r
  00-08-1B   (hex)               Windigo Systems\r
  00081B     (base 16)           Windigo Systems\r
                                 2210 O'Toole Ave. #200\r
@@ -90956,12 +91262,6 @@ D8D67E     (base 16)           GSK CNC EQUIPMENT CO.,LTD
                                 Cary,  NC  27513\r
                                 US\r
  \r
-00-03-CB   (hex)               Nippon Systems Development Co., Ltd.\r
-0003CB     (base 16)           Nippon Systems Development Co., Ltd.\r
-                               30-12, Komyo-cho,\r
-                                 665-0045  \r
-                               JP\r
-\r
  00-03-C7   (hex)               hopf Elektronik GmbH\r
  0003C7     (base 16)           hopf Elektronik GmbH\r
                                 Nottebohmstraße 41\r
@@ -95681,12 +95981,210 @@ FCC233     (base 16)         ASUSTek COMPUTER INC.
                                 Thalwil    8800\r
                                 CH\r
  \r
+28-52-F9   (hex)               Zhongxin Intelligent Times (Shenzhen) Co., Ltd.\r
+2852F9     (base 16)           Zhongxin Intelligent Times (Shenzhen) Co., Ltd.\r
+                               3rd Floor,Building 46,Cuigang Industrial Zone 5,Fuyong Street,Baoan District\r
+                               Shenzhen  Guangdong  518103\r
+                               CN\r
+\r
+B8-F8-53   (hex)               Arcadyan Corporation\r
+B8F853     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
+E0-D0-83   (hex)               Samsung Electronics Co.,Ltd\r
+E0D083     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+74-3C-18   (hex)               Taicang T&W Electronics\r
+743C18     (base 16)           Taicang T&W Electronics\r
+                               89# Jiang Nan RD\r
+                               Suzhou  Jiangsu  215412\r
+                               CN\r
+\r
  4C-80-BA   (hex)               Wuhan Tianyu Information Industry Co., Ltd.\r
  4C80BA     (base 16)           Wuhan Tianyu Information Industry Co., Ltd.\r
                                 HUST Industry Park, East-Lake Development Zone\r
                                 Wuhan  Hubei  430223\r
                                 CN\r
  \r
+8C-02-FA   (hex)               COMMANDO Networks Limited\r
+8C02FA     (base 16)           COMMANDO Networks Limited\r
+                               Rm407, 4th floor, 3-2 HuaYuan Rd., DaLang Subdistrict, LongHua District\r
+                               Shenzhen  Guangdong  518109\r
+                               CN\r
+\r
+F0-26-4C   (hex)               Sigrist-Photometer AG\r
+F0264C     (base 16)           Sigrist-Photometer AG\r
+                               Hofurlistrasse 1\r
+                               Ennetbürgen    6373\r
+                               CH\r
+\r
+D0-3D-52   (hex)               Vaion Limited\r
+D03D52     (base 16)           Vaion Limited\r
+                               The Charter Building, Charter Place\r
+                               Uxbridge    UB8 1JG \r
+                               GB\r
+\r
+D8-0B-9A   (hex)               Samsung Electronics Co.,Ltd\r
+D80B9A     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+AC-8D-34   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+AC8D34     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+64-52-99   (hex)               The Chamberlain Group, Inc\r
+645299     (base 16)           The Chamberlain Group, Inc\r
+                               300 Windsor Drive\r
+                               Oak Brook  IL  60523\r
+                               US\r
+\r
+F8-75-A4   (hex)               LCFC(HeFei) Electronics Technology co., ltd\r
+F875A4     (base 16)           LCFC(HeFei) Electronics Technology co., ltd\r
+                               YunGu Road 3188-1\r
+                               Hefei  Anhui  230000\r
+                               CN\r
+\r
+00-D2-B1   (hex)               TPV Display Technology (Xiamen) Co.,Ltd.\r
+00D2B1     (base 16)           TPV Display Technology (Xiamen) Co.,Ltd.\r
+                               No.1, Xianghai Road, Xiamen Torch Hi-Tech Industrial Development Zone\r
+                               XM  Fujian  361101\r
+                               CN\r
+\r
+C0-E4-34   (hex)               AzureWave Technology Inc.\r
+C0E434     (base 16)           AzureWave Technology Inc.\r
+                               8F., No. 94, Baozhong Rd.\r
+                               New Taipei City  Taiwan  231\r
+                               TW\r
+\r
+6C-71-0D   (hex)               Cisco Systems, Inc\r
+6C710D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Dr.\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+24-6F-8C   (hex)               Huawei Device Co., Ltd.\r
+246F8C     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+1C-13-86   (hex)               Huawei Device Co., Ltd.\r
+1C1386     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+BC-2E-F6   (hex)               Huawei Device Co., Ltd.\r
+BC2EF6     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+44-55-C4   (hex)               Huawei Device Co., Ltd.\r
+4455C4     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+00-08-29   (hex)               TOKYO ELECTRON DEVICE NAGASAKI LIMITED\r
+000829     (base 16)           TOKYO ELECTRON DEVICE NAGASAKI LIMITED\r
+                               6-42 Tsukuba-machi, Isahaya-shi\r
+                               Nagasaki  Kyushu  854-0065\r
+                               JP\r
+\r
+1C-44-55   (hex)               Sieb & Meyer AG\r
+1C4455     (base 16)           Sieb & Meyer AG\r
+                               Auf dem Schmaarkamp 21\r
+                               Lueneburg    21339\r
+                               DE\r
+\r
+80-32-53   (hex)               Intel Corporate\r
+803253     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+F8-8A-5E   (hex)               Texas Instruments\r
+F88A5E     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+5C-E7-A0   (hex)               Nokia\r
+5CE7A0     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+E0-1F-88   (hex)               Xiaomi Communications Co Ltd\r
+E01F88     (base 16)           Xiaomi Communications Co Ltd\r
+                               The Rainbow City of China Resources\r
+                               NO.68, Qinghe Middle Street  Haidian District, Beijing  100085\r
+                               CN\r
+\r
+8C-DC-02   (hex)               zte corporation\r
+8CDC02     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+B4-BC-7C   (hex)               Texas Instruments\r
+B4BC7C     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+E0-AA-B0   (hex)               SUNTAILI ENTERPRISE CO. LTD,\r
+E0AAB0     (base 16)           SUNTAILI ENTERPRISE CO. LTD,\r
+                               No. 6 ALY 3,LN 64 XINGFU RD, XINZHUNAG DISTRICT\r
+                               NEW TAIPEI CITY    242\r
+                               TW\r
+\r
+68-39-43   (hex)               ittim\r
+683943     (base 16)           ittim\r
+                               1202, No.6, Zhongguancun South Street, Haidian District,\r
+                               beijing    100080\r
+                               CN\r
+\r
+7C-A7-B0   (hex)               SHENZHEN BILIAN ELECTRONIC CO.，LTD\r
+7CA7B0     (base 16)           SHENZHEN BILIAN ELECTRONIC CO.，LTD\r
+                               NO.268? Fuqian Rd, Jutang community, Guanlan Town, Longhua New district\r
+                               shenzhen  guangdong  518000\r
+                               CN\r
+\r
+20-31-1C   (hex)               vivo Mobile Communication Co., Ltd.\r
+20311C     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               #283,BBK Road\r
+                               Wusha,Chang'An  DongGuan City,Guangdong,  523860\r
+                               CN\r
+\r
+B4-E8-42   (hex)               Hong Kong Bouffalo Lab Limited\r
+B4E842     (base 16)           Hong Kong Bouffalo Lab Limited\r
+                               RM 1903, 19/F Lee Garden One 33 Hysan Avenue, Causeway Bay\r
+                               HongKong    999077\r
+                               HK\r
+\r
+10-C6-5E   (hex)               Adapt-IP\r
+10C65E     (base 16)           Adapt-IP\r
+                               1671 Dell Avenue, Suite 130\r
+                               Campbell  CA  95008-6900\r
+                               US\r
+\r
+00-03-CB   (hex)               SystemGear Co., Ltd.\r
+0003CB     (base 16)           SystemGear Co., Ltd.\r
+                               1-9-14 Edobori\r
+                               Osaka  Nishi-ku  550-0002\r
+                               JP\r
+\r
  F8-D0-27   (hex)               Seiko Epson Corporation\r
  F8D027     (base 16)           Seiko Epson Corporation\r
                                 2070 Kotobuki Koaka\r
@@ -114131,12 +114629,6 @@ A07332     (base 16)         Cashmaster International Limited
                                   Tokyo  113-8503\r
                                 JP\r
  \r
-00-24-87   (hex)               Blackboard Inc.\r
-002487     (base 16)           Blackboard Inc.\r
-                               22601 North 19th Avenue\r
-                               Phoenix  AZ  85027\r
-                               US\r
-\r
  00-24-47   (hex)               Kaztek Systems\r
  002447     (base 16)           Kaztek Systems\r
                                 17 Bromfield Road\r
@@ -120968,12 +121460,6 @@ A07332     (base 16)         Cashmaster International Limited
                                 Hamburg    21029\r
                                 DE\r
  \r
-00-0A-7B   (hex)               Cornelius Consult\r
-000A7B     (base 16)           Cornelius Consult\r
-                               Am Siepen 17\r
-                               Bochum  NRW  44803\r
-                               DE\r
-\r
  00-0A-84   (hex)               Rainsun Enterprise Co., Ltd.\r
  000A84     (base 16)           Rainsun Enterprise Co., Ltd.\r
                                 No.14-3 , Lane 235, Ho-Chen Road\r
@@ -127499,6 +127985,129 @@ F89E28     (base 16)                Cisco Meraki
                                 San Francisco    94158\r
                                 US\r
  \r
+F8-C4-F3   (hex)               Shanghai Infinity Wireless Technologies Co.,Ltd.\r
+F8C4F3     (base 16)           Shanghai Infinity Wireless Technologies Co.,Ltd.\r
+                               Room 522, Building A, No.1687 Changyang Road, Yangpu District, Shanghai\r
+                               Shanghai  Shanghai  200082\r
+                               CN\r
+\r
+18-D0-C5   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+18D0C5     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+D4-77-2B   (hex)               Nanjing Ztlink Network Technology Co.,Ltd\r
+D4772B     (base 16)           Nanjing Ztlink Network Technology Co.,Ltd\r
+                               No.0 Mozhou East Road , Jiangning Economic & Technological Development Zone, Jiangning District\r
+                               Nanjing  Jiangsu  211111\r
+                               CN\r
+\r
+C4-E9-0A   (hex)               D-Link International\r
+C4E90A     (base 16)           D-Link International\r
+                               1 Internal Business Park, #03-12,The Synergy, Singapore\r
+                               Singapore  Singapore  609917\r
+                               SG\r
+\r
+C0-2E-26   (hex)               Private\r
+C02E26     (base 16)           Private\r
+\r
+00-0A-7B   (hex)               Cornelius Consult\r
+000A7B     (base 16)           Cornelius Consult\r
+                               Im Vogelsang 21\r
+                               Hattingen  NRW  45527\r
+                               DE\r
+\r
+30-E9-8E   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+30E98E     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+C4-44-7D   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+C4447D     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+AC-BD-70   (hex)               Huawei Device Co., Ltd.\r
+ACBD70     (base 16)           Huawei Device Co., Ltd.\r
+                               No.2 of Xincheng Road, Songshan Lake Zone\r
+                               Dongguan  Guangdong  523808\r
+                               CN\r
+\r
+C8-09-A8   (hex)               Intel Corporate\r
+C809A8     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+74-8B-34   (hex)               Shanghai Smart System Technology Co., Ltd\r
+748B34     (base 16)           Shanghai Smart System Technology Co., Ltd\r
+                               Room 902C-1, 560 Shengxia Road, Zhangjiang Hi-Tech Park, Shanghai 201203, China\r
+                               Shanghai  Shanghai  201210\r
+                               CN\r
+\r
+34-D2-62   (hex)               SZ DJI TECHNOLOGY CO.,LTD\r
+34D262     (base 16)           SZ DJI TECHNOLOGY CO.,LTD\r
+                               6/F,HKUST SZ IER Bldg,9 Yuexing 1st Rd\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+08-12-A5   (hex)               Amazon Technologies Inc.\r
+0812A5     (base 16)           Amazon Technologies Inc.\r
+                               P.O Box 8102\r
+                               Reno  NV  89507\r
+                               US\r
+\r
+80-7F-F8   (hex)               Juniper Networks\r
+807FF8     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+44-03-77   (hex)               IEEE Registration Authority\r
+440377     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+00-24-87   (hex)               Transact Campus, Inc.\r
+002487     (base 16)           Transact Campus, Inc.\r
+                               22601 North 19th Avenue\r
+                               Phoenix  AZ  85027\r
+                               US\r
+\r
+80-E4-55   (hex)               New H3C Technologies Co., Ltd\r
+80E455     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+2C-4C-C6   (hex)               Murata Manufacturing Co., Ltd.\r
+2C4CC6     (base 16)           Murata Manufacturing Co., Ltd.\r
+                               1-10-1, Higashikotari\r
+                               Nagaokakyo-shi  Kyoto  617-8555\r
+                               JP\r
+\r
+90-B8-E0   (hex)               SHENZHEN YANRAY TECHNOLOGY CO.,LTD\r
+90B8E0     (base 16)           SHENZHEN YANRAY TECHNOLOGY CO.,LTD\r
+                               5A, 4th Building, Huafengzhenbao Industrial Park, Beihuan Road, Shiyan Street, Baoan District, \r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+9C-F5-31   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+9CF531     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+7C-21-0D   (hex)               Cisco Systems, Inc\r
+7C210D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Dr.\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
  7C-8A-E1   (hex)               COMPAL INFORMATION (KUNSHAN) CO., LTD. \r
  7C8AE1     (base 16)           COMPAL INFORMATION (KUNSHAN) CO., LTD. \r
                                 NO. 25, THE 3RD Street KUNSHAN EXPORT PROCESSING ZONE \r
@@ -159427,3 +160036,177 @@ E4671E     (base 16)                SHEN ZHEN NUO XIN CHENG TECHNOLOGY co., Ltd.
                                 1133 Innovation Way\r
                                 Sunnyvale  CA  94089\r
                                 US\r
+\r
+A4-C9-39   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+A4C939     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+34-D7-72   (hex)               Xiamen Yudian Automation Technology Co., Ltd \r
+34D772     (base 16)           Xiamen Yudian Automation Technology Co., Ltd \r
+                               No. 17 North Huoju Rd., Huoju Park, Huoju Hi-Tech District  \r
+                               XIAMEN  FUJIAN   361000 \r
+                               CN\r
+\r
+C0-DC-DA   (hex)               Samsung Electronics Co.,Ltd\r
+C0DCDA     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+04-B4-29   (hex)               Samsung Electronics Co.,Ltd\r
+04B429     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+48-79-4D   (hex)               Samsung Electronics Co.,Ltd\r
+48794D     (base 16)           Samsung Electronics Co.,Ltd\r
+                               #94-1, Imsoo-Dong\r
+                               Gumi  Gyeongbuk  730-350\r
+                               KR\r
+\r
+44-F9-71   (hex)               SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+44F971     (base 16)           SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.\r
+                               3/F, Building R1-B, High-Tech Industrial Park, Nanshan District\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+18-F9-C4   (hex)               BAE Systems\r
+18F9C4     (base 16)           BAE Systems\r
+                               21 continental boulevard\r
+                               Merrimack  NH  03054\r
+                               US\r
+\r
+60-AB-D2   (hex)               Bose Corporation\r
+60ABD2     (base 16)           Bose Corporation\r
+                               The Mountain\r
+                               Framingham  MA  01701-9168\r
+                               US\r
+\r
+F0-EF-86   (hex)               Google, Inc.\r
+F0EF86     (base 16)           Google, Inc.\r
+                               1600 Amphitheatre Parkway\r
+                               Mountain View  CA  94043\r
+                               US\r
+\r
+E4-C0-CC   (hex)               China Mobile Group Device Co.,Ltd.\r
+E4C0CC     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
+\r
+5C-B1-3E   (hex)               Sagemcom Broadband SAS\r
+5CB13E     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+F4-E5-F2   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+F4E5F2     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+54-13-10   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+541310     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+8C-E5-EF   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+8CE5EF     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
+A4-CD-23   (hex)               Shenzhenshi Xinzhongxin  Co., Ltd\r
+A4CD23     (base 16)           Shenzhenshi Xinzhongxin  Co., Ltd\r
+                               Building A3, Donghuan Industrial Zone, Nanpu Road, Shajing Town, Baoan District\r
+                               Shenzhen  Guangdong  518125\r
+                               CN\r
+\r
+B8-3A-5A   (hex)               Aruba, a Hewlett Packard Enterprise Company\r
+B83A5A     (base 16)           Aruba, a Hewlett Packard Enterprise Company\r
+                               3333 Scott Blvd\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+E4-AA-EA   (hex)               Liteon Technology Corporation\r
+E4AAEA     (base 16)           Liteon Technology Corporation\r
+                               4F, 90, Chien 1 Road\r
+                               New Taipei City  Taiwan  23585\r
+                               TW\r
+\r
+A0-94-6A   (hex)               Shenzhen XGTEC Technology Co,.Ltd.\r
+A0946A     (base 16)           Shenzhen XGTEC Technology Co,.Ltd.\r
+                               Room 312, Changhong Science and Technology Building, No.18, South 12 Rd., High-tech Community, Yuehai Street, Nanshan District, Shenzhen\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+1C-2A-A3   (hex)               Shenzhen HongRui Optical Technology Co., Ltd.\r
+1C2AA3     (base 16)           Shenzhen HongRui Optical Technology Co., Ltd.\r
+                               B#2F Shuangjinhui Industrial Park, Yonghe Road, Heping Village, Fuyong Town, Bao'an Dis\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+38-8E-7A   (hex)               AUTOIT\r
+388E7A     (base 16)           AUTOIT\r
+                               212, Gasan digital 1-ro\r
+                               Seoul  Geumcheon-gu  08502\r
+                               KR\r
+\r
+4C-71-0C   (hex)               Cisco Systems, Inc\r
+4C710C     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+4C-71-0D   (hex)               Cisco Systems, Inc\r
+4C710D     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+9C-31-C3   (hex)               BSkyB Ltd\r
+9C31C3     (base 16)           BSkyB Ltd\r
+                               130 Kings Road\r
+                               Brentwood  Essex  08854\r
+                               GB\r
+\r
+6C-24-A6   (hex)               vivo Mobile Communication Co., Ltd.\r
+6C24A6     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               #283,BBK Road\r
+                               Wusha,Chang'An  DongGuan City,Guangdong,  523860\r
+                               CN\r
+\r
+9C-5F-5A   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+9C5F5A     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+E4-47-B3   (hex)               zte corporation\r
+E447B3     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+FC-DB-21   (hex)               SAMSARA NETWORKS INC\r
+FCDB21     (base 16)           SAMSARA NETWORKS INC\r
+                               525 York St\r
+                               San Francisco  CA  94110\r
+                               US\r
+\r
+60-77-71   (hex)               Texas Instruments\r
+607771     (base 16)           Texas Instruments\r
+                               12500 TI Blvd\r
+                               Dallas  TX  75243\r
+                               US\r
+\r
+B4-E8-C9   (hex)               XADA Technologies\r
+B4E8C9     (base 16)           XADA Technologies\r
+                               No. 2-2, Xinyi Road Section 5, Lane 150, 1st Floor\r
+                               Taipei City  Taipei City  110\r
+                               TW\r
diff --git a/hwdb/ma-medium.txt b/hwdb/ma-medium.txt

index f988e38bdf95f03b5be1d43bf516a537ba58d64a..5d255daaf12d18092474f6c95849ff865d9af5b9 100644 (file)
--- a/hwdb/ma-medium.txt
+++ b/hwdb/ma-medium.txt
@@ -11,6 +11,12 @@ B00000-BFFFFF     (base 16)          IOG Products LLC
                                 CHATSWORTH  CA  91311\r
                                 US\r
  \r
+B0-C5-CA   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
+B0-1F-81   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  20-85-93   (hex)               Shanghai Kenmyond Industrial Network Equipment Co.,Ltd\r
  D00000-DFFFFF     (base 16)            Shanghai Kenmyond Industrial Network Equipment Co.,Ltd\r
                                 15/F,NO3003,Baoyang Road,Baoshan District\r
@@ -23,9 +29,6 @@ A00000-AFFFFF     (base 16)           H3 Industries, Inc.
                                 Star  ID  83669\r
                                 US\r
  \r
-B0-C5-CA   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
  24-15-10   (hex)               Teknic, Inc.\r
  B00000-BFFFFF     (base 16)            Teknic, Inc.\r
                                 115 Victor Heights Pkwy\r
@@ -62,20 +65,17 @@ D00000-DFFFFF     (base 16)         Helen of Troy
                                 El Paso  TX  79912\r
                                 US\r
  \r
-98-06-37   (hex)               E. P. Schlumberger\r
-100000-1FFFFF     (base 16)            E. P. Schlumberger\r
-                               1 rue Henri Becquerel\r
-                               Clamart    92140\r
-                               FR\r
-\r
  98-06-37   (hex)               Zoleo Inc.\r
  000000-0FFFFF     (base 16)            Zoleo Inc.\r
                                 7a Taymall Avenue\r
                                 Toronto  ON  M8Z 3Y8\r
                                 CA\r
  \r
-B0-1F-81   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
+98-06-37   (hex)               E. P. Schlumberger\r
+100000-1FFFFF     (base 16)            E. P. Schlumberger\r
+                               1 rue Henri Becquerel\r
+                               Clamart    92140\r
+                               FR\r
  \r
  B4-37-D1   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
@@ -86,29 +86,17 @@ A00000-AFFFFF     (base 16)         SYS TEC electronic GmbH
                                 Heinsdorfergrund   Sachsen  D-08468\r
                                 DE\r
  \r
-D0-5F-64   (hex)               Montblanc-Simplo GmbH\r
-E00000-EFFFFF     (base 16)            Montblanc-Simplo GmbH\r
-                               Hellgrundweg 100\r
-                               Hamburg  Hamburg  22525\r
-                               DE\r
-\r
-D0-5F-64   (hex)               TytoCare LTD.\r
-800000-8FFFFF     (base 16)            TytoCare LTD.\r
-                               12 Haomanut st., 2nd floor\r
-                               Netanya  Merkaz  4250445\r
-                               IL\r
-\r
  44-D5-F2   (hex)               Shenzhen Nation RFID Technology Co.,Ltd.\r
  D00000-DFFFFF     (base 16)            Shenzhen Nation RFID Technology Co.,Ltd.\r
                                 Room 816, Building A, Yuanzheng Venture Building, No. 19 Langshan Road, Xili Street, Nanshan District\r
                                 ShenZhen  Guangdong  518000\r
                                 CN\r
  \r
-44-D5-F2   (hex)               Beam Communications Pty Ltd\r
-600000-6FFFFF     (base 16)            Beam Communications Pty Ltd\r
-                               U5/8 Anzed Court\r
-                               Mulgrave  Victoria  3170\r
-                               AU\r
+D0-5F-64   (hex)               TytoCare LTD.\r
+800000-8FFFFF     (base 16)            TytoCare LTD.\r
+                               12 Haomanut st., 2nd floor\r
+                               Netanya  Merkaz  4250445\r
+                               IL\r
  \r
  D0-5F-64   (hex)               Cyrus Technology GmbH\r
  600000-6FFFFF     (base 16)            Cyrus Technology GmbH\r
@@ -116,11 +104,17 @@ D0-5F-64   (hex)          Cyrus Technology GmbH
                                 Aachen    52080\r
                                 DE\r
  \r
-2C-16-BD   (hex)               LINGDONG TECHNOLOGY (BEIJING) CO. LTD\r
-B00000-BFFFFF     (base 16)            LINGDONG TECHNOLOGY (BEIJING) CO. LTD\r
-                               2603-01, Floor 22, building 2, No.66 Zhongguancun East Road, Haidian District, Beijing\r
-                               Beijing    100080\r
-                               CN\r
+D0-5F-64   (hex)               Montblanc-Simplo GmbH\r
+E00000-EFFFFF     (base 16)            Montblanc-Simplo GmbH\r
+                               Hellgrundweg 100\r
+                               Hamburg  Hamburg  22525\r
+                               DE\r
+\r
+44-D5-F2   (hex)               Beam Communications Pty Ltd\r
+600000-6FFFFF     (base 16)            Beam Communications Pty Ltd\r
+                               U5/8 Anzed Court\r
+                               Mulgrave  Victoria  3170\r
+                               AU\r
  \r
  FC-A4-7A   (hex)               Innovative Advantage\r
  700000-7FFFFF     (base 16)            Innovative Advantage\r
@@ -140,12 +134,24 @@ C00000-CFFFFF     (base 16)               Shenzhen ALFEYE Technology CO.,Ltd
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+2C-16-BD   (hex)               LINGDONG TECHNOLOGY (BEIJING) CO. LTD\r
+B00000-BFFFFF     (base 16)            LINGDONG TECHNOLOGY (BEIJING) CO. LTD\r
+                               2603-01, Floor 22, building 2, No.66 Zhongguancun East Road, Haidian District, Beijing\r
+                               Beijing    100080\r
+                               CN\r
+\r
  2C-16-BD   (hex)               Beijing CHJ Automotive Co., Ltd.\r
  C00000-CFFFFF     (base 16)            Beijing CHJ Automotive Co., Ltd.\r
                                 Room 101, Building 1, No. 4 Hengxing Road, Gaoliying, Shunyi District\r
                                 Beijing  Beijing  101303\r
                                 CN\r
  \r
+B4-A2-EB   (hex)               Quantitec GmbH\r
+B00000-BFFFFF     (base 16)            Quantitec GmbH\r
+                               Elisabethenstr. 3a\r
+                               Hofheim am Taunus  Hessen  65719\r
+                               DE\r
+\r
  B4-A2-EB   (hex)               CURRENT WAYS, INC.\r
  900000-9FFFFF     (base 16)            CURRENT WAYS, INC.\r
                                 10221 BUENA VISTA AVE\r
@@ -170,12 +176,6 @@ A00000-AFFFFF     (base 16)                Hengkang（Hangzhou）Co.,Ltd
                                 Reading  Berkshire  RG7 8EA\r
                                 GB\r
  \r
-B4-A2-EB   (hex)               Quantitec GmbH\r
-B00000-BFFFFF     (base 16)            Quantitec GmbH\r
-                               Elisabethenstr. 3a\r
-                               Hofheim am Taunus  Hessen  65719\r
-                               DE\r
-\r
  8C-59-3C   (hex)               Beida Jade Bird Universal Fire Alarm Device CO.,LTD.\r
  200000-2FFFFF     (base 16)            Beida Jade Bird Universal Fire Alarm Device CO.,LTD.\r
                                 Jade Bird Building C, 207 Chengfu RD, Haidian District\r
@@ -215,12 +215,6 @@ E00000-EFFFFF     (base 16)                E-T-A Elektrotechnische Apparate GmbH
                                 Altdorf    90518\r
                                 DE\r
  \r
-60-95-CE   (hex)               Beijing Sinomedisite Bio-tech Co.,Ltd\r
-B00000-BFFFFF     (base 16)            Beijing Sinomedisite Bio-tech Co.,Ltd\r
-                               No.9 Kangding Street,Economic-Technological Development Area\r
-                               Beijing  Beijing  100176\r
-                               CN\r
-\r
  BC-97-40   (hex)               Airfi Oy AB\r
  700000-7FFFFF     (base 16)            Airfi Oy AB\r
                                 Piilipuunkatu 11\r
@@ -239,6 +233,27 @@ BC-97-40   (hex)           Precision Galaxy Pvt. Ltd
                                 CHENNAI,Tamil Nadu  Tamilnadu  600017\r
                                 IN\r
  \r
+60-95-CE   (hex)               Xiamen Sigmastar Technology Ltd.\r
+600000-6FFFFF     (base 16)            Xiamen Sigmastar Technology Ltd.\r
+                               15th Floor ,Unit A,Chuangxin Building, Software Park, Xiamen Torch Hi-Tech Industrial Development Zone, Xiamen,China\r
+                               Xiamen  Fujian  361005\r
+                               CN\r
+\r
+1C-82-59   (hex)               KeyWest Networks, Inc\r
+B00000-BFFFFF     (base 16)            KeyWest Networks, Inc\r
+                               2200 N Glassell St\r
+                               Orange  CA  92865\r
+                               US\r
+\r
+88-5D-90   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
+60-95-CE   (hex)               Beijing Sinomedisite Bio-tech Co.,Ltd\r
+B00000-BFFFFF     (base 16)            Beijing Sinomedisite Bio-tech Co.,Ltd\r
+                               No.9 Kangding Street,Economic-Technological Development Area\r
+                               Beijing  Beijing  100176\r
+                               CN\r
+\r
  60-95-CE   (hex)               Siema Applications\r
  000000-0FFFFF     (base 16)            Siema Applications\r
                                 35 rue Alfred Brinon\r
@@ -257,28 +272,16 @@ E00000-EFFFFF     (base 16)               VNS Inc.
                                 Taipei  Taiwan  11466\r
                                 TW\r
  \r
-60-95-CE   (hex)               Xiamen Sigmastar Technology Ltd.\r
-600000-6FFFFF     (base 16)            Xiamen Sigmastar Technology Ltd.\r
-                               15th Floor ,Unit A,Chuangxin Building, Software Park, Xiamen Torch Hi-Tech Industrial Development Zone, Xiamen,China\r
-                               Xiamen  Fujian  361005\r
-                               CN\r
-\r
-1C-82-59   (hex)               3xLOGIC Inc.\r
-100000-1FFFFF     (base 16)            3xLOGIC Inc.\r
-                               9882 E. 121st Street\r
-                               Fishers  IN  46037\r
-                               US\r
-\r
  84-8B-CD   (hex)               exodraft a/s\r
  500000-5FFFFF     (base 16)            exodraft a/s\r
                                 C. F. Teiegens Boulevard 41\r
                                 Odense SØ    5220\r
                                 DK\r
  \r
-1C-82-59   (hex)               KeyWest Networks, Inc\r
-B00000-BFFFFF     (base 16)            KeyWest Networks, Inc\r
-                               2200 N Glassell St\r
-                               Orange  CA  92865\r
+1C-82-59   (hex)               3xLOGIC Inc.\r
+100000-1FFFFF     (base 16)            3xLOGIC Inc.\r
+                               9882 E. 121st Street\r
+                               Fishers  IN  46037\r
                                 US\r
  \r
  84-8B-CD   (hex)               CCX Technologies Inc.\r
@@ -287,8 +290,17 @@ B00000-BFFFFF     (base 16)                KeyWest Networks, Inc
                                 Ottawa  Ontario  K1Y 4R8\r
                                 CA\r
  \r
-88-5D-90   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
+84-8B-CD   (hex)               TWTG R&D B.V. \r
+600000-6FFFFF     (base 16)            TWTG R&D B.V. \r
+                               Schaardijk 386\r
+                               Capelle aan den IJssel    2909LA\r
+                               NL\r
+\r
+B0-FD-0B   (hex)               DMAC Security LLC\r
+300000-3FFFFF     (base 16)            DMAC Security LLC\r
+                               833 Shotgun Road\r
+                               Sunrise  FL  33326\r
+                               US\r
  \r
  B0-FD-0B   (hex)               eSenseLab Ltd.\r
  800000-8FFFFF     (base 16)            eSenseLab Ltd.\r
@@ -302,18 +314,6 @@ A00000-AFFFFF     (base 16)                TEMCO JAPAN CO., LTD.
                                 SUGINAMI KU  Tokyo-to  168-0062\r
                                 JP\r
  \r
-84-8B-CD   (hex)               TWTG R&D B.V. \r
-600000-6FFFFF     (base 16)            TWTG R&D B.V. \r
-                               Schaardijk 386\r
-                               Capelle aan den IJssel    2909LA\r
-                               NL\r
-\r
-B0-FD-0B   (hex)               DMAC Security LLC\r
-300000-3FFFFF     (base 16)            DMAC Security LLC\r
-                               833 Shotgun Road\r
-                               Sunrise  FL  33326\r
-                               US\r
-\r
  C8-2C-2B   (hex)               Grav I.T.\r
  600000-6FFFFF     (base 16)            Grav I.T.\r
                                 601 1st Ave NW\r
@@ -326,12 +326,6 @@ C8-2C-2B   (hex)           Galgus
                                 Camas  Seville  41900\r
                                 ES\r
  \r
-E4-1E-0A   (hex)               SAGE Glass\r
-800000-8FFFFF     (base 16)            SAGE Glass\r
-                               Two Sage Way\r
-                               Faribault  MN  55021\r
-                               US\r
-\r
  C8-2C-2B   (hex)               Kunshan SVL Electric  Co.,Ltd\r
  B00000-BFFFFF     (base 16)            Kunshan SVL Electric  Co.,Ltd\r
                                 No. 568, JuJin Road, Zhangpu Town\r
@@ -344,17 +338,23 @@ C8-2C-2B   (hex)          Merpa Bilgi Islem Ltd.Sti
                                 Istanbul  Bayrampasa  34040\r
                                 TR\r
  \r
+E4-1E-0A   (hex)               SAGE Glass\r
+800000-8FFFFF     (base 16)            SAGE Glass\r
+                               Two Sage Way\r
+                               Faribault  MN  55021\r
+                               US\r
+\r
  C8-2C-2B   (hex)               UBITRON Co.,LTD\r
  D00000-DFFFFF     (base 16)            UBITRON Co.,LTD\r
                                 Sinbuk-Ro\r
                                 Chuncheon City  Gangwon  24206\r
                                 KR\r
  \r
-C8-63-14   (hex)               Maxcom S.A.\r
-900000-9FFFFF     (base 16)            Maxcom S.A.\r
-                               Towarowa 23A\r
-                               Tychy    43-100\r
-                               PL\r
+C8-63-14   (hex)               Autonics Co., Ltd.\r
+100000-1FFFFF     (base 16)            Autonics Co., Ltd.\r
+                               4-14-26, Shimo-Muneoka\r
+                               Shiki  Saitama  3530003\r
+                               JP\r
  \r
  C8-63-14   (hex)               Thinci, Inc.\r
  800000-8FFFFF     (base 16)            Thinci, Inc.\r
@@ -362,11 +362,11 @@ C8-63-14   (hex)          Thinci, Inc.
                                 Campbell  CA  95008\r
                                 US\r
  \r
-C8-63-14   (hex)               Autonics Co., Ltd.\r
-100000-1FFFFF     (base 16)            Autonics Co., Ltd.\r
-                               4-14-26, Shimo-Muneoka\r
-                               Shiki  Saitama  3530003\r
-                               JP\r
+C8-63-14   (hex)               Maxcom S.A.\r
+900000-9FFFFF     (base 16)            Maxcom S.A.\r
+                               Towarowa 23A\r
+                               Tychy    43-100\r
+                               PL\r
  \r
  FC-D2-B6   (hex)               Bee Smart(Changzhou) Information Technology Co., Ltd\r
  D00000-DFFFFF     (base 16)            Bee Smart(Changzhou) Information Technology Co., Ltd\r
@@ -374,12 +374,24 @@ D00000-DFFFFF     (base 16)               Bee Smart(Changzhou) Information Technology Co., Lt
                                 Changzhou  Jiangsu  213100\r
                                 CN\r
  \r
+74-5B-C5   (hex)               CELYSS SAS\r
+D00000-DFFFFF     (base 16)            CELYSS SAS\r
+                               7 allee des ginkgos\r
+                               Bron    69500\r
+                               FR\r
+\r
  FC-D2-B6   (hex)               Coet Costruzioni Elettrotecniche\r
  300000-3FFFFF     (base 16)            Coet Costruzioni Elettrotecniche\r
                                 Via Civesio 12\r
                                 San Donato Milanese  Mi  20097\r
                                 IT\r
  \r
+A8-3F-A1   (hex)               MEDCAPTAIN MEDICAL TECHNOLOGY CO., LTD.\r
+200000-2FFFFF     (base 16)            MEDCAPTAIN MEDICAL TECHNOLOGY CO., LTD.\r
+                               12th Floor, Baiwang Research Building, No.5158 Shahe West Road, Xili, Nanshan\r
+                               Shenzhen    518055\r
+                               CN\r
+\r
  74-5B-C5   (hex)               Fournie Grospaud Energie SASU\r
  A00000-AFFFFF     (base 16)            Fournie Grospaud Energie SASU\r
                                 220 rue du chene vert\r
@@ -392,24 +404,6 @@ C00000-CFFFFF     (base 16)                ComNot
                                 DARDILLY    69570\r
                                 FR\r
  \r
-A8-3F-A1   (hex)               MEDCAPTAIN MEDICAL TECHNOLOGY CO., LTD.\r
-200000-2FFFFF     (base 16)            MEDCAPTAIN MEDICAL TECHNOLOGY CO., LTD.\r
-                               12th Floor, Baiwang Research Building, No.5158 Shahe West Road, Xili, Nanshan\r
-                               Shenzhen    518055\r
-                               CN\r
-\r
-74-5B-C5   (hex)               CELYSS SAS\r
-D00000-DFFFFF     (base 16)            CELYSS SAS\r
-                               7 allee des ginkgos\r
-                               Bron    69500\r
-                               FR\r
-\r
-E4-4C-C7   (hex)               EPS Bio\r
-C00000-CFFFFF     (base 16)            EPS Bio\r
-                               No. 8, R&D 3rd Rd, Science-Based Industrial Park\r
-                               Hsinchu  Taiwan  30077\r
-                               TW\r
-\r
  4C-BC-98   (hex)               Wonder Workshop\r
  E00000-EFFFFF     (base 16)            Wonder Workshop\r
                                 1500 Fashion Island, Suite #200\r
@@ -422,12 +416,27 @@ E00000-EFFFFF     (base 16)               Wonder Workshop
                                 Moscow    117246\r
                                 RU\r
  \r
+E4-4C-C7   (hex)               EPS Bio\r
+C00000-CFFFFF     (base 16)            EPS Bio\r
+                               No. 8, R&D 3rd Rd, Science-Based Industrial Park\r
+                               Hsinchu  Taiwan  30077\r
+                               TW\r
+\r
  E4-4C-C7   (hex)               Doowon Electronics & Telecom Co.,Ltd\r
  200000-2FFFFF     (base 16)            Doowon Electronics & Telecom Co.,Ltd\r
                                 IT 301-408, Ssangyong 3Cha, Bucheon Technopark, 397, Seokcheon-ro, Ojeong-gu\r
                                 Bucheon-si  Gyeonggi-do  14449\r
                                 KR\r
  \r
+E0-5A-9F   (hex)               Fibrain\r
+600000-6FFFFF     (base 16)            Fibrain\r
+                               Zaczernie 190F\r
+                               Zaczernie  Subcarpathia  36-062\r
+                               PL\r
+\r
+F8-02-78   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  4C-BC-98   (hex)               Shenzhen Cogitation Technology Co.,Ltd.\r
  A00000-AFFFFF     (base 16)            Shenzhen Cogitation Technology Co.,Ltd.\r
                                 NO.509 LangShan Building,Nanshan Yungu Innovation Industrial Park,No.1183 Taoyuan Street,Nanshen District\r
@@ -440,15 +449,6 @@ E0-5A-9F   (hex)           Gemalto Document Readers
                                 Williamsburg  VA  23188\r
                                 US\r
  \r
-E0-5A-9F   (hex)               Fibrain\r
-600000-6FFFFF     (base 16)            Fibrain\r
-                               Zaczernie 190F\r
-                               Zaczernie  Subcarpathia  36-062\r
-                               PL\r
-\r
-F8-02-78   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
  D8-86-0B   (hex)               Grünbeck Wasseraufbereitung GmbH\r
  700000-7FFFFF     (base 16)            Grünbeck Wasseraufbereitung GmbH\r
                                 Josef-Grünbeck-Str. 1\r
@@ -467,12 +467,6 @@ D8-86-0B   (hex)           CAMTRACE
                                 SURESNES    92150\r
                                 FR\r
  \r
-CC-D3-9D   (hex)               SHENZHEN ROYOLE TECHNOLOGIES CO., LTD.\r
-500000-5FFFFF     (base 16)            SHENZHEN ROYOLE TECHNOLOGIES CO., LTD.\r
-                               Building #43, Dayun Software Town, No.8288 Longgang Road, Henggang Street, Longgang District,\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
  38-B1-9E   (hex)               System Q Ltd\r
  B00000-BFFFFF     (base 16)            System Q Ltd\r
                                 Turnoaks Business Park, Hasland\r
@@ -485,36 +479,45 @@ D00000-DFFFFF     (base 16)               Ethernity Networks
                                 Lod  Israel  7152025\r
                                 IL\r
  \r
+CC-D3-9D   (hex)               SHENZHEN ROYOLE TECHNOLOGIES CO., LTD.\r
+500000-5FFFFF     (base 16)            SHENZHEN ROYOLE TECHNOLOGIES CO., LTD.\r
+                               Building #43, Dayun Software Town, No.8288 Longgang Road, Henggang Street, Longgang District,\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
  D4-25-CC   (hex)               Barobo, Inc.\r
  400000-4FFFFF     (base 16)            Barobo, Inc.\r
                                 221 G Street, #204\r
                                 Davis  CA  95616\r
                                 US\r
  \r
-9C-69-B4   (hex)               Elesta GmbH\r
-500000-5FFFFF     (base 16)            Elesta GmbH\r
-                               Heuteilstrasse 18\r
-                               Bad Ragaz  St. Gallen  7310\r
-                               CH\r
-\r
  9C-69-B4   (hex)               BEIJING PICOHOOD TECHNOLOGY CO.,LTD\r
  A00000-AFFFFF     (base 16)            BEIJING PICOHOOD TECHNOLOGY CO.,LTD\r
                                 Room 504A, Building E, Lize Middle Yard, Wangjing Science and Technology Venture Park, Chaoyang District\r
                                 BEIJING  BEIJING  100102\r
                                 CN\r
  \r
-9C-69-B4   (hex)               Toughdog Security Systems\r
-B00000-BFFFFF     (base 16)            Toughdog Security Systems\r
+9C-69-B4   (hex)               Elesta GmbH\r
+500000-5FFFFF     (base 16)            Elesta GmbH\r
+                               Heuteilstrasse 18\r
+                               Bad Ragaz  St. Gallen  7310\r
+                               CH\r
+\r
+9C-69-B4   (hex)               Toughdog Security Systems\r
+B00000-BFFFFF     (base 16)            Toughdog Security Systems\r
                                 1317 E Hackberry Ave\r
                                 McAllen  TX  78501\r
                                 US\r
  \r
-4C-91-7A   (hex)               Shenzhen Dangs Science & Technology CO.,LTD\r
-000000-0FFFFF     (base 16)            Shenzhen Dangs Science & Technology CO.,LTD\r
-                               7D, 7th Floor, HSAE Building, Nanshan District,\r
-                               Shenzhen  GuangDong  518000\r
+6C-DF-FB   (hex)               Chongqing Baoli Yota Technologies Limited\r
+100000-1FFFFF     (base 16)            Chongqing Baoli Yota Technologies Limited\r
+                               No.2,1 Floor,Kelly Building,No.115 Xingtong Avenue,Guilin Street office, Tongnan District\r
+                               Chongqing  Chongqing  402660\r
                                 CN\r
  \r
+A4-4F-29   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  4C-91-7A   (hex)               Chongqing Unisinsight Technology Co.,Ltd.\r
  200000-2FFFFF     (base 16)            Chongqing Unisinsight Technology Co.,Ltd.\r
                                 No.117-386, Yunhan Road\r
@@ -533,25 +536,28 @@ E00000-EFFFFF     (base 16)               Beijing Fimi Technology Co., Ltd.
                                 Beijing    100000\r
                                 CN\r
  \r
-A4-4F-29   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
  6C-DF-FB   (hex)               Beijing Ainemo Co Ltd\r
  300000-3FFFFF     (base 16)            Beijing Ainemo Co Ltd\r
                                 Building K1,  NO. 86 Beiyuan North road, Chaoyang district, Beijing China\r
                                 Beijing   Beijing  100012\r
                                 CN\r
  \r
+4C-91-7A   (hex)               Shenzhen Dangs Science & Technology CO.,LTD\r
+000000-0FFFFF     (base 16)            Shenzhen Dangs Science & Technology CO.,LTD\r
+                               7D, 7th Floor, HSAE Building, Nanshan District,\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
  7C-BC-84   (hex)               Nanning auto digital technology co.,LTD\r
  500000-5FFFFF     (base 16)            Nanning auto digital technology co.,LTD\r
                                 3/f, no.6 guichun road, qingxiu district\r
                                 Nanning  Guangxi  530021\r
                                 CN\r
  \r
-6C-DF-FB   (hex)               Chongqing Baoli Yota Technologies Limited\r
-100000-1FFFFF     (base 16)            Chongqing Baoli Yota Technologies Limited\r
-                               No.2,1 Floor,Kelly Building,No.115 Xingtong Avenue,Guilin Street office, Tongnan District\r
-                               Chongqing  Chongqing  402660\r
+98-F9-C7   (hex)               Koala Technology CO., LTD.\r
+900000-9FFFFF     (base 16)            Koala Technology CO., LTD.\r
+                               Room 2004, Building A3, Dayuan International Center, High Tech Zone\r
+                               Chengdu  Sichuan  610000\r
                                 CN\r
  \r
  6C-DF-FB   (hex)               Hashtrend AG\r
@@ -584,11 +590,11 @@ E00000-EFFFFF     (base 16)               IROOTECH TECHNOLOGY CO.,LTD
                                 Beijing    100092\r
                                 CN\r
  \r
-98-F9-C7   (hex)               Koala Technology CO., LTD.\r
-900000-9FFFFF     (base 16)            Koala Technology CO., LTD.\r
-                               Room 2004, Building A3, Dayuan International Center, High Tech Zone\r
-                               Chengdu  Sichuan  610000\r
-                               CN\r
+0C-FE-5D   (hex)               NEWGREEN TECH CO., LTD.\r
+E00000-EFFFFF     (base 16)            NEWGREEN TECH CO., LTD.\r
+                               2F., No.200, Sec. 2, Gaotie N. Rd., Dayuan Dist., Taoyuan City 337, Taiwan (R.O.C.)\r
+                               Taoyuan City    33743\r
+                               TW\r
  \r
  0C-FE-5D   (hex)               Bepal Technology Co.,Ltd.\r
  C00000-CFFFFF     (base 16)            Bepal Technology Co.,Ltd.\r
@@ -596,11 +602,8 @@ C00000-CFFFFF     (base 16)                Bepal Technology Co.,Ltd.
                                 HangZhou  ZheJiang  310000\r
                                 CN\r
  \r
-0C-FE-5D   (hex)               NEWGREEN TECH CO., LTD.\r
-E00000-EFFFFF     (base 16)            NEWGREEN TECH CO., LTD.\r
-                               2F., No.200, Sec. 2, Gaotie N. Rd., Dayuan Dist., Taoyuan City 337, Taiwan (R.O.C.)\r
-                               Taoyuan City    33743\r
-                               TW\r
+3C-39-E7   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
  \r
  0C-FE-5D   (hex)               Chengdu Ledong Information & Technology Co., Ltd. \r
  000000-0FFFFF     (base 16)            Chengdu Ledong Information & Technology Co., Ltd. \r
@@ -620,14 +623,11 @@ E00000-EFFFFF     (base 16)               NEWGREEN TECH CO., LTD.
                                 ShengZhen  GuangDong  518109\r
                                 CN\r
  \r
-3C-39-E7   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
-1C-FD-08   (hex)               LABEL \r
-900000-9FFFFF     (base 16)            LABEL \r
-                               18 ALLEE DE MONTREAL \r
-                               ANNEMASSE    74100\r
-                               FR\r
+6C-5C-3D   (hex)               Unitel Engineering\r
+500000-5FFFFF     (base 16)            Unitel Engineering\r
+                               2-я Кабельная д.2 стр.1\r
+                               Москва  Россия  111024\r
+                               RU\r
  \r
  A8-3F-A1   (hex)               BEGLEC\r
  600000-6FFFFF     (base 16)            BEGLEC\r
@@ -635,14 +635,23 @@ A8-3F-A1   (hex)          BEGLEC
                                 Groot-Bijgaarden    1702\r
                                 BE\r
  \r
-E8-18-63   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
+1C-FD-08   (hex)               ShenZhen DeLippo Technology Co., LTD\r
+800000-8FFFFF     (base 16)            ShenZhen DeLippo Technology Co., LTD\r
+                               District A of Fifth Floor,Building E,Guancheng Low Carbon Industrial Park, Shangcun Community,Gongming Street,Guangming District\r
+                               Shenzhen    518106\r
+                               CN\r
  \r
-6C-5C-3D   (hex)               Unitel Engineering\r
-500000-5FFFFF     (base 16)            Unitel Engineering\r
-                               2-я Кабельная д.2 стр.1\r
-                               Москва  Россия  111024\r
-                               RU\r
+1C-FD-08   (hex)               LABEL \r
+900000-9FFFFF     (base 16)            LABEL \r
+                               18 ALLEE DE MONTREAL \r
+                               ANNEMASSE    74100\r
+                               FR\r
+\r
+A8-3F-A1   (hex)               Neos Ventures Limited\r
+800000-8FFFFF     (base 16)            Neos Ventures Limited\r
+                               47 Bermondsey Street\r
+                               London    SE1 3XT\r
+                               GB\r
  \r
  A8-3F-A1   (hex)               GTDevice LLC\r
  100000-1FFFFF     (base 16)            GTDevice LLC\r
@@ -650,17 +659,8 @@ A8-3F-A1   (hex)           GTDevice LLC
                                 Portland  OR  97286\r
                                 US\r
  \r
-1C-FD-08   (hex)               ShenZhen DeLippo Technology Co., LTD\r
-800000-8FFFFF     (base 16)            ShenZhen DeLippo Technology Co., LTD\r
-                               District A of Fifth Floor,Building E,Guancheng Low Carbon Industrial Park, Shangcun Community,Gongming Street,Guangming District\r
-                               Shenzhen    518106\r
-                               CN\r
-\r
-3C-6A-2C   (hex)               XI'AN YEP TELECOM TECHNOLOGY CO.,LTD\r
-400000-4FFFFF     (base 16)            XI'AN YEP TELECOM TECHNOLOGY CO.,LTD\r
-                               5F,Building C,CLP Park,No.211, Tiangu 8 Road, High-tech Zone, Xi' an, Shanxi Province, China\r
-                               Xi’an  Shanxi   710001\r
-                               CN\r
+E8-18-63   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
  \r
  3C-6A-2C   (hex)               TP Radio\r
  800000-8FFFFF     (base 16)            TP Radio\r
@@ -668,6 +668,12 @@ A8-3F-A1   (hex)           GTDevice LLC
                                 Greve  .  2670\r
                                 DK\r
  \r
+3C-6A-2C   (hex)               Xiamen Smarttek CO., Ltd.\r
+D00000-DFFFFF     (base 16)            Xiamen Smarttek CO., Ltd.\r
+                               5F, B Area, Chuangxin Plaza, SoftPark I, Siming District\r
+                               Xiamen  Fujian  361005\r
+                               CN\r
+\r
  3C-6A-2C   (hex)               Eltov System\r
  C00000-CFFFFF     (base 16)            Eltov System\r
                                 #1309 Gyeonggi Venture Yeonsung Univ Center. 111, Anyang-ro, Manan-gu,\r
@@ -686,11 +692,11 @@ A00000-AFFFFF     (base 16)               Metro
                                 creskill  NJ  07626\r
                                 US\r
  \r
-A8-3F-A1   (hex)               Neos Ventures Limited\r
-800000-8FFFFF     (base 16)            Neos Ventures Limited\r
-                               47 Bermondsey Street\r
-                               London    SE1 3XT\r
-                               GB\r
+3C-6A-2C   (hex)               XI'AN YEP TELECOM TECHNOLOGY CO.,LTD\r
+400000-4FFFFF     (base 16)            XI'AN YEP TELECOM TECHNOLOGY CO.,LTD\r
+                               5F,Building C,CLP Park,No.211, Tiangu 8 Road, High-tech Zone, Xi' an, Shanxi Province, China\r
+                               Xi’an  Shanxi   710001\r
+                               CN\r
  \r
  A4-ED-43   (hex)               Wuxi Junction Infomation Technology Incorporated Company\r
  700000-7FFFFF     (base 16)            Wuxi Junction Infomation Technology Incorporated Company\r
@@ -698,24 +704,12 @@ A4-ED-43   (hex)          Wuxi Junction Infomation Technology Incorporated Company
                                 WuXi  Jiangsu  214000\r
                                 CN\r
  \r
-3C-6A-2C   (hex)               Xiamen Smarttek CO., Ltd.\r
-D00000-DFFFFF     (base 16)            Xiamen Smarttek CO., Ltd.\r
-                               5F, B Area, Chuangxin Plaza, SoftPark I, Siming District\r
-                               Xiamen  Fujian  361005\r
-                               CN\r
-\r
  30-0A-60   (hex)               Ampetronic Ltd\r
  A00000-AFFFFF     (base 16)            Ampetronic Ltd\r
                                 Unit 2 Trentside Business Village, Farndon Road\r
                                 Newark  Nottinghamshire  NG24 4XB\r
                                 GB\r
  \r
-30-0A-60   (hex)               Thermo Process Instruments, LP\r
-C00000-CFFFFF     (base 16)            Thermo Process Instruments, LP\r
-                               27 Forge Parkway\r
-                               Frankllin  MA  02038\r
-                               US\r
-\r
  30-0A-60   (hex)               WINTEK System Co., Ltd\r
  900000-9FFFFF     (base 16)            WINTEK System Co., Ltd\r
                                 Wintek Venture Bldg., 511, Poil-Dong\r
@@ -728,17 +722,11 @@ B00000-BFFFFF     (base 16)               Giax GmbH
                                 Erlangen    91058\r
                                 DE\r
  \r
-A4-ED-43   (hex)               Linseis Messgeraete GmbH\r
-800000-8FFFFF     (base 16)            Linseis Messgeraete GmbH\r
-                               Vielitzer Str. 43                      \r
-                               Selb    95100\r
-                               DE\r
-\r
-A4-ED-43   (hex)               Brand New Brand Nordic AB\r
-D00000-DFFFFF     (base 16)            Brand New Brand Nordic AB\r
-                               Nohrstedts väg 5\r
-                               Söderbärke    77794\r
-                               SE\r
+30-0A-60   (hex)               Thermo Process Instruments, LP\r
+C00000-CFFFFF     (base 16)            Thermo Process Instruments, LP\r
+                               27 Forge Parkway\r
+                               Frankllin  MA  02038\r
+                               US\r
  \r
  A0-28-33   (hex)               Xiamen Caimore Communication Technology Co.,Ltd.\r
  600000-6FFFFF     (base 16)            Xiamen Caimore Communication Technology Co.,Ltd.\r
@@ -752,6 +740,24 @@ A0-28-33   (hex)           GERSYS GmbH
                                 Wolfratshausen    82515\r
                                 DE\r
  \r
+A4-ED-43   (hex)               Brand New Brand Nordic AB\r
+D00000-DFFFFF     (base 16)            Brand New Brand Nordic AB\r
+                               Nohrstedts väg 5\r
+                               Söderbärke    77794\r
+                               SE\r
+\r
+A4-ED-43   (hex)               Linseis Messgeraete GmbH\r
+800000-8FFFFF     (base 16)            Linseis Messgeraete GmbH\r
+                               Vielitzer Str. 43                      \r
+                               Selb    95100\r
+                               DE\r
+\r
+A0-28-33   (hex)               Audix\r
+D00000-DFFFFF     (base 16)            Audix\r
+                               9400 SW Barber St. \r
+                               Wilsonville  OR  97070\r
+                               US\r
+\r
  A0-28-33   (hex)               Shanghai Nohmi Secom Fire Protection  Equipment Co.,Ltd.\r
  200000-2FFFFF     (base 16)            Shanghai Nohmi Secom Fire Protection  Equipment Co.,Ltd.\r
                                 No.98,Lane 1971,(s)Lianhua Road,Minhang Area\r
@@ -764,30 +770,6 @@ E00000-EFFFFF     (base 16)                Shenzhen Intellifusion Technologies Co., Ltd.
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-84-89-EC   (hex)               POCT biotechnology\r
-600000-6FFFFF     (base 16)            POCT biotechnology\r
-                               6F, No. 185, GangQian Rd., Neihu dist.,\r
-                               Taipei    11494\r
-                               TW\r
-\r
-84-89-EC   (hex)               Arts Digital Technology (HK) Ltd.\r
-800000-8FFFFF     (base 16)            Arts Digital Technology (HK) Ltd.\r
-                               1704, 17/F, Fo Tan Industrial Centre, 26-28 Au Pui Wan Street, Fo Tan, Hong Kong\r
-                               Hong Kong    Nil\r
-                               HK\r
-\r
-A0-28-33   (hex)               Audix\r
-D00000-DFFFFF     (base 16)            Audix\r
-                               9400 SW Barber St. \r
-                               Wilsonville  OR  97070\r
-                               US\r
-\r
-84-89-EC   (hex)               Vayyar Imaging Ltd.\r
-400000-4FFFFF     (base 16)            Vayyar Imaging Ltd.\r
-                               3 Avraham Giron St\r
-                               Yehud    5621717\r
-                               IL\r
-\r
  00-55-DA   (hex)               Victorsure Limited\r
  E00000-EFFFFF     (base 16)            Victorsure Limited\r
                                 15/F Cambridge house, 26-28 Cameron Road\r
@@ -806,16 +788,34 @@ E00000-EFFFFF     (base 16)               Victorsure Limited
                                 moscow   moscow   109456\r
                                 RU\r
  \r
+84-89-EC   (hex)               Arts Digital Technology (HK) Ltd.\r
+800000-8FFFFF     (base 16)            Arts Digital Technology (HK) Ltd.\r
+                               1704, 17/F, Fo Tan Industrial Centre, 26-28 Au Pui Wan Street, Fo Tan, Hong Kong\r
+                               Hong Kong    Nil\r
+                               HK\r
+\r
+84-89-EC   (hex)               Vayyar Imaging Ltd.\r
+400000-4FFFFF     (base 16)            Vayyar Imaging Ltd.\r
+                               3 Avraham Giron St\r
+                               Yehud    5621717\r
+                               IL\r
+\r
+84-89-EC   (hex)               POCT biotechnology\r
+600000-6FFFFF     (base 16)            POCT biotechnology\r
+                               6F, No. 185, GangQian Rd., Neihu dist.,\r
+                               Taipei    11494\r
+                               TW\r
+\r
  30-09-F9   (hex)               Technology for Humankind\r
  D00000-DFFFFF     (base 16)            Technology for Humankind\r
                                 3913 N. Rushwood St.\r
                                 Wichita  KS  67226\r
                                 US\r
  \r
-9C-F6-DD   (hex)               Guangzhou LANGO Electronics Technology Co., Ltd.\r
-B00000-BFFFFF     (base 16)            Guangzhou LANGO Electronics Technology Co., Ltd.\r
-                               136#, Gaopu Road, Tianhe District\r
-                               Guangzhou  Guangdong  510663\r
+C0-83-59   (hex)               SHANGHAI CHARMHOPE INFORMATION TECHNOLOGY CO.,LTD.\r
+A00000-AFFFFF     (base 16)            SHANGHAI CHARMHOPE INFORMATION TECHNOLOGY CO.,LTD.\r
+                               Building 11,No.230,Chuanhong Rd,Pudong Distrist\r
+                               Shanghai  Shanghai  201202\r
                                 CN\r
  \r
  9C-F6-DD   (hex)               Ithor IT Co.,Ltd.\r
@@ -824,17 +824,17 @@ B00000-BFFFFF     (base 16)               Guangzhou LANGO Electronics Technology Co., Ltd.
                                 XI'AN  ShanXi  710065\r
                                 CN\r
  \r
-C0-83-59   (hex)               SHANGHAI CHARMHOPE INFORMATION TECHNOLOGY CO.,LTD.\r
-A00000-AFFFFF     (base 16)            SHANGHAI CHARMHOPE INFORMATION TECHNOLOGY CO.,LTD.\r
-                               Building 11,No.230,Chuanhong Rd,Pudong Distrist\r
-                               Shanghai  Shanghai  201202\r
+9C-F6-DD   (hex)               Guangzhou LANGO Electronics Technology Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Guangzhou LANGO Electronics Technology Co., Ltd.\r
+                               136#, Gaopu Road, Tianhe District\r
+                               Guangzhou  Guangdong  510663\r
                                 CN\r
  \r
-C0-83-59   (hex)               PCH Engineering A/S\r
-300000-3FFFFF     (base 16)            PCH Engineering A/S\r
-                               Ved Klaedebo 4\r
-                               Horsholm    2970\r
-                               DK\r
+9C-F6-DD   (hex)               CAMA（Luoyang）Electronics Co.，Ltd\r
+900000-9FFFFF     (base 16)            CAMA（Luoyang）Electronics Co.，Ltd\r
+                               Luoyang High-tech District, Chuncheng Road 16th.\r
+                               Luoyang  Henan  471003\r
+                               CN\r
  \r
  C0-83-59   (hex)               Suzhou Siheng Science and Technology Ltd.\r
  B00000-BFFFFF     (base 16)            Suzhou Siheng Science and Technology Ltd.\r
@@ -842,12 +842,6 @@ B00000-BFFFFF     (base 16)                Suzhou Siheng Science and Technology Ltd.
                                 Suzhou    215000\r
                                 CN\r
  \r
-9C-F6-DD   (hex)               CAMA（Luoyang）Electronics Co.，Ltd\r
-900000-9FFFFF     (base 16)            CAMA（Luoyang）Electronics Co.，Ltd\r
-                               Luoyang High-tech District, Chuncheng Road 16th.\r
-                               Luoyang  Henan  471003\r
-                               CN\r
-\r
  C0-83-59   (hex)               ista International GmbH\r
  800000-8FFFFF     (base 16)            ista International GmbH\r
                                 Luxemburger Strasse 1\r
@@ -860,12 +854,6 @@ C0-83-59   (hex)           Fuzhou Fdlinker Technology Co.,LTD
                                 Fuzhou  Fujian  350001\r
                                 CN\r
  \r
-3C-42-7E   (hex)               Shenzhen VETAS Communication Technology Co , Ltd.\r
-300000-3FFFFF     (base 16)            Shenzhen VETAS Communication Technology Co , Ltd.\r
-                               Room 1301-1303,West Wing,Skyworth Semiconductor Design Building,No.18,Gaoxin South 4th road, Nanshan District\r
-                               ShenZhen  Guangdong  518063\r
-                               CN\r
-\r
  04-C3-E6   (hex)               Teleepoch Ltd\r
  E00000-EFFFFF     (base 16)            Teleepoch Ltd\r
                                 No.13 Langshan Rd,HiTech Park,Nanshan District\r
@@ -878,11 +866,11 @@ A00000-AFFFFF     (base 16)               Sealed Unit Parts Co., Inc.
                                 ALLENWOOD  NJ  08720\r
                                 US\r
  \r
-3C-42-7E   (hex)               Privacy Labs\r
-C00000-CFFFFF     (base 16)            Privacy Labs\r
-                               10400 NE 4th Street, 7th Floor\r
-                               Bellevue  WA  98004\r
-                               US\r
+C0-83-59   (hex)               PCH Engineering A/S\r
+300000-3FFFFF     (base 16)            PCH Engineering A/S\r
+                               Ved Klaedebo 4\r
+                               Horsholm    2970\r
+                               DK\r
  \r
  B4-4B-D6   (hex)               DongYoung media\r
  B00000-BFFFFF     (base 16)            DongYoung media\r
@@ -896,17 +884,32 @@ B4-4B-D6   (hex)          Perspicace Intellegince Technology
                                 ShangHai  ShangHai  200052\r
                                 CN\r
  \r
-B4-4B-D6   (hex)               Taizhou convergence Information technology Co.,LTD\r
-700000-7FFFFF     (base 16)            Taizhou convergence Information technology Co.,LTD\r
-                               Room 1006,general chamber of commerce,159 henghu road\r
-                               wenling  zhejiang  317515\r
+3C-42-7E   (hex)               Shenzhen VETAS Communication Technology Co , Ltd.\r
+300000-3FFFFF     (base 16)            Shenzhen VETAS Communication Technology Co , Ltd.\r
+                               Room 1301-1303,West Wing,Skyworth Semiconductor Design Building,No.18,Gaoxin South 4th road, Nanshan District\r
+                               ShenZhen  Guangdong  518063\r
                                 CN\r
  \r
-B4-4B-D6   (hex)               G4S Monitoring Technologies Ltd\r
-000000-0FFFFF     (base 16)            G4S Monitoring Technologies Ltd\r
-                               3 Centurion Court, Meridian East\r
-                               Leicester  Leicestershire  LE19 1TP\r
-                               GB\r
+3C-42-7E   (hex)               Privacy Labs\r
+C00000-CFFFFF     (base 16)            Privacy Labs\r
+                               10400 NE 4th Street, 7th Floor\r
+                               Bellevue  WA  98004\r
+                               US\r
+\r
+98-6D-35   (hex)               Private\r
+900000-9FFFFF     (base 16)            Private\r
+\r
+3C-42-7E   (hex)               Starloop Tech Co., Ltd.\r
+200000-2FFFFF     (base 16)            Starloop Tech Co., Ltd.\r
+                               #643, Meinian Plaza A\r
+                               Chengdu    610000\r
+                               CN\r
+\r
+3C-42-7E   (hex)               Geoplan Korea\r
+500000-5FFFFF     (base 16)            Geoplan Korea\r
+                               Simin-ro 327-7 DaeMyung Bldg #614\r
+                               AnYang    15044\r
+                               KR\r
  \r
  B4-4B-D6   (hex)               Huizhou Sunoda Technology Co. Ltd\r
  300000-3FFFFF     (base 16)            Huizhou Sunoda Technology Co. Ltd\r
@@ -920,14 +923,20 @@ B4-4B-D6   (hex)          Shenzhen Hi-Net Technology Co., Ltd.
                                 ShenZhen  GuangDong  518103\r
                                 CN\r
  \r
-3C-42-7E   (hex)               Geoplan Korea\r
-500000-5FFFFF     (base 16)            Geoplan Korea\r
-                               Simin-ro 327-7 DaeMyung Bldg #614\r
-                               AnYang    15044\r
-                               KR\r
+B4-4B-D6   (hex)               Taizhou convergence Information technology Co.,LTD\r
+700000-7FFFFF     (base 16)            Taizhou convergence Information technology Co.,LTD\r
+                               Room 1006,general chamber of commerce,159 henghu road\r
+                               wenling  zhejiang  317515\r
+                               CN\r
  \r
-98-6D-35   (hex)               Private\r
-900000-9FFFFF     (base 16)            Private\r
+B4-4B-D6   (hex)               G4S Monitoring Technologies Ltd\r
+000000-0FFFFF     (base 16)            G4S Monitoring Technologies Ltd\r
+                               3 Centurion Court, Meridian East\r
+                               Leicester  Leicestershire  LE19 1TP\r
+                               GB\r
+\r
+D0-D9-4F   (hex)               Private\r
+700000-7FFFFF     (base 16)            Private\r
  \r
  D4-7C-44   (hex)               SHENZHEN ANYSEC TECHNOLOGY CO. LTD\r
  E00000-EFFFFF     (base 16)            SHENZHEN ANYSEC TECHNOLOGY CO. LTD\r
@@ -935,32 +944,23 @@ E00000-EFFFFF     (base 16)               SHENZHEN ANYSEC TECHNOLOGY CO. LTD
                                 SHENZHEN  GuangDong  518000\r
                                 CN\r
  \r
-3C-42-7E   (hex)               Starloop Tech Co., Ltd.\r
-200000-2FFFFF     (base 16)            Starloop Tech Co., Ltd.\r
-                               #643, Meinian Plaza A\r
-                               Chengdu    610000\r
-                               CN\r
-\r
-D4-7C-44   (hex)               STRIVE ORTHOPEDICS INC\r
-C00000-CFFFFF     (base 16)            STRIVE ORTHOPEDICS INC\r
-                               505 PARK AVE FL 17\r
-                               NEW YORK  NY  10022\r
-                               US\r
-\r
  D4-7C-44   (hex)               Pongee Industries Co., Ltd.\r
  700000-7FFFFF     (base 16)            Pongee Industries Co., Ltd.\r
                                 5F., No.738, Chung-Cheng Road,\r
                                 Chung-Ho District,  New Taipei City,   23511\r
                                 TW\r
  \r
-D0-D9-4F   (hex)               Private\r
-700000-7FFFFF     (base 16)            Private\r
+A0-19-B2   (hex)               ARIMA Communications Corp.\r
+700000-7FFFFF     (base 16)            ARIMA Communications Corp.\r
+                               6F.,No.866,Zhongzheng Rd.,Zhonghe Dist.,\r
+                               New Taipei City  Taiwan  23586\r
+                               TW\r
  \r
-D4-7C-44   (hex)               OPTiM Corporation\r
-B00000-BFFFFF     (base 16)            OPTiM Corporation\r
-                               1 Honjo-machi\r
-                               Saga    840-8502\r
-                               JP\r
+A0-19-B2   (hex)               GfG mbH\r
+600000-6FFFFF     (base 16)            GfG mbH\r
+                               Kloennestrasse 99\r
+                               Dortmund    44143\r
+                               DE\r
  \r
  1C-A0-D3   (hex)               Exicom Tele-Systems Ltd.\r
  E00000-EFFFFF     (base 16)            Exicom Tele-Systems Ltd.\r
@@ -980,23 +980,20 @@ D00000-DFFFFF     (base 16)               RYD Electronic Technology Co.,Ltd.
                                 Xiamen  FuJian  361000\r
                                 CN\r
  \r
-A0-19-B2   (hex)               ARIMA Communications Corp.\r
-700000-7FFFFF     (base 16)            ARIMA Communications Corp.\r
-                               6F.,No.866,Zhongzheng Rd.,Zhonghe Dist.,\r
-                               New Taipei City  Taiwan  23586\r
-                               TW\r
+D4-7C-44   (hex)               STRIVE ORTHOPEDICS INC\r
+C00000-CFFFFF     (base 16)            STRIVE ORTHOPEDICS INC\r
+                               505 PARK AVE FL 17\r
+                               NEW YORK  NY  10022\r
+                               US\r
  \r
-A0-19-B2   (hex)               GfG mbH\r
-600000-6FFFFF     (base 16)            GfG mbH\r
-                               Kloennestrasse 99\r
-                               Dortmund    44143\r
-                               DE\r
+D4-7C-44   (hex)               OPTiM Corporation\r
+B00000-BFFFFF     (base 16)            OPTiM Corporation\r
+                               1 Honjo-machi\r
+                               Saga    840-8502\r
+                               JP\r
  \r
-2C-48-35   (hex)               FAST\r
-700000-7FFFFF     (base 16)            FAST\r
-                               4740 44th Ave SW Suite #201\r
-                               Seattle  WA  98116\r
-                               US\r
+34-04-9E   (hex)               Private\r
+C00000-CFFFFF     (base 16)            Private\r
  \r
  2C-48-35   (hex)               Phasor Solutions Ltd\r
  D00000-DFFFFF     (base 16)            Phasor Solutions Ltd\r
@@ -1004,8 +1001,11 @@ D00000-DFFFFF     (base 16)              Phasor Solutions Ltd
                                 London    EC1N 7RJ\r
                                 GB\r
  \r
-34-04-9E   (hex)               Private\r
-C00000-CFFFFF     (base 16)            Private\r
+2C-48-35   (hex)               FAST\r
+700000-7FFFFF     (base 16)            FAST\r
+                               4740 44th Ave SW Suite #201\r
+                               Seattle  WA  98116\r
+                               US\r
  \r
  3C-24-F0   (hex)               Swissdotnet SA\r
  700000-7FFFFF     (base 16)            Swissdotnet SA\r
@@ -1019,12 +1019,6 @@ C00000-CFFFFF     (base 16)              Private
                                 GYEONGGI-DO  GOYANG-SI,ILSANDONG-GU  410315\r
                                 KR\r
  \r
-48-0B-B2   (hex)               SHENZHEN TOPWELL TECHNOLOGY CO..LTD\r
-C00000-CFFFFF     (base 16)            SHENZHEN TOPWELL TECHNOLOGY CO..LTD\r
-                               5th Floor, Building 10 Changyuan New Material \r
-                               Port,No.2,Middle Road 1, High Tech Park,  Nanshan District,Shenzhen  518001\r
-                               CN\r
-\r
  48-0B-B2   (hex)               Microprogram Information Co., Ltd\r
  900000-9FFFFF     (base 16)            Microprogram Information Co., Ltd\r
                                 14F., No.262, Sec. 2, Henan Rd., Xitun Dist.\r
@@ -1043,10 +1037,10 @@ C00000-CFFFFF     (base 16)             SHENZHEN TOPWELL TECHNOLOGY CO..LTD
                                 Xiamen  fujian  361000\r
                                 CN\r
  \r
-88-5F-E8   (hex)               Apoidea Technology Co., Ltd.\r
-100000-1FFFFF     (base 16)            Apoidea Technology Co., Ltd.\r
-                               No. 111, Boyun Road\r
-                               Shanghai    201203\r
+48-0B-B2   (hex)               SHENZHEN TOPWELL TECHNOLOGY CO..LTD\r
+C00000-CFFFFF     (base 16)            SHENZHEN TOPWELL TECHNOLOGY CO..LTD\r
+                               5th Floor, Building 10 Changyuan New Material \r
+                               Port,No.2,Middle Road 1, High Tech Park,  Nanshan District,Shenzhen  518001\r
                                 CN\r
  \r
  88-5F-E8   (hex)               Changsha Xiangji-Haidun Technology Co., Ltd\r
@@ -1055,12 +1049,6 @@ C00000-CFFFFF     (base 16)              SHENZHEN TOPWELL TECHNOLOGY CO..LTD
                                 Changsha  HuNan  410100\r
                                 CN\r
  \r
-88-5F-E8   (hex)               Shenzhen ORVIBO Technology Co., Ltd\r
-B00000-BFFFFF     (base 16)            Shenzhen ORVIBO Technology Co., Ltd\r
-                               7F, A7 Zhiyuan, No.1001, Xueyuan AV., Nanshan district, Shenzhen,518055,PRC\r
-                                Shenzhen  guangdong  518000\r
-                               CN\r
-\r
  30-1F-9A   (hex)               Smart Component Technologies LTD\r
  B00000-BFFFFF     (base 16)            Smart Component Technologies LTD\r
                                 Cooper Buildings, Arundel Street\r
@@ -1073,22 +1061,16 @@ B00000-BFFFFF     (base 16)             Smart Component Technologies LTD
                                 WUXI  JIANGSU  214028\r
                                 CN\r
  \r
-F0-41-C8   (hex)               Candelic Limited\r
-400000-4FFFFF     (base 16)            Candelic Limited\r
-                               Unit 312, 3/F Solo Workshop, 131-132 Cannaught Road West\r
-                               Hong Kong    111111\r
-                               HK\r
-\r
-F0-41-C8   (hex)               Telstra\r
-A00000-AFFFFF     (base 16)            Telstra\r
-                               231 Elisabeth St\r
-                               SYDNEY  NSW  2000\r
-                               AU\r
+88-5F-E8   (hex)               Shenzhen ORVIBO Technology Co., Ltd\r
+B00000-BFFFFF     (base 16)            Shenzhen ORVIBO Technology Co., Ltd\r
+                               7F, A7 Zhiyuan, No.1001, Xueyuan AV., Nanshan district, Shenzhen,518055,PRC\r
+                                Shenzhen  guangdong  518000\r
+                               CN\r
  \r
-F0-41-C8   (hex)               DongGuan Siyoto Electronics Co., Ltd       \r
-100000-1FFFFF     (base 16)            DongGuan Siyoto Electronics Co., Ltd       \r
-                               Hecheng Industrial District, QiaoTou Town\r
-                               DongGuan City  Guangdong  523520\r
+88-5F-E8   (hex)               Apoidea Technology Co., Ltd.\r
+100000-1FFFFF     (base 16)            Apoidea Technology Co., Ltd.\r
+                               No. 111, Boyun Road\r
+                               Shanghai    201203\r
                                 CN\r
  \r
  F0-41-C8   (hex)               ATN Media Group FZ LLC\r
@@ -1097,22 +1079,58 @@ D00000-DFFFFF     (base 16)             ATN Media Group FZ LLC
                                 Dubai    25051\r
                                 AE\r
  \r
+F0-41-C8   (hex)               Telstra\r
+A00000-AFFFFF     (base 16)            Telstra\r
+                               231 Elisabeth St\r
+                               SYDNEY  NSW  2000\r
+                               AU\r
+\r
  88-A9-A7   (hex)               Shenzhenshi kechuangzhixian technology Co.LTD\r
  000000-0FFFFF     (base 16)            Shenzhenshi kechuangzhixian technology Co.LTD\r
                                 Room 14G,14th Floor, Langshi Building , keji South Road 12 , High-tech Industrial Park , Nanshan District\r
                                 Shenzhen    518000\r
                                 CN\r
  \r
+88-A9-A7   (hex)               Volterman Inc.\r
+500000-5FFFFF     (base 16)            Volterman Inc.\r
+                               Suite B2, Sunset Lake Road\r
+                               Newark  DE  19702\r
+                               US\r
+\r
  88-A9-A7   (hex)               AVLINK INDUSTRIAL CO., LTD\r
  D00000-DFFFFF     (base 16)            AVLINK INDUSTRIAL CO., LTD\r
                                 7/F, A1 Bldg, 1st Shuichanjingwan Industrial Park, Nanchang Village, Gushu, Bao'an Dist \r
                                 Shenzhen  Guangdong  518126\r
                                 CN\r
  \r
-88-A9-A7   (hex)               Volterman Inc.\r
-500000-5FFFFF     (base 16)            Volterman Inc.\r
-                               Suite B2, Sunset Lake Road\r
-                               Newark  DE  19702\r
+F0-41-C8   (hex)               DongGuan Siyoto Electronics Co., Ltd       \r
+100000-1FFFFF     (base 16)            DongGuan Siyoto Electronics Co., Ltd       \r
+                               Hecheng Industrial District, QiaoTou Town\r
+                               DongGuan City  Guangdong  523520\r
+                               CN\r
+\r
+F0-41-C8   (hex)               Candelic Limited\r
+400000-4FFFFF     (base 16)            Candelic Limited\r
+                               Unit 312, 3/F Solo Workshop, 131-132 Cannaught Road West\r
+                               Hong Kong    111111\r
+                               HK\r
+\r
+A4-DA-22   (hex)               Shen Zhen City YaKun Electronics Co., Ltd\r
+D00000-DFFFFF     (base 16)            Shen Zhen City YaKun Electronics Co., Ltd\r
+                               SOUTHERN BUILDING 5388 Shang Bu  Industrial Zone Huaqiang North Road Futian District\r
+                               shen zhen city  Guang Dong Province  518000\r
+                               CN\r
+\r
+A4-DA-22   (hex)               Klashwerks Inc.\r
+B00000-BFFFFF     (base 16)            Klashwerks Inc.\r
+                               441 Maclaren Street, Suite 408\r
+                               Ottawa  ON  K2P2H3\r
+                               CA\r
+\r
+A4-DA-22   (hex)               Hydro Electronic Devices, Inc.\r
+700000-7FFFFF     (base 16)            Hydro Electronic Devices, Inc.\r
+                               2120 Constitution Ave\r
+                               Hartford  WI  53027\r
                                 US\r
  \r
  A4-DA-22   (hex)               DURATECH Enterprise,LLC\r
@@ -1133,59 +1151,53 @@ A4-DA-22   (hex)                LORIOT AG
                                 Thalwil  Zürich  8800\r
                                 CH\r
  \r
+A4-DA-22   (hex)               T2T System\r
+100000-1FFFFF     (base 16)            T2T System\r
+                               #316, HYUNDAI Knowledge Industry Center, 70, Dusan-ro\r
+                               Geumcheon-gu  Seoul  08584\r
+                               KR\r
+\r
+A4-DA-22   (hex)               Original Products Pvt. Ltd.\r
+500000-5FFFFF     (base 16)            Original Products Pvt. Ltd.\r
+                               B-19, Shiv Park, School Road, Khanpur \r
+                               New Delhi  New Delhi  110062\r
+                               IN\r
+\r
+DC-E5-33   (hex)               Tintel Hongkong Co.Ltd\r
+B00000-BFFFFF     (base 16)            Tintel Hongkong Co.Ltd\r
+                               FLAT C,23/F,LUCKY PLAZA,315-321 LOCKHART ROAD,WANCHAI,HONGKONG\r
+                               HONGKONG  GUANG DONG PROVINCE  999077\r
+                               HK\r
+\r
  DC-E5-33   (hex)               JB-Lighting Lichtanlagen GmbH\r
  800000-8FFFFF     (base 16)            JB-Lighting Lichtanlagen GmbH\r
                                 Sallersteig 15\r
                                 89134    89134\r
                                 DE\r
  \r
+C4-FF-BC   (hex)               GSM Innovations Pty Ltd\r
+900000-9FFFFF     (base 16)            GSM Innovations Pty Ltd\r
+                               142-144 Fullarton Road\r
+                               Rose Park  SA  5067\r
+                               AU\r
+\r
  DC-E5-33   (hex)               Remko GmbH & Co. KG\r
  200000-2FFFFF     (base 16)            Remko GmbH & Co. KG\r
                                 Im Seelenkamp 12\r
                                 Lage    32791\r
                                 DE\r
  \r
-DC-E5-33   (hex)               Tintel Hongkong Co.Ltd\r
-B00000-BFFFFF     (base 16)            Tintel Hongkong Co.Ltd\r
-                               FLAT C,23/F,LUCKY PLAZA,315-321 LOCKHART ROAD,WANCHAI,HONGKONG\r
-                               HONGKONG  GUANG DONG PROVINCE  999077\r
-                               HK\r
-\r
-A4-DA-22   (hex)               Shen Zhen City YaKun Electronics Co., Ltd\r
-D00000-DFFFFF     (base 16)            Shen Zhen City YaKun Electronics Co., Ltd\r
-                               SOUTHERN BUILDING 5388 Shang Bu  Industrial Zone Huaqiang North Road Futian District\r
-                               shen zhen city  Guang Dong Province  518000\r
-                               CN\r
-\r
-A4-DA-22   (hex)               Klashwerks Inc.\r
-B00000-BFFFFF     (base 16)            Klashwerks Inc.\r
-                               441 Maclaren Street, Suite 408\r
-                               Ottawa  ON  K2P2H3\r
-                               CA\r
-\r
-A4-DA-22   (hex)               Original Products Pvt. Ltd.\r
-500000-5FFFFF     (base 16)            Original Products Pvt. Ltd.\r
-                               B-19, Shiv Park, School Road, Khanpur \r
-                               New Delhi  New Delhi  110062\r
-                               IN\r
-\r
-A4-DA-22   (hex)               Hydro Electronic Devices, Inc.\r
-700000-7FFFFF     (base 16)            Hydro Electronic Devices, Inc.\r
-                               2120 Constitution Ave\r
-                               Hartford  WI  53027\r
-                               US\r
-\r
  DC-E5-33   (hex)               Ambi Labs Limited\r
  100000-1FFFFF     (base 16)            Ambi Labs Limited\r
                                 1903, 19/F, Loon Lee Building, 267-275 Des Voeux Road Central., Sheung Wan, Hong Kong\r
                                 Hong Kong  Hong Kong  00000\r
                                 HK\r
  \r
-A4-DA-22   (hex)               T2T System\r
-100000-1FFFFF     (base 16)            T2T System\r
-                               #316, HYUNDAI Knowledge Industry Center, 70, Dusan-ro\r
-                               Geumcheon-gu  Seoul  08584\r
-                               KR\r
+C4-FF-BC   (hex)               comtime GmbH\r
+500000-5FFFFF     (base 16)            comtime GmbH\r
+                               Gutenbergring 22\r
+                               Norderstedt    22848\r
+                               US\r
  \r
  C4-FF-BC   (hex)               VISATECH C0., LTD.\r
  100000-1FFFFF     (base 16)            VISATECH C0., LTD.\r
@@ -1193,24 +1205,6 @@ C4-FF-BC   (hex)         VISATECH C0., LTD.
                                  Geumcheon-gu   Seoul  08507\r
                                 KR\r
  \r
-C4-FF-BC   (hex)               GSM Innovations Pty Ltd\r
-900000-9FFFFF     (base 16)            GSM Innovations Pty Ltd\r
-                               142-144 Fullarton Road\r
-                               Rose Park  SA  5067\r
-                               AU\r
-\r
-9C-43-1E   (hex)               Midas Technology DBA Phoenix Audio Technologies\r
-E00000-EFFFFF     (base 16)            Midas Technology DBA Phoenix Audio Technologies\r
-                               16 Goodyear #120\r
-                               Irvine  CA  92618\r
-                               US\r
-\r
-C4-FF-BC   (hex)               comtime GmbH\r
-500000-5FFFFF     (base 16)            comtime GmbH\r
-                               Gutenbergring 22\r
-                               Norderstedt    22848\r
-                               US\r
-\r
  1C-21-D1   (hex)               p2-plus inc.\r
  E00000-EFFFFF     (base 16)            p2-plus inc.\r
                                 12F.-6,No.5,Sec.3,new taipei Blvd., Sinjhuang Dist.,\r
@@ -1229,6 +1223,12 @@ D00000-DFFFFF     (base 16)              HK ELEPHONE Communication Tech Co.,Limited
                                 Hong Kong     999077\r
                                 HK\r
  \r
+28-2C-02   (hex)               Tokin Limited\r
+A00000-AFFFFF     (base 16)            Tokin Limited\r
+                               Unit 513-4, Block A, Focal Industrial Centre, 21 Man Lok Street, Hung Hom\r
+                               Kowloon    0000\r
+                               HK\r
+\r
  28-2C-02   (hex)               LLC MICROTEH\r
  500000-5FFFFF     (base 16)            LLC MICROTEH\r
                                 pl.5 bldg.2/3 Akademika Anokhina str. \r
@@ -1241,54 +1241,48 @@ B00000-BFFFFF     (base 16)             ThirdReality, Inc
                                 Shanghai  Shanghai  200023\r
                                 CN\r
  \r
-28-2C-02   (hex)               Tokin Limited\r
-A00000-AFFFFF     (base 16)            Tokin Limited\r
-                               Unit 513-4, Block A, Focal Industrial Centre, 21 Man Lok Street, Hung Hom\r
-                               Kowloon    0000\r
-                               HK\r
-\r
-28-2C-02   (hex)               SAKATA DENKI Co., Ltd.\r
-000000-0FFFFF     (base 16)            SAKATA DENKI Co., Ltd.\r
-                               Yagisawa2-17-20\r
-                               NishiTokyo-city  Tokyo  202-0022\r
-                               JP\r
-\r
  9C-43-1E   (hex)               Antailiye Technology Co.,Ltd\r
  000000-0FFFFF     (base 16)            Antailiye Technology Co.,Ltd\r
                                 7/F,Zhengjiyuan Buiding,2 Road,Qianjing, Xixiang, Baoan District,Shenzhen\r
                                 SHEN ZHEN  GUANGDONG  518000\r
                                 CN\r
  \r
-40-48-FD   (hex)               Plus One Global Ltd.\r
-900000-9FFFFF     (base 16)            Plus One Global Ltd.\r
-                               2-8-6,Nishishinbashi\r
-                               Minato-ku  Tokyo  105-0003\r
-                               JP\r
-\r
-F8-B5-68   (hex)               LifePrint Products, Inc.\r
-000000-0FFFFF     (base 16)            LifePrint Products, Inc.\r
-                               4667 Golden Foothill Parkway, Suite 102\r
-                               El Dorado Hills  CA  95762\r
+9C-43-1E   (hex)               Midas Technology DBA Phoenix Audio Technologies\r
+E00000-EFFFFF     (base 16)            Midas Technology DBA Phoenix Audio Technologies\r
+                               16 Goodyear #120\r
+                               Irvine  CA  92618\r
                                 US\r
  \r
-F8-B5-68   (hex)               Combiwins Technology Co.,Limited\r
-400000-4FFFFF     (base 16)            Combiwins Technology Co.,Limited\r
-                               2F Sever Star Mansion, West Qixing Road \r
-                               Xiamen  Fujian  361012\r
-                               CN\r
-\r
  F8-B5-68   (hex)               Dongwoo Engineering Co.,Ltd\r
  300000-3FFFFF     (base 16)            Dongwoo Engineering Co.,Ltd\r
                                 #311, dREC Techno 9-ro, Yuseong-gu\r
                                 Daegeon    34027\r
                                 KR\r
  \r
+F8-B5-68   (hex)               LifePrint Products, Inc.\r
+000000-0FFFFF     (base 16)            LifePrint Products, Inc.\r
+                               4667 Golden Foothill Parkway, Suite 102\r
+                               El Dorado Hills  CA  95762\r
+                               US\r
+\r
  F8-B5-68   (hex)               etectRx\r
  500000-5FFFFF     (base 16)            etectRx\r
                                 107 SW 140th Terr., Ste. 1\r
                                 Newberry  FL  32669\r
                                 US\r
  \r
+F8-B5-68   (hex)               Combiwins Technology Co.,Limited\r
+400000-4FFFFF     (base 16)            Combiwins Technology Co.,Limited\r
+                               2F Sever Star Mansion, West Qixing Road \r
+                               Xiamen  Fujian  361012\r
+                               CN\r
+\r
+28-2C-02   (hex)               SAKATA DENKI Co., Ltd.\r
+000000-0FFFFF     (base 16)            SAKATA DENKI Co., Ltd.\r
+                               Yagisawa2-17-20\r
+                               NishiTokyo-city  Tokyo  202-0022\r
+                               JP\r
+\r
  38-73-EA   (hex)               Annapurna labs\r
  D00000-DFFFFF     (base 16)            Annapurna labs\r
                                 Matam Scientific Industries Center,   Building 8.2\r
@@ -1301,35 +1295,41 @@ E00000-EFFFFF     (base 16)             Shenzhen Jixian Technology Co., Ltd.
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+40-48-FD   (hex)               Plus One Global Ltd.\r
+900000-9FFFFF     (base 16)            Plus One Global Ltd.\r
+                               2-8-6,Nishishinbashi\r
+                               Minato-ku  Tokyo  105-0003\r
+                               JP\r
+\r
  38-73-EA   (hex)               PingGPS Inc\r
  700000-7FFFFF     (base 16)            PingGPS Inc\r
                                 19825 North Cove Road, #173\r
                                 CORNELIUS  NC  28031\r
                                 US\r
  \r
-38-73-EA   (hex)               Proch plastic Co., Ltd.\r
-300000-3FFFFF     (base 16)            Proch plastic Co., Ltd.\r
-                               7F No.189 Xinhu 3rd Rd. Neihu Dist.\r
-                               Taipei city  ---  114\r
-                               TW\r
-\r
  38-73-EA   (hex)               SHENZHEN CSE TECHNOLOGY CO., LTD\r
  A00000-AFFFFF     (base 16)            SHENZHEN CSE TECHNOLOGY CO., LTD\r
                                 2F,3Building,Xinlianhe Industrial Park,Jinxiu Road,Western Industrial Zone, Shajing Town,Baoan,\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+38-73-EA   (hex)               Proch plastic Co., Ltd.\r
+300000-3FFFFF     (base 16)            Proch plastic Co., Ltd.\r
+                               7F No.189 Xinhu 3rd Rd. Neihu Dist.\r
+                               Taipei city  ---  114\r
+                               TW\r
+\r
  38-73-EA   (hex)               LG Electronics\r
  C00000-CFFFFF     (base 16)            LG Electronics\r
                                 51, Gasan Digital1-ro, Geumcheon-gu\r
                                 Seoul    08592\r
                                 KR\r
  \r
-34-D0-B8   (hex)               Meatest sro\r
-A00000-AFFFFF     (base 16)            Meatest sro\r
-                               Zelezna 509/3\r
-                               Brno    61900\r
-                               CZ\r
+34-D0-B8   (hex)               Captec Ltd\r
+000000-0FFFFF     (base 16)            Captec Ltd\r
+                               7 Whittle Avenue\r
+                               Fareham  Hampshire  PO15 5SH\r
+                               GB\r
  \r
  8C-14-7D   (hex)               Anyware Solutions ApS\r
  900000-9FFFFF     (base 16)            Anyware Solutions ApS\r
@@ -1337,17 +1337,23 @@ A00000-AFFFFF     (base 16)             Meatest sro
                                 Valby  Sjaelland  2500\r
                                 DK\r
  \r
+34-D0-B8   (hex)               Meatest sro\r
+A00000-AFFFFF     (base 16)            Meatest sro\r
+                               Zelezna 509/3\r
+                               Brno    61900\r
+                               CZ\r
+\r
  EC-9F-0D   (hex)               WisIOE\r
  400000-4FFFFF     (base 16)            WisIOE\r
                                 Room 601, Hongyuan Building, Baoyuan Road, Xixiang Street, Baoan District \r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-34-D0-B8   (hex)               Captec Ltd\r
-000000-0FFFFF     (base 16)            Captec Ltd\r
-                               7 Whittle Avenue\r
-                               Fareham  Hampshire  PO15 5SH\r
-                               GB\r
+AC-1D-DF   (hex)               Fine Inc.\r
+B00000-BFFFFF     (base 16)            Fine Inc.\r
+                               Rm 2208, U-Tower, 120 HeungDeok JungAng-ro, GiHeung-Gu\r
+                               YongIn-si  Gyeonggi-do  16950\r
+                               KR\r
  \r
  AC-1D-DF   (hex)               Elekon AG\r
  D00000-DFFFFF     (base 16)            Elekon AG\r
@@ -1361,18 +1367,18 @@ AC-1D-DF   (hex)                HellaStorm, Inc.
                                 Alpharetta  GA  30005\r
                                 US\r
  \r
-AC-1D-DF   (hex)               Fine Inc.\r
-B00000-BFFFFF     (base 16)            Fine Inc.\r
-                               Rm 2208, U-Tower, 120 HeungDeok JungAng-ro, GiHeung-Gu\r
-                               YongIn-si  Gyeonggi-do  16950\r
-                               KR\r
-\r
  AC-1D-DF   (hex)               WESCO INTEGRATED SUPPLY\r
  A00000-AFFFFF     (base 16)            WESCO INTEGRATED SUPPLY\r
                                 36 HARBOR PARK DRIVE\r
                                 PORT WASHINGTON  NY  11050\r
                                 US\r
  \r
+74-1A-E0   (hex)               FUJIAN TAILI COMMUNICATION TECHNOLOGY CO.,LTD\r
+500000-5FFFFF     (base 16)            FUJIAN TAILI COMMUNICATION TECHNOLOGY CO.,LTD\r
+                               Cangshan science and technology park, Baihuting,Cangshan District, Fuzhou\r
+                               FUZHOU    350026\r
+                               CN\r
+\r
  74-1A-E0   (hex)               NURA HOLDINGS PTY LTD\r
  200000-2FFFFF     (base 16)            NURA HOLDINGS PTY LTD\r
                                 349 Brunswick Rd\r
@@ -1397,17 +1403,11 @@ C00000-CFFFFF     (base 16)             bistos.co.ltd
                                 San Francisco  CA  94103\r
                                 US\r
  \r
-74-1A-E0   (hex)               FUJIAN TAILI COMMUNICATION TECHNOLOGY CO.,LTD\r
-500000-5FFFFF     (base 16)            FUJIAN TAILI COMMUNICATION TECHNOLOGY CO.,LTD\r
-                               Cangshan science and technology park, Baihuting,Cangshan District, Fuzhou\r
-                               FUZHOU    350026\r
-                               CN\r
-\r
-2C-27-9E   (hex)               Forties Inc.\r
-B00000-BFFFFF     (base 16)            Forties Inc.\r
-                               5-3-10-1F, Shiba\r
-                               Minato  Tokyo  1080014\r
-                               JP\r
+CC-22-37   (hex)               Terma Sp. z o.o.\r
+100000-1FFFFF     (base 16)            Terma Sp. z o.o.\r
+                               Czaple 100\r
+                               Gdańsk  Pomorskie  80-298\r
+                               PL\r
  \r
  2C-27-9E   (hex)               Rutledge Omni Services Pte Ltd\r
  600000-6FFFFF     (base 16)            Rutledge Omni Services Pte Ltd\r
@@ -1415,17 +1415,23 @@ B00000-BFFFFF     (base 16)             Forties Inc.
                                 Singapore  Singapore  608579\r
                                 SG\r
  \r
+2C-27-9E   (hex)               Forties Inc.\r
+B00000-BFFFFF     (base 16)            Forties Inc.\r
+                               5-3-10-1F, Shiba\r
+                               Minato  Tokyo  1080014\r
+                               JP\r
+\r
  2C-27-9E   (hex)               Kunyi electronic technology (Shanghai) Co., Ltd.\r
  200000-2FFFFF     (base 16)            Kunyi electronic technology (Shanghai) Co., Ltd.\r
                                 2F, 42th Building, No.1000 Jinhai Road,Pudong\r
                                 Shanghai   Shanghai   201206\r
                                 CN\r
  \r
-CC-22-37   (hex)               Terma Sp. z o.o.\r
-100000-1FFFFF     (base 16)            Terma Sp. z o.o.\r
-                               Czaple 100\r
-                               Gdańsk  Pomorskie  80-298\r
-                               PL\r
+2C-27-9E   (hex)               Changzhou WEBO Weighing Device & System CO.,LTD\r
+000000-0FFFFF     (base 16)            Changzhou WEBO Weighing Device & System CO.,LTD\r
+                               Gaoyang Road No.1\r
+                               Changzhou  Jiangsu  213000\r
+                               CN\r
  \r
  18-9B-A5   (hex)               Christ Electronic System GmbH\r
  C00000-CFFFFF     (base 16)            Christ Electronic System GmbH\r
@@ -1439,30 +1445,12 @@ D00000-DFFFFF     (base 16)             Jiangsu JianHu Science & Technology Co., Ltd.
                                 Changzhou  Jiangsu  213011\r
                                 CN\r
  \r
-2C-27-9E   (hex)               Changzhou WEBO Weighing Device & System CO.,LTD\r
-000000-0FFFFF     (base 16)            Changzhou WEBO Weighing Device & System CO.,LTD\r
-                               Gaoyang Road No.1\r
-                               Changzhou  Jiangsu  213000\r
-                               CN\r
-\r
  90-4E-91   (hex)               Apollo Video Technology\r
  100000-1FFFFF     (base 16)            Apollo Video Technology\r
                                 24000 35th Ave SE\r
                                 Bothell  WA  98021\r
                                 US\r
  \r
-34-29-8F   (hex)               Wiesheu GmbH\r
-900000-9FFFFF     (base 16)            Wiesheu GmbH\r
-                               Daimlerstr. 10\r
-                               Affalterbach    71563\r
-                               DE\r
-\r
-34-29-8F   (hex)               Highlite International B.V.\r
-500000-5FFFFF     (base 16)            Highlite International B.V.\r
-                               Vestastraat 2\r
-                               Kerkrade    6468 EX\r
-                               NL\r
-\r
  34-29-8F   (hex)               ISRA Vision AG\r
  400000-4FFFFF     (base 16)            ISRA Vision AG\r
                                 Industriestraße 14\r
@@ -1475,6 +1463,18 @@ A00000-AFFFFF     (base 16)              Hibertek International Limited
                                 New Taipei City    24250\r
                                 TW\r
  \r
+34-29-8F   (hex)               Wiesheu GmbH\r
+900000-9FFFFF     (base 16)            Wiesheu GmbH\r
+                               Daimlerstr. 10\r
+                               Affalterbach    71563\r
+                               DE\r
+\r
+34-29-8F   (hex)               Highlite International B.V.\r
+500000-5FFFFF     (base 16)            Highlite International B.V.\r
+                               Vestastraat 2\r
+                               Kerkrade    6468 EX\r
+                               NL\r
+\r
  28-F5-37   (hex)               Honeywell Safety Products USA, Inc\r
  A00000-AFFFFF     (base 16)            Honeywell Safety Products USA, Inc\r
                                 7828 Waterville Road\r
@@ -1487,18 +1487,18 @@ E8-18-63   (hex)                AVCON Information Technology Co.,Ltd
                                 Shanghai  Shanghai  200433\r
                                 CN\r
  \r
-34-00-8A   (hex)               uberGARD Pte. Ltd.\r
-700000-7FFFFF     (base 16)            uberGARD Pte. Ltd.\r
-                               39 Sungei Kadut Avenue\r
-                               Singapore    729663\r
-                               SG\r
-\r
  34-00-8A   (hex)               Shenzhen Andakai Technologies Co., Ltd.\r
  800000-8FFFFF     (base 16)            Shenzhen Andakai Technologies Co., Ltd.\r
                                 Unit B, 10/F, Building 2, NO.10 Industial Park, Tianliao Community, Gongming Street, GuangMing District, Shenzhen,China\r
                                 Shenzhen  Guangdong  518107\r
                                 CN\r
  \r
+34-00-8A   (hex)               uberGARD Pte. Ltd.\r
+700000-7FFFFF     (base 16)            uberGARD Pte. Ltd.\r
+                               39 Sungei Kadut Avenue\r
+                               Singapore    729663\r
+                               SG\r
+\r
  78-D8-00   (hex)               CL International \r
  E00000-EFFFFF     (base 16)            CL International \r
                                 12th Floor, Woolim Lions Valley 1 Bldg 27, Dunchon-daero 457beongil, Jungwon-gu\r
@@ -1547,6 +1547,12 @@ F8-8A-3C   (hex)         Josh.ai
                                 Denver  CO  80206\r
                                 US\r
  \r
+4C-65-A8   (hex)               Fuse\r
+C00000-CFFFFF     (base 16)            Fuse\r
+                               1425 E St.\r
+                               San Diego    92110\r
+                               US\r
+\r
  4C-65-A8   (hex)               Beijing Bluehalo Internet Inc.\r
  100000-1FFFFF     (base 16)            Beijing Bluehalo Internet Inc.\r
                                 901B,Building A of Power Creative,NO.1 Shangdi East Road,Haidian District,\r
@@ -1565,11 +1571,11 @@ A00000-AFFFFF     (base 16)             Serious Integrated, Inc.
                                 Gilbert  AZ  85296\r
                                 US\r
  \r
-4C-65-A8   (hex)               Fuse\r
-C00000-CFFFFF     (base 16)            Fuse\r
-                               1425 E St.\r
-                               San Diego    92110\r
-                               US\r
+A0-C5-F2   (hex)               Oray.com co., LTD.\r
+B00000-BFFFFF     (base 16)            Oray.com co., LTD.\r
+                               8008Rm, building No.1 GuoDing d. Yangpu District\r
+                               Shanghai  Shanghai  200433\r
+                               CN\r
  \r
  4C-65-A8   (hex)               Wuhan MoreQuick Network Technology Co., Ltd.\r
  700000-7FFFFF     (base 16)            Wuhan MoreQuick Network Technology Co., Ltd.\r
@@ -1583,6 +1589,12 @@ C00000-CFFFFF     (base 16)              Fuse
                                  shenzhen   Guang Dong      518115\r
                                 CN\r
  \r
+8C-14-7D   (hex)               Shenzhen Meidou Technology Co, Ltd.\r
+600000-6FFFFF     (base 16)            Shenzhen Meidou Technology Co, Ltd.\r
+                               Room 321,Building 4,Zhongxinggongyeyuan,  Chuangye Road, Nanshan District\r
+                               Shenzhen  Guangdong  518054\r
+                               CN\r
+\r
  8C-14-7D   (hex)               Unwired Networks\r
  500000-5FFFFF     (base 16)            Unwired Networks\r
                                 Gonzagagasse 11/25\r
@@ -1595,18 +1607,6 @@ E00000-EFFFFF     (base 16)              Domotz Ltd
                                 London    W10 5AD\r
                                 GB\r
  \r
-8C-14-7D   (hex)               Shenzhen Meidou Technology Co, Ltd.\r
-600000-6FFFFF     (base 16)            Shenzhen Meidou Technology Co, Ltd.\r
-                               Room 321,Building 4,Zhongxinggongyeyuan,  Chuangye Road, Nanshan District\r
-                               Shenzhen  Guangdong  518054\r
-                               CN\r
-\r
-A0-C5-F2   (hex)               Oray.com co., LTD.\r
-B00000-BFFFFF     (base 16)            Oray.com co., LTD.\r
-                               8008Rm, building No.1 GuoDing d. Yangpu District\r
-                               Shanghai  Shanghai  200433\r
-                               CN\r
-\r
  04-71-4B   (hex)               Apparatebau Gauting GmbH\r
  400000-4FFFFF     (base 16)            Apparatebau Gauting GmbH\r
                                 Friedrichshafener Strasse 5\r
@@ -1619,24 +1619,30 @@ B00000-BFFFFF     (base 16)             Oray.com co., LTD.
                                 Palo Alto  CA  94306\r
                                 US\r
  \r
-F0-23-B9   (hex)               Shenzhen Lachesis Mhealth Co., Ltd.\r
-C00000-CFFFFF     (base 16)            Shenzhen Lachesis Mhealth Co., Ltd.\r
-                               Bldg. C, No.43 Yanshan Rd, Nanshan District\r
-                               Shenzhen  GuangDong  518067\r
-                               CN\r
-\r
-04-71-4B   (hex)               Observables, Inc.\r
-A00000-AFFFFF     (base 16)            Observables, Inc.\r
-                               117 N. MILPAS ST\r
-                               SANTA BARBARA  CA  93103\r
-                               US\r
-\r
  04-71-4B   (hex)               Energport Inc\r
  800000-8FFFFF     (base 16)            Energport Inc\r
                                 48660 Kato Road\r
                                 Fremont  CA  94538\r
                                 US\r
  \r
+60-D7-E3   (hex)               HuBDIC CO.,LTD\r
+E00000-EFFFFF     (base 16)            HuBDIC CO.,LTD\r
+                               #301, 53, Jeonpa-ro, Manan-gu, Anyang-si\r
+                               Gyeonggi-do    14084\r
+                               KR\r
+\r
+04-71-4B   (hex)               Observables, Inc.\r
+A00000-AFFFFF     (base 16)            Observables, Inc.\r
+                               117 N. MILPAS ST\r
+                               SANTA BARBARA  CA  93103\r
+                               US\r
+\r
+F0-23-B9   (hex)               Shenzhen Lachesis Mhealth Co., Ltd.\r
+C00000-CFFFFF     (base 16)            Shenzhen Lachesis Mhealth Co., Ltd.\r
+                               Bldg. C, No.43 Yanshan Rd, Nanshan District\r
+                               Shenzhen  GuangDong  518067\r
+                               CN\r
+\r
  60-D7-E3   (hex)               Nextivity\r
  B00000-BFFFFF     (base 16)            Nextivity\r
                                 16550 West Bernardo Road, Bldg 5, Suite 550\r
@@ -1649,23 +1655,17 @@ C00000-CFFFFF     (base 16)             Zhejiang Send Intelligent Technology,Ltd
                                 Hangzhou  Zhejiang  310012\r
                                 CN\r
  \r
-60-D7-E3   (hex)               HuBDIC CO.,LTD\r
-E00000-EFFFFF     (base 16)            HuBDIC CO.,LTD\r
-                               #301, 53, Jeonpa-ro, Manan-gu, Anyang-si\r
-                               Gyeonggi-do    14084\r
-                               KR\r
-\r
  60-D7-E3   (hex)               HindlePower, Inc\r
  800000-8FFFFF     (base 16)            HindlePower, Inc\r
                                 1075 Saint John St\r
                                 Easton  PA  18042\r
                                 US\r
  \r
-08-ED-02   (hex)               Savox Communications \r
-900000-9FFFFF     (base 16)            Savox Communications \r
-                               Laitaatsillantie 3\r
-                               Savonlinna    57170\r
-                               FI\r
+60-D7-E3   (hex)               Quantronix, Inc.\r
+D00000-DFFFFF     (base 16)            Quantronix, Inc.\r
+                               380 S. 200 W.\r
+                               Farmington  UT  84025\r
+                               US\r
  \r
  60-D7-E3   (hex)               Hemisphere GNSS\r
  400000-4FFFFF     (base 16)            Hemisphere GNSS\r
@@ -1673,17 +1673,29 @@ E00000-EFFFFF     (base 16)             HuBDIC CO.,LTD
                                 Scottsdale  AZ  85255\r
                                 US\r
  \r
+08-ED-02   (hex)               Savox Communications \r
+900000-9FFFFF     (base 16)            Savox Communications \r
+                               Laitaatsillantie 3\r
+                               Savonlinna    57170\r
+                               FI\r
+\r
  08-ED-02   (hex)               Szok Energy and Communication Co., Ltd.\r
  B00000-BFFFFF     (base 16)            Szok Energy and Communication Co., Ltd.\r
                                 Rm. 1, 17F., No.104, Sec. 1, Xintai 5th Rd., Xizhi Dist.\r
                                 New Taipei City    22102\r
                                 TW\r
  \r
-60-D7-E3   (hex)               Quantronix, Inc.\r
-D00000-DFFFFF     (base 16)            Quantronix, Inc.\r
-                               380 S. 200 W.\r
-                               Farmington  UT  84025\r
-                               US\r
+08-ED-02   (hex)               Guard RFID Solutions\r
+C00000-CFFFFF     (base 16)            Guard RFID Solutions\r
+                               #140-766 Cliveden Place\r
+                               Delta  BC  V3M6C7\r
+                               CA\r
+\r
+98-AA-FC   (hex)               RPE RADICO\r
+400000-4FFFFF     (base 16)            RPE RADICO\r
+                               Marksa, 14\r
+                               Obninsk  Kaluga reg.  249035\r
+                               RU\r
  \r
  98-AA-FC   (hex)               Nexus Electrical(Jiaxing) Limited\r
  300000-3FFFFF     (base 16)            Nexus Electrical(Jiaxing) Limited\r
@@ -1703,17 +1715,11 @@ D00000-DFFFFF     (base 16)             Quantronix, Inc.
                                 Hong Kong    999077\r
                                 HK\r
  \r
-98-AA-FC   (hex)               RPE RADICO\r
-400000-4FFFFF     (base 16)            RPE RADICO\r
-                               Marksa, 14\r
-                               Obninsk  Kaluga reg.  249035\r
-                               RU\r
-\r
-08-ED-02   (hex)               Guard RFID Solutions\r
-C00000-CFFFFF     (base 16)            Guard RFID Solutions\r
-                               #140-766 Cliveden Place\r
-                               Delta  BC  V3M6C7\r
-                               CA\r
+98-AA-FC   (hex)               MCS Micronic Computer Systeme GmbH\r
+D00000-DFFFFF     (base 16)            MCS Micronic Computer Systeme GmbH\r
+                               Geneststr. 5\r
+                               Berlin    10829\r
+                               DE\r
  \r
  14-4F-D7   (hex)               Arkus-ST Ltd\r
  B00000-BFFFFF     (base 16)            Arkus-ST Ltd\r
@@ -1721,12 +1727,6 @@ B00000-BFFFFF     (base 16)              Arkus-ST Ltd
                                 Moscow    117342\r
                                 RU\r
  \r
-98-AA-FC   (hex)               MCS Micronic Computer Systeme GmbH\r
-D00000-DFFFFF     (base 16)            MCS Micronic Computer Systeme GmbH\r
-                               Geneststr. 5\r
-                               Berlin    10829\r
-                               DE\r
-\r
  14-4F-D7   (hex)               i-SENS, Inc.\r
  600000-6FFFFF     (base 16)            i-SENS, Inc.\r
                                 43, Banpo-daero 28-gil, Seocho-gu\r
@@ -1739,6 +1739,12 @@ D00000-DFFFFF     (base 16)              MCS Micronic Computer Systeme GmbH
                                 DongGuan  GuangDong  523347\r
                                 CN\r
  \r
+40-F3-85   (hex)               PALAZZETTI LELIO SPA\r
+700000-7FFFFF     (base 16)            PALAZZETTI LELIO SPA\r
+                               VIA ROVEREDO 103\r
+                               PORCIA  PORDENONE  33080\r
+                               IT\r
+\r
  A4-11-63   (hex)               accesso Technology Group\r
  900000-9FFFFF     (base 16)            accesso Technology Group\r
                                 Unit 5, The Pavillions, Ruscombe Business Park\r
@@ -1751,18 +1757,6 @@ B00000-BFFFFF     (base 16)              Guang Dong He Zheng Network Technology Co.,Ltd
                                 Dongguan  Guangdong  523460\r
                                 CN\r
  \r
-40-F3-85   (hex)               PALAZZETTI LELIO SPA\r
-700000-7FFFFF     (base 16)            PALAZZETTI LELIO SPA\r
-                               VIA ROVEREDO 103\r
-                               PORCIA  PORDENONE  33080\r
-                               IT\r
-\r
-40-F3-85   (hex)               IntelliDesign Pty Ltd\r
-300000-3FFFFF     (base 16)            IntelliDesign Pty Ltd\r
-                               99 Bluestone Circuit\r
-                               Seventeen Mile Rocks  Qld  4073\r
-                               AU\r
-\r
  8C-C8-F4   (hex)               SHENZHEN D-light Technolgy Limited\r
  600000-6FFFFF     (base 16)            SHENZHEN D-light Technolgy Limited\r
                                 2302F, Block B, Wisdom Building ,Qiao xiang Road,Shahe Street, Nanshan District,\r
@@ -1775,6 +1769,12 @@ A00000-AFFFFF     (base 16)              Trilux Group Management GmbH
                                 Arnsberg    59759\r
                                 DE\r
  \r
+40-F3-85   (hex)               IntelliDesign Pty Ltd\r
+300000-3FFFFF     (base 16)            IntelliDesign Pty Ltd\r
+                               99 Bluestone Circuit\r
+                               Seventeen Mile Rocks  Qld  4073\r
+                               AU\r
+\r
  40-F3-85   (hex)               Embedded IQ\r
  400000-4FFFFF     (base 16)            Embedded IQ\r
                                 Block C, HHK House; 22 Ethel Avenue\r
@@ -1799,29 +1799,29 @@ A00000-AFFFFF     (base 16)             Trilux Group Management GmbH
                                 Beijing  Beijing  100070\r
                                 CN\r
  \r
+8C-C8-F4   (hex)               Lanhomex Technology(Shen Zhen)Co.,Ltd. \r
+100000-1FFFFF     (base 16)            Lanhomex Technology(Shen Zhen)Co.,Ltd. \r
+                               Room 409, Building 29,Zhi Heng Industrial Part, Guankou 2nd  Road, Nanshan District\r
+                               SHENZHEN    518000\r
+                               CN\r
+\r
  8C-C8-F4   (hex)               Swift Navigation Inc\r
  900000-9FFFFF     (base 16)            Swift Navigation Inc\r
                                 1543 Mission Street\r
                                 San Francisco  CA  94103\r
                                 US\r
  \r
-8C-C8-F4   (hex)               Guardtec,Inc\r
-000000-0FFFFF     (base 16)            Guardtec,Inc\r
-                               Hanshin IT tower #1203 Digital-ro 272 GUROGU\r
-                               SEOUL    08389\r
-                               KR\r
-\r
  50-A4-D0   (hex)               Shanghai Pujiang Smart Card Systems Co., Ltd.\r
  700000-7FFFFF     (base 16)            Shanghai Pujiang Smart Card Systems Co., Ltd.\r
                                 No.100, Lane 7488, Hutai Road\r
                                 Shanghai    86-201809\r
                                 CN\r
  \r
-8C-C8-F4   (hex)               Lanhomex Technology(Shen Zhen)Co.,Ltd. \r
-100000-1FFFFF     (base 16)            Lanhomex Technology(Shen Zhen)Co.,Ltd. \r
-                               Room 409, Building 29,Zhi Heng Industrial Part, Guankou 2nd  Road, Nanshan District\r
-                               SHENZHEN    518000\r
-                               CN\r
+8C-C8-F4   (hex)               Guardtec,Inc\r
+000000-0FFFFF     (base 16)            Guardtec,Inc\r
+                               Hanshin IT tower #1203 Digital-ro 272 GUROGU\r
+                               SEOUL    08389\r
+                               KR\r
  \r
  50-A4-D0   (hex)               OEM PRODUCTION INC.\r
  900000-9FFFFF     (base 16)            OEM PRODUCTION INC.\r
@@ -1829,11 +1829,11 @@ A00000-AFFFFF     (base 16)             Trilux Group Management GmbH
                                 South San Francisco  CA  94080\r
                                 US\r
  \r
-50-A4-D0   (hex)               TREXOM S.r.l.\r
-500000-5FFFFF     (base 16)            TREXOM S.r.l.\r
-                               viale dell'Unione Europea, 19\r
-                               TARCENTO  Udine  33017\r
-                               IT\r
+34-04-9E   (hex)               Eginity, Inc.\r
+B00000-BFFFFF     (base 16)            Eginity, Inc.\r
+                               37 N Orange Ave STE 770\r
+                               Orlando    32801\r
+                               US\r
  \r
  34-04-9E   (hex)               Eclipse Information Technologies\r
  800000-8FFFFF     (base 16)            Eclipse Information Technologies\r
@@ -1841,6 +1841,12 @@ A00000-AFFFFF     (base 16)              Trilux Group Management GmbH
                                 Istanbul  Turkey  34848\r
                                 TR\r
  \r
+50-A4-D0   (hex)               TREXOM S.r.l.\r
+500000-5FFFFF     (base 16)            TREXOM S.r.l.\r
+                               viale dell'Unione Europea, 19\r
+                               TARCENTO  Udine  33017\r
+                               IT\r
+\r
  40-ED-98   (hex)               Siebert Industrieelektronik GmbH\r
  B00000-BFFFFF     (base 16)            Siebert Industrieelektronik GmbH\r
                                 Siebertstrasse 2\r
@@ -1859,10 +1865,16 @@ D00000-DFFFFF     (base 16)             uikismart
                                 Shenzhen  Guangdong  518061\r
                                 CN\r
  \r
-34-04-9E   (hex)               Eginity, Inc.\r
-B00000-BFFFFF     (base 16)            Eginity, Inc.\r
-                               37 N Orange Ave STE 770\r
-                               Orlando    32801\r
+40-ED-98   (hex)               Shanghai Broadwan Communications Co.,Ltd\r
+600000-6FFFFF     (base 16)            Shanghai Broadwan Communications Co.,Ltd\r
+                               Building G, No.1015, Caobao Rd\r
+                               Shanghai  Shanghai  200233\r
+                               CN\r
+\r
+40-ED-98   (hex)               Cape\r
+500000-5FFFFF     (base 16)            Cape\r
+                               1040 Mariposa St\r
+                               San Francisco  CA  94107\r
                                 US\r
  \r
  40-ED-98   (hex)               Tsinghua Tongfang Co., LTD\r
@@ -1889,24 +1901,18 @@ A00000-AFFFFF     (base 16)             GUANGZHOU OPTICAL BRIDGE COMMUNICATION EQUIPMENT CO
                                 guangzhou    510660\r
                                 CN\r
  \r
-40-ED-98   (hex)               Shanghai Broadwan Communications Co.,Ltd\r
-600000-6FFFFF     (base 16)            Shanghai Broadwan Communications Co.,Ltd\r
-                               Building G, No.1015, Caobao Rd\r
-                               Shanghai  Shanghai  200233\r
-                               CN\r
-\r
-40-ED-98   (hex)               Cape\r
-500000-5FFFFF     (base 16)            Cape\r
-                               1040 Mariposa St\r
-                               San Francisco  CA  94107\r
-                               US\r
-\r
  50-0B-91   (hex)               Panasonic Enterprise Solutions Company\r
  800000-8FFFFF     (base 16)            Panasonic Enterprise Solutions Company\r
                                 6144 N Panasonic Way\r
                                 Denver  CO  80249\r
                                 US\r
  \r
+24-4E-7B   (hex)               Leshi Internet Information & Technology (Beijing) Corp.\r
+400000-4FFFFF     (base 16)            Leshi Internet Information & Technology (Beijing) Corp.\r
+                               Fl 16, Letv Building, 105 Yaojiayuan Road, Chaoyang District, Beijing,China\r
+                               Beijing    100025\r
+                               CN\r
+\r
  24-4E-7B   (hex)               WithWin Technology ShenZhen CO.,LTD\r
  E00000-EFFFFF     (base 16)            WithWin Technology ShenZhen CO.,LTD\r
                                 29F, East Tower, NanShan Digital Technology & Cultural Industry Park, ShenNan Throughfare10128#\r
@@ -1943,12 +1949,6 @@ C00000-CFFFFF     (base 16)              mirakonta s.l.
                                 Hong Kong    518000\r
                                 HK\r
  \r
-24-4E-7B   (hex)               Leshi Internet Information & Technology (Beijing) Corp.\r
-400000-4FFFFF     (base 16)            Leshi Internet Information & Technology (Beijing) Corp.\r
-                               Fl 16, Letv Building, 105 Yaojiayuan Road, Chaoyang District, Beijing,China\r
-                               Beijing    100025\r
-                               CN\r
-\r
  48-65-EE   (hex)               Mission Microwave Technologies, Inc\r
  400000-4FFFFF     (base 16)            Mission Microwave Technologies, Inc\r
                                 10012 Norwalk Blvd, Suite 150\r
@@ -1979,23 +1979,17 @@ E00000-EFFFFF     (base 16)             Plus One Japan Limited
                                 Minato-ku  Tokyo  105-0003\r
                                 JP\r
  \r
-4C-E1-73   (hex)               REMONDE NETWORK \r
-C00000-CFFFFF     (base 16)            REMONDE NETWORK \r
-                               Room 504 Building A, 3 Juquan Road, Science Town\r
-                               Guangzhou  Guangdong  510170\r
-                               CN\r
-\r
  1C-C0-E1   (hex)               Shenzhen Highsharp Electronics Ltd.\r
  000000-0FFFFF     (base 16)            Shenzhen Highsharp Electronics Ltd.\r
                                 A8 Music Tower 2007-08, High-tech Park\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-AC-64-DD   (hex)               Groupe Citypassenger Inc\r
-B00000-BFFFFF     (base 16)            Groupe Citypassenger Inc\r
-                               1117 sainte catherine ouest\r
-                               Montreal  Quebec  H3B1H9\r
-                               CA\r
+4C-E1-73   (hex)               REMONDE NETWORK \r
+C00000-CFFFFF     (base 16)            REMONDE NETWORK \r
+                               Room 504 Building A, 3 Juquan Road, Science Town\r
+                               Guangzhou  Guangdong  510170\r
+                               CN\r
  \r
  0C-EF-AF   (hex)               Kenmore\r
  000000-0FFFFF     (base 16)            Kenmore\r
@@ -2021,6 +2015,18 @@ AC-64-DD   (hex)         JSC InfoTeCS
                                 Moscow    127287\r
                                 RU\r
  \r
+AC-64-DD   (hex)               Groupe Citypassenger Inc\r
+B00000-BFFFFF     (base 16)            Groupe Citypassenger Inc\r
+                               1117 sainte catherine ouest\r
+                               Montreal  Quebec  H3B1H9\r
+                               CA\r
+\r
+38-3A-21   (hex)               Colooc AB\r
+D00000-DFFFFF     (base 16)            Colooc AB\r
+                               Nåsvägen 9\r
+                               Bromma  Sverige  16775\r
+                               SE\r
+\r
  38-3A-21   (hex)               Shenzhen Smart-core Technology co., Ltd.\r
  600000-6FFFFF     (base 16)            Shenzhen Smart-core Technology co., Ltd.\r
                                 16/F., Finance & Technology Building, No. 11 Keyuan Road, Nanshan Dist.\r
@@ -2051,12 +2057,6 @@ A00000-AFFFFF     (base 16)              AVPro Global Holdings LLC
                                 Sioux Falls  SD  57104\r
                                 US\r
  \r
-38-3A-21   (hex)               Colooc AB\r
-D00000-DFFFFF     (base 16)            Colooc AB\r
-                               Nåsvägen 9\r
-                               Bromma  Sverige  16775\r
-                               SE\r
-\r
  38-3A-21   (hex)               Dongguan Innovation Technology Co Ltd\r
  400000-4FFFFF     (base 16)            Dongguan Innovation Technology Co Ltd\r
                                 Building B, No.3 Desheng Road, Longbeiling, Tangxia \r
@@ -2093,29 +2093,35 @@ C0-D3-91   (hex)                xxter bv
                                 Amsterdam    1016 TR\r
                                 NL\r
  \r
+58-E8-76   (hex)               Xiamen Cacamle Technology Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            Xiamen Cacamle Technology Co.,Ltd.\r
+                               Room 1501,15th floor,Building C,DaTang YOHO Park,Huli district\r
+                               Xiamen  Fujian  361000\r
+                               CN\r
+\r
  58-E8-76   (hex)               Broad Air Technology Co., LTD.\r
  500000-5FFFFF     (base 16)            Broad Air Technology Co., LTD.\r
                                 Broadtown\r
                                 Changsha  Hunan  410126\r
                                 CN\r
  \r
+C0-D3-91   (hex)               ALNETz Co.,LTD\r
+700000-7FFFFF     (base 16)            ALNETz Co.,LTD\r
+                               1-3 Honcho,Naka-ku\r
+                               Yokohama  Kanagawa  231-0005\r
+                               JP\r
+\r
  58-E8-76   (hex)               Annapurna labs\r
  B00000-BFFFFF     (base 16)            Annapurna labs\r
                                 Matam Scientific Industries Center,   Building 8.2\r
                                 Mail box 15123  Haifa  3508409\r
                                 IL\r
  \r
-58-E8-76   (hex)               Xiamen Cacamle Technology Co.,Ltd.\r
-D00000-DFFFFF     (base 16)            Xiamen Cacamle Technology Co.,Ltd.\r
-                               Room 1501,15th floor,Building C,DaTang YOHO Park,Huli district\r
-                               Xiamen  Fujian  361000\r
-                               CN\r
-\r
-C0-D3-91   (hex)               ALNETz Co.,LTD\r
-700000-7FFFFF     (base 16)            ALNETz Co.,LTD\r
-                               1-3 Honcho,Naka-ku\r
-                               Yokohama  Kanagawa  231-0005\r
-                               JP\r
+58-E8-76   (hex)               McWong International Inc\r
+300000-3FFFFF     (base 16)            McWong International Inc\r
+                               1921 Arena Blvd\r
+                               Sacramento  CA  95834\r
+                               US\r
  \r
  F0-AC-D7   (hex)               Intenta GmbH\r
  100000-1FFFFF     (base 16)            Intenta GmbH\r
@@ -2129,12 +2135,6 @@ F0-AC-D7   (hex)         QUANTUM POWER SYSTEMS
                                 BANGALORE  KARNATAKA  560048\r
                                 IN\r
  \r
-58-E8-76   (hex)               McWong International Inc\r
-300000-3FFFFF     (base 16)            McWong International Inc\r
-                               1921 Arena Blvd\r
-                               Sacramento  CA  95834\r
-                               US\r
-\r
  F0-AC-D7   (hex)               Med-Pat/Inn-Phone\r
  300000-3FFFFF     (base 16)            Med-Pat/Inn-Phone\r
                                 31 Riordan Place\r
@@ -2189,23 +2189,29 @@ B00000-BFFFFF     (base 16)             ExaScaler Inc.
                                 Shenzhen    518000\r
                                 CN\r
  \r
-D0-D9-4F   (hex)               Apption Labs Limited\r
-800000-8FFFFF     (base 16)            Apption Labs Limited\r
-                               7-8 Westbridge Close\r
-                               Leicester    LE3 5LW\r
-                               GB\r
-\r
+8C-19-2D   (hex)               DataRemote Inc.\r
+200000-2FFFFF     (base 16)            DataRemote Inc.\r
+                               19301 SW 106th Ave  Suite 6\r
+                               Miami  FL  33157\r
+                               US\r
+\r
  D0-D9-4F   (hex)               Perfant Technology Co., Ltd\r
  000000-0FFFFF     (base 16)            Perfant Technology Co., Ltd\r
                                 Guo Ren Tong Xin B317,Ke Ji Zhong San Lu,Nanshan,Shenzhen,Guangdong,China\r
                                 Shenzhen    518000\r
                                 CN\r
  \r
-8C-19-2D   (hex)               DataRemote Inc.\r
-200000-2FFFFF     (base 16)            DataRemote Inc.\r
-                               19301 SW 106th Ave  Suite 6\r
-                               Miami  FL  33157\r
-                               US\r
+D0-D9-4F   (hex)               Apption Labs Limited\r
+800000-8FFFFF     (base 16)            Apption Labs Limited\r
+                               7-8 Westbridge Close\r
+                               Leicester    LE3 5LW\r
+                               GB\r
+\r
+D0-D9-4F   (hex)               Optigo Networks\r
+500000-5FFFFF     (base 16)            Optigo Networks\r
+                               #320 – 887 Great Northern Way\r
+                               Vancouver  BC  V5T 4T5\r
+                               CA\r
  \r
  D0-D9-4F   (hex)               Beijing Yiwangxuntong Technology\r
  300000-3FFFFF     (base 16)            Beijing Yiwangxuntong Technology\r
@@ -2219,41 +2225,17 @@ D0-D9-4F   (hex)                peiker CEE
                                 Bad Homburg    61352\r
                                 DE\r
  \r
-D0-D9-4F   (hex)               Optigo Networks\r
-500000-5FFFFF     (base 16)            Optigo Networks\r
-                               #320 – 887 Great Northern Way\r
-                               Vancouver  BC  V5T 4T5\r
-                               CA\r
-\r
  CC-D3-1E   (hex)               Haishu Technology LIMITED\r
  A00000-AFFFFF     (base 16)            Haishu Technology LIMITED\r
                                 Jiulong Midun street No.89\r
                                 Hongkong    999077\r
                                 HK\r
  \r
-C4-7C-8D   (hex)               Awiselink Co., Ltd.\r
-700000-7FFFFF     (base 16)            Awiselink Co., Ltd.\r
-                               7F., No.98, Minquan Rd., Xindian Dist.\r
-                               New Taipei City     23141\r
-                               TW\r
-\r
-C4-7C-8D   (hex)               INOTEC Sicherheitstechnik GmbH\r
-C00000-CFFFFF     (base 16)            INOTEC Sicherheitstechnik GmbH\r
-                               Am Buschgarten 17\r
-                               Ense  NRW  59469\r
-                               DE\r
-\r
-C4-7C-8D   (hex)               PASCAL Co., Ltd.\r
-500000-5FFFFF     (base 16)            PASCAL Co., Ltd.\r
-                               1-8-31, Honjo-Nishi\r
-                               Higashiosaka  Osaka-hu  5780965\r
-                               JP\r
-\r
-CC-D3-1E   (hex)               BBPOS International Limited\r
-600000-6FFFFF     (base 16)            BBPOS International Limited\r
-                               Suite 1602, Tower 2, Nina Tower, 8 Yeung Uk Road, Tsuen Wan, NT\r
-                               Hong Kong  China  00000\r
-                               HK\r
+C4-7C-8D   (hex)               HHCC Plant Technology Co.,Ltd.\r
+600000-6FFFFF     (base 16)            HHCC Plant Technology Co.,Ltd.\r
+                               Floor 12,A build ,Shuguang Plaza, Jingshun road, Chaoyang district\r
+                               Beijing  Beijing  100028\r
+                               CN\r
  \r
  CC-D3-1E   (hex)               Elk Products\r
  B00000-BFFFFF     (base 16)            Elk Products\r
@@ -2261,17 +2243,11 @@ B00000-BFFFFF     (base 16)             Elk Products
                                 Hildebran  NC  28637\r
                                 US\r
  \r
-C4-7C-8D   (hex)               HHCC Plant Technology Co.,Ltd.\r
-600000-6FFFFF     (base 16)            HHCC Plant Technology Co.,Ltd.\r
-                               Floor 12,A build ,Shuguang Plaza, Jingshun road, Chaoyang district\r
-                               Beijing  Beijing  100028\r
-                               CN\r
-\r
-C4-7C-8D   (hex)               Airbus DS - SLC\r
-900000-9FFFFF     (base 16)            Airbus DS - SLC\r
-                               1, Bd Jean Moulin - Metapole\r
-                               ELANCOURT   Cedex    78996\r
-                               FR\r
+CC-D3-1E   (hex)               BBPOS International Limited\r
+600000-6FFFFF     (base 16)            BBPOS International Limited\r
+                               Suite 1602, Tower 2, Nina Tower, 8 Yeung Uk Road, Tsuen Wan, NT\r
+                               Hong Kong  China  00000\r
+                               HK\r
  \r
  68-91-D0   (hex)               Altis Technology \r
  B00000-BFFFFF     (base 16)            Altis Technology \r
@@ -2279,12 +2255,36 @@ B00000-BFFFFF     (base 16)             Altis Technology
                                 Hong Kong    0000\r
                                 HK\r
  \r
+C4-7C-8D   (hex)               Awiselink Co., Ltd.\r
+700000-7FFFFF     (base 16)            Awiselink Co., Ltd.\r
+                               7F., No.98, Minquan Rd., Xindian Dist.\r
+                               New Taipei City     23141\r
+                               TW\r
+\r
+C4-7C-8D   (hex)               INOTEC Sicherheitstechnik GmbH\r
+C00000-CFFFFF     (base 16)            INOTEC Sicherheitstechnik GmbH\r
+                               Am Buschgarten 17\r
+                               Ense  NRW  59469\r
+                               DE\r
+\r
  68-91-D0   (hex)               WiseCube\r
  A00000-AFFFFF     (base 16)            WiseCube\r
                                 14F IT Castle-2, 137 Gasan Digital 1-ro, Geumcheon-gu\r
                                 Seoul    08506\r
                                 KR\r
  \r
+C4-7C-8D   (hex)               Airbus DS - SLC\r
+900000-9FFFFF     (base 16)            Airbus DS - SLC\r
+                               1, Bd Jean Moulin - Metapole\r
+                               ELANCOURT   Cedex    78996\r
+                               FR\r
+\r
+C4-7C-8D   (hex)               PASCAL Co., Ltd.\r
+500000-5FFFFF     (base 16)            PASCAL Co., Ltd.\r
+                               1-8-31, Honjo-Nishi\r
+                               Higashiosaka  Osaka-hu  5780965\r
+                               JP\r
+\r
  68-91-D0   (hex)               Omniimpex GmbH\r
  700000-7FFFFF     (base 16)            Omniimpex GmbH\r
                                 Waldhof 5\r
@@ -2333,12 +2333,6 @@ B00000-BFFFFF     (base 16)              Sichuan Dowlab Electronics Technology Co. Ltd
                                 Chengdu  Sichuan  610091\r
                                 CN\r
  \r
-5C-F2-86   (hex)               BrightSky, LLC\r
-D00000-DFFFFF     (base 16)            BrightSky, LLC\r
-                               5121 Castello Drive\r
-                               Naples  null  34103-1927\r
-                               US\r
-\r
  98-6D-35   (hex)               Shenzhen cositea electronics technology co.,LTD\r
  100000-1FFFFF     (base 16)            Shenzhen cositea electronics technology co.,LTD\r
                                  Nanshan District  Xili academy Avenue Tong Long Industrial A District 7 Building 3 floor\r
@@ -2363,24 +2357,6 @@ C00000-CFFFFF     (base 16)              Annapurna labs
                                 Mail box 15123  Haifa  3508409\r
                                 IL\r
  \r
-5C-F2-86   (hex)               beijing your wonderful control system technology co.,ltd\r
-300000-3FFFFF     (base 16)            beijing your wonderful control system technology co.,ltd\r
-                               NO.11 Fengxian Medium Road,Yongfeng Industry Base,Haidian District,Beijing\r
-                               beijing  beijing  100094\r
-                               CN\r
-\r
-5C-F2-86   (hex)               EUROIMMUN Medizinische Labordiagnostika AG\r
-500000-5FFFFF     (base 16)            EUROIMMUN Medizinische Labordiagnostika AG\r
-                               Seekamp 31\r
-                               Lübeck  Schleswig-Holstein  23560\r
-                               DE\r
-\r
-38-FD-FE   (hex)               iSmart electronic technology co.,LTD\r
-E00000-EFFFFF     (base 16)            iSmart electronic technology co.,LTD\r
-                               Room2101,DeWei Building,4 YunShan West Road,JiangBei,\r
-                               HuiZhou  GuangDong  516000\r
-                               CN\r
-\r
  5C-F2-86   (hex)               VPInstruments\r
  600000-6FFFFF     (base 16)            VPInstruments\r
                                 Buitenwatersloot 335\r
@@ -2399,6 +2375,30 @@ C00000-CFFFFF     (base 16)              Sunpet Industries Limited
                                 Shatin  N.T.  -\r
                                 HK\r
  \r
+5C-F2-86   (hex)               beijing your wonderful control system technology co.,ltd\r
+300000-3FFFFF     (base 16)            beijing your wonderful control system technology co.,ltd\r
+                               NO.11 Fengxian Medium Road,Yongfeng Industry Base,Haidian District,Beijing\r
+                               beijing  beijing  100094\r
+                               CN\r
+\r
+5C-F2-86   (hex)               EUROIMMUN Medizinische Labordiagnostika AG\r
+500000-5FFFFF     (base 16)            EUROIMMUN Medizinische Labordiagnostika AG\r
+                               Seekamp 31\r
+                               Lübeck  Schleswig-Holstein  23560\r
+                               DE\r
+\r
+5C-F2-86   (hex)               BrightSky, LLC\r
+D00000-DFFFFF     (base 16)            BrightSky, LLC\r
+                               5121 Castello Drive\r
+                               Naples  null  34103-1927\r
+                               US\r
+\r
+38-FD-FE   (hex)               iSmart electronic technology co.,LTD\r
+E00000-EFFFFF     (base 16)            iSmart electronic technology co.,LTD\r
+                               Room2101,DeWei Building,4 YunShan West Road,JiangBei,\r
+                               HuiZhou  GuangDong  516000\r
+                               CN\r
+\r
  5C-F2-86   (hex)               SHENZHEN HIVT TECHNOLOGY CO.,LTD\r
  800000-8FFFFF     (base 16)            SHENZHEN HIVT TECHNOLOGY CO.,LTD\r
                                 7 F,3rd Zone,B Block,Mingyou purchasing Center,Baoyuan RD,Xixiang,Bao'an District,Shenzhen,China\r
@@ -2417,12 +2417,6 @@ C00000-CFFFFF     (base 16)              Sunpet Industries Limited
                                 Tokyo    162-0825\r
                                 JP\r
  \r
-38-B8-EB   (hex)               Dojo-Labs Ltd\r
-500000-5FFFFF     (base 16)            Dojo-Labs Ltd\r
-                               Hatidhar 17\r
-                               Raanana    346651\r
-                               IL\r
-\r
  38-B8-EB   (hex)               Wyres SAS\r
  E00000-EFFFFF     (base 16)            Wyres SAS\r
                                 24 rue henri barbusse\r
@@ -2441,6 +2435,12 @@ E00000-EFFFFF     (base 16)              Wyres SAS
                                 Van Nuys  CA  91406\r
                                 US\r
  \r
+38-B8-EB   (hex)               Dojo-Labs Ltd\r
+500000-5FFFFF     (base 16)            Dojo-Labs Ltd\r
+                               Hatidhar 17\r
+                               Raanana    346651\r
+                               IL\r
+\r
  78-CA-83   (hex)               DAINCUBE\r
  000000-0FFFFF     (base 16)            DAINCUBE\r
                                 #401-701, 655, Pyeongcheon-ro\r
@@ -2465,11 +2465,11 @@ C00000-CFFFFF     (base 16)             Accriva
                                 San Diego  CA  92121\r
                                 US\r
  \r
-1C-87-76   (hex)               EBS Sp. z o.o.\r
-100000-1FFFFF     (base 16)            EBS Sp. z o.o.\r
-                               ul. Bronisława Czecha 59\r
-                               Warszawa  Mazowieckie  04-555\r
-                               PL\r
+1C-87-79   (hex)               BEIDIAN  GROUP\r
+500000-5FFFFF     (base 16)            BEIDIAN  GROUP\r
+                               A2 501 Jingang Road Pudong Jinqiao Shanghai\r
+                               Shanghai  Shanghai  200126\r
+                               CN\r
  \r
  1C-87-79   (hex)               Shenzhen Innovaconn Systems Co.,Ltd\r
  D00000-DFFFFF     (base 16)            Shenzhen Innovaconn Systems Co.,Ltd\r
@@ -2483,18 +2483,18 @@ C00000-CFFFFF     (base 16)             AllThingsTalk
                                 Gent    9000\r
                                 BE\r
  \r
+1C-87-76   (hex)               EBS Sp. z o.o.\r
+100000-1FFFFF     (base 16)            EBS Sp. z o.o.\r
+                               ul. Bronisława Czecha 59\r
+                               Warszawa  Mazowieckie  04-555\r
+                               PL\r
+\r
  1C-87-79   (hex)               Shenzhen Shouxin Tongda Technology Co.,Ltd\r
  600000-6FFFFF     (base 16)            Shenzhen Shouxin Tongda Technology Co.,Ltd\r
                                 Rm.1301-1305A,Fujian Building, Caitian road, Futian District,\r
                                 Shenzhen  Guangdong  China\r
                                 CN\r
  \r
-1C-87-79   (hex)               BEIDIAN  GROUP\r
-500000-5FFFFF     (base 16)            BEIDIAN  GROUP\r
-                               A2 501 Jingang Road Pudong Jinqiao Shanghai\r
-                               Shanghai  Shanghai  200126\r
-                               CN\r
-\r
  84-39-BE   (hex)               Shenzhen Lidaxun Digital Technology Co.,Ltd\r
  D00000-DFFFFF     (base 16)            Shenzhen Lidaxun Digital Technology Co.,Ltd\r
                                 4th Floor 3B03-3B05, Building 2,Internet Industries Park Area A, Baoan district\r
@@ -2519,6 +2519,12 @@ A00000-AFFFFF     (base 16)              Emotiq s.r.l.
                                 plano  tx  75093\r
                                 US\r
  \r
+80-0A-80   (hex)               Beijing VControl Technology Co., Ltd.\r
+300000-3FFFFF     (base 16)            Beijing VControl Technology Co., Ltd.\r
+                               Qinghe Anning Road, Wuyougang building #22\r
+                               Beijing  Haidian  100085\r
+                               CN\r
+\r
  80-0A-80   (hex)               Sumitomo Wiring Systems, Ltd.\r
  200000-2FFFFF     (base 16)            Sumitomo Wiring Systems, Ltd.\r
                                 Nagoya Lucent Tower 25F\r
@@ -2531,11 +2537,11 @@ A00000-AFFFFF     (base 16)             Emotiq s.r.l.
                                 Beijing  Beijing  100026\r
                                 CN\r
  \r
-80-0A-80   (hex)               Beijing VControl Technology Co., Ltd.\r
-300000-3FFFFF     (base 16)            Beijing VControl Technology Co., Ltd.\r
-                               Qinghe Anning Road, Wuyougang building #22\r
-                               Beijing  Haidian  100085\r
-                               CN\r
+CC-1B-E0   (hex)               IC RealTech\r
+600000-6FFFFF     (base 16)            IC RealTech\r
+                               3050 North Andrews Avenue Extension\r
+                               Pompano Beach  Florida  33064\r
+                               US\r
  \r
  00-55-DA   (hex)               Beijing Connected Information Technology Co.,Ltd.\r
  200000-2FFFFF     (base 16)            Beijing Connected Information Technology Co.,Ltd.\r
@@ -2543,18 +2549,6 @@ A00000-AFFFFF     (base 16)              Emotiq s.r.l.
                                 Beijing  Beijing  100041\r
                                 CN\r
  \r
-CC-1B-E0   (hex)               Shenzhen Vanstor Technology Co.,Ltd\r
-300000-3FFFFF     (base 16)            Shenzhen Vanstor Technology Co.,Ltd\r
-                               nanshan District\r
-                               shenzhen  GuangDong  518057\r
-                               CN\r
-\r
-CC-1B-E0   (hex)               IC RealTech\r
-600000-6FFFFF     (base 16)            IC RealTech\r
-                               3050 North Andrews Avenue Extension\r
-                               Pompano Beach  Florida  33064\r
-                               US\r
-\r
  CC-1B-E0   (hex)               MobiStor Technology Inc.\r
  900000-9FFFFF     (base 16)            MobiStor Technology Inc.\r
                                 Rm. 209, 2F., No. 99-1, Anzhong Rd., Xindian Dist.\r
@@ -2585,23 +2579,17 @@ D00000-DFFFFF     (base 16)             Arrow Electronics,Inc.
                                 Reno  NV  89511\r
                                 US\r
  \r
-C8-8E-D1   (hex)               Shenyang Machine Tool(Group) Research & Design Institute Co., Ltd, Shanghai Branch\r
-600000-6FFFFF     (base 16)            Shenyang Machine Tool(Group) Research & Design Institute Co., Ltd, Shanghai Branch\r
-                               2nd Floor,1st Building, No. 128 Xiangyin Rd, Shanghai\r
-                               Shanghai  Shanghai  200433\r
+CC-1B-E0   (hex)               Shenzhen Vanstor Technology Co.,Ltd\r
+300000-3FFFFF     (base 16)            Shenzhen Vanstor Technology Co.,Ltd\r
+                               nanshan District\r
+                               shenzhen  GuangDong  518057\r
                                 CN\r
  \r
-A0-3E-6B   (hex)               Friday Lab, UAB\r
-500000-5FFFFF     (base 16)            Friday Lab, UAB\r
-                               Sauletekio ave 15\r
-                               Vilnius  Vilnius  10224\r
-                               LT\r
-\r
-A0-3E-6B   (hex)               Videx Electronics S.p.A.\r
-200000-2FFFFF     (base 16)            Videx Electronics S.p.A.\r
-                               Via del Lavoro, 1\r
-                               Monte Giberto  FM  63846\r
-                               IT\r
+A0-3E-6B   (hex)               Qunar.com\r
+C00000-CFFFFF     (base 16)            Qunar.com\r
+                               xihaiguoji,1#8\r
+                               Beijing  Beijing  100086\r
+                               CN\r
  \r
  A0-3E-6B   (hex)               718th  Research  Institute  of  CSIC\r
  800000-8FFFFF     (base 16)            718th  Research  Institute  of  CSIC\r
@@ -2615,41 +2603,41 @@ A0-3E-6B   (hex)                Incogniteam Ltd.
                                 Tallin  Estonia  10111\r
                                 EE\r
  \r
+A0-3E-6B   (hex)               Friday Lab, UAB\r
+500000-5FFFFF     (base 16)            Friday Lab, UAB\r
+                               Sauletekio ave 15\r
+                               Vilnius  Vilnius  10224\r
+                               LT\r
+\r
  C8-8E-D1   (hex)               AP Sensing GmbH\r
  A00000-AFFFFF     (base 16)            AP Sensing GmbH\r
                                 Herrenberger Str. 130\r
                                 Böblingen  Baden-Würrtemberg  71034\r
                                 DE\r
  \r
-A0-3E-6B   (hex)               Qunar.com\r
-C00000-CFFFFF     (base 16)            Qunar.com\r
-                               xihaiguoji,1#8\r
-                               Beijing  Beijing  100086\r
+C8-8E-D1   (hex)               Shenyang Machine Tool(Group) Research & Design Institute Co., Ltd, Shanghai Branch\r
+600000-6FFFFF     (base 16)            Shenyang Machine Tool(Group) Research & Design Institute Co., Ltd, Shanghai Branch\r
+                               2nd Floor,1st Building, No. 128 Xiangyin Rd, Shanghai\r
+                               Shanghai  Shanghai  200433\r
                                 CN\r
  \r
-1C-21-D1   (hex)               Reliatronics Inc.\r
-800000-8FFFFF     (base 16)            Reliatronics Inc.\r
-                               1858 Ranch Road 3232\r
-                               Johnson City  TX  78636\r
-                               US\r
+C8-8E-D1   (hex)               ROTRONIC AG\r
+200000-2FFFFF     (base 16)            ROTRONIC AG\r
+                               Grindelstrasse 6\r
+                               Bassersdorf  Zurich  8303\r
+                               CH\r
  \r
-1C-21-D1   (hex)               B-Scada Inc.\r
-500000-5FFFFF     (base 16)            B-Scada Inc.\r
-                               9030 W Fort Island Trail\r
-                               Crystal River  FL  34429\r
-                               US\r
-\r
-DC-44-27   (hex)               General Microsystems Sdn Bhd\r
-300000-3FFFFF     (base 16)            General Microsystems Sdn Bhd\r
-                               3-17, Jalan USJ 7/3B\r
-                               UEP Subang Jaya  Selangor D. E.  47610\r
-                               MY\r
+A0-3E-6B   (hex)               Videx Electronics S.p.A.\r
+200000-2FFFFF     (base 16)            Videx Electronics S.p.A.\r
+                               Via del Lavoro, 1\r
+                               Monte Giberto  FM  63846\r
+                               IT\r
  \r
-C8-8E-D1   (hex)               ROTRONIC AG\r
-200000-2FFFFF     (base 16)            ROTRONIC AG\r
-                               Grindelstrasse 6\r
-                               Bassersdorf  Zurich  8303\r
-                               CH\r
+DC-44-27   (hex)               Wharton Electronics Ltd\r
+800000-8FFFFF     (base 16)            Wharton Electronics Ltd\r
+                               Unit 15, Thame Park Business Centre\r
+                               Thame  Oxfordshire  OX9 3XA\r
+                               GB\r
  \r
  1C-21-D1   (hex)               Dynojet Research\r
  900000-9FFFFF     (base 16)            Dynojet Research\r
@@ -2657,11 +2645,23 @@ C8-8E-D1   (hex)                ROTRONIC AG
                                 North Las Vegas  NV  89081\r
                                 US\r
  \r
-DC-44-27   (hex)               Wharton Electronics Ltd\r
-800000-8FFFFF     (base 16)            Wharton Electronics Ltd\r
-                               Unit 15, Thame Park Business Centre\r
-                               Thame  Oxfordshire  OX9 3XA\r
-                               GB\r
+1C-21-D1   (hex)               Reliatronics Inc.\r
+800000-8FFFFF     (base 16)            Reliatronics Inc.\r
+                               1858 Ranch Road 3232\r
+                               Johnson City  TX  78636\r
+                               US\r
+\r
+B0-C5-CA   (hex)               Astyx GmbH\r
+800000-8FFFFF     (base 16)            Astyx GmbH\r
+                               Lise-Meitner-Str. 2a\r
+                               Ottobrunn  Bavaria  85521\r
+                               DE\r
+\r
+DC-44-27   (hex)               General Microsystems Sdn Bhd\r
+300000-3FFFFF     (base 16)            General Microsystems Sdn Bhd\r
+                               3-17, Jalan USJ 7/3B\r
+                               UEP Subang Jaya  Selangor D. E.  47610\r
+                               MY\r
  \r
  DC-44-27   (hex)               Suritel\r
  000000-0FFFFF     (base 16)            Suritel\r
@@ -2669,17 +2669,11 @@ DC-44-27   (hex)                Suritel
                                 Moscow  Moscow  125319\r
                                 RU\r
  \r
-B0-C5-CA   (hex)               SYSTOVI\r
-500000-5FFFFF     (base 16)            SYSTOVI\r
-                               5, rue du Chêne Lassé\r
-                               SAINT-HERBLAIN  Loire-Atlantique  44800\r
-                               FR\r
-\r
-B0-C5-CA   (hex)               Astyx GmbH\r
-800000-8FFFFF     (base 16)            Astyx GmbH\r
-                               Lise-Meitner-Str. 2a\r
-                               Ottobrunn  Bavaria  85521\r
-                               DE\r
+1C-21-D1   (hex)               B-Scada Inc.\r
+500000-5FFFFF     (base 16)            B-Scada Inc.\r
+                               9030 W Fort Island Trail\r
+                               Crystal River  FL  34429\r
+                               US\r
  \r
  B0-C5-CA   (hex)               IVK-SAYANY\r
  100000-1FFFFF     (base 16)            IVK-SAYANY\r
@@ -2687,11 +2681,11 @@ B0-C5-CA   (hex)                IVK-SAYANY
                                 Moscow  Moscow  111024\r
                                 RU\r
  \r
-78-C2-C0   (hex)               Shenzhen ELI Technology co.,ltd\r
-000000-0FFFFF     (base 16)            Shenzhen ELI Technology co.,ltd\r
-                               Room 201, Dawning Building, No.12 Keji South 12th Road, Hi-Tech Park , Shenzhen\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
+B0-C5-CA   (hex)               SYSTOVI\r
+500000-5FFFFF     (base 16)            SYSTOVI\r
+                               5, rue du Chêne Lassé\r
+                               SAINT-HERBLAIN  Loire-Atlantique  44800\r
+                               FR\r
  \r
  78-C2-C0   (hex)               Wan Chao An (Beijing) Technology Co., Ltd.\r
  B00000-BFFFFF     (base 16)            Wan Chao An (Beijing) Technology Co., Ltd.\r
@@ -2699,30 +2693,6 @@ B00000-BFFFFF     (base 16)              Wan Chao An (Beijing) Technology Co., Ltd.
                                 Beijing  Beijing  100085\r
                                 CN\r
  \r
-88-5D-90   (hex)               Wuhan Strong Electronics Co., Ltd\r
-400000-4FFFFF     (base 16)            Wuhan Strong Electronics Co., Ltd\r
-                               2nd Floor, 6 Bldg, Guannan Fuxing Medical Park,\r
-                               Wuhan  Hubei  430074\r
-                               CN\r
-\r
-88-5D-90   (hex)               iRoom GmbH\r
-C00000-CFFFFF     (base 16)            iRoom GmbH\r
-                               Paracelsus Str. 4\r
-                               Oberndorf  Salzburg  5110\r
-                               AT\r
-\r
-88-5D-90   (hex)               Premier Merchandises Limited\r
-B00000-BFFFFF     (base 16)            Premier Merchandises Limited\r
-                               23/F Metro Loft, 38 Kwai Hei Street,\r
-                               Hong Kong    \r
-                               HK\r
-\r
-88-5D-90   (hex)               Schmidt & Co.,(H.K.)Ltd.\r
-700000-7FFFFF     (base 16)            Schmidt & Co.,(H.K.)Ltd.\r
-                               5F., No.139, Songjiang Rd., Zhongshan Dist., Taipei City 10485, Taiwan (R.O.C.)\r
-                               Taipei  Taiwan  10485\r
-                               TW\r
-\r
  B4-37-D1   (hex)               DIMTON CO.,LTD.\r
  300000-3FFFFF     (base 16)            DIMTON CO.,LTD.\r
                                 1F.,No.137,Xingfu E.Rd., Xinzhuang Dist., New Taipei City 242, Taiwan (R.O.C)\r
@@ -2741,29 +2711,53 @@ B4-37-D1   (hex)                Fibersystem AB
                                 Bormma  Stockholm  16866\r
                                 SE\r
  \r
+78-C2-C0   (hex)               Shenzhen ELI Technology co.,ltd\r
+000000-0FFFFF     (base 16)            Shenzhen ELI Technology co.,ltd\r
+                               Room 201, Dawning Building, No.12 Keji South 12th Road, Hi-Tech Park , Shenzhen\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+88-5D-90   (hex)               Wuhan Strong Electronics Co., Ltd\r
+400000-4FFFFF     (base 16)            Wuhan Strong Electronics Co., Ltd\r
+                               2nd Floor, 6 Bldg, Guannan Fuxing Medical Park,\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+88-5D-90   (hex)               Schmidt & Co.,(H.K.)Ltd.\r
+700000-7FFFFF     (base 16)            Schmidt & Co.,(H.K.)Ltd.\r
+                               5F., No.139, Songjiang Rd., Zhongshan Dist., Taipei City 10485, Taiwan (R.O.C.)\r
+                               Taipei  Taiwan  10485\r
+                               TW\r
+\r
+88-5D-90   (hex)               iRoom GmbH\r
+C00000-CFFFFF     (base 16)            iRoom GmbH\r
+                               Paracelsus Str. 4\r
+                               Oberndorf  Salzburg  5110\r
+                               AT\r
+\r
+88-5D-90   (hex)               Premier Merchandises Limited\r
+B00000-BFFFFF     (base 16)            Premier Merchandises Limited\r
+                               23/F Metro Loft, 38 Kwai Hei Street,\r
+                               Hong Kong    \r
+                               HK\r
+\r
  74-F8-DB   (hex)               Provision-ISR\r
  500000-5FFFFF     (base 16)            Provision-ISR\r
                                 11 Atir Yeda St.\r
                                 Kfar Saba  Israel  4464310\r
                                 IL\r
  \r
-64-FB-81   (hex)               NPG Technology S.A.\r
-800000-8FFFFF     (base 16)            NPG Technology S.A.\r
-                               C/ Ecuador 14 (P.I. Las Monjas)\r
-                               Torrejón de Ardoz  Madrid  28850\r
-                               ES\r
-\r
  64-FB-81   (hex)               Kay Schulze & Karsten Pohle GbR\r
  500000-5FFFFF     (base 16)            Kay Schulze & Karsten Pohle GbR\r
                                 Heinrich-Hertz-Strasse 121\r
                                 Hamburg  Hamburg  22083\r
                                 DE\r
  \r
-80-7B-85   (hex)               Ningbo Plus and Popscreens electronic Technology Co.,LTD\r
-C00000-CFFFFF     (base 16)            Ningbo Plus and Popscreens electronic Technology Co.,LTD\r
-                               7 Hong Da Road, Hong Tang Industrial Park Zone A\r
-                               Ningbo  Zhejiang  315040\r
-                               CN\r
+64-FB-81   (hex)               NPG Technology S.A.\r
+800000-8FFFFF     (base 16)            NPG Technology S.A.\r
+                               C/ Ecuador 14 (P.I. Las Monjas)\r
+                               Torrejón de Ardoz  Madrid  28850\r
+                               ES\r
  \r
  80-7B-85   (hex)               Oliotalo Oy\r
  B00000-BFFFFF     (base 16)            Oliotalo Oy\r
@@ -2783,12 +2777,24 @@ B00000-BFFFFF     (base 16)             Oliotalo Oy
                                 Taipei City    10656\r
                                 TW\r
  \r
+80-7B-85   (hex)               Ningbo Plus and Popscreens electronic Technology Co.,LTD\r
+C00000-CFFFFF     (base 16)            Ningbo Plus and Popscreens electronic Technology Co.,LTD\r
+                               7 Hong Da Road, Hong Tang Industrial Park Zone A\r
+                               Ningbo  Zhejiang  315040\r
+                               CN\r
+\r
  64-FB-81   (hex)               Bronkhorst High-Tech BV\r
  A00000-AFFFFF     (base 16)            Bronkhorst High-Tech BV\r
                                 Nijverheidsstraat 1a\r
                                 Ruurlo  Gelderland  NL-7261AK\r
                                 NL\r
  \r
+80-E4-DA   (hex)               Elcus\r
+900000-9FFFFF     (base 16)            Elcus\r
+                               Varshavskaya st. 5A lit L\r
+                               St.-Petersburg  St.-Petersburg  196128\r
+                               RU\r
+\r
  64-FB-81   (hex)               Pricer AB\r
  400000-4FFFFF     (base 16)            Pricer AB\r
                                 Västra Järnvägsgatan 7\r
@@ -2807,20 +2813,14 @@ A00000-AFFFFF     (base 16)             Bronkhorst High-Tech BV
                                 Seocho-gu  Seoul  138-898\r
                                 KR\r
  \r
-80-E4-DA   (hex)               Elcus\r
-900000-9FFFFF     (base 16)            Elcus\r
-                               Varshavskaya st. 5A lit L\r
-                               St.-Petersburg  St.-Petersburg  196128\r
-                               RU\r
-\r
  1C-CA-E3   (hex)               Private\r
  000000-0FFFFF     (base 16)            Private\r
  \r
-80-E4-DA   (hex)               Wheatstone Corporation\r
-000000-0FFFFF     (base 16)            Wheatstone Corporation\r
-                               600 Industrial Drive\r
-                               New Bern  NC  28562\r
-                               US\r
+90-C6-82   (hex)               Shenzhen Lencotion Technology Co.,Ltd\r
+000000-0FFFFF     (base 16)            Shenzhen Lencotion Technology Co.,Ltd\r
+                                LongGang,Buji Xia Shuijing,Hubei\r
+                               Shenzhen  Guangdong  518112\r
+                               CN\r
  \r
  2C-D1-41   (hex)               CITA SMART SOLUTIONS LTD\r
  E00000-EFFFFF     (base 16)            CITA SMART SOLUTIONS LTD\r
@@ -2834,6 +2834,12 @@ E00000-EFFFFF     (base 16)              CITA SMART SOLUTIONS LTD
                                 Stockholm  Stockholm  11428\r
                                 SE\r
  \r
+80-E4-DA   (hex)               Wheatstone Corporation\r
+000000-0FFFFF     (base 16)            Wheatstone Corporation\r
+                               600 Industrial Drive\r
+                               New Bern  NC  28562\r
+                               US\r
+\r
  2C-D1-41   (hex)               Fiberroad Technology Co., Ltd.\r
  A00000-AFFFFF     (base 16)            Fiberroad Technology Co., Ltd.\r
                                 2F,5# Building,Minxing Industrial Park,MinKang Rd.Minzhi,Longhua District,ShenZhen China.\r
@@ -2846,6 +2852,30 @@ A00000-AFFFFF     (base 16)              Fiberroad Technology Co., Ltd.
                                 Nionohama  Otsu Shiga  520-0801\r
                                 JP\r
  \r
+2C-6A-6F   (hex)               Logic IO Aps\r
+900000-9FFFFF     (base 16)            Logic IO Aps\r
+                               Holmboes Alle 14\r
+                               Horsens  DK  8700\r
+                               DK\r
+\r
+2C-6A-6F   (hex)               SM DSP CO.,LTD.\r
+700000-7FFFFF     (base 16)            SM DSP CO.,LTD.\r
+                               6-Gil 13-14\r
+                               Gumi-si  Gyeongsangbuk-Do  730-906\r
+                               KR\r
+\r
+A0-BB-3E   (hex)               ManTech International Corporation\r
+500000-5FFFFF     (base 16)            ManTech International Corporation\r
+                               2250 Corporate Park Drive\r
+                               Herndon  Virginia  20171\r
+                               US\r
+\r
+A0-BB-3E   (hex)               Filo SRL\r
+A00000-AFFFFF     (base 16)            Filo SRL\r
+                               Via Giovanni Giolitti 34\r
+                               Roma  rm  00185\r
+                               IT\r
+\r
  98-02-D8   (hex)               Private\r
  E00000-EFFFFF     (base 16)            Private\r
  \r
@@ -2861,35 +2891,17 @@ E00000-EFFFFF     (base 16)             Private
                                 Edmonton  AB  T6N 1E6\r
                                 CA\r
  \r
-A0-BB-3E   (hex)               Filo SRL\r
-A00000-AFFFFF     (base 16)            Filo SRL\r
-                               Via Giovanni Giolitti 34\r
-                               Roma  rm  00185\r
-                               IT\r
-\r
-90-C6-82   (hex)               Shenzhen Lencotion Technology Co.,Ltd\r
-000000-0FFFFF     (base 16)            Shenzhen Lencotion Technology Co.,Ltd\r
-                                LongGang,Buji Xia Shuijing,Hubei\r
-                               Shenzhen  Guangdong  518112\r
-                               CN\r
-\r
  98-02-D8   (hex)               Simplo Technology Co.,LTD\r
  800000-8FFFFF     (base 16)            Simplo Technology Co.,LTD\r
                                 No471., Sec.2, Pa The Rd.,\r
                                 Hu Kou  30348  Hsin Chu Hsien\r
                                 TW\r
  \r
-2C-6A-6F   (hex)               Logic IO Aps\r
-900000-9FFFFF     (base 16)            Logic IO Aps\r
-                               Holmboes Alle 14\r
-                               Horsens  DK  8700\r
-                               DK\r
-\r
-2C-6A-6F   (hex)               SM DSP CO.,LTD.\r
-700000-7FFFFF     (base 16)            SM DSP CO.,LTD.\r
-                               6-Gil 13-14\r
-                               Gumi-si  Gyeongsangbuk-Do  730-906\r
-                               KR\r
+28-FD-80   (hex)               Airbus Defence and Space Oy\r
+C00000-CFFFFF     (base 16)            Airbus Defence and Space Oy\r
+                               Hiomotie 32\r
+                                 Helsinki  00380\r
+                               FI\r
  \r
  A0-BB-3E   (hex)               IVision Electronics Co.,Ltd\r
  100000-1FFFFF     (base 16)            IVision Electronics Co.,Ltd\r
@@ -2903,24 +2915,12 @@ A0-BB-3E   (hex)                WiteRiver Technology LLC
                                 Ufa  Republic of Bashkortostan  450112\r
                                 RU\r
  \r
-A0-BB-3E   (hex)               ManTech International Corporation\r
-500000-5FFFFF     (base 16)            ManTech International Corporation\r
-                               2250 Corporate Park Drive\r
-                               Herndon  Virginia  20171\r
-                               US\r
-\r
  28-FD-80   (hex)               Zhixiang Technology Co., Ltd.\r
  200000-2FFFFF     (base 16)            Zhixiang Technology Co., Ltd.\r
                                 7-2604 Media Village,\r
                                 Chaoyang District,  Beijing  100107\r
                                 CN\r
  \r
-28-FD-80   (hex)               Airbus Defence and Space Oy\r
-C00000-CFFFFF     (base 16)            Airbus Defence and Space Oy\r
-                               Hiomotie 32\r
-                                 Helsinki  00380\r
-                               FI\r
-\r
  2C-26-5F   (hex)               Jiangsu JARI Technology Group Co., LTD\r
  200000-2FFFFF     (base 16)            Jiangsu JARI Technology Group Co., LTD\r
                                 NO.18, Shenghu Rd,\r
@@ -2933,18 +2933,6 @@ A00000-AFFFFF     (base 16)              Polara Engineering
                                 CORONA  California  92883\r
                                 US\r
  \r
-F8-02-78   (hex)               CLARUS Korea Co., Ltd\r
-400000-4FFFFF     (base 16)            CLARUS Korea Co., Ltd\r
-                                2F, Illutech Bldg, Myoenmok7-dong,\r
-                                  Seoul   131827\r
-                               KR\r
-\r
-0C-EF-AF   (hex)               Goerlitz AG\r
-100000-1FFFFF     (base 16)            Goerlitz AG\r
-                               August-Thyssen-Strasse 32\r
-                               Koblenz  Rheinland-Pfalz  56070\r
-                               DE\r
-\r
  0C-EF-AF   (hex)               GainStrong Industry Co.,Ltd\r
  C00000-CFFFFF     (base 16)            GainStrong Industry Co.,Ltd\r
                                 3rd Floor, 1st Building, Block E, Minzhu West Industrial Zone, Bao’an Dist.\r
@@ -2957,17 +2945,17 @@ A00000-AFFFFF     (base 16)             chengdu joyotime Technology Co., Ltd.
                                 chengdu  sichuan  610000\r
                                 CN\r
  \r
-F8-02-78   (hex)               Rosemount Analytical\r
-B00000-BFFFFF     (base 16)            Rosemount Analytical\r
-                               10241 West Little York, Suite 200\r
-                               Houston, TX 77040  Texas  77040\r
-                               US\r
+F8-02-78   (hex)               CLARUS Korea Co., Ltd\r
+400000-4FFFFF     (base 16)            CLARUS Korea Co., Ltd\r
+                                2F, Illutech Bldg, Myoenmok7-dong,\r
+                                  Seoul   131827\r
+                               KR\r
  \r
-A4-4F-29   (hex)               Dermalog Identification Systems GmbH\r
-000000-0FFFFF     (base 16)            Dermalog Identification Systems GmbH\r
-                               Mittelweg 120\r
-                               Hamburg  Hamburg  20148\r
-                               DE\r
+F8-02-78   (hex)               Rosemount Analytical\r
+B00000-BFFFFF     (base 16)            Rosemount Analytical\r
+                               10241 West Little York, Suite 200\r
+                               Houston, TX 77040  Texas  77040\r
+                               US\r
  \r
  A4-4F-29   (hex)               HTD\r
  A00000-AFFFFF     (base 16)            HTD\r
@@ -2981,11 +2969,17 @@ B00000-BFFFFF     (base 16)             GUANGDONG REAL-DESIGN INTELLIGENT TECHNOLOGY CO.,LT
                                 Foshan  Guangdong  528300\r
                                 CN\r
  \r
-3C-39-E7   (hex)               Martem AS\r
-800000-8FFFFF     (base 16)            Martem AS\r
-                               Akadeemia tee 21/6\r
-                               Tallinn  Harjumaa  12618\r
-                               EE\r
+3C-39-E7   (hex)               VANSTONE ELECTRONIC (BEIJING)CO,. LTD.\r
+C00000-CFFFFF     (base 16)            VANSTONE ELECTRONIC (BEIJING)CO,. LTD.\r
+                               Room 805,8/F,Qinghua Information Port Development Building,North High-tech Industrial Park,Nanshan District,Shenzhen\r
+                               shenzhen  guangdong  518000\r
+                               CN\r
+\r
+A4-4F-29   (hex)               Dermalog Identification Systems GmbH\r
+000000-0FFFFF     (base 16)            Dermalog Identification Systems GmbH\r
+                               Mittelweg 120\r
+                               Hamburg  Hamburg  20148\r
+                               DE\r
  \r
  3C-39-E7   (hex)               Attrackting AG\r
  500000-5FFFFF     (base 16)            Attrackting AG\r
@@ -2993,11 +2987,17 @@ B00000-BFFFFF     (base 16)             GUANGDONG REAL-DESIGN INTELLIGENT TECHNOLOGY CO.,LT
                                 Biel/Bienne  Berne  2502\r
                                 CH\r
  \r
-3C-39-E7   (hex)               VANSTONE ELECTRONIC (BEIJING)CO,. LTD.\r
-C00000-CFFFFF     (base 16)            VANSTONE ELECTRONIC (BEIJING)CO,. LTD.\r
-                               Room 805,8/F,Qinghua Information Port Development Building,North High-tech Industrial Park,Nanshan District,Shenzhen\r
-                               shenzhen  guangdong  518000\r
-                               CN\r
+0C-EF-AF   (hex)               Goerlitz AG\r
+100000-1FFFFF     (base 16)            Goerlitz AG\r
+                               August-Thyssen-Strasse 32\r
+                               Koblenz  Rheinland-Pfalz  56070\r
+                               DE\r
+\r
+3C-39-E7   (hex)               Martem AS\r
+800000-8FFFFF     (base 16)            Martem AS\r
+                               Akadeemia tee 21/6\r
+                               Tallinn  Harjumaa  12618\r
+                               EE\r
  \r
  3C-39-E7   (hex)               HomeWizard B.V.\r
  200000-2FFFFF     (base 16)            HomeWizard B.V.\r
@@ -3005,35 +3005,35 @@ C00000-CFFFFF     (base 16)             VANSTONE ELECTRONIC (BEIJING)CO,. LTD.
                                 Katwijk  ZH  2222AC\r
                                 NL\r
  \r
-E8-18-63   (hex)               Protek Electronics Group Co.,LTD\r
-B00000-BFFFFF     (base 16)            Protek Electronics Group Co.,LTD\r
-                               Homecare Technology Park,5/F,No.30,Langdong\r
-                               Shenzhen  Guangdong  518105\r
-                               CN\r
-\r
-D0-22-12   (hex)               Viatron GmbH\r
-400000-4FFFFF     (base 16)            Viatron GmbH\r
-                               Carl-Metz-Str. 3\r
-                               Ettlingen  Baden Würtemberg  76275\r
-                               DE\r
-\r
  10-07-23   (hex)               BEIJING SOOALL INFORMATION TECHNOLOGY CO.,LTD\r
  500000-5FFFFF     (base 16)            BEIJING SOOALL INFORMATION TECHNOLOGY CO.,LTD\r
                                 Room 1028,Block B,No.11 XinghuoRoad,Science City,Fengtai District\r
                                 Beijing  Beijing  100070\r
                                 CN\r
  \r
+E8-18-63   (hex)               Protek Electronics Group Co.,LTD\r
+B00000-BFFFFF     (base 16)            Protek Electronics Group Co.,LTD\r
+                               Homecare Technology Park,5/F,No.30,Langdong\r
+                               Shenzhen  Guangdong  518105\r
+                               CN\r
+\r
  D0-22-12   (hex)               Spirit IT B.V.\r
  000000-0FFFFF     (base 16)            Spirit IT B.V.\r
                                 prof. dr. Dorgelolaan 20\r
                                 Eindhoven  Noord-Brabant  5613 AM\r
                                 NL\r
  \r
-74-E1-4A   (hex)               APM Technologies (DongGuan) Ltd\r
-700000-7FFFFF     (base 16)            APM Technologies (DongGuan) Ltd\r
-                               109Gosun Science Building, NanCheng , DongGuan, GuangDong, China\r
-                               DongGuan  GuangDong  523000\r
-                               CN\r
+D0-22-12   (hex)               Viatron GmbH\r
+400000-4FFFFF     (base 16)            Viatron GmbH\r
+                               Carl-Metz-Str. 3\r
+                               Ettlingen  Baden Würtemberg  76275\r
+                               DE\r
+\r
+B8-D8-12   (hex)               V5 Technology Corporation\r
+400000-4FFFFF     (base 16)            V5 Technology Corporation\r
+                               5F., No.7, Lixing 3rd Rd., East Dist., Hsinchu City 30078, Taiwan (R.O.C.)\r
+                               HsinChu  Taiwan  30078\r
+                               TW\r
  \r
  74-E1-4A   (hex)               Kanto Aircraft Instrument Co., Ltd.\r
  900000-9FFFFF     (base 16)            Kanto Aircraft Instrument Co., Ltd.\r
@@ -3041,11 +3041,11 @@ D0-22-12   (hex)                Spirit IT B.V.
                                 Fujisawa  Kanagawa  251-0875\r
                                 JP\r
  \r
-B8-D8-12   (hex)               V5 Technology Corporation\r
-400000-4FFFFF     (base 16)            V5 Technology Corporation\r
-                               5F., No.7, Lixing 3rd Rd., East Dist., Hsinchu City 30078, Taiwan (R.O.C.)\r
-                               HsinChu  Taiwan  30078\r
-                               TW\r
+74-E1-4A   (hex)               APM Technologies (DongGuan) Ltd\r
+700000-7FFFFF     (base 16)            APM Technologies (DongGuan) Ltd\r
+                               109Gosun Science Building, NanCheng , DongGuan, GuangDong, China\r
+                               DongGuan  GuangDong  523000\r
+                               CN\r
  \r
  B8-D8-12   (hex)               Kiwigrid GmbH\r
  A00000-AFFFFF     (base 16)            Kiwigrid GmbH\r
@@ -3059,41 +3059,29 @@ D00000-DFFFFF     (base 16)             Shanghai Tieda Telecommunications Equipment Co.,LTD
                                 Shanghai  Zhabei District  200070\r
                                 \r
  \r
-E4-95-6E   (hex)               PT.MLWTelecom\r
-800000-8FFFFF     (base 16)            PT.MLWTelecom\r
-                               Jalan Jembatan Dua Raya no.16/2\r
-                                 Jakarta  14450\r
-                               ID\r
-\r
  BC-66-41   (hex)               UtilLighting Co.,Ltd.\r
  D00000-DFFFFF     (base 16)            UtilLighting Co.,Ltd.\r
                                 #102, 1F, 22, Samyang-ro, Seongbuk-gu, Seoul\r
                                 Seongbuk-gu  Seoul  136-717\r
                                 KR\r
  \r
+E4-95-6E   (hex)               PT.MLWTelecom\r
+800000-8FFFFF     (base 16)            PT.MLWTelecom\r
+                               Jalan Jembatan Dua Raya no.16/2\r
+                                 Jakarta  14450\r
+                               ID\r
+\r
  E4-95-6E   (hex)               SMC Networks, Inc\r
  000000-0FFFFF     (base 16)            SMC Networks, Inc\r
                                 20 Mason\r
                                 Irvine  CA  92618\r
                                 US\r
  \r
-B0-1F-81   (hex)               Access Device Integrated Communications Corp.\r
-C00000-CFFFFF     (base 16)            Access Device Integrated Communications Corp.\r
-                               No. 839, Sec.3, ChungChing Road,\r
-                               Taichung City  Taichung  42862\r
-                               TW\r
-\r
-BC-66-41   (hex)               Intuitive Surgical, Inc\r
-600000-6FFFFF     (base 16)            Intuitive Surgical, Inc\r
-                               1250 Kifer Rd\r
-                               Sunnyvale  California  94086\r
-                               US\r
-\r
-58-FC-DB   (hex)               Inforce Computing Inc.\r
-400000-4FFFFF     (base 16)            Inforce Computing Inc.\r
-                               48820 Kato Road\r
-                               Fremont  CA  94538\r
-                               US\r
+BC-66-41   (hex)               Global China Technology Limited\r
+100000-1FFFFF     (base 16)            Global China Technology Limited\r
+                               Ruyi Road 1-3,Ailian, Longcheng Street, longgang Town,\r
+                               Shenzhen  GuangDong  518172\r
+                               CN\r
  \r
  58-FC-DB   (hex)               Spang Power Electronics\r
  000000-0FFFFF     (base 16)            Spang Power Electronics\r
@@ -3101,16 +3089,10 @@ BC-66-41   (hex)                Intuitive Surgical, Inc
                                 Mentor  Ohio  44060\r
                                 US\r
  \r
-BC-66-41   (hex)               Global China Technology Limited\r
-100000-1FFFFF     (base 16)            Global China Technology Limited\r
-                               Ruyi Road 1-3,Ailian, Longcheng Street, longgang Town,\r
-                               Shenzhen  GuangDong  518172\r
-                               CN\r
-\r
-B0-1F-81   (hex)               Aether Services, Inc.\r
-700000-7FFFFF     (base 16)            Aether Services, Inc.\r
-                               1A2-A08, No.1, Lising 1st RD.\r
-                               Hsinchu City  Hsinchu  30078\r
+B0-1F-81   (hex)               Access Device Integrated Communications Corp.\r
+C00000-CFFFFF     (base 16)            Access Device Integrated Communications Corp.\r
+                               No. 839, Sec.3, ChungChing Road,\r
+                               Taichung City  Taichung  42862\r
                                 TW\r
  \r
  58-FC-DB   (hex)               Hi-Target Surveying Instrument Co., Ltd.\r
@@ -3119,6 +3101,18 @@ B0-1F-81   (hex)         Aether Services, Inc.
                                 Guangzhou  Guangdong  511400\r
                                 CN\r
  \r
+58-FC-DB   (hex)               Inforce Computing Inc.\r
+400000-4FFFFF     (base 16)            Inforce Computing Inc.\r
+                               48820 Kato Road\r
+                               Fremont  CA  94538\r
+                               US\r
+\r
+BC-66-41   (hex)               Intuitive Surgical, Inc\r
+600000-6FFFFF     (base 16)            Intuitive Surgical, Inc\r
+                               1250 Kifer Rd\r
+                               Sunnyvale  California  94086\r
+                               US\r
+\r
  14-1F-BA   (hex)               POS Systema LLC\r
  E00000-EFFFFF     (base 16)            POS Systema LLC\r
                                 Varshavskoe shosse, 35, room №13\r
@@ -3131,41 +3125,53 @@ F4-0E-11   (hex)                BEIJING DONGJIN AERO-TECH CO., LTD
                                 Beijing  Beijing  100089\r
                                 CN\r
  \r
+B0-1F-81   (hex)               Aether Services, Inc.\r
+700000-7FFFFF     (base 16)            Aether Services, Inc.\r
+                               1A2-A08, No.1, Lising 1st RD.\r
+                               Hsinchu City  Hsinchu  30078\r
+                               TW\r
+\r
  F4-0E-11   (hex)               Kodpro Ltd.\r
  A00000-AFFFFF     (base 16)            Kodpro Ltd.\r
                                 Room 801, 8/F, Opulent Bldg.,\r
                                 Hong Kong  Wan Chai  999077\r
                                 HK\r
  \r
-7C-70-BC   (hex)               K-Vision Technology (Shanghai), Ltd\r
-400000-4FFFFF     (base 16)            K-Vision Technology (Shanghai), Ltd\r
-                               Floor 4, No.9 Building, 879 Lane\r
-                               Shanghai  Shanghai  200333\r
-                               CN\r
-\r
  14-1F-BA   (hex)               Wisnetworks Technologies Co., Ltd.\r
  700000-7FFFFF     (base 16)            Wisnetworks Technologies Co., Ltd.\r
                                 No.77, FuTe West 3 Road, China\r
                                   Shanghai  200000\r
                                 \r
  \r
+7C-70-BC   (hex)               K-Vision Technology (Shanghai), Ltd\r
+400000-4FFFFF     (base 16)            K-Vision Technology (Shanghai), Ltd\r
+                               Floor 4, No.9 Building, 879 Lane\r
+                               Shanghai  Shanghai  200333\r
+                               CN\r
+\r
  7C-70-BC   (hex)               Nomad Digital Ltd.\r
  700000-7FFFFF     (base 16)            Nomad Digital Ltd.\r
                                 2nd Floor, Baltic Chambers,\r
                                 Newcastle upon Tyne    NE1 3DQ\r
                                 GB\r
  \r
+7C-70-BC   (hex)               Shanghai magcomm communication technology co ltd\r
+000000-0FFFFF     (base 16)            Shanghai magcomm communication technology co ltd\r
+                               B Block,11F,Software Building, No 461 Hongcaolu\r
+                               Shanghai  Shanghai  200233\r
+                               CN\r
+\r
  14-1F-BA   (hex)               BYZERO\r
  400000-4FFFFF     (base 16)            BYZERO\r
                                 1222 Doosan Venture Digm\r
                                 Anyang-si  Gyeonggi-do  431-755\r
                                 KR\r
  \r
-7C-70-BC   (hex)               Shanghai magcomm communication technology co ltd\r
-000000-0FFFFF     (base 16)            Shanghai magcomm communication technology co ltd\r
-                               B Block,11F,Software Building, No 461 Hongcaolu\r
-                               Shanghai  Shanghai  200233\r
-                               CN\r
+BC-34-00   (hex)               Q-PRODUCTS a. s.\r
+700000-7FFFFF     (base 16)            Q-PRODUCTS a. s.\r
+                               Rybnicna 38/K\r
+                               Bratislava  SK  83106\r
+                               SK\r
  \r
  BC-34-00   (hex)               Altronix Corporation\r
  300000-3FFFFF     (base 16)            Altronix Corporation\r
@@ -3179,11 +3185,11 @@ BC-34-00   (hex)                Redvision CCTV
                                 Bordon  Hampshire  GU35 0AX\r
                                 GB\r
  \r
-BC-34-00   (hex)               Q-PRODUCTS a. s.\r
-700000-7FFFFF     (base 16)            Q-PRODUCTS a. s.\r
-                               Rybnicna 38/K\r
-                               Bratislava  SK  83106\r
-                               SK\r
+A4-3B-FA   (hex)               Recognition Systems LLC\r
+600000-6FFFFF     (base 16)            Recognition Systems LLC\r
+                               2380 Owen Street\r
+                               Santa Clara  CA  95054\r
+                               US\r
  \r
  A4-3B-FA   (hex)               Deatronic srl\r
  700000-7FFFFF     (base 16)            Deatronic srl\r
@@ -3191,12 +3197,6 @@ A4-3B-FA   (hex)         Deatronic srl
                                 ROMA    00178\r
                                 IT\r
  \r
-A4-3B-FA   (hex)               Recognition Systems LLC\r
-600000-6FFFFF     (base 16)            Recognition Systems LLC\r
-                               2380 Owen Street\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
  D0-76-50   (hex)               Private\r
  400000-4FFFFF     (base 16)            Private\r
  \r
@@ -3206,6 +3206,12 @@ D0-76-50   (hex)         Accumulate AB
                                   Stockholm  111 44\r
                                 SE\r
  \r
+74-19-F8   (hex)               Starcor Beijing Co.,Limited\r
+500000-5FFFFF     (base 16)            Starcor Beijing Co.,Limited\r
+                               NO.210 Block B, Building 2\r
+                               Beijing  Berijing  100089\r
+                               CN\r
+\r
  74-19-F8   (hex)               Princip a.s.\r
  900000-9FFFFF     (base 16)            Princip a.s.\r
                                 Radlicka 204/503\r
@@ -3224,29 +3230,35 @@ A00000-AFFFFF     (base 16)             Tanjarine
                                 Hawthorn  Victoria  3122\r
                                 AU\r
  \r
-74-19-F8   (hex)               Starcor Beijing Co.,Limited\r
-500000-5FFFFF     (base 16)            Starcor Beijing Co.,Limited\r
-                               NO.210 Block B, Building 2\r
-                               Beijing  Berijing  100089\r
-                               CN\r
-\r
  74-19-F8   (hex)               Symtop Instrument Co.\r
  200000-2FFFFF     (base 16)            Symtop Instrument Co.\r
                                 Haidianqu Xueqinglu Xuezhixuan 613\r
                                 Haidianqu  Beijing  100083\r
                                 CN\r
  \r
+4C-4B-F9   (hex)               Electrolux Professional AB\r
+A00000-AFFFFF     (base 16)            Electrolux Professional AB\r
+                               Ringvägen 14\r
+                               Ljungby    34180\r
+                               SE\r
+\r
+40-11-75   (hex)               MIRC ELECTRONICS LTD\r
+500000-5FFFFF     (base 16)            MIRC ELECTRONICS LTD\r
+                               Onida House, G-1, MIDC, Mahakali Caves Road, Andheri East\r
+                               Mumbai  Maharashtra  400093\r
+                               IN\r
+\r
  40-11-75   (hex)               Table Trac Inc\r
  400000-4FFFFF     (base 16)            Table Trac Inc\r
                                 6101 Baker Rd STE 206\r
                                 Minnetonka  MN  55345\r
                                 US\r
  \r
-4C-4B-F9   (hex)               Electrolux Professional AB\r
-A00000-AFFFFF     (base 16)            Electrolux Professional AB\r
-                               Ringvägen 14\r
-                               Ljungby    34180\r
-                               SE\r
+40-11-75   (hex)               Lexi Devices, Inc.\r
+000000-0FFFFF     (base 16)            Lexi Devices, Inc.\r
+                               2342 Shattuck Ave, #260\r
+                               Berkeley    94704\r
+                               US\r
  \r
  40-11-75   (hex)               NIBBLE\r
  E00000-EFFFFF     (base 16)            NIBBLE\r
@@ -3260,33 +3272,75 @@ E00000-EFFFFF     (base 16)             NIBBLE
                                 Fuzhou   Fujian  350200\r
                                 CN\r
  \r
-40-11-75   (hex)               MIRC ELECTRONICS LTD\r
-500000-5FFFFF     (base 16)            MIRC ELECTRONICS LTD\r
-                               Onida House, G-1, MIDC, Mahakali Caves Road, Andheri East\r
-                               Mumbai  Maharashtra  400093\r
-                               IN\r
-\r
-40-11-75   (hex)               Lexi Devices, Inc.\r
-000000-0FFFFF     (base 16)            Lexi Devices, Inc.\r
-                               2342 Shattuck Ave, #260\r
-                               Berkeley    94704\r
-                               US\r
-\r
  10-DC-B6   (hex)               Pickering Interfaces Ltd\r
  A00000-AFFFFF     (base 16)            Pickering Interfaces Ltd\r
                                 Stephenson Road\r
                                 Clacton On Sea  Essex  CO154NL\r
                                 GB\r
  \r
-4C-4B-F9   (hex)               Shenzhen dingsheng technology co., LTD\r
-400000-4FFFFF     (base 16)            Shenzhen dingsheng technology co., LTD\r
-                               Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district\r
-                               Shenzhen  Guangdong  518000\r
+10-DC-B6   (hex)               Moya Commumication Technology (Shenzhen) Co.,Ltd.\r
+700000-7FFFFF     (base 16)            Moya Commumication Technology (Shenzhen) Co.,Ltd.\r
+                               Guang Hui Science Park, No.17 of Min Qing Road, Longhua District\r
+                               Shenzhen    518000\r
                                 CN\r
  \r
-4C-4B-F9   (hex)               Connected IO\r
-C00000-CFFFFF     (base 16)            Connected IO\r
-                               8304 Esters Boulevard, Suite 850\r
+54-A4-93   (hex)               Intelligent Surveillance Corp\r
+000000-0FFFFF     (base 16)            Intelligent Surveillance Corp\r
+                               PO Box 12168\r
+                               College Station  TX  77842\r
+                               US\r
+\r
+54-A4-93   (hex)               I-MOON TECHNOLOGY CO., LIMITED\r
+300000-3FFFFF     (base 16)            I-MOON TECHNOLOGY CO., LIMITED\r
+                               FLAT/RM 2253, BLK 1, 22/F, HOI TAI FACTORY, EST TSING YEUNG CIRCUIT, TUEN MUN\r
+                               NT    999077\r
+                               HK\r
+\r
+04-D1-6E   (hex)               Dspread Technology (Beijing) Inc.\r
+500000-5FFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
+                               Jingxin Building, 2045 Suite , Chaoyang District\r
+                               Beijing    100027\r
+                               CN\r
+\r
+04-D1-6E   (hex)               Evolute Systems Private Limited\r
+E00000-EFFFFF     (base 16)            Evolute Systems Private Limited\r
+                               #3794 ,Ground and First Floor, 7th Main, Indira Nagar\r
+                               Bangalore  Karnataka  560038\r
+                               IN\r
+\r
+44-03-77   (hex)               Exsom Computers LLC\r
+200000-2FFFFF     (base 16)            Exsom Computers LLC\r
+                               Office 3206, The Citadel Tower, Business Bay\r
+                               Dubai  Dubai  72891\r
+                               AE\r
+\r
+44-03-77   (hex)               SHEN ZHEN HUAWANG TECHNOLOGY CO; LTD\r
+600000-6FFFFF     (base 16)            SHEN ZHEN HUAWANG TECHNOLOGY CO; LTD\r
+                               Longhua New District Qing Xiang Road, Bao Neng Technology Park\r
+                               SHEN ZHEN  GUANG DONG  518109\r
+                               CN\r
+\r
+44-03-77   (hex)               Atari, Inc.\r
+100000-1FFFFF     (base 16)            Atari, Inc.\r
+                               286 Madison Ave, 8th floor\r
+                               New York  NY  10017\r
+                               US\r
+\r
+44-03-77   (hex)               Lenovo Image(Tianjin) Technology Ltd.\r
+400000-4FFFFF     (base 16)            Lenovo Image(Tianjin) Technology Ltd.\r
+                               Tianjin Free Trade Test Zone (Airport Economic Zone) Room 310, No. 1, Second Avenue, Airport International Logistics Zone\r
+                               Tianjin  Tianjin  300000\r
+                               CN\r
+\r
+4C-4B-F9   (hex)               Shenzhen dingsheng technology co., LTD\r
+400000-4FFFFF     (base 16)            Shenzhen dingsheng technology co., LTD\r
+                               Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+4C-4B-F9   (hex)               Connected IO\r
+C00000-CFFFFF     (base 16)            Connected IO\r
+                               8304 Esters Boulevard, Suite 850\r
                                 Irving  TX  75063\r
                                 US\r
  \r
@@ -3377,12 +3431,6 @@ C00000-CFFFFF     (base 16)              Shenzhen Xtooltech Co., Ltd
                                 Berlin    10117\r
                                 DE\r
  \r
-98-06-37   (hex)               HwaCom Systems Inc.\r
-C00000-CFFFFF     (base 16)            HwaCom Systems Inc.\r
-                               11Fl., No.108, Sec. 1, Hsin-Tai-Wu Rd., Hsi-Chih District\r
-                               New Taipei  New Taipei  221\r
-                               TW\r
-\r
  54-9A-11   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
@@ -3392,6 +3440,18 @@ A00000-AFFFFF     (base 16)              Unitronux(Shenzhen) Intelligence Technology Co.,Ltd
                                 Shenzhen  Guangdong  518108\r
                                 CN\r
  \r
+98-06-37   (hex)               SAMWONTECH\r
+700000-7FFFFF     (base 16)            SAMWONTECH\r
+                               YAKDAE-DONG, BUCHEON TECHNO-PARK\r
+                               BUCHEON-CITY  KYUNGGI-DO  14502\r
+                               KR\r
+\r
+98-06-37   (hex)               HwaCom Systems Inc.\r
+C00000-CFFFFF     (base 16)            HwaCom Systems Inc.\r
+                               11Fl., No.108, Sec. 1, Hsin-Tai-Wu Rd., Hsi-Chih District\r
+                               New Taipei  New Taipei  221\r
+                               TW\r
+\r
  98-06-37   (hex)               Petersime\r
  B00000-BFFFFF     (base 16)            Petersime\r
                                 Centrumstraat 125\r
@@ -3404,12 +3464,6 @@ D00000-DFFFFF     (base 16)              VR Technology(Shenzhen) Limited
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-98-06-37   (hex)               SAMWONTECH\r
-700000-7FFFFF     (base 16)            SAMWONTECH\r
-                               YAKDAE-DONG, BUCHEON TECHNO-PARK\r
-                               BUCHEON-CITY  KYUNGGI-DO  14502\r
-                               KR\r
-\r
  98-06-37   (hex)               Hangzhou Sanxin Network Technology Co.,Ltd\r
  300000-3FFFFF     (base 16)            Hangzhou Sanxin Network Technology Co.,Ltd\r
                                 No. 195, Wen Er Road, Xihu District, Xinyuan 11-18F\r
@@ -3491,6 +3545,12 @@ B00000-BFFFFF     (base 16)              North American Blue Tiger Company, LLC
                                 Petach Tikva  Israel  4951251\r
                                 IL\r
  \r
+2C-16-BD   (hex)               Sunit Oy\r
+400000-4FFFFF     (base 16)            Sunit Oy\r
+                               Taitoraitti 1\r
+                               Kajaani    87400\r
+                               FI\r
+\r
  FC-A4-7A   (hex)               Broadcom Inc.\r
  000000-0FFFFF     (base 16)            Broadcom Inc.\r
                                 Wernerwerkstr. 2\r
@@ -3509,11 +3569,11 @@ FC-A4-7A   (hex)                Token
                                 Henrietta  NY  14586\r
                                 US\r
  \r
-2C-16-BD   (hex)               Sunit Oy\r
-400000-4FFFFF     (base 16)            Sunit Oy\r
-                               Taitoraitti 1\r
-                               Kajaani    87400\r
-                               FI\r
+8C-59-3C   (hex)               Shenzhen Tian-Power Technology Co.,Ltd.\r
+E00000-EFFFFF     (base 16)            Shenzhen Tian-Power Technology Co.,Ltd.\r
+                               Guangming New District Gongming Office Yulu Community No. 6 Industrial Zone Building 26\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
  \r
  8C-59-3C   (hex)               Scharfe-Sicht GmbH\r
  B00000-BFFFFF     (base 16)            Scharfe-Sicht GmbH\r
@@ -3527,11 +3587,11 @@ A00000-AFFFFF     (base 16)             ecom instruments GmbH
                                 Assamstadt  Baden-Württemberg  97959\r
                                 DE\r
  \r
-8C-59-3C   (hex)               Shenzhen Tian-Power Technology Co.,Ltd.\r
-E00000-EFFFFF     (base 16)            Shenzhen Tian-Power Technology Co.,Ltd.\r
-                               Guangming New District Gongming Office Yulu Community No. 6 Industrial Zone Building 26\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+B4-A2-EB   (hex)               Kona I\r
+700000-7FFFFF     (base 16)            Kona I\r
+                               4F EXCON Venture-Tower, 3, Eunhaeng-ro, Youngdeungpo-gu,\r
+                               Seoul    07237\r
+                               KR\r
  \r
  B4-A2-EB   (hex)               QKM Technology(Dongguan)Co.,Ltd\r
  000000-0FFFFF     (base 16)            QKM Technology(Dongguan)Co.,Ltd\r
@@ -3539,32 +3599,26 @@ B4-A2-EB   (hex)                QKM Technology(Dongguan)Co.,Ltd
                                 Dongguan  Guangdong  523808\r
                                 CN\r
  \r
-B4-A2-EB   (hex)               Kona I\r
-700000-7FFFFF     (base 16)            Kona I\r
-                               4F EXCON Venture-Tower, 3, Eunhaeng-ro, Youngdeungpo-gu,\r
-                               Seoul    07237\r
-                               KR\r
+D0-C8-57   (hex)               IFLYTEK CO.,LTD.\r
+D00000-DFFFFF     (base 16)            IFLYTEK CO.,LTD.\r
+                               National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,\r
+                               Heifei  An hui  230088\r
+                               CN\r
  \r
  2C-D1-41   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
-D0-C8-57   (hex)               Eco Mobile \r
-700000-7FFFFF     (base 16)            Eco Mobile \r
-                               Samoborska cesta 330\r
-                               Zagreb  Zagreb  10090\r
-                               HR\r
-\r
  D0-C8-57   (hex)               Mobicon\r
  300000-3FFFFF     (base 16)            Mobicon\r
                                 #406, 97, Jungbu-daero 448beon-gil, Yeongtong-gu\r
                                 Suwon-si  Gyeonggi-do  16521\r
                                 KR\r
  \r
-D0-C8-57   (hex)               IFLYTEK CO.,LTD.\r
-D00000-DFFFFF     (base 16)            IFLYTEK CO.,LTD.\r
-                               National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,\r
-                               Heifei  An hui  230088\r
-                               CN\r
+D0-C8-57   (hex)               Eco Mobile \r
+700000-7FFFFF     (base 16)            Eco Mobile \r
+                               Samoborska cesta 330\r
+                               Zagreb  Zagreb  10090\r
+                               HR\r
  \r
  60-95-CE   (hex)               Synamedia\r
  C00000-CFFFFF     (base 16)            Synamedia\r
@@ -3572,6 +3626,12 @@ C00000-CFFFFF     (base 16)              Synamedia
                                 Kortrijk  West-Vlaanderen  8500\r
                                 BE\r
  \r
+60-95-CE   (hex)               Untangle, Inc.\r
+400000-4FFFFF     (base 16)            Untangle, Inc.\r
+                               100 W. San Fernando St., Ste. 565\r
+                               San Jose  CA  95113\r
+                               US\r
+\r
  1C-82-59   (hex)               ESTec Corporation\r
  A00000-AFFFFF     (base 16)            ESTec Corporation\r
                                 22, Yusangongdan 9-gil\r
@@ -3584,57 +3644,51 @@ A00000-AFFFFF     (base 16)             ESTec Corporation
                                 London    EC3M 3BY\r
                                 GB\r
  \r
-60-95-CE   (hex)               Untangle, Inc.\r
-400000-4FFFFF     (base 16)            Untangle, Inc.\r
-                               100 W. San Fernando St., Ste. 565\r
-                               San Jose  CA  95113\r
+C8-2C-2B   (hex)               Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
+E00000-EFFFFF     (base 16)            Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
+                               Hellinger Str. 1\r
+                               Königsberg/Bayern    97486\r
+                               DE\r
+\r
+C8-2C-2B   (hex)               Repp Health\r
+200000-2FFFFF     (base 16)            Repp Health\r
+                               1919 14th Street , Suite 700\r
+                               Boulder  CO  80302\r
+                               US\r
+\r
+C8-2C-2B   (hex)               Smart Wires Inc\r
+C00000-CFFFFF     (base 16)            Smart Wires Inc\r
+                               3292 Whipple Road\r
+                               Union City   CA  94587\r
                                 US\r
  \r
  F0-23-B9   (hex)               Private\r
  D00000-DFFFFF     (base 16)            Private\r
  \r
-B0-FD-0B   (hex)               IDspire Corporation Ltd.\r
-100000-1FFFFF     (base 16)            IDspire Corporation Ltd.\r
-                               9F, No. 266, Sec. 1, Wenhua Rd., Banqiao Dist.\r
-                               New Taipei City    22041\r
-                               TW\r
-\r
  84-8B-CD   (hex)               SouXin Corporate\r
  000000-0FFFFF     (base 16)            SouXin Corporate\r
                                 33 Jingyou Road\r
                                 Nanjing  Jiangsu  211100\r
                                 CN\r
  \r
+B0-FD-0B   (hex)               IDspire Corporation Ltd.\r
+100000-1FFFFF     (base 16)            IDspire Corporation Ltd.\r
+                               9F, No. 266, Sec. 1, Wenhua Rd., Banqiao Dist.\r
+                               New Taipei City    22041\r
+                               TW\r
+\r
  B0-FD-0B   (hex)               Shenzhen FEIBIT Electronic Technology Co.,LTD\r
  E00000-EFFFFF     (base 16)            Shenzhen FEIBIT Electronic Technology Co.,LTD\r
                                 5th floor,Bld. A1, Lilang Software Park\r
                                 Shenzhen    518112\r
                                 CN\r
  \r
-C8-2C-2B   (hex)               Smart Wires Inc\r
-C00000-CFFFFF     (base 16)            Smart Wires Inc\r
-                               3292 Whipple Road\r
-                               Union City   CA  94587\r
-                               US\r
-\r
  C8-2C-2B   (hex)               Verifone Systems (China),lnc.\r
  800000-8FFFFF     (base 16)            Verifone Systems (China),lnc.\r
                                 2nd Floor,No.39,Region C, Tongpan Road,Gulou District\r
                                 fuzhou  fujian  350004\r
                                 CN\r
  \r
-C8-2C-2B   (hex)               Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
-E00000-EFFFFF     (base 16)            Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
-                               Hellinger Str. 1\r
-                               Königsberg/Bayern    97486\r
-                               DE\r
-\r
-C8-2C-2B   (hex)               Repp Health\r
-200000-2FFFFF     (base 16)            Repp Health\r
-                               1919 14th Street , Suite 700\r
-                               Boulder  CO  80302\r
-                               US\r
-\r
  E4-1E-0A   (hex)               FireAngel Safety Technology Ltd\r
  A00000-AFFFFF     (base 16)            FireAngel Safety Technology Ltd\r
                                 Sir William Lyons Road, Vanguard Centre\r
@@ -3653,18 +3707,24 @@ E00000-EFFFFF     (base 16)             Taylor Dynamometer
                                 Milwaukee  WI  53208\r
                                 US\r
  \r
-C8-63-14   (hex)               Western Reserve Controls, Inc.\r
-000000-0FFFFF     (base 16)            Western Reserve Controls, Inc.\r
-                               1485 Exeter Dr.\r
-                               Akron  OH  44306\r
-                               US\r
-\r
  C8-63-14   (hex)               Freeus LLC\r
  C00000-CFFFFF     (base 16)            Freeus LLC\r
                                 640 W 1100 S\r
                                 Ogden  UT  84404\r
                                 US\r
  \r
+34-E1-D1   (hex)               Apart Audio NV\r
+900000-9FFFFF     (base 16)            Apart Audio NV\r
+                               Industriepark Brechtsebaan 8 bus 1\r
+                               Schoten    2900\r
+                               BE\r
+\r
+C8-63-14   (hex)               Western Reserve Controls, Inc.\r
+000000-0FFFFF     (base 16)            Western Reserve Controls, Inc.\r
+                               1485 Exeter Dr.\r
+                               Akron  OH  44306\r
+                               US\r
+\r
  34-E1-D1   (hex)               Genius Pros\r
  700000-7FFFFF     (base 16)            Genius Pros\r
                                 Floor 13,  Building B, NO. 859 West Shixiang Road, Xihu District, Hangzhou City\r
@@ -3701,24 +3761,18 @@ C00000-CFFFFF     (base 16)             Silicon (Shenzhen) Electronic Technology Co.,Ltd.
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-FC-D2-B6   (hex)               Univer S.p.A.\r
-E00000-EFFFFF     (base 16)            Univer S.p.A.\r
-                               Via Eraclito 31\r
-                               Milan    20128\r
-                               IT\r
-\r
-34-E1-D1   (hex)               Apart Audio NV\r
-900000-9FFFFF     (base 16)            Apart Audio NV\r
-                               Industriepark Brechtsebaan 8 bus 1\r
-                               Schoten    2900\r
-                               BE\r
-\r
  FC-D2-B6   (hex)               NREAL TECHNOLOGY LIMITED\r
  A00000-AFFFFF     (base 16)            NREAL TECHNOLOGY LIMITED\r
                                 RM 1901，19/F LEE GARDEN ONE 33 HYSAN AVENUE CAUSEWAY BAY\r
                                 HONG KONG    999077\r
                                 HK\r
  \r
+FC-D2-B6   (hex)               Univer S.p.A.\r
+E00000-EFFFFF     (base 16)            Univer S.p.A.\r
+                               Via Eraclito 31\r
+                               Milan    20128\r
+                               IT\r
+\r
  74-5B-C5   (hex)               Haikou Frun Flash&Mcu Microcontrol Technology Development Co.,Ltd\r
  900000-9FFFFF     (base 16)            Haikou Frun Flash&Mcu Microcontrol Technology Development Co.,Ltd\r
                                 5 floor A1-9, A building, incubation center, Haikou national hi tech Development Zone\r
@@ -3755,11 +3809,8 @@ E4-4C-C7   (hex)         CE LABS, LLC
                                 GARLAND  TX  75041\r
                                 US\r
  \r
-E0-5A-9F   (hex)               Shenzhen Rongan Networks Technology Co.,Ltd\r
-B00000-BFFFFF     (base 16)            Shenzhen Rongan Networks Technology Co.,Ltd\r
-                               Room 1903, Industrial and Research building of Sun Yat-Sen university,no.1, Yuexing 4th road, Yuehai street,Nanshan district\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
+34-04-9E   (hex)               Private\r
+900000-9FFFFF     (base 16)            Private\r
  \r
  E0-5A-9F   (hex)               Link of Things Co., Ltd.\r
  300000-3FFFFF     (base 16)            Link of Things Co., Ltd.\r
@@ -3767,14 +3818,11 @@ E0-5A-9F   (hex)                Link of Things Co., Ltd.
                                 Taipei    115\r
                                 TW\r
  \r
-4C-BC-98   (hex)               Quake Global Inc\r
-200000-2FFFFF     (base 16)            Quake Global Inc\r
-                               4711 VIEWRIDGE AVE., STE 150\r
-                               SAN DIEGO  CA  92123\r
-                               US\r
-\r
-34-04-9E   (hex)               Private\r
-900000-9FFFFF     (base 16)            Private\r
+E0-5A-9F   (hex)               Shenzhen Rongan Networks Technology Co.,Ltd\r
+B00000-BFFFFF     (base 16)            Shenzhen Rongan Networks Technology Co.,Ltd\r
+                               Room 1903, Industrial and Research building of Sun Yat-Sen university,no.1, Yuexing 4th road, Yuehai street,Nanshan district\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
  \r
  38-B8-EB   (hex)               Private\r
  700000-7FFFFF     (base 16)            Private\r
@@ -3785,6 +3833,18 @@ B00000-BFFFFF     (base 16)              Dongguan SmartAction Technology Co.,Ltd
                                 Dongguan  Guangdong  523000\r
                                 CN\r
  \r
+E0-5A-9F   (hex)               Hale Products\r
+400000-4FFFFF     (base 16)            Hale Products\r
+                               607 NW 27th Ave\r
+                               Ocala  FL  34475\r
+                               US\r
+\r
+4C-BC-98   (hex)               Quake Global Inc\r
+200000-2FFFFF     (base 16)            Quake Global Inc\r
+                               4711 VIEWRIDGE AVE., STE 150\r
+                               SAN DIEGO  CA  92123\r
+                               US\r
+\r
  4C-BC-98   (hex)               Gronic Systems GmbH\r
  500000-5FFFFF     (base 16)            Gronic Systems GmbH\r
                                 Hilpertswiese 7\r
@@ -3803,24 +3863,12 @@ B00000-BFFFFF     (base 16)             Dongguan SmartAction Technology Co.,Ltd
                                 Jakarta  Jakarta  10730\r
                                 ID\r
  \r
-D8-86-0B   (hex)               Teplovodokhran Ltd.\r
-400000-4FFFFF     (base 16)            Teplovodokhran Ltd.\r
-                               Novaya , 51v\r
-                               Ryazan    390027\r
-                               RU\r
-\r
  D8-86-0B   (hex)               DIGITAL CONCEPTS\r
  900000-9FFFFF     (base 16)            DIGITAL CONCEPTS\r
                                 3108 RIVERPORT TECH CENTER DR\r
                                 MARYLAND HEIGHTS  MO  630434825\r
                                 US\r
  \r
-E0-5A-9F   (hex)               Hale Products\r
-400000-4FFFFF     (base 16)            Hale Products\r
-                               607 NW 27th Ave\r
-                               Ocala  FL  34475\r
-                               US\r
-\r
  D8-86-0B   (hex)               GLO Science\r
  A00000-AFFFFF     (base 16)            GLO Science\r
                                 10 West 37th Street, 1001\r
@@ -3833,11 +3881,11 @@ D8-86-0B   (hex)                SCANMATIK
                                 Mytischi  Moscow  141008\r
                                 RU\r
  \r
-38-B1-9E   (hex)               Dallas Delta Corporation\r
-D00000-DFFFFF     (base 16)            Dallas Delta Corporation\r
-                               102 Albert Street\r
-                               Brunswick East  Victoria  3057\r
-                               AU\r
+D8-86-0B   (hex)               Teplovodokhran Ltd.\r
+400000-4FFFFF     (base 16)            Teplovodokhran Ltd.\r
+                               Novaya , 51v\r
+                               Ryazan    390027\r
+                               RU\r
  \r
  38-B1-9E   (hex)               AVO DEVELOPMENT LTD\r
  300000-3FFFFF     (base 16)            AVO DEVELOPMENT LTD\r
@@ -3845,11 +3893,17 @@ D00000-DFFFFF     (base 16)             Dallas Delta Corporation
                                 Romford  Essex  RM3 0NR\r
                                 GB\r
  \r
-84-39-BE   (hex)               HINO ENGINEERING, INC\r
-000000-0FFFFF     (base 16)            HINO ENGINEERING, INC\r
-                               60-7 Takakuramachi\r
-                               Hachiouji  Tokyo  192-0033\r
-                               JP\r
+38-B1-9E   (hex)               Dallas Delta Corporation\r
+D00000-DFFFFF     (base 16)            Dallas Delta Corporation\r
+                               102 Albert Street\r
+                               Brunswick East  Victoria  3057\r
+                               AU\r
+\r
+84-39-BE   (hex)               HINO ENGINEERING, INC\r
+000000-0FFFFF     (base 16)            HINO ENGINEERING, INC\r
+                               60-7 Takakuramachi\r
+                               Hachiouji  Tokyo  192-0033\r
+                               JP\r
  \r
  CC-D3-9D   (hex)               Glenair\r
  700000-7FFFFF     (base 16)            Glenair\r
@@ -3857,6 +3911,30 @@ CC-D3-9D   (hex)         Glenair
                                 Glendale  CA  91201\r
                                 US\r
  \r
+D4-25-CC   (hex)               NORDI TELEKOMMUNIKATSIOONI OÜ\r
+000000-0FFFFF     (base 16)            NORDI TELEKOMMUNIKATSIOONI OÜ\r
+                               Valukoja 8\r
+                               Tallinn city  Estonian Republic  11415\r
+                               EE\r
+\r
+D4-25-CC   (hex)               Eware Information Technology com.,Ltd\r
+100000-1FFFFF     (base 16)            Eware Information Technology com.,Ltd\r
+                               No.402,Building 5,Software Park,Keji Mid 3nd Road,Nanshan District\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+CC-D3-9D   (hex)               MagTarget LLC\r
+300000-3FFFFF     (base 16)            MagTarget LLC\r
+                               1300 Reamwood Ave Sunnyvale CA\r
+                               SUNNYVALE  CA  94089\r
+                               US\r
+\r
+D4-25-CC   (hex)               Coperion\r
+E00000-EFFFFF     (base 16)            Coperion\r
+                               590 WOODBURY GLASSBORO RD.\r
+                               SEWELL  NJ  08080\r
+                               US\r
+\r
  D4-25-CC   (hex)               EISST Ltd\r
  300000-3FFFFF     (base 16)            EISST Ltd\r
                                 10 Queen Street Place\r
@@ -3869,53 +3947,41 @@ A00000-AFFFFF     (base 16)             E-MetroTel
                                 Plano  TX  75075\r
                                 US\r
  \r
-D4-25-CC   (hex)               Coperion\r
-E00000-EFFFFF     (base 16)            Coperion\r
-                               590 WOODBURY GLASSBORO RD.\r
-                               SEWELL  NJ  08080\r
-                               US\r
+9C-69-B4   (hex)               PCI Limited\r
+700000-7FFFFF     (base 16)            PCI Limited\r
+                               35, Pioneer Road North\r
+                               Singapore    628475\r
+                               SG\r
  \r
-D4-25-CC   (hex)               NORDI TELEKOMMUNIKATSIOONI OÜ\r
-000000-0FFFFF     (base 16)            NORDI TELEKOMMUNIKATSIOONI OÜ\r
-                               Valukoja 8\r
-                               Tallinn city  Estonian Republic  11415\r
-                               EE\r
+9C-69-B4   (hex)               Skydock do Brasil Ltda\r
+800000-8FFFFF     (base 16)            Skydock do Brasil Ltda\r
+                               Rua Gralha Azul, 147\r
+                               Quatro Barras  PR  83420-000\r
+                               BR\r
  \r
-CC-D3-9D   (hex)               MagTarget LLC\r
-300000-3FFFFF     (base 16)            MagTarget LLC\r
-                               1300 Reamwood Ave Sunnyvale CA\r
-                               SUNNYVALE  CA  94089\r
+4C-91-7A   (hex)               LumiGrow Inc.\r
+400000-4FFFFF     (base 16)            LumiGrow Inc.\r
+                               1480 64th Street, Suite #150\r
+                               Emeryville  CA  94608\r
                                 US\r
  \r
-D4-25-CC   (hex)               Eware Information Technology com.,Ltd\r
-100000-1FFFFF     (base 16)            Eware Information Technology com.,Ltd\r
-                               No.402,Building 5,Software Park,Keji Mid 3nd Road,Nanshan District\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
  9C-69-B4   (hex)               Teptron AB\r
  900000-9FFFFF     (base 16)            Teptron AB\r
                                 Box 1009\r
                                 Varberg  Halland  43213\r
                                 SE\r
  \r
-4C-91-7A   (hex)               LumiGrow Inc.\r
-400000-4FFFFF     (base 16)            LumiGrow Inc.\r
-                               1480 64th Street, Suite #150\r
-                               Emeryville  CA  94608\r
-                               US\r
-\r
-9C-69-B4   (hex)               Skydock do Brasil Ltda\r
-800000-8FFFFF     (base 16)            Skydock do Brasil Ltda\r
-                               Rua Gralha Azul, 147\r
-                               Quatro Barras  PR  83420-000\r
-                               BR\r
+4C-91-7A   (hex)               Hangzhou Hangtu Technology Co.,Ltd.\r
+900000-9FFFFF     (base 16)            Hangzhou Hangtu Technology Co.,Ltd.\r
+                               Room A301, no.11, xiyuan eighth road, xihu district\r
+                               Hangzhou  Zhejiang  310000\r
+                               CN\r
  \r
-9C-69-B4   (hex)               PCI Limited\r
-700000-7FFFFF     (base 16)            PCI Limited\r
-                               35, Pioneer Road North\r
-                               Singapore    628475\r
-                               SG\r
+4C-91-7A   (hex)               Camsat Przemysław Gralak\r
+800000-8FFFFF     (base 16)            Camsat Przemysław Gralak\r
+                               Ogrodowa 2A\r
+                               Solec Kujawski  Bydgoszcz  86-050\r
+                               PL\r
  \r
  6C-DF-FB   (hex)               AAON\r
  600000-6FFFFF     (base 16)            AAON\r
@@ -3929,18 +3995,6 @@ B00000-BFFFFF     (base 16)              CELL System Co.,Ltd.
                                 Yokohama  Kanagawa  225-0012\r
                                 JP\r
  \r
-4C-91-7A   (hex)               Camsat Przemysław Gralak\r
-800000-8FFFFF     (base 16)            Camsat Przemysław Gralak\r
-                               Ogrodowa 2A\r
-                               Solec Kujawski  Bydgoszcz  86-050\r
-                               PL\r
-\r
-4C-91-7A   (hex)               Hangzhou Hangtu Technology Co.,Ltd.\r
-900000-9FFFFF     (base 16)            Hangzhou Hangtu Technology Co.,Ltd.\r
-                               Room A301, no.11, xiyuan eighth road, xihu district\r
-                               Hangzhou  Zhejiang  310000\r
-                               CN\r
-\r
  6C-DF-FB   (hex)               YongTechs Electric Co. Ltd\r
  900000-9FFFFF     (base 16)            YongTechs Electric Co. Ltd\r
                                 18F-8, No.118, Ci-Yun Rd., Hsin Chu 30072, Taiwan(R.O.C.)\r
@@ -3953,6 +4007,12 @@ B00000-BFFFFF     (base 16)              CELL System Co.,Ltd.
                                 Tallinn    11312\r
                                 EE\r
  \r
+98-F9-C7   (hex)               MSB Elektronik und Gerätebau GmbH\r
+A00000-AFFFFF     (base 16)            MSB Elektronik und Gerätebau GmbH\r
+                               Hofwiesenstr. 23\r
+                               Crailsheim    74564\r
+                               DE\r
+\r
  7C-BC-84   (hex)               Xuji Changnan Communication Equipment Co., Ltd.\r
  700000-7FFFFF     (base 16)            Xuji Changnan Communication Equipment Co., Ltd.\r
                                 No. 2725, Xu You Xi Road\r
@@ -3965,6 +4025,12 @@ A00000-AFFFFF     (base 16)              OPNT BV
                                 Amsterdam    1081 HV\r
                                 NL\r
  \r
+98-F9-C7   (hex)               ARIMA Communications Corp.\r
+700000-7FFFFF     (base 16)            ARIMA Communications Corp.\r
+                               6F.,No.866,Zhongzheng Rd.,Zhonghe Dist.,\r
+                               New Taipei City  Taiwan  23586\r
+                               TW\r
+\r
  7C-BC-84   (hex)               Xiamen Mage Information Technology Co.,Ltd.\r
  100000-1FFFFF     (base 16)            Xiamen Mage Information Technology Co.,Ltd.\r
                                 Room 302B, No.40 Guanri Road, Software Park II\r
@@ -3977,24 +4043,12 @@ A00000-AFFFFF     (base 16)             OPNT BV
                                 Montréal  Québec  H5A 1J6\r
                                 CA\r
  \r
-98-F9-C7   (hex)               ARIMA Communications Corp.\r
-700000-7FFFFF     (base 16)            ARIMA Communications Corp.\r
-                               6F.,No.866,Zhongzheng Rd.,Zhonghe Dist.,\r
-                               New Taipei City  Taiwan  23586\r
-                               TW\r
-\r
  0C-FE-5D   (hex)               Beijing WayClouds Technology Co., Ltd.\r
  300000-3FFFFF     (base 16)            Beijing WayClouds Technology Co., Ltd.\r
                                 RM501, 5F, DASCOM BD,NO.9 SHANGDI EAST RD, HAIDIAN DISTRICT,BEIJING,CHINA\r
                                 Beijing    100085\r
                                 CN\r
  \r
-98-F9-C7   (hex)               MSB Elektronik und Gerätebau GmbH\r
-A00000-AFFFFF     (base 16)            MSB Elektronik und Gerätebau GmbH\r
-                               Hofwiesenstr. 23\r
-                               Crailsheim    74564\r
-                               DE\r
-\r
  6C-5C-3D   (hex)               Reconova Technologies\r
  B00000-BFFFFF     (base 16)            Reconova Technologies\r
                                 B103,Shenzhen Institute of Nanjing University,Keyuan Road,Hi-Tech Park,Nanshan District\r
@@ -4013,8 +4067,11 @@ A00000-AFFFFF     (base 16)              krtkl inc.
                                 San Francisco  CA  94107\r
                                 US\r
  \r
-24-4E-7B   (hex)               Private\r
-D00000-DFFFFF     (base 16)            Private\r
+6C-5C-3D   (hex)               choyang powertech\r
+C00000-CFFFFF     (base 16)            choyang powertech\r
+                               11. Deoksan-ro 189beon-gil.\r
+                               ilsan seo-gu. Goyang-si  Gyeonggi-do  10205\r
+                               KR\r
  \r
  1C-FD-08   (hex)               A&B Technology\r
  600000-6FFFFF     (base 16)            A&B Technology\r
@@ -4022,24 +4079,12 @@ D00000-DFFFFF     (base 16)             Private
                                 Gwangju    61247\r
                                 KR\r
  \r
-6C-5C-3D   (hex)               choyang powertech\r
-C00000-CFFFFF     (base 16)            choyang powertech\r
-                               11. Deoksan-ro 189beon-gil.\r
-                               ilsan seo-gu. Goyang-si  Gyeonggi-do  10205\r
-                               KR\r
-\r
  6C-5C-3D   (hex)               SOUNDKING ELECTRONICS&SOUND CO., LTD.\r
  700000-7FFFFF     (base 16)            SOUNDKING ELECTRONICS&SOUND CO., LTD.\r
                                 No.818 Chengxin RoadYinzhou Investment Business Park\r
                                 Ningbo  Zhejiang  315105\r
                                 CN\r
  \r
-1C-FD-08   (hex)               Beijing Hengxin Rainbow Information Technology Co.,Ltd\r
-500000-5FFFFF     (base 16)            Beijing Hengxin Rainbow Information Technology Co.,Ltd\r
-                               11Floor,north district,newton business building,No.25 Landian factory south road，Haidian District\r
-                               Beijing  Beijing  100097\r
-                               CN\r
-\r
  A8-3F-A1   (hex)               Exel s.r.l. unipersonale\r
  B00000-BFFFFF     (base 16)            Exel s.r.l. unipersonale\r
                                 via di corticella 201\r
@@ -4052,6 +4097,12 @@ A8-3F-A1   (hex)         Guangzhou Tupu Internet Technology Co., Ltd.
                                 Guangzhou  Guangdong  510665\r
                                 CN\r
  \r
+A8-3F-A1   (hex)               Shenzhen BIO I/E Co.,Ltd\r
+D00000-DFFFFF     (base 16)            Shenzhen BIO I/E Co.,Ltd\r
+                               Huafan Industrial Park,Building #12, Henggang JianLong Village Industrial Zone, Longgang District\r
+                               Shenzhen  GuangDong province  518115\r
+                               CN\r
+\r
  3C-6A-2C   (hex)               Bosch Automotive Products (Suzhou) Co., Ltd.\r
  200000-2FFFFF     (base 16)            Bosch Automotive Products (Suzhou) Co., Ltd.\r
                                 No. 455 Xing Long Street\r
@@ -4064,10 +4115,10 @@ B00000-BFFFFF     (base 16)             Phytium Technology Co., Ltd.
                                 Binhai New District, Tianjin    300450\r
                                 CN\r
  \r
-3C-6A-2C   (hex)               Qingdao iGuan Technology Co., Ltd.\r
-500000-5FFFFF     (base 16)            Qingdao iGuan Technology Co., Ltd.\r
-                               Room416, Science and Technology Park, Ocean University of China, No.23 HongKongEast Road\r
-                               Qingdao  Shandong  266100\r
+1C-FD-08   (hex)               Beijing Hengxin Rainbow Information Technology Co.,Ltd\r
+500000-5FFFFF     (base 16)            Beijing Hengxin Rainbow Information Technology Co.,Ltd\r
+                               11Floor,north district,newton business building,No.25 Landian factory south road，Haidian District\r
+                               Beijing  Beijing  100097\r
                                 CN\r
  \r
  A8-3F-A1   (hex)               Zhejiang Wellsun Intelligent Technology Co.,Ltd.\r
@@ -4076,15 +4127,15 @@ A8-3F-A1   (hex)                Zhejiang Wellsun Intelligent Technology Co.,Ltd.
                                 Taizhou  Zhejiang  317200\r
                                 CN\r
  \r
-A8-3F-A1   (hex)               Shenzhen BIO I/E Co.,Ltd\r
-D00000-DFFFFF     (base 16)            Shenzhen BIO I/E Co.,Ltd\r
-                               Huafan Industrial Park,Building #12, Henggang JianLong Village Industrial Zone, Longgang District\r
-                               Shenzhen  GuangDong province  518115\r
-                               CN\r
-\r
  00-55-DA   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
+3C-6A-2C   (hex)               Qingdao iGuan Technology Co., Ltd.\r
+500000-5FFFFF     (base 16)            Qingdao iGuan Technology Co., Ltd.\r
+                               Room416, Science and Technology Park, Ocean University of China, No.23 HongKongEast Road\r
+                               Qingdao  Shandong  266100\r
+                               CN\r
+\r
  30-0A-60   (hex)               Newtons4th Ltd\r
  700000-7FFFFF     (base 16)            Newtons4th Ltd\r
                                 1 Bede Island Road\r
@@ -4133,41 +4184,35 @@ C00000-CFFFFF     (base 16)             SHINKAWA LTD.
                                 Shinjuku-ku  Tokyo  169-0074\r
                                 JP\r
  \r
-9C-F6-DD   (hex)               AVI Pty Ltd\r
-A00000-AFFFFF     (base 16)            AVI Pty Ltd\r
-                               9 Pitt Way\r
-                               Booragoon  Western Australia  6154\r
-                               AU\r
-\r
-30-09-F9   (hex)               Punkt Tronics AG\r
-400000-4FFFFF     (base 16)            Punkt Tronics AG\r
-                               Via Losanna 4\r
-                               Lugano    6900\r
-                               CH\r
-\r
  C0-83-59   (hex)               Beijing Cloud Fly Technology Development Co.Ltd\r
  600000-6FFFFF     (base 16)            Beijing Cloud Fly Technology Development Co.Ltd\r
                                 No. 1703, Zhong An Sheng Ye Building, No. 168  Bei Yuan Road, Chaoyang District, Beijing\r
                                 Beijing  Beijing  100101\r
                                 CN\r
  \r
+9C-F6-DD   (hex)               KXT Technology Co., Ltd.\r
+700000-7FFFFF     (base 16)            KXT Technology Co., Ltd.\r
+                               3F. No.42, Sec. 2, Chongsin Rd., Sanchong Dist.\r
+                               New Taipei City    241\r
+                               TW\r
+\r
  9C-F6-DD   (hex)               Capital Engineering & Research Incorporation Ltd.\r
  400000-4FFFFF     (base 16)            Capital Engineering & Research Incorporation Ltd.\r
                                 NO.7 JianAnJie, Beijing Economic-Technological Development Area\r
                                 Beijing    100176\r
                                 CN\r
  \r
-9C-F6-DD   (hex)               KXT Technology Co., Ltd.\r
-700000-7FFFFF     (base 16)            KXT Technology Co., Ltd.\r
-                               3F. No.42, Sec. 2, Chongsin Rd., Sanchong Dist.\r
-                               New Taipei City    241\r
-                               TW\r
+30-09-F9   (hex)               Punkt Tronics AG\r
+400000-4FFFFF     (base 16)            Punkt Tronics AG\r
+                               Via Losanna 4\r
+                               Lugano    6900\r
+                               CH\r
  \r
-C0-83-59   (hex)               Gardner Denver Thomas GmbH\r
-D00000-DFFFFF     (base 16)            Gardner Denver Thomas GmbH\r
-                               Livry-Gargan-Straße 10\r
-                               Fürstenfeldbruck  Bavaria  82256\r
-                               DE\r
+9C-F6-DD   (hex)               AVI Pty Ltd\r
+A00000-AFFFFF     (base 16)            AVI Pty Ltd\r
+                               9 Pitt Way\r
+                               Booragoon  Western Australia  6154\r
+                               AU\r
  \r
  04-C3-E6   (hex)               Amiosec Ltd\r
  D00000-DFFFFF     (base 16)            Amiosec Ltd\r
@@ -4181,12 +4226,30 @@ D00000-DFFFFF     (base 16)             Amiosec Ltd
                                 Los Altos  CA  94022\r
                                 US\r
  \r
+C0-83-59   (hex)               Gardner Denver Thomas GmbH\r
+D00000-DFFFFF     (base 16)            Gardner Denver Thomas GmbH\r
+                               Livry-Gargan-Straße 10\r
+                               Fürstenfeldbruck  Bavaria  82256\r
+                               DE\r
+\r
  04-C3-E6   (hex)               SLOC GmbH\r
  800000-8FFFFF     (base 16)            SLOC GmbH\r
                                 Nikolaiplatz 4\r
                                 Graz  Styria  8020\r
                                 AT\r
  \r
+3C-42-7E   (hex)               snap40 Ltd\r
+A00000-AFFFFF     (base 16)            snap40 Ltd\r
+                               24 Forth Street\r
+                               Edinburgh    EH1 3LH\r
+                               GB\r
+\r
+D4-7C-44   (hex)               Beijing Maystar Information Technology Co., Ltd.\r
+800000-8FFFFF     (base 16)            Beijing Maystar Information Technology Co., Ltd.\r
+                               Building B 5/F,Shangdi Keji Zonghe Building,No.22 Shangdi Information Road, Haidian District\r
+                               Beijing    100084\r
+                               CN\r
+\r
  B4-4B-D6   (hex)               SHENZHEN TITA INTERACTIVE TECHNOLOGY CO.,LTD\r
  100000-1FFFFF     (base 16)            SHENZHEN TITA INTERACTIVE TECHNOLOGY CO.,LTD\r
                                 Floor 23, Haowei Technology Mansion,Keji south eighth Road, Gaoxin Sci-Tech. Park(South Zone), \r
@@ -4205,16 +4268,16 @@ D00000-DFFFFF     (base 16)             ROBOX SMART MOTION (WUHU) CO.,LTD
                                 Wuhu  Anhui  241000\r
                                 CN\r
  \r
-3C-42-7E   (hex)               snap40 Ltd\r
-A00000-AFFFFF     (base 16)            snap40 Ltd\r
-                               24 Forth Street\r
-                               Edinburgh    EH1 3LH\r
-                               GB\r
+A0-19-B2   (hex)               MIS Industrie Systeme GmbH & Co. KG\r
+800000-8FFFFF     (base 16)            MIS Industrie Systeme GmbH & Co. KG\r
+                               Lohwiese 7\r
+                               Scheuring  Bavaria  86937\r
+                               DE\r
  \r
-D4-7C-44   (hex)               Beijing Maystar Information Technology Co., Ltd.\r
-800000-8FFFFF     (base 16)            Beijing Maystar Information Technology Co., Ltd.\r
-                               Building B 5/F,Shangdi Keji Zonghe Building,No.22 Shangdi Information Road, Haidian District\r
-                               Beijing    100084\r
+A0-19-B2   (hex)               Beijing Deephi Intelligent Technology Co., Ltd\r
+200000-2FFFFF     (base 16)            Beijing Deephi Intelligent Technology Co., Ltd\r
+                               7F Building D, Tsinghua Tongfang High-Tech PlazaRoom 1706, Building D-East, Tsinghua Tongfang High-Tech Plaza Haidian District, Beijing, 100083, China\r
+                               BEIJING  HAIDIAN  100083\r
                                 CN\r
  \r
  A0-19-B2   (hex)               Ahgora Sistemas SA\r
@@ -4235,18 +4298,6 @@ D4-7C-44   (hex)         ASDA ICT Co., Ltd.
                                 Chicago  IL  60607\r
                                 US\r
  \r
-A0-19-B2   (hex)               MIS Industrie Systeme GmbH & Co. KG\r
-800000-8FFFFF     (base 16)            MIS Industrie Systeme GmbH & Co. KG\r
-                               Lohwiese 7\r
-                               Scheuring  Bavaria  86937\r
-                               DE\r
-\r
-A0-19-B2   (hex)               Beijing Deephi Intelligent Technology Co., Ltd\r
-200000-2FFFFF     (base 16)            Beijing Deephi Intelligent Technology Co., Ltd\r
-                               7F Building D, Tsinghua Tongfang High-Tech PlazaRoom 1706, Building D-East, Tsinghua Tongfang High-Tech Plaza Haidian District, Beijing, 100083, China\r
-                               BEIJING  HAIDIAN  100083\r
-                               CN\r
-\r
  2C-48-35   (hex)               Progress Rail Services, Inspection and Information Systems\r
  000000-0FFFFF     (base 16)            Progress Rail Services, Inspection and Information Systems\r
                                 3801-1 South Selsa Road\r
@@ -4265,24 +4316,18 @@ A0-19-B2   (hex)                Beijing Deephi Intelligent Technology Co., Ltd
                                 RIYADH  CENTRAL  11623\r
                                 SA\r
  \r
+3C-24-F0   (hex)               COMATIS\r
+B00000-BFFFFF     (base 16)            COMATIS\r
+                               8 rue Carnot\r
+                               SAINT-CYR-L'ECOLE    78210\r
+                               FR\r
+\r
  8C-1C-DA   (hex)               Septentrio NV\r
  500000-5FFFFF     (base 16)            Septentrio NV\r
                                 Interleuvenlaan 15i\r
                                 Leuven    3001\r
                                 BE\r
  \r
-8C-1C-DA   (hex)               CEOS Pty Ltd\r
-000000-0FFFFF     (base 16)            CEOS Pty Ltd\r
-                               3/17 Burgundy Street,\r
-                               Heidelberg  VIC  3084\r
-                               AU\r
-\r
-3C-24-F0   (hex)               Sivat Technology Co.,Ltd.\r
-800000-8FFFFF     (base 16)            Sivat Technology Co.,Ltd.\r
-                               Room 1602, Starbuilding 2, west Complex of ChangYing TianJie ChaoYang District\r
-                               BeiJing  Beijing  100024\r
-                               CN\r
-\r
  8C-1C-DA   (hex)               Riegl Laser Measurement Systems GmbH\r
  D00000-DFFFFF     (base 16)            Riegl Laser Measurement Systems GmbH\r
                                 Riedenburgstraße 48\r
@@ -4295,23 +4340,29 @@ D00000-DFFFFF     (base 16)             Riegl Laser Measurement Systems GmbH
                                 Shin-Yokohama, Kohoku-ku, Yokohama, Kanagawa    222-0033\r
                                 JP\r
  \r
-0C-73-EB   (hex)               Tiinlab Acoustic Technology (Shenzhen) Co., Ltd.\r
-300000-3FFFFF     (base 16)            Tiinlab Acoustic Technology (Shenzhen) Co., Ltd.\r
-                               Tianliao Building F14 East Block (New Materials Industrial Park), Xueyuan Road, Nanshan District, \r
-                               Shenzhen  Guangdong  518055\r
+3C-24-F0   (hex)               Sivat Technology Co.,Ltd.\r
+800000-8FFFFF     (base 16)            Sivat Technology Co.,Ltd.\r
+                               Room 1602, Starbuilding 2, west Complex of ChangYing TianJie ChaoYang District\r
+                               BeiJing  Beijing  100024\r
                                 CN\r
  \r
-0C-73-EB   (hex)               D-Link （Shanghai）Limited Corp.\r
-D00000-DFFFFF     (base 16)            D-Link （Shanghai）Limited Corp.\r
-                               Registered Address: Part J1, Floor 1, Building 2, No.115, Fute West First Road, China(Shanghai) Pilot Free Trade Zone\r
-                               Shanghai    200000\r
-                               CN\r
+3C-24-F0   (hex)               Siemens AG - Siemens Deutschland Mobility\r
+900000-9FFFFF     (base 16)            Siemens AG - Siemens Deutschland Mobility\r
+                               Otto-Hahn-Ring 6\r
+                               Munich    81379\r
+                               DE\r
  \r
-0C-73-EB   (hex)               Dinkle Enterprise Co., Ltd.\r
-700000-7FFFFF     (base 16)            Dinkle Enterprise Co., Ltd.\r
-                               No.19, Wuquan 2nd Rd., Wugu Dist.\r
-                               New Taipei City    24890\r
-                               TW\r
+8C-1C-DA   (hex)               CEOS Pty Ltd\r
+000000-0FFFFF     (base 16)            CEOS Pty Ltd\r
+                               3/17 Burgundy Street,\r
+                               Heidelberg  VIC  3084\r
+                               AU\r
+\r
+3C-24-F0   (hex)               Inter Action Corporation\r
+600000-6FFFFF     (base 16)            Inter Action Corporation\r
+                               14F,Yokohama-Kanazawa High-Tech Center,1-1,\r
+                               Yokohama  Kanagawa  236-0004\r
+                               JP\r
  \r
  0C-73-EB   (hex)               Synaccess Networks\r
  B00000-BFFFFF     (base 16)            Synaccess Networks\r
@@ -4331,17 +4382,23 @@ A00000-AFFFFF     (base 16)             Pi Innovo LLC
                                 Plymouth  MI  48170\r
                                 US\r
  \r
-3C-24-F0   (hex)               Inter Action Corporation\r
-600000-6FFFFF     (base 16)            Inter Action Corporation\r
-                               14F,Yokohama-Kanazawa High-Tech Center,1-1,\r
-                               Yokohama  Kanagawa  236-0004\r
-                               JP\r
+0C-73-EB   (hex)               Tiinlab Acoustic Technology (Shenzhen) Co., Ltd.\r
+300000-3FFFFF     (base 16)            Tiinlab Acoustic Technology (Shenzhen) Co., Ltd.\r
+                               Tianliao Building F14 East Block (New Materials Industrial Park), Xueyuan Road, Nanshan District, \r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
  \r
-3C-24-F0   (hex)               Siemens AG - Siemens Deutschland Mobility\r
-900000-9FFFFF     (base 16)            Siemens AG - Siemens Deutschland Mobility\r
-                               Otto-Hahn-Ring 6\r
-                               Munich    81379\r
-                               DE\r
+0C-73-EB   (hex)               D-Link （Shanghai）Limited Corp.\r
+D00000-DFFFFF     (base 16)            D-Link （Shanghai）Limited Corp.\r
+                               Registered Address: Part J1, Floor 1, Building 2, No.115, Fute West First Road, China(Shanghai) Pilot Free Trade Zone\r
+                               Shanghai    200000\r
+                               CN\r
+\r
+0C-73-EB   (hex)               Dinkle Enterprise Co., Ltd.\r
+700000-7FFFFF     (base 16)            Dinkle Enterprise Co., Ltd.\r
+                               No.19, Wuquan 2nd Rd., Wugu Dist.\r
+                               New Taipei City    24890\r
+                               TW\r
  \r
  0C-73-EB   (hex)               Taiwan Pulse Motion Co., Ltd.\r
  E00000-EFFFFF     (base 16)            Taiwan Pulse Motion Co., Ltd.\r
@@ -4349,12 +4406,6 @@ E00000-EFFFFF     (base 16)              Taiwan Pulse Motion Co., Ltd.
                                 Taichung City    40768\r
                                 TW\r
  \r
-3C-24-F0   (hex)               COMATIS\r
-B00000-BFFFFF     (base 16)            COMATIS\r
-                               8 rue Carnot\r
-                               SAINT-CYR-L'ECOLE    78210\r
-                               FR\r
-\r
  48-65-EE   (hex)               SmartDisplayer Technology Co., Ltd.\r
  800000-8FFFFF     (base 16)            SmartDisplayer Technology Co., Ltd.\r
                                 No. 2-1, Gongjian Rd., Qidu Dist, Keelung City, 20647, Taiwan (R.O.C.)\r
@@ -4373,6 +4424,18 @@ B00000-BFFFFF     (base 16)              Popit Oy
                                 Espoo    02130\r
                                 FI\r
  \r
+88-5F-E8   (hex)               Sowee\r
+900000-9FFFFF     (base 16)            Sowee\r
+                               4 place des Vosges\r
+                               Courbevoie    92400\r
+                               FR\r
+\r
+40-A3-6B   (hex)               SKS-Kinkel Elektronik GmbH\r
+400000-4FFFFF     (base 16)            SKS-Kinkel Elektronik GmbH\r
+                               Im Industriegebiet 9\r
+                               Hof    56472\r
+                               DE\r
+\r
  88-5F-E8   (hex)               Sonnet Labs Inc.\r
  300000-3FFFFF     (base 16)            Sonnet Labs Inc.\r
                                 8 The Green Suite #6290\r
@@ -4385,11 +4448,17 @@ B00000-BFFFFF     (base 16)             Popit Oy
                                 Lynge    3540\r
                                 DK\r
  \r
-88-5F-E8   (hex)               Sowee\r
-900000-9FFFFF     (base 16)            Sowee\r
-                               4 place des Vosges\r
-                               Courbevoie    92400\r
-                               FR\r
+30-1F-9A   (hex)               MICOMSOFT CO.,LTD.\r
+300000-3FFFFF     (base 16)            MICOMSOFT CO.,LTD.\r
+                               6F,KEIHAN-YODOYABASHI BLDG., 3-2-25,KITAHAMA,CHUO-KU\r
+                               osaka    541-0041\r
+                               JP\r
+\r
+30-1F-9A   (hex)               HUNAN CHANGSHA HENGJIAN TECHNOLDGY DEVELPMENT CO.,LTD.\r
+A00000-AFFFFF     (base 16)            HUNAN CHANGSHA HENGJIAN TECHNOLDGY DEVELPMENT CO.,LTD.\r
+                               Jiayun Road 209\r
+                               Changsha  Hunan  410205\r
+                               CN\r
  \r
  88-5F-E8   (hex)               Red Technologies, LLC.\r
  700000-7FFFFF     (base 16)            Red Technologies, LLC.\r
@@ -4397,41 +4466,29 @@ B00000-BFFFFF     (base 16)             Popit Oy
                                 Irvine  CA  92618\r
                                 US\r
  \r
-F0-41-C8   (hex)               Shenzhen Medica Technology Development Co., Ltd.\r
-200000-2FFFFF     (base 16)            Shenzhen Medica Technology Development Co., Ltd.\r
-                               2F Building A, Tongfang Information Harbor, No.11, East Langshan Road, Nanshan District\r
-                               Shenzhen    518000\r
-                               CN\r
-\r
  F0-41-C8   (hex)                Shanghai Think-Force Electronic Technology Co. Ltd\r
  C00000-CFFFFF     (base 16)             Shanghai Think-Force Electronic Technology Co. Ltd\r
                                 North ZhongShan Road, No. 3000, Room 2608\r
                                 Shanghai    200000\r
                                 CN\r
  \r
+F0-41-C8   (hex)               Shenzhen Medica Technology Development Co., Ltd.\r
+200000-2FFFFF     (base 16)            Shenzhen Medica Technology Development Co., Ltd.\r
+                               2F Building A, Tongfang Information Harbor, No.11, East Langshan Road, Nanshan District\r
+                               Shenzhen    518000\r
+                               CN\r
+\r
  F0-41-C8   (hex)               Shenzhen Umind Technology Co., Ltd.\r
  E00000-EFFFFF     (base 16)            Shenzhen Umind Technology Co., Ltd.\r
                                 Add: D2-6A, TCL Science Park, 1001 ZhongshanYuan Road, Nanshan District\r
                                 Shenzhen  Guangdong  581055\r
                                 CN\r
  \r
-40-A3-6B   (hex)               SKS-Kinkel Elektronik GmbH\r
-400000-4FFFFF     (base 16)            SKS-Kinkel Elektronik GmbH\r
-                               Im Industriegebiet 9\r
-                               Hof    56472\r
-                               DE\r
-\r
-30-1F-9A   (hex)               MICOMSOFT CO.,LTD.\r
-300000-3FFFFF     (base 16)            MICOMSOFT CO.,LTD.\r
-                               6F,KEIHAN-YODOYABASHI BLDG., 3-2-25,KITAHAMA,CHUO-KU\r
-                               osaka    541-0041\r
-                               JP\r
-\r
-30-1F-9A   (hex)               HUNAN CHANGSHA HENGJIAN TECHNOLDGY DEVELPMENT CO.,LTD.\r
-A00000-AFFFFF     (base 16)            HUNAN CHANGSHA HENGJIAN TECHNOLDGY DEVELPMENT CO.,LTD.\r
-                               Jiayun Road 209\r
-                               Changsha  Hunan  410205\r
-                               CN\r
+A4-DA-22   (hex)               SolidPro Technology Corporation\r
+800000-8FFFFF     (base 16)            SolidPro Technology Corporation\r
+                               10F.-1, No.150, Jian 1st Rd.\r
+                               Zhonghe Dist.  New Taipei City  23511\r
+                               TW\r
  \r
  88-A9-A7   (hex)               Sieper Lüdenscheid GmbH & Co. KG\r
  600000-6FFFFF     (base 16)            Sieper Lüdenscheid GmbH & Co. KG\r
@@ -4439,11 +4496,11 @@ A00000-AFFFFF     (base 16)             HUNAN CHANGSHA HENGJIAN TECHNOLDGY DEVELPMENT CO.,L
                                 Lüdenscheid    58511\r
                                 DE\r
  \r
-A4-DA-22   (hex)               SolidPro Technology Corporation\r
-800000-8FFFFF     (base 16)            SolidPro Technology Corporation\r
-                               10F.-1, No.150, Jian 1st Rd.\r
-                               Zhonghe Dist.  New Taipei City  23511\r
-                               TW\r
+DC-E5-33   (hex)               ShenZhen C&D Electronics CO.Ltd.\r
+300000-3FFFFF     (base 16)            ShenZhen C&D Electronics CO.Ltd.\r
+                               9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park,  Longhua New District\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
  \r
  DC-E5-33   (hex)               SAN Engineering\r
  700000-7FFFFF     (base 16)            SAN Engineering\r
@@ -4451,11 +4508,11 @@ DC-E5-33   (hex)                SAN Engineering
                                 Seongnam-si Jungwon-gu  Gyunggi-do  13230\r
                                 KR\r
  \r
-DC-E5-33   (hex)               ShenZhen C&D Electronics CO.Ltd.\r
-300000-3FFFFF     (base 16)            ShenZhen C&D Electronics CO.Ltd.\r
-                               9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park,  Longhua New District\r
-                               ShenZhen  GuangDong  518000\r
-                               CN\r
+9C-43-1E   (hex)               Wireless Environment, LLC\r
+400000-4FFFFF     (base 16)            Wireless Environment, LLC\r
+                               600 Beta Drive Unit 100 Mayfield Village, OH 44143,US\r
+                               Mayfield Village  OH  44143\r
+                               US\r
  \r
  C4-FF-BC   (hex)               KAGA ELECTRONICS CO.,LTD.\r
  B00000-BFFFFF     (base 16)            KAGA ELECTRONICS CO.,LTD.\r
@@ -4463,12 +4520,6 @@ B00000-BFFFFF     (base 16)              KAGA ELECTRONICS CO.,LTD.
                                 Chiyoda-ku  TOKYO  101-8627\r
                                 JP\r
  \r
-9C-43-1E   (hex)               Wireless Environment, LLC\r
-400000-4FFFFF     (base 16)            Wireless Environment, LLC\r
-                               600 Beta Drive Unit 100 Mayfield Village, OH 44143,US\r
-                               Mayfield Village  OH  44143\r
-                               US\r
-\r
  9C-43-1E   (hex)               Symfun Telecom Ltd\r
  100000-1FFFFF     (base 16)            Symfun Telecom Ltd\r
                                 Floor 4 Building 11 Xi Qi Dian Jia Yuan\r
@@ -4490,12 +4541,24 @@ D00000-DFFFFF     (base 16)             Private
                                 shenzhen  Guangdong  518131\r
                                 CN\r
  \r
+40-48-FD   (hex)               Swarco Technology ApS\r
+600000-6FFFFF     (base 16)            Swarco Technology ApS\r
+                               C. F. Tietgens Boulevard 25\r
+                               Odense SØ  Danmark  5220\r
+                               DK\r
+\r
  F8-B5-68   (hex)               Whizpace Pte. Ltd.\r
  B00000-BFFFFF     (base 16)            Whizpace Pte. Ltd.\r
                                 77 Ayer Rajah Crescent, #02-30\r
                                 Singapore    139954\r
                                 SG\r
  \r
+40-48-FD   (hex)               Ecotap B.V.\r
+C00000-CFFFFF     (base 16)            Ecotap B.V.\r
+                               Industrieweg 4\r
+                               Boxtel    5281RW\r
+                               NL\r
+\r
  F8-B5-68   (hex)               Maven Wireless AB\r
  800000-8FFFFF     (base 16)            Maven Wireless AB\r
                                 Torshamnsgatan 35\r
@@ -4508,24 +4571,18 @@ F8-B5-68   (hex)                Maven Wireless AB
                                 San Francisco  null  94103\r
                                 US\r
  \r
-40-48-FD   (hex)               Ecotap B.V.\r
-C00000-CFFFFF     (base 16)            Ecotap B.V.\r
-                               Industrieweg 4\r
-                               Boxtel    5281RW\r
-                               NL\r
-\r
-40-48-FD   (hex)               Swarco Technology ApS\r
-600000-6FFFFF     (base 16)            Swarco Technology ApS\r
-                               C. F. Tietgens Boulevard 25\r
-                               Odense SØ  Danmark  5220\r
-                               DK\r
-\r
  40-48-FD   (hex)               MITHRAS Technology Co., LTD\r
  200000-2FFFFF     (base 16)            MITHRAS Technology Co., LTD\r
                                 4F.-3, No. 880, Zhongzheng Rd., Zhonghe Dist., \r
                                 New Taipei    23586\r
                                 TW\r
  \r
+38-73-EA   (hex)               ISTCONTROL\r
+500000-5FFFFF     (base 16)            ISTCONTROL\r
+                               #1203, 37 Maebongsan-ro, Mapo-gu\r
+                               Seoul    03909\r
+                               KR\r
+\r
  38-73-EA   (hex)               Light Blue Optics Ltd.\r
  400000-4FFFFF     (base 16)            Light Blue Optics Ltd.\r
                                 St John's Innovation Centre, Cowley Road\r
@@ -4538,12 +4595,6 @@ B00000-BFFFFF     (base 16)              CRRC QINGDAO SIFANG ROLLING STOCK RESEARCH INSTITUT
                                 Qingdao  Shandong  266000\r
                                 CN\r
  \r
-38-73-EA   (hex)               ISTCONTROL\r
-500000-5FFFFF     (base 16)            ISTCONTROL\r
-                               #1203, 37 Maebongsan-ro, Mapo-gu\r
-                               Seoul    03909\r
-                               KR\r
-\r
  EC-9F-0D   (hex)               flexlog GmbH\r
  A00000-AFFFFF     (base 16)            flexlog GmbH\r
                                 Zur Gießerei 4\r
@@ -4556,6 +4607,12 @@ A00000-AFFFFF     (base 16)              flexlog GmbH
                                 Kwai Chung    000000\r
                                 HK\r
  \r
+34-D0-B8   (hex)               NTX Embedded\r
+D00000-DFFFFF     (base 16)            NTX Embedded\r
+                               4275 Kellway Circle, Suite #106\r
+                               Addison  TX  75001\r
+                               US\r
+\r
  34-D0-B8   (hex)               Glory Mark Electronic Ltd. Taiwan Branch (B.V.I.)\r
  C00000-CFFFFF     (base 16)            Glory Mark Electronic Ltd. Taiwan Branch (B.V.I.)\r
                                 3F, No. 6, Lane 148, Li De St., Chungho Dist.\r
@@ -4568,6 +4625,12 @@ C00000-CFFFFF     (base 16)              Glory Mark Electronic Ltd. Taiwan Branch (B.V.I.)
                                 Kunshan  Jiangsu  215300\r
                                 CN\r
  \r
+74-1A-E0   (hex)               ITS Partner (O.B.S) S.L.\r
+E00000-EFFFFF     (base 16)            ITS Partner (O.B.S) S.L.\r
+                               Av. Corts Catalanes 9-11 \r
+                               Sant Cugat del Valles  Barcelona  08173\r
+                               ES\r
+\r
  AC-1D-DF   (hex)               Sichuan Odot Automation System Co.,Ltd.\r
  800000-8FFFFF     (base 16)            Sichuan Odot Automation System Co.,Ltd.\r
                                 No.6,Hongsheng Street\r
@@ -4580,12 +4643,6 @@ AC-1D-DF   (hex)         ConectaIP Tecnologia S.L.
                                 Barcelona    08014\r
                                 ES\r
  \r
-34-D0-B8   (hex)               NTX Embedded\r
-D00000-DFFFFF     (base 16)            NTX Embedded\r
-                               4275 Kellway Circle, Suite #106\r
-                               Addison  TX  75001\r
-                               US\r
-\r
  AC-1D-DF   (hex)               Solare Datensysteme GmbH\r
  900000-9FFFFF     (base 16)            Solare Datensysteme GmbH\r
                                 Fuhrmannstraße 9\r
@@ -4598,18 +4655,24 @@ B00000-BFFFFF     (base 16)             Tolomatic, Inc.
                                 Hamel  MN  55340\r
                                 US\r
  \r
-74-1A-E0   (hex)               ITS Partner (O.B.S) S.L.\r
-E00000-EFFFFF     (base 16)            ITS Partner (O.B.S) S.L.\r
-                               Av. Corts Catalanes 9-11 \r
-                               Sant Cugat del Valles  Barcelona  08173\r
-                               ES\r
-\r
  CC-22-37   (hex)               MANUFACTURAS Y TRANSFORMADOS AB, S.L.\r
  E00000-EFFFFF     (base 16)            MANUFACTURAS Y TRANSFORMADOS AB, S.L.\r
                                 SANT ANTONI DE BAIX, 110-112\r
                                 IGUALADA  BARCELONA  08700\r
                                 ES\r
  \r
+04-71-4B   (hex)               Shenzhen WayOS Technology Crop., Ltd.\r
+200000-2FFFFF     (base 16)            Shenzhen WayOS Technology Crop., Ltd.\r
+                               F18, Yousong Business Building, Longhua New Districe, Shenzhen, China\r
+                               Shenzhen  Guangdong  518109\r
+                               CN\r
+\r
+CC-22-37   (hex)               SHENZHEN HOOENERGY TECHNOLOGY CO.,LTD\r
+D00000-DFFFFF     (base 16)            SHENZHEN HOOENERGY TECHNOLOGY CO.,LTD\r
+                               NO.5C3-5,BLOCK CD,TIANZHANDASHA,FUTIAN DISTRICT\r
+                               SHENZHEN    518000\r
+                               CN\r
+\r
  74-1A-E0   (hex)               BÄR Bahnsicherung AG\r
  700000-7FFFFF     (base 16)            BÄR Bahnsicherung AG\r
                                 Luppmenstrasse 3\r
@@ -4622,24 +4685,6 @@ E00000-EFFFFF     (base 16)              MANUFACTURAS Y TRANSFORMADOS AB, S.L.
                                 Southampton  Hampshire  SO31 7GB\r
                                 GB\r
  \r
-04-71-4B   (hex)               Shenzhen WayOS Technology Crop., Ltd.\r
-200000-2FFFFF     (base 16)            Shenzhen WayOS Technology Crop., Ltd.\r
-                               F18, Yousong Business Building, Longhua New Districe, Shenzhen, China\r
-                               Shenzhen  Guangdong  518109\r
-                               CN\r
-\r
-CC-22-37   (hex)               Apeiron Data Systems\r
-200000-2FFFFF     (base 16)            Apeiron Data Systems\r
-                               81 Blue Ravine Road\r
-                               Folsom  CA  95630\r
-                               US\r
-\r
-2C-27-9E   (hex)               Amaryllo International Inc.\r
-E00000-EFFFFF     (base 16)            Amaryllo International Inc.\r
-                               4F, No. 159, Xianzheng 9th Rd.,\r
-                               ZUHUBEI CITY  HSINCHU COUNTY  302\r
-                               TW\r
-\r
  2C-27-9E   (hex)               octoScope, Inc.\r
  900000-9FFFFF     (base 16)            octoScope, Inc.\r
                                 305 Foster Street, #104\r
@@ -4652,12 +4697,24 @@ E00000-EFFFFF     (base 16)             Amaryllo International Inc.
                                 Reutlingen    72766\r
                                 DE\r
  \r
-CC-22-37   (hex)               SHENZHEN HOOENERGY TECHNOLOGY CO.,LTD\r
-D00000-DFFFFF     (base 16)            SHENZHEN HOOENERGY TECHNOLOGY CO.,LTD\r
-                               NO.5C3-5,BLOCK CD,TIANZHANDASHA,FUTIAN DISTRICT\r
-                               SHENZHEN    518000\r
+CC-22-37   (hex)               Apeiron Data Systems\r
+200000-2FFFFF     (base 16)            Apeiron Data Systems\r
+                               81 Blue Ravine Road\r
+                               Folsom  CA  95630\r
+                               US\r
+\r
+90-4E-91   (hex)               Wrtnode technology Inc.\r
+400000-4FFFFF     (base 16)            Wrtnode technology Inc.\r
+                               Dingsi Lu #18, Shahe, Changping Dist.\r
+                               Beijing    102209\r
                                 CN\r
  \r
+2C-27-9E   (hex)               Amaryllo International Inc.\r
+E00000-EFFFFF     (base 16)            Amaryllo International Inc.\r
+                               4F, No. 159, Xianzheng 9th Rd.,\r
+                               ZUHUBEI CITY  HSINCHU COUNTY  302\r
+                               TW\r
+\r
  2C-27-9E   (hex)               Shijiazhuang King Transportation Equipment Co.,Ltd\r
  400000-4FFFFF     (base 16)            Shijiazhuang King Transportation Equipment Co.,Ltd\r
                                 No.255 Changjiang Road\r
@@ -4670,24 +4727,6 @@ D00000-DFFFFF     (base 16)              SHENZHEN HOOENERGY TECHNOLOGY CO.,LTD
                                 shenzhen  guangdong  518102\r
                                 CN\r
  \r
-84-39-BE   (hex)               ShenZhen Fudeyu Technology co.,Ltd\r
-300000-3FFFFF     (base 16)            ShenZhen Fudeyu Technology co.,Ltd\r
-                               1st Floor, Building C, No.3 Jinyuan Road, Heao Strict, Henggang Street, Longgang Area, Shenzhen.\r
-                               Shenzhen  Guangdong province  518115\r
-                               CN\r
-\r
-18-9B-A5   (hex)               PHINETWORKS\r
-300000-3FFFFF     (base 16)            PHINETWORKS\r
-                               412, Woorim E-Biz Center 2, Digital ro 33 gil\r
-                               Seoul  Guro gu  08377\r
-                               KR\r
-\r
-34-29-8F   (hex)               Nanjing Sandemarine Electric Co.,Ltd\r
-800000-8FFFFF     (base 16)            Nanjing Sandemarine Electric Co.,Ltd\r
-                               Room 202, D Building, No.2 Dongda Road, Pukou District, Nanjing, Jiangsu Province, P.R.China\r
-                               Nanjing  Jiangsu  210032\r
-                               CN\r
-\r
  90-4E-91   (hex)               SKODA ELECTRIC a.s.\r
  D00000-DFFFFF     (base 16)            SKODA ELECTRIC a.s.\r
                                 Tylova 1/57\r
@@ -4700,30 +4739,36 @@ D00000-DFFFFF     (base 16)             SKODA ELECTRIC a.s.
                                 Bellingham  WA  98226\r
                                 US\r
  \r
-90-4E-91   (hex)               Wrtnode technology Inc.\r
-400000-4FFFFF     (base 16)            Wrtnode technology Inc.\r
-                               Dingsi Lu #18, Shahe, Changping Dist.\r
-                               Beijing    102209\r
+34-29-8F   (hex)               Nanjing Sandemarine Electric Co.,Ltd\r
+800000-8FFFFF     (base 16)            Nanjing Sandemarine Electric Co.,Ltd\r
+                               Room 202, D Building, No.2 Dongda Road, Pukou District, Nanjing, Jiangsu Province, P.R.China\r
+                               Nanjing  Jiangsu  210032\r
                                 CN\r
  \r
-34-29-8F   (hex)               Schnick-Schnack-Systems GmbH\r
-B00000-BFFFFF     (base 16)            Schnick-Schnack-Systems GmbH\r
-                               Mathias-Brüggen Str. 79\r
-                               Koeln    50829 \r
-                               DE\r
-\r
-34-29-8F   (hex)               Chengdu Meross Technology Co., Ltd.\r
-100000-1FFFFF     (base 16)            Chengdu Meross Technology Co., Ltd.\r
-                               No. 25, Yizhou Avenue, Gaoxin\r
-                               Chengdu  Sichuan  610000\r
+84-39-BE   (hex)               ShenZhen Fudeyu Technology co.,Ltd\r
+300000-3FFFFF     (base 16)            ShenZhen Fudeyu Technology co.,Ltd\r
+                               1st Floor, Building C, No.3 Jinyuan Road, Heao Strict, Henggang Street, Longgang Area, Shenzhen.\r
+                               Shenzhen  Guangdong province  518115\r
                                 CN\r
  \r
+18-9B-A5   (hex)               PHINETWORKS\r
+300000-3FFFFF     (base 16)            PHINETWORKS\r
+                               412, Woorim E-Biz Center 2, Digital ro 33 gil\r
+                               Seoul  Guro gu  08377\r
+                               KR\r
+\r
  34-29-8F   (hex)               Bellman & Symfon\r
  600000-6FFFFF     (base 16)            Bellman & Symfon\r
                                 Södra Långebergsgatan 30\r
                                 Västra Frölunda    42132\r
                                 SE\r
  \r
+34-29-8F   (hex)               Chengdu Meross Technology Co., Ltd.\r
+100000-1FFFFF     (base 16)            Chengdu Meross Technology Co., Ltd.\r
+                               No. 25, Yizhou Avenue, Gaoxin\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
+\r
  34-00-8A   (hex)               SHENZHEN WXL ELECTRONICS CO., LTD.\r
  E00000-EFFFFF     (base 16)            SHENZHEN WXL ELECTRONICS CO., LTD.\r
                                 Internet Industry Base,Baoyuan Road,Bao'an District\r
@@ -4736,6 +4781,12 @@ B00000-BFFFFF     (base 16)              Project Engineering srl
                                 Impruneta  FI  50023\r
                                 IT\r
  \r
+34-29-8F   (hex)               Schnick-Schnack-Systems GmbH\r
+B00000-BFFFFF     (base 16)            Schnick-Schnack-Systems GmbH\r
+                               Mathias-Brüggen Str. 79\r
+                               Koeln    50829 \r
+                               DE\r
+\r
  34-29-8F   (hex)               Virtual Trunk Pte Ltd\r
  A00000-AFFFFF     (base 16)            Virtual Trunk Pte Ltd\r
                                 12 Kallang Avenue \r
@@ -4760,12 +4811,6 @@ A00000-AFFFFF     (base 16)              Virtual Trunk Pte Ltd
                                 Shenzhen  Guangdong  518110\r
                                 CN\r
  \r
-78-D8-00   (hex)               Shenzhen Scodeno Technology Co,. Ltd.\r
-300000-3FFFFF     (base 16)            Shenzhen Scodeno Technology Co,. Ltd.\r
-                               New Longhua District，Guanlan rich Industrial Zone No. 22，Silicon Valley Power Digital Industrial Park A6 Building 2 floor\r
-                               Shenzhen  Guangdong  518110\r
-                               CN\r
-\r
  78-D8-00   (hex)               Shenzhen Chenzhuo Technology Co., Ltd.\r
  C00000-CFFFFF     (base 16)            Shenzhen Chenzhuo Technology Co., Ltd.\r
                                 301,3/F,Longtangge,1183 Liuxian Avenue,Nanshan\r
@@ -4778,6 +4823,12 @@ C00000-CFFFFF     (base 16)              Shenzhen Chenzhuo Technology Co., Ltd.
                                 Bicester  Oxon  Ox26 2UA\r
                                 GB\r
  \r
+78-D8-00   (hex)               Shenzhen Scodeno Technology Co,. Ltd.\r
+300000-3FFFFF     (base 16)            Shenzhen Scodeno Technology Co,. Ltd.\r
+                               New Longhua District，Guanlan rich Industrial Zone No. 22，Silicon Valley Power Digital Industrial Park A6 Building 2 floor\r
+                               Shenzhen  Guangdong  518110\r
+                               CN\r
+\r
  7C-BA-CC   (hex)               ALPHA TECHNOLOGIES, LLC\r
  E00000-EFFFFF     (base 16)            ALPHA TECHNOLOGIES, LLC\r
                                 3030 GILCHRIST ROAD\r
@@ -4814,23 +4865,29 @@ E00000-EFFFFF     (base 16)             High Infinity Germany
                                 Salo    24100\r
                                 FI\r
  \r
+F8-8A-3C   (hex)               ART SPA\r
+000000-0FFFFF     (base 16)            ART SPA\r
+                               VOC.PISCHIELLO, 20\r
+                               PASSIGNANO SUL TRASIMENO  PG  06065\r
+                               IT\r
+\r
  F8-8A-3C   (hex)               FARA AS\r
  B00000-BFFFFF     (base 16)            FARA AS\r
                                 Sjøgangen 4\r
                                 Trondheim    NO-7010\r
                                 NO\r
  \r
-F8-8A-3C   (hex)               ART SPA\r
-000000-0FFFFF     (base 16)            ART SPA\r
-                               VOC.PISCHIELLO, 20\r
-                               PASSIGNANO SUL TRASIMENO  PG  06065\r
-                               IT\r
+A0-C5-F2   (hex)               UnaliWear, Inc.\r
+D00000-DFFFFF     (base 16)            UnaliWear, Inc.\r
+                               3410 Cherry Lane\r
+                               Austin  TX  78703\r
+                               US\r
  \r
-8C-14-7D   (hex)               Nanjing bilian information Technology Co.,Ltd.\r
-400000-4FFFFF     (base 16)            Nanjing bilian information Technology Co.,Ltd.\r
-                               Room 407,Building 1,No.8.Huayuan Road,Xuanwu District,Nanjing\r
-                               Nanjing  Jiangsu   210000\r
-                               CN\r
+A0-C5-F2   (hex)               Impulse Networks Pte Ltd\r
+900000-9FFFFF     (base 16)            Impulse Networks Pte Ltd\r
+                               1 Raffles Place, #44-08 Raffles Place\r
+                               Singapore    048616\r
+                               SG\r
  \r
  8C-14-7D   (hex)               Bluemega Document & Print Services\r
  A00000-AFFFFF     (base 16)            Bluemega Document & Print Services\r
@@ -4838,6 +4895,18 @@ A00000-AFFFFF     (base 16)              Bluemega Document & Print Services
                                 Villejust  Essonne  91140\r
                                 FR\r
  \r
+50-FF-99   (hex)               IPC Global\r
+400000-4FFFFF     (base 16)            IPC Global\r
+                               4 Wadhurst Drive\r
+                               Boronia  Victoria  3155\r
+                               AU\r
+\r
+8C-14-7D   (hex)               Nanjing bilian information Technology Co.,Ltd.\r
+400000-4FFFFF     (base 16)            Nanjing bilian information Technology Co.,Ltd.\r
+                               Room 407,Building 1,No.8.Huayuan Road,Xuanwu District,Nanjing\r
+                               Nanjing  Jiangsu   210000\r
+                               CN\r
+\r
  4C-65-A8   (hex)               Instant Byte, S.L.\r
  800000-8FFFFF     (base 16)            Instant Byte, S.L.\r
                                 Calle Julio Palacios, 10 Naves 1-5, Pol. Ind. Ntra. Sra. de Butarque\r
@@ -4850,24 +4919,6 @@ A00000-AFFFFF     (base 16)              Bluemega Document & Print Services
                                 Troisdorf  NRW  53840\r
                                 DE\r
  \r
-A0-C5-F2   (hex)               UnaliWear, Inc.\r
-D00000-DFFFFF     (base 16)            UnaliWear, Inc.\r
-                               3410 Cherry Lane\r
-                               Austin  TX  78703\r
-                               US\r
-\r
-A0-C5-F2   (hex)               Impulse Networks Pte Ltd\r
-900000-9FFFFF     (base 16)            Impulse Networks Pte Ltd\r
-                               1 Raffles Place, #44-08 Raffles Place\r
-                               Singapore    048616\r
-                               SG\r
-\r
-50-FF-99   (hex)               IPC Global\r
-400000-4FFFFF     (base 16)            IPC Global\r
-                               4 Wadhurst Drive\r
-                               Boronia  Victoria  3155\r
-                               AU\r
-\r
  A0-C5-F2   (hex)               CoolR Group Inc\r
  800000-8FFFFF     (base 16)            CoolR Group Inc\r
                                 14100 Parke Long Ct Suite I\r
@@ -4928,11 +4979,11 @@ A00000-AFFFFF     (base 16)             Wilderness Labs Inc.
                                 montreal  QC  H3X1T8\r
                                 CA\r
  \r
-60-D7-E3   (hex)               SKS Automaatio oy\r
-300000-3FFFFF     (base 16)            SKS Automaatio oy\r
-                               Martinkylantie 50\r
-                               Vantaa    01720\r
-                               FI\r
+08-ED-02   (hex)               Imperx, Inc\r
+100000-1FFFFF     (base 16)            Imperx, Inc\r
+                               6421 Congress Avenue\r
+                               Boca Raton  FL  33487\r
+                               US\r
  \r
  08-ED-02   (hex)               D2SLink Systems\r
  000000-0FFFFF     (base 16)            D2SLink Systems\r
@@ -4940,11 +4991,11 @@ A00000-AFFFFF     (base 16)             Wilderness Labs Inc.
                                 Boulogne Billancourt    92514\r
                                 FR\r
  \r
-08-ED-02   (hex)               Imperx, Inc\r
-100000-1FFFFF     (base 16)            Imperx, Inc\r
-                               6421 Congress Avenue\r
-                               Boca Raton  FL  33487\r
-                               US\r
+60-D7-E3   (hex)               SKS Automaatio oy\r
+300000-3FFFFF     (base 16)            SKS Automaatio oy\r
+                               Martinkylantie 50\r
+                               Vantaa    01720\r
+                               FI\r
  \r
  98-AA-FC   (hex)               Comarch S.A. \r
  E00000-EFFFFF     (base 16)            Comarch S.A. \r
@@ -4976,35 +5027,29 @@ C00000-CFFFFF     (base 16)             D&S Cable Industries (HK) Limited
                                 Collierville  TN  38017\r
                                 US\r
  \r
-14-4F-D7   (hex)               Annapurna labs\r
-000000-0FFFFF     (base 16)            Annapurna labs\r
-                               Matam Scientific Industries Center,   Building 8.2\r
-                               Mail box 15123  Haifa  3508409\r
-                               IL\r
-\r
  F8-02-78   (hex)               BETTINI SRL\r
  700000-7FFFFF     (base 16)            BETTINI SRL\r
                                 VIA CESARE BATTISTI 22\r
                                 CESANO MADERNO  MILAN  20031\r
                                 IT\r
  \r
-14-4F-D7   (hex)               NPort Networks Inc.,\r
-800000-8FFFFF     (base 16)            NPort Networks Inc.,\r
-                               9F No. 242 BaoAi street, ShuLin District,\r
-                               New Taipei  Taiwan  23845\r
-                               TW\r
-\r
  14-4F-D7   (hex)               Zehnder Group AG\r
  100000-1FFFFF     (base 16)            Zehnder Group AG\r
                                 Moortalstrasse 1\r
                                 Gränichen    CH-5722 \r
                                 CH\r
  \r
-A4-11-63   (hex)               Dspread Technology (Beijing) Inc.\r
-800000-8FFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
-                               Jingxin Building, 2045 Suite , Chaoyang District\r
-                               Beijing    100027\r
-                               CN\r
+14-4F-D7   (hex)               Annapurna labs\r
+000000-0FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+14-4F-D7   (hex)               NPort Networks Inc.,\r
+800000-8FFFFF     (base 16)            NPort Networks Inc.,\r
+                               9F No. 242 BaoAi street, ShuLin District,\r
+                               New Taipei  Taiwan  23845\r
+                               TW\r
  \r
  A4-11-63   (hex)               Pax\r
  300000-3FFFFF     (base 16)            Pax\r
@@ -5012,6 +5057,12 @@ A4-11-63   (hex)         Pax
                                 london  England  sw5 0bj\r
                                 GB\r
  \r
+A4-11-63   (hex)               Dspread Technology (Beijing) Inc.\r
+800000-8FFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
+                               Jingxin Building, 2045 Suite , Chaoyang District\r
+                               Beijing    100027\r
+                               CN\r
+\r
  1C-A0-D3   (hex)               Dynamic Connect (Suzhou) Hi-Tech Electronic Co.,Ltd.\r
  500000-5FFFFF     (base 16)            Dynamic Connect (Suzhou) Hi-Tech Electronic Co.,Ltd.\r
                                 Unit C&D, No.201 WuXiang, Export Processing Zone A No.200Suhong Road SIP\r
@@ -5024,12 +5075,6 @@ A4-11-63   (hex)         Pax
                                 Izhevsk  Udmurtia  426039\r
                                 RU\r
  \r
-1C-A0-D3   (hex)               Intertecno SRL NISUTA\r
-600000-6FFFFF     (base 16)            Intertecno SRL NISUTA\r
-                               Av. Belgrano 1209\r
-                               Capital Federal  Buenos Aires  1093\r
-                               AR\r
-\r
  1C-A0-D3   (hex)               SAVELEC\r
  300000-3FFFFF     (base 16)            SAVELEC\r
                                 rue de la houille blanche\r
@@ -5054,6 +5099,18 @@ E00000-EFFFFF     (base 16)              BBB Inc.
                                 Nanjing  Jiangsu  210039\r
                                 CN\r
  \r
+1C-A0-D3   (hex)               Intertecno SRL NISUTA\r
+600000-6FFFFF     (base 16)            Intertecno SRL NISUTA\r
+                               Av. Belgrano 1209\r
+                               Capital Federal  Buenos Aires  1093\r
+                               AR\r
+\r
+34-04-9E   (hex)               Nanjing Mythware Information Technology Co., Ltd.\r
+300000-3FFFFF     (base 16)            Nanjing Mythware Information Technology Co., Ltd.\r
+                               Level 13, Unit 3, Zijin Entrepreneur R&D Centre, No.89 Shengli Road, Jiangning District\r
+                               Nanjing  Jiangsu  211106\r
+                               CN\r
+\r
  34-04-9E   (hex)               ND SatCom GmbH\r
  E00000-EFFFFF     (base 16)            ND SatCom GmbH\r
                                 Graf-von-Soden-Straße\r
@@ -5066,36 +5123,12 @@ E00000-EFFFFF     (base 16)             ND SatCom GmbH
                                 hangzhou    311121\r
                                 CN\r
  \r
-34-04-9E   (hex)               Nanjing Mythware Information Technology Co., Ltd.\r
-300000-3FFFFF     (base 16)            Nanjing Mythware Information Technology Co., Ltd.\r
-                               Level 13, Unit 3, Zijin Entrepreneur R&D Centre, No.89 Shengli Road, Jiangning District\r
-                               Nanjing  Jiangsu  211106\r
-                               CN\r
-\r
  A4-58-0F   (hex)               Finetree Communications Inc\r
  E00000-EFFFFF     (base 16)            Finetree Communications Inc\r
                                 #406, Shinyatap Prugiocity2, Yanghyunro 405\r
                                 Seungnamsi    13439\r
                                 KR\r
  \r
-7C-CB-E2   (hex)               Easy Broadband Technology Co., Ltd.\r
-B00000-BFFFFF     (base 16)            Easy Broadband Technology Co., Ltd.\r
-                               3rd Floor, Jinyanlong Building, Xisanqi Bridge, Haidian District, Beijing 100096, China\r
-                               Beijing  Beijing  100096\r
-                               CN\r
-\r
-7C-CB-E2   (hex)               Hangzhou Kaicom Communication Co.,Ltd\r
-700000-7FFFFF     (base 16)            Hangzhou Kaicom Communication Co.,Ltd\r
-                               12th Floor,Block B CONBA Building,No.288 jiangnan Avenue , Binjiang District, Hangzhou, China\r
-                               Hangzhou  Zhejiang  310051\r
-                               CN\r
-\r
-50-0B-91   (hex)               Shenzhen Lucky Sonics Co .,Ltd\r
-D00000-DFFFFF     (base 16)            Shenzhen Lucky Sonics Co .,Ltd\r
-                               201A, BLOCK 10 ROW 1, SHANGTUN VILLAGE HESHUIKOU COMMUNITY,GO NGMING STREET, GUANGMING DISTRICT\r
-                               SHENZHEN  GUANGDONG  518107\r
-                               CN\r
-\r
  A4-58-0F   (hex)               CoAsia Microelectronics Corp.\r
  500000-5FFFFF     (base 16)            CoAsia Microelectronics Corp.\r
                                 13F, No. 3-2, Park St. Nangang District\r
@@ -5108,9 +5141,15 @@ E00000-EFFFFF     (base 16)              Shenzhen zhong ju  Fiber optical Co.Ltd
                                 Shen zhen  Guang dong  518000\r
                                 CN\r
  \r
-A4-58-0F   (hex)               Shenzhen City billion Leiden science and Technology Co., Ltd.\r
-400000-4FFFFF     (base 16)            Shenzhen City billion Leiden science and Technology Co., Ltd.\r
-                               Shenzhen City, Baoan District Songgang Street Community Goodrich Tantou Industrial Park plant building 2\r
+50-0B-91   (hex)               Shenzhen Lucky Sonics Co .,Ltd\r
+D00000-DFFFFF     (base 16)            Shenzhen Lucky Sonics Co .,Ltd\r
+                               201A, BLOCK 10 ROW 1, SHANGTUN VILLAGE HESHUIKOU COMMUNITY,GO NGMING STREET, GUANGMING DISTRICT\r
+                               SHENZHEN  GUANGDONG  518107\r
+                               CN\r
+\r
+A4-58-0F   (hex)               Shenzhen City billion Leiden science and Technology Co., Ltd.\r
+400000-4FFFFF     (base 16)            Shenzhen City billion Leiden science and Technology Co., Ltd.\r
+                               Shenzhen City, Baoan District Songgang Street Community Goodrich Tantou Industrial Park plant building 2\r
                                 Shenzhen City  Guangdong Province  518000\r
                                 CN\r
  \r
@@ -5126,17 +5165,29 @@ C00000-CFFFFF     (base 16)             Diamond Traffic Products, Inc
                                 Oakridge  OR  97463\r
                                 US\r
  \r
+7C-CB-E2   (hex)               Astrum Technologies CC\r
+300000-3FFFFF     (base 16)            Astrum Technologies CC\r
+                               Unit 49, Sandton View Office Park, 1 Conduit Str, Lyme Park\r
+                               Johannesburg  Gauteng  2060\r
+                               ZA\r
+\r
  7C-CB-E2   (hex)               Heyuan Yongyida Technology Holdings Co.,Ltd.\r
  000000-0FFFFF     (base 16)            Heyuan Yongyida Technology Holdings Co.,Ltd.\r
                                 Xin Yong Yi Science Park, GaoXin 3rd Road, High-tech Zone\r
                                 Heyuan  Guangdong  517000\r
                                 CN\r
  \r
-7C-CB-E2   (hex)               Astrum Technologies CC\r
-300000-3FFFFF     (base 16)            Astrum Technologies CC\r
-                               Unit 49, Sandton View Office Park, 1 Conduit Str, Lyme Park\r
-                               Johannesburg  Gauteng  2060\r
-                               ZA\r
+7C-CB-E2   (hex)               Easy Broadband Technology Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Easy Broadband Technology Co., Ltd.\r
+                               3rd Floor, Jinyanlong Building, Xisanqi Bridge, Haidian District, Beijing 100096, China\r
+                               Beijing  Beijing  100096\r
+                               CN\r
+\r
+7C-CB-E2   (hex)               Hangzhou Kaicom Communication Co.,Ltd\r
+700000-7FFFFF     (base 16)            Hangzhou Kaicom Communication Co.,Ltd\r
+                               12th Floor,Block B CONBA Building,No.288 jiangnan Avenue , Binjiang District, Hangzhou, China\r
+                               Hangzhou  Zhejiang  310051\r
+                               CN\r
  \r
  24-4E-7B   (hex)               Tekelek Europe Ltd\r
  000000-0FFFFF     (base 16)            Tekelek Europe Ltd\r
@@ -5162,46 +5213,34 @@ A00000-AFFFFF     (base 16)             Shenzhen AWT science &  technology limited
                                 Nagoya  Aichi  450-8640\r
                                 JP\r
  \r
-48-65-EE   (hex)               EnBW Energie Baden-Württemberg AG\r
-B00000-BFFFFF     (base 16)            EnBW Energie Baden-Württemberg AG\r
-                               Durlacher Allee 93\r
-                               Karlsruhe    76131\r
-                               DE\r
-\r
  48-65-EE   (hex)               Gopod Group Limited\r
  100000-1FFFFF     (base 16)            Gopod Group Limited\r
                                 5-6/f,building 8,Lianjian Industrial Park,Longhua\r
                                 Shenzhen    518109\r
                                 CN\r
  \r
-24-4E-7B   (hex)               UniMAT Automation Technology Co., Ltd.\r
-900000-9FFFFF     (base 16)            UniMAT Automation Technology Co., Ltd.\r
-                                5/F, Building 15&16, Wisdomland Business Park, Road 2 Nantou port, Nanshan District\r
-                               Shenzhen   Guangdong   518052\r
-                               CN\r
-\r
-48-65-EE   (hex)               Winn Technology Co.,Ltd\r
-D00000-DFFFFF     (base 16)            Winn Technology Co.,Ltd\r
-                               Winn Tech Industrial Park Xianghe Rd.Xinmin Area，Chang an，Dongguan City Guangdong Province，China.\r
-                               Dongguan  Guangdong  523879\r
-                               CN\r
-\r
  48-65-EE   (hex)               Data Technology Inc.\r
  300000-3FFFFF     (base 16)            Data Technology Inc.\r
                                 Tachikawa Nishiki-cho Bldg 8F, 1-8-7 Nishiki-cho\r
                                 Tachikawa-shi  Tokyo  190-0022\r
                                 JP\r
  \r
-4C-E1-73   (hex)               Nanjing Tongke Technology Development Co., LTD\r
-800000-8FFFFF     (base 16)            Nanjing Tongke Technology Development Co., LTD\r
-                               8 Taishan Road jianye\r
-                               Nanjing    210000\r
+48-65-EE   (hex)               Winn Technology Co.,Ltd\r
+D00000-DFFFFF     (base 16)            Winn Technology Co.,Ltd\r
+                               Winn Tech Industrial Park Xianghe Rd.Xinmin Area，Chang an，Dongguan City Guangdong Province，China.\r
+                               Dongguan  Guangdong  523879\r
                                 CN\r
  \r
-1C-C0-E1   (hex)               HANGZHOU SOFTEL OPTIC CO., LTD\r
-300000-3FFFFF     (base 16)            HANGZHOU SOFTEL OPTIC CO., LTD\r
-                               101 BINKANG ROAD, BINJIANG DISTRICT\r
-                               HANGZHOU  ZHEJIANG  310052\r
+48-65-EE   (hex)               EnBW Energie Baden-Württemberg AG\r
+B00000-BFFFFF     (base 16)            EnBW Energie Baden-Württemberg AG\r
+                               Durlacher Allee 93\r
+                               Karlsruhe    76131\r
+                               DE\r
+\r
+24-4E-7B   (hex)               UniMAT Automation Technology Co., Ltd.\r
+900000-9FFFFF     (base 16)            UniMAT Automation Technology Co., Ltd.\r
+                                5/F, Building 15&16, Wisdomland Business Park, Road 2 Nantou port, Nanshan District\r
+                               Shenzhen   Guangdong   518052\r
                                 CN\r
  \r
  4C-E1-73   (hex)               Huizhou Dehong Technology Co., Ltd.\r
@@ -5210,16 +5249,16 @@ D00000-DFFFFF     (base 16)             Winn Technology Co.,Ltd
                                 Huizhou  Guangdong  516210\r
                                 CN\r
  \r
-4C-E1-73   (hex)               Shanghai Ehong Technology Co.,Ltd\r
-B00000-BFFFFF     (base 16)            Shanghai Ehong Technology Co.,Ltd\r
-                               RM1505,blk 1st,No.833 South Hongmei Road Minhang Dis\r
-                               Shanghai   shanghai  200237\r
+4C-E1-73   (hex)               Nanjing Tongke Technology Development Co., LTD\r
+800000-8FFFFF     (base 16)            Nanjing Tongke Technology Development Co., LTD\r
+                               8 Taishan Road jianye\r
+                               Nanjing    210000\r
                                 CN\r
  \r
-AC-64-DD   (hex)               DIGIBIRD TECHNOLOGY CO., LTD.\r
-E00000-EFFFFF     (base 16)            DIGIBIRD TECHNOLOGY CO., LTD.\r
-                               LONGGUAN BUSINESS CENTER, SUITE 501. HUILONGGUAN W., ST., CHANGPING\r
-                               BEIJING  BEIJING  102208\r
+1C-C0-E1   (hex)               HANGZHOU SOFTEL OPTIC CO., LTD\r
+300000-3FFFFF     (base 16)            HANGZHOU SOFTEL OPTIC CO., LTD\r
+                               101 BINKANG ROAD, BINJIANG DISTRICT\r
+                               HANGZHOU  ZHEJIANG  310052\r
                                 CN\r
  \r
  1C-C0-E1   (hex)               SECHERON SA\r
@@ -5234,6 +5273,12 @@ A00000-AFFFFF     (base 16)              SECHERON SA
                                 Taipei City  Neihu Dist.  11469\r
                                 TW\r
  \r
+4C-E1-73   (hex)               Shanghai Ehong Technology Co.,Ltd\r
+B00000-BFFFFF     (base 16)            Shanghai Ehong Technology Co.,Ltd\r
+                               RM1505,blk 1st,No.833 South Hongmei Road Minhang Dis\r
+                               Shanghai   shanghai  200237\r
+                               CN\r
+\r
  38-3A-21   (hex)               Chengdu Krosslan Technology Inc.\r
  700000-7FFFFF     (base 16)            Chengdu Krosslan Technology Inc.\r
                                 4F,Tower B, Rennan Mansion, No.5 Section 3, 2nd Ring Road South\r
@@ -5246,23 +5291,23 @@ A00000-AFFFFF     (base 16)             SECHERON SA
                                 Houston  TX  77098\r
                                 US\r
  \r
-38-3A-21   (hex)               SDNware technology co.,LTD\r
-E00000-EFFFFF     (base 16)            SDNware technology co.,LTD\r
-                               166 Renai Road\r
-                               Suzhou    215000\r
-                               CN\r
-\r
  AC-64-DD   (hex)               infypower Co., Ltd\r
  300000-3FFFFF     (base 16)            infypower Co., Ltd\r
                                 -101, No. 3009, Shahexi Road, Nanshan District,\r
                                 shenzhen  guangdong  518055\r
                                 CN\r
  \r
-38-3A-21   (hex)               Pactron\r
-B00000-BFFFFF     (base 16)            Pactron\r
-                               3000 Patrick Henry \r
-                               Santa Clara   CA  95054\r
-                               US\r
+AC-64-DD   (hex)               DIGIBIRD TECHNOLOGY CO., LTD.\r
+E00000-EFFFFF     (base 16)            DIGIBIRD TECHNOLOGY CO., LTD.\r
+                               LONGGUAN BUSINESS CENTER, SUITE 501. HUILONGGUAN W., ST., CHANGPING\r
+                               BEIJING  BEIJING  102208\r
+                               CN\r
+\r
+38-3A-21   (hex)               SDNware technology co.,LTD\r
+E00000-EFFFFF     (base 16)            SDNware technology co.,LTD\r
+                               166 Renai Road\r
+                               Suzhou    215000\r
+                               CN\r
  \r
  F8-1D-78   (hex)               ADTECHNO Inc.\r
  100000-1FFFFF     (base 16)            ADTECHNO Inc.\r
@@ -5270,6 +5315,12 @@ F8-1D-78   (hex)         ADTECHNO Inc.
                                 Tokyo    102-0074\r
                                 JP\r
  \r
+38-3A-21   (hex)               Pactron\r
+B00000-BFFFFF     (base 16)            Pactron\r
+                               3000 Patrick Henry \r
+                               Santa Clara   CA  95054\r
+                               US\r
+\r
  70-F8-E7   (hex)               Flexim Security Oy\r
  600000-6FFFFF     (base 16)            Flexim Security Oy\r
                                 P.O.Box 700\r
@@ -5282,12 +5333,6 @@ F8-1D-78   (hex)         ADTECHNO Inc.
                                 shenzhen  Guangdong  518109\r
                                 CN\r
  \r
-70-F8-E7   (hex)               SHENZHEN Xin JiuNing Electronics Co Ltd\r
-000000-0FFFFF     (base 16)            SHENZHEN Xin JiuNing Electronics Co Ltd\r
-                               Floor 2, Building 11, WaiMao Industrial Park, Shiyan Subdistrict , Baoan District, Shenzhen\r
-                               SHENZHEN  GUANGDONG  518108\r
-                               CN\r
-\r
  70-F8-E7   (hex)               Eclipse Security\r
  800000-8FFFFF     (base 16)            Eclipse Security\r
                                 3900 N. 29th Ave\r
@@ -5330,12 +5375,24 @@ A00000-AFFFFF     (base 16)             iSolution Technologies Co.,Ltd.
                                 Taipei    11503\r
                                 TW\r
  \r
+70-F8-E7   (hex)               SHENZHEN Xin JiuNing Electronics Co Ltd\r
+000000-0FFFFF     (base 16)            SHENZHEN Xin JiuNing Electronics Co Ltd\r
+                               Floor 2, Building 11, WaiMao Industrial Park, Shiyan Subdistrict , Baoan District, Shenzhen\r
+                               SHENZHEN  GUANGDONG  518108\r
+                               CN\r
+\r
  84-E0-F4   (hex)               RAY Co.,LTD\r
  800000-8FFFFF     (base 16)            RAY Co.,LTD\r
                                 3~4F, 332-7, Samsung1-ro\r
                                 Hwaseong-si  Gyeonggi-do  445-330\r
                                 KR\r
  \r
+C0-D3-91   (hex)               REGULUS CO.,LTD.\r
+D00000-DFFFFF     (base 16)            REGULUS CO.,LTD.\r
+                               Yotsuya  Orchid Bldg.  23-3 Daikyo-cho\r
+                                Shinjuku-ku  Tokyo  160-0015\r
+                               JP\r
+\r
  C0-D3-91   (hex)               XENA SECURITY LIMITED\r
  800000-8FFFFF     (base 16)            XENA SECURITY LIMITED\r
                                 ROOM 1210, WANG CHEONG ENTERPRISE CENTRE, 65 CHAI WAN KOK STREET, TSUEN WAN, N.T.\r
@@ -5360,11 +5417,11 @@ C0-D3-91   (hex)                IXON B.V.
                                 Overloon  Noord-Brabant  5825 AX\r
                                 NL\r
  \r
-58-E8-76   (hex)               Chengdu Vision-Zenith Technology Co.,Ltd\r
-800000-8FFFFF     (base 16)            Chengdu Vision-Zenith Technology Co.,Ltd\r
-                               3rd Floor,Unit 1 Building 6,No.88 of Tianchen Road West Science Park, Hi-tech zone west\r
-                               Chengdu  Sichuan  610000\r
-                               CN\r
+58-E8-76   (hex)               KUSTOM SIGNALS INC\r
+C00000-CFFFFF     (base 16)            KUSTOM SIGNALS INC\r
+                               1010 W CHESTNUT\r
+                               CHANUTE  KS  66720\r
+                               US\r
  \r
  58-E8-76   (hex)               SHENZHEN DIGISSIN TECHNOLOGY\r
  A00000-AFFFFF     (base 16)            SHENZHEN DIGISSIN TECHNOLOGY\r
@@ -5372,17 +5429,17 @@ A00000-AFFFFF     (base 16)             SHENZHEN DIGISSIN TECHNOLOGY
                                 SHENZHEN  GUANGDONG  518102\r
                                 CN\r
  \r
-58-E8-76   (hex)               KUSTOM SIGNALS INC\r
-C00000-CFFFFF     (base 16)            KUSTOM SIGNALS INC\r
-                               1010 W CHESTNUT\r
-                               CHANUTE  KS  66720\r
-                               US\r
+F0-AC-D7   (hex)               Hanju Network Technologies Co.\r
+700000-7FFFFF     (base 16)            Hanju Network Technologies Co.\r
+                               lvdilanhai building 2303, zhangba street\r
+                               Xi'an  ShaanXi  710065\r
+                               CN\r
  \r
-C0-D3-91   (hex)               REGULUS CO.,LTD.\r
-D00000-DFFFFF     (base 16)            REGULUS CO.,LTD.\r
-                               Yotsuya  Orchid Bldg.  23-3 Daikyo-cho\r
-                                Shinjuku-ku  Tokyo  160-0015\r
-                               JP\r
+58-E8-76   (hex)               Chengdu Vision-Zenith Technology Co.,Ltd\r
+800000-8FFFFF     (base 16)            Chengdu Vision-Zenith Technology Co.,Ltd\r
+                               3rd Floor,Unit 1 Building 6,No.88 of Tianchen Road West Science Park, Hi-tech zone west\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
  \r
  F0-AC-D7   (hex)               Sercomm Corporation.\r
  400000-4FFFFF     (base 16)            Sercomm Corporation.\r
@@ -5390,18 +5447,6 @@ F0-AC-D7   (hex)         Sercomm Corporation.
                                 Miao-Lih Hsuan    115\r
                                 TW\r
  \r
-F0-AC-D7   (hex)               Hanju Network Technologies Co.\r
-700000-7FFFFF     (base 16)            Hanju Network Technologies Co.\r
-                               lvdilanhai building 2303, zhangba street\r
-                               Xi'an  ShaanXi  710065\r
-                               CN\r
-\r
-F0-AC-D7   (hex)               Telefonix Incorporated\r
-800000-8FFFFF     (base 16)            Telefonix Incorporated\r
-                               2340 Ernie Krueger Circle\r
-                               Waukegan  null  60087\r
-                               US\r
-\r
  F0-AC-D7   (hex)               PAVO TASARIM URETIM TICARET A.S.\r
  500000-5FFFFF     (base 16)            PAVO TASARIM URETIM TICARET A.S.\r
                                 Teknopark Istanbul Ar-Ge Binalari 1.Blok Pendik\r
@@ -5414,10 +5459,10 @@ F0-AC-D7   (hex)                Suzhou Pairlink Network Technology
                                 Suzhou  Jiangsu  215011\r
                                 CN\r
  \r
-28-36-38   (hex)               Knowles Electronics LLC\r
-000000-0FFFFF     (base 16)            Knowles Electronics LLC\r
-                               1151 Maplewood Drive\r
-                               Itasca  IL  60143\r
+F0-AC-D7   (hex)               Telefonix Incorporated\r
+800000-8FFFFF     (base 16)            Telefonix Incorporated\r
+                               2340 Ernie Krueger Circle\r
+                               Waukegan  null  60087\r
                                 US\r
  \r
  28-36-38   (hex)               APPEAK Technology System Co.Ltd.\r
@@ -5426,6 +5471,12 @@ D00000-DFFFFF     (base 16)              APPEAK Technology System Co.Ltd.
                                 Xindian Dist  New Taipei City  231\r
                                 TW\r
  \r
+28-36-38   (hex)               Knowles Electronics LLC\r
+000000-0FFFFF     (base 16)            Knowles Electronics LLC\r
+                               1151 Maplewood Drive\r
+                               Itasca  IL  60143\r
+                               US\r
+\r
  28-36-38   (hex)               Dspread Technology (Beijing) Inc.\r
  400000-4FFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
                                 Jingxin Building, 2045 Suite , Chaoyang District\r
@@ -5438,6 +5489,18 @@ A00000-AFFFFF     (base 16)              Bluekey Pty Ltd
                                 Arundel  Queensland  4214\r
                                 AU\r
  \r
+8C-19-2D   (hex)               Abside Networks, Inc.\r
+B00000-BFFFFF     (base 16)            Abside Networks, Inc.\r
+                               16 heritage road\r
+                               Acton  MA  01720\r
+                               US\r
+\r
+8C-19-2D   (hex)               SRETT\r
+700000-7FFFFF     (base 16)            SRETT\r
+                               305 Avenue Le jour se lève\r
+                               Boulogne-Billancourt    92100\r
+                               FR\r
+\r
  8C-19-2D   (hex)               You Zhengcheng co.,ltd\r
  C00000-CFFFFF     (base 16)            You Zhengcheng co.,ltd\r
                                 Baoan District 45 District\r
@@ -5450,18 +5513,6 @@ C00000-CFFFFF     (base 16)              You Zhengcheng co.,ltd
                                 HONGKONG    999077\r
                                 HK\r
  \r
-8C-19-2D   (hex)               SRETT\r
-700000-7FFFFF     (base 16)            SRETT\r
-                               305 Avenue Le jour se lève\r
-                               Boulogne-Billancourt    92100\r
-                               FR\r
-\r
-8C-19-2D   (hex)               Abside Networks, Inc.\r
-B00000-BFFFFF     (base 16)            Abside Networks, Inc.\r
-                               16 heritage road\r
-                               Acton  MA  01720\r
-                               US\r
-\r
  8C-19-2D   (hex)               ViaWear, Inc.\r
  900000-9FFFFF     (base 16)            ViaWear, Inc.\r
                                 801 Key Route Blvd\r
@@ -5474,17 +5525,23 @@ B00000-BFFFFF     (base 16)             Abside Networks, Inc.
                                 Shenzhen  Guangdong  518036\r
                                 CN\r
  \r
+D0-D9-4F   (hex)               DUKSANMECASYS CO., LTD.\r
+D00000-DFFFFF     (base 16)            DUKSANMECASYS CO., LTD.\r
+                               7F The 6th Byucksan Digital Valley 481-4 Gasan-Dong Geumcheon-Gu \r
+                               SEOUL    08501\r
+                               KR\r
+\r
  CC-D3-1E   (hex)               Siemens AG, MO MLT BG\r
  900000-9FFFFF     (base 16)            Siemens AG, MO MLT BG\r
                                 Eggenbergerstr. 31\r
                                 Graz  Styria  8020\r
                                 AT\r
  \r
-D0-D9-4F   (hex)               DUKSANMECASYS CO., LTD.\r
-D00000-DFFFFF     (base 16)            DUKSANMECASYS CO., LTD.\r
-                               7F The 6th Byucksan Digital Valley 481-4 Gasan-Dong Geumcheon-Gu \r
-                               SEOUL    08501\r
-                               KR\r
+C4-7C-8D   (hex)               Silvus technologies inc\r
+A00000-AFFFFF     (base 16)            Silvus technologies inc\r
+                               10990 Wilshire blvd. suite 1500\r
+                               Los Angeles   CA  90024\r
+                               US\r
  \r
  C4-7C-8D   (hex)               GETEMED Medizin- und Informationstechnik AG\r
  800000-8FFFFF     (base 16)            GETEMED Medizin- und Informationstechnik AG\r
@@ -5498,53 +5555,23 @@ B00000-BFFFFF     (base 16)             GC AUTOMATION CO,LTD
                                 Shenzhen    518000\r
                                 CN\r
  \r
-C4-7C-8D   (hex)               Silvus technologies inc\r
-A00000-AFFFFF     (base 16)            Silvus technologies inc\r
-                               10990 Wilshire blvd. suite 1500\r
-                               Los Angeles   CA  90024\r
-                               US\r
-\r
  C4-7C-8D   (hex)               ROBOSTAR\r
  400000-4FFFFF     (base 16)            ROBOSTAR\r
                                 700, Suin-ro, Sangnok-gu\r
                                 Ansan-si  Kyŏnggi-do  426-220\r
                                 KR\r
  \r
-68-91-D0   (hex)               Outstanding Technology Co., Ltd.\r
-E00000-EFFFFF     (base 16)            Outstanding Technology Co., Ltd.\r
-                               9th floor, New Yaesu bldg., 3-5-12 nihon-bashi\r
-                               Chuo-ku  Tokyo  103-0027\r
-                               JP\r
-\r
  C4-7C-8D   (hex)               Watec Co., Ltd.\r
  300000-3FFFFF     (base 16)            Watec Co., Ltd.\r
                                 254-2 Nihonkoku, Daihoji\r
                                 Tsuruoka-shi  Yamagata  997-0017\r
                                 JP\r
  \r
-68-91-D0   (hex)               Multi Alarm Zrt.\r
-100000-1FFFFF     (base 16)            Multi Alarm Zrt.\r
-                               Basamalom u. 33.\r
-                               Pécs  Baranya  7630\r
-                               HU\r
-\r
-68-91-D0   (hex)               QUANTEX\r
-900000-9FFFFF     (base 16)            QUANTEX\r
-                               010000, Republic of Kazakhstan, Astana, Dostyk st., 5/2, VP 3\r
-                               Astana    010000\r
-                               KZ\r
-\r
-E0-B6-F5   (hex)               POMCube Inc. \r
-600000-6FFFFF     (base 16)            POMCube Inc. \r
-                               19363 Brockton Ln\r
-                               Saratoga  CA  95070\r
-                               US\r
-\r
-E0-B6-F5   (hex)               Huizhou GISUN Industrial CO. LTD\r
-300000-3FFFFF     (base 16)            Huizhou GISUN Industrial CO. LTD\r
-                               Gisun Industry Park,Dong Ao Village, Sha Tian Town,HuiYang District ,Huizhou China\r
-                               Huizhou  Guangdong  518114\r
-                               CN\r
+68-91-D0   (hex)               Outstanding Technology Co., Ltd.\r
+E00000-EFFFFF     (base 16)            Outstanding Technology Co., Ltd.\r
+                               9th floor, New Yaesu bldg., 3-5-12 nihon-bashi\r
+                               Chuo-ku  Tokyo  103-0027\r
+                               JP\r
  \r
  68-91-D0   (hex)               NIPK Electron Co.\r
  500000-5FFFFF     (base 16)            NIPK Electron Co.\r
@@ -5558,11 +5585,23 @@ C00000-CFFFFF     (base 16)             funktel GmbH
                                 Salzgitter    38259\r
                                 DE\r
  \r
-50-FF-99   (hex)                SHENZHEN KINGVT ELECTRONICS CO.,LTD\r
-200000-2FFFFF     (base 16)             SHENZHEN KINGVT ELECTRONICS CO.,LTD\r
-                                8/F,NO.100,LANGKOU INDUSTRLAL PARK,DALANG STREET,NEW LONGHUA DISTRCT,SHENZHEN,R.R.C\r
-                               Shenzhen    518000\r
-                               CN\r
+68-91-D0   (hex)               QUANTEX\r
+900000-9FFFFF     (base 16)            QUANTEX\r
+                               010000, Republic of Kazakhstan, Astana, Dostyk st., 5/2, VP 3\r
+                               Astana    010000\r
+                               KZ\r
+\r
+E0-B6-F5   (hex)               POMCube Inc. \r
+600000-6FFFFF     (base 16)            POMCube Inc. \r
+                               19363 Brockton Ln\r
+                               Saratoga  CA  95070\r
+                               US\r
+\r
+68-91-D0   (hex)               Multi Alarm Zrt.\r
+100000-1FFFFF     (base 16)            Multi Alarm Zrt.\r
+                               Basamalom u. 33.\r
+                               Pécs  Baranya  7630\r
+                               HU\r
  \r
  E0-B6-F5   (hex)               Yuneec International（China）Co.，Ltd\r
  800000-8FFFFF     (base 16)            Yuneec International（China）Co.，Ltd\r
@@ -5570,10 +5609,16 @@ E0-B6-F5   (hex)                Yuneec International（China）Co.，Ltd
                                 Kunshan  Jiangsu  215300\r
                                 CN\r
  \r
-98-6D-35   (hex)               Zhejiang Hanshow Technology Co., Ltd.\r
-700000-7FFFFF     (base 16)            Zhejiang Hanshow Technology Co., Ltd.\r
-                               Floor 18, Building C, Ruipu Plaza, No.15,Hongjunying South Rd, Beijing, China\r
-                               beijing  beijing  100012\r
+50-FF-99   (hex)                SHENZHEN KINGVT ELECTRONICS CO.,LTD\r
+200000-2FFFFF     (base 16)             SHENZHEN KINGVT ELECTRONICS CO.,LTD\r
+                                8/F,NO.100,LANGKOU INDUSTRLAL PARK,DALANG STREET,NEW LONGHUA DISTRCT,SHENZHEN,R.R.C\r
+                               Shenzhen    518000\r
+                               CN\r
+\r
+E0-B6-F5   (hex)               Huizhou GISUN Industrial CO. LTD\r
+300000-3FFFFF     (base 16)            Huizhou GISUN Industrial CO. LTD\r
+                               Gisun Industry Park,Dong Ao Village, Sha Tian Town,HuiYang District ,Huizhou China\r
+                               Huizhou  Guangdong  518114\r
                                 CN\r
  \r
  50-FF-99   (hex)               Honeywell International\r
@@ -5582,10 +5627,10 @@ E0-B6-F5   (hex)                Yuneec International（China）Co.，Ltd
                                 Poway  CA  92064\r
                                 US\r
  \r
-7C-47-7C   (hex)               Shenzhen Eunicum Electric Co.,Ltd.\r
-800000-8FFFFF     (base 16)            Shenzhen Eunicum Electric Co.,Ltd.\r
-                               3/F Building 11, Lishan Industrial Park, Yueliangwan,Nanshan District\r
-                               Shenzhen  Guangdong  518054\r
+98-6D-35   (hex)               Zhejiang Hanshow Technology Co., Ltd.\r
+700000-7FFFFF     (base 16)            Zhejiang Hanshow Technology Co., Ltd.\r
+                               Floor 18, Building C, Ruipu Plaza, No.15,Hongjunying South Rd, Beijing, China\r
+                               beijing  beijing  100012\r
                                 CN\r
  \r
  7C-47-7C   (hex)               Photosynth Inc.\r
@@ -5594,11 +5639,11 @@ E0-B6-F5   (hex)                Yuneec International（China）Co.，Ltd
                                 Osaki, Shinagawa-ku  Tokyo  141-0032\r
                                 JP\r
  \r
-7C-47-7C   (hex)               Zerosystem LTD.Co\r
-600000-6FFFFF     (base 16)            Zerosystem LTD.Co\r
-                               #905 Hansol Technotown 455 Gyeongsu-Daero\r
-                               Gunpo  Gyeonggido  435-831 \r
-                               KR\r
+7C-47-7C   (hex)               Shenzhen Eunicum Electric Co.,Ltd.\r
+800000-8FFFFF     (base 16)            Shenzhen Eunicum Electric Co.,Ltd.\r
+                               3/F Building 11, Lishan Industrial Park, Yueliangwan,Nanshan District\r
+                               Shenzhen  Guangdong  518054\r
+                               CN\r
  \r
  98-6D-35   (hex)               Vitronic Dr.-Ing. Stein Bildverarbeitungssysteme GmbH\r
  600000-6FFFFF     (base 16)            Vitronic Dr.-Ing. Stein Bildverarbeitungssysteme GmbH\r
@@ -5612,6 +5657,12 @@ D00000-DFFFFF     (base 16)              Praesideo B.V.
                                 Utrecht    3502 MA\r
                                 NL\r
  \r
+7C-47-7C   (hex)               Zerosystem LTD.Co\r
+600000-6FFFFF     (base 16)            Zerosystem LTD.Co\r
+                               #905 Hansol Technotown 455 Gyeongsu-Daero\r
+                               Gunpo  Gyeonggido  435-831 \r
+                               KR\r
+\r
  7C-47-7C   (hex)               BungBungame Inc\r
  000000-0FFFFF     (base 16)            BungBungame Inc\r
                                 15F., No.19-11, Sanchong Rd., Nangang Dist., Taipei City 115, Taiwan (R.O.C.)\r
@@ -5648,6 +5699,12 @@ A00000-AFFFFF     (base 16)              Unfors Raysafe AB
                                 Raleigh  NC  27616\r
                                 US\r
  \r
+38-B8-EB   (hex)               CeeNex Inc\r
+800000-8FFFFF     (base 16)            CeeNex Inc\r
+                               1200 Aerowood Drive  Unit 30\r
+                               Mississauga, ON  Canada L4W 2S7    L4W 2S7\r
+                               CA\r
+\r
  78-CA-83   (hex)               Elanview Technology Co.,Ltd\r
  C00000-CFFFFF     (base 16)            Elanview Technology Co.,Ltd\r
                                 NO.7001,Zhongchun Road,Minghang District, Shanghai\r
@@ -5660,12 +5717,6 @@ C00000-CFFFFF     (base 16)              Elanview Technology Co.,Ltd
                                 BEIJING    100191\r
                                 CN\r
  \r
-38-B8-EB   (hex)               CeeNex Inc\r
-800000-8FFFFF     (base 16)            CeeNex Inc\r
-                               1200 Aerowood Drive  Unit 30\r
-                               Mississauga, ON  Canada L4W 2S7    L4W 2S7\r
-                               CA\r
-\r
  78-CA-83   (hex)               IHM\r
  800000-8FFFFF     (base 16)            IHM\r
                                 Vandtaarnsvej 87\r
@@ -5762,18 +5813,18 @@ B00000-BFFFFF     (base 16)             Amobile Intelligent Corp.
                                 Pella  IA  50219\r
                                 US\r
  \r
-40-A3-6B   (hex)               Omnitracs, LLC\r
-300000-3FFFFF     (base 16)            Omnitracs, LLC\r
-                               717 North Harwood St.\r
-                               Dallas  TX  75201\r
-                               US\r
-\r
  40-A3-6B   (hex)               Fin Robotics Inc\r
  000000-0FFFFF     (base 16)            Fin Robotics Inc\r
                                 11871 Hilltop Dr, Losaltos Hills\r
                                 Los Altos  CA  94024\r
                                 US\r
  \r
+40-A3-6B   (hex)               Omnitracs, LLC\r
+300000-3FFFFF     (base 16)            Omnitracs, LLC\r
+                               717 North Harwood St.\r
+                               Dallas  TX  75201\r
+                               US\r
+\r
  80-0A-80   (hex)               Beijing Gooagoo Technical Service Co.,Ltd.\r
  600000-6FFFFF     (base 16)            Beijing Gooagoo Technical Service Co.,Ltd.\r
                                 Room 402A,Block E,Wangjing Technology Park,Lize Road\r
@@ -5786,28 +5837,34 @@ B00000-BFFFFF     (base 16)             Amobile Intelligent Corp.
                                 Shenzhen  Guangdong  518100\r
                                 CN\r
  \r
-00-55-DA   (hex)               Donguan WideLink Communication Technology Co.,Ltd.\r
-C00000-CFFFFF     (base 16)            Donguan WideLink Communication Technology Co.,Ltd.\r
-                               Guangdong dongguan songshan lake high new technology industry development zone industrial south road no. 6 3 building the second floor\r
-                               Dongguan city  Guangdong province  523808\r
+A0-3E-6B   (hex)               Nanjing zhanyi software technology co., LTD\r
+E00000-EFFFFF     (base 16)            Nanjing zhanyi software technology co., LTD\r
+                               Room 1101-1,Building No.2,No.106 Software Avenue,Yuhuatai District,Nanjing Jiangsu\r
+                               Nanjing  Jiangsu  210000\r
                                 CN\r
  \r
+CC-1B-E0   (hex)               Earphone Connection, Ubc.\r
+500000-5FFFFF     (base 16)            Earphone Connection, Ubc.\r
+                               25139 Ave Stanford\r
+                               Valnecia  CA  91355\r
+                               US\r
+\r
  00-55-DA   (hex)               LUCISTECHNOLOGIES（SHANGHAI）CO.,LTD\r
  700000-7FFFFF     (base 16)            LUCISTECHNOLOGIES（SHANGHAI）CO.,LTD\r
                                 No.57.East Caohejing.Building Lucis XuHui District, Shanghai.200235.China\r
                                 SHANGHAI  SHANGHAI  200235\r
                                 CN\r
  \r
-CC-1B-E0   (hex)               Earphone Connection, Ubc.\r
-500000-5FFFFF     (base 16)            Earphone Connection, Ubc.\r
-                               25139 Ave Stanford\r
-                               Valnecia  CA  91355\r
-                               US\r
+00-55-DA   (hex)               Novexx Solutions GmbH\r
+300000-3FFFFF     (base 16)            Novexx Solutions GmbH\r
+                               Ohmstrasse 3\r
+                               Eching  Bayern  85386\r
+                               DE\r
  \r
-A0-3E-6B   (hex)               Nanjing zhanyi software technology co., LTD\r
-E00000-EFFFFF     (base 16)            Nanjing zhanyi software technology co., LTD\r
-                               Room 1101-1,Building No.2,No.106 Software Avenue,Yuhuatai District,Nanjing Jiangsu\r
-                               Nanjing  Jiangsu  210000\r
+00-55-DA   (hex)               Donguan WideLink Communication Technology Co.,Ltd.\r
+C00000-CFFFFF     (base 16)            Donguan WideLink Communication Technology Co.,Ltd.\r
+                               Guangdong dongguan songshan lake high new technology industry development zone industrial south road no. 6 3 building the second floor\r
+                               Dongguan city  Guangdong province  523808\r
                                 CN\r
  \r
  A0-3E-6B   (hex)               Business Support Consultant Co.,Ltd\r
@@ -5816,10 +5873,19 @@ A0-3E-6B   (hex)                Business Support Consultant Co.,Ltd
                                 Shenzhen  Guangdong  518038\r
                                 CN\r
  \r
-00-55-DA   (hex)               Novexx Solutions GmbH\r
-300000-3FFFFF     (base 16)            Novexx Solutions GmbH\r
-                               Ohmstrasse 3\r
-                               Eching  Bayern  85386\r
+1C-21-D1   (hex)               Ognios GmbH\r
+100000-1FFFFF     (base 16)            Ognios GmbH\r
+                               Dr.-Hans-Lechner-Straße 6\r
+                               Wals-Siezenheim  Salzburg  5071\r
+                               AT\r
+\r
+1C-21-D1   (hex)               Private\r
+C00000-CFFFFF     (base 16)            Private\r
+\r
+C8-8E-D1   (hex)               German Pipe GmbH\r
+100000-1FFFFF     (base 16)            German Pipe GmbH\r
+                               Darrweg 43\r
+                               Nordhausen  Thuringia  D-99734\r
                                 DE\r
  \r
  DC-44-27   (hex)               Nautilus Infotech CO., Ltd.\r
@@ -5840,44 +5906,17 @@ A00000-AFFFFF     (base 16)             Shanghai Huahong Integrated Circuit Co.,Ltd
                                 Shanghai  Shanghai  201203\r
                                 CN\r
  \r
-1C-21-D1   (hex)               Private\r
-C00000-CFFFFF     (base 16)            Private\r
-\r
-C8-8E-D1   (hex)               German Pipe GmbH\r
-100000-1FFFFF     (base 16)            German Pipe GmbH\r
-                               Darrweg 43\r
-                               Nordhausen  Thuringia  D-99734\r
-                               DE\r
-\r
-1C-21-D1   (hex)               Ognios GmbH\r
-100000-1FFFFF     (base 16)            Ognios GmbH\r
-                               Dr.-Hans-Lechner-Straße 6\r
-                               Wals-Siezenheim  Salzburg  5071\r
-                               AT\r
-\r
-B0-C5-CA   (hex)               D&T Inc.\r
-900000-9FFFFF     (base 16)            D&T Inc.\r
-                               Gajungbukro 26-121\r
-                               YouSung Gu  Daejeon  305-343\r
-                               KR\r
-\r
  DC-44-27   (hex)               Nex Technologies PTY LTD\r
  400000-4FFFFF     (base 16)            Nex Technologies PTY LTD\r
                                 7 Pimpala Street\r
                                 Lithgow  New South Wales  2790\r
                                 AU\r
  \r
-78-C2-C0   (hex)               Beijing Coilabs technology co.,ltd\r
-800000-8FFFFF     (base 16)            Beijing Coilabs technology co.,ltd\r
-                               The 8th floor, Zhongguancun Dream Lab Building, No.1 Haidian Street, Haidian District, Beijing City, China\r
-                               Beijing  Beijing  100086\r
-                               CN\r
-\r
-78-C2-C0   (hex)               Ombitron, Inc.\r
-A00000-AFFFFF     (base 16)            Ombitron, Inc.\r
-                               1425 Broadway\r
-                               Seattle  Washington  98122\r
-                               US\r
+B0-C5-CA   (hex)               D&T Inc.\r
+900000-9FFFFF     (base 16)            D&T Inc.\r
+                               Gajungbukro 26-121\r
+                               YouSung Gu  Daejeon  305-343\r
+                               KR\r
  \r
  78-C2-C0   (hex)               KORF Inc.\r
  D00000-DFFFFF     (base 16)            KORF Inc.\r
@@ -5885,17 +5924,11 @@ D00000-DFFFFF     (base 16)             KORF Inc.
                                 Yuseong-gu  Daejeon  305-510\r
                                 KR\r
  \r
-B4-37-D1   (hex)               Yireh Auto Tech Co.,Ltd.\r
-600000-6FFFFF     (base 16)            Yireh Auto Tech Co.,Ltd.\r
-                               #703, 311 Nowon-ro, Nowon-gu\r
-                               Seoul  Seoul  139865\r
-                               KR\r
-\r
-B4-37-D1   (hex)               Lezyne INC USA\r
-000000-0FFFFF     (base 16)            Lezyne INC USA\r
-                               645 Tank Farm\r
-                               San Luis Obispo  California  93401\r
-                               US\r
+78-C2-C0   (hex)               Beijing Coilabs technology co.,ltd\r
+800000-8FFFFF     (base 16)            Beijing Coilabs technology co.,ltd\r
+                               The 8th floor, Zhongguancun Dream Lab Building, No.1 Haidian Street, Haidian District, Beijing City, China\r
+                               Beijing  Beijing  100086\r
+                               CN\r
  \r
  78-C2-C0   (hex)               Guangzhou Hongcai Stage Equipment co.,ltd\r
  700000-7FFFFF     (base 16)            Guangzhou Hongcai Stage Equipment co.,ltd\r
@@ -5903,18 +5936,36 @@ B4-37-D1   (hex)                Lezyne INC USA
                                 Guangzhou  Guangdong  511450\r
                                 CN\r
  \r
+78-C2-C0   (hex)               Ombitron, Inc.\r
+A00000-AFFFFF     (base 16)            Ombitron, Inc.\r
+                               1425 Broadway\r
+                               Seattle  Washington  98122\r
+                               US\r
+\r
  B4-37-D1   (hex)               GE Power Management\r
  700000-7FFFFF     (base 16)            GE Power Management\r
                                 Avenida Pinoa 10\r
                                 Zamudio  Vizcaya  48170\r
                                 ES\r
  \r
+74-F8-DB   (hex)               Wuhan Tianyu Information Industry Co., Ltd.\r
+700000-7FFFFF     (base 16)            Wuhan Tianyu Information Industry Co., Ltd.\r
+                               HUST Industry Park, East-Lake Development Zone\r
+                               Wuhan  Hubei  430223\r
+                               CN\r
+\r
  74-F8-DB   (hex)               WiFi Hotspots, SL\r
  400000-4FFFFF     (base 16)            WiFi Hotspots, SL\r
                                 C/ Montaña Clara, No.18\r
                                 Fañabe  Tenerife  38760\r
                                 ES\r
  \r
+B4-37-D1   (hex)               Lezyne INC USA\r
+000000-0FFFFF     (base 16)            Lezyne INC USA\r
+                               645 Tank Farm\r
+                               San Luis Obispo  California  93401\r
+                               US\r
+\r
  74-F8-DB   (hex)               Shenzhen Ruishi Information Technology Co.,Ltd.\r
  200000-2FFFFF     (base 16)            Shenzhen Ruishi Information Technology Co.,Ltd.\r
                                 9G,Building A,Nanyuemingzhu Buliding,No.2322, Houhai Avenue,Nanshan District\r
@@ -5927,11 +5978,17 @@ B4-37-D1   (hex)                GE Power Management
                                 San Jose  CA  95138\r
                                 US\r
  \r
-74-F8-DB   (hex)               Wuhan Tianyu Information Industry Co., Ltd.\r
-700000-7FFFFF     (base 16)            Wuhan Tianyu Information Industry Co., Ltd.\r
-                               HUST Industry Park, East-Lake Development Zone\r
-                               Wuhan  Hubei  430223\r
-                               CN\r
+B4-37-D1   (hex)               Yireh Auto Tech Co.,Ltd.\r
+600000-6FFFFF     (base 16)            Yireh Auto Tech Co.,Ltd.\r
+                               #703, 311 Nowon-ro, Nowon-gu\r
+                               Seoul  Seoul  139865\r
+                               KR\r
+\r
+80-7B-85   (hex)               Interplan Co., Ltd.\r
+A00000-AFFFFF     (base 16)            Interplan Co., Ltd.\r
+                               5F Ishihara Bld. 3-3-12 Iidabashi\r
+                               Chiyoda-ku  Tokyo  102-0072\r
+                               JP\r
  \r
  54-9A-11   (hex)               Niveo International BV\r
  700000-7FFFFF     (base 16)            Niveo International BV\r
@@ -5939,12 +5996,6 @@ B4-37-D1   (hex)         GE Power Management
                                 Mijdrecht    3641 SG\r
                                 NL\r
  \r
-54-9A-11   (hex)               Beijing HTSmartech Co.,Ltd\r
-E00000-EFFFFF     (base 16)            Beijing HTSmartech Co.,Ltd\r
-                               Suite 301,Unit 2,Building 6,No.29,Jing Hai\r
-                               Beijing  Beijing  100176\r
-                               CN\r
-\r
  54-9A-11   (hex)               eTauro LLC\r
  400000-4FFFFF     (base 16)            eTauro LLC\r
                                 PMB 128\r
@@ -5963,29 +6014,17 @@ E00000-EFFFFF     (base 16)             Beijing HTSmartech Co.,Ltd
                                 ShenZhen  Guangdong  518052\r
                                 CN\r
  \r
-80-7B-85   (hex)               Interplan Co., Ltd.\r
-A00000-AFFFFF     (base 16)            Interplan Co., Ltd.\r
-                               5F Ishihara Bld. 3-3-12 Iidabashi\r
-                               Chiyoda-ku  Tokyo  102-0072\r
-                               JP\r
+54-9A-11   (hex)               Beijing HTSmartech Co.,Ltd\r
+E00000-EFFFFF     (base 16)            Beijing HTSmartech Co.,Ltd\r
+                               Suite 301,Unit 2,Building 6,No.29,Jing Hai\r
+                               Beijing  Beijing  100176\r
+                               CN\r
  \r
-64-FB-81   (hex)               Dongyang unitech.co.ltd\r
-D00000-DFFFFF     (base 16)            Dongyang unitech.co.ltd\r
-                               8F dearung technotown 13\r
-                               seoul    153-803\r
-                               KR\r
-\r
-64-FB-81   (hex)               Bridgeport Instruments, LLC\r
-C00000-CFFFFF     (base 16)            Bridgeport Instruments, LLC\r
-                               11740 Jollyville Rd.\r
-                               Austin  TX  78759\r
-                               US\r
-\r
-64-FB-81   (hex)               Seven Solutions S.L\r
-200000-2FFFFF     (base 16)            Seven Solutions S.L\r
-                               C/Periodista Rafael Gómez Montero, 2.\r
-                               Granada  Granada  18014\r
-                               ES\r
+80-7B-85   (hex)               Quickte Technology Co.,Ltd\r
+600000-6FFFFF     (base 16)            Quickte Technology Co.,Ltd\r
+                               4thF/Bldg44, XiLiTong Long industrial Zone,\r
+                               Shenzhen  Guangdong province  518052\r
+                               CN\r
  \r
  64-FB-81   (hex)               ChengDu KeChuang LongXin Sci-tech Co.,Ltd\r
  E00000-EFFFFF     (base 16)            ChengDu KeChuang LongXin Sci-tech Co.,Ltd\r
@@ -5999,23 +6038,17 @@ E00000-EFFFFF     (base 16)             ChengDu KeChuang LongXin Sci-tech Co.,Ltd
                                 Taipei    11558\r
                                 TW\r
  \r
-80-7B-85   (hex)               Quickte Technology Co.,Ltd\r
-600000-6FFFFF     (base 16)            Quickte Technology Co.,Ltd\r
-                               4thF/Bldg44, XiLiTong Long industrial Zone,\r
-                               Shenzhen  Guangdong province  518052\r
-                               CN\r
-\r
-80-E4-DA   (hex)               Beijing Yuantel Technolgy Co.,Ltd-Shenzhen Branch\r
-400000-4FFFFF     (base 16)            Beijing Yuantel Technolgy Co.,Ltd-Shenzhen Branch\r
-                               Room502,B  BLdg, Fuan mansion\r
-                               Shenzhen  Gangdong  518000\r
-                               CN\r
+64-FB-81   (hex)               Dongyang unitech.co.ltd\r
+D00000-DFFFFF     (base 16)            Dongyang unitech.co.ltd\r
+                               8F dearung technotown 13\r
+                               seoul    153-803\r
+                               KR\r
  \r
-80-E4-DA   (hex)               Krizer international Co,. Ltd.\r
-800000-8FFFFF     (base 16)            Krizer international Co,. Ltd.\r
-                               RM 9F, Block B, Central Building\r
-                               shenzhen  guangdong  518101\r
-                               CN\r
+64-FB-81   (hex)               Bridgeport Instruments, LLC\r
+C00000-CFFFFF     (base 16)            Bridgeport Instruments, LLC\r
+                               11740 Jollyville Rd.\r
+                               Austin  TX  78759\r
+                               US\r
  \r
  80-E4-DA   (hex)               Nanjing LILO Technology Co. Ltd.\r
  B00000-BFFFFF     (base 16)            Nanjing LILO Technology Co. Ltd.\r
@@ -6023,11 +6056,11 @@ B00000-BFFFFF     (base 16)             Nanjing LILO Technology Co. Ltd.
                                 Beijing  Beijing  100000\r
                                 CN\r
  \r
-80-E4-DA   (hex)               EVER Sp. z o.o.\r
-C00000-CFFFFF     (base 16)            EVER Sp. z o.o.\r
-                               ul. Grudzinskiego 30\r
-                               Swarzedz  wielkopolskie  62-020\r
-                               PL\r
+64-FB-81   (hex)               Seven Solutions S.L\r
+200000-2FFFFF     (base 16)            Seven Solutions S.L\r
+                               C/Periodista Rafael Gómez Montero, 2.\r
+                               Granada  Granada  18014\r
+                               ES\r
  \r
  1C-CA-E3   (hex)               eSight Corporation\r
  D00000-DFFFFF     (base 16)            eSight Corporation\r
@@ -6035,17 +6068,41 @@ D00000-DFFFFF     (base 16)             eSight Corporation
                                 Ottawa  Ontario  K2K3B8\r
                                 CA\r
  \r
+1C-CA-E3   (hex)               Bird Home Automation GmbH\r
+700000-7FFFFF     (base 16)            Bird Home Automation GmbH\r
+                               Joachimsthaler Str. 12\r
+                               Berlin  Berlin  10719\r
+                               DE\r
+\r
  80-E4-DA   (hex)               Beijing Gaokezhongtian Technology Co Ltd\r
  300000-3FFFFF     (base 16)            Beijing Gaokezhongtian Technology Co Ltd\r
                                 Beijing City Haidian District 23 Liangziyinzuo 806 room\r
                                 beijing  beijing  100191\r
                                 CN\r
  \r
-1C-CA-E3   (hex)               Bird Home Automation GmbH\r
-700000-7FFFFF     (base 16)            Bird Home Automation GmbH\r
-                               Joachimsthaler Str. 12\r
-                               Berlin  Berlin  10719\r
-                               DE\r
+80-E4-DA   (hex)               Krizer international Co,. Ltd.\r
+800000-8FFFFF     (base 16)            Krizer international Co,. Ltd.\r
+                               RM 9F, Block B, Central Building\r
+                               shenzhen  guangdong  518101\r
+                               CN\r
+\r
+80-E4-DA   (hex)               Beijing Yuantel Technolgy Co.,Ltd-Shenzhen Branch\r
+400000-4FFFFF     (base 16)            Beijing Yuantel Technolgy Co.,Ltd-Shenzhen Branch\r
+                               Room502,B  BLdg, Fuan mansion\r
+                               Shenzhen  Gangdong  518000\r
+                               CN\r
+\r
+2C-D1-41   (hex)               Bowei Technology Company Limited\r
+600000-6FFFFF     (base 16)            Bowei Technology Company Limited\r
+                               Room 1716, Building Xinmao,\r
+                                 Shanghai  200233\r
+                               CN\r
+\r
+90-C6-82   (hex)               Shanghai HuRong Communication Technology Development Co., Ltd.\r
+E00000-EFFFFF     (base 16)            Shanghai HuRong Communication Technology Development Co., Ltd.\r
+                               Room 342，Building A，No.68. Donghe Road, Chengqiao town, Chongming county（Chengqiao Economic Development Zone）\r
+                               shanghai  shanghai  202150\r
+                               CN\r
  \r
  2C-D1-41   (hex)               XiaMen 35.com Technology Co,.Ltd.\r
  700000-7FFFFF     (base 16)            XiaMen 35.com Technology Co,.Ltd.\r
@@ -6053,17 +6110,11 @@ D00000-DFFFFF     (base 16)             eSight Corporation
                                 Xiamen  Fujian  361008\r
                                 CN\r
  \r
-90-C6-82   (hex)               Cinet Inc\r
-700000-7FFFFF     (base 16)            Cinet Inc\r
-                               8616 Phoenix Drive\r
-                               Manassas  VA  20110\r
-                               US\r
-\r
-90-C6-82   (hex)               Innovative Electronic Technology\r
-300000-3FFFFF     (base 16)            Innovative Electronic Technology\r
-                               IET House\r
-                               Potten End  Herts  HP42RN\r
-                               GB\r
+80-E4-DA   (hex)               EVER Sp. z o.o.\r
+C00000-CFFFFF     (base 16)            EVER Sp. z o.o.\r
+                               ul. Grudzinskiego 30\r
+                               Swarzedz  wielkopolskie  62-020\r
+                               PL\r
  \r
  90-C6-82   (hex)               Teletek Electronics\r
  800000-8FFFFF     (base 16)            Teletek Electronics\r
@@ -6077,17 +6128,23 @@ D00000-DFFFFF     (base 16)             eSight Corporation
                                 Nanjing  Jiangsu  210023\r
                                 CN\r
  \r
+90-C6-82   (hex)               Cinet Inc\r
+700000-7FFFFF     (base 16)            Cinet Inc\r
+                               8616 Phoenix Drive\r
+                               Manassas  VA  20110\r
+                               US\r
+\r
  2C-6A-6F   (hex)               Shanghai Shuncom Electronic Technology Co.,Ltd\r
  000000-0FFFFF     (base 16)            Shanghai Shuncom Electronic Technology Co.,Ltd\r
                                 8/F,No.4 building,No.3000 Longdong Ave,,\r
                                 shanghai  shanghai  201203\r
                                 CN\r
  \r
-90-C6-82   (hex)               Shanghai HuRong Communication Technology Development Co., Ltd.\r
-E00000-EFFFFF     (base 16)            Shanghai HuRong Communication Technology Development Co., Ltd.\r
-                               Room 342，Building A，No.68. Donghe Road, Chengqiao town, Chongming county（Chengqiao Economic Development Zone）\r
-                               shanghai  shanghai  202150\r
-                               CN\r
+90-C6-82   (hex)               Innovative Electronic Technology\r
+300000-3FFFFF     (base 16)            Innovative Electronic Technology\r
+                               IET House\r
+                               Potten End  Herts  HP42RN\r
+                               GB\r
  \r
  2C-6A-6F   (hex)               Wellntel, Inc.\r
  A00000-AFFFFF     (base 16)            Wellntel, Inc.\r
@@ -6095,18 +6152,6 @@ A00000-AFFFFF     (base 16)              Wellntel, Inc.
                                 Milwaukee  WI  53211\r
                                 US\r
  \r
-2C-D1-41   (hex)               Bowei Technology Company Limited\r
-600000-6FFFFF     (base 16)            Bowei Technology Company Limited\r
-                               Room 1716, Building Xinmao,\r
-                                 Shanghai  200233\r
-                               CN\r
-\r
-28-FD-80   (hex)               Digital Signal Corp\r
-400000-4FFFFF     (base 16)            Digital Signal Corp\r
-                               14000 Thunderbolt Place\r
-                               Chantilly  VA  20151\r
-                               US\r
-\r
  A0-BB-3E   (hex)               Xiamen Kehua Hengsheng Co.,Ltd\r
  600000-6FFFFF     (base 16)            Xiamen Kehua Hengsheng Co.,Ltd\r
                                 No.457,Malong Road,Torch High-tech Industrial Zone\r
@@ -6125,28 +6170,34 @@ A0-BB-3E   (hex)                Sandal Plc
                                 Harlow  Essex  \r
                                 GB\r
  \r
+28-FD-80   (hex)               Digital Signal Corp\r
+400000-4FFFFF     (base 16)            Digital Signal Corp\r
+                               14000 Thunderbolt Place\r
+                               Chantilly  VA  20151\r
+                               US\r
+\r
+2C-26-5F   (hex)               Hysentel Technology Co., Ltd\r
+E00000-EFFFFF     (base 16)            Hysentel Technology Co., Ltd\r
+                               Floor 2 Building L  No.26#  2 xiang\r
+                               Shenzhen  Guangdong  518101\r
+                               CN\r
+\r
  F8-02-78   (hex)               Innodisk\r
  200000-2FFFFF     (base 16)            Innodisk\r
                                 5F., No.237, Sec. 1, Datong Rd., Xizhi Dist.,\r
                                 New Taipei City  Taiwan  221\r
                                 TW\r
  \r
-F8-02-78   (hex)               Beijing Redcdn Technology, Co., Ltd\r
-900000-9FFFFF     (base 16)            Beijing Redcdn Technology, Co., Ltd\r
-                               7F, B block, Yu Hui building\r
-                               Haidian District  Beijing  100142\r
-                               CN\r
-\r
  2C-26-5F   (hex)               Motec GmbH\r
  500000-5FFFFF     (base 16)            Motec GmbH\r
                                 Oberweyerer Strasse 21\r
                                 Hadamar-Steinbach  Hessen  65589\r
                                 DE\r
  \r
-2C-26-5F   (hex)               Hysentel Technology Co., Ltd\r
-E00000-EFFFFF     (base 16)            Hysentel Technology Co., Ltd\r
-                               Floor 2 Building L  No.26#  2 xiang\r
-                               Shenzhen  Guangdong  518101\r
+F8-02-78   (hex)               Beijing Redcdn Technology, Co., Ltd\r
+900000-9FFFFF     (base 16)            Beijing Redcdn Technology, Co., Ltd\r
+                               7F, B block, Yu Hui building\r
+                               Haidian District  Beijing  100142\r
                                 CN\r
  \r
  A4-4F-29   (hex)               Comsel System Ltd\r
@@ -6167,23 +6218,41 @@ A4-4F-29   (hex)                Comsel System Ltd
                                 Vancouver  BC  V6T 1Z4\r
                                 CA\r
  \r
+10-07-23   (hex)               RippleTek Tech Ltd\r
+000000-0FFFFF     (base 16)            RippleTek Tech Ltd\r
+                               Tianyi Street #38 Idealisim Center Building #1 Room #705\r
+                               Chengdu  Sichuan  610041\r
+                               CN\r
+\r
  3C-39-E7   (hex)               BEWATEC Kommunikationstechnik GmbH\r
  100000-1FFFFF     (base 16)            BEWATEC Kommunikationstechnik GmbH\r
                                 Orkotten 65\r
                                 Telgte  NRW  48291\r
                                 DE\r
  \r
-10-07-23   (hex)               RippleTek Tech Ltd\r
-000000-0FFFFF     (base 16)            RippleTek Tech Ltd\r
-                               Tianyi Street #38 Idealisim Center Building #1 Room #705\r
-                               Chengdu  Sichuan  610041\r
+E8-18-63   (hex)               clabsys\r
+100000-1FFFFF     (base 16)            clabsys\r
+                               9F Elentec-dong, Pangyo 7 Venture Valley II, 633\r
+                               Seongnam-si  Kyeonggi-do  463-010\r
+                               KR\r
+\r
+B8-D8-12   (hex)               Yuwei Info&Tech Development Co.,Ltd\r
+C00000-CFFFFF     (base 16)            Yuwei Info&Tech Development Co.,Ltd\r
+                               Floor 6, Taike Building, No 2 Taike Road, Futian\r
+                               Shenzhen  Guangdong  518049\r
                                 CN\r
  \r
-B8-D8-12   (hex)               Lam Research\r
-D00000-DFFFFF     (base 16)            Lam Research\r
-                               4305 cushing parkway\r
-                               Fremont  California  94538\r
-                               US\r
+B8-D8-12   (hex)               Vonger Electronic Technology Co.,Ltd.\r
+600000-6FFFFF     (base 16)            Vonger Electronic Technology Co.,Ltd.\r
+                               Qiaodong Street #24\r
+                               Taiyuan  Shanxi  030001\r
+                               CN\r
+\r
+D0-22-12   (hex)               RHENAC Systems GmbH\r
+200000-2FFFFF     (base 16)            RHENAC Systems GmbH\r
+                               Christian-Lassen-Str. 16\r
+                               Bonn  NRW  53117\r
+                               DE\r
  \r
  D0-22-12   (hex)               AIM\r
  100000-1FFFFF     (base 16)            AIM\r
@@ -6191,17 +6260,11 @@ D0-22-12   (hex)                AIM
                                 MEYLAN  ISERE  38240\r
                                 FR\r
  \r
-B8-D8-12   (hex)               Yuwei Info&Tech Development Co.,Ltd\r
-C00000-CFFFFF     (base 16)            Yuwei Info&Tech Development Co.,Ltd\r
-                               Floor 6, Taike Building, No 2 Taike Road, Futian\r
-                               Shenzhen  Guangdong  518049\r
-                               CN\r
-\r
-E8-18-63   (hex)               clabsys\r
-100000-1FFFFF     (base 16)            clabsys\r
-                               9F Elentec-dong, Pangyo 7 Venture Valley II, 633\r
-                               Seongnam-si  Kyeonggi-do  463-010\r
-                               KR\r
+E8-18-63   (hex)               BSM Wireless Inc.\r
+900000-9FFFFF     (base 16)            BSM Wireless Inc.\r
+                               75 International Blvd.\r
+                               Toronto  Ontario  M9W 6L9\r
+                               CA\r
  \r
  E8-18-63   (hex)               Siliconcube\r
  700000-7FFFFF     (base 16)            Siliconcube\r
@@ -6209,6 +6272,12 @@ E8-18-63   (hex)         Siliconcube
                                 Seongnam-si  Gyeonggi-do  463-400\r
                                 KR\r
  \r
+B8-D8-12   (hex)               Lam Research\r
+D00000-DFFFFF     (base 16)            Lam Research\r
+                               4305 cushing parkway\r
+                               Fremont  California  94538\r
+                               US\r
+\r
  D0-22-12   (hex)               Shenzhen SIC Technology. Co., Ltd.\r
  800000-8FFFFF     (base 16)            Shenzhen SIC Technology. Co., Ltd.\r
                                 Room 601-31,Floor 6,Meinian International Square\r
@@ -6221,17 +6290,11 @@ D0-22-12   (hex)                URANO INDUSTRIA DE BALANCAS E EQUIPAMENTOS LTDA
                                 CANOAS  RS  92020550\r
                                 BR\r
  \r
-E8-18-63   (hex)               BSM Wireless Inc.\r
-900000-9FFFFF     (base 16)            BSM Wireless Inc.\r
-                               75 International Blvd.\r
-                               Toronto  Ontario  M9W 6L9\r
-                               CA\r
-\r
-D0-22-12   (hex)               RHENAC Systems GmbH\r
-200000-2FFFFF     (base 16)            RHENAC Systems GmbH\r
-                               Christian-Lassen-Str. 16\r
-                               Bonn  NRW  53117\r
-                               DE\r
+74-E1-4A   (hex)               open joint stock company YUG-SISTEMA plus\r
+400000-4FFFFF     (base 16)            open joint stock company YUG-SISTEMA plus\r
+                               \r
+                               Krasnodar   Krasnodar Region  350072\r
+                               RU\r
  \r
  74-E1-4A   (hex)               emz-Hanauer GmbH & Co. KGaA\r
  300000-3FFFFF     (base 16)            emz-Hanauer GmbH & Co. KGaA\r
@@ -6239,47 +6302,29 @@ D0-22-12   (hex)                RHENAC Systems GmbH
                                 Nabburg  Bavaria  92507\r
                                 DE\r
  \r
-74-E1-4A   (hex)               open joint stock company YUG-SISTEMA plus\r
-400000-4FFFFF     (base 16)            open joint stock company YUG-SISTEMA plus\r
-                               \r
-                               Krasnodar   Krasnodar Region  350072\r
-                               RU\r
-\r
  B8-D8-12   (hex)               VOTEM\r
  100000-1FFFFF     (base 16)            VOTEM\r
                                 27, Geodudanji 1-gil,\r
                                 Chuncheon-Si  Gangwon-Do  200-883\r
                                 KR\r
  \r
-B8-D8-12   (hex)               Vonger Electronic Technology Co.,Ltd.\r
-600000-6FFFFF     (base 16)            Vonger Electronic Technology Co.,Ltd.\r
-                               Qiaodong Street #24\r
-                               Taiyuan  Shanxi  030001\r
-                               CN\r
-\r
-E4-95-6E   (hex)               NationalchipKorea\r
-700000-7FFFFF     (base 16)            NationalchipKorea\r
-                               #1109, Ace PyeongchonTower\r
-                               Anyang-si  Gyeonggi-do  431-804\r
-                               KR\r
-\r
  E4-95-6E   (hex)               Tacom Projetos Bilhetagem Inteligente ltda\r
  E00000-EFFFFF     (base 16)            Tacom Projetos Bilhetagem Inteligente ltda\r
                                 3800 Raja Gabaglia avenue\r
                                 Belo Horizonte  Minas Gerais  30494310\r
                                 BR\r
  \r
-E4-95-6E   (hex)               Shanghai DGE Co., Ltd\r
-300000-3FFFFF     (base 16)            Shanghai DGE Co., Ltd\r
-                               No.6608, Beisong Road,\r
-                                 Shanghai  201611\r
-                               CN\r
+BC-66-41   (hex)               EBlink\r
+A00000-AFFFFF     (base 16)            EBlink\r
+                               3-5 Rue Marcel Pagnol\r
+                               Boussy Saint Antoine  France  91800\r
+                               FR\r
  \r
-E4-95-6E   (hex)               Guang Lian Zhi Tong Technology Limited\r
-400000-4FFFFF     (base 16)            Guang Lian Zhi Tong Technology Limited\r
-                               Room 1102 Baoyuanhuafeng Economy Bldg\r
-                               Shenzhen  Guang Dong  518000\r
-                               \r
+E4-95-6E   (hex)               Tband srl\r
+100000-1FFFFF     (base 16)            Tband srl\r
+                               via A. Meucci, 4\r
+                               Preganziol  Treviso  31022\r
+                               IT\r
  \r
  BC-66-41   (hex)               Shenzhen Yaguang communication CO.,LTD\r
  800000-8FFFFF     (base 16)            Shenzhen Yaguang communication CO.,LTD\r
@@ -6287,23 +6332,17 @@ BC-66-41   (hex)                Shenzhen Yaguang communication CO.,LTD
                                 Shenzhen  Guangdong  518029\r
                                 CN\r
  \r
-E4-95-6E   (hex)               Tband srl\r
-100000-1FFFFF     (base 16)            Tband srl\r
-                               via A. Meucci, 4\r
-                               Preganziol  Treviso  31022\r
-                               IT\r
-\r
-BC-66-41   (hex)               EBlink\r
-A00000-AFFFFF     (base 16)            EBlink\r
-                               3-5 Rue Marcel Pagnol\r
-                               Boussy Saint Antoine  France  91800\r
-                               FR\r
+E4-95-6E   (hex)               Shanghai DGE Co., Ltd\r
+300000-3FFFFF     (base 16)            Shanghai DGE Co., Ltd\r
+                               No.6608, Beisong Road,\r
+                                 Shanghai  201611\r
+                               CN\r
  \r
-58-FC-DB   (hex)               Applied Device Technologies\r
-E00000-EFFFFF     (base 16)            Applied Device Technologies\r
-                               400 West Front Street\r
-                               Traverse City  Michigan  49684\r
-                               US\r
+E4-95-6E   (hex)               Guang Lian Zhi Tong Technology Limited\r
+400000-4FFFFF     (base 16)            Guang Lian Zhi Tong Technology Limited\r
+                               Room 1102 Baoyuanhuafeng Economy Bldg\r
+                               Shenzhen  Guang Dong  518000\r
+                               \r
  \r
  58-FC-DB   (hex)               XIAMEN LEELEN TECHNOLOGY CO.,LTD\r
  D00000-DFFFFF     (base 16)            XIAMEN LEELEN TECHNOLOGY CO.,LTD\r
@@ -6311,12 +6350,30 @@ D00000-DFFFFF     (base 16)             XIAMEN LEELEN TECHNOLOGY CO.,LTD
                                 Xiamen  Fujian  361021\r
                                 CN\r
  \r
+E4-95-6E   (hex)               NationalchipKorea\r
+700000-7FFFFF     (base 16)            NationalchipKorea\r
+                               #1109, Ace PyeongchonTower\r
+                               Anyang-si  Gyeonggi-do  431-804\r
+                               KR\r
+\r
  BC-66-41   (hex)               Process-Electronic Sp. z o.o.\r
  200000-2FFFFF     (base 16)            Process-Electronic Sp. z o.o.\r
                                 ul. Jednosci 48\r
                                 Sosnowiec  slaskie  41-218\r
                                 PL\r
  \r
+58-FC-DB   (hex)               Applied Device Technologies\r
+E00000-EFFFFF     (base 16)            Applied Device Technologies\r
+                               400 West Front Street\r
+                               Traverse City  Michigan  49684\r
+                               US\r
+\r
+B0-1F-81   (hex)               Rademacher Geraete-Elektronik GmbH\r
+B00000-BFFFFF     (base 16)            Rademacher Geraete-Elektronik GmbH\r
+                               Buschkamp 7\r
+                               Rhede  NRW  46414\r
+                               DE\r
+\r
  58-FC-DB   (hex)               Beseye Cloud Security Co. Ltd.\r
  200000-2FFFFF     (base 16)            Beseye Cloud Security Co. Ltd.\r
                                 3F.-1, No.45-1, Dexing W. Rd., Shilin Dist.\r
@@ -6329,17 +6386,11 @@ B0-1F-81   (hex)                SHENZHEN YIFANG DIGITAL TECHNOLOGY CO.,LTD.
                                 Shenzhen  Guangdong  518108\r
                                 CN\r
  \r
-F4-0E-11   (hex)               Sterna Security\r
-900000-9FFFFF     (base 16)            Sterna Security\r
-                               100 West Sambandam road\r
-                               Coimbatore  Tamilnadu  641002\r
-                               IN\r
-\r
-B0-1F-81   (hex)               Rademacher Geraete-Elektronik GmbH\r
-B00000-BFFFFF     (base 16)            Rademacher Geraete-Elektronik GmbH\r
-                               Buschkamp 7\r
-                               Rhede  NRW  46414\r
-                               DE\r
+F4-0E-11   (hex)               Axel srl\r
+200000-2FFFFF     (base 16)            Axel srl\r
+                               Via del Santo, 143\r
+                               Limena  PD  35010\r
+                               IT\r
  \r
  14-1F-BA   (hex)               Newings Communication CO., LTD.\r
  B00000-BFFFFF     (base 16)            Newings Communication CO., LTD.\r
@@ -6353,17 +6404,11 @@ F4-0E-11   (hex)                realphone technology co.,ltd
                                 shenzhen  guangdong  518400\r
                                 CN\r
  \r
-F4-0E-11   (hex)               Axel srl\r
-200000-2FFFFF     (base 16)            Axel srl\r
-                               Via del Santo, 143\r
-                               Limena  PD  35010\r
-                               IT\r
-\r
-7C-70-BC   (hex)               Tohan　Engineering　Corporation\r
-B00000-BFFFFF     (base 16)            Tohan　Engineering　Corporation\r
-                               1-701-1 Baba\r
-                               Sennan-shi  Osaka  590-0525\r
-                               JP\r
+F4-0E-11   (hex)               Sterna Security\r
+900000-9FFFFF     (base 16)            Sterna Security\r
+                               100 West Sambandam road\r
+                               Coimbatore  Tamilnadu  641002\r
+                               IN\r
  \r
  14-1F-BA   (hex)               Private\r
  300000-3FFFFF     (base 16)            Private\r
@@ -6374,12 +6419,6 @@ A00000-AFFFFF     (base 16)              AURALIC LIMITED
                                 Beijing    102200\r
                                 CN\r
  \r
-A4-3B-FA   (hex)               SHEN ZHEN PASUN TECH CO.LTD.\r
-900000-9FFFFF     (base 16)            SHEN ZHEN PASUN TECH CO.LTD.\r
-                               Room B406, Taojindi E-Business Incubator Base\r
-                               SHENZHEN  GUANGDONG  518131\r
-                               CN\r
-\r
  BC-34-00   (hex)               Cameron\r
  600000-6FFFFF     (base 16)            Cameron\r
                                 14450 John F. Kennedy Blvd\r
@@ -6392,17 +6431,17 @@ BC-34-00   (hex)                Cameron
                                   BERLIN  12681\r
                                 DE\r
  \r
-D0-76-50   (hex)               CentrAlert, Inc.\r
-000000-0FFFFF     (base 16)            CentrAlert, Inc.\r
-                               275 Meijer Way\r
-                               Lexington  KY  40503\r
-                               US\r
+7C-70-BC   (hex)               Tohan　Engineering　Corporation\r
+B00000-BFFFFF     (base 16)            Tohan　Engineering　Corporation\r
+                               1-701-1 Baba\r
+                               Sennan-shi  Osaka  590-0525\r
+                               JP\r
  \r
-A4-3B-FA   (hex)               Circus World Displays Ltd\r
-300000-3FFFFF     (base 16)            Circus World Displays Ltd\r
-                               4080 Montrose Rd\r
-                               Niagara Falls  Ontario  L2H 1J9\r
-                               CA\r
+A4-3B-FA   (hex)               SHEN ZHEN PASUN TECH CO.LTD.\r
+900000-9FFFFF     (base 16)            SHEN ZHEN PASUN TECH CO.LTD.\r
+                               Room B406, Taojindi E-Business Incubator Base\r
+                               SHENZHEN  GUANGDONG  518131\r
+                               CN\r
  \r
  A4-3B-FA   (hex)               Beijing Uniwill Science and Technology Co,Ltd\r
  100000-1FFFFF     (base 16)            Beijing Uniwill Science and Technology Co,Ltd\r
@@ -6416,6 +6455,12 @@ A4-3B-FA   (hex)         Chengdu Territory Technology Co.,Ltd
                                 Chengdu  Sichuan  610000\r
                                 CN\r
  \r
+A4-3B-FA   (hex)               Circus World Displays Ltd\r
+300000-3FFFFF     (base 16)            Circus World Displays Ltd\r
+                               4080 Montrose Rd\r
+                               Niagara Falls  Ontario  L2H 1J9\r
+                               CA\r
+\r
  D0-76-50   (hex)               tecnotron elekronik gmbh\r
  D00000-DFFFFF     (base 16)            tecnotron elekronik gmbh\r
                                 Wildberg 64\r
@@ -6428,17 +6473,23 @@ D0-76-50   (hex)                Greenwave Scientific
                                 Raleigh  North Carolina  27612\r
                                 US\r
  \r
+74-19-F8   (hex)               Heptagon Systems PTY. LTD.\r
+700000-7FFFFF     (base 16)            Heptagon Systems PTY. LTD.\r
+                               625-627 Ringwood Warrandyte Road\r
+                               Ringwood North  VIC  3124\r
+                               AU\r
+\r
  74-19-F8   (hex)               IDEXX Laboratories, Inc\r
  B00000-BFFFFF     (base 16)            IDEXX Laboratories, Inc\r
                                 1 IDEXX Drive\r
                                 Westbrook  ME  04092\r
                                 US\r
  \r
-74-19-F8   (hex)               Heptagon Systems PTY. LTD.\r
-700000-7FFFFF     (base 16)            Heptagon Systems PTY. LTD.\r
-                               625-627 Ringwood Warrandyte Road\r
-                               Ringwood North  VIC  3124\r
-                               AU\r
+D0-76-50   (hex)               CentrAlert, Inc.\r
+000000-0FFFFF     (base 16)            CentrAlert, Inc.\r
+                               275 Meijer Way\r
+                               Lexington  KY  40503\r
+                               US\r
  \r
  74-19-F8   (hex)               Bach Icon ApS\r
  C00000-CFFFFF     (base 16)            Bach Icon ApS\r
@@ -6446,6 +6497,12 @@ C00000-CFFFFF     (base 16)              Bach Icon ApS
                                 Hoersholm  DK  2970\r
                                 DK\r
  \r
+40-11-75   (hex)               Beijing Gemotech Intelligent Technology Co., Ltd.\r
+800000-8FFFFF     (base 16)            Beijing Gemotech Intelligent Technology Co., Ltd.\r
+                               NO.1 Development Road,Beijing International Information Industrial Base,Huilongguan Town,Changping District\r
+                               Beijing  Beijing  102206\r
+                               CN\r
+\r
  4C-4B-F9   (hex)               Beijing AutoAi Technology co. LTD\r
  E00000-EFFFFF     (base 16)            Beijing AutoAi Technology co. LTD\r
                                 The building of Navinfo ,at the intersection Yongfeng road and Beiqing road,Haidian District\r
@@ -6458,18 +6515,60 @@ E00000-EFFFFF     (base 16)             Beijing AutoAi Technology co. LTD
                                 HImeji  Hyogo  6700991\r
                                 JP\r
  \r
-40-11-75   (hex)               Beijing Gemotech Intelligent Technology Co., Ltd.\r
-800000-8FFFFF     (base 16)            Beijing Gemotech Intelligent Technology Co., Ltd.\r
-                               NO.1 Development Road,Beijing International Information Industrial Base,Huilongguan Town,Changping District\r
-                               Beijing  Beijing  102206\r
-                               CN\r
-\r
  40-11-75   (hex)               ADH Guardian USA\r
  900000-9FFFFF     (base 16)            ADH Guardian USA\r
                                 122 Penn St\r
                                 El Segundo  CA  90245\r
                                 US\r
  \r
+24-4E-7B   (hex)               Church & Dwight Co., Inc.\r
+D00000-DFFFFF     (base 16)            Church & Dwight Co., Inc.\r
+                               500 Charles Ewing Blvd\r
+                               Ewing  NJ  08628\r
+                               US\r
+\r
+04-D1-6E   (hex)               CHENGDU INTERLINK SCIENCE AND TECHNOLOGY CO.,LTD\r
+800000-8FFFFF     (base 16)            CHENGDU INTERLINK SCIENCE AND TECHNOLOGY CO.,LTD\r
+                               Room 1305, 12A Level, Wanke Huamao Building\r
+                               Sichuan  Chengdu  610051\r
+                               CN\r
+\r
+04-D1-6E   (hex)               PacPort Corporation\r
+C00000-CFFFFF     (base 16)            PacPort Corporation\r
+                               Ginza 6-10-1, GINZA SIX 13F, Chuo-ku\r
+                               Tokyo  Tokyo  1040061\r
+                               JP\r
+\r
+04-D1-6E   (hex)               ShenZhen Huafu Information technology Co.?Ltd\r
+400000-4FFFFF     (base 16)            ShenZhen Huafu Information technology Co.?Ltd\r
+                               T2-B5 FLOOR, shenzhen software park, gaoxin south 7th road, yuehai                street, nanshan district\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+44-03-77   (hex)               Stara S/A Indústria de Implementos Agrícolas\r
+700000-7FFFFF     (base 16)            Stara S/A Indústria de Implementos Agrícolas\r
+                               Avenida Stara 519\r
+                               Não-Me-Toque  Rio Grande do Sul  99470000\r
+                               BR\r
+\r
+04-D1-6E   (hex)               Launch Tech Co., Ltd.\r
+100000-1FFFFF     (base 16)            Launch Tech Co., Ltd.\r
+                               Launch Industrial Park, No.4012, North of Wuhe Road, Bantian Street, Longgang District,\r
+                               Shenzhen  Guangdong  518100\r
+                               CN\r
+\r
+04-D1-6E   (hex)               Envision Energy\r
+700000-7FFFFF     (base 16)            Envision Energy\r
+                               8/F, Building B, SOHO Zhongshan Plaza, 1065 West Zhongshan Road\r
+                               Shanghai     200051\r
+                               CN\r
+\r
+44-03-77   (hex)               Hangzhou Asia Infrastructure Tech. Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Hangzhou Asia Infrastructure Tech. Co., Ltd.\r
+                               No.7 Xiyuan Rd, Sandun Town, Westlake District\r
+                               Hangzhou  Zhejiang  310000\r
+                               CN\r
+\r
  20-85-93   (hex)               UNILUMIN GROUP CO.,LTD\r
  300000-3FFFFF     (base 16)            UNILUMIN GROUP CO.,LTD\r
                                 No.112 Yongfu Rd.,BaoanDistrict,\r
@@ -6488,6 +6587,9 @@ B00000-BFFFFF     (base 16)               Stored Energy Systems
                                 Longmont  CO  80501\r
                                 US\r
  \r
+DC-E5-33   (hex)               Private\r
+A00000-AFFFFF     (base 16)            Private\r
+\r
  24-15-10   (hex)               SHANDONG KEHUI POWER AUTOMATION CO. LTD.\r
  600000-6FFFFF     (base 16)            SHANDONG KEHUI POWER AUTOMATION CO. LTD.\r
                                  No. 16,Sanying Road\r
@@ -6500,9 +6602,6 @@ B00000-BFFFFF     (base 16)               Stored Energy Systems
                                 Dongguang    523617\r
                                 CN\r
  \r
-DC-E5-33   (hex)               Private\r
-A00000-AFFFFF     (base 16)            Private\r
-\r
  DC-44-27   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
@@ -6527,17 +6626,29 @@ F00000-FFFFFF     (base 16)             Private
  1C-21-D1   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
+FC-A4-7A   (hex)               SHENZHEN KUKU TECHNOLOGY CO.,LTD\r
+D00000-DFFFFF     (base 16)            SHENZHEN KUKU TECHNOLOGY CO.,LTD\r
+                               No.205,2F,17th Block,PingShan Industrial District,TaoYuan Street, NanShan\r
+                               ShenZhen  GuangDong  518055\r
+                               CN\r
+\r
  D0-5F-64   (hex)               Shenzhen Canzone Technology Co.,Ltd.\r
  D00000-DFFFFF     (base 16)            Shenzhen Canzone Technology Co.,Ltd.\r
                                 Minzhi Street Longhua District\r
                                 ShenZhen    518000\r
                                 CN\r
  \r
-FC-A4-7A   (hex)               KARRY COMMUNICATION LIMITED\r
-800000-8FFFFF     (base 16)            KARRY COMMUNICATION LIMITED\r
-                               FLAT/RM 705 7/F SUNBEAM PLAZA 1155 CANTON ROAD MONGKOK KL\r
-                               Hong Kong    999077\r
-                               HK\r
+2C-16-BD   (hex)               Curtiss-Wright Drive Technology\r
+100000-1FFFFF     (base 16)            Curtiss-Wright Drive Technology\r
+                               Badstrasse 5\r
+                               Neuhausen am Rheinfall  Schaffhausen  8212\r
+                               CH\r
+\r
+2C-16-BD   (hex)               Saft AB\r
+300000-3FFFFF     (base 16)            Saft AB\r
+                               Jungnergatan\r
+                               Oskarshamn    57228\r
+                               SE\r
  \r
  2C-16-BD   (hex)               Beijing Jishi Huitong Technology Co., Ltd.\r
  000000-0FFFFF     (base 16)            Beijing Jishi Huitong Technology Co., Ltd.\r
@@ -6563,30 +6674,24 @@ FC-A4-7A   (hex)                KARRY COMMUNICATION LIMITED
                                 Shanghai  Shanghai  200233\r
                                 CN\r
  \r
-2C-16-BD   (hex)               Curtiss-Wright Drive Technology\r
-100000-1FFFFF     (base 16)            Curtiss-Wright Drive Technology\r
-                               Badstrasse 5\r
-                               Neuhausen am Rheinfall  Schaffhausen  8212\r
-                               CH\r
-\r
-2C-16-BD   (hex)               Saft AB\r
-300000-3FFFFF     (base 16)            Saft AB\r
-                               Jungnergatan\r
-                               Oskarshamn    57228\r
-                               SE\r
-\r
-FC-A4-7A   (hex)               SHENZHEN KUKU TECHNOLOGY CO.,LTD\r
-D00000-DFFFFF     (base 16)            SHENZHEN KUKU TECHNOLOGY CO.,LTD\r
-                               No.205,2F,17th Block,PingShan Industrial District,TaoYuan Street, NanShan\r
-                               ShenZhen  GuangDong  518055\r
-                               CN\r
-\r
  FC-A4-7A   (hex)               Oberix Group Pty Ltd\r
  900000-9FFFFF     (base 16)            Oberix Group Pty Ltd\r
                                 22 McIntyre Street\r
                                 Burwood  VIC  3125\r
                                 AU\r
  \r
+FC-A4-7A   (hex)               KARRY COMMUNICATION LIMITED\r
+800000-8FFFFF     (base 16)            KARRY COMMUNICATION LIMITED\r
+                               FLAT/RM 705 7/F SUNBEAM PLAZA 1155 CANTON ROAD MONGKOK KL\r
+                               Hong Kong    999077\r
+                               HK\r
+\r
+8C-59-3C   (hex)               Nanonord A/S\r
+800000-8FFFFF     (base 16)            Nanonord A/S\r
+                               Skjernvej 4A\r
+                               Aalborg    9220\r
+                               DK\r
+\r
  8C-59-3C   (hex)               Future Robot Technology Co., Limited\r
  100000-1FFFFF     (base 16)            Future Robot Technology Co., Limited\r
                                 Room 406 Block A South Wind Tower, Nanshan Cloud Valley Innovation Industry Park, No 4093 Lau Sin Avenue Taoyuan Street Nanshan District\r
@@ -6599,12 +6704,6 @@ FC-A4-7A   (hex)         Oberix Group Pty Ltd
                                 Sunnyvale  CA  94085\r
                                 US\r
  \r
-8C-59-3C   (hex)               Nanonord A/S\r
-800000-8FFFFF     (base 16)            Nanonord A/S\r
-                               Skjernvej 4A\r
-                               Aalborg    9220\r
-                               DK\r
-\r
  B4-A2-EB   (hex)               SHENZHEN ZHUIFENGMA TECHNOLOGY CO., LTD\r
  800000-8FFFFF     (base 16)            SHENZHEN ZHUIFENGMA TECHNOLOGY CO., LTD\r
                                 2 FLOOR WEST WING BLOCK 3  NO.28 LANGSHAN ROAD, NANSHAN DISTRICT \r
@@ -6617,6 +6716,18 @@ D00000-DFFFFF     (base 16)              SALZBRENNER media GmbH
                                 Buttenheim    96155\r
                                 DE\r
  \r
+BC-97-40   (hex)               Shenzhen Colorwin Optical Technology Co.,Ltd\r
+600000-6FFFFF     (base 16)            Shenzhen Colorwin Optical Technology Co.,Ltd\r
+                               201-2，2nd Floor,G3 Building, TCL International E City,1001 Zhongshanyuan Road,Nanshan District\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
+\r
+BC-97-40   (hex)               Direct Communication Solutions\r
+900000-9FFFFF     (base 16)            Direct Communication Solutions\r
+                               17150 Via del Campo, Ste 200\r
+                               San Diego  CA  92127\r
+                               US\r
+\r
  D0-C8-57   (hex)               Nanjing Magewell Electronics Co.,Ltd\r
  800000-8FFFFF     (base 16)            Nanjing Magewell Electronics Co.,Ltd\r
                                 14th Floor, Building 3, No. 89 Shengli Road, Jiangning Economic and Technological Development Zone\r
@@ -6635,12 +6746,6 @@ E00000-EFFFFF     (base 16)              B4ComTechnologies LLC
                                 Moscow    117292\r
                                 RU\r
  \r
-BC-97-40   (hex)               Shenzhen Colorwin Optical Technology Co.,Ltd\r
-600000-6FFFFF     (base 16)            Shenzhen Colorwin Optical Technology Co.,Ltd\r
-                               201-2，2nd Floor,G3 Building, TCL International E City,1001 Zhongshanyuan Road,Nanshan District\r
-                               Shenzhen  Guangdong  518055\r
-                               CN\r
-\r
  BC-97-40   (hex)               Amap Information Technology Co., Ltd\r
  A00000-AFFFFF     (base 16)            Amap Information Technology Co., Ltd\r
                                 A051, No.01, 3/F, No.55 Suzhou Street, Haidian District\r
@@ -6659,35 +6764,23 @@ D0-C8-57   (hex)                YUAN High-Tech Development Co., Ltd.
                                 Taipei,   Taiwan   10050 \r
                                 TW\r
  \r
-BC-97-40   (hex)               Direct Communication Solutions\r
-900000-9FFFFF     (base 16)            Direct Communication Solutions\r
-                               17150 Via del Campo, Ste 200\r
-                               San Diego  CA  92127\r
-                               US\r
-\r
  BC-97-40   (hex)               Wind Mobility Technology (Beijing) Co., Ltd\r
  400000-4FFFFF     (base 16)            Wind Mobility Technology (Beijing) Co., Ltd\r
                                 13603, Building 13, No. 2, Nanzhuzhang Hutong, Dongcheng District\r
                                 Beijing  Beijing  100010\r
                                 CN\r
  \r
-1C-82-59   (hex)               Microtronics Engineering GmbH\r
-E00000-EFFFFF     (base 16)            Microtronics Engineering GmbH\r
-                               Hauptstrasse 7\r
-                               Ruprechtshofen    3244\r
-                               AT\r
-\r
  60-95-CE   (hex)               Q-SENTECH Co.,Ltd.\r
  200000-2FFFFF     (base 16)            Q-SENTECH Co.,Ltd.\r
                                 #201,170 Seonyu-ro, Yeongdeungpo-gu\r
                                 Seoul  Korea  07255\r
                                 KR\r
  \r
-1C-82-59   (hex)               SHENZHEN AOA TECHNOLOGY CO.,LTD\r
-800000-8FFFFF     (base 16)            SHENZHEN AOA TECHNOLOGY CO.,LTD\r
-                               B624,C1 Building,Hengchao Industrial Park,Tangtou Road,Shiyan,Bao'an District\r
-                               SHENZHEN  Guangdong  518108\r
-                               CN\r
+1C-82-59   (hex)               Microtronics Engineering GmbH\r
+E00000-EFFFFF     (base 16)            Microtronics Engineering GmbH\r
+                               Hauptstrasse 7\r
+                               Ruprechtshofen    3244\r
+                               AT\r
  \r
  1C-82-59   (hex)               Diatrend Corporation\r
  200000-2FFFFF     (base 16)            Diatrend Corporation\r
@@ -6695,17 +6788,11 @@ E00000-EFFFFF     (base 16)             Microtronics Engineering GmbH
                                 Osaka  Osaka  530-0011\r
                                 JP\r
  \r
-B0-FD-0B   (hex)               Everynet Oy\r
-700000-7FFFFF     (base 16)            Everynet Oy\r
-                               At Azets Insight Oy, Hatanpään valtatie 26 (5.krs)\r
-                               Tampere    33100\r
-                               FI\r
-\r
-84-8B-CD   (hex)               Logic Supply\r
-400000-4FFFFF     (base 16)            Logic Supply\r
-                               35 Thompson St\r
-                               South Burlington  VT  05403\r
-                               US\r
+1C-82-59   (hex)               SHENZHEN AOA TECHNOLOGY CO.,LTD\r
+800000-8FFFFF     (base 16)            SHENZHEN AOA TECHNOLOGY CO.,LTD\r
+                               B624,C1 Building,Hengchao Industrial Park,Tangtou Road,Shiyan,Bao'an District\r
+                               SHENZHEN  Guangdong  518108\r
+                               CN\r
  \r
  84-8B-CD   (hex)               WORMIT\r
  C00000-CFFFFF     (base 16)            WORMIT\r
@@ -6713,12 +6800,6 @@ C00000-CFFFFF     (base 16)              WORMIT
                                 New Taipei City    22101\r
                                 TW\r
  \r
-1C-82-59   (hex)               Shanghai Xiaoyan Technology Co., Ltd.\r
-900000-9FFFFF     (base 16)            Shanghai Xiaoyan Technology Co., Ltd.\r
-                               Room 503, Building B, NO. 2305, Zuchongzhi Road\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
-\r
  B0-FD-0B   (hex)               Taian Yuqi Communication Technology Co., Ltd\r
  500000-5FFFFF     (base 16)            Taian Yuqi Communication Technology Co., Ltd\r
                                 Building 4, Fengxiang Road, Tai'an Development Zone\r
@@ -6731,6 +6812,24 @@ B0-FD-0B   (hex)         Eagle Acoustics Manufacturing, LLC
                                 MUNDELEIN  IL  60060-4214\r
                                 US\r
  \r
+1C-82-59   (hex)               Shanghai Xiaoyan Technology Co., Ltd.\r
+900000-9FFFFF     (base 16)            Shanghai Xiaoyan Technology Co., Ltd.\r
+                               Room 503, Building B, NO. 2305, Zuchongzhi Road\r
+                               Shanghai  Shanghai  201203\r
+                               CN\r
+\r
+84-8B-CD   (hex)               Logic Supply\r
+400000-4FFFFF     (base 16)            Logic Supply\r
+                               35 Thompson St\r
+                               South Burlington  VT  05403\r
+                               US\r
+\r
+B0-FD-0B   (hex)               Everynet Oy\r
+700000-7FFFFF     (base 16)            Everynet Oy\r
+                               At Azets Insight Oy, Hatanpään valtatie 26 (5.krs)\r
+                               Tampere    33100\r
+                               FI\r
+\r
  B0-FD-0B   (hex)               Vista Manufacturing\r
  200000-2FFFFF     (base 16)            Vista Manufacturing\r
                                 53345 Columbia Drive\r
@@ -6740,9 +6839,6 @@ B0-FD-0B   (hex)          Vista Manufacturing
  8C-14-7D   (hex)               Private\r
  100000-1FFFFF     (base 16)            Private\r
  \r
-1C-CA-E3   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
  C8-2C-2B   (hex)               RF Engineering and Energy Resource\r
  300000-3FFFFF     (base 16)            RF Engineering and Energy Resource\r
                                 4460 Commercial Ave.\r
@@ -6761,24 +6857,27 @@ C8-2C-2B   (hex)                DALCO AG
                                 Volketswil  ZH  8604\r
                                 CH\r
  \r
+1C-CA-E3   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  C8-63-14   (hex)               Optictimes Co.,Ltd\r
  A00000-AFFFFF     (base 16)            Optictimes Co.,Ltd\r
                                 Hangzhou City,  Zhejiang Province\r
                                 Hangzhou  Zhejiang  310023\r
                                 CN\r
  \r
-E4-1E-0A   (hex)               Zavod № 423\r
-000000-0FFFFF     (base 16)            Zavod № 423\r
-                               2B, Zavodskoy proezd\r
-                               Bogoroditsk  Tula  301830\r
-                               RU\r
-\r
  E4-1E-0A   (hex)               Tritium Pty Ltd\r
  700000-7FFFFF     (base 16)            Tritium Pty Ltd\r
                                 1/31 Archimedes PL.\r
                                 Murarrie  QLD   4172\r
                                 AU\r
  \r
+E4-1E-0A   (hex)               Zavod № 423\r
+000000-0FFFFF     (base 16)            Zavod № 423\r
+                               2B, Zavodskoy proezd\r
+                               Bogoroditsk  Tula  301830\r
+                               RU\r
+\r
  CC-D3-9D   (hex)               Shanghai tongli information technology co. LTD\r
  E00000-EFFFFF     (base 16)            Shanghai tongli information technology co. LTD\r
                                 Floor 2, building 1, liqin building, No.1885, metropolis road, minhang district\r
@@ -6797,24 +6896,30 @@ FC-D2-B6   (hex)                Winglet Systems Inc.
                                  Yokohama  Kanagawa  222-0033\r
                                 JP\r
  \r
-34-E1-D1   (hex)               SAMA NextGen PTE Limited\r
-100000-1FFFFF     (base 16)            SAMA NextGen PTE Limited\r
-                                 16 Collyer Quay, #21-00 Income AT Raffels,  Singapore 049318\r
-                               Singapore    049318\r
-                               SG\r
-\r
  34-E1-D1   (hex)               CREW by True Rowing, Inc.\r
  C00000-CFFFFF     (base 16)            CREW by True Rowing, Inc.\r
                                 14 Arrow St, Floor 4\r
                                 Cambridge  MA  02138\r
                                 US\r
  \r
+34-E1-D1   (hex)               SAMA NextGen PTE Limited\r
+100000-1FFFFF     (base 16)            SAMA NextGen PTE Limited\r
+                                 16 Collyer Quay, #21-00 Income AT Raffels,  Singapore 049318\r
+                               Singapore    049318\r
+                               SG\r
+\r
  34-E1-D1   (hex)               HI-TECH.ORG\r
  D00000-DFFFFF     (base 16)            HI-TECH.ORG\r
                                 Volgogradskiy prospekt, 43, k.3, room XXVI\r
                                 Moscow     109316\r
                                 RU\r
  \r
+D4-7C-44   (hex)               Huaqin Telecom Technology Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            Huaqin Telecom Technology Co.,Ltd.\r
+                               Building 1,No.399, Keyuan Road, Pudong, Shanghai China\r
+                               Shanghai    200120\r
+                               CN\r
+\r
  FC-D2-B6   (hex)               Soma GmbH\r
  200000-2FFFFF     (base 16)            Soma GmbH\r
                                 Gewerbering 9\r
@@ -6833,21 +6938,12 @@ E4-4C-C7   (hex)                Alert Alarm AB
                                 Solna  Stockholm  16967\r
                                 SE\r
  \r
-D4-7C-44   (hex)               Huaqin Telecom Technology Co.,Ltd.\r
-D00000-DFFFFF     (base 16)            Huaqin Telecom Technology Co.,Ltd.\r
-                               Building 1,No.399, Keyuan Road, Pudong, Shanghai China\r
-                               Shanghai    200120\r
-                               CN\r
-\r
  4C-BC-98   (hex)               Shenzhen Shanling Digital Technology Development Co.,Ltd.\r
  800000-8FFFFF     (base 16)            Shenzhen Shanling Digital Technology Development Co.,Ltd.\r
                                 No.10, Chiwan 1 Road, Shekou, Nanshan\r
                                 Shenzhen  GuangDong  518068\r
                                 CN\r
  \r
-8C-C8-F4   (hex)               Private\r
-700000-7FFFFF     (base 16)            Private\r
-\r
  E4-4C-C7   (hex)               JSC Svyaz Inginiring M\r
  300000-3FFFFF     (base 16)            JSC Svyaz Inginiring M\r
                                 Varshavskoe Shosse, 42\r
@@ -6860,6 +6956,15 @@ E4-4C-C7   (hex)         JSC Svyaz Inginiring M
                                 Seongnam  Gyeonggi  13631\r
                                 KR\r
  \r
+E0-5A-9F   (hex)               ShenZhen Arts Changhua Intelligent Technology Co., Ltd\r
+E00000-EFFFFF     (base 16)            ShenZhen Arts Changhua Intelligent Technology Co., Ltd\r
+                               15i, Taibang Science & Technology Building, Science and Technology South 8th Road, Hi-Tech Park South Area\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+8C-C8-F4   (hex)               Private\r
+700000-7FFFFF     (base 16)            Private\r
+\r
  98-02-D8   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
@@ -6887,12 +6992,6 @@ E00000-EFFFFF     (base 16)              viRaTec GmbH
                                 Wien    1040\r
                                 AT\r
  \r
-E0-5A-9F   (hex)               ShenZhen Arts Changhua Intelligent Technology Co., Ltd\r
-E00000-EFFFFF     (base 16)            ShenZhen Arts Changhua Intelligent Technology Co., Ltd\r
-                               15i, Taibang Science & Technology Building, Science and Technology South 8th Road, Hi-Tech Park South Area\r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
  38-B1-9E   (hex)               Basalte BVBA\r
  400000-4FFFFF     (base 16)            Basalte BVBA\r
                                 Hundelgemsesteenweg 1a\r
@@ -6992,12 +7091,6 @@ C00000-CFFFFF     (base 16)              Toucan Systems Ltd
                                 Berlin    12099\r
                                 DE\r
  \r
-98-F9-C7   (hex)               HighSecLabs\r
-100000-1FFFFF     (base 16)            HighSecLabs\r
-                               29 Haeshel St\r
-                               Caesarea    3088900\r
-                               IL\r
-\r
  98-F9-C7   (hex)               Renalsense\r
  800000-8FFFFF     (base 16)            Renalsense\r
                                 Hamarpe 3\r
@@ -7010,24 +7103,30 @@ C00000-CFFFFF     (base 16)             Toucan Systems Ltd
                                 Shenzhen  Guangdong  518129\r
                                 CN\r
  \r
+98-F9-C7   (hex)               HighSecLabs\r
+100000-1FFFFF     (base 16)            HighSecLabs\r
+                               29 Haeshel St\r
+                               Caesarea    3088900\r
+                               IL\r
+\r
  0C-FE-5D   (hex)               CTK Contact Electronics co., Ltd.\r
  800000-8FFFFF     (base 16)            CTK Contact Electronics co., Ltd.\r
                                 6F-5, No79, Sec 1, Xintai 5th RD, Xizhi Dist\r
                                 New Taipei City    22101\r
                                 TW\r
  \r
-A4-58-0F   (hex)               Homebeaver\r
-C00000-CFFFFF     (base 16)            Homebeaver\r
-                               3 place ville marie, 4th floor\r
-                               Montreal  Quebec  H3B 2E3\r
-                               CA\r
-\r
  0C-FE-5D   (hex)               Fujian Jieyu Computer Technology Co., Ltd.\r
  A00000-AFFFFF     (base 16)            Fujian Jieyu Computer Technology Co., Ltd.\r
                                 3rd Floor, Building 21, Cangshan Park, Jinshan Orange Garden Industrial Park, Cangshan District\r
                                 Fuzhou  Fujian  350000 \r
                                 CN\r
  \r
+A4-58-0F   (hex)               Homebeaver\r
+C00000-CFFFFF     (base 16)            Homebeaver\r
+                               3 place ville marie, 4th floor\r
+                               Montreal  Quebec  H3B 2E3\r
+                               CA\r
+\r
  6C-5C-3D   (hex)               Clinton Electronics Corporation\r
  E00000-EFFFFF     (base 16)            Clinton Electronics Corporation\r
                                 6701 Clinton Road\r
@@ -7040,24 +7139,6 @@ E00000-EFFFFF     (base 16)              Clinton Electronics Corporation
                                 HONG KONG  HONG KONG  999077\r
                                 HK\r
  \r
-6C-5C-3D   (hex)               Hangzhou Netease Yanxuan Trading Co.,Ltd\r
-600000-6FFFFF     (base 16)            Hangzhou Netease Yanxuan Trading Co.,Ltd\r
-                               Room 410,No.4 Building,No.599 Road Wangshang, \r
-                               Hangzhou, Binjiang District,  Zhejiang Province  310052\r
-                               CN\r
-\r
-6C-5C-3D   (hex)               Shenzhen Justek Technology Co., Ltd\r
-100000-1FFFFF     (base 16)            Shenzhen Justek Technology Co., Ltd\r
-                               5/F, Building No.818, Qingtiexi Mabu Community, Bao 'an DistrictXixiang Street,\r
-                               Shenzhen  Guangdong  518102\r
-                               CN\r
-\r
-3C-6A-2C   (hex)               Homegear GmbH\r
-700000-7FFFFF     (base 16)            Homegear GmbH\r
-                               Am Schützenplatz 3\r
-                               Preetz  Schleswig-Holstein  24211\r
-                               DE\r
-\r
  1C-FD-08   (hex)               sunweit industrial limited\r
  700000-7FFFFF     (base 16)            sunweit industrial limited\r
                                 Block A ,503B Room,Zhihui Innovation Centre\r
@@ -7076,18 +7157,6 @@ B00000-BFFFFF     (base 16)              guangzhou huiqun intelligent technology co. LTD
                                 guangzhou  guangdong  511436\r
                                 CN\r
  \r
-1C-FD-08   (hex)               Umeox Innovations Co.,Ltd\r
-300000-3FFFFF     (base 16)            Umeox Innovations Co.,Ltd\r
-                               Room 1208-09, Research Building, Tsinghua Information Port, No. 1, Xindong Road, Nanshan District, Shenzhen\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
-3C-6A-2C   (hex)               Beijing Donghua Hongtai Polytron Technologies Inc\r
-E00000-EFFFFF     (base 16)            Beijing Donghua Hongtai Polytron Technologies Inc\r
-                               Room 126,Layer 1, Mudan building, , Huayuan Road No. 2, Haidian District\r
-                               Beijing  Beijing  100089\r
-                               CN\r
-\r
  1C-FD-08   (hex)               SABIK Offshore GmbH\r
  400000-4FFFFF     (base 16)            SABIK Offshore GmbH\r
                                 Wilhelm-Maybach-Straße 3\r
@@ -7100,12 +7169,42 @@ E00000-EFFFFF     (base 16)             Beijing Donghua Hongtai Polytron Technologies Inc
                                 Christchurch    BH236EW\r
                                 GB\r
  \r
+1C-FD-08   (hex)               Umeox Innovations Co.,Ltd\r
+300000-3FFFFF     (base 16)            Umeox Innovations Co.,Ltd\r
+                               Room 1208-09, Research Building, Tsinghua Information Port, No. 1, Xindong Road, Nanshan District, Shenzhen\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+6C-5C-3D   (hex)               Hangzhou Netease Yanxuan Trading Co.,Ltd\r
+600000-6FFFFF     (base 16)            Hangzhou Netease Yanxuan Trading Co.,Ltd\r
+                               Room 410,No.4 Building,No.599 Road Wangshang, \r
+                               Hangzhou, Binjiang District,  Zhejiang Province  310052\r
+                               CN\r
+\r
+6C-5C-3D   (hex)               Shenzhen Justek Technology Co., Ltd\r
+100000-1FFFFF     (base 16)            Shenzhen Justek Technology Co., Ltd\r
+                               5/F, Building No.818, Qingtiexi Mabu Community, Bao 'an DistrictXixiang Street,\r
+                               Shenzhen  Guangdong  518102\r
+                               CN\r
+\r
+3C-6A-2C   (hex)               Beijing Donghua Hongtai Polytron Technologies Inc\r
+E00000-EFFFFF     (base 16)            Beijing Donghua Hongtai Polytron Technologies Inc\r
+                               Room 126,Layer 1, Mudan building, , Huayuan Road No. 2, Haidian District\r
+                               Beijing  Beijing  100089\r
+                               CN\r
+\r
  D0-22-12   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
  CC-1B-E0   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
+3C-6A-2C   (hex)               Homegear GmbH\r
+700000-7FFFFF     (base 16)            Homegear GmbH\r
+                               Am Schützenplatz 3\r
+                               Preetz  Schleswig-Holstein  24211\r
+                               DE\r
+\r
  30-0A-60   (hex)               Sixth Energy Technologies Private Limited\r
  D00000-DFFFFF     (base 16)            Sixth Energy Technologies Private Limited\r
                                 #62, Sri Varda, 10th main, HMT Layout, R.T.Nagar\r
@@ -7118,17 +7217,14 @@ D00000-DFFFFF     (base 16)             Sixth Energy Technologies Private Limited
                                 Granada Hills  CA  91344-4502\r
                                 US\r
  \r
-3C-6A-2C   (hex)               La Barrière Automatique\r
-600000-6FFFFF     (base 16)            La Barrière Automatique\r
-                               451 chemin de Champivost\r
-                               Limonest    69760\r
-                               FR\r
+30-0A-60   (hex)               Private\r
+300000-3FFFFF     (base 16)            Private\r
  \r
-30-0A-60   (hex)               Imageo s.r.o.\r
-E00000-EFFFFF     (base 16)            Imageo s.r.o.\r
-                               Golcova 485\r
-                               Praha    14800\r
-                               CZ\r
+30-0A-60   (hex)               KAZUtechnica Co.,Ltd.\r
+000000-0FFFFF     (base 16)            KAZUtechnica Co.,Ltd.\r
+                               1-9-18,Chuo,Chuo-ku\r
+                               Sagamihara-shi  Kanagawa  2520239\r
+                               JP\r
  \r
  30-0A-60   (hex)               A9\r
  500000-5FFFFF     (base 16)            A9\r
@@ -7136,14 +7232,17 @@ E00000-EFFFFF     (base 16)             Imageo s.r.o.
                                 BUCHEON-SI  GYEONGGI-DO  14555\r
                                 KR\r
  \r
-30-0A-60   (hex)               KAZUtechnica Co.,Ltd.\r
-000000-0FFFFF     (base 16)            KAZUtechnica Co.,Ltd.\r
-                               1-9-18,Chuo,Chuo-ku\r
-                               Sagamihara-shi  Kanagawa  2520239\r
-                               JP\r
+30-0A-60   (hex)               Imageo s.r.o.\r
+E00000-EFFFFF     (base 16)            Imageo s.r.o.\r
+                               Golcova 485\r
+                               Praha    14800\r
+                               CZ\r
  \r
-30-0A-60   (hex)               Private\r
-300000-3FFFFF     (base 16)            Private\r
+3C-6A-2C   (hex)               La Barrière Automatique\r
+600000-6FFFFF     (base 16)            La Barrière Automatique\r
+                               451 chemin de Champivost\r
+                               Limonest    69760\r
+                               FR\r
  \r
  74-E1-4A   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
@@ -7151,18 +7250,18 @@ F00000-FFFFFF     (base 16)             Private
  C8-8E-D1   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
-A0-28-33   (hex)               IMESHX CORPORATION LIMITED\r
-900000-9FFFFF     (base 16)            IMESHX CORPORATION LIMITED\r
-                               10A7F, ShenZhen Bay Technology Ecological Park, NanShan District,\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
  A4-ED-43   (hex)               Heyuan intelligence technology CO.,Ltd\r
  900000-9FFFFF     (base 16)            Heyuan intelligence technology CO.,Ltd\r
                                 No.1166 Xinluo Street\r
                                 Jinan City  Shandong Province  250101\r
                                 CN\r
  \r
+A0-28-33   (hex)               JGR Optics Inc\r
+500000-5FFFFF     (base 16)            JGR Optics Inc\r
+                               160 Michael Cowpland Drive\r
+                               Ottawa  Ontario  K2M 1P6\r
+                               CA\r
+\r
  A0-28-33   (hex)               Firm INFORMTEST Ltd.\r
  400000-4FFFFF     (base 16)            Firm INFORMTEST Ltd.\r
                                 APT. 8, LODG. XIV ,FL.6, bld.4, Passage Savelkinsky\r
@@ -7175,36 +7274,12 @@ A0-28-33   (hex)                Kryptus Information Security S/A
                                 Cidade Universitaria  Campinas-SP  CEP 13083-820\r
                                 BR\r
  \r
-A0-28-33   (hex)               JGR Optics Inc\r
-500000-5FFFFF     (base 16)            JGR Optics Inc\r
-                               160 Michael Cowpland Drive\r
-                               Ottawa  Ontario  K2M 1P6\r
-                               CA\r
-\r
-30-09-F9   (hex)               Maytronics Ltd.\r
-700000-7FFFFF     (base 16)            Maytronics Ltd.\r
-                               Kibbutz Yizrael\r
-                               Kibbutz Yizrael    1935000\r
-                               IL\r
-\r
-30-09-F9   (hex)               Shenzhen Sunvell Electronics Co., Ltd.\r
-100000-1FFFFF     (base 16)            Shenzhen Sunvell Electronics Co., Ltd.\r
-                               5th Floor, Building F, Hongzhu Yongqi Technology Park, Lezhujiao Village, Xixiang Town, Bao’ an District,\r
-                               Shenzhen  GuangDong  518000\r
-                               CN\r
-\r
-30-09-F9   (hex)               Shenzhen Tencent Computer System Co., Ltd.\r
-A00000-AFFFFF     (base 16)            Shenzhen Tencent Computer System Co., Ltd.\r
-                               5-10 Building High-tech Zone, Nanshan District, \r
-                               Shenzhen  Guangdong Province  518057\r
+A0-28-33   (hex)               IMESHX CORPORATION LIMITED\r
+900000-9FFFFF     (base 16)            IMESHX CORPORATION LIMITED\r
+                               10A7F, ShenZhen Bay Technology Ecological Park, NanShan District,\r
+                               Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-30-09-F9   (hex)               VELSITEC-CLIBASE\r
-500000-5FFFFF     (base 16)            VELSITEC-CLIBASE\r
-                               LA RATELIERE\r
-                               SAINT-JUST-MALMONT  Haute-Loire  43240\r
-                               FR\r
-\r
  9C-F6-DD   (hex)               Savari Inc\r
  800000-8FFFFF     (base 16)            Savari Inc\r
                                 2005 De la cruz blvd, st 111,\r
@@ -7220,12 +7295,6 @@ A00000-AFFFFF     (base 16)              Shenzhen Tencent Computer System Co., Ltd.
                                 Beijing  Beijing  100005\r
                                 CN\r
  \r
-30-09-F9   (hex)               essence security\r
-800000-8FFFFF     (base 16)            essence security\r
-                               Aba Even 12 st \r
-                               Herzelia    4672530\r
-                               IL\r
-\r
  84-89-EC   (hex)               Newell Brands\r
  A00000-AFFFFF     (base 16)            Newell Brands\r
                                 221 River Street\r
@@ -7238,6 +7307,42 @@ B00000-BFFFFF     (base 16)              EPSa Elektronik & Präzisionsbau Saalfeld GmbH
                                 Saalfeld/Saale    07318\r
                                 DE\r
  \r
+30-09-F9   (hex)               Shenzhen Sunvell Electronics Co., Ltd.\r
+100000-1FFFFF     (base 16)            Shenzhen Sunvell Electronics Co., Ltd.\r
+                               5th Floor, Building F, Hongzhu Yongqi Technology Park, Lezhujiao Village, Xixiang Town, Bao’ an District,\r
+                               Shenzhen  GuangDong  518000\r
+                               CN\r
+\r
+30-09-F9   (hex)               Shenzhen Tencent Computer System Co., Ltd.\r
+A00000-AFFFFF     (base 16)            Shenzhen Tencent Computer System Co., Ltd.\r
+                               5-10 Building High-tech Zone, Nanshan District, \r
+                               Shenzhen  Guangdong Province  518057\r
+                               CN\r
+\r
+30-09-F9   (hex)               essence security\r
+800000-8FFFFF     (base 16)            essence security\r
+                               Aba Even 12 st \r
+                               Herzelia    4672530\r
+                               IL\r
+\r
+30-09-F9   (hex)               Maytronics Ltd.\r
+700000-7FFFFF     (base 16)            Maytronics Ltd.\r
+                               Kibbutz Yizrael\r
+                               Kibbutz Yizrael    1935000\r
+                               IL\r
+\r
+30-09-F9   (hex)               VELSITEC-CLIBASE\r
+500000-5FFFFF     (base 16)            VELSITEC-CLIBASE\r
+                               LA RATELIERE\r
+                               SAINT-JUST-MALMONT  Haute-Loire  43240\r
+                               FR\r
+\r
+C0-83-59   (hex)               Shenzhen Pay Device Technology Co., Ltd.\r
+900000-9FFFFF     (base 16)            Shenzhen Pay Device Technology Co., Ltd.\r
+                               Room 502,Peng’s Building,Fanshen Road,43# Baoan District\r
+                               Shenzhen  Guangdong  518101\r
+                               CN\r
+\r
  9C-F6-DD   (hex)               RYEEX Technology Co.,Ltd.\r
  300000-3FFFFF     (base 16)            RYEEX Technology Co.,Ltd.\r
                                 RM106,Joinin Hub,Builing J District 71,Construction Industrial Park,Xin'an Street,Bao'an, Shenzhen,China\r
@@ -7250,12 +7355,6 @@ C00000-CFFFFF     (base 16)              Lighting New Energy Technology Co., Ltd.
                                 Shenzhen  Guangdong  518100\r
                                 CN\r
  \r
-C0-83-59   (hex)               Shenzhen Pay Device Technology Co., Ltd.\r
-900000-9FFFFF     (base 16)            Shenzhen Pay Device Technology Co., Ltd.\r
-                               Room 502,Peng’s Building,Fanshen Road,43# Baoan District\r
-                               Shenzhen  Guangdong  518101\r
-                               CN\r
-\r
  C0-83-59   (hex)               Cyber Sciences, Inc.\r
  E00000-EFFFFF     (base 16)            Cyber Sciences, Inc.\r
                                 229 Castlewood Dr, Suite E\r
@@ -7265,35 +7364,17 @@ E00000-EFFFFF     (base 16)             Cyber Sciences, Inc.
  C0-83-59   (hex)               Private\r
  C00000-CFFFFF     (base 16)            Private\r
  \r
-04-C3-E6   (hex)               Flintec UK Ltd.\r
-B00000-BFFFFF     (base 16)            Flintec UK Ltd.\r
-                               W4/5 Capital Point, Wentloog Avenue\r
-                               Cardiff  Cardiff  CF3 2PW\r
-                               GB\r
-\r
-C0-83-59   (hex)               Viper Design, LLC\r
-500000-5FFFFF     (base 16)            Viper Design, LLC\r
-                               125 Glancy St.\r
-                               Goodlettsville  TN  37072\r
-                               US\r
-\r
  C0-83-59   (hex)               Huaxin SM Optics Co. LTD.\r
  200000-2FFFFF     (base 16)            Huaxin SM Optics Co. LTD.\r
                                 5F,B8,Tianfu software Park,Tianfu Road\r
                                 Chengdu  Sichuan  610041\r
                                 CN\r
  \r
-04-C3-E6   (hex)               Extech Electronics Co., LTD.\r
-300000-3FFFFF     (base 16)            Extech Electronics Co., LTD.\r
-                               17F., No.237, Sec. 1, Datong Rd., Xizhi Dist.\r
-                               New Taipei City    22161\r
-                               TW\r
-\r
-04-C3-E6   (hex)               Invasys\r
-500000-5FFFFF     (base 16)            Invasys\r
-                               Sochorova 36\r
-                               Brno    616 00\r
-                               CZ\r
+04-C3-E6   (hex)               Flintec UK Ltd.\r
+B00000-BFFFFF     (base 16)            Flintec UK Ltd.\r
+                               W4/5 Capital Point, Wentloog Avenue\r
+                               Cardiff  Cardiff  CF3 2PW\r
+                               GB\r
  \r
  3C-42-7E   (hex)               Grandway Technology (Shenzhen) Limited\r
  000000-0FFFFF     (base 16)            Grandway Technology (Shenzhen) Limited\r
@@ -7307,53 +7388,77 @@ C0-83-59   (hex)                Huaxin SM Optics Co. LTD.
                                 istanbul    34450\r
                                 TR\r
  \r
+04-C3-E6   (hex)               Invasys\r
+500000-5FFFFF     (base 16)            Invasys\r
+                               Sochorova 36\r
+                               Brno    616 00\r
+                               CZ\r
+\r
+04-C3-E6   (hex)               Extech Electronics Co., LTD.\r
+300000-3FFFFF     (base 16)            Extech Electronics Co., LTD.\r
+                               17F., No.237, Sec. 1, Datong Rd., Xizhi Dist.\r
+                               New Taipei City    22161\r
+                               TW\r
+\r
+C0-83-59   (hex)               Viper Design, LLC\r
+500000-5FFFFF     (base 16)            Viper Design, LLC\r
+                               125 Glancy St.\r
+                               Goodlettsville  TN  37072\r
+                               US\r
+\r
+B4-4B-D6   (hex)               Qstar Technology Co,Ltd \r
+900000-9FFFFF     (base 16)            Qstar Technology Co,Ltd \r
+                               311# Xindongxing Business Centre ,2rd Road liuxian ,Bao'an Shenzhen China\r
+                               Shenzhen   Guangdong   518100\r
+                               CN\r
+\r
  B4-4B-D6   (hex)               CHUNGHSIN INTERNATIONAL ELECTRONICS CO.,LTD.\r
  E00000-EFFFFF     (base 16)            CHUNGHSIN INTERNATIONAL ELECTRONICS CO.,LTD.\r
                                 618-2# Gongren West Road,Jiaojiang,\r
                                 Taizhou  Zhejiang  317700\r
                                 CN\r
  \r
+B4-4B-D6   (hex)               Arnouse Digital Devices Corp\r
+800000-8FFFFF     (base 16)            Arnouse Digital Devices Corp\r
+                               1983 Marcus Ave, Suite 104\r
+                               Lake Success  NY  11042\r
+                               US\r
+\r
  3C-42-7E   (hex)               Teknoware Oy\r
  400000-4FFFFF     (base 16)            Teknoware Oy\r
                                 Ilmarisentie 8\r
                                 Lahti    15200\r
                                 FI\r
  \r
-B4-4B-D6   (hex)               Qstar Technology Co,Ltd \r
-900000-9FFFFF     (base 16)            Qstar Technology Co,Ltd \r
-                               311# Xindongxing Business Centre ,2rd Road liuxian ,Bao'an Shenzhen China\r
-                               Shenzhen   Guangdong   518100\r
+D4-7C-44   (hex)               Tendzone International Pte Ltd\r
+A00000-AFFFFF     (base 16)            Tendzone International Pte Ltd\r
+                               Rm 202, Blk C, Huahan Innovation Park, No.16 Langshan Rd,Nanshan District\r
+                               Shenzhen  GuangDong  518057\r
                                 CN\r
  \r
+D4-7C-44   (hex)               Innoviz Technologies LTD\r
+100000-1FFFFF     (base 16)            Innoviz Technologies LTD\r
+                               Atir Yeda 15\r
+                               Kfar Saba  Ha Sharon  4464312\r
+                               IL\r
+\r
  D4-7C-44   (hex)               Exafore Oy\r
  000000-0FFFFF     (base 16)            Exafore Oy\r
                                 Hermiankatu 6-8D\r
                                 Tampere    33720\r
                                 FI\r
  \r
-B4-4B-D6   (hex)               Arnouse Digital Devices Corp\r
-800000-8FFFFF     (base 16)            Arnouse Digital Devices Corp\r
-                               1983 Marcus Ave, Suite 104\r
-                               Lake Success  NY  11042\r
-                               US\r
-\r
  D4-7C-44   (hex)               OMRON SENTECH CO., LTD.\r
  300000-3FFFFF     (base 16)            OMRON SENTECH CO., LTD.\r
                                 9F, Ebina Prime Tower, 9-50, Chuo 2 Chome\r
                                 Ebina-City  Kanagawa  243-0432\r
                                 JP\r
  \r
-D4-7C-44   (hex)               Innoviz Technologies LTD\r
-100000-1FFFFF     (base 16)            Innoviz Technologies LTD\r
-                               Atir Yeda 15\r
-                               Kfar Saba  Ha Sharon  4464312\r
-                               IL\r
-\r
-D4-7C-44   (hex)               Tendzone International Pte Ltd\r
-A00000-AFFFFF     (base 16)            Tendzone International Pte Ltd\r
-                               Rm 202, Blk C, Huahan Innovation Park, No.16 Langshan Rd,Nanshan District\r
-                               Shenzhen  GuangDong  518057\r
-                               CN\r
+2C-48-35   (hex)               Rheonik Messtechnik GmbH\r
+200000-2FFFFF     (base 16)            Rheonik Messtechnik GmbH\r
+                               Rudolf-Diesel-Str., 5\r
+                               Odelzhausen  Deutschland  85235\r
+                               DE\r
  \r
  A0-19-B2   (hex)               Adomi\r
  A00000-AFFFFF     (base 16)            Adomi\r
@@ -7385,12 +7490,6 @@ E00000-EFFFFF     (base 16)              ShenZhenBoryNet Co.,LTD.
                                 shenzhen  guangzhou  518109\r
                                 CN\r
  \r
-2C-48-35   (hex)               Rheonik Messtechnik GmbH\r
-200000-2FFFFF     (base 16)            Rheonik Messtechnik GmbH\r
-                               Rudolf-Diesel-Str., 5\r
-                               Odelzhausen  Deutschland  85235\r
-                               DE\r
-\r
  2C-48-35   (hex)               Santec Corporation\r
  C00000-CFFFFF     (base 16)            Santec Corporation\r
                                 5823 Ohkusa-Nenjozaka\r
@@ -7403,10 +7502,10 @@ C00000-CFFFFF     (base 16)             Santec Corporation
                                 Seinäjoki    60320\r
                                 FI\r
  \r
-8C-1C-DA   (hex)               LocoLabs LLC\r
-600000-6FFFFF     (base 16)            LocoLabs LLC\r
-                               3350 Scott Blvd, Bldg 56\r
-                               Santa Clara  CA  95054\r
+8C-1C-DA   (hex)               Alcidae Inc\r
+C00000-CFFFFF     (base 16)            Alcidae Inc\r
+                               535 Mission St, 14th Fl,\r
+                               San Francisco  CA  94105\r
                                 US\r
  \r
  8C-1C-DA   (hex)               Electronic Controlled Systems, Inc.\r
@@ -7415,17 +7514,17 @@ E00000-EFFFFF     (base 16)             Electronic Controlled Systems, Inc.
                                 Bloomington  MN  55438\r
                                 US\r
  \r
-8C-1C-DA   (hex)               Alcidae Inc\r
-C00000-CFFFFF     (base 16)            Alcidae Inc\r
-                               535 Mission St, 14th Fl,\r
-                               San Francisco  CA  94105\r
+8C-1C-DA   (hex)               LocoLabs LLC\r
+600000-6FFFFF     (base 16)            LocoLabs LLC\r
+                               3350 Scott Blvd, Bldg 56\r
+                               Santa Clara  CA  95054\r
                                 US\r
  \r
-3C-24-F0   (hex)               Inter-Coastal Electronics\r
-400000-4FFFFF     (base 16)            Inter-Coastal Electronics\r
-                               5750 E McKellips Rd\r
-                               Mesa  AZ  85215\r
-                               US\r
+3C-24-F0   (hex)               Wisycom\r
+300000-3FFFFF     (base 16)            Wisycom\r
+                               Via Spin 156\r
+                               Romano D'Ezzelino  Vicenza  36060\r
+                               IT\r
  \r
  3C-24-F0   (hex)               SHENZHEN PINSIDA TECHNOLOGY CO.,LTD.\r
  000000-0FFFFF     (base 16)            SHENZHEN PINSIDA TECHNOLOGY CO.,LTD.\r
@@ -7433,11 +7532,11 @@ C00000-CFFFFF     (base 16)             Alcidae Inc
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-3C-24-F0   (hex)               Wisycom\r
-300000-3FFFFF     (base 16)            Wisycom\r
-                               Via Spin 156\r
-                               Romano D'Ezzelino  Vicenza  36060\r
-                               IT\r
+0C-73-EB   (hex)               Shenzhen Samchung Video Technology Co., Ltd.\r
+C00000-CFFFFF     (base 16)            Shenzhen Samchung Video Technology Co., Ltd.\r
+                               Xixiang Street 4016 Bao'an Avenue \r
+                               Yong Kai Business Building A,  Bao'an District of Shenzhen City Guangdong  528470\r
+                               CN\r
  \r
  8C-1C-DA   (hex)               GEOMC\r
  200000-2FFFFF     (base 16)            GEOMC\r
@@ -7451,6 +7550,12 @@ C00000-CFFFFF     (base 16)              Alcidae Inc
                                 Richmond Hill  ON - Ontario  L4B 1K3\r
                                 CA\r
  \r
+3C-24-F0   (hex)               Inter-Coastal Electronics\r
+400000-4FFFFF     (base 16)            Inter-Coastal Electronics\r
+                               5750 E McKellips Rd\r
+                               Mesa  AZ  85215\r
+                               US\r
+\r
  0C-73-EB   (hex)               Beijing L&S Lancom Platform Tech. Co., Ltd. \r
  900000-9FFFFF     (base 16)            Beijing L&S Lancom Platform Tech. Co., Ltd. \r
                                 1st Floor, Xingtianhaiyuan Building, Xianghuangqi Eaast Rd, Nondda South Rd,Haidian District\r
@@ -7469,12 +7574,6 @@ C00000-CFFFFF     (base 16)              Alcidae Inc
                                 Beijing    100010\r
                                 CN\r
  \r
-0C-73-EB   (hex)               Shenzhen Samchung Video Technology Co., Ltd.\r
-C00000-CFFFFF     (base 16)            Shenzhen Samchung Video Technology Co., Ltd.\r
-                               Xixiang Street 4016 Bao'an Avenue \r
-                               Yong Kai Business Building A,  Bao'an District of Shenzhen City Guangdong  528470\r
-                               CN\r
-\r
  48-0B-B2   (hex)               XIAMEN RONGTA TECHNOLOGY CO.,LTD.\r
  A00000-AFFFFF     (base 16)            XIAMEN RONGTA TECHNOLOGY CO.,LTD.\r
                                 3F, E Plant, Gaoqi Industrial Zones, No.195, Gaoqi Community, Gaodian Village, Huli\r
@@ -7493,11 +7592,11 @@ A00000-AFFFFF     (base 16)             XIAMEN RONGTA TECHNOLOGY CO.,LTD.
                                 Chengdu  Sichuan  611731\r
                                 CN\r
  \r
-88-5F-E8   (hex)               zhejiang yuanwang communication technolgy co.,ltd\r
-D00000-DFFFFF     (base 16)            zhejiang yuanwang communication technolgy co.,ltd\r
-                               No. 6 of shen shi lei lu Road\r
-                               ZhuJi  Zhejiang  311800\r
-                               CN\r
+88-5F-E8   (hex)               Inor Process AB\r
+C00000-CFFFFF     (base 16)            Inor Process AB\r
+                               Travbanegatan 10\r
+                               Malmo  Skane  SE-213 77\r
+                               SE\r
  \r
  88-5F-E8   (hex)               Beijing laiwei Technology  Co.,Ltd\r
  400000-4FFFFF     (base 16)            Beijing laiwei Technology  Co.,Ltd\r
@@ -7505,16 +7604,10 @@ D00000-DFFFFF     (base 16)             zhejiang yuanwang communication technolgy co.,ltd
                                 Beijing  Beijing  102206\r
                                 CN\r
  \r
-88-5F-E8   (hex)               Inor Process AB\r
-C00000-CFFFFF     (base 16)            Inor Process AB\r
-                               Travbanegatan 10\r
-                               Malmo  Skane  SE-213 77\r
-                               SE\r
-\r
-30-1F-9A   (hex)               Shenzhen Fengliyuan Energy Conservating Technology Co. Ltd\r
-E00000-EFFFFF     (base 16)            Shenzhen Fengliyuan Energy Conservating Technology Co. Ltd\r
-                               8th floor of building A, Baoshan Industrial Estate, Longhua District, Shenzhen\r
-                               Shenzhen  Guangdong  518131\r
+88-5F-E8   (hex)               zhejiang yuanwang communication technolgy co.,ltd\r
+D00000-DFFFFF     (base 16)            zhejiang yuanwang communication technolgy co.,ltd\r
+                               No. 6 of shen shi lei lu Road\r
+                               ZhuJi  Zhejiang  311800\r
                                 CN\r
  \r
  B8-D8-12   (hex)               Visual Productions BV\r
@@ -7523,6 +7616,12 @@ B8-D8-12   (hex)         Visual Productions BV
                                 Haarlem    2013SM\r
                                 NL\r
  \r
+30-1F-9A   (hex)               NCM Supplies, Inc.\r
+400000-4FFFFF     (base 16)            NCM Supplies, Inc.\r
+                               8125 NW 64th Street\r
+                               Miami  FL  33166\r
+                               US\r
+\r
  30-1F-9A   (hex)               Triax A/S\r
  700000-7FFFFF     (base 16)            Triax A/S\r
                                 Bjornkaervej 3\r
@@ -7541,23 +7640,23 @@ C00000-CFFFFF     (base 16)             Origami Group Limited
                                 Hong Kong    000000\r
                                 HK\r
  \r
-F0-41-C8   (hex)               LINPA ACOUSTIC TECHNOLOGY CO.,LTD \r
-000000-0FFFFF     (base 16)            LINPA ACOUSTIC TECHNOLOGY CO.,LTD \r
+30-1F-9A   (hex)               Shenzhen Fengliyuan Energy Conservating Technology Co. Ltd\r
+E00000-EFFFFF     (base 16)            Shenzhen Fengliyuan Energy Conservating Technology Co. Ltd\r
+                               8th floor of building A, Baoshan Industrial Estate, Longhua District, Shenzhen\r
+                               Shenzhen  Guangdong  518131\r
+                               CN\r
+\r
+F0-41-C8   (hex)               LINPA ACOUSTIC TECHNOLOGY CO.,LTD \r
+000000-0FFFFF     (base 16)            LINPA ACOUSTIC TECHNOLOGY CO.,LTD \r
                                 2A,No60 , Lizhong Road,DaliQingxi Town\r
                                 Dongguan  Guandong  523648\r
                                 CN\r
  \r
-30-1F-9A   (hex)               NCM Supplies, Inc.\r
-400000-4FFFFF     (base 16)            NCM Supplies, Inc.\r
-                               8125 NW 64th Street\r
-                               Miami  FL  33166\r
-                               US\r
-\r
-F0-41-C8   (hex)               XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.\r
-500000-5FFFFF     (base 16)            XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.\r
-                               Xi'an Beilin District Yanta Middle Road No. 17A XIN QING YA YUAN 2-5C\r
-                               XI'AN  shanxi  710000\r
-                               CN\r
+88-A9-A7   (hex)               Honeywell spol. s.r.o. HTS CZ o.z. \r
+200000-2FFFFF     (base 16)            Honeywell spol. s.r.o. HTS CZ o.z. \r
+                               Turanka 100/1387 \r
+                               Brno    62700\r
+                               CZ\r
  \r
  88-A9-A7   (hex)               TWK-ELEKTRONIK\r
  B00000-BFFFFF     (base 16)            TWK-ELEKTRONIK\r
@@ -7571,11 +7670,11 @@ C00000-CFFFFF     (base 16)             AndroVideo Inc.
                                 Taipei    11441\r
                                 TW\r
  \r
-88-A9-A7   (hex)               Mikroelektronika\r
-300000-3FFFFF     (base 16)            Mikroelektronika\r
-                               Batajnicki drum 23\r
-                               Belgrade    11186\r
-                               RS\r
+F0-41-C8   (hex)               XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.\r
+500000-5FFFFF     (base 16)            XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.\r
+                               Xi'an Beilin District Yanta Middle Road No. 17A XIN QING YA YUAN 2-5C\r
+                               XI'AN  shanxi  710000\r
+                               CN\r
  \r
  88-A9-A7   (hex)               FlashForge Corporation\r
  900000-9FFFFF     (base 16)            FlashForge Corporation\r
@@ -7583,11 +7682,17 @@ C00000-CFFFFF     (base 16)             AndroVideo Inc.
                                 Jinhua  Zhejiang  321000\r
                                 CN\r
  \r
-88-A9-A7   (hex)               Honeywell spol. s.r.o. HTS CZ o.z. \r
-200000-2FFFFF     (base 16)            Honeywell spol. s.r.o. HTS CZ o.z. \r
-                               Turanka 100/1387 \r
-                               Brno    62700\r
-                               CZ\r
+A4-DA-22   (hex)               AURANEXT\r
+600000-6FFFFF     (base 16)            AURANEXT\r
+                               202 quai de clichy\r
+                               CLICHY    92110\r
+                               FR\r
+\r
+DC-E5-33   (hex)               WECAN Solution Inc.\r
+600000-6FFFFF     (base 16)            WECAN Solution Inc.\r
+                               71, Yulhadong-ro 8-gil, Dong-gu, Daegu, Republic of Korea\r
+                               Daegu    41102\r
+                               KR\r
  \r
  A4-DA-22   (hex)               Malldon Technology Limited\r
  900000-9FFFFF     (base 16)            Malldon Technology Limited\r
@@ -7595,6 +7700,12 @@ A4-DA-22   (hex)         Malldon Technology Limited
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+88-A9-A7   (hex)               Mikroelektronika\r
+300000-3FFFFF     (base 16)            Mikroelektronika\r
+                               Batajnicki drum 23\r
+                               Belgrade    11186\r
+                               RS\r
+\r
  C4-FF-BC   (hex)               Shenzhen C & D Electronics Co., Ltd.\r
  600000-6FFFFF     (base 16)            Shenzhen C & D Electronics Co., Ltd.\r
                                 9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District\r
@@ -7607,18 +7718,6 @@ C4-FF-BC   (hex)         ShenZhen ZYT Technology co., Ltd
                                 Shenzhen  GuangDong  518000\r
                                 CN\r
  \r
-DC-E5-33   (hex)               WECAN Solution Inc.\r
-600000-6FFFFF     (base 16)            WECAN Solution Inc.\r
-                               71, Yulhadong-ro 8-gil, Dong-gu, Daegu, Republic of Korea\r
-                               Daegu    41102\r
-                               KR\r
-\r
-A4-DA-22   (hex)               AURANEXT\r
-600000-6FFFFF     (base 16)            AURANEXT\r
-                               202 quai de clichy\r
-                               CLICHY    92110\r
-                               FR\r
-\r
  C4-FF-BC   (hex)               Beijing  KDF information technology co. LTD.\r
  D00000-DFFFFF     (base 16)            Beijing  KDF information technology co. LTD.\r
                                 Room14C,TowerA,,LindaBuilding,No.8,Dongtucheng Road,Chaoyang District, Beijing.\r
@@ -7631,29 +7730,47 @@ A00000-AFFFFF     (base 16)             Advanced Navigation
                                 Sydney  NSW  2000\r
                                 AU\r
  \r
+C4-FF-BC   (hex)               Mobiletron Electronics Co., Ltd\r
+200000-2FFFFF     (base 16)            Mobiletron Electronics Co., Ltd\r
+                               85, Sec.4, Chung-Ching Rd., Ta-Ya District\r
+                               Taichung    428\r
+                               TW\r
+\r
+C4-FF-BC   (hex)               KyongBo Electric Co., Ltd.\r
+C00000-CFFFFF     (base 16)            KyongBo Electric Co., Ltd.\r
+                               5, Seongsuil-ro 12-gagil Seongdong-gu\r
+                               Seoul    04792\r
+                               KR\r
+\r
+9C-43-1E   (hex)               ProMOS Technologies Inc.\r
+500000-5FFFFF     (base 16)            ProMOS Technologies Inc.\r
+                               3A3, No.1, Lixing 1st Rd., East Dist.,\r
+                               Hsinchu City  Taiwan  300\r
+                               TW\r
+\r
  9C-43-1E   (hex)               Wunda Group plc\r
  800000-8FFFFF     (base 16)            Wunda Group plc\r
                                 Unit 1-5, Hawthorn, Crick\r
                                 Caldicot  Monmouthshire  NP26 5UT\r
                                 GB\r
  \r
+9C-43-1E   (hex)               R-S-I Elektrotechnik GmbH  CO KG\r
+600000-6FFFFF     (base 16)            R-S-I Elektrotechnik GmbH  CO KG\r
+                               Woelkestrasse 11\r
+                               Schweitenkirchen    85276\r
+                               DE\r
+\r
  9C-43-1E   (hex)               CONTINENT Co. Ltd\r
  900000-9FFFFF     (base 16)            CONTINENT Co. Ltd\r
                                 Bumazhnaya st., 16/3 lit B, of. 414\r
                                 Saint-Petersburg    190020\r
                                 RU\r
  \r
-C4-FF-BC   (hex)               Mobiletron Electronics Co., Ltd\r
-200000-2FFFFF     (base 16)            Mobiletron Electronics Co., Ltd\r
-                               85, Sec.4, Chung-Ching Rd., Ta-Ya District\r
-                               Taichung    428\r
-                               TW\r
-\r
-C4-FF-BC   (hex)               KyongBo Electric Co., Ltd.\r
-C00000-CFFFFF     (base 16)            KyongBo Electric Co., Ltd.\r
-                               5, Seongsuil-ro 12-gagil Seongdong-gu\r
-                               Seoul    04792\r
-                               KR\r
+28-2C-02   (hex)               Dexin Digital Technology Corp. Ltd.\r
+300000-3FFFFF     (base 16)            Dexin Digital Technology Corp. Ltd.\r
+                               No.10 and 12, Wuxing Fourth Road,Wuhou District Chengdu 610045 Sichuan, PR China\r
+                               chengdu  Sichuan  610045\r
+                               CN\r
  \r
  9C-43-1E   (hex)               Advanced Logic Technology (ALT) sa\r
  300000-3FFFFF     (base 16)            Advanced Logic Technology (ALT) sa\r
@@ -7661,17 +7778,11 @@ C00000-CFFFFF     (base 16)             KyongBo Electric Co., Ltd.
                                 Redange-sur-Attert  Luxembourg  8506\r
                                 LU\r
  \r
-9C-43-1E   (hex)               ProMOS Technologies Inc.\r
-500000-5FFFFF     (base 16)            ProMOS Technologies Inc.\r
-                               3A3, No.1, Lixing 1st Rd., East Dist.,\r
-                               Hsinchu City  Taiwan  300\r
-                               TW\r
-\r
-28-2C-02   (hex)               Lookman Electroplast Industries Ltd\r
-600000-6FFFFF     (base 16)            Lookman Electroplast Industries Ltd\r
-                               Old No : 9, New No : 15, II Street Etn., III Main Road , CIT Nagar, Nandanam\r
-                               Chennai  Tamilnadu  600035\r
-                               IN\r
+F8-B5-68   (hex)               Beijing Wanji Techonology Co., Ltd.\r
+900000-9FFFFF     (base 16)            Beijing Wanji Techonology Co., Ltd.\r
+                               NO.12 Building,Zhongguancun Software Park,Haidian District \r
+                               beijing  beijing  100193\r
+                               CN\r
  \r
  28-2C-02   (hex)               Telecom and Microelectonic Industries\r
  700000-7FFFFF     (base 16)            Telecom and Microelectonic Industries\r
@@ -7685,36 +7796,36 @@ C00000-CFFFFF     (base 16)             KyongBo Electric Co., Ltd.
                                 Tianjin    300384\r
                                 CN\r
  \r
+F8-B5-68   (hex)               ZAO &quot;RADIUS Avtomatika&quot;\r
+E00000-EFFFFF     (base 16)            ZAO &quot;RADIUS Avtomatika&quot;\r
+                               Panfilovskiy prospekt, 10/3\r
+                               Zelenograd  Moscow  124489\r
+                               RU\r
+\r
+28-2C-02   (hex)               Lookman Electroplast Industries Ltd\r
+600000-6FFFFF     (base 16)            Lookman Electroplast Industries Ltd\r
+                               Old No : 9, New No : 15, II Street Etn., III Main Road , CIT Nagar, Nandanam\r
+                               Chennai  Tamilnadu  600035\r
+                               IN\r
+\r
+F8-B5-68   (hex)               SinePulse GmbH\r
+A00000-AFFFFF     (base 16)            SinePulse GmbH\r
+                               Kistlerhofstr. 170\r
+                               Munich    D-81379\r
+                               DE\r
+\r
  F8-B5-68   (hex)               Shenzhen New-Bund Technology Co., Ltd.\r
  200000-2FFFFF     (base 16)            Shenzhen New-Bund Technology Co., Ltd.\r
                                 Room20A, 20th Floor, HSAE Technology Building, Nanshan District,\r
                                  Shenzhen    518000\r
                                 CN\r
  \r
-F8-B5-68   (hex)               Beijing Wanji Techonology Co., Ltd.\r
-900000-9FFFFF     (base 16)            Beijing Wanji Techonology Co., Ltd.\r
-                               NO.12 Building,Zhongguancun Software Park,Haidian District \r
-                               beijing  beijing  100193\r
-                               CN\r
-\r
-28-2C-02   (hex)               Dexin Digital Technology Corp. Ltd.\r
-300000-3FFFFF     (base 16)            Dexin Digital Technology Corp. Ltd.\r
-                               No.10 and 12, Wuxing Fourth Road,Wuhou District Chengdu 610045 Sichuan, PR China\r
-                               chengdu  Sichuan  610045\r
+F8-B5-68   (hex)               CloudMinds (Shenzhen) Holdings Co., Ltd\r
+700000-7FFFFF     (base 16)            CloudMinds (Shenzhen) Holdings Co., Ltd\r
+                               Tower 3, 33F, Unit B, Wangjing SOHO,Wangjing Street No.10\r
+                               beijing    100102\r
                                 CN\r
  \r
-9C-43-1E   (hex)               R-S-I Elektrotechnik GmbH  CO KG\r
-600000-6FFFFF     (base 16)            R-S-I Elektrotechnik GmbH  CO KG\r
-                               Woelkestrasse 11\r
-                               Schweitenkirchen    85276\r
-                               DE\r
-\r
-F8-B5-68   (hex)               ZAO &quot;RADIUS Avtomatika&quot;\r
-E00000-EFFFFF     (base 16)            ZAO &quot;RADIUS Avtomatika&quot;\r
-                               Panfilovskiy prospekt, 10/3\r
-                               Zelenograd  Moscow  124489\r
-                               RU\r
-\r
  40-48-FD   (hex)               Dorel Juvenile\r
  800000-8FFFFF     (base 16)            Dorel Juvenile\r
                                 25 Forbes Blvd\r
@@ -7727,48 +7838,30 @@ E00000-EFFFFF     (base 16)             ZAO &quot;RADIUS Avtomatika&quot;
                                 Hangzhou  Zhejiang  310012\r
                                 CN\r
  \r
+40-48-FD   (hex)               BEIJING C&W ELECTRONICS(GROUP)CO.,LTD\r
+000000-0FFFFF     (base 16)            BEIJING C&W ELECTRONICS(GROUP)CO.,LTD\r
+                               No.14 Jiuxianqiao,chaoyang,Beijing,China\r
+                               Beijing  Beijing  100015\r
+                               CN\r
+\r
  F8-B5-68   (hex)               3SI Security Systems, Inc\r
  C00000-CFFFFF     (base 16)            3SI Security Systems, Inc\r
                                 101 Lindenwood Drive, Suite 200\r
                                 Malvern  PA  19355\r
                                 US\r
  \r
-F8-B5-68   (hex)               CloudMinds (Shenzhen) Holdings Co., Ltd\r
-700000-7FFFFF     (base 16)            CloudMinds (Shenzhen) Holdings Co., Ltd\r
-                               Tower 3, 33F, Unit B, Wangjing SOHO,Wangjing Street No.10\r
-                               beijing    100102\r
-                               CN\r
-\r
-F8-B5-68   (hex)               SinePulse GmbH\r
-A00000-AFFFFF     (base 16)            SinePulse GmbH\r
-                               Kistlerhofstr. 170\r
-                               Munich    D-81379\r
-                               DE\r
-\r
  40-48-FD   (hex)               NOX Systems AG\r
  D00000-DFFFFF     (base 16)            NOX Systems AG\r
                                 Alvierweg 17\r
                                 Vaduz  FL  9490\r
                                 LI\r
  \r
-40-48-FD   (hex)               BEIJING C&W ELECTRONICS(GROUP)CO.,LTD\r
-000000-0FFFFF     (base 16)            BEIJING C&W ELECTRONICS(GROUP)CO.,LTD\r
-                               No.14 Jiuxianqiao,chaoyang,Beijing,China\r
-                               Beijing  Beijing  100015\r
-                               CN\r
-\r
  38-73-EA   (hex)               Lightform, Inc.\r
  900000-9FFFFF     (base 16)            Lightform, Inc.\r
                                 123 Langton St.\r
                                 San Francisco  CA  94103\r
                                 US\r
  \r
-EC-9F-0D   (hex)               Shenzhen Compare Electronics Co., Ltd\r
-600000-6FFFFF     (base 16)            Shenzhen Compare Electronics Co., Ltd\r
-                               18F 5D First Area, Shenzhen Bay Eco-tech Park, Nanshan District, Shenzhen 518057, China\r
-                               Shenzhen City (深圳市)  Guangdong  518057\r
-                               CN\r
-\r
  38-73-EA   (hex)               Live Sentinel\r
  600000-6FFFFF     (base 16)            Live Sentinel\r
                                 27 Armthorpe Rd.\r
@@ -7781,6 +7874,12 @@ EC-9F-0D   (hex)         Simula Technology Inc.
                                 Taoyuan     330\r
                                 TW\r
  \r
+EC-9F-0D   (hex)               Shenzhen Compare Electronics Co., Ltd\r
+600000-6FFFFF     (base 16)            Shenzhen Compare Electronics Co., Ltd\r
+                               18F 5D First Area, Shenzhen Bay Eco-tech Park, Nanshan District, Shenzhen 518057, China\r
+                               Shenzhen City (深圳市)  Guangdong  518057\r
+                               CN\r
+\r
  EC-9F-0D   (hex)               Zhejiang HEJU Communication Technology Co., Ltd\r
  800000-8FFFFF     (base 16)            Zhejiang HEJU Communication Technology Co., Ltd\r
                                 F4,Block B, Lotus Commercial Building,Lianhua Street 333#,XiHu District\r
@@ -7793,6 +7892,12 @@ B00000-BFFFFF     (base 16)              OROSOUND SAS
                                 PARIS    75011\r
                                 FR\r
  \r
+AC-1D-DF   (hex)               Motec Pty Ltd\r
+400000-4FFFFF     (base 16)            Motec Pty Ltd\r
+                               121 Merrindale Drive\r
+                               Croydon South  Victoria  3136\r
+                               AU\r
+\r
  AC-1D-DF   (hex)               Green IT Korea Co., Ltd.\r
  700000-7FFFFF     (base 16)            Green IT Korea Co., Ltd.\r
                                 1, Gaun-ro 1-gil, Namyangju-si\r
@@ -7805,11 +7910,11 @@ AC-1D-DF   (hex)                Shenzhen Ouzheng Electronic Tech Co,.Ltd
                                 Shenzhen  Guangdong  518111\r
                                 CN\r
  \r
-AC-1D-DF   (hex)               Motec Pty Ltd\r
-400000-4FFFFF     (base 16)            Motec Pty Ltd\r
-                               121 Merrindale Drive\r
-                               Croydon South  Victoria  3136\r
-                               AU\r
+CC-22-37   (hex)               shenzhen zonglian network technology limited\r
+A00000-AFFFFF     (base 16)            shenzhen zonglian network technology limited\r
+                               floor 3, building 3, yuepeng industry area, guanlan avenue,longhua new district\r
+                               shenzhen  guangdong  518000\r
+                               CN\r
  \r
  CC-22-37   (hex)               E Ink Corp\r
  900000-9FFFFF     (base 16)            E Ink Corp\r
@@ -7817,12 +7922,6 @@ CC-22-37   (hex)         E Ink Corp
                                 Billerica  MA  01821\r
                                 US\r
  \r
-CC-22-37   (hex)               shenzhen zonglian network technology limited\r
-A00000-AFFFFF     (base 16)            shenzhen zonglian network technology limited\r
-                               floor 3, building 3, yuepeng industry area, guanlan avenue,longhua new district\r
-                               shenzhen  guangdong  518000\r
-                               CN\r
-\r
  74-1A-E0   (hex)               Socionext Inc.\r
  100000-1FFFFF     (base 16)            Socionext Inc.\r
                                 Nomura Shin-Yokohama Bldg., 2-10-23 Shin-Yokohama, Kohoku-ku\r
@@ -7865,6 +7964,12 @@ B8-D8-12   (hex)         Glamo Inc.
                                 La Talaudière    42353\r
                                 FR\r
  \r
+90-4E-91   (hex)               Teleepoch Ltd\r
+300000-3FFFFF     (base 16)            Teleepoch Ltd\r
+                               No.13 Langshan Rd,HiTech Park,Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
  18-9B-A5   (hex)               legendsky tech \r
  D00000-DFFFFF     (base 16)            legendsky tech \r
                                 RM2210 PENG YUN GE JINGLI MANSION NO.48 BEILI ROAD SOUTH\r
@@ -7913,30 +8018,24 @@ CC-1B-E0   (hex)                Microtech System,Inc
                                 Baden-Daettwil    5405\r
                                 CH\r
  \r
-90-4E-91   (hex)               Teleepoch Ltd\r
-300000-3FFFFF     (base 16)            Teleepoch Ltd\r
-                               No.13 Langshan Rd,HiTech Park,Nanshan District\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
  34-29-8F   (hex)               Keystone Electronic Solutions\r
  D00000-DFFFFF     (base 16)            Keystone Electronic Solutions\r
                                 469 Julius Jeppe St, Waterkloof\r
                                 Pretoria  Gauteng  0181\r
                                 ZA\r
  \r
-28-F5-37   (hex)               Performance Motion Devices\r
-E00000-EFFFFF     (base 16)            Performance Motion Devices\r
-                               1 Technology Park Drive \r
-                               Westford  MA  01886\r
-                               US\r
-\r
  28-F5-37   (hex)               Herbert Waldmann GmbH & Co. KG\r
  900000-9FFFFF     (base 16)            Herbert Waldmann GmbH & Co. KG\r
                                 Peter-Henlein-Straße 5\r
                                 Villingen-Schwenningen  Baden-Württemberg  78056\r
                                 DE\r
  \r
+28-F5-37   (hex)               Performance Motion Devices\r
+E00000-EFFFFF     (base 16)            Performance Motion Devices\r
+                               1 Technology Park Drive \r
+                               Westford  MA  01886\r
+                               US\r
+\r
  28-F5-37   (hex)               MyOmega Systems GmbH\r
  600000-6FFFFF     (base 16)            MyOmega Systems GmbH\r
                                 Neumeyerstr. 28-34\r
@@ -8021,23 +8120,17 @@ F8-8A-3C   (hex)                GO-LINK TECHNOLOGY CO., LTD.
                                 Hsinchu City    30060\r
                                 TW\r
  \r
-8C-14-7D   (hex)               Electrical & Automation Larsen & Toubro Limited\r
-E00000-EFFFFF     (base 16)            Electrical & Automation Larsen & Toubro Limited\r
-                               Mysore Campus, KIADB Industrial Area, Hebbal, Hootagalli\r
-                               Mysore  Karnataka  570020\r
-                               IN\r
-\r
  4C-65-A8   (hex)               Plus One Japan Limited\r
  400000-4FFFFF     (base 16)            Plus One Japan Limited\r
                                 2-8-6,Nishishinbashi\r
                                 Minato-ku  Tokyo  105-0003\r
                                 JP\r
  \r
-A0-C5-F2   (hex)               AiCare Corp.\r
-400000-4FFFFF     (base 16)            AiCare Corp.\r
-                               1917 Scepter Ct\r
-                               San Jose  CA  95132\r
-                               US\r
+8C-14-7D   (hex)               Electrical & Automation Larsen & Toubro Limited\r
+E00000-EFFFFF     (base 16)            Electrical & Automation Larsen & Toubro Limited\r
+                               Mysore Campus, KIADB Industrial Area, Hebbal, Hootagalli\r
+                               Mysore  Karnataka  570020\r
+                               IN\r
  \r
  8C-14-7D   (hex)               Bausch Datacom NV/SA\r
  B00000-BFFFFF     (base 16)            Bausch Datacom NV/SA\r
@@ -8045,24 +8138,24 @@ B00000-BFFFFF     (base 16)             Bausch Datacom NV/SA
                                 Korbeek-Lo  Vlaams-Brabant - Belgium  3360\r
                                 BE\r
  \r
+8C-14-7D   (hex)               Nio\r
+000000-0FFFFF     (base 16)            Nio\r
+                               3200 North 1st Street\r
+                               San Jose  NY  95134\r
+                               US\r
+\r
+A0-C5-F2   (hex)               AiCare Corp.\r
+400000-4FFFFF     (base 16)            AiCare Corp.\r
+                               1917 Scepter Ct\r
+                               San Jose  CA  95132\r
+                               US\r
+\r
  8C-14-7D   (hex)               Shenzhen  Lanxus  technology Co. Ltd.\r
  D00000-DFFFFF     (base 16)            Shenzhen  Lanxus  technology Co. Ltd.\r
                                 3rd Floor, Block A, Aerospace micromotor building, Science Park North, Nanshan District\r
                                 Shenzhen  China  518000\r
                                 CN\r
  \r
-F0-23-B9   (hex)               Annapurna labs\r
-A00000-AFFFFF     (base 16)            Annapurna labs\r
-                               Matam Scientific Industries Center,   Building 8.2\r
-                               Mail box 15123  Haifa  3508409\r
-                               IL\r
-\r
-F0-23-B9   (hex)               BSP RUS Ltd.\r
-300000-3FFFFF     (base 16)            BSP RUS Ltd.\r
-                               174/1 Stavropolskaya street\r
-                               Krasnodar  Krasnodar  350001\r
-                               RU\r
-\r
  F0-23-B9   (hex)               Ubiant\r
  100000-1FFFFF     (base 16)            Ubiant\r
                                 2 Place de Francfort\r
@@ -8081,23 +8174,23 @@ A00000-AFFFFF     (base 16)             Integrated Design Ltd
                                 Feltham  Middlesex  TW137EQ\r
                                 GB\r
  \r
-8C-14-7D   (hex)               Nio\r
-000000-0FFFFF     (base 16)            Nio\r
-                               3200 North 1st Street\r
-                               San Jose  NY  95134\r
-                               US\r
-\r
  04-71-4B   (hex)               Shenzhen BoClouds Technology Co.,Ltd.\r
  D00000-DFFFFF     (base 16)            Shenzhen BoClouds Technology Co.,Ltd.\r
                                 Room 909, Unit A, Cadre Group Centre Building, No.168 TongSha Road, XiLi Town, Nanshan\r
                                 Shenzhen  GuangDong  518000\r
                                 CN\r
  \r
-04-71-4B   (hex)               Bureau Electronique Appliquee\r
-500000-5FFFFF     (base 16)            Bureau Electronique Appliquee\r
-                               Allee des Noisetiers, 5\r
-                               ANGLEUR  LIEGE  4031\r
-                               BE\r
+F0-23-B9   (hex)               Annapurna labs\r
+A00000-AFFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+F0-23-B9   (hex)               BSP RUS Ltd.\r
+300000-3FFFFF     (base 16)            BSP RUS Ltd.\r
+                               174/1 Stavropolskaya street\r
+                               Krasnodar  Krasnodar  350001\r
+                               RU\r
  \r
  04-71-4B   (hex)               Griesser Electronic AG\r
  300000-3FFFFF     (base 16)            Griesser Electronic AG\r
@@ -8105,6 +8198,12 @@ D00000-DFFFFF     (base 16)              Shenzhen BoClouds Technology Co.,Ltd.
                                 Aadorf  Thurgau  8355\r
                                 CH\r
  \r
+04-71-4B   (hex)               Bureau Electronique Appliquee\r
+500000-5FFFFF     (base 16)            Bureau Electronique Appliquee\r
+                               Allee des Noisetiers, 5\r
+                               ANGLEUR  LIEGE  4031\r
+                               BE\r
+\r
  60-D7-E3   (hex)               Ameli s.r.l.\r
  600000-6FFFFF     (base 16)            Ameli s.r.l.\r
                                 via Guido Rossa,10\r
@@ -8129,18 +8228,18 @@ E00000-EFFFFF     (base 16)             Edan Instruments, Inc.
                                 Shenzhen  Guangdong  518122\r
                                 CN\r
  \r
-08-ED-02   (hex)               Origami Energy Ltd\r
-D00000-DFFFFF     (base 16)            Origami Energy Ltd\r
-                               Ashcombe Court, Woolsack Way\r
-                               Godalming    GU7 1LQ\r
-                               GB\r
-\r
  98-AA-FC   (hex)               SURTEC\r
  100000-1FFFFF     (base 16)            SURTEC\r
                                 616 avenue de l'Europe\r
                                 Le Creusot  burgundy  71206\r
                                 FR\r
  \r
+08-ED-02   (hex)               Origami Energy Ltd\r
+D00000-DFFFFF     (base 16)            Origami Energy Ltd\r
+                               Ashcombe Court, Woolsack Way\r
+                               Godalming    GU7 1LQ\r
+                               GB\r
+\r
  14-4F-D7   (hex)               Shanghai B&A Technology Co., Ltd\r
  D00000-DFFFFF     (base 16)            Shanghai B&A Technology Co., Ltd\r
                                 4F, No. 150 Cailun Rd, Zhangjiang\r
@@ -8183,6 +8282,12 @@ D00000-DFFFFF     (base 16)              SHENZHEN ZHISHI TECHNOLOGY CO., LTD.
                                 Moscow    127282\r
                                 RU\r
  \r
+40-A3-6B   (hex)               Securiton AG\r
+600000-6FFFFF     (base 16)            Securiton AG\r
+                               Alpenstrasse 20, P.O. Box 127\r
+                               Zollikofen    CH-3052 \r
+                               CH\r
+\r
  A4-11-63   (hex)               Moog Music Inc.\r
  B00000-BFFFFF     (base 16)            Moog Music Inc.\r
                                 160 Broadway St\r
@@ -8201,6 +8306,12 @@ B00000-BFFFFF     (base 16)              Moog Music Inc.
                                 Palo Alto  CA  94306\r
                                 US\r
  \r
+8C-C8-F4   (hex)               Strongbyte Solutions Limited\r
+800000-8FFFFF     (base 16)            Strongbyte Solutions Limited\r
+                               Unit 7, Wychwood Business Centre\r
+                               Chipping Norton  Oxfordshire  OX7 6XU\r
+                               GB\r
+\r
  40-F3-85   (hex)               Beijing Zongheng Electro-Mechanical Technology Development Co.\r
  200000-2FFFFF     (base 16)            Beijing Zongheng Electro-Mechanical Technology Development Co.\r
                                 No.1 Fenghui East Road, Yongfeng Industry Base, Haidian District, Beijing China\r
@@ -8225,12 +8336,6 @@ D00000-DFFFFF     (base 16)              Digital Bros S.p.A.
                                 Milan  MI  20144\r
                                 IT\r
  \r
-40-A3-6B   (hex)               Securiton AG\r
-600000-6FFFFF     (base 16)            Securiton AG\r
-                               Alpenstrasse 20, P.O. Box 127\r
-                               Zollikofen    CH-3052 \r
-                               CH\r
-\r
  8C-C8-F4   (hex)               Dark Horse Connect LLC\r
  200000-2FFFFF     (base 16)            Dark Horse Connect LLC\r
                                 13492 Research Blvd, Ste 336\r
@@ -8249,12 +8354,6 @@ A00000-AFFFFF     (base 16)              Changsha SinoCare, Inc
                                 Changsha  Hunan  410205\r
                                 CN\r
  \r
-8C-C8-F4   (hex)               Strongbyte Solutions Limited\r
-800000-8FFFFF     (base 16)            Strongbyte Solutions Limited\r
-                               Unit 7, Wychwood Business Centre\r
-                               Chipping Norton  Oxfordshire  OX7 6XU\r
-                               GB\r
-\r
  50-A4-D0   (hex)               Axel Technology\r
  D00000-DFFFFF     (base 16)            Axel Technology\r
                                 Via Caduti di Sabbiuno 6/F\r
@@ -8273,6 +8372,12 @@ E00000-EFFFFF     (base 16)              Sagetech Corporation
                                 Sioux Falls  SD  57104\r
                                 US\r
  \r
+34-04-9E   (hex)               GoChip Inc.\r
+000000-0FFFFF     (base 16)            GoChip Inc.\r
+                               275 Airpark Blvd, Suite 100\r
+                               Chico  CA  95973\r
+                               US\r
+\r
  40-ED-98   (hex)               A-IOX INC.\r
  200000-2FFFFF     (base 16)            A-IOX INC.\r
                                 10Fl., No. 497, Sec. 2, Tiding Blvd., Neihu Dist.\r
@@ -8285,18 +8390,6 @@ E00000-EFFFFF     (base 16)              Sagetech Corporation
                                 Minato  Tokyo  1050013\r
                                 JP\r
  \r
-34-04-9E   (hex)               GoChip Inc.\r
-000000-0FFFFF     (base 16)            GoChip Inc.\r
-                               275 Airpark Blvd, Suite 100\r
-                               Chico  CA  95973\r
-                               US\r
-\r
-50-0B-91   (hex)               Igor, Inc.\r
-000000-0FFFFF     (base 16)            Igor, Inc.\r
-                               5619 NW 86th St.\r
-                               Johnston  IA  50131\r
-                               US\r
-\r
  40-ED-98   (hex)               GuangZhou FiiO Electronics Technology Co.,Ltd\r
  100000-1FFFFF     (base 16)            GuangZhou FiiO Electronics Technology Co.,Ltd\r
                                 201,2/F, F Building, Hougang Industrial Zone, Shigang Village, huangshi West Road,Baiyun District\r
@@ -8309,6 +8402,12 @@ C00000-CFFFFF     (base 16)              BloomSky,Inc.
                                 Mountain view  CA  94043\r
                                 US\r
  \r
+50-0B-91   (hex)               Igor, Inc.\r
+000000-0FFFFF     (base 16)            Igor, Inc.\r
+                               5619 NW 86th St.\r
+                               Johnston  IA  50131\r
+                               US\r
+\r
  A4-58-0F   (hex)               Stone Lock Global, Inc.\r
  100000-1FFFFF     (base 16)            Stone Lock Global, Inc.\r
                                 101 N Church St\r
@@ -8321,6 +8420,12 @@ A4-58-0F   (hex)         AIR LIQUIDE MEDICAL SYSTEMS
                                     \r
                                 \r
  \r
+50-0B-91   (hex)               Annapurna labs\r
+200000-2FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
  A4-58-0F   (hex)               Ksenia Security srl\r
  900000-9FFFFF     (base 16)            Ksenia Security srl\r
                                 SP Valtesino 44\r
@@ -8351,11 +8456,11 @@ E00000-EFFFFF     (base 16)             Aplex Technology Inc.
                                 Shenzhen  Guangdong  518055\r
                                 CN\r
  \r
-50-0B-91   (hex)               Annapurna labs\r
-200000-2FFFFF     (base 16)            Annapurna labs\r
-                               Matam Scientific Industries Center,   Building 8.2\r
-                               Mail box 15123  Haifa  3508409\r
-                               IL\r
+24-4E-7B   (hex)               Nanjing Wanlida Technology Co., Ltd.\r
+700000-7FFFFF     (base 16)            Nanjing Wanlida Technology Co., Ltd.\r
+                               Wanlida Industry Zone, Nanjing County\r
+                               Zhangzhou  Fujian  363601\r
+                               CN\r
  \r
  7C-CB-E2   (hex)               Hangzhou Haohaokaiche Technology Co.,Ltd.\r
  900000-9FFFFF     (base 16)            Hangzhou Haohaokaiche Technology Co.,Ltd.\r
@@ -8375,12 +8480,6 @@ E00000-EFFFFF     (base 16)              Aplex Technology Inc.
                                 ShenZhen  GangDong  518000\r
                                 CN\r
  \r
-24-4E-7B   (hex)               Nanjing Wanlida Technology Co., Ltd.\r
-700000-7FFFFF     (base 16)            Nanjing Wanlida Technology Co., Ltd.\r
-                               Wanlida Industry Zone, Nanjing County\r
-                               Zhangzhou  Fujian  363601\r
-                               CN\r
-\r
  48-65-EE   (hex)               DefPower Ltd\r
  000000-0FFFFF     (base 16)            DefPower Ltd\r
                                 6 Repton Close\r
@@ -8405,18 +8504,18 @@ B00000-BFFFFF     (base 16)             Exigent Sensors
                                 Kowloon Bay  Kowloon  00000\r
                                 HK\r
  \r
+4C-E1-73   (hex)               Nexoforge Inc.\r
+100000-1FFFFF     (base 16)            Nexoforge Inc.\r
+                               4514 47 Ave \r
+                               Leduc  Alberta  T9E 5S9\r
+                               CA\r
+\r
  1C-C0-E1   (hex)               NewLand (NZ) Communication Tech Limited\r
  D00000-DFFFFF     (base 16)            NewLand (NZ) Communication Tech Limited\r
                                 39A WAIPA ST BIRKENHEAD\r
                                 AUCKLAND  Auckland  0626\r
                                 NZ\r
  \r
-AC-64-DD   (hex)               Bluewave Global Manufacturing Limited\r
-A00000-AFFFFF     (base 16)            Bluewave Global Manufacturing Limited\r
-                               82/F, International Commerce Centre, 1 Austin Road\r
-                               West Kowloon    0\r
-                               HK\r
-\r
  AC-64-DD   (hex)               PFDC ELANCYL\r
  800000-8FFFFF     (base 16)            PFDC ELANCYL\r
                                 LES CAUQUILLOUS \r
@@ -8429,11 +8528,11 @@ AC-64-DD   (hex)                Shenzhen PuHua Technology Co., Ltd
                                 shenzhen    518103\r
                                 CN\r
  \r
-4C-E1-73   (hex)               Nexoforge Inc.\r
-100000-1FFFFF     (base 16)            Nexoforge Inc.\r
-                               4514 47 Ave \r
-                               Leduc  Alberta  T9E 5S9\r
-                               CA\r
+AC-64-DD   (hex)               Bluewave Global Manufacturing Limited\r
+A00000-AFFFFF     (base 16)            Bluewave Global Manufacturing Limited\r
+                               82/F, International Commerce Centre, 1 Austin Road\r
+                               West Kowloon    0\r
+                               HK\r
  \r
  AC-64-DD   (hex)               Wittmann Kunststoffgeräte GmbH\r
  700000-7FFFFF     (base 16)            Wittmann Kunststoffgeräte GmbH\r
@@ -8441,12 +8540,6 @@ AC-64-DD   (hex)         Wittmann Kunststoffgeräte GmbH
                                 Vienna  Vienna  1220\r
                                 AT\r
  \r
-38-3A-21   (hex)               OOO NPP Uraltechnologiya\r
-500000-5FFFFF     (base 16)            OOO NPP Uraltechnologiya\r
-                               Studencheskaya str. 16-130\r
-                               Ekaterinburg    620137\r
-                               RU\r
-\r
  38-3A-21   (hex)               R3C Information(Shenzhen) Co.，Ltd.\r
  000000-0FFFFF     (base 16)            R3C Information(Shenzhen) Co.，Ltd.\r
                                 2F,JinHuiQiou Building,Langshan2 Road,Hi-Tech Ind.Park, Nanshan District\r
@@ -8465,6 +8558,12 @@ E00000-EFFFFF     (base 16)              GUANGDONG ENOK COMMUNICATION CO., LTD.
                                 DongGuan  GuanDong  523795\r
                                 CN\r
  \r
+38-3A-21   (hex)               OOO NPP Uraltechnologiya\r
+500000-5FFFFF     (base 16)            OOO NPP Uraltechnologiya\r
+                               Studencheskaya str. 16-130\r
+                               Ekaterinburg    620137\r
+                               RU\r
+\r
  F8-1D-78   (hex)               WUHAN GUIDE INFRARED CO.,LTD\r
  700000-7FFFFF     (base 16)            WUHAN GUIDE INFRARED CO.,LTD\r
                                 No.6 Huanglongshan South Rd\r
@@ -8489,23 +8588,17 @@ E00000-EFFFFF     (base 16)             Fiziico Co., Ltd.
                                 Taipei    11493\r
                                 TW\r
  \r
-F0-AC-D7   (hex)               Zhejiang Makepower Electronics,Inc.\r
-B00000-BFFFFF     (base 16)            Zhejiang Makepower Electronics,Inc.\r
-                               Building 2, Estate 10, Wenzhou Hi-Tech Industrial Development Area, zhejiang, China\r
-                               shenzhen    518000\r
-                               CN\r
-\r
  98-6D-35   (hex)               my-PV GmbH\r
  C00000-CFFFFF     (base 16)            my-PV GmbH\r
                                 Teichstrasse 43\r
                                 Neuzeug    4523\r
                                 AT\r
  \r
-B0-C5-CA   (hex)               EM-Tech\r
-000000-0FFFFF     (base 16)            EM-Tech\r
-                               40, Changwon-daero 1144beon-gil, Seongsan-gu\r
-                               Changwon  Gyeongsangnam-do  642-120\r
-                               KR\r
+F0-AC-D7   (hex)               Zhejiang Makepower Electronics,Inc.\r
+B00000-BFFFFF     (base 16)            Zhejiang Makepower Electronics,Inc.\r
+                               Building 2, Estate 10, Wenzhou Hi-Tech Industrial Development Area, zhejiang, China\r
+                               shenzhen    518000\r
+                               CN\r
  \r
  28-36-38   (hex)               CHARGELIB\r
  500000-5FFFFF     (base 16)            CHARGELIB\r
@@ -8519,24 +8612,18 @@ B0-C5-CA   (hex)                EM-Tech
                                 Berlin    10117\r
                                 DE\r
  \r
+B0-C5-CA   (hex)               EM-Tech\r
+000000-0FFFFF     (base 16)            EM-Tech\r
+                               40, Changwon-daero 1144beon-gil, Seongsan-gu\r
+                               Changwon  Gyeongsangnam-do  642-120\r
+                               KR\r
+\r
  8C-19-2D   (hex)               Pyras Technology Inc.\r
  D00000-DFFFFF     (base 16)            Pyras Technology Inc.\r
                                 6F, No. 1353, Chung Cheng Rd., Taoyuan Dist.,\r
                                 Taoyuan City  Select State  33071\r
                                 TW\r
  \r
-8C-19-2D   (hex)               smartHome Partner GmbH\r
-600000-6FFFFF     (base 16)            smartHome Partner GmbH\r
-                               Dalbker Strasse 138\r
-                               Oerlinghausen  NRW  33813\r
-                               DE\r
-\r
-1C-87-76   (hex)               Dspread Technology (Beijing) Inc.\r
-000000-0FFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
-                               Jingxin Building, 2045 Suite , Chaoyang District\r
-                               Beijing    100027\r
-                               CN\r
-\r
  8C-19-2D   (hex)               Noritsu Precision Co., Ltd.\r
  000000-0FFFFF     (base 16)            Noritsu Precision Co., Ltd.\r
                                 579-1 Umehara\r
@@ -8549,10 +8636,16 @@ A00000-AFFFFF     (base 16)             Eksagate Elektronik Mühendislik ve Bilgisayar San.
                                 istanbul    34381\r
                                 TR\r
  \r
-D0-D9-4F   (hex)               Shenzhen FDC Electuonic Co.,Ltd.\r
-A00000-AFFFFF     (base 16)            Shenzhen FDC Electuonic Co.,Ltd.\r
-                               Gushu Community, Xixiang Street, Baoan Dist. ShenZhen, GuangDong, China\r
-                               Shenzhen  Guangdong  518126\r
+8C-19-2D   (hex)               smartHome Partner GmbH\r
+600000-6FFFFF     (base 16)            smartHome Partner GmbH\r
+                               Dalbker Strasse 138\r
+                               Oerlinghausen  NRW  33813\r
+                               DE\r
+\r
+1C-87-76   (hex)               Dspread Technology (Beijing) Inc.\r
+000000-0FFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
+                               Jingxin Building, 2045 Suite , Chaoyang District\r
+                               Beijing    100027\r
                                 CN\r
  \r
  D0-D9-4F   (hex)               ARROWAVE TECHNOLOGIES LIMITED\r
@@ -8561,11 +8654,11 @@ C00000-CFFFFF     (base 16)             ARROWAVE TECHNOLOGIES LIMITED
                                 Bangalore  Karnataka  560075\r
                                 IN\r
  \r
-CC-D3-1E   (hex)               NantEnergy\r
-C00000-CFFFFF     (base 16)            NantEnergy\r
-                               8455 North 90th Street Suite 4\r
-                               Scottsdale  AZ  85258\r
-                               US\r
+D0-D9-4F   (hex)               Shenzhen FDC Electuonic Co.,Ltd.\r
+A00000-AFFFFF     (base 16)            Shenzhen FDC Electuonic Co.,Ltd.\r
+                               Gushu Community, Xixiang Street, Baoan Dist. ShenZhen, GuangDong, China\r
+                               Shenzhen  Guangdong  518126\r
+                               CN\r
  \r
  CC-D3-1E   (hex)               PJG Systementwicklung GmbH\r
  400000-4FFFFF     (base 16)            PJG Systementwicklung GmbH\r
@@ -8573,6 +8666,12 @@ CC-D3-1E   (hex)         PJG Systementwicklung GmbH
                                 Vienna  Vienna  1190\r
                                 AT\r
  \r
+CC-D3-1E   (hex)               NantEnergy\r
+C00000-CFFFFF     (base 16)            NantEnergy\r
+                               8455 North 90th Street Suite 4\r
+                               Scottsdale  AZ  85258\r
+                               US\r
+\r
  E0-B6-F5   (hex)               Advatek Lighting Pty Ltd\r
  E00000-EFFFFF     (base 16)            Advatek Lighting Pty Ltd\r
                                 16 / 62 Ramset Drive\r
@@ -8585,18 +8684,6 @@ E0-B6-F5   (hex)          Shanghai- British Information Technology Co., Ltd
                                 shanghai    201203\r
                                 CN\r
  \r
-E0-B6-F5   (hex)               Shenzhen Civicom Technology Co.,Limited\r
-500000-5FFFFF     (base 16)            Shenzhen Civicom Technology Co.,Limited\r
-                               Room 1302,Microprofit Building,Gaoxin 6th Avenue,Hi-tech Park,Nanshan District \r
-                               Shenzhen  Guangdong  518057\r
-                               CN\r
-\r
-E0-B6-F5   (hex)               Motiveprime Consumer Electronics Pvt Ltd\r
-900000-9FFFFF     (base 16)            Motiveprime Consumer Electronics Pvt Ltd\r
-                               #244,17th cross Sector 6 HSR Layout\r
-                               Bangalore  Karnataka  560102\r
-                               IN\r
-\r
  2C-26-5F   (hex)               AATON DIGITAL\r
  C00000-CFFFFF     (base 16)            AATON DIGITAL\r
                                 2 RUE DE LA PAIX\r
@@ -8609,22 +8696,52 @@ C00000-CFFFFF     (base 16)             AATON DIGITAL
                                 shanghai  shanghai  201100 \r
                                 CN\r
  \r
-50-FF-99   (hex)               Garrison Technology\r
-500000-5FFFFF     (base 16)            Garrison Technology\r
+E0-B6-F5   (hex)               Motiveprime Consumer Electronics Pvt Ltd\r
+900000-9FFFFF     (base 16)            Motiveprime Consumer Electronics Pvt Ltd\r
+                               #244,17th cross Sector 6 HSR Layout\r
+                               Bangalore  Karnataka  560102\r
+                               IN\r
+\r
+E0-B6-F5   (hex)               Shenzhen Civicom Technology Co.,Limited\r
+500000-5FFFFF     (base 16)            Shenzhen Civicom Technology Co.,Limited\r
+                               Room 1302,Microprofit Building,Gaoxin 6th Avenue,Hi-tech Park,Nanshan District \r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+50-FF-99   (hex)               Garrison Technology\r
+500000-5FFFFF     (base 16)            Garrison Technology\r
                                 20-22 Wenlock Road\r
                                 London  London  N1 7GU\r
                                 GB\r
  \r
+98-6D-35   (hex)               PDAHL \r
+500000-5FFFFF     (base 16)            PDAHL \r
+                               Gammagatan  1\r
+                               Moelndal  Sweden  43949\r
+                               SE\r
+\r
  7C-47-7C   (hex)               I-Convergence.com\r
  E00000-EFFFFF     (base 16)            I-Convergence.com\r
                                 2A2212, No.32 Baiziwan Road, Chaoyang District\r
                                 Beijing    100021\r
                                 CN\r
  \r
-98-6D-35   (hex)               PDAHL \r
-500000-5FFFFF     (base 16)            PDAHL \r
-                               Gammagatan  1\r
-                               Moelndal  Sweden  43949\r
+7C-47-7C   (hex)               RLC Electronics Systems\r
+400000-4FFFFF     (base 16)            RLC Electronics Systems\r
+                               10 Corporate Blvd.\r
+                               Sinking Spring  PA  19608\r
+                               US\r
+\r
+7C-47-7C   (hex)               DaLian Cheering Tech Co.,Ltd\r
+900000-9FFFFF     (base 16)            DaLian Cheering Tech Co.,Ltd\r
+                               321-1 Tuqiang Street RM308,DDA\r
+                               DaLian  Liaoning  116023\r
+                               CN\r
+\r
+38-FD-FE   (hex)               Swedish Adrenaline AB\r
+B00000-BFFFFF     (base 16)            Swedish Adrenaline AB\r
+                               Pilefeltsgatan 73\r
+                               Halmstad    302 50\r
                                 SE\r
  \r
  38-FD-FE   (hex)               Indra Navia AS\r
@@ -8639,17 +8756,11 @@ E00000-EFFFFF     (base 16)             I-Convergence.com
                                 Moscow  Moscow  117321\r
                                 RU\r
  \r
-7C-47-7C   (hex)               RLC Electronics Systems\r
-400000-4FFFFF     (base 16)            RLC Electronics Systems\r
-                               10 Corporate Blvd.\r
-                               Sinking Spring  PA  19608\r
-                               US\r
-\r
-7C-47-7C   (hex)               DaLian Cheering Tech Co.,Ltd\r
-900000-9FFFFF     (base 16)            DaLian Cheering Tech Co.,Ltd\r
-                               321-1 Tuqiang Street RM308,DDA\r
-                               DaLian  Liaoning  116023\r
-                               CN\r
+38-FD-FE   (hex)               Edge I&D Co., Ltd.\r
+000000-0FFFFF     (base 16)            Edge I&D Co., Ltd.\r
+                               1342-12, Gyeongchung-daero, Chowol-eup\r
+                               Gwangju-si  Gyeonggi-do  12735\r
+                               KR\r
  \r
  5C-F2-86   (hex)               Access IS\r
  700000-7FFFFF     (base 16)            Access IS\r
@@ -8669,18 +8780,18 @@ C00000-CFFFFF     (base 16)             Ajax Systems Inc
                                 Curitiba  Parana  81260000\r
                                 BR\r
  \r
-38-FD-FE   (hex)               Swedish Adrenaline AB\r
-B00000-BFFFFF     (base 16)            Swedish Adrenaline AB\r
-                               Pilefeltsgatan 73\r
-                               Halmstad    302 50\r
-                               SE\r
-\r
-38-FD-FE   (hex)               Edge I&D Co., Ltd.\r
-000000-0FFFFF     (base 16)            Edge I&D Co., Ltd.\r
-                               1342-12, Gyeongchung-daero, Chowol-eup\r
-                               Gwangju-si  Gyeonggi-do  12735\r
+38-B8-EB   (hex)               UMLOGICS\r
+400000-4FFFFF     (base 16)            UMLOGICS\r
+                               17, Techno2ro, Yuseong-gu\r
+                               Daejeon    34012\r
                                 KR\r
  \r
+38-B8-EB   (hex)               SECAD SA\r
+A00000-AFFFFF     (base 16)            SECAD SA\r
+                               Zac des Pellants\r
+                               St Martin du Fresne    01430\r
+                               FR\r
+\r
  38-FD-FE   (hex)               Management Service Corporation\r
  A00000-AFFFFF     (base 16)            Management Service Corporation\r
                                 1-7-12 Marunouchi, Chiyoda-ku\r
@@ -8693,18 +8804,6 @@ A00000-AFFFFF     (base 16)              Management Service Corporation
                                 Ansan  Gyeonggi  15612\r
                                 KR\r
  \r
-38-B8-EB   (hex)               UMLOGICS\r
-400000-4FFFFF     (base 16)            UMLOGICS\r
-                               17, Techno2ro, Yuseong-gu\r
-                               Daejeon    34012\r
-                               KR\r
-\r
-38-B8-EB   (hex)               SECAD SA\r
-A00000-AFFFFF     (base 16)            SECAD SA\r
-                               Zac des Pellants\r
-                               St Martin du Fresne    01430\r
-                               FR\r
-\r
  78-CA-83   (hex)               Pinhole (Beijing) Technology Co., Ltd.\r
  400000-4FFFFF     (base 16)            Pinhole (Beijing) Technology Co., Ltd.\r
                                 Room 1001-008, No.1 Building, No. 3 Haidian Street, Haidian District\r
@@ -8747,30 +8846,24 @@ D00000-DFFFFF     (base 16)             Beijing Raycores Technology Co.,Ltd
                                 Keelung    20647\r
                                 TW\r
  \r
-1C-87-74   (hex)               Nebbiolo Technologies\r
-A00000-AFFFFF     (base 16)            Nebbiolo Technologies\r
-                               860 Hillview Court, #310\r
-                               Milpitas  CA  94035\r
-                               US\r
-\r
  1C-88-79   (hex)               Ultraflux\r
  400000-4FFFFF     (base 16)            Ultraflux\r
                                 9 Allee Rosa Luxembourg\r
                                 Eragny    95610\r
                                 FR\r
  \r
+1C-87-74   (hex)               Nebbiolo Technologies\r
+A00000-AFFFFF     (base 16)            Nebbiolo Technologies\r
+                               860 Hillview Court, #310\r
+                               Milpitas  CA  94035\r
+                               US\r
+\r
  1C-87-74   (hex)               Wide World Trade HK ltd.\r
  900000-9FFFFF     (base 16)            Wide World Trade HK ltd.\r
                                 Office Tower, Convention Plaza, 1 Harbour Road, Wanchai\r
                                 Hong Kong    4210\r
                                 HK\r
  \r
-1C-87-76   (hex)               Qivivo\r
-D00000-DFFFFF     (base 16)            Qivivo\r
-                               11 impasse Juton\r
-                               NANTES    44000\r
-                               FR\r
-\r
  1C-87-74   (hex)               Silora R&D\r
  300000-3FFFFF     (base 16)            Silora R&D\r
                                 Kibbutz Kfar-Masaryk\r
@@ -8783,11 +8876,11 @@ D00000-DFFFFF     (base 16)             Qivivo
                                 Labege    31670\r
                                 FR\r
  \r
-1C-87-76   (hex)               Tokyo Drawing Ltd.\r
-900000-9FFFFF     (base 16)            Tokyo Drawing Ltd.\r
-                               103 Ni Terai-machi\r
-                               Nomi-shi  Ishikawa  923-1121\r
-                               JP\r
+1C-87-76   (hex)               Qivivo\r
+D00000-DFFFFF     (base 16)            Qivivo\r
+                               11 impasse Juton\r
+                               NANTES    44000\r
+                               FR\r
  \r
  1C-87-76   (hex)               Guangzhou Video-Star Electronics Co.,Ltd.\r
  800000-8FFFFF     (base 16)            Guangzhou Video-Star Electronics Co.,Ltd.\r
@@ -8795,17 +8888,35 @@ D00000-DFFFFF     (base 16)             Qivivo
                                 Guangzhou  Guangdong  510730\r
                                 CN\r
  \r
+1C-87-76   (hex)               philandro Software GmbH\r
+600000-6FFFFF     (base 16)            philandro Software GmbH\r
+                               Rosenbergstr. 46\r
+                               Stuttgart    70176\r
+                               DE\r
+\r
  1C-87-76   (hex)               Corporate Systems Engineering \r
  700000-7FFFFF     (base 16)            Corporate Systems Engineering \r
                                 1215 Brookville Way\r
                                 Indianapolis   IN  46239\r
                                 US\r
  \r
-1C-87-76   (hex)               philandro Software GmbH\r
-600000-6FFFFF     (base 16)            philandro Software GmbH\r
-                               Rosenbergstr. 46\r
-                               Stuttgart    70176\r
-                               DE\r
+1C-87-76   (hex)               Tokyo Drawing Ltd.\r
+900000-9FFFFF     (base 16)            Tokyo Drawing Ltd.\r
+                               103 Ni Terai-machi\r
+                               Nomi-shi  Ishikawa  923-1121\r
+                               JP\r
+\r
+1C-87-76   (hex)               Unjo AB\r
+300000-3FFFFF     (base 16)            Unjo AB\r
+                               Bergfotsgatan 3B\r
+                               Mölndal    SE-43135\r
+                               SE\r
+\r
+1C-87-79   (hex)               Visual Land Inc.\r
+300000-3FFFFF     (base 16)            Visual Land Inc.\r
+                               17785 Center Court Dr. #670\r
+                               Cerritos  CA  90703\r
+                               US\r
  \r
  1C-87-79   (hex)               Wurm GmbH & Co. KG Elektronische Systeme\r
  000000-0FFFFF     (base 16)            Wurm GmbH & Co. KG Elektronische Systeme\r
@@ -8819,12 +8930,6 @@ D00000-DFFFFF     (base 16)              Qivivo
                                 Hamburg    22143\r
                                 DE\r
  \r
-1C-87-76   (hex)               Unjo AB\r
-300000-3FFFFF     (base 16)            Unjo AB\r
-                               Bergfotsgatan 3B\r
-                               Mölndal    SE-43135\r
-                               SE\r
-\r
  40-A3-6B   (hex)               FAOD Co.,Ltd.\r
  D00000-DFFFFF     (base 16)            FAOD Co.,Ltd.\r
                                 #301, U-Tower, 1029, Yeongdeok-dong, Giheung-gu\r
@@ -8843,11 +8948,11 @@ D00000-DFFFFF     (base 16)             FAOD Co.,Ltd.
                                 Shenzhen  Guangdong  518010\r
                                 CN\r
  \r
-1C-87-79   (hex)               Visual Land Inc.\r
-300000-3FFFFF     (base 16)            Visual Land Inc.\r
-                               17785 Center Court Dr. #670\r
-                               Cerritos  CA  90703\r
-                               US\r
+40-A3-6B   (hex)               TOPROOTTechnology Corp. Ltd.\r
+200000-2FFFFF     (base 16)            TOPROOTTechnology Corp. Ltd.\r
+                               5F-8, No. 14, Lane 609, Sec.5, Chongsin Rd., \r
+                               Sanchong Dist.   NewTaipei City   241\r
+                               TW\r
  \r
  70-88-6B   (hex)               Beijing Strongleader Science & Technology Co., Ltd.\r
  B00000-BFFFFF     (base 16)            Beijing Strongleader Science & Technology Co., Ltd.\r
@@ -8855,18 +8960,6 @@ B00000-BFFFFF     (base 16)              Beijing Strongleader Science & Technology Co., Ltd.
                                 Beijing  Beijing  100081\r
                                 CN\r
  \r
-70-88-6B   (hex)               MAX4G, Inc.\r
-C00000-CFFFFF     (base 16)            MAX4G, Inc.\r
-                               6400 Flying Cloud Drive, Suite 225\r
-                               Eden Prairie  MN  55344\r
-                               US\r
-\r
-70-88-6B   (hex)               Veracity UK Ltd\r
-000000-0FFFFF     (base 16)            Veracity UK Ltd\r
-                               4 Dow Road\r
-                               Monkton, Prestwick    KA9 2TU\r
-                               GB\r
-\r
  70-88-6B   (hex)               RHXTune Technology Co.,Ltd\r
  A00000-AFFFFF     (base 16)            RHXTune Technology Co.,Ltd\r
                                 Room 409, TianGong building A, Xueyuan Road 30, Haidian District\r
@@ -8879,11 +8972,17 @@ A00000-AFFFFF     (base 16)             RHXTune Technology Co.,Ltd
                                 Yokohama-city  Kanagawa  224-0054\r
                                 JP\r
  \r
-40-A3-6B   (hex)               TOPROOTTechnology Corp. Ltd.\r
-200000-2FFFFF     (base 16)            TOPROOTTechnology Corp. Ltd.\r
-                               5F-8, No. 14, Lane 609, Sec.5, Chongsin Rd., \r
-                               Sanchong Dist.   NewTaipei City   241\r
-                               TW\r
+70-88-6B   (hex)               MAX4G, Inc.\r
+C00000-CFFFFF     (base 16)            MAX4G, Inc.\r
+                               6400 Flying Cloud Drive, Suite 225\r
+                               Eden Prairie  MN  55344\r
+                               US\r
+\r
+70-88-6B   (hex)               Veracity UK Ltd\r
+000000-0FFFFF     (base 16)            Veracity UK Ltd\r
+                               4 Dow Road\r
+                               Monkton, Prestwick    KA9 2TU\r
+                               GB\r
  \r
  80-0A-80   (hex)               Dongguan I-Chime electrinics Co.,Ltd\r
  100000-1FFFFF     (base 16)            Dongguan I-Chime electrinics Co.,Ltd\r
@@ -8891,40 +8990,46 @@ A00000-AFFFFF     (base 16)             RHXTune Technology Co.,Ltd
                                 Dongguan  Guangdong  523660\r
                                 CN\r
  \r
+CC-1B-E0   (hex)               Sichuan Dianjia network technology Co.Ltd.\r
+700000-7FFFFF     (base 16)            Sichuan Dianjia network technology Co.Ltd.\r
+                               East 6F,No.51 East Wenshui Road,Hongkou District\r
+                               Shanghai  Shanghai  200437\r
+                               CN\r
+\r
+CC-1B-E0   (hex)               i-Trinetech Co.,Ltd.\r
+200000-2FFFFF     (base 16)            i-Trinetech Co.,Ltd.\r
+                               4th FL.,East Wing of M-8 Building,Sparrow Ridge Industrial Zone,Science&Technology Park,Nanshan District.,Shenzhen City\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
  CC-1B-E0   (hex)               ART&CORE Inc\r
  B00000-BFFFFF     (base 16)            ART&CORE Inc\r
                                 6F, 44, Burim-ro 170beon-gil, Dongan-gu,\r
                                 Anyang-si  Gyeonggi-do  431-060\r
                                 KR\r
  \r
-A0-3E-6B   (hex)               Wuhan Rui Ying Tong Network Technology Co., Ltd(China)\r
-600000-6FFFFF     (base 16)            Wuhan Rui Ying Tong Network Technology Co., Ltd(China)\r
-                               No.303, Optics Valley Avenue, Wuhan, Hubei, China\r
-                               Wuhan  Hubei  430074\r
-                               CN\r
-\r
-A0-3E-6B   (hex)               iLoda Solutions Limited\r
-300000-3FFFFF     (base 16)            iLoda Solutions Limited\r
-                               217A, 2/F, Enterprise Place\r
-                               Hong Kong  Hong Kong  000000\r
-                               HK\r
-\r
  00-55-DA   (hex)               Shinko Technos co.,ltd.\r
  000000-0FFFFF     (base 16)            Shinko Technos co.,ltd.\r
                                 2-5-1, Senba Higashi\r
                                 Mino  Osaka  562-0035\r
                                 JP\r
  \r
-CC-1B-E0   (hex)               Sichuan Dianjia network technology Co.Ltd.\r
-700000-7FFFFF     (base 16)            Sichuan Dianjia network technology Co.Ltd.\r
-                               East 6F,No.51 East Wenshui Road,Hongkou District\r
-                               Shanghai  Shanghai  200437\r
-                               CN\r
+C8-8E-D1   (hex)               Aventics GmbH\r
+E00000-EFFFFF     (base 16)            Aventics GmbH\r
+                               Ulmer Str. 4\r
+                               Laatzen  Lower Saxony  30880\r
+                               DE\r
  \r
-CC-1B-E0   (hex)               i-Trinetech Co.,Ltd.\r
-200000-2FFFFF     (base 16)            i-Trinetech Co.,Ltd.\r
-                               4th FL.,East Wing of M-8 Building,Sparrow Ridge Industrial Zone,Science&Technology Park,Nanshan District.,Shenzhen City\r
-                               Shenzhen  Guangdong  518057\r
+A0-3E-6B   (hex)               iLoda Solutions Limited\r
+300000-3FFFFF     (base 16)            iLoda Solutions Limited\r
+                               217A, 2/F, Enterprise Place\r
+                               Hong Kong  Hong Kong  000000\r
+                               HK\r
+\r
+A0-3E-6B   (hex)               Wuhan Rui Ying Tong Network Technology Co., Ltd(China)\r
+600000-6FFFFF     (base 16)            Wuhan Rui Ying Tong Network Technology Co., Ltd(China)\r
+                               No.303, Optics Valley Avenue, Wuhan, Hubei, China\r
+                               Wuhan  Hubei  430074\r
                                 CN\r
  \r
  A0-3E-6B   (hex)               SinoGrid Software Systems Inc.\r
@@ -8945,11 +9050,11 @@ A0-3E-6B   (hex)                SinoGrid Software Systems Inc.
                                 Cheboksary  Chuvash Republic  428015\r
                                 RU\r
  \r
-C8-8E-D1   (hex)               Aventics GmbH\r
-E00000-EFFFFF     (base 16)            Aventics GmbH\r
-                               Ulmer Str. 4\r
-                               Laatzen  Lower Saxony  30880\r
-                               DE\r
+DC-44-27   (hex)               Neusoft Corporation\r
+900000-9FFFFF     (base 16)            Neusoft Corporation\r
+                               No.2 Xinxiu Street,Hunnan New District,Shenyang,Liaoning,China\r
+                               Shenyang  Liaoning  110179\r
+                               CN\r
  \r
  C8-8E-D1   (hex)               AISWORLD PRIVATE LIMITED\r
  000000-0FFFFF     (base 16)            AISWORLD PRIVATE LIMITED\r
@@ -8957,23 +9062,20 @@ C8-8E-D1   (hex)                AISWORLD PRIVATE LIMITED
                                 HONG KONG  SHEUNG WAN  999077\r
                                 HK\r
  \r
-B0-C5-CA   (hex)               XMetrics\r
-C00000-CFFFFF     (base 16)            XMetrics\r
-                               Via Caravaggio, 3\r
-                               Bussero  MI  20060\r
-                               IT\r
-\r
  B0-C5-CA   (hex)               Audio Elektronik İthalat İhracat San ve Tic A.Ş.\r
  E00000-EFFFFF     (base 16)            Audio Elektronik İthalat İhracat San ve Tic A.Ş.\r
                                 Esenkent Mah. Barajyolu cad. No:26\r
                                 İstanbul  Ümraniye  34776\r
                                 TR\r
  \r
-DC-44-27   (hex)               Neusoft Corporation\r
-900000-9FFFFF     (base 16)            Neusoft Corporation\r
-                               No.2 Xinxiu Street,Hunnan New District,Shenyang,Liaoning,China\r
-                               Shenyang  Liaoning  110179\r
-                               CN\r
+B0-C5-CA   (hex)               Private\r
+D00000-DFFFFF     (base 16)            Private\r
+\r
+B0-C5-CA   (hex)               XMetrics\r
+C00000-CFFFFF     (base 16)            XMetrics\r
+                               Via Caravaggio, 3\r
+                               Bussero  MI  20060\r
+                               IT\r
  \r
  DC-44-27   (hex)               Century Audio, Inc.\r
  500000-5FFFFF     (base 16)            Century Audio, Inc.\r
@@ -8987,26 +9089,17 @@ B0-C5-CA   (hex)                abode systems, inc.
                                 Palo Alto  CA  94306\r
                                 US\r
  \r
-B0-C5-CA   (hex)               Private\r
-D00000-DFFFFF     (base 16)            Private\r
-\r
  78-C2-C0   (hex)               Huwomobility\r
  E00000-EFFFFF     (base 16)            Huwomobility\r
                                 1196 Borregas Ave, Suite 100\r
                                 Sunnyvale  California  94089\r
                                 US\r
  \r
-B4-37-D1   (hex)               NSI Co., Ltd.\r
-B00000-BFFFFF     (base 16)            NSI Co., Ltd.\r
-                               3F, No.33-1, Lane235, Sung-Chiang Road\r
-                               Taipei    10483\r
-                               TW\r
-\r
-78-C2-C0   (hex)               XRONOS-INC\r
-100000-1FFFFF     (base 16)            XRONOS-INC\r
-                               SHINANOMACHI35\r
-                               SHINJUKUKU  TOKYO  160-0016\r
-                               JP\r
+78-C2-C0   (hex)               SES\r
+900000-9FFFFF     (base 16)            SES\r
+                               35-39 avenue du Danemark\r
+                               TOURS  Indre et Loire  37072\r
+                               FR\r
  \r
  74-F8-DB   (hex)               Simon Electric (China) Co.,ltd\r
  D00000-DFFFFF     (base 16)            Simon Electric (China) Co.,ltd\r
@@ -9014,11 +9107,23 @@ D00000-DFFFFF     (base 16)             Simon Electric (China) Co.,ltd
                                 Nantong  Jiangsu  226601\r
                                 CN\r
  \r
-78-C2-C0   (hex)               SES\r
-900000-9FFFFF     (base 16)            SES\r
-                               35-39 avenue du Danemark\r
-                               TOURS  Indre et Loire  37072\r
-                               FR\r
+74-F8-DB   (hex)               Songam Syscom Co. LTD.\r
+800000-8FFFFF     (base 16)            Songam Syscom Co. LTD.\r
+                               1672-1, Donghwa-Ri, Munmak-Eup\r
+                               Wonju  Gangwon-Do  220-801\r
+                               KR\r
+\r
+74-F8-DB   (hex)               Shenzhen Melon Electronics Co.,Ltd\r
+600000-6FFFFF     (base 16)            Shenzhen Melon Electronics Co.,Ltd\r
+                               3 Floor ,A5 building ,YinLong Technology Industrial Park ,Shenshan Road 292 ,Longgang District\r
+                               Shenzhen  Guangdong  518116\r
+                               CN\r
+\r
+78-C2-C0   (hex)               XRONOS-INC\r
+100000-1FFFFF     (base 16)            XRONOS-INC\r
+                               SHINANOMACHI35\r
+                               SHINJUKUKU  TOKYO  160-0016\r
+                               JP\r
  \r
  B4-37-D1   (hex)               Union Tecnologica Noxium S.L.\r
  E00000-EFFFFF     (base 16)            Union Tecnologica Noxium S.L.\r
@@ -9032,59 +9137,53 @@ D00000-DFFFFF     (base 16)             ZXY Sport Tracking
                                 Trondheim  Norway  7047\r
                                 NO\r
  \r
+B4-37-D1   (hex)               NSI Co., Ltd.\r
+B00000-BFFFFF     (base 16)            NSI Co., Ltd.\r
+                               3F, No.33-1, Lane235, Sung-Chiang Road\r
+                               Taipei    10483\r
+                               TW\r
+\r
  88-5D-90   (hex)               CPAC Systems\r
  300000-3FFFFF     (base 16)            CPAC Systems\r
                                 Bergskroken 3\r
                                 Gothenburg  Västra Götaland  40123\r
                                 SE\r
  \r
-88-5D-90   (hex)               FOSHAN HUAGUO OPTICAL CO.,LTD\r
-000000-0FFFFF     (base 16)            FOSHAN HUAGUO OPTICAL CO.,LTD\r
-                               NO.3 Changhong East Road,Zhanghca Town Foshan City Guang Dong,China\r
-                               Foshan  Guang Dong  528000\r
-                               CN\r
-\r
-88-5D-90   (hex)               Hexaglobe\r
-D00000-DFFFFF     (base 16)            Hexaglobe\r
-                               1 rue Méhul\r
-                                 Paris  75002\r
-                               FR\r
-\r
  88-5D-90   (hex)               Shenzhen JingHanDa Electronics Co.Ltd\r
  500000-5FFFFF     (base 16)            Shenzhen JingHanDa Electronics Co.Ltd\r
                                 5th Floor,No 4 ,Road 1,ShangXue Technology industrial Park,LongGang district,ShenZhen,GuangDong,China\r
                                 ShenZhen  GuangDong  518129\r
                                 CN\r
  \r
-74-F8-DB   (hex)               Songam Syscom Co. LTD.\r
-800000-8FFFFF     (base 16)            Songam Syscom Co. LTD.\r
-                               1672-1, Donghwa-Ri, Munmak-Eup\r
-                               Wonju  Gangwon-Do  220-801\r
-                               KR\r
-\r
-74-F8-DB   (hex)               Shenzhen Melon Electronics Co.,Ltd\r
-600000-6FFFFF     (base 16)            Shenzhen Melon Electronics Co.,Ltd\r
-                               3 Floor ,A5 building ,YinLong Technology Industrial Park ,Shenshan Road 292 ,Longgang District\r
-                               Shenzhen  Guangdong  518116\r
+88-5D-90   (hex)               FOSHAN HUAGUO OPTICAL CO.,LTD\r
+000000-0FFFFF     (base 16)            FOSHAN HUAGUO OPTICAL CO.,LTD\r
+                               NO.3 Changhong East Road,Zhanghca Town Foshan City Guang Dong,China\r
+                               Foshan  Guang Dong  528000\r
                                 CN\r
  \r
+80-7B-85   (hex)               Mersen\r
+E00000-EFFFFF     (base 16)            Mersen\r
+                               374 Merrimac St\r
+                               Newburyport  MA  01950\r
+                               US\r
+\r
+54-9A-11   (hex)               Orient Direct, Inc.\r
+600000-6FFFFF     (base 16)            Orient Direct, Inc.\r
+                               974 Commercial St.\r
+                               Palo Alto  California  94303\r
+                               US\r
+\r
  54-9A-11   (hex)               Xi'an Hua Fan Technology Co.,Ltd.\r
  C00000-CFFFFF     (base 16)            Xi'an Hua Fan Technology Co.,Ltd.\r
                                 Room No.1,3rd Floor,Xi Tie Gong Cheng Da Sha,No.205 Jinhua Road,Xincheng District\r
                                 Xi'an  Shaanxi  710032\r
                                 CN\r
  \r
-64-FB-81   (hex)               XIMO Communication Technology Co., Ltd\r
-600000-6FFFFF     (base 16)            XIMO Communication Technology Co., Ltd\r
-                               3rd Floor,F region,418#,Tian Lin Road, Xuhui District, Shanghai\r
-                               shanghai  shanghai  200233\r
-                               CN\r
-\r
-80-7B-85   (hex)               Mersen\r
-E00000-EFFFFF     (base 16)            Mersen\r
-                               374 Merrimac St\r
-                               Newburyport  MA  01950\r
-                               US\r
+88-5D-90   (hex)               Hexaglobe\r
+D00000-DFFFFF     (base 16)            Hexaglobe\r
+                               1 rue Méhul\r
+                                 Paris  75002\r
+                               FR\r
  \r
  80-7B-85   (hex)               Kaynes Technology India Pvt Ltd\r
  D00000-DFFFFF     (base 16)            Kaynes Technology India Pvt Ltd\r
@@ -9092,18 +9191,30 @@ D00000-DFFFFF     (base 16)             Kaynes Technology India Pvt Ltd
                                 MYSORE  Karnataka  570016\r
                                 IN\r
  \r
-54-9A-11   (hex)               Orient Direct, Inc.\r
-600000-6FFFFF     (base 16)            Orient Direct, Inc.\r
-                               974 Commercial St.\r
-                               Palo Alto  California  94303\r
-                               US\r
-\r
  64-FB-81   (hex)               SHANGHAI   SIMCOM   LIMITED\r
  000000-0FFFFF     (base 16)            SHANGHAI   SIMCOM   LIMITED\r
                                 Building A, SIM technology Building, N0.633 JinZhong Road,\r
                                 Shanghai  /  200335\r
                                 CN\r
  \r
+64-FB-81   (hex)               XIMO Communication Technology Co., Ltd\r
+600000-6FFFFF     (base 16)            XIMO Communication Technology Co., Ltd\r
+                               3rd Floor,F region,418#,Tian Lin Road, Xuhui District, Shanghai\r
+                               shanghai  shanghai  200233\r
+                               CN\r
+\r
+1C-CA-E3   (hex)               Dabi Atlante S/A Industrias Medico Odontológicas\r
+E00000-EFFFFF     (base 16)            Dabi Atlante S/A Industrias Medico Odontológicas\r
+                               Av. Presidente Castelo Branco, 2525\r
+                               Ribeirão Preto  São Paulo  14095-903\r
+                               BR\r
+\r
+80-E4-DA   (hex)               Dalian Roiland Technology Co.,Ltd\r
+D00000-DFFFFF     (base 16)            Dalian Roiland Technology Co.,Ltd\r
+                               11th floor,7Huixian Yuan,\r
+                               Dalian,  Liaoning  116023\r
+                               CN\r
+\r
  80-E4-DA   (hex)               CAVALRY STORAGE INC\r
  500000-5FFFFF     (base 16)            CAVALRY STORAGE INC\r
                                 4251 E BRICKELL ST\r
@@ -9116,10 +9227,16 @@ D00000-DFFFFF     (base 16)             Kaynes Technology India Pvt Ltd
                                 Seoul  N/A  150-935\r
                                 KR\r
  \r
-80-E4-DA   (hex)               Dalian Roiland Technology Co.,Ltd\r
-D00000-DFFFFF     (base 16)            Dalian Roiland Technology Co.,Ltd\r
-                               11th floor,7Huixian Yuan,\r
-                               Dalian,  Liaoning  116023\r
+1C-CA-E3   (hex)               Shenzhen Smart Device Technology Co.,LTD\r
+300000-3FFFFF     (base 16)            Shenzhen Smart Device Technology Co.,LTD\r
+                               SSMEC Building, Gao Xin Nan First Avenue Hi-Tech Park South\r
+                               Shenzhen  GuangDong  518057\r
+                               CN\r
+\r
+1C-CA-E3   (hex)               Sunray Medical Apparatus Co.,Ltd.\r
+400000-4FFFFF     (base 16)            Sunray Medical Apparatus Co.,Ltd.\r
+                                4/F No.242 Tianhe Dong Road ,510620 Guangzhou,  PEOPLE’S REPUBLICA OF CHINA\r
+                               Guangzhou  Guangdong  510620\r
                                 CN\r
  \r
  1C-CA-E3   (hex)               SHIN-YOSHA CORPORATION\r
@@ -9134,29 +9251,17 @@ D00000-DFFFFF     (base 16)             Dalian Roiland Technology Co.,Ltd
                                 Treviolo  Bergamo  24048\r
                                 IT\r
  \r
-1C-CA-E3   (hex)               Dabi Atlante S/A Industrias Medico Odontológicas\r
-E00000-EFFFFF     (base 16)            Dabi Atlante S/A Industrias Medico Odontológicas\r
-                               Av. Presidente Castelo Branco, 2525\r
-                               Ribeirão Preto  São Paulo  14095-903\r
-                               BR\r
-\r
-1C-CA-E3   (hex)               Shenzhen Smart Device Technology Co.,LTD\r
-300000-3FFFFF     (base 16)            Shenzhen Smart Device Technology Co.,LTD\r
-                               SSMEC Building, Gao Xin Nan First Avenue Hi-Tech Park South\r
-                               Shenzhen  GuangDong  518057\r
-                               CN\r
-\r
-1C-CA-E3   (hex)               Sunray Medical Apparatus Co.,Ltd.\r
-400000-4FFFFF     (base 16)            Sunray Medical Apparatus Co.,Ltd.\r
-                                4/F No.242 Tianhe Dong Road ,510620 Guangzhou,  PEOPLE’S REPUBLICA OF CHINA\r
-                               Guangzhou  Guangdong  510620\r
-                               CN\r
+2C-6A-6F   (hex)               Milbank Manufacturing Co.\r
+800000-8FFFFF     (base 16)            Milbank Manufacturing Co.\r
+                               4801 Deramus Ave.\r
+                               Kansas City  MO  64120\r
+                               US\r
  \r
-90-C6-82   (hex)               S.A.E.T. S.R.L.\r
-500000-5FFFFF     (base 16)            S.A.E.T. S.R.L.\r
-                               VIA PO 13\r
-                               BUSCA  CUNEO  12022\r
-                               IT\r
+2C-D1-41   (hex)               Ezee Systems Limited\r
+100000-1FFFFF     (base 16)            Ezee Systems Limited\r
+                               Room 2103, Singga Commercial Centre\r
+                               Hong Kong  HKSAR  HK\r
+                               HK\r
  \r
  2C-6A-6F   (hex)               EATON FHF Funke + Huster Fernsig GmbH\r
  E00000-EFFFFF     (base 16)            EATON FHF Funke + Huster Fernsig GmbH\r
@@ -9164,12 +9269,6 @@ E00000-EFFFFF     (base 16)              EATON FHF Funke + Huster Fernsig GmbH
                                 Muelheim an der Ruhr  NRW  45478\r
                                 DE\r
  \r
-2C-D1-41   (hex)               Ezee Systems Limited\r
-100000-1FFFFF     (base 16)            Ezee Systems Limited\r
-                               Room 2103, Singga Commercial Centre\r
-                               Hong Kong  HKSAR  HK\r
-                               HK\r
-\r
  90-C6-82   (hex)               Lachmann & Rink GmbH\r
  B00000-BFFFFF     (base 16)            Lachmann & Rink GmbH\r
                                 Hommeswiese 129\r
@@ -9182,17 +9281,29 @@ C00000-CFFFFF     (base 16)             Li Seng Technology Ltd.
                                   Hong Kong  852\r
                                 HK\r
  \r
+90-C6-82   (hex)               S.A.E.T. S.R.L.\r
+500000-5FFFFF     (base 16)            S.A.E.T. S.R.L.\r
+                               VIA PO 13\r
+                               BUSCA  CUNEO  12022\r
+                               IT\r
+\r
  2C-D1-41   (hex)               Resus Industries\r
  B00000-BFFFFF     (base 16)            Resus Industries\r
                                 Kleine monnikenwerve 9\r
                                 Brugge  West-Vlaanderen  8000\r
                                 BE\r
  \r
-2C-6A-6F   (hex)               Milbank Manufacturing Co.\r
-800000-8FFFFF     (base 16)            Milbank Manufacturing Co.\r
-                               4801 Deramus Ave.\r
-                               Kansas City  MO  64120\r
-                               US\r
+2C-6A-6F   (hex)               SHEN ZHEN SIS SCIENCE & TECHNOLOGY LTD.\r
+500000-5FFFFF     (base 16)            SHEN ZHEN SIS SCIENCE & TECHNOLOGY LTD.\r
+                               Room 201, Block A, No.1, Qianwan Road 1,\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+A0-BB-3E   (hex)               Shenzhen Talent Technology company limited\r
+D00000-DFFFFF     (base 16)            Shenzhen Talent Technology company limited\r
+                               105~107,1/F,Bldg T3,Shenzhen SW Park,No 011,High-teh South 7th Road, Nanshan District,Shenzhen\r
+                               Shenzhen  Guangdong  518040\r
+                               CN\r
  \r
  A0-BB-3E   (hex)               Ewig Industries Macao Commercial Offshore Ltd\r
  C00000-CFFFFF     (base 16)            Ewig Industries Macao Commercial Offshore Ltd\r
@@ -9206,6 +9317,18 @@ C00000-CFFFFF     (base 16)              Ewig Industries Macao Commercial Offshore Ltd
                                 NanChang  JiangXi  330096\r
                                 CN\r
  \r
+A0-BB-3E   (hex)               DirectOut GmbH\r
+200000-2FFFFF     (base 16)            DirectOut GmbH\r
+                               Leipziger Str. 32\r
+                               Mittweida  Saxony  09648\r
+                               DE\r
+\r
+98-02-D8   (hex)               EBI  Ltd.\r
+500000-5FFFFF     (base 16)            EBI  Ltd.\r
+                               1305 Metro Loft\r
+                               Kwai Chung  NT  HKG\r
+                               HK\r
+\r
  98-02-D8   (hex)               AGV spa\r
  C00000-CFFFFF     (base 16)            AGV spa\r
                                 Strada Savonesa 12\r
@@ -9218,23 +9341,29 @@ C00000-CFFFFF     (base 16)             AGV spa
                                 Hsinchu City  Taiwan  300\r
                                 TW\r
  \r
-A0-BB-3E   (hex)               Shenzhen Talent Technology company limited\r
-D00000-DFFFFF     (base 16)            Shenzhen Talent Technology company limited\r
-                               105~107,1/F,Bldg T3,Shenzhen SW Park,No 011,High-teh South 7th Road, Nanshan District,Shenzhen\r
-                               Shenzhen  Guangdong  518040\r
-                               CN\r
+28-FD-80   (hex)               Poket Hardware GmbH\r
+B00000-BFFFFF     (base 16)            Poket Hardware GmbH\r
+                               Borsigstr. 9.\r
+                               Berlin  Berlin  10115\r
+                               DE\r
  \r
-2C-6A-6F   (hex)               SHEN ZHEN SIS SCIENCE & TECHNOLOGY LTD.\r
-500000-5FFFFF     (base 16)            SHEN ZHEN SIS SCIENCE & TECHNOLOGY LTD.\r
-                               Room 201, Block A, No.1, Qianwan Road 1,\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+28-FD-80   (hex)               Apollo Digital (Taiwan) Ltd.\r
+A00000-AFFFFF     (base 16)            Apollo Digital (Taiwan) Ltd.\r
+                               Rm. A, 9F, No.68, Sec. 2,\r
+                               New Taipei City  Taiwan  22065\r
+                               TW\r
  \r
-98-02-D8   (hex)               EBI  Ltd.\r
-500000-5FFFFF     (base 16)            EBI  Ltd.\r
-                               1305 Metro Loft\r
-                               Kwai Chung  NT  HKG\r
-                               HK\r
+2C-26-5F   (hex)               Rexgen Inc.\r
+B00000-BFFFFF     (base 16)            Rexgen Inc.\r
+                               127, Wonmanseong-ro, Deokjin -gu\r
+                               Jeonju-si  Jeonbuk  561-202\r
+                               KR\r
+\r
+28-FD-80   (hex)               Xiaocong Network Limited\r
+500000-5FFFFF     (base 16)            Xiaocong Network Limited\r
+                               2F,Building 3, No.200, Guoding East Road (Innovation Works)\r
+                                 Shanghai  200093\r
+                               CN\r
  \r
  28-FD-80   (hex)               JINLITONG INTERNATIONAL CO.,LTD\r
  900000-9FFFFF     (base 16)            JINLITONG INTERNATIONAL CO.,LTD\r
@@ -9254,48 +9383,18 @@ D00000-DFFFFF     (base 16)             Shenzhen Talent Technology company limited
                                 Auckland  Auckland  1010\r
                                 NZ\r
  \r
-2C-26-5F   (hex)               Rexgen Inc.\r
-B00000-BFFFFF     (base 16)            Rexgen Inc.\r
-                               127, Wonmanseong-ro, Deokjin -gu\r
-                               Jeonju-si  Jeonbuk  561-202\r
-                               KR\r
-\r
-2C-26-5F   (hex)               E Core Corporation\r
-D00000-DFFFFF     (base 16)            E Core Corporation\r
-                               2F., No.15, Yijiang St., Zhongshan Dist.,\r
-                               Taipie  Taiwan  10456\r
-                               TW\r
-\r
  2C-26-5F   (hex)               Brüel & Kjaer Vibro GmbH\r
  900000-9FFFFF     (base 16)            Brüel & Kjaer Vibro GmbH\r
                                 Leydheckerstrasse 10\r
                                 Darmstadt  Hessen  64293\r
                                 DE\r
  \r
-28-FD-80   (hex)               Poket Hardware GmbH\r
-B00000-BFFFFF     (base 16)            Poket Hardware GmbH\r
-                               Borsigstr. 9.\r
-                               Berlin  Berlin  10115\r
-                               DE\r
-\r
-28-FD-80   (hex)               Apollo Digital (Taiwan) Ltd.\r
-A00000-AFFFFF     (base 16)            Apollo Digital (Taiwan) Ltd.\r
-                               Rm. A, 9F, No.68, Sec. 2,\r
-                               New Taipei City  Taiwan  22065\r
+2C-26-5F   (hex)               E Core Corporation\r
+D00000-DFFFFF     (base 16)            E Core Corporation\r
+                               2F., No.15, Yijiang St., Zhongshan Dist.,\r
+                               Taipie  Taiwan  10456\r
                                 TW\r
  \r
-28-FD-80   (hex)               Xiaocong Network Limited\r
-500000-5FFFFF     (base 16)            Xiaocong Network Limited\r
-                               2F,Building 3, No.200, Guoding East Road (Innovation Works)\r
-                                 Shanghai  200093\r
-                               CN\r
-\r
-A0-BB-3E   (hex)               DirectOut GmbH\r
-200000-2FFFFF     (base 16)            DirectOut GmbH\r
-                               Leipziger Str. 32\r
-                               Mittweida  Saxony  09648\r
-                               DE\r
-\r
  0C-EF-AF   (hex)               Syntrans AB\r
  700000-7FFFFF     (base 16)            Syntrans AB\r
                                 Teknikringen 4C\r
@@ -9314,10 +9413,10 @@ D00000-DFFFFF     (base 16)             CJSC «Svyaz Engineering»
                                   Moscow  115404\r
                                 \r
  \r
-F8-02-78   (hex)               Witium Co., Ltd\r
-600000-6FFFFF     (base 16)            Witium Co., Ltd\r
-                               Room 605A, E Building, NO.7001 Zhongchun Road\r
-                               Shanghai  Shanghai  201101\r
+A4-4F-29   (hex)               Shenzhen Huadoo Bright Group Limitied\r
+C00000-CFFFFF     (base 16)            Shenzhen Huadoo Bright Group Limitied\r
+                               Room 13E, Jinsong Buiding, Tai ran 4th Rood, Chegong Miao,Futian Distrct\r
+                               Shenzhen  Guangdong  51800\r
                                 CN\r
  \r
  F8-02-78   (hex)               EMBUX Technology Co., Ltd.\r
@@ -9326,17 +9425,29 @@ F8-02-78   (hex)                EMBUX Technology Co., Ltd.
                                 New Taipei City  New Taipei City  235\r
                                 TW\r
  \r
-A4-4F-29   (hex)               Shenzhen Huadoo Bright Group Limitied\r
-C00000-CFFFFF     (base 16)            Shenzhen Huadoo Bright Group Limitied\r
-                               Room 13E, Jinsong Buiding, Tai ran 4th Rood, Chegong Miao,Futian Distrct\r
-                               Shenzhen  Guangdong  51800\r
+F8-02-78   (hex)               Witium Co., Ltd\r
+600000-6FFFFF     (base 16)            Witium Co., Ltd\r
+                               Room 605A, E Building, NO.7001 Zhongchun Road\r
+                               Shanghai  Shanghai  201101\r
                                 CN\r
  \r
-3C-39-E7   (hex)               RO.VE.R. Laboratories S.p.A\r
-600000-6FFFFF     (base 16)            RO.VE.R. Laboratories S.p.A\r
-                               Via Parini 2/4\r
-                               Colombare di SIrmione  BS  25019\r
-                               IT\r
+3C-39-E7   (hex)               Hannstar Display Corp\r
+000000-0FFFFF     (base 16)            Hannstar Display Corp\r
+                               4F., No.15, Ln. 168, Xingshan Rd.,\r
+                                Taipei  Taiwan (R.O.C.)  11469\r
+                               TW\r
+\r
+10-07-23   (hex)               TESSERA TECHNOLOGY INC.\r
+A00000-AFFFFF     (base 16)            TESSERA TECHNOLOGY INC.\r
+                               2710-1 4F, Noborito, Tama-ku\r
+                               Kawasaki-shi  Kanagawa  214-0014\r
+                               JP\r
+\r
+A4-4F-29   (hex)               Certi Networks Sdn Bhd\r
+900000-9FFFFF     (base 16)            Certi Networks Sdn Bhd\r
+                               2-8 Level 8 Wisma Manjalara\r
+                               Kuala Lumpur  Wilayah Persekutuan Kuala Lumpur  52200\r
+                               MY\r
  \r
  3C-39-E7   (hex)               MARPOSS SPA\r
  E00000-EFFFFF     (base 16)            MARPOSS SPA\r
@@ -9356,35 +9467,17 @@ A4-4F-29   (hex)                Innovations in Optics, Inc.
                                 Woburn  MA  01801\r
                                 US\r
  \r
-A4-4F-29   (hex)               Certi Networks Sdn Bhd\r
-900000-9FFFFF     (base 16)            Certi Networks Sdn Bhd\r
-                               2-8 Level 8 Wisma Manjalara\r
-                               Kuala Lumpur  Wilayah Persekutuan Kuala Lumpur  52200\r
-                               MY\r
-\r
-3C-39-E7   (hex)               Hannstar Display Corp\r
-000000-0FFFFF     (base 16)            Hannstar Display Corp\r
-                               4F., No.15, Ln. 168, Xingshan Rd.,\r
-                                Taipei  Taiwan (R.O.C.)  11469\r
-                               TW\r
-\r
-10-07-23   (hex)               TESSERA TECHNOLOGY INC.\r
-A00000-AFFFFF     (base 16)            TESSERA TECHNOLOGY INC.\r
-                               2710-1 4F, Noborito, Tama-ku\r
-                               Kawasaki-shi  Kanagawa  214-0014\r
-                               JP\r
-\r
  10-07-23   (hex)               Wireless input technology Inc.\r
  900000-9FFFFF     (base 16)            Wireless input technology Inc.\r
                                 34339 N. Bobolink Trail\r
                                 Grayslake  IL  60030\r
                                 US\r
  \r
-10-07-23   (hex)               Audio Engineering Ltd.\r
-400000-4FFFFF     (base 16)            Audio Engineering Ltd.\r
-                               75 Parnell Rise\r
-                               Auckland    1052\r
-                               NZ\r
+3C-39-E7   (hex)               RO.VE.R. Laboratories S.p.A\r
+600000-6FFFFF     (base 16)            RO.VE.R. Laboratories S.p.A\r
+                               Via Parini 2/4\r
+                               Colombare di SIrmione  BS  25019\r
+                               IT\r
  \r
  10-07-23   (hex)               Tongfang computer co.Ltd.\r
  300000-3FFFFF     (base 16)            Tongfang computer co.Ltd.\r
@@ -9404,36 +9497,42 @@ C00000-CFFFFF     (base 16)             Shenzhen Hipad Telecommunication Technology Co.,Ltd
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+10-07-23   (hex)               Audio Engineering Ltd.\r
+400000-4FFFFF     (base 16)            Audio Engineering Ltd.\r
+                               75 Parnell Rise\r
+                               Auckland    1052\r
+                               NZ\r
+\r
+E8-18-63   (hex)               WETEK ELECTRONICS LIMITED\r
+500000-5FFFFF     (base 16)            WETEK ELECTRONICS LIMITED\r
+                               #604, TOWER A NEW TRADE PLAZA\r
+                               HONG KONG  HONG KONG  999077\r
+                               HK\r
+\r
  E8-18-63   (hex)               DIGITAL DYNAMICS, INC.\r
  D00000-DFFFFF     (base 16)            DIGITAL DYNAMICS, INC.\r
                                 5 VICTOR SQUARE\r
                                 SCOTTS VALLEY  CA.  95066\r
                                 US\r
  \r
-74-E1-4A   (hex)               Diamond Kinetics\r
-E00000-EFFFFF     (base 16)            Diamond Kinetics\r
-                               700 River Ave., Suite 318\r
-                               Pittsburgh  PA  15212\r
-                               US\r
-\r
  74-E1-4A   (hex)               Wuhan Shenghong Laser Projection Technology Co.,LTD\r
  C00000-CFFFFF     (base 16)            Wuhan Shenghong Laser Projection Technology Co.,LTD\r
                                 Room 403,Tower A11,Optical valley software Park,No.1 GuanShan first Road,East lake development Zone\r
                                 Wuhan  Hubei  430000\r
                                 CN\r
  \r
-E8-18-63   (hex)               WETEK ELECTRONICS LIMITED\r
-500000-5FFFFF     (base 16)            WETEK ELECTRONICS LIMITED\r
-                               #604, TOWER A NEW TRADE PLAZA\r
-                               HONG KONG  HONG KONG  999077\r
-                               HK\r
-\r
-B8-D8-12   (hex)               Neuropace Inc.\r
-700000-7FFFFF     (base 16)            Neuropace Inc.\r
-                               455 N Bernardo Ave\r
-                               Mountain View  California  94043\r
+74-E1-4A   (hex)               Diamond Kinetics\r
+E00000-EFFFFF     (base 16)            Diamond Kinetics\r
+                               700 River Ave., Suite 318\r
+                               Pittsburgh  PA  15212\r
                                 US\r
  \r
+74-E1-4A   (hex)               KLIMAT SOLEC Sp. z o.o.\r
+200000-2FFFFF     (base 16)            KLIMAT SOLEC Sp. z o.o.\r
+                               Nadborna 2a\r
+                               Solec Kujawski  Kujawsko-Pomorskie  86-050\r
+                               PL\r
+\r
  74-E1-4A   (hex)               Altenburger Electronic GmbH\r
  000000-0FFFFF     (base 16)            Altenburger Electronic GmbH\r
                                 Schlossweg 5\r
@@ -9446,29 +9545,59 @@ B8-D8-12   (hex)                Neuropace Inc.
                                 Tiyoda  Tokyo  101-0021\r
                                 JP\r
  \r
+74-E1-4A   (hex)               Emerging Technology (Holdings) Ltd.\r
+600000-6FFFFF     (base 16)            Emerging Technology (Holdings) Ltd.\r
+                               17/F, C-Bons International Center, 108 Wai Yip Street,\r
+                               Hong Kong  Hong Kong  Hong Kong\r
+                               CN\r
+\r
+B8-D8-12   (hex)               Neuropace Inc.\r
+700000-7FFFFF     (base 16)            Neuropace Inc.\r
+                               455 N Bernardo Ave\r
+                               Mountain View  California  94043\r
+                               US\r
+\r
+BC-66-41   (hex)               Shenzhen General Measure Technology Co., Ltd\r
+900000-9FFFFF     (base 16)            Shenzhen General Measure Technology Co., Ltd\r
+                               4th Floor, No.6 Block Science&Technologt Industrial Park of Privately Owned Enterprises\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+BC-66-41   (hex)               Scientific Games\r
+500000-5FFFFF     (base 16)            Scientific Games\r
+                               1500 Bluegrass Lakes Parkway\r
+                               Alpharetta  GA  30004\r
+                               US\r
+\r
  E4-95-6E   (hex)               Shanghai Hoping Technology Co., Ltd.\r
  200000-2FFFFF     (base 16)            Shanghai Hoping Technology Co., Ltd.\r
                                 Room 224, Building 3, No.99\r
                                   Shanghai  201210\r
                                 CN\r
  \r
+BC-66-41   (hex)               Solectria Renewables, LLC\r
+300000-3FFFFF     (base 16)            Solectria Renewables, LLC\r
+                               360 Merrimack St.\r
+                               Lawrence  MA  01843\r
+                               US\r
+\r
  E4-95-6E   (hex)               SHENZHEN JOYETECH ELECTRONICS CO., LTD.\r
  600000-6FFFFF     (base 16)            SHENZHEN JOYETECH ELECTRONICS CO., LTD.\r
                                 9th Blvd.Changxing New Tech.Industry Zone,Shajing Town,Baoan District\r
                                 shenzhen  Guangdong  518104\r
                                 CN\r
  \r
-74-E1-4A   (hex)               Emerging Technology (Holdings) Ltd.\r
-600000-6FFFFF     (base 16)            Emerging Technology (Holdings) Ltd.\r
-                               17/F, C-Bons International Center, 108 Wai Yip Street,\r
-                               Hong Kong  Hong Kong  Hong Kong\r
-                               CN\r
+58-FC-DB   (hex)               Shanghai Qianjin Electronic Equipment Co. Ltd\r
+800000-8FFFFF     (base 16)            Shanghai Qianjin Electronic Equipment Co. Ltd\r
+                                4/F,Building No.2,401 Caobao Road\r
+                                 Shanghai  200233\r
+                               \r
  \r
-74-E1-4A   (hex)               KLIMAT SOLEC Sp. z o.o.\r
-200000-2FFFFF     (base 16)            KLIMAT SOLEC Sp. z o.o.\r
-                               Nadborna 2a\r
-                               Solec Kujawski  Kujawsko-Pomorskie  86-050\r
-                               PL\r
+58-FC-DB   (hex)               Shenzhen Siecom Communication Technology Development Co.,Ltd.\r
+500000-5FFFFF     (base 16)            Shenzhen Siecom Communication Technology Development Co.,Ltd.\r
+                               Wanwei building401 ,Industry 5th Road\r
+                               Shenzhen  Guangdong  518067\r
+                               CN\r
  \r
  58-FC-DB   (hex)               Excenon Mobile Technology Co., Ltd.\r
  C00000-CFFFFF     (base 16)            Excenon Mobile Technology Co., Ltd.\r
@@ -9482,23 +9611,11 @@ C00000-CFFFFF     (base 16)             Excenon Mobile Technology Co., Ltd.
                                 Chesapeake  Virginia  23320\r
                                 US\r
  \r
-58-FC-DB   (hex)               Shanghai Qianjin Electronic Equipment Co. Ltd\r
-800000-8FFFFF     (base 16)            Shanghai Qianjin Electronic Equipment Co. Ltd\r
-                                4/F,Building No.2,401 Caobao Road\r
-                                 Shanghai  200233\r
-                               \r
-\r
-58-FC-DB   (hex)               Shenzhen Siecom Communication Technology Development Co.,Ltd.\r
-500000-5FFFFF     (base 16)            Shenzhen Siecom Communication Technology Development Co.,Ltd.\r
-                               Wanwei building401 ,Industry 5th Road\r
-                               Shenzhen  Guangdong  518067\r
-                               CN\r
-\r
-58-FC-DB   (hex)               Certis Technology International\r
-100000-1FFFFF     (base 16)            Certis Technology International\r
-                               Certis CISCO\r
-                                 Singapore  409179\r
-                               \r
+B0-1F-81   (hex)               Advanced & Wise Technology Corp.\r
+E00000-EFFFFF     (base 16)            Advanced & Wise Technology Corp.\r
+                               5F, No. 3-2, Industry East 9th Road, Hsinchu Science Park,\r
+                               Hsinchu City  Hsinchu  30075\r
+                               TW\r
  \r
  58-FC-DB   (hex)               Custom Biogenic Systems\r
  300000-3FFFFF     (base 16)            Custom Biogenic Systems\r
@@ -9506,29 +9623,35 @@ C00000-CFFFFF     (base 16)             Excenon Mobile Technology Co., Ltd.
                                 MI  Michigan  48065\r
                                 US\r
  \r
+B0-1F-81   (hex)               Technion Oy\r
+800000-8FFFFF     (base 16)            Technion Oy\r
+                               Linkkikatu 15\r
+                               Naantali  Länsi-Suomi  21100\r
+                               FI\r
+\r
+B0-1F-81   (hex)               COMOTA Co., Ltd.\r
+600000-6FFFFF     (base 16)            COMOTA Co., Ltd.\r
+                               Queens Tower C 10F\r
+                               Yokohama  Kanagawa  220-6210\r
+                               JP\r
+\r
  BC-66-41   (hex)               InSync Technology Ltd\r
  000000-0FFFFF     (base 16)            InSync Technology Ltd\r
                                 Tilbrook House\r
                                 Petersfield  Hampshire  GU31 4AZ\r
                                 GB\r
  \r
-BC-66-41   (hex)               Solectria Renewables, LLC\r
-300000-3FFFFF     (base 16)            Solectria Renewables, LLC\r
-                               360 Merrimack St.\r
-                               Lawrence  MA  01843\r
-                               US\r
-\r
-BC-66-41   (hex)               Shenzhen General Measure Technology Co., Ltd\r
-900000-9FFFFF     (base 16)            Shenzhen General Measure Technology Co., Ltd\r
-                               4th Floor, No.6 Block Science&Technologt Industrial Park of Privately Owned Enterprises\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+58-FC-DB   (hex)               Certis Technology International\r
+100000-1FFFFF     (base 16)            Certis Technology International\r
+                               Certis CISCO\r
+                                 Singapore  409179\r
+                               \r
  \r
-BC-66-41   (hex)               Scientific Games\r
-500000-5FFFFF     (base 16)            Scientific Games\r
-                               1500 Bluegrass Lakes Parkway\r
-                               Alpharetta  GA  30004\r
-                               US\r
+B0-1F-81   (hex)               Uvax Concepts\r
+100000-1FFFFF     (base 16)            Uvax Concepts\r
+                               Calle Corretger 71-2\r
+                               Paterna  Other  46980\r
+                               ES\r
  \r
  B0-1F-81   (hex)               Dalian GigaTec Electronics Co.,Ltd\r
  000000-0FFFFF     (base 16)            Dalian GigaTec Electronics Co.,Ltd\r
@@ -9542,36 +9665,18 @@ D00000-DFFFFF     (base 16)             DXG Technology Corp.
                                 Taipei    10477\r
                                 TW\r
  \r
-B0-1F-81   (hex)               Advanced & Wise Technology Corp.\r
-E00000-EFFFFF     (base 16)            Advanced & Wise Technology Corp.\r
-                               5F, No. 3-2, Industry East 9th Road, Hsinchu Science Park,\r
-                               Hsinchu City  Hsinchu  30075\r
-                               TW\r
-\r
-B0-1F-81   (hex)               Uvax Concepts\r
-100000-1FFFFF     (base 16)            Uvax Concepts\r
-                               Calle Corretger 71-2\r
-                               Paterna  Other  46980\r
-                               ES\r
-\r
-B0-1F-81   (hex)               Technion Oy\r
-800000-8FFFFF     (base 16)            Technion Oy\r
-                               Linkkikatu 15\r
-                               Naantali  Länsi-Suomi  21100\r
-                               FI\r
-\r
-B0-1F-81   (hex)               COMOTA Co., Ltd.\r
-600000-6FFFFF     (base 16)            COMOTA Co., Ltd.\r
-                               Queens Tower C 10F\r
-                               Yokohama  Kanagawa  220-6210\r
-                               JP\r
-\r
  F4-0E-11   (hex)               Dayang Technology Development Inc.\r
  400000-4FFFFF     (base 16)            Dayang Technology Development Inc.\r
                                 Dayang Building\r
                                 Haidian District  Beijing  100193\r
                                 CN\r
  \r
+14-1F-BA   (hex)               Black Moth Technologies\r
+900000-9FFFFF     (base 16)            Black Moth Technologies\r
+                               17 Waverley St\r
+                               Annerley  Queensland  4103\r
+                               AU\r
+\r
  7C-70-BC   (hex)               Lukup Media\r
  C00000-CFFFFF     (base 16)            Lukup Media\r
                                 25/2 Norris Road\r
@@ -9608,17 +9713,17 @@ E00000-EFFFFF     (base 16)             HOPERUN MMAX DIGITAL PTE. LTD.
                                 New York  NY  10017\r
                                 US\r
  \r
-14-1F-BA   (hex)               Black Moth Technologies\r
-900000-9FFFFF     (base 16)            Black Moth Technologies\r
-                               17 Waverley St\r
-                               Annerley  Queensland  4103\r
-                               AU\r
+BC-34-00   (hex)               Dexcel Design Pvt Ltd\r
+400000-4FFFFF     (base 16)            Dexcel Design Pvt Ltd\r
+                               #138, Level 3,4 - Maruthi Tower\r
+                               Bangalore  Karnataka  560008\r
+                               IN\r
  \r
-A4-3B-FA   (hex)               Alpwise\r
-800000-8FFFFF     (base 16)            Alpwise\r
-                               4 avenue Louis Doyen Weil\r
-                               Grenoble  Rhône-Alpes  38000\r
-                               FR\r
+7C-70-BC   (hex)               Digital Lumens\r
+200000-2FFFFF     (base 16)            Digital Lumens\r
+                               374 Congress Street, 6th Floor\r
+                               Boston  MA  02210\r
+                               US\r
  \r
  A4-3B-FA   (hex)               JSC “Component-ASU”\r
  D00000-DFFFFF     (base 16)            JSC “Component-ASU”\r
@@ -9626,17 +9731,11 @@ D00000-DFFFFF     (base 16)             JSC “Component-ASU”
                                 Chernogolovka  Moscow Region  142432\r
                                 \r
  \r
-7C-70-BC   (hex)               Digital Lumens\r
-200000-2FFFFF     (base 16)            Digital Lumens\r
-                               374 Congress Street, 6th Floor\r
-                               Boston  MA  02210\r
-                               US\r
-\r
-BC-34-00   (hex)               Dexcel Design Pvt Ltd\r
-400000-4FFFFF     (base 16)            Dexcel Design Pvt Ltd\r
-                               #138, Level 3,4 - Maruthi Tower\r
-                               Bangalore  Karnataka  560008\r
-                               IN\r
+A4-3B-FA   (hex)               Maxon Australia\r
+400000-4FFFFF     (base 16)            Maxon Australia\r
+                               36a Gibson Ave\r
+                               Padstow  New South Wales  2211\r
+                               AU\r
  \r
  D0-76-50   (hex)               Revox Inc.\r
  E00000-EFFFFF     (base 16)            Revox Inc.\r
@@ -9644,29 +9743,29 @@ E00000-EFFFFF     (base 16)             Revox Inc.
                                 Sagamihara  Kanagawa  252-0243\r
                                 JP\r
  \r
+A4-3B-FA   (hex)               Alpwise\r
+800000-8FFFFF     (base 16)            Alpwise\r
+                               4 avenue Louis Doyen Weil\r
+                               Grenoble  Rhône-Alpes  38000\r
+                               FR\r
+\r
  D0-76-50   (hex)               Picobrew LLC\r
  600000-6FFFFF     (base 16)            Picobrew LLC\r
                                 2121 N 35th Street\r
                                 Seattle  WA  98103\r
                                 US\r
  \r
-D0-76-50   (hex)               Annapurna Labs\r
-500000-5FFFFF     (base 16)            Annapurna Labs\r
-                               1830 The Alameda\r
-                               San Jose  California  95126\r
-                               US\r
-\r
  74-19-F8   (hex)               Ansjer Electronics Co., Ltd.\r
  D00000-DFFFFF     (base 16)            Ansjer Electronics Co., Ltd.\r
                                 4 Bldg., Pinglan Indl. Park, Nanping,\r
                                 Zhuhai  Guangdong  519060\r
                                 CN\r
  \r
-A4-3B-FA   (hex)               Maxon Australia\r
-400000-4FFFFF     (base 16)            Maxon Australia\r
-                               36a Gibson Ave\r
-                               Padstow  New South Wales  2211\r
-                               AU\r
+D0-76-50   (hex)               Annapurna Labs\r
+500000-5FFFFF     (base 16)            Annapurna Labs\r
+                               1830 The Alameda\r
+                               San Jose  California  95126\r
+                               US\r
  \r
  40-11-75   (hex)               BWT Tianjin Ltd.\r
  A00000-AFFFFF     (base 16)            BWT Tianjin Ltd.\r
@@ -9680,9 +9779,63 @@ D00000-DFFFFF     (base 16)              Shenzhen Haichuan Intelligent Information Technolog
                                 Shenzhen  Guangdong  518101\r
                                 CN\r
  \r
+54-A4-93   (hex)               Advice\r
+B00000-BFFFFF     (base 16)            Advice\r
+                               16 Atir Yeda St\r
+                               Kfar Saba  Not applicable  4464321\r
+                               IL\r
+\r
  10-DC-B6   (hex)               Private\r
  000000-0FFFFF     (base 16)            Private\r
  \r
+54-A4-93   (hex)               Wonders Technology Co., Ltd.\r
+A00000-AFFFFF     (base 16)            Wonders Technology Co., Ltd.\r
+                               4/F,Tower A,3rd Building,Tian'an Cloud Park,Bantian Avenue,Longgang District\r
+                               Shenzhen    518129\r
+                               CN\r
+\r
+04-D1-6E   (hex)               s.d.i. s.p.a.\r
+200000-2FFFFF     (base 16)            s.d.i. s.p.a.\r
+                               Edison, 10\r
+                               Trezzano sul Naviglio  Milano  20090\r
+                               IT\r
+\r
+04-D1-6E   (hex)               FUZHOU ZHUOYI ELECTRONIC CO.,LTD\r
+900000-9FFFFF     (base 16)            FUZHOU ZHUOYI ELECTRONIC CO.,LTD\r
+                               NO.22 BAIHUAZHOU ROAD,FUZHOU,FUJIAN,CHINA\r
+                               FUZHOU  FUJIAN  350008\r
+                               CN\r
+\r
+54-A4-93   (hex)               Do Easy International Limited\r
+900000-9FFFFF     (base 16)            Do Easy International Limited\r
+                               No. 107, Wenjian St., Fengshan Dist.\r
+                               Kaohsiung    83067\r
+                               TW\r
+\r
+54-A4-93   (hex)               RED Hydrogen LLC\r
+700000-7FFFFF     (base 16)            RED Hydrogen LLC\r
+                               15 Cushing\r
+                               IRVINE  CA  92618\r
+                               US\r
+\r
+44-03-77   (hex)               Norden Communication UK Ltd.\r
+500000-5FFFFF     (base 16)            Norden Communication UK Ltd.\r
+                               Unit-13, Baker Close, Oakwood Business Park\r
+                               Clacton-On-Sea  Essex  CO15 4BD\r
+                               GB\r
+\r
+44-03-77   (hex)               symplr\r
+A00000-AFFFFF     (base 16)            symplr\r
+                               1550 Innovation Way\r
+                               Hartford  WI  53027\r
+                               US\r
+\r
+44-03-77   (hex)               Musashi Seimitsu Industry Co.,Ltd\r
+000000-0FFFFF     (base 16)            Musashi Seimitsu Industry Co.,Ltd\r
+                               39-5 Daizen,Ueta-cho\r
+                               Toyohashi  Aichi  441-8560\r
+                               JP\r
+\r
  4C-4B-F9   (hex)               Shandong Linkotech Electronic Co., Ltd.\r
  600000-6FFFFF     (base 16)            Shandong Linkotech Electronic Co., Ltd.\r
                                 22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone\r
@@ -9896,6 +10049,9 @@ B4-A2-EB   (hex)         Canaan Creative Co.,Ltd.
                                 Chongqing  Chongqing  401120\r
                                 CN\r
  \r
+A4-3B-FA   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  D0-C8-57   (hex)               Imin Technology Pte Ltd\r
  400000-4FFFFF     (base 16)            Imin Technology Pte Ltd\r
                                 77 Sciene park Drive #03-10 Cintech III \r
@@ -9908,6 +10064,12 @@ D0-C8-57   (hex)                Imin Technology Pte Ltd
                                 Beijing  Beijing  100092\r
                                 CN\r
  \r
+30-0A-60   (hex)               Beijing Ruiteng Zhongtian TECH Ltd.,Co\r
+100000-1FFFFF     (base 16)            Beijing Ruiteng Zhongtian TECH Ltd.,Co\r
+                               Blk 6,Rm 602,Noble CenterⅡ，No.1 Automotive Museum East Lane,South Fourth Ring Road, Fengtai District\r
+                               Beijing  Beijing  100070\r
+                               CN\r
+\r
  D0-C8-57   (hex)               shenzhen cnsun\r
  A00000-AFFFFF     (base 16)            shenzhen cnsun\r
                                 5 Floor, 2 Building,Tongfuyu Industrial City\r
@@ -9926,45 +10088,18 @@ D0-C8-57   (hex)               Innovative Industrial(HK)Co., Limited
                                 SAI YING PUN    999077\r
                                 HK\r
  \r
-30-0A-60   (hex)               Beijing Ruiteng Zhongtian TECH Ltd.,Co\r
-100000-1FFFFF     (base 16)            Beijing Ruiteng Zhongtian TECH Ltd.,Co\r
-                               Blk 6,Rm 602,Noble CenterⅡ，No.1 Automotive Museum East Lane,South Fourth Ring Road, Fengtai District\r
-                               Beijing  Beijing  100070\r
-                               CN\r
-\r
  BC-97-40   (hex)               Lattec I/S\r
  200000-2FFFFF     (base 16)            Lattec I/S\r
                                 Blytækkervej 10\r
                                 Hillerød    3400\r
                                 DK\r
  \r
-A4-3B-FA   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
  D0-C8-57   (hex)               FORGAMERS INC.\r
  200000-2FFFFF     (base 16)            FORGAMERS INC.\r
                                 6F., NO.51, DONGXING RD., XINYI DIST., TAIPEI CITY 110-70, TAIWAN\r
                                 Taipei    110\r
                                 TW\r
  \r
-60-95-CE   (hex)               Cadmo Soluciones SAC\r
-700000-7FFFFF     (base 16)            Cadmo Soluciones SAC\r
-                               Av. Angamos Este 2495 Dpt. 301, San Borja\r
-                               Lima  Lima  15036\r
-                               PE\r
-\r
-60-95-CE   (hex)               GovComm\r
-D00000-DFFFFF     (base 16)            GovComm\r
-                               3830 SW 30 Ave\r
-                               Fort Lauderdale  FL  33312\r
-                               US\r
-\r
-60-95-CE   (hex)               Ponoor Experiments Inc.\r
-100000-1FFFFF     (base 16)            Ponoor Experiments Inc.\r
-                               Higashi-shinagawa 1-33-10, Terrada Art Complex 216\r
-                               Shinagawa-ku  Tokyo  1400002\r
-                               JP\r
-\r
  BC-97-40   (hex)               Alpha ESS Co., Ltd.\r
  000000-0FFFFF     (base 16)            Alpha ESS Co., Ltd.\r
                                 JiuHua Road 888, Nantong High-Tech Industrial Development Zone,\r
@@ -9989,6 +10124,24 @@ A00000-AFFFFF     (base 16)             (UN)MANNED
                                 Palma de Mallorca  SPAIN / Balearic Islands  07009\r
                                 ES\r
  \r
+60-95-CE   (hex)               Cadmo Soluciones SAC\r
+700000-7FFFFF     (base 16)            Cadmo Soluciones SAC\r
+                               Av. Angamos Este 2495 Dpt. 301, San Borja\r
+                               Lima  Lima  15036\r
+                               PE\r
+\r
+60-95-CE   (hex)               GovComm\r
+D00000-DFFFFF     (base 16)            GovComm\r
+                               3830 SW 30 Ave\r
+                               Fort Lauderdale  FL  33312\r
+                               US\r
+\r
+60-95-CE   (hex)               Ponoor Experiments Inc.\r
+100000-1FFFFF     (base 16)            Ponoor Experiments Inc.\r
+                               Higashi-shinagawa 1-33-10, Terrada Art Complex 216\r
+                               Shinagawa-ku  Tokyo  1400002\r
+                               JP\r
+\r
  BC-97-40   (hex)               Rollock Oy\r
  D00000-DFFFFF     (base 16)            Rollock Oy\r
                                 Viestitie 2 B\r
@@ -9998,36 +10151,6 @@ D00000-DFFFFF     (base 16)             Rollock Oy
  BC-34-00   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
-1C-82-59   (hex)               Shandong Luneng Intelligence Technology CO., Ltd\r
-000000-0FFFFF     (base 16)            Shandong Luneng Intelligence Technology CO., Ltd\r
-                               Shandong Jinan Hightech zone Yinhe building block B, 2008 Xinluo Street\r
-                               Jinan  Shandong  250100\r
-                               CN\r
-\r
-1C-82-59   (hex)               Jump Trading\r
-700000-7FFFFF     (base 16)            Jump Trading\r
-                               1 London Wall\r
-                               London     EC2Y 5EA\r
-                               GB\r
-\r
-1C-82-59   (hex)               winsun AG\r
-400000-4FFFFF     (base 16)            winsun AG\r
-                               Beeschi Mattenstrasse 2\r
-                               Steg  Wallis  3940\r
-                               CH\r
-\r
-F8-1D-78   (hex)               TELEOFIS\r
-800000-8FFFFF     (base 16)            TELEOFIS\r
-                               1K3, Electrolitny proezd\r
-                               Moscow    115230\r
-                               RU\r
-\r
-1C-82-59   (hex)               Applied Concepts, Inc.\r
-D00000-DFFFFF     (base 16)            Applied Concepts, Inc.\r
-                               855 E Collins Blvd\r
-                               Richardson  TX  75081\r
-                               US\r
-\r
  84-8B-CD   (hex)               CHONGQING HUAYI KANGDAO TECHNOLOGY CO.,LTD.\r
  B00000-BFFFFF     (base 16)            CHONGQING HUAYI KANGDAO TECHNOLOGY CO.,LTD.\r
                                 14th Floor, Unicom Building, 192 Yuzhou Road, Yuzhong District\r
@@ -10058,10 +10181,34 @@ C00000-CFFFFF     (base 16)           Evondos Oy
                                 Edison   NJ  08837\r
                                 US\r
  \r
-B0-FD-0B   (hex)               MartinLogan, Ltd.\r
-B00000-BFFFFF     (base 16)            MartinLogan, Ltd.\r
-                               2101 Delware St\r
-                               Lawrence  KS  66046\r
+1C-82-59   (hex)               Shandong Luneng Intelligence Technology CO., Ltd\r
+000000-0FFFFF     (base 16)            Shandong Luneng Intelligence Technology CO., Ltd\r
+                               Shandong Jinan Hightech zone Yinhe building block B, 2008 Xinluo Street\r
+                               Jinan  Shandong  250100\r
+                               CN\r
+\r
+1C-82-59   (hex)               Jump Trading\r
+700000-7FFFFF     (base 16)            Jump Trading\r
+                               1 London Wall\r
+                               London     EC2Y 5EA\r
+                               GB\r
+\r
+1C-82-59   (hex)               winsun AG\r
+400000-4FFFFF     (base 16)            winsun AG\r
+                               Beeschi Mattenstrasse 2\r
+                               Steg  Wallis  3940\r
+                               CH\r
+\r
+F8-1D-78   (hex)               TELEOFIS\r
+800000-8FFFFF     (base 16)            TELEOFIS\r
+                               1K3, Electrolitny proezd\r
+                               Moscow    115230\r
+                               RU\r
+\r
+1C-82-59   (hex)               Applied Concepts, Inc.\r
+D00000-DFFFFF     (base 16)            Applied Concepts, Inc.\r
+                               855 E Collins Blvd\r
+                               Richardson  TX  75081\r
                                 US\r
  \r
  B0-FD-0B   (hex)               DNESO TEN Ltd.\r
@@ -10070,11 +10217,14 @@ B0-FD-0B   (hex)              DNESO TEN Ltd.
                                 kobe  hyougo  652-8510\r
                                 JP\r
  \r
-84-8B-CD   (hex)               Shenzhen LTIME In-Vehicle Entertainment System Company Limited\r
-100000-1FFFFF     (base 16)            Shenzhen LTIME In-Vehicle Entertainment System Company Limited\r
-                               4/F, Building 1, Nangang 1st Industrial Park No. 1029, Songbai Road, Xili, Nanshan District\r
-                               SHENZHEN  GUANGDONG  518055\r
-                               CN\r
+B0-FD-0B   (hex)               MartinLogan, Ltd.\r
+B00000-BFFFFF     (base 16)            MartinLogan, Ltd.\r
+                               2101 Delware St\r
+                               Lawrence  KS  66046\r
+                               US\r
+\r
+80-7B-85   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
  \r
  B0-FD-0B   (hex)               Haltian Products Oy\r
  C00000-CFFFFF     (base 16)            Haltian Products Oy\r
@@ -10082,8 +10232,17 @@ C00000-CFFFFF     (base 16)            Haltian Products Oy
                                 Oulu    90230\r
                                 FI\r
  \r
-80-7B-85   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
+84-8B-CD   (hex)               Shenzhen LTIME In-Vehicle Entertainment System Company Limited\r
+100000-1FFFFF     (base 16)            Shenzhen LTIME In-Vehicle Entertainment System Company Limited\r
+                               4/F, Building 1, Nangang 1st Industrial Park No. 1029, Songbai Road, Xili, Nanshan District\r
+                               SHENZHEN  GUANGDONG  518055\r
+                               CN\r
+\r
+E4-1E-0A   (hex)               Safety Vision, LLC\r
+B00000-BFFFFF     (base 16)            Safety Vision, LLC\r
+                               6100 West Sam Houston Parkway North\r
+                               Houston  TX  77041-5113\r
+                               US\r
  \r
  E4-1E-0A   (hex)               IDvaco Private Limited\r
  200000-2FFFFF     (base 16)            IDvaco Private Limited\r
@@ -10097,17 +10256,11 @@ E4-1E-0A   (hex)              Connected Cars A/S
                                 Brøndby    2605\r
                                 DK\r
  \r
-E4-1E-0A   (hex)               B METERS S.R.L.\r
-900000-9FFFFF     (base 16)            B METERS S.R.L.\r
-                               VIA FRIULI 3\r
-                               GONARS  UDINE  33050\r
-                               IT\r
-\r
-E4-1E-0A   (hex)               Safety Vision, LLC\r
-B00000-BFFFFF     (base 16)            Safety Vision, LLC\r
-                               6100 West Sam Houston Parkway North\r
-                               Houston  TX  77041-5113\r
-                               US\r
+E4-1E-0A   (hex)               SFC Energy AG\r
+600000-6FFFFF     (base 16)            SFC Energy AG\r
+                               Eugen-Saenger-Ring 7\r
+                               Brunnthal    85649\r
+                               DE\r
  \r
  E4-1E-0A   (hex)               XPR Group\r
  400000-4FFFFF     (base 16)            XPR Group\r
@@ -10115,11 +10268,17 @@ E4-1E-0A   (hex)              XPR Group
                                 Waterloo    1410\r
                                 BE\r
  \r
-E4-1E-0A   (hex)               SFC Energy AG\r
-600000-6FFFFF     (base 16)            SFC Energy AG\r
-                               Eugen-Saenger-Ring 7\r
-                               Brunnthal    85649\r
-                               DE\r
+E4-1E-0A   (hex)               B METERS S.R.L.\r
+900000-9FFFFF     (base 16)            B METERS S.R.L.\r
+                               VIA FRIULI 3\r
+                               GONARS  UDINE  33050\r
+                               IT\r
+\r
+C8-63-14   (hex)               Tymphany Acoustic Technology (Huizhou) Co., Ltd.\r
+200000-2FFFFF     (base 16)            Tymphany Acoustic Technology (Huizhou) Co., Ltd.\r
+                               Tymphany Industrial Area, Xin Lian Village, XinXu Town, HuiYang District\r
+                               Huizhou  Guangdong  516223\r
+                               CN\r
  \r
  C8-63-14   (hex)               Shenzhen Lihewei Electronics Co.,Ltd.Hunan Branch\r
  B00000-BFFFFF     (base 16)            Shenzhen Lihewei Electronics Co.,Ltd.Hunan Branch\r
@@ -10127,30 +10286,12 @@ B00000-BFFFFF     (base 16)           Shenzhen Lihewei Electronics Co.,Ltd.Hunan Branch
                                 Changsha  Hunan  410000\r
                                 CN\r
  \r
-34-E1-D1   (hex)               Hubitat Inc.\r
-800000-8FFFFF     (base 16)            Hubitat Inc.\r
-                               20343 N Hayden Rd, Suite 105-280\r
-                               Scottsdale  AZ  85255\r
-                               US\r
-\r
-34-E1-D1   (hex)               APG Cash Drawer, LLC\r
-B00000-BFFFFF     (base 16)            APG Cash Drawer, LLC\r
-                               5250 Industrial Blvd NE\r
-                               Minneapolis  MN  55421\r
-                               US\r
-\r
  34-E1-D1   (hex)               OrCam Technologies\r
  A00000-AFFFFF     (base 16)            OrCam Technologies\r
                                 Kiryat Hamada 3\r
                                 JERUSALEM    97775603\r
                                 IL\r
  \r
-C8-63-14   (hex)               Tymphany Acoustic Technology (Huizhou) Co., Ltd.\r
-200000-2FFFFF     (base 16)            Tymphany Acoustic Technology (Huizhou) Co., Ltd.\r
-                               Tymphany Industrial Area, Xin Lian Village, XinXu Town, HuiYang District\r
-                               Huizhou  Guangdong  516223\r
-                               CN\r
-\r
  FC-D2-B6   (hex)               Cirque Audio Technology Co.,Ltd\r
  600000-6FFFFF     (base 16)            Cirque Audio Technology Co.,Ltd\r
                                 No.2 Road BeiYiHeng,HuangJiaBao Industrial Park,ShiPai Town,DongGuan City,GuangDong,China\r
@@ -10169,17 +10310,29 @@ FC-D2-B6   (hex)              SHEN ZHEN XIN HAO YUAN PRECISION TECHNOLOGY CO.,L TD
                                 shenzhen  guangdongsheng  518000\r
                                 CN\r
  \r
+74-5B-C5   (hex)               Qingdao Wintec System Co., Ltd\r
+E00000-EFFFFF     (base 16)            Qingdao Wintec System Co., Ltd\r
+                               Wintec Park, Xinye Road, High-tech Zone, Qingdao, China 266114\r
+                               QING DAO  shan dong  of  China  6805\r
+                               CN\r
+\r
  FC-D2-B6   (hex)               Teamly Digital\r
  700000-7FFFFF     (base 16)            Teamly Digital\r
                                 11-13 Avenue de Friedland\r
                                 Paris  Ile de France  75008\r
                                 FR\r
  \r
-74-5B-C5   (hex)               Qingdao Wintec System Co., Ltd\r
-E00000-EFFFFF     (base 16)            Qingdao Wintec System Co., Ltd\r
-                               Wintec Park, Xinye Road, High-tech Zone, Qingdao, China 266114\r
-                               QING DAO  shan dong  of  China  6805\r
-                               CN\r
+34-E1-D1   (hex)               Hubitat Inc.\r
+800000-8FFFFF     (base 16)            Hubitat Inc.\r
+                               20343 N Hayden Rd, Suite 105-280\r
+                               Scottsdale  AZ  85255\r
+                               US\r
+\r
+34-E1-D1   (hex)               APG Cash Drawer, LLC\r
+B00000-BFFFFF     (base 16)            APG Cash Drawer, LLC\r
+                               5250 Industrial Blvd NE\r
+                               Minneapolis  MN  55421\r
+                               US\r
  \r
  74-5B-C5   (hex)               SIGLENT TECHNOLOGIES CO., LTD.\r
  200000-2FFFFF     (base 16)            SIGLENT TECHNOLOGIES CO., LTD.\r
@@ -10193,18 +10346,6 @@ E00000-EFFFFF     (base 16)            Qingdao Wintec System Co., Ltd
                                 Witkoppen  Gauteng  5214\r
                                 ZA\r
  \r
-74-5B-C5   (hex)               SHENZHEN ATX TECHNOLOGY CO.,LTD \r
-700000-7FFFFF     (base 16)            SHENZHEN ATX TECHNOLOGY CO.,LTD \r
-                               7/F,Zhengjiyuan Buiding,2 Road,Qianjing, Xixiang, Baoan District\r
-                               Shenzhen  GUANGDONG  518000\r
-                               CN\r
-\r
-E4-4C-C7   (hex)               Ottomate International Pvt. Ltd.\r
-900000-9FFFFF     (base 16)            Ottomate International Pvt. Ltd.\r
-                               Awfis Building, 5th Floor, Plot # 7, Sector-44\r
-                               Gurgaon  Haryana  122003\r
-                               IN\r
-\r
  E4-4C-C7   (hex)               ACS-Solutions GmbH\r
  100000-1FFFFF     (base 16)            ACS-Solutions GmbH\r
                                 Science Park 2\r
@@ -10217,12 +10358,24 @@ D00000-DFFFFF     (base 16)           Telo Systems Limitd
                                 ShenZhen  GuangDong  518000\r
                                 CN\r
  \r
+74-5B-C5   (hex)               SHENZHEN ATX TECHNOLOGY CO.,LTD \r
+700000-7FFFFF     (base 16)            SHENZHEN ATX TECHNOLOGY CO.,LTD \r
+                               7/F,Zhengjiyuan Buiding,2 Road,Qianjing, Xixiang, Baoan District\r
+                               Shenzhen  GUANGDONG  518000\r
+                               CN\r
+\r
  E4-4C-C7   (hex)               SmallHD\r
  B00000-BFFFFF     (base 16)            SmallHD\r
                                 301 Gregson Dr\r
                                 Cary  NC  27511\r
                                 US\r
  \r
+E4-4C-C7   (hex)               Ottomate International Pvt. Ltd.\r
+900000-9FFFFF     (base 16)            Ottomate International Pvt. Ltd.\r
+                               Awfis Building, 5th Floor, Plot # 7, Sector-44\r
+                               Gurgaon  Haryana  122003\r
+                               IN\r
+\r
  74-5B-C5   (hex)               SpringCard\r
  500000-5FFFFF     (base 16)            SpringCard\r
                                 2 voie La Cardon, Parc Gutenberg\r
@@ -10238,9 +10391,6 @@ B00000-BFFFFF     (base 16)             SmallHD
  1C-A0-D3   (hex)               Private\r
  700000-7FFFFF     (base 16)            Private\r
  \r
-28-FD-80   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
  E0-5A-9F   (hex)               ShenZhen Mornsun Smartlinker Limited Co., LTD\r
  C00000-CFFFFF     (base 16)            ShenZhen Mornsun Smartlinker Limited Co., LTD\r
                                 South 2nd Flr, 23 Bldg, Yuanxi Industrial Zone, Kefa Rd, Nanshan Keji Yuan\r
@@ -10253,29 +10403,14 @@ D00000-DFFFFF     (base 16)           Elink Technology (Shenzhen) Co., Limited
                                 Shenzhen  Guangdong  518101\r
                                 CN\r
  \r
-E0-5A-9F   (hex)               Fujian Newland Auto-ID Tech. Co.,Ltd.\r
-800000-8FFFFF     (base 16)            Fujian Newland Auto-ID Tech. Co.,Ltd.\r
-                               Newland Science & Technology Park, No.1 Rujiang West Rd,Mawei,Fuzhou, P.R.China\r
-                               Fuzhou  Fujian  350015\r
-                               CN\r
-\r
  4C-BC-98   (hex)               Charge-Amps AB\r
  000000-0FFFFF     (base 16)            Charge-Amps AB\r
                                 GUSTAV III:S BOULEVARD 42, 8TR\r
                                 SOLNA    16973\r
                                 SE\r
  \r
-38-B1-9E   (hex)               ShenZhen ShuaiXian Electronic Equipment Co.Ltd\r
-E00000-EFFFFF     (base 16)            ShenZhen ShuaiXian Electronic Equipment Co.Ltd\r
-                               No. 10, Lane 3, Longxing Rd, Dakang Village,HengGang Town\r
-                               ShenZhen  Guangdong  518115\r
-                               CN\r
-\r
-D8-86-0B   (hex)               Auvidea GmbH\r
-300000-3FFFFF     (base 16)            Auvidea GmbH\r
-                               Kellerberg 3\r
-                               Denklingen    86920\r
-                               DE\r
+28-FD-80   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
  \r
  28-F5-37   (hex)               1MORE\r
  800000-8FFFFF     (base 16)            1MORE\r
@@ -10301,11 +10436,17 @@ D00000-DFFFFF     (base 16)           ComNav Technology Ltd.
                                 JiaDing District  Shanghai  201801\r
                                 CN\r
  \r
-38-B1-9E   (hex)               Star Electronics GmbH & CoKG\r
-500000-5FFFFF     (base 16)            Star Electronics GmbH & CoKG\r
-                               Jahnstraße, 86\r
-                               Göppingen    73037\r
-                               DE\r
+D8-86-0B   (hex)               VRINDA NANO TECHNOLOGIES PVT LTD\r
+800000-8FFFFF     (base 16)            VRINDA NANO TECHNOLOGIES PVT LTD\r
+                               PLOT NO.283, SECTOR 7, IMT MANESAR, GURGAON \r
+                               INDIA  HARYANA  122050\r
+                               IN\r
+\r
+38-B1-9E   (hex)               ShenZhen ShuaiXian Electronic Equipment Co.Ltd\r
+E00000-EFFFFF     (base 16)            ShenZhen ShuaiXian Electronic Equipment Co.Ltd\r
+                               No. 10, Lane 3, Longxing Rd, Dakang Village,HengGang Town\r
+                               ShenZhen  Guangdong  518115\r
+                               CN\r
  \r
  38-B1-9E   (hex)               HDANYWHERE\r
  200000-2FFFFF     (base 16)            HDANYWHERE\r
@@ -10319,29 +10460,35 @@ A00000-AFFFFF     (base 16)           Aeroespacial Guosheng Technology Co., Ltd
                                 Haiden DIstrict  Beijing  100191\r
                                 CN\r
  \r
+E0-5A-9F   (hex)               Fujian Newland Auto-ID Tech. Co.,Ltd.\r
+800000-8FFFFF     (base 16)            Fujian Newland Auto-ID Tech. Co.,Ltd.\r
+                               Newland Science & Technology Park, No.1 Rujiang West Rd,Mawei,Fuzhou, P.R.China\r
+                               Fuzhou  Fujian  350015\r
+                               CN\r
+\r
  D8-86-0B   (hex)               Shenzhen Yidong Technology Co.,Ltd\r
  E00000-EFFFFF     (base 16)            Shenzhen Yidong Technology Co.,Ltd\r
                                 13th Floor,Jia'anda Building, No.110 Huafan Road,Tongsheng Community, Dalang Street,Longhua District\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-D8-86-0B   (hex)               VRINDA NANO TECHNOLOGIES PVT LTD\r
-800000-8FFFFF     (base 16)            VRINDA NANO TECHNOLOGIES PVT LTD\r
-                               PLOT NO.283, SECTOR 7, IMT MANESAR, GURGAON \r
-                               INDIA  HARYANA  122050\r
-                               IN\r
-\r
  38-B1-9E   (hex)               Triple Jump Medical\r
  000000-0FFFFF     (base 16)            Triple Jump Medical\r
                                 5 HaCarmel St.\r
                                 Yokneam    2069203\r
                                 IL\r
  \r
-38-B1-9E   (hex)               BoCo Inc.\r
-800000-8FFFFF     (base 16)            BoCo Inc.\r
-                               Isshin Bldg 6F,Yaesu 2-11-7\r
-                               Chuo-ku, Tokyo    104-0028\r
-                               JP\r
+38-B1-9E   (hex)               Star Electronics GmbH & CoKG\r
+500000-5FFFFF     (base 16)            Star Electronics GmbH & CoKG\r
+                               Jahnstraße, 86\r
+                               Göppingen    73037\r
+                               DE\r
+\r
+D8-86-0B   (hex)               Auvidea GmbH\r
+300000-3FFFFF     (base 16)            Auvidea GmbH\r
+                               Kellerberg 3\r
+                               Denklingen    86920\r
+                               DE\r
  \r
  38-B1-9E   (hex)               Gesellschaft industrieller Technologien \r
  C00000-CFFFFF     (base 16)            Gesellschaft industrieller Technologien \r
@@ -10349,6 +10496,12 @@ C00000-CFFFFF     (base 16)            Gesellschaft industrieller Technologien
                                 Großbeeren    14979 \r
                                 DE\r
  \r
+38-B1-9E   (hex)               BoCo Inc.\r
+800000-8FFFFF     (base 16)            BoCo Inc.\r
+                               Isshin Bldg 6F,Yaesu 2-11-7\r
+                               Chuo-ku, Tokyo    104-0028\r
+                               JP\r
+\r
  CC-D3-9D   (hex)               Q-Branch Labs, Inc.\r
  B00000-BFFFFF     (base 16)            Q-Branch Labs, Inc.\r
                                 427 N. Tatnall St., Suite #82712\r
@@ -10361,6 +10514,12 @@ CC-D3-9D   (hex)               Shenzhen Chenggu Technology Co., Ltd
                                 Shenzhen  Guagndong  518112\r
                                 CN\r
  \r
+9C-69-B4   (hex)               NINGBO SHEN LINK COMMUNICATION TECHNOLOGY CO., LTD\r
+E00000-EFFFFF     (base 16)            NINGBO SHEN LINK COMMUNICATION TECHNOLOGY CO., LTD\r
+                               NO.87,FENGMINGROAD,LIZHOUSTREET, YUYAO, ZHEJIANG\r
+                               NINGBO  ZHEJIANG  315400\r
+                               CN\r
+\r
  CC-D3-9D   (hex)               Krontech\r
  600000-6FFFFF     (base 16)            Krontech\r
                                 I.T.U ARI 3 Teknokent Kron Telekomunikasyon, Maslak\r
@@ -10385,10 +10544,10 @@ D4-25-CC   (hex)              TAKUMI JAPAN LTD
                                 Minato-ku Tokyo  Tokyo  1050003\r
                                 JP\r
  \r
-9C-69-B4   (hex)               NINGBO SHEN LINK COMMUNICATION TECHNOLOGY CO., LTD\r
-E00000-EFFFFF     (base 16)            NINGBO SHEN LINK COMMUNICATION TECHNOLOGY CO., LTD\r
-                               NO.87,FENGMINGROAD,LIZHOUSTREET, YUYAO, ZHEJIANG\r
-                               NINGBO  ZHEJIANG  315400\r
+9C-69-B4   (hex)               Guangdong Hanwei intergration Co.,Ltd\r
+C00000-CFFFFF     (base 16)            Guangdong Hanwei intergration Co.,Ltd\r
+                               Room 404,7# Hongtai Zhihui Gu, No.23 Sicheng Road\r
+                               Guangzhou  Guangdong  510663\r
                                 CN\r
  \r
  4C-91-7A   (hex)               Openeye\r
@@ -10403,28 +10562,16 @@ E00000-EFFFFF     (base 16)           NINGBO SHEN LINK COMMUNICATION TECHNOLOGY CO., LTD
                                 Moscow    117246\r
                                 RU\r
  \r
-9C-69-B4   (hex)               Suzhou Fitcan Technology Co.,LTD\r
-000000-0FFFFF     (base 16)            Suzhou Fitcan Technology Co.,LTD\r
-                               Kechuang Road\r
-                               Suzhou City  Jiangsu Province  215163\r
-                               CN\r
-\r
-9C-69-B4   (hex)               Guangdong Hanwei intergration Co.,Ltd\r
-C00000-CFFFFF     (base 16)            Guangdong Hanwei intergration Co.,Ltd\r
-                               Room 404,7# Hongtai Zhihui Gu, No.23 Sicheng Road\r
-                               Guangzhou  Guangdong  510663\r
-                               CN\r
-\r
  9C-69-B4   (hex)               Shenzhen jiahua zhongli technology co.LTD\r
  600000-6FFFFF     (base 16)            Shenzhen jiahua zhongli technology co.LTD\r
                                 3/F,building B,JINHU building,industrial road,longhua new district\r
                                 Shenzhen  Guangdong  518109\r
                                 CN\r
  \r
-6C-DF-FB   (hex)               Nanjing Buruike Electronics Technology Co., Ltd.\r
-D00000-DFFFFF     (base 16)            Nanjing Buruike Electronics Technology Co., Ltd.\r
-                               Jiangning District Moling Street, SuYuan Avenue No.117 Building 2, Floor 5 Room 541\r
-                               Nanjing  Jiangsu  210000\r
+9C-69-B4   (hex)               Suzhou Fitcan Technology Co.,LTD\r
+000000-0FFFFF     (base 16)            Suzhou Fitcan Technology Co.,LTD\r
+                               Kechuang Road\r
+                               Suzhou City  Jiangsu Province  215163\r
                                 CN\r
  \r
  4C-91-7A   (hex)               Alibaba (Beijing) Software Service Inc.\r
@@ -10451,42 +10598,48 @@ E00000-EFFFFF     (base 16)           Beijing Topnew Group Co., Ltd
                                 shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+6C-DF-FB   (hex)               Nanjing Buruike Electronics Technology Co., Ltd.\r
+D00000-DFFFFF     (base 16)            Nanjing Buruike Electronics Technology Co., Ltd.\r
+                               Jiangning District Moling Street, SuYuan Avenue No.117 Building 2, Floor 5 Room 541\r
+                               Nanjing  Jiangsu  210000\r
+                               CN\r
+\r
  6C-DF-FB   (hex)               Lineable Inc\r
  400000-4FFFFF     (base 16)            Lineable Inc\r
                                 5, Ttukseom-ro 1na-gil, Seongdong-gu, Seoul, Republic of Korea, Heyground, G505\r
                                 Seoul  Seoul  04779\r
                                 KR\r
  \r
-98-F9-C7   (hex)               NC-LINK Technology Co., Ltd.\r
-E00000-EFFFFF     (base 16)            NC-LINK Technology Co., Ltd.\r
-                               Block A2 Jinhai Business Mansion, Jinhai Road, Xixiang town\r
-                               Shenzhen  Guangdong  518101\r
-                               CN\r
-\r
  7C-BC-84   (hex)               VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
  D00000-DFFFFF     (base 16)            VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD\r
                                 B-11 SECTOR-VII\r
                                 NOIDA  UTTAR PRADESH  201301\r
                                 IN\r
  \r
+98-F9-C7   (hex)               NC-LINK Technology Co., Ltd.\r
+E00000-EFFFFF     (base 16)            NC-LINK Technology Co., Ltd.\r
+                               Block A2 Jinhai Business Mansion, Jinhai Road, Xixiang town\r
+                               Shenzhen  Guangdong  518101\r
+                               CN\r
+\r
  7C-BC-84   (hex)               Shanghai Yitu Technology Co. Ltd\r
  300000-3FFFFF     (base 16)            Shanghai Yitu Technology Co. Ltd\r
                                 23/F, Tower 1, No.523 Loushanguan Road, Changning District\r
                                 Shanghai    200051\r
                                 CN\r
  \r
-0C-FE-5D   (hex)               Antailiye Technology Co.,Ltd\r
-600000-6FFFFF     (base 16)            Antailiye Technology Co.,Ltd\r
-                               7/F,Zhengjiyuan Buiding,2 Road,Qianjing, Xixiang, Baoan District,Shenzhen\r
-                               SHEN ZHEN  GUANGDONG  518000\r
-                               CN\r
-\r
  0C-FE-5D   (hex)               Yantai Dongfang Wisdom Electic Co.,Ltd.\r
  400000-4FFFFF     (base 16)            Yantai Dongfang Wisdom Electic Co.,Ltd.\r
                                 6 Jindu Road\r
                                 Yantai  Shandong  264003\r
                                 CN\r
  \r
+0C-FE-5D   (hex)               Antailiye Technology Co.,Ltd\r
+600000-6FFFFF     (base 16)            Antailiye Technology Co.,Ltd\r
+                               7/F,Zhengjiyuan Buiding,2 Road,Qianjing, Xixiang, Baoan District,Shenzhen\r
+                               SHEN ZHEN  GUANGDONG  518000\r
+                               CN\r
+\r
  98-F9-C7   (hex)               Pozyx NV\r
  200000-2FFFFF     (base 16)            Pozyx NV\r
                                 Vrijdagmarkt 10/201\r
@@ -10508,23 +10661,17 @@ D00000-DFFFFF     (base 16)           VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
  10-07-23   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
-6C-5C-3D   (hex)               IskraUralTEL\r
-900000-9FFFFF     (base 16)            IskraUralTEL\r
-                               Komvuzovkaya\r
-                               Ekaterinburg    620137\r
-                               RU\r
-\r
  6C-5C-3D   (hex)               HTI Co., LTD.\r
  400000-4FFFFF     (base 16)            HTI Co., LTD.\r
                                 Rm741, Kyungin Ctr., 20, Baekbeom-ro 577, Bupyung-Gu\r
                                 Incheon    21449\r
                                 KR\r
  \r
-A8-3F-A1   (hex)               Plejd AB\r
-700000-7FFFFF     (base 16)            Plejd AB\r
-                               Göteborgsvägen 52\r
-                               Mölndal    431 37\r
-                               SE\r
+6C-5C-3D   (hex)               IskraUralTEL\r
+900000-9FFFFF     (base 16)            IskraUralTEL\r
+                               Komvuzovkaya\r
+                               Ekaterinburg    620137\r
+                               RU\r
  \r
  A8-3F-A1   (hex)               Guangzhou Navigateworx Technologies Co., Limited\r
  E00000-EFFFFF     (base 16)            Guangzhou Navigateworx Technologies Co., Limited\r
@@ -10538,8 +10685,11 @@ A00000-AFFFFF     (base 16)            Shanghai East China Computer Co., Ltd
                                 Shanghai  Shanghai  200233\r
                                 CN\r
  \r
-A0-3E-6B   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
+A8-3F-A1   (hex)               Plejd AB\r
+700000-7FFFFF     (base 16)            Plejd AB\r
+                               Göteborgsvägen 52\r
+                               Mölndal    431 37\r
+                               SE\r
  \r
  A8-3F-A1   (hex)               Laonz Co.,Ltd\r
  C00000-CFFFFF     (base 16)            Laonz Co.,Ltd\r
@@ -10547,11 +10697,8 @@ C00000-CFFFFF     (base 16)            Laonz Co.,Ltd
                                 Seoul    06779\r
                                 KR\r
  \r
-3C-6A-2C   (hex)               figur8, Inc.\r
-300000-3FFFFF     (base 16)            figur8, Inc.\r
-                               2 Park Plaza, Suite 605\r
-                               BOSTON  MA  02116\r
-                               US\r
+A0-3E-6B   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
  \r
  30-0A-60   (hex)               Realtime biometrics India pvt ltd\r
  600000-6FFFFF     (base 16)            Realtime biometrics India pvt ltd\r
@@ -10559,11 +10706,17 @@ C00000-CFFFFF     (base 16)           Laonz Co.,Ltd
                                 delhi  Delhi  110092\r
                                 IN\r
  \r
-A4-ED-43   (hex)               Shanghai  Facom  Electronics Technology  Co, ltd.\r
-600000-6FFFFF     (base 16)            Shanghai  Facom  Electronics Technology  Co, ltd.\r
-                               The third floor, A area,         Huaxu road No. 685\r
-                               Shanghai  Xujing town，Qingpu  200217\r
-                               CN\r
+3C-6A-2C   (hex)               figur8, Inc.\r
+300000-3FFFFF     (base 16)            figur8, Inc.\r
+                               2 Park Plaza, Suite 605\r
+                               BOSTON  MA  02116\r
+                               US\r
+\r
+A4-ED-43   (hex)               Shanghai  Facom  Electronics Technology  Co, ltd.\r
+600000-6FFFFF     (base 16)            Shanghai  Facom  Electronics Technology  Co, ltd.\r
+                               The third floor, A area,         Huaxu road No. 685\r
+                               Shanghai  Xujing town，Qingpu  200217\r
+                               CN\r
  \r
  30-0A-60   (hex)               Advanced Electronic Designs, Inc.\r
  200000-2FFFFF     (base 16)            Advanced Electronic Designs, Inc.\r
@@ -10589,6 +10742,12 @@ A00000-AFFFFF     (base 16)            Medical Evolution Kft
                                 Pomaz    2013\r
                                 HU\r
  \r
+A4-ED-43   (hex)               NETAS TELEKOMUNIKASYON A.S.\r
+400000-4FFFFF     (base 16)            NETAS TELEKOMUNIKASYON A.S.\r
+                               Kurtköy Mahallesi, Osmanlı Blv. No:11\r
+                               Pendik  Istanbul  34912\r
+                               TR\r
+\r
  A0-28-33   (hex)               HZHY TECHNOLOGY\r
  800000-8FFFFF     (base 16)            HZHY TECHNOLOGY\r
                                 The 2th floor,Longzeyuan Multi-use\r
@@ -10601,23 +10760,17 @@ A4-ED-43   (hex)              Beijing ICPC CO.,Ltd.
                                 Beijing  Beijing  100070\r
                                 CN\r
  \r
-A4-ED-43   (hex)               NETAS TELEKOMUNIKASYON A.S.\r
-400000-4FFFFF     (base 16)            NETAS TELEKOMUNIKASYON A.S.\r
-                               Kurtköy Mahallesi, Osmanlı Blv. No:11\r
-                               Pendik  Istanbul  34912\r
-                               TR\r
-\r
  A4-ED-43   (hex)               Guangzhou Maxfaith Communication Technology Co.,LTD.\r
  A00000-AFFFFF     (base 16)            Guangzhou Maxfaith Communication Technology Co.,LTD.\r
                                 3rd Floor,Office of Youtong Zone,No.139,Zhongshan Avenue\r
                                 Guangzhou    510665\r
                                 CN\r
  \r
-84-89-EC   (hex)               Price Industries Limited\r
-D00000-DFFFFF     (base 16)            Price Industries Limited\r
-                               638 Raleigh Street\r
-                               Winnipeg  Manitoba  R2K3Z9\r
-                               CA\r
+84-89-EC   (hex)               thousand star tech LTD.\r
+200000-2FFFFF     (base 16)            thousand star tech LTD.\r
+                               guan nan yuan 1 road dangdai optical valley dream workshop\r
+                               wuhan  hubei  430070\r
+                               CN\r
  \r
  30-09-F9   (hex)               ZhongLi HengFeng (Shenzhen) Technology co.,Ltd.\r
  E00000-EFFFFF     (base 16)            ZhongLi HengFeng (Shenzhen) Technology co.,Ltd.\r
@@ -10625,23 +10778,23 @@ E00000-EFFFFF     (base 16)           ZhongLi HengFeng (Shenzhen) Technology co.,Ltd.
                                 Shenzhen  Guangdong  430000\r
                                 CN\r
  \r
+84-89-EC   (hex)               Price Industries Limited\r
+D00000-DFFFFF     (base 16)            Price Industries Limited\r
+                               638 Raleigh Street\r
+                               Winnipeg  Manitoba  R2K3Z9\r
+                               CA\r
+\r
  30-09-F9   (hex)               Sichuan Nebula Networks Co.,LTD.\r
  B00000-BFFFFF     (base 16)            Sichuan Nebula Networks Co.,LTD.\r
                                 Floor 21 Building 2,No.200 Tianquan Road,West Hi-Tech Zone,\r
                                 Chengdu  Sichuan  611731\r
                                 CN\r
  \r
-84-89-EC   (hex)               thousand star tech LTD.\r
-200000-2FFFFF     (base 16)            thousand star tech LTD.\r
-                               guan nan yuan 1 road dangdai optical valley dream workshop\r
-                               wuhan  hubei  430070\r
-                               CN\r
-\r
-9C-F6-DD   (hex)               Shanxi ZhuoZhi fei High Electronic Technology Co. Ltd.\r
-E00000-EFFFFF     (base 16)            Shanxi ZhuoZhi fei High Electronic Technology Co. Ltd.\r
-                               Red flag East Street\r
-                               yuncheng  shanxi  044000\r
-                               CN\r
+30-09-F9   (hex)               Honeywell\r
+C00000-CFFFFF     (base 16)            Honeywell\r
+                               13350 US Hwy 19 N \r
+                               Clearwater  null  33764\r
+                               US\r
  \r
  B8-D8-12   (hex)               IPM Sales and service Co.,Ltd.\r
  200000-2FFFFF     (base 16)            IPM Sales and service Co.,Ltd.\r
@@ -10655,24 +10808,24 @@ B8-D8-12   (hex)              IPM Sales and service Co.,Ltd.
                                 Beijing    100085\r
                                 CN\r
  \r
-9C-F6-DD   (hex)               b8ta Inc.\r
-500000-5FFFFF     (base 16)            b8ta Inc.\r
-                               164 Townsend St\r
-                               San Francisco  CA  94107\r
-                               US\r
-\r
  9C-F6-DD   (hex)               Annapurna labs\r
  000000-0FFFFF     (base 16)            Annapurna labs\r
                                 Matam Scientific Industries Center,   Building 8.2\r
                                 Mail box 15123  Haifa  3508409\r
                                 IL\r
  \r
-30-09-F9   (hex)               Honeywell\r
-C00000-CFFFFF     (base 16)            Honeywell\r
-                               13350 US Hwy 19 N \r
-                               Clearwater  null  33764\r
+9C-F6-DD   (hex)               b8ta Inc.\r
+500000-5FFFFF     (base 16)            b8ta Inc.\r
+                               164 Townsend St\r
+                               San Francisco  CA  94107\r
                                 US\r
  \r
+9C-F6-DD   (hex)               Shanxi ZhuoZhi fei High Electronic Technology Co. Ltd.\r
+E00000-EFFFFF     (base 16)            Shanxi ZhuoZhi fei High Electronic Technology Co. Ltd.\r
+                               Red flag East Street\r
+                               yuncheng  shanxi  044000\r
+                               CN\r
+\r
  C0-83-59   (hex)               CHONGQING JIUYU SMART TECHNOLOGY CO.LTD.\r
  000000-0FFFFF     (base 16)            CHONGQING JIUYU SMART TECHNOLOGY CO.LTD.\r
                                 T2-11-3, No. 2 Jiangbeizui Financial City, Jiangbei District,\r
@@ -10685,6 +10838,12 @@ C0-83-59   (hex)               CHONGQING JIUYU SMART TECHNOLOGY CO.LTD.
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+04-C3-E6   (hex)               SiS Technology\r
+200000-2FFFFF     (base 16)            SiS Technology\r
+                               Business Park Varna, building B1, floor 4\r
+                               Varna    9000\r
+                               BG\r
+\r
  04-C3-E6   (hex)               Advanced Digital Technologies, s.r.o.\r
  700000-7FFFFF     (base 16)            Advanced Digital Technologies, s.r.o.\r
                                 Purkynova 649/127\r
@@ -10703,24 +10862,12 @@ E00000-EFFFFF     (base 16)           Xiaoniu network technology (Shanghai) Co., Ltd.
                                 Shang hai    200040\r
                                 CN\r
  \r
-04-C3-E6   (hex)               SiS Technology\r
-200000-2FFFFF     (base 16)            SiS Technology\r
-                               Business Park Varna, building B1, floor 4\r
-                               Varna    9000\r
-                               BG\r
-\r
  3C-42-7E   (hex)               Dongguan Taide Industrial Co.,Ltd.\r
  100000-1FFFFF     (base 16)            Dongguan Taide Industrial Co.,Ltd.\r
                                 Taide Industrial Park,Phase 2 Jinfenghuang Industrial District Huangdong,Fenggang Town\r
                                 Dongguan City  GuangDong  523696\r
                                 CN\r
  \r
-D4-7C-44   (hex)               YunDing Network Technology (Beijing) Co., Ltd\r
-200000-2FFFFF     (base 16)            YunDing Network Technology (Beijing) Co., Ltd\r
-                               A521,Floor 5, Tencent Space Building No.388, Hui long guan East St. \r
-                               Beijing    100000\r
-                               CN\r
-\r
  D4-7C-44   (hex)               Suzhou Wan Dian Zhang Network Technology Co., Ltd\r
  900000-9FFFFF     (base 16)            Suzhou Wan Dian Zhang Network Technology Co., Ltd\r
                                 No. 209 Zhuyuan Road, High-tech Zone\r
@@ -10751,6 +10898,12 @@ C00000-CFFFFF     (base 16)            Impakt S.A.
                                 Mosina  Wielkopolska  62-050\r
                                 PL\r
  \r
+D4-7C-44   (hex)               YunDing Network Technology (Beijing) Co., Ltd\r
+200000-2FFFFF     (base 16)            YunDing Network Technology (Beijing) Co., Ltd\r
+                               A521,Floor 5, Tencent Space Building No.388, Hui long guan East St. \r
+                               Beijing    100000\r
+                               CN\r
+\r
  A0-19-B2   (hex)               Power Diagnostic Service Co., LTD.\r
  300000-3FFFFF     (base 16)            Power Diagnostic Service Co., LTD.\r
                                 No.10, Ln.482, Sec.4 Zhonghua Rd.\r
@@ -10781,23 +10934,17 @@ A00000-AFFFFF     (base 16)           Ballard Technology, Inc,
                                 Everett    98204\r
                                 US\r
  \r
-2C-48-35   (hex)               DPS Electronics\r
-800000-8FFFFF     (base 16)            DPS Electronics\r
-                               317 Gallatin Park Dr #2\r
-                               Bozeman  MT  59715\r
-                               US\r
-\r
  2C-48-35   (hex)               Shanghai Visteon Automotive Electronics System CO. Ltd.\r
  B00000-BFFFFF     (base 16)            Shanghai Visteon Automotive Electronics System CO. Ltd.\r
                                 No.1268, East Kangqiao Road, Pudong District,\r
                                 ShangHai    201315\r
                                 CN\r
  \r
-8C-1C-DA   (hex)               Anntec （Beijing） Technology Co.,Ltd.\r
-400000-4FFFFF     (base 16)            Anntec （Beijing） Technology Co.,Ltd.\r
-                               F803, Shangdi Third Street, No.9,HaiDian District\r
-                               Beijing    100080\r
-                               CN\r
+2C-48-35   (hex)               DPS Electronics\r
+800000-8FFFFF     (base 16)            DPS Electronics\r
+                               317 Gallatin Park Dr #2\r
+                               Bozeman  MT  59715\r
+                               US\r
  \r
  3C-24-F0   (hex)               CASKY eTech Co., Ltd.\r
  500000-5FFFFF     (base 16)            CASKY eTech Co., Ltd.\r
@@ -10805,18 +10952,18 @@ B00000-BFFFFF     (base 16)           Shanghai Visteon Automotive Electronics System CO.
                                 Beijing  Beijing  100080\r
                                 CN\r
  \r
-0C-73-EB   (hex)               Green Fox Electro AS\r
-600000-6FFFFF     (base 16)            Green Fox Electro AS\r
-                               Wessels veg 63\r
-                               STJORDAL    NO-7502\r
-                               NO\r
-\r
  8C-1C-DA   (hex)               China Potevio Co., Ltd\r
  A00000-AFFFFF     (base 16)            China Potevio Co., Ltd\r
                                 No.6, haidian north second street, haidian district, Beijing\r
                                 Beijing  Beijing  100080\r
                                 CN\r
  \r
+8C-1C-DA   (hex)               Anntec （Beijing） Technology Co.,Ltd.\r
+400000-4FFFFF     (base 16)            Anntec （Beijing） Technology Co.,Ltd.\r
+                               F803, Shangdi Third Street, No.9,HaiDian District\r
+                               Beijing    100080\r
+                               CN\r
+\r
  3C-24-F0   (hex)               Travis Holding B.V.\r
  D00000-DFFFFF     (base 16)            Travis Holding B.V.\r
                                 Stationsplein 45, A4.002 3013 AK\r
@@ -10829,24 +10976,30 @@ D00000-DFFFFF     (base 16)           Travis Holding B.V.
                                 Sofia  Sofia  1407\r
                                 BG\r
  \r
+0C-73-EB   (hex)               Green Fox Electro AS\r
+600000-6FFFFF     (base 16)            Green Fox Electro AS\r
+                               Wessels veg 63\r
+                               STJORDAL    NO-7502\r
+                               NO\r
+\r
  48-0B-B2   (hex)               Solaredge LTD.\r
  500000-5FFFFF     (base 16)            Solaredge LTD.\r
                                 Hamada 1\r
                                 Herzelia    4673335\r
                                 IL\r
  \r
-48-0B-B2   (hex)               shanghai Rinlink  Intelligent Technology Co., Ltd.\r
-300000-3FFFFF     (base 16)            shanghai Rinlink  Intelligent Technology Co., Ltd.\r
-                               Room1510,ROAD Xiuwen,Minhang District\r
-                               shanghai    201100\r
-                               CN\r
-\r
  88-5F-E8   (hex)               Unicom Global, Inc.\r
  E00000-EFFFFF     (base 16)            Unicom Global, Inc.\r
                                 581, Ruiguang Road, Neihu Dist.\r
                                 Taipei    11492\r
                                 TW\r
  \r
+48-0B-B2   (hex)               shanghai Rinlink  Intelligent Technology Co., Ltd.\r
+300000-3FFFFF     (base 16)            shanghai Rinlink  Intelligent Technology Co., Ltd.\r
+                               Room1510,ROAD Xiuwen,Minhang District\r
+                               shanghai    201100\r
+                               CN\r
+\r
  30-1F-9A   (hex)                FINE TRIUMPH TECHNOLOGY CORP.,LTD.\r
  800000-8FFFFF     (base 16)             FINE TRIUMPH TECHNOLOGY CORP.,LTD.\r
                                 Xixiang\r
@@ -10859,6 +11012,12 @@ E00000-EFFFFF     (base 16)            Unicom Global, Inc.
                                 Beijing    100089\r
                                 CN\r
  \r
+F0-41-C8   (hex)               SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD\r
+300000-3FFFFF     (base 16)            SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD\r
+                               No.826,Zone 1,Block B,Famous industrial product display purchasing center,Baoyuan Road,Xixiang,Bao'an Dis., Shenzhen,P.R.China\r
+                               shenzhen  China  518102\r
+                               CN\r
+\r
  30-1F-9A   (hex)               ILSAN ELECTRONICS\r
  000000-0FFFFF     (base 16)            ILSAN ELECTRONICS\r
                                 433Beon-gil 52,Sasang-ro,Sasang-gu\r
@@ -10871,18 +11030,6 @@ E00000-EFFFFF     (base 16)            Unicom Global, Inc.
                                 Trbovlje    1420\r
                                 SI\r
  \r
-F0-41-C8   (hex)               SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD\r
-300000-3FFFFF     (base 16)            SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD\r
-                               No.826,Zone 1,Block B,Famous industrial product display purchasing center,Baoyuan Road,Xixiang,Bao'an Dis., Shenzhen,P.R.China\r
-                               shenzhen  China  518102\r
-                               CN\r
-\r
-88-A9-A7   (hex)               Thomas & Darden, Inc\r
-400000-4FFFFF     (base 16)            Thomas & Darden, Inc\r
-                               916 Springdale Rd Bldg 4 #104\r
-                               Austin    78702\r
-                               US\r
-\r
  F0-41-C8   (hex)               Powervault Ltd\r
  B00000-BFFFFF     (base 16)            Powervault Ltd\r
                                 29 Shand Street, London Bridge\r
@@ -10901,11 +11048,11 @@ A00000-AFFFFF     (base 16)           Zhejiang Haoteng Electronic Technology Co.,Ltd.
                                 Lishui  Zhejiang  323000\r
                                 CN\r
  \r
-DC-E5-33   (hex)               Giant Power Technology Biomedical Corporation\r
-E00000-EFFFFF     (base 16)            Giant Power Technology Biomedical Corporation\r
-                               Rm201, 2nd Educational Building, No. 84, Gongzhuan Rd, Taishan Dist\r
-                               New Taipei City    24301\r
-                               TW\r
+88-A9-A7   (hex)               Thomas & Darden, Inc\r
+400000-4FFFFF     (base 16)            Thomas & Darden, Inc\r
+                               916 Springdale Rd Bldg 4 #104\r
+                               Austin    78702\r
+                               US\r
  \r
  DC-E5-33   (hex)               Suzhou ATES electronic technology co.LTD\r
  D00000-DFFFFF     (base 16)            Suzhou ATES electronic technology co.LTD\r
@@ -10925,11 +11072,11 @@ DC-E5-33   (hex)              shenzhen bangying electronics co,.ltd
                                 shenzhen  guangdong  518000\r
                                 CN\r
  \r
-DC-E5-33   (hex)               Tiertime Corporation\r
-900000-9FFFFF     (base 16)            Tiertime Corporation\r
-                               2398 Walsh Avenue\r
-                               Santa Clara  CA  95051\r
-                               US\r
+DC-E5-33   (hex)               Giant Power Technology Biomedical Corporation\r
+E00000-EFFFFF     (base 16)            Giant Power Technology Biomedical Corporation\r
+                               Rm201, 2nd Educational Building, No. 84, Gongzhuan Rd, Taishan Dist\r
+                               New Taipei City    24301\r
+                               TW\r
  \r
  DC-E5-33   (hex)               FLYHT Aerospace\r
  000000-0FFFFF     (base 16)            FLYHT Aerospace\r
@@ -10937,10 +11084,16 @@ DC-E5-33   (hex)              FLYHT Aerospace
                                 Calgary  AB  T2E7P1\r
                                 CA\r
  \r
-9C-43-1E   (hex)               SuZhou Jinruiyang Information Technology CO.,LTD\r
-C00000-CFFFFF     (base 16)            SuZhou Jinruiyang Information Technology CO.,LTD\r
-                               NO.1003 Room A1 Buliding Tengfei Business Park in Suzhou Industrial Park.\r
-                               Suzhou  Jiangsu  215123\r
+DC-E5-33   (hex)               Tiertime Corporation\r
+900000-9FFFFF     (base 16)            Tiertime Corporation\r
+                               2398 Walsh Avenue\r
+                               Santa Clara  CA  95051\r
+                               US\r
+\r
+C4-FF-BC   (hex)               SHENZHEN KALIF ELECTRONICS CO.,LTD\r
+300000-3FFFFF     (base 16)            SHENZHEN KALIF ELECTRONICS CO.,LTD\r
+                               1、2 and 3 Floor, No.114, Haochong No.2 Industry Area, Hongxing Community, Songgang, Baoan, Shenzhen \r
+                               SHENZHEN  GuangDong  518105\r
                                 CN\r
  \r
  9C-43-1E   (hex)               JNL Technologies Inc\r
@@ -10955,11 +11108,11 @@ C4-FF-BC   (hex)              iMageTech CO.,LTD.
                                 TAIPEI    114\r
                                 TW\r
  \r
-C4-FF-BC   (hex)               SHENZHEN KALIF ELECTRONICS CO.,LTD\r
-300000-3FFFFF     (base 16)            SHENZHEN KALIF ELECTRONICS CO.,LTD\r
-                               1、2 and 3 Floor, No.114, Haochong No.2 Industry Area, Hongxing Community, Songgang, Baoan, Shenzhen \r
-                               SHENZHEN  GuangDong  518105\r
-                               CN\r
+28-2C-02   (hex)               EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA\r
+400000-4FFFFF     (base 16)            EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA\r
+                               Dietla 93/6\r
+                               Kraków    31-031\r
+                               PL\r
  \r
  28-2C-02   (hex)               Epoch International Enterprises, Inc.\r
  C00000-CFFFFF     (base 16)            Epoch International Enterprises, Inc.\r
@@ -10967,11 +11120,11 @@ C00000-CFFFFF     (base 16)           Epoch International Enterprises, Inc.
                                 Los Alamitos  CA  90720\r
                                 US\r
  \r
-28-2C-02   (hex)               EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA\r
-400000-4FFFFF     (base 16)            EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA\r
-                               Dietla 93/6\r
-                               Kraków    31-031\r
-                               PL\r
+9C-43-1E   (hex)               SuZhou Jinruiyang Information Technology CO.,LTD\r
+C00000-CFFFFF     (base 16)            SuZhou Jinruiyang Information Technology CO.,LTD\r
+                               NO.1003 Room A1 Buliding Tengfei Business Park in Suzhou Industrial Park.\r
+                               Suzhou  Jiangsu  215123\r
+                               CN\r
  \r
  F8-B5-68   (hex)               PT. Eyro Digital Teknologi\r
  100000-1FFFFF     (base 16)            PT. Eyro Digital Teknologi\r
@@ -10979,12 +11132,6 @@ F8-B5-68   (hex)               PT. Eyro Digital Teknologi
                                 Surabaya  Jawa Timur  60294\r
                                 ID\r
  \r
-40-48-FD   (hex)               RL Controls LLC.\r
-300000-3FFFFF     (base 16)            RL Controls LLC.\r
-                               2 G Gill St\r
-                               Woburn  MA  01801\r
-                               US\r
-\r
  40-48-FD   (hex)               Dynamic Engineering\r
  400000-4FFFFF     (base 16)            Dynamic Engineering\r
                                 Dynamic Engineering, 150 DuBois St. Suite C\r
@@ -10997,18 +11144,18 @@ B00000-BFFFFF     (base 16)           Magenta Labs, Inc.
                                 San Francisco  CA  94107\r
                                 US\r
  \r
-40-48-FD   (hex)               Fast Programming\r
-100000-1FFFFF     (base 16)            Fast Programming\r
-                               Alyarmouk\r
-                               Riyadh  Ar Riyadh  13251\r
-                               SA\r
-\r
  40-48-FD   (hex)               SMART SENSOR DEVICES AB\r
  E00000-EFFFFF     (base 16)            SMART SENSOR DEVICES AB\r
                                 Sollentunavägen 67A\r
                                 Sollentuna  Stockholm  19140\r
                                 SE\r
  \r
+40-48-FD   (hex)               Fast Programming\r
+100000-1FFFFF     (base 16)            Fast Programming\r
+                               Alyarmouk\r
+                               Riyadh  Ar Riyadh  13251\r
+                               SA\r
+\r
  38-73-EA   (hex)               Eyesight(Shanghai)Communication Technology Co.,Ltd.\r
  200000-2FFFFF     (base 16)            Eyesight(Shanghai)Communication Technology Co.,Ltd.\r
                                 Room 820, C/F, Building 1, NO. 3000 Longdong Avenue, China(Shanghai) Pilot Free Trade\r
@@ -11027,10 +11174,10 @@ E00000-EFFFFF     (base 16)           SMART SENSOR DEVICES AB
                                 shenzhen  Guangdong  518055\r
                                 CN\r
  \r
-EC-9F-0D   (hex)               Paw-Taw-John Services, Inc.\r
-500000-5FFFFF     (base 16)            Paw-Taw-John Services, Inc.\r
-                               18125 N Ramsey Rd\r
-                               Rathdrum  ID  83858-8288\r
+40-48-FD   (hex)               RL Controls LLC.\r
+300000-3FFFFF     (base 16)            RL Controls LLC.\r
+                               2 G Gill St\r
+                               Woburn  MA  01801\r
                                 US\r
  \r
  EC-9F-0D   (hex)               Hesai Photonics Technology Co., Ltd\r
@@ -11039,29 +11186,29 @@ EC-9F-0D   (hex)              Hesai Photonics Technology Co., Ltd
                                 Shanghai  Shanghai  200010\r
                                 CN\r
  \r
-EC-9F-0D   (hex)               Sarcos Corp\r
-C00000-CFFFFF     (base 16)            Sarcos Corp\r
-                               360 S Wakara Way\r
-                               Salt Lake City  UT  84108\r
+EC-9F-0D   (hex)               Paw-Taw-John Services, Inc.\r
+500000-5FFFFF     (base 16)            Paw-Taw-John Services, Inc.\r
+                               18125 N Ramsey Rd\r
+                               Rathdrum  ID  83858-8288\r
                                 US\r
  \r
-EC-9F-0D   (hex)               FCI\r
-900000-9FFFFF     (base 16)            FCI\r
-                               B-7F,Silicon Park, 35, Pangyo-ro 255 beon-gil,Bundang-gu\r
-                               Seongnam si  Gyeonggi-do. KOREA  13486\r
-                               KR\r
-\r
  EC-9F-0D   (hex)               Bei jing Lian Shan times Techonology Co.Ltd\r
  700000-7FFFFF     (base 16)            Bei jing Lian Shan times Techonology Co.Ltd\r
                                 Beijing Haidian.No.2 of Yong Cheng North Road Building 1.402\r
                                 Beijing    100094\r
                                 CN\r
  \r
-34-D0-B8   (hex)               eesy-innovation GmbH\r
-500000-5FFFFF     (base 16)            eesy-innovation GmbH\r
-                               Otto-Hahn-Str. 13b\r
-                               Munich  Bavaria  85521\r
-                               DE\r
+EC-9F-0D   (hex)               FCI\r
+900000-9FFFFF     (base 16)            FCI\r
+                               B-7F,Silicon Park, 35, Pangyo-ro 255 beon-gil,Bundang-gu\r
+                               Seongnam si  Gyeonggi-do. KOREA  13486\r
+                               KR\r
+\r
+34-D0-B8   (hex)               Tascent, Inc.\r
+300000-3FFFFF     (base 16)            Tascent, Inc.\r
+                               475 Alberto Way, Suite #200\r
+                               Los Gatos  CA  95032\r
+                               US\r
  \r
  34-D0-B8   (hex)               Vtrek Group International Ltd.\r
  800000-8FFFFF     (base 16)            Vtrek Group International Ltd.\r
@@ -11075,18 +11222,24 @@ EC-9F-0D   (hex)              Bei jing Lian Shan times Techonology Co.Ltd
                                 Mt. Waverley  Victoria  3149\r
                                 AU\r
  \r
+34-D0-B8   (hex)               eesy-innovation GmbH\r
+500000-5FFFFF     (base 16)            eesy-innovation GmbH\r
+                               Otto-Hahn-Str. 13b\r
+                               Munich  Bavaria  85521\r
+                               DE\r
+\r
+EC-9F-0D   (hex)               Sarcos Corp\r
+C00000-CFFFFF     (base 16)            Sarcos Corp\r
+                               360 S Wakara Way\r
+                               Salt Lake City  UT  84108\r
+                               US\r
+\r
  AC-1D-DF   (hex)               CRDE\r
  300000-3FFFFF     (base 16)            CRDE\r
                                 ZI DES GRANDS CAMPS\r
                                 MERCUES  LOT  46090\r
                                 FR\r
  \r
-34-D0-B8   (hex)               Tascent, Inc.\r
-300000-3FFFFF     (base 16)            Tascent, Inc.\r
-                               475 Alberto Way, Suite #200\r
-                               Los Gatos  CA  95032\r
-                               US\r
-\r
  74-1A-E0   (hex)               SAIERCOM CORPORATION\r
  A00000-AFFFFF     (base 16)            SAIERCOM CORPORATION\r
                                 ROOM 11501,FLOOR 15,UNIT 1,BLOCK 1,RENOVATION CENTER,TUANJIE SOUTH RD.,HI-TECH ZONE,XIAN,SHAANXI\r
@@ -11111,36 +11264,24 @@ D00000-DFFFFF     (base 16)           Voltaware Services Limited
                                 Hilden  NRW  40723\r
                                 DE\r
  \r
-CC-22-37   (hex)               SHANGHAI CARGOA M.&E.EQUIPMENT CO.LTD\r
-400000-4FFFFF     (base 16)            SHANGHAI CARGOA M.&E.EQUIPMENT CO.LTD\r
-                               98 shunda road 9#,nanxiang town, Jianding district\r
-                               Shanghai, 200182P.R.    200182\r
-                               CN\r
-\r
  CC-22-37   (hex)               Hebei ZHSF Technology Co.,Ltd.\r
  C00000-CFFFFF     (base 16)            Hebei ZHSF Technology Co.,Ltd.\r
                                 88 Xinshi South Road\r
                                 Shijiazhuang, Hebei    050000\r
                                 CN\r
  \r
+CC-22-37   (hex)               SHANGHAI CARGOA M.&E.EQUIPMENT CO.LTD\r
+400000-4FFFFF     (base 16)            SHANGHAI CARGOA M.&E.EQUIPMENT CO.LTD\r
+                               98 shunda road 9#,nanxiang town, Jianding district\r
+                               Shanghai, 200182P.R.    200182\r
+                               CN\r
+\r
  CC-22-37   (hex)               XConnect Professional Services\r
  300000-3FFFFF     (base 16)            XConnect Professional Services\r
                                 459 Westlake Dr\r
                                 Brisbane  QLD  4074\r
                                 AU\r
  \r
-2C-27-9E   (hex)               AudioNord Distribution A/S\r
-500000-5FFFFF     (base 16)            AudioNord Distribution A/S\r
-                               Moelbakvej 4\r
-                               Lystrup    8520\r
-                               DK\r
-\r
-18-9B-A5   (hex)               ChengDu Vantron Technology, Ltd.\r
-100000-1FFFFF     (base 16)            ChengDu Vantron Technology, Ltd.\r
-                               6th Floor, 1st  Building,No.9, 3rd WuKe East Street, WuHou District,\r
-                               ChengDu  SiChuan  610045\r
-                               CN\r
-\r
  90-4E-91   (hex)               CUTTER Systems spol. s r.o.\r
  900000-9FFFFF     (base 16)            CUTTER Systems spol. s r.o.\r
                                 Milicova 2530/26\r
@@ -11165,6 +11306,12 @@ CC-22-37   (hex)               XConnect Professional Services
                                 Minneapolis  MN  55401\r
                                 US\r
  \r
+2C-27-9E   (hex)               AudioNord Distribution A/S\r
+500000-5FFFFF     (base 16)            AudioNord Distribution A/S\r
+                               Moelbakvej 4\r
+                               Lystrup    8520\r
+                               DK\r
+\r
  50-FF-99   (hex)               Informa LLC\r
  E00000-EFFFFF     (base 16)            Informa LLC\r
                                 215 N. College Ave\r
@@ -11189,24 +11336,18 @@ E00000-EFFFFF     (base 16)           Informa LLC
                                 Shenzhen  Guangdong  518048\r
                                 CN\r
  \r
+18-9B-A5   (hex)               ChengDu Vantron Technology, Ltd.\r
+100000-1FFFFF     (base 16)            ChengDu Vantron Technology, Ltd.\r
+                               6th Floor, 1st  Building,No.9, 3rd WuKe East Street, WuHou District,\r
+                               ChengDu  SiChuan  610045\r
+                               CN\r
+\r
  34-00-8A   (hex)               ChengDu HuiZhong Cloud Information Technology Co., Ltd.\r
  D00000-DFFFFF     (base 16)            ChengDu HuiZhong Cloud Information Technology Co., Ltd.\r
                                 NO.1 CHENGJI ROAD ,CHENGHUA DISTRICT\r
                                 CHENGDU CITY  SICHUAN  610000\r
                                 CN\r
  \r
-28-F5-37   (hex)               Shenzhen Modern Cowboy Technology Co.,Ltd.     \r
-700000-7FFFFF     (base 16)            Shenzhen Modern Cowboy Technology Co.,Ltd.     \r
-                               Room 1006,Beike building，Keyuan road,Yuehai streets,Nanshan District\r
-                               Shenzhen  Guangdong Province  518200\r
-                               CN\r
-\r
-28-F5-37   (hex)               PRIMETECH ENGINEERING CORP.\r
-300000-3FFFFF     (base 16)            PRIMETECH ENGINEERING CORP.\r
-                                Koishikawadaikoku Bldg. 3F, 1-3-25\r
-                                Koishikawa, Bunkyo-ku  Tokyo  112-0002\r
-                               JP\r
-\r
  34-00-8A   (hex)               Keruyun Technoligies(Beijing) Corporation Limited\r
  900000-9FFFFF     (base 16)            Keruyun Technoligies(Beijing) Corporation Limited\r
                                 Room 405, Taibang Technical Building, High-tech south 4 road, Nanshan\r
@@ -11219,6 +11360,18 @@ D00000-DFFFFF     (base 16)            ChengDu HuiZhong Cloud Information Technology Co.,
                                 Rostov-on-Don  Select  344068\r
                                 RU\r
  \r
+28-F5-37   (hex)               Shenzhen Modern Cowboy Technology Co.,Ltd.     \r
+700000-7FFFFF     (base 16)            Shenzhen Modern Cowboy Technology Co.,Ltd.     \r
+                               Room 1006,Beike building，Keyuan road,Yuehai streets,Nanshan District\r
+                               Shenzhen  Guangdong Province  518200\r
+                               CN\r
+\r
+28-F5-37   (hex)               PRIMETECH ENGINEERING CORP.\r
+300000-3FFFFF     (base 16)            PRIMETECH ENGINEERING CORP.\r
+                                Koishikawadaikoku Bldg. 3F, 1-3-25\r
+                                Koishikawa, Bunkyo-ku  Tokyo  112-0002\r
+                               JP\r
+\r
  34-00-8A   (hex)               Shenzhen Eternal Idea Tech Co.,Ltd\r
  C00000-CFFFFF     (base 16)            Shenzhen Eternal Idea Tech Co.,Ltd\r
                                 5/F, Building C, Chuangwei Technology Park,1st Rd,Shiyan tangtou,Baoan District, Shenzhen, Guang Dong Province,PRC \r
@@ -11237,12 +11390,6 @@ C00000-CFFFFF     (base 16)            Shenzhen Eternal Idea Tech Co.,Ltd
                                 Chicago  IL  60611\r
                                 US\r
  \r
-28-F5-37   (hex)               Atomrock LLC\r
-500000-5FFFFF     (base 16)            Atomrock LLC\r
-                               22525 SE 64th Place, Suite 2288\r
-                               Issaquah    98027\r
-                               US\r
-\r
  28-F5-37   (hex)               Skyrockettoys LLC\r
  D00000-DFFFFF     (base 16)            Skyrockettoys LLC\r
                                 12910 culver blvd Ste F\r
@@ -11255,6 +11402,12 @@ D00000-DFFFFF     (base 16)            Skyrockettoys LLC
                                 Drammen  Buskerud  3036\r
                                 NO\r
  \r
+28-F5-37   (hex)               Atomrock LLC\r
+500000-5FFFFF     (base 16)            Atomrock LLC\r
+                               22525 SE 64th Place, Suite 2288\r
+                               Issaquah    98027\r
+                               US\r
+\r
  28-F5-37   (hex)               LogiM GmbH Software und Entwicklung\r
  B00000-BFFFFF     (base 16)            LogiM GmbH Software und Entwicklung\r
                                 Mahonienweg 22b\r
@@ -11309,48 +11462,42 @@ F8-8A-3C   (hex)              Shenzhen Shengyuan Tech Ltd.
                                 Sunnyvale  CA  94085\r
                                 US\r
  \r
-F8-8A-3C   (hex)               KLATU Networks Inc\r
-200000-2FFFFF     (base 16)            KLATU Networks Inc\r
-                               4174 NE Lookout Lane\r
-                               Poulsbo  WA  98370\r
-                               US\r
-\r
  A0-C5-F2   (hex)               Synapsys Solutions Ltd.\r
  E00000-EFFFFF     (base 16)            Synapsys Solutions Ltd.\r
                                 1 Woodlands Court, Albert Drive\r
                                 Burgess Hill  West Sussex  RH15 9TN\r
                                 GB\r
  \r
+F8-8A-3C   (hex)               KLATU Networks Inc\r
+200000-2FFFFF     (base 16)            KLATU Networks Inc\r
+                               4174 NE Lookout Lane\r
+                               Poulsbo  WA  98370\r
+                               US\r
+\r
  A0-C5-F2   (hex)               KNS Group LLC (YADRO Company)\r
  100000-1FFFFF     (base 16)            KNS Group LLC (YADRO Company)\r
                                 Spartakovskaya sq., 14, bl. 1\r
                                 Moscow    105082\r
                                 RU\r
  \r
-A0-C5-F2   (hex)               Speedgoat GmbH\r
-200000-2FFFFF     (base 16)            Speedgoat GmbH\r
-                               Waldeggstrasse 30\r
-                               Liebefeld  BE  3097\r
-                               CH\r
-\r
  A0-C5-F2   (hex)               Viettronimex JSC\r
  700000-7FFFFF     (base 16)            Viettronimex JSC\r
                                 74-76 Nguyen Hue street, Ben nghe ward, distric 1\r
                                 Ho Chi Minh    70000\r
                                 VN\r
  \r
+A0-C5-F2   (hex)               Speedgoat GmbH\r
+200000-2FFFFF     (base 16)            Speedgoat GmbH\r
+                               Waldeggstrasse 30\r
+                               Liebefeld  BE  3097\r
+                               CH\r
+\r
  04-71-4B   (hex)               Neurio Technology Inc.\r
  000000-0FFFFF     (base 16)            Neurio Technology Inc.\r
                                 43 West Hastings Street\r
                                 Vancouver  BC  V6B 1G4\r
                                 CA\r
  \r
-04-71-4B   (hex)               Lighthouse AI, Inc\r
-900000-9FFFFF     (base 16)            Lighthouse AI, Inc\r
-                               380 Portage Ave\r
-                               Palo Alto  CA  94306\r
-                               US\r
-\r
  F0-23-B9   (hex)               Emu Technology\r
  900000-9FFFFF     (base 16)            Emu Technology\r
                                 1400 E. Angela Blvd. #101\r
@@ -11363,17 +11510,23 @@ F0-23-B9   (hex)              Audeara Pty. Ltd.
                                 Brisbane  Queensland  4000\r
                                 AU\r
  \r
+04-71-4B   (hex)               Lighthouse AI, Inc\r
+900000-9FFFFF     (base 16)            Lighthouse AI, Inc\r
+                               380 Portage Ave\r
+                               Palo Alto  CA  94306\r
+                               US\r
+\r
  60-D7-E3   (hex)               Elap s.r.l.\r
  100000-1FFFFF     (base 16)            Elap s.r.l.\r
                                 Via V. Veneto 4\r
                                 Corsico  Milano  20094\r
                                 IT\r
  \r
-04-71-4B   (hex)               DIGIBEST TECHNOLOGY CO., LTD.\r
-B00000-BFFFFF     (base 16)            DIGIBEST TECHNOLOGY CO., LTD.\r
-                               4F ,No.65 , SHITAN ROAD , NEIHU DIST.\r
-                               TAIPEI    114\r
-                               TW\r
+1C-C0-E1   (hex)               SHENZHEN KINSTONE D&T DEVELOP CO.,LTD\r
+700000-7FFFFF     (base 16)            SHENZHEN KINSTONE D&T DEVELOP CO.,LTD\r
+                               5F, A2 Building ,XinJianXing Tech Industrial Park,Fengxin Road ,Lou Cun , Gongming Street,Guangming New Dist.,\r
+                                Shenzhen  Guangdong  518000\r
+                               CN\r
  \r
  04-71-4B   (hex)               KittyHawk Corporation\r
  C00000-CFFFFF     (base 16)            KittyHawk Corporation\r
@@ -11381,11 +11534,11 @@ C00000-CFFFFF     (base 16)           KittyHawk Corporation
                                 Mountain View  CA  94043\r
                                 US\r
  \r
-1C-C0-E1   (hex)               SHENZHEN KINSTONE D&T DEVELOP CO.,LTD\r
-700000-7FFFFF     (base 16)            SHENZHEN KINSTONE D&T DEVELOP CO.,LTD\r
-                               5F, A2 Building ,XinJianXing Tech Industrial Park,Fengxin Road ,Lou Cun , Gongming Street,Guangming New Dist.,\r
-                                Shenzhen  Guangdong  518000\r
-                               CN\r
+04-71-4B   (hex)               DIGIBEST TECHNOLOGY CO., LTD.\r
+B00000-BFFFFF     (base 16)            DIGIBEST TECHNOLOGY CO., LTD.\r
+                               4F ,No.65 , SHITAN ROAD , NEIHU DIST.\r
+                               TAIPEI    114\r
+                               TW\r
  \r
  08-ED-02   (hex)               Eleven Engineering Incorporated\r
  700000-7FFFFF     (base 16)            Eleven Engineering Incorporated\r
@@ -11399,6 +11552,18 @@ C00000-CFFFFF     (base 16)            KittyHawk Corporation
                                 Taipei    106\r
                                 TW\r
  \r
+14-4F-D7   (hex)               Red Technology Limited\r
+400000-4FFFFF     (base 16)            Red Technology Limited\r
+                               Room 702, 7/F., Fu Fai Commercial Centre, 27 Hillier Street, Sheung Wan\r
+                               Hong Kong    999077\r
+                               HK\r
+\r
+14-4F-D7   (hex)               Qingdao Wodatong Electronics Co., Ltd.\r
+300000-3FFFFF     (base 16)            Qingdao Wodatong Electronics Co., Ltd.\r
+                               West of Committees, HouHaiXi Community, JiHongTan Street, Chengyang District,\r
+                               Qingdao  Shandong  266111\r
+                               CN\r
+\r
  98-AA-FC   (hex)               Resonant Systems Inc.\r
  B00000-BFFFFF     (base 16)            Resonant Systems Inc.\r
                                 Tsurumi chiyoda building,4-34-26,Tsurumi-tyuou,Tsurumi\r
@@ -11423,18 +11588,6 @@ A00000-AFFFFF     (base 16)            SENKO Co.,Ltd.
                                 Seongnam-si  Kyonggi-do  13229\r
                                 KR\r
  \r
-14-4F-D7   (hex)               Red Technology Limited\r
-400000-4FFFFF     (base 16)            Red Technology Limited\r
-                               Room 702, 7/F., Fu Fai Commercial Centre, 27 Hillier Street, Sheung Wan\r
-                               Hong Kong    999077\r
-                               HK\r
-\r
-14-4F-D7   (hex)               Qingdao Wodatong Electronics Co., Ltd.\r
-300000-3FFFFF     (base 16)            Qingdao Wodatong Electronics Co., Ltd.\r
-                               West of Committees, HouHaiXi Community, JiHongTan Street, Chengyang District,\r
-                               Qingdao  Shandong  266111\r
-                               CN\r
-\r
  14-4F-D7   (hex)               Unirobot Corporation\r
  A00000-AFFFFF     (base 16)            Unirobot Corporation\r
                                 MK Hatagaya Sasazuka building 6F, Hatagaya, Shibuya-ku\r
@@ -11453,11 +11606,11 @@ A4-11-63   (hex)              Beijing XiaoRui Technology Co., Ltd
                                 Coral Springs  FL  33067\r
                                 US\r
  \r
-40-F3-85   (hex)               URMET Home & Building Solutions Pty Ltd\r
-B00000-BFFFFF     (base 16)            URMET Home & Building Solutions Pty Ltd\r
-                               36 Ricketty Street\r
-                               Mascot  NSW  2020\r
-                               AU\r
+40-F3-85   (hex)               Clixxo Broadband Private Limited\r
+C00000-CFFFFF     (base 16)            Clixxo Broadband Private Limited\r
+                               Suite # 10, 3rd Floor, Tower 2, Stellar IT Park, C-25, Sector 62\r
+                               Noida  Uttar Pradesh  201301\r
+                               IN\r
  \r
  40-F3-85   (hex)               Johnson Matthey\r
  100000-1FFFFF     (base 16)            Johnson Matthey\r
@@ -11465,24 +11618,18 @@ B00000-BFFFFF     (base 16)           URMET Home & Building Solutions Pty Ltd
                                 Billingham  Cleveland  TS23 4ED\r
                                 GB\r
  \r
+40-F3-85   (hex)               URMET Home & Building Solutions Pty Ltd\r
+B00000-BFFFFF     (base 16)            URMET Home & Building Solutions Pty Ltd\r
+                               36 Ricketty Street\r
+                               Mascot  NSW  2020\r
+                               AU\r
+\r
  8C-C8-F4   (hex)               Beijing KXWELL Technology CO., LTD \r
  500000-5FFFFF     (base 16)            Beijing KXWELL Technology CO., LTD \r
                                  Room 12A05, North Real Estate Building, Block 3\r
                                 81 Zizhuyuan Road, Haidian District  Beijing   100089\r
                                 CN\r
  \r
-40-F3-85   (hex)               Clixxo Broadband Private Limited\r
-C00000-CFFFFF     (base 16)            Clixxo Broadband Private Limited\r
-                               Suite # 10, 3rd Floor, Tower 2, Stellar IT Park, C-25, Sector 62\r
-                               Noida  Uttar Pradesh  201301\r
-                               IN\r
-\r
-50-A4-D0   (hex)               Beijing YangLian Networks Technology co., LTD\r
-C00000-CFFFFF     (base 16)            Beijing YangLian Networks Technology co., LTD\r
-                               Building 17, East Zone, No.10 Xibeiwang Dong Rd, Haidian District, Beijing, PRC\r
-                               BeiJing    100193\r
-                               CN\r
-\r
  8C-C8-F4   (hex)               Beijing Xinxunxintong Eletronics Co.,Ltd\r
  D00000-DFFFFF     (base 16)            Beijing Xinxunxintong Eletronics Co.,Ltd\r
                                 No.9 Yingfu Road,Haidian District\r
@@ -11495,6 +11642,12 @@ B00000-BFFFFF     (base 16)            PTYPE Co., LTD.
                                 Anyang-si  Gyeonggi-do  14056\r
                                 KR\r
  \r
+50-A4-D0   (hex)               Beijing YangLian Networks Technology co., LTD\r
+C00000-CFFFFF     (base 16)            Beijing YangLian Networks Technology co., LTD\r
+                               Building 17, East Zone, No.10 Xibeiwang Dong Rd, Haidian District, Beijing, PRC\r
+                               BeiJing    100193\r
+                               CN\r
+\r
  50-A4-D0   (hex)               Guangzhou Hysoon Electronic Co., Ltd.\r
  300000-3FFFFF     (base 16)            Guangzhou Hysoon Electronic Co., Ltd.\r
                                 No.1, Fenghuang South Road, Xinhua, Huadu District\r
@@ -11567,11 +11720,11 @@ D00000-DFFFFF     (base 16)           optilink networks pvt ltd
                                 Fenghua City  Zhejiang Province  315559\r
                                 CN\r
  \r
-48-65-EE   (hex)               CNU\r
-E00000-EFFFFF     (base 16)            CNU\r
-                               No.8 Everygreen Road,  Haidian District 3 layer 313\r
-                               Beijing    100195\r
-                               CN\r
+24-4E-7B   (hex)               Mighty Audio, Inc.\r
+B00000-BFFFFF     (base 16)            Mighty Audio, Inc.\r
+                               707 Coeur d'Alene Ave\r
+                               Venice  CA  90291\r
+                               US\r
  \r
  48-65-EE   (hex)               Swistec Systems AG\r
  500000-5FFFFF     (base 16)            Swistec Systems AG\r
@@ -11579,37 +11732,37 @@ E00000-EFFFFF     (base 16)           CNU
                                 Fehraltorf  ZH  8320\r
                                 CH\r
  \r
-10-07-23   (hex)               Shenzhen Xinfa Electronic Co.,ltd\r
-C00000-CFFFFF     (base 16)            Shenzhen Xinfa Electronic Co.,ltd\r
-                                NO.57., Baoli Rd.,Buji Town.,Longgang District.,Shenzhen city.,guangdong province.,China\r
-                               shenzhen  guangdong  518112\r
-                               CN\r
-\r
-24-4E-7B   (hex)               sonoscape\r
-100000-1FFFFF     (base 16)            sonoscape\r
-                               yuquan road\r
-                               shenzhen  guangdong  518052\r
-                               CN\r
-\r
-24-4E-7B   (hex)               Mighty Audio, Inc.\r
-B00000-BFFFFF     (base 16)            Mighty Audio, Inc.\r
-                               707 Coeur d'Alene Ave\r
-                               Venice  CA  90291\r
-                               US\r
-\r
  24-4E-7B   (hex)               Shenzhen Ruixunyun Technology Co.,Ltd.\r
  300000-3FFFFF     (base 16)            Shenzhen Ruixunyun Technology Co.,Ltd.\r
                                 Rm 311, 2Bldg.,Xunmei Technology Plaza, Keyuan Avenue, Nanshan District\r
                                 Shenzhen  Guangdong   518057\r
                                 CN\r
  \r
+10-07-23   (hex)               Shenzhen Xinfa Electronic Co.,ltd\r
+C00000-CFFFFF     (base 16)            Shenzhen Xinfa Electronic Co.,ltd\r
+                                NO.57., Baoli Rd.,Buji Town.,Longgang District.,Shenzhen city.,guangdong province.,China\r
+                               shenzhen  guangdong  518112\r
+                               CN\r
+\r
  24-4E-7B   (hex)               CHUNGHSIN TECHNOLOGY GROUP CO.,LTD\r
  C00000-CFFFFF     (base 16)            CHUNGHSIN TECHNOLOGY GROUP CO.,LTD\r
                                 618-2#GONGREN WEST ROAD,JIAOJIANG AREA\r
                                 TAIZHOU  ZHEJIANG  318000\r
                                 CN\r
  \r
-1C-C0-E1   (hex)               Abbott Medical Optics Inc.\r
+48-65-EE   (hex)               CNU\r
+E00000-EFFFFF     (base 16)            CNU\r
+                               No.8 Everygreen Road,  Haidian District 3 layer 313\r
+                               Beijing    100195\r
+                               CN\r
+\r
+24-4E-7B   (hex)               sonoscape\r
+100000-1FFFFF     (base 16)            sonoscape\r
+                               yuquan road\r
+                               shenzhen  guangdong  518052\r
+                               CN\r
+\r
+1C-C0-E1   (hex)               Abbott Medical Optics Inc.\r
  200000-2FFFFF     (base 16)            Abbott Medical Optics Inc.\r
                                 510 Cottonwood Drive\r
                                 Milpitas  CA  95035\r
@@ -11621,6 +11774,12 @@ C00000-CFFFFF     (base 16)            CHUNGHSIN TECHNOLOGY GROUP CO.,LTD
                                 Chicago  IL  60654\r
                                 US\r
  \r
+4C-E1-73   (hex)                Beijing Sutongwang E-Business Co., Ltd\r
+000000-0FFFFF     (base 16)             Beijing Sutongwang E-Business Co., Ltd\r
+                                Room 1108, Qingyun modern building. NO.43 Bei San Huan Xi Road\r
+                               Beijing  Beijing  100086\r
+                               CN\r
+\r
  4C-E1-73   (hex)               KTC(K-TEL)\r
  D00000-DFFFFF     (base 16)            KTC(K-TEL)\r
                                 98, Sandan-ro 132beon-gil\r
@@ -11633,10 +11792,10 @@ C00000-CFFFFF     (base 16)           Beijing Hamigua Technology Co., Ltd.
                                 BEIJING  BEIJING  100000\r
                                 CN\r
  \r
-4C-E1-73   (hex)                Beijing Sutongwang E-Business Co., Ltd\r
-000000-0FFFFF     (base 16)             Beijing Sutongwang E-Business Co., Ltd\r
-                                Room 1108, Qingyun modern building. NO.43 Bei San Huan Xi Road\r
-                               Beijing  Beijing  100086\r
+38-3A-21   (hex)               Shanghai Greatwall Safety System Co.,Ltd\r
+300000-3FFFFF     (base 16)            Shanghai Greatwall Safety System Co.,Ltd\r
+                               502B - Bloc ,No.168 Luoyang Str\r
+                               ShangHai    201100\r
                                 CN\r
  \r
  38-3A-21   (hex)               Mission Embedded GmbH\r
@@ -11645,18 +11804,18 @@ C00000-CFFFFF     (base 16)           Mission Embedded GmbH
                                 Wien  Wien  1100\r
                                 AT\r
  \r
+F8-1D-78   (hex)               Xperio Labs Limited\r
+200000-2FFFFF     (base 16)            Xperio Labs Limited\r
+                               Unit 3709, 37th Floor, Tower II, Lippo Centre, 89 Queensway, Admiralty,\r
+                               Hong Kong  Hong Kong  Hong Kong\r
+                               HK\r
+\r
  F8-1D-78   (hex)               DACONS\r
  500000-5FFFFF     (base 16)            DACONS\r
                                 90, Centum jungang-ro, Haeundae-gu\r
                                 Busan    48059\r
                                 KR\r
  \r
-38-3A-21   (hex)               Shanghai Greatwall Safety System Co.,Ltd\r
-300000-3FFFFF     (base 16)            Shanghai Greatwall Safety System Co.,Ltd\r
-                               502B - Bloc ,No.168 Luoyang Str\r
-                               ShangHai    201100\r
-                               CN\r
-\r
  F8-1D-78   (hex)               Ophrys Systèmes\r
  900000-9FFFFF     (base 16)            Ophrys Systèmes\r
                                 6 rue Valérien Perrin\r
@@ -11669,18 +11828,18 @@ F8-1D-78   (hex)              Ophrys Systèmes
                                 Göppingen    73033\r
                                 DE\r
  \r
-F8-1D-78   (hex)               Xperio Labs Limited\r
-200000-2FFFFF     (base 16)            Xperio Labs Limited\r
-                               Unit 3709, 37th Floor, Tower II, Lippo Centre, 89 Queensway, Admiralty,\r
-                               Hong Kong  Hong Kong  Hong Kong\r
-                               HK\r
-\r
  70-F8-E7   (hex)               TiVACI CORPORATION PTE LTD\r
  A00000-AFFFFF     (base 16)            TiVACI CORPORATION PTE LTD\r
                                 264A Tanjong Katong Road\r
                                 Singapore    437051\r
                                 SG\r
  \r
+84-E0-F4   (hex)               Orchard Electronics Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Orchard Electronics Co., Ltd.\r
+                               8F,No.2,Lane 235,Bao-Chiao Rd., Hsin-Tien District,\r
+                               New Taipei City    23145\r
+                               TW\r
+\r
  84-E0-F4   (hex)               AIMTRON CORPORATION\r
  C00000-CFFFFF     (base 16)            AIMTRON CORPORATION\r
                                 555 S VERMONT ST\r
@@ -11693,24 +11852,6 @@ C00000-CFFFFF     (base 16)            AIMTRON CORPORATION
                                 Utrecht    3542EG\r
                                 NL\r
  \r
-84-E0-F4   (hex)               Orchard Electronics Co., Ltd.\r
-B00000-BFFFFF     (base 16)            Orchard Electronics Co., Ltd.\r
-                               8F,No.2,Lane 235,Bao-Chiao Rd., Hsin-Tien District,\r
-                               New Taipei City    23145\r
-                               TW\r
-\r
-C0-D3-91   (hex)               SAMSARA NETWORKS INC\r
-E00000-EFFFFF     (base 16)            SAMSARA NETWORKS INC\r
-                               525 York St\r
-                               San Francisco  CA  94110\r
-                               US\r
-\r
-C0-D3-91   (hex)               Alpha Audiotronics, Inc.\r
-A00000-AFFFFF     (base 16)            Alpha Audiotronics, Inc.\r
-                               401 Park Avenue South, Fl. 10\r
-                               New York  NY  10016\r
-                               US\r
-\r
  C0-D3-91   (hex)               Zhinengguo technology company limited\r
  C00000-CFFFFF     (base 16)            Zhinengguo technology company limited\r
                                 Taiyueshangwu building, Luozhuang East road, Haidian District\r
@@ -11723,11 +11864,17 @@ C00000-CFFFFF     (base 16)           Zhinengguo technology company limited
                                 shenzhen    518034\r
                                 CN\r
  \r
-58-E8-76   (hex)               TEM Mobile Limited\r
-900000-9FFFFF     (base 16)            TEM Mobile Limited\r
-                               RM1703, North Block, Cangsong Building, Tairan 6 road, Futian District, Shenzhen.\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+C0-D3-91   (hex)               SAMSARA NETWORKS INC\r
+E00000-EFFFFF     (base 16)            SAMSARA NETWORKS INC\r
+                               525 York St\r
+                               San Francisco  CA  94110\r
+                               US\r
+\r
+C0-D3-91   (hex)               Alpha Audiotronics, Inc.\r
+A00000-AFFFFF     (base 16)            Alpha Audiotronics, Inc.\r
+                               401 Park Avenue South, Fl. 10\r
+                               New York  NY  10016\r
+                               US\r
  \r
  C0-D3-91   (hex)               WiTagg, Inc\r
  500000-5FFFFF     (base 16)            WiTagg, Inc\r
@@ -11735,10 +11882,10 @@ C0-D3-91   (hex)              WiTagg, Inc
                                 Mountain View    94043\r
                                 US\r
  \r
-F0-AC-D7   (hex)               Smart Power Technology Co., Ltd.\r
-D00000-DFFFFF     (base 16)            Smart Power Technology Co., Ltd.\r
-                               Room 102,Unit A,Building 32,No.999,Gaoxinqi Road, High Tech Industrial Development Zone,Nanchang,Jiangxi\r
-                                Nanchang City  Jiangxi Province  330096\r
+58-E8-76   (hex)               TEM Mobile Limited\r
+900000-9FFFFF     (base 16)            TEM Mobile Limited\r
+                               RM1703, North Block, Cangsong Building, Tairan 6 road, Futian District, Shenzhen.\r
+                               Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
  58-E8-76   (hex)               PROBIT SRL\r
@@ -11753,10 +11900,10 @@ A00000-AFFFFF     (base 16)           Groupeer Technologies
                                 Paris  Ile-de-France  75008\r
                                 FR\r
  \r
-28-36-38   (hex)               Shenzhen  Zhi Hua  Creative Technology  Co., Ltd.\r
-900000-9FFFFF     (base 16)            Shenzhen  Zhi Hua  Creative Technology  Co., Ltd.\r
-                               Bao`an District,  Shenzhen Baoan  District  Xixiang  Bao yuan road beach village in the 8-905 room\r
-                               Shenzhen    518000\r
+F0-AC-D7   (hex)               Smart Power Technology Co., Ltd.\r
+D00000-DFFFFF     (base 16)            Smart Power Technology Co., Ltd.\r
+                               Room 102,Unit A,Building 32,No.999,Gaoxinqi Road, High Tech Industrial Development Zone,Nanchang,Jiangxi\r
+                                Nanchang City  Jiangxi Province  330096\r
                                 CN\r
  \r
  5C-F2-86   (hex)               Hangzhou Signwei Electronics Technology Co., Ltd\r
@@ -11771,6 +11918,12 @@ A00000-AFFFFF     (base 16)            Groupeer Technologies
                                 Wiesbaden    65203\r
                                 DE\r
  \r
+28-36-38   (hex)               Shenzhen  Zhi Hua  Creative Technology  Co., Ltd.\r
+900000-9FFFFF     (base 16)            Shenzhen  Zhi Hua  Creative Technology  Co., Ltd.\r
+                               Bao`an District,  Shenzhen Baoan  District  Xixiang  Bao yuan road beach village in the 8-905 room\r
+                               Shenzhen    518000\r
+                               CN\r
+\r
  8C-19-2D   (hex)               ELCO(TIANJIN)ELECTRONICS CO.,LTD.\r
  500000-5FFFFF     (base 16)            ELCO(TIANJIN)ELECTRONICS CO.,LTD.\r
                                 NO. 12 4th XEDA Branch Road,XiQing Economic Development Area\r
@@ -11795,12 +11948,6 @@ D0-D9-4F   (hex)               Hangzhou xiaoben technology co.,Ltd
                                 Hangzhou  Zhejiang  311106\r
                                 CN\r
  \r
-D0-D9-4F   (hex)               mycable GmbH\r
-100000-1FFFFF     (base 16)            mycable GmbH\r
-                               Gartenstrasse 10\r
-                               Neumuenster  Schleswig Holstein  24534\r
-                               DE\r
-\r
  D0-D9-4F   (hex)               MAX Smart Home, LLC\r
  B00000-BFFFFF     (base 16)            MAX Smart Home, LLC\r
                                 3830 Valley Centre Dr, STE 705-852\r
@@ -11813,11 +11960,11 @@ CC-D3-1E   (hex)              KEN A/S
                                 Brobyværk  Denmark  5672\r
                                 DK\r
  \r
-CC-D3-1E   (hex)               Neptune Systems\r
-200000-2FFFFF     (base 16)            Neptune Systems\r
-                               15750 Vineyard Blvd Suite 150\r
-                               MORGAN HILL  CA  95037\r
-                               US\r
+D0-D9-4F   (hex)               mycable GmbH\r
+100000-1FFFFF     (base 16)            mycable GmbH\r
+                               Gartenstrasse 10\r
+                               Neumuenster  Schleswig Holstein  24534\r
+                               DE\r
  \r
  CC-D3-1E   (hex)               SAMIM Co\r
  000000-0FFFFF     (base 16)            SAMIM Co\r
@@ -11825,11 +11972,17 @@ CC-D3-1E   (hex)              SAMIM Co
                                 Tehran  Tehran  1581633939\r
                                 IR\r
  \r
-CC-D3-1E   (hex)               Rondo Burgdorf AG\r
-100000-1FFFFF     (base 16)            Rondo Burgdorf AG\r
-                               Heimiswilstrasse 42\r
-                               Burgdorf    3400\r
-                               CH\r
+C4-7C-8D   (hex)               LYNX INNOVATION LITIMED\r
+100000-1FFFFF     (base 16)            LYNX INNOVATION LITIMED\r
+                               Unit 8A,331 Rosedale Road Albany,North Shore City 0632 Auckland,New Zealand\r
+                               Auckland    0632\r
+                               NZ\r
+\r
+C4-7C-8D   (hex)               Labor Strauss Sicherungsanlagenbau GmbH\r
+E00000-EFFFFF     (base 16)            Labor Strauss Sicherungsanlagenbau GmbH\r
+                               Wiegelestraße 36\r
+                               Vienna    1230\r
+                               AT\r
  \r
  C4-7C-8D   (hex)               ATI\r
  000000-0FFFFF     (base 16)            ATI\r
@@ -11837,24 +11990,24 @@ C4-7C-8D   (hex)              ATI
                                 Boston  MA  02128\r
                                 US\r
  \r
+CC-D3-1E   (hex)               Neptune Systems\r
+200000-2FFFFF     (base 16)            Neptune Systems\r
+                               15750 Vineyard Blvd Suite 150\r
+                               MORGAN HILL  CA  95037\r
+                               US\r
+\r
+CC-D3-1E   (hex)               Rondo Burgdorf AG\r
+100000-1FFFFF     (base 16)            Rondo Burgdorf AG\r
+                               Heimiswilstrasse 42\r
+                               Burgdorf    3400\r
+                               CH\r
+\r
  68-91-D0   (hex)               femrice\r
  600000-6FFFFF     (base 16)            femrice\r
                                 Rm408,Tower B,Jiahu Building,Shangdi 3rd Street,Haidian,Beijing,China\r
                                 Beijing    100085\r
                                 CN\r
  \r
-C4-7C-8D   (hex)               Labor Strauss Sicherungsanlagenbau GmbH\r
-E00000-EFFFFF     (base 16)            Labor Strauss Sicherungsanlagenbau GmbH\r
-                               Wiegelestraße 36\r
-                               Vienna    1230\r
-                               AT\r
-\r
-C4-7C-8D   (hex)               LYNX INNOVATION LITIMED\r
-100000-1FFFFF     (base 16)            LYNX INNOVATION LITIMED\r
-                               Unit 8A,331 Rosedale Road Albany,North Shore City 0632 Auckland,New Zealand\r
-                               Auckland    0632\r
-                               NZ\r
-\r
  68-91-D0   (hex)               Central Railway Manufacturing\r
  000000-0FFFFF     (base 16)            Central Railway Manufacturing\r
                                 8933 Western Way Suite 8\r
@@ -11873,23 +12026,17 @@ E0-B6-F5   (hex)              Shenzhen Xrinda Technology Ltd
                                 Shenzhen  Guangdong  518052\r
                                 CN\r
  \r
-E0-B6-F5   (hex)               BeSTAR Corporation\r
-000000-0FFFFF     (base 16)            BeSTAR Corporation\r
-                               8th F/L, UNIQUEST B/D, 314, Hwangsaeul-ro, Bundang-gu\r
-                               Seongnam-si  Gyeonggi-do  13591\r
-                               KR\r
-\r
  50-FF-99   (hex)               Sea Eagle Optoelectronic Information Technology(Tianjin)co,Ltd\r
  900000-9FFFFF     (base 16)            Sea Eagle Optoelectronic Information Technology(Tianjin)co,Ltd\r
                                 Nankai District\r
                                 Tianjin  Tianjin  300000\r
                                 CN\r
  \r
-98-6D-35   (hex)               DH Mechatronic AG\r
-300000-3FFFFF     (base 16)            DH Mechatronic AG\r
-                               Georg-Sasse-Straße 28-32\r
-                               Ammersbek  Schleswig-Holstein  22949\r
-                               DE\r
+E0-B6-F5   (hex)               BeSTAR Corporation\r
+000000-0FFFFF     (base 16)            BeSTAR Corporation\r
+                               8th F/L, UNIQUEST B/D, 314, Hwangsaeul-ro, Bundang-gu\r
+                               Seongnam-si  Gyeonggi-do  13591\r
+                               KR\r
  \r
  50-FF-99   (hex)               Simicon\r
  000000-0FFFFF     (base 16)            Simicon\r
@@ -11909,24 +12056,18 @@ E0-B6-F5   (hex)              BeSTAR Corporation
                                 Shenzhen  GUANGDONG  518057\r
                                 CN\r
  \r
-7C-47-7C   (hex)               Dspread Technology (Beijing) Inc.\r
-A00000-AFFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
-                               Jingxin Building, 2045 Suite , Chaoyang District\r
-                               Beijing    100027\r
-                               CN\r
-\r
-7C-47-7C   (hex)               BlueSmart Technology Corporation\r
-700000-7FFFFF     (base 16)            BlueSmart Technology Corporation\r
-                               1451 Grant Road, Suite 200\r
-                               Mountain View  CA  94042\r
-                               US\r
-\r
  7C-47-7C   (hex)               Speedifi Inc\r
  D00000-DFFFFF     (base 16)            Speedifi Inc\r
                                 1163 Kassel Terrace\r
                                 Sunnyvale  CA  94089\r
                                 \r
  \r
+98-6D-35   (hex)               DH Mechatronic AG\r
+300000-3FFFFF     (base 16)            DH Mechatronic AG\r
+                               Georg-Sasse-Straße 28-32\r
+                               Ammersbek  Schleswig-Holstein  22949\r
+                               DE\r
+\r
  5C-F2-86   (hex)               CHIPSEN Co.,Ltd.\r
  400000-4FFFFF     (base 16)            CHIPSEN Co.,Ltd.\r
                                 Haan-ro 60\r
@@ -11939,6 +12080,18 @@ D00000-DFFFFF     (base 16)            Speedifi Inc
                                 Taipei  Taiwan  110\r
                                 TW\r
  \r
+7C-47-7C   (hex)               BlueSmart Technology Corporation\r
+700000-7FFFFF     (base 16)            BlueSmart Technology Corporation\r
+                               1451 Grant Road, Suite 200\r
+                               Mountain View  CA  94042\r
+                               US\r
+\r
+7C-47-7C   (hex)               Dspread Technology (Beijing) Inc.\r
+A00000-AFFFFF     (base 16)            Dspread Technology (Beijing) Inc.\r
+                               Jingxin Building, 2045 Suite , Chaoyang District\r
+                               Beijing    100027\r
+                               CN\r
+\r
  38-FD-FE   (hex)               Inspero Inc\r
  600000-6FFFFF     (base 16)            Inspero Inc\r
                                 C101, Ju'Er Hu Tong, Dong Cheng Qu\r
@@ -11957,18 +12110,18 @@ D00000-DFFFFF     (base 16)           FUBA Automotive Electronics GmbH
                                 Nohfelden  Saarland  66625\r
                                 DE\r
  \r
-78-CA-83   (hex)               Konecranes\r
-E00000-EFFFFF     (base 16)            Konecranes\r
-                               Koneenkatu 8\r
-                               Hyvinkää    05801\r
-                               FI\r
-\r
  38-B8-EB   (hex)               Aina Wireless Inc\r
  300000-3FFFFF     (base 16)            Aina Wireless Inc\r
                                 Hub Salo, Tehdaskatu 6\r
                                 Salo    24100\r
                                 FI\r
  \r
+78-CA-83   (hex)               Konecranes\r
+E00000-EFFFFF     (base 16)            Konecranes\r
+                               Koneenkatu 8\r
+                               Hyvinkää    05801\r
+                               FI\r
+\r
  78-CA-83   (hex)               Huatune Technology (Shanghai) Co., Ltd.\r
  500000-5FFFFF     (base 16)            Huatune Technology (Shanghai) Co., Ltd.\r
                                 No.8 Longxi RD\r
@@ -11993,40 +12146,34 @@ B00000-BFFFFF     (base 16)           HABEY USA Inc.
                                 Shenzhen  Guang Dong  518101\r
                                 CN\r
  \r
-1C-88-79   (hex)               Shenzhen Xiaoxi Technology Co., Ltd.\r
-300000-3FFFFF     (base 16)            Shenzhen Xiaoxi Technology Co., Ltd.\r
-                               2F, Wing D, Building 5, Software Industry Base, No.14, Haitian 2nd Road, Nanshan District\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
  1C-88-79   (hex)               SHENZHENFREELINK ELECTRONIC CO.,LTD\r
  500000-5FFFFF     (base 16)            SHENZHENFREELINK ELECTRONIC CO.,LTD\r
                                 3/F,Building A,Quanyongyuan industrial park,Langkou industrial area,Dalang,Bao'an District,Shenzhen,China \r
                                 Shenzhen    518000\r
                                 CN\r
  \r
+1C-88-79   (hex)               Shenzhen Xiaoxi Technology Co., Ltd.\r
+300000-3FFFFF     (base 16)            Shenzhen Xiaoxi Technology Co., Ltd.\r
+                               2F, Wing D, Building 5, Software Industry Base, No.14, Haitian 2nd Road, Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
  1C-87-76   (hex)               Strone Technology\r
  C00000-CFFFFF     (base 16)            Strone Technology\r
                                 13 Ellis Street\r
                                 South Yarra  Victoria  3141\r
                                 AU\r
  \r
-1C-87-76   (hex)               Jiangsu ETERN COMMUNICATION Co.,ltd\r
-A00000-AFFFFF     (base 16)            Jiangsu ETERN COMMUNICATION Co.,ltd\r
-                               888 YUEXIU ROAD, LILI TOWN, WUJIANG DISTRICT, \r
-                               Suzhou  Jiangsu  215211\r
-                               CN\r
-\r
  1C-87-76   (hex)               Zhuhai MYZR Technology Co.,Ltd\r
  500000-5FFFFF     (base 16)            Zhuhai MYZR Technology Co.,Ltd\r
                                 Room 302,Area D2,National Hi-tech Zone,NO.1,Software Park Road\r
                                 Zhuhai    519085\r
                                 CN\r
  \r
-1C-88-79   (hex)               Xingtera China Ltd\r
-900000-9FFFFF     (base 16)            Xingtera China Ltd\r
-                               88 Chenhui Rd Bldg 1 Ste 303\r
-                               Shanghai    201203\r
+1C-87-76   (hex)               Jiangsu ETERN COMMUNICATION Co.,ltd\r
+A00000-AFFFFF     (base 16)            Jiangsu ETERN COMMUNICATION Co.,ltd\r
+                               888 YUEXIU ROAD, LILI TOWN, WUJIANG DISTRICT, \r
+                               Suzhou  Jiangsu  215211\r
                                 CN\r
  \r
  1C-87-79   (hex)               Novetta\r
@@ -12035,18 +12182,24 @@ A00000-AFFFFF     (base 16)           Jiangsu ETERN COMMUNICATION Co.,ltd
                                 McLean  VA  22102\r
                                 US\r
  \r
-84-39-BE   (hex)               Neat S.r.l.\r
-500000-5FFFFF     (base 16)            Neat S.r.l.\r
-                               via Edoardo D'Onofrio 304\r
-                               Rome  ITALY  00155\r
-                               IT\r
-\r
-84-39-BE   (hex)               Shenzhen Ramos Digital Technology Co,.Ltd.\r
-400000-4FFFFF     (base 16)            Shenzhen Ramos Digital Technology Co,.Ltd.\r
-                               3F,Noth Block B, No.2 Kingdee Software Park, Keji South 12th Road, High-Tech Industrial Park, Nanshan District,Shenzhen 518057\r
+1C-88-79   (hex)               Xingtera China Ltd\r
+900000-9FFFFF     (base 16)            Xingtera China Ltd\r
+                               88 Chenhui Rd Bldg 1 Ste 303\r
+                               Shanghai    201203\r
+                               CN\r
+\r
+84-39-BE   (hex)               Shenzhen Ramos Digital Technology Co,.Ltd.\r
+400000-4FFFFF     (base 16)            Shenzhen Ramos Digital Technology Co,.Ltd.\r
+                               3F,Noth Block B, No.2 Kingdee Software Park, Keji South 12th Road, High-Tech Industrial Park, Nanshan District,Shenzhen 518057\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
+84-39-BE   (hex)               Neat S.r.l.\r
+500000-5FFFFF     (base 16)            Neat S.r.l.\r
+                               via Edoardo D'Onofrio 304\r
+                               Rome  ITALY  00155\r
+                               IT\r
+\r
  40-A3-6B   (hex)               National Research Council of Canada\r
  500000-5FFFFF     (base 16)            National Research Council of Canada\r
                                 717 White Lake Road\r
@@ -12077,10 +12230,22 @@ C00000-CFFFFF     (base 16)           Guangzhou Southelectric Power Science Technology De
                                 Guangzhou  Guangdong  510310\r
                                 CN\r
  \r
-A0-3E-6B   (hex)               Jining SmartCity Infotech Co.Ltd.\r
-D00000-DFFFFF     (base 16)            Jining SmartCity Infotech Co.Ltd.\r
-                               Technology Center,Renchen District,\r
-                               Jining  Shandong  272000\r
+CC-1B-E0   (hex)               Laserworld (Switzerland) AG\r
+400000-4FFFFF     (base 16)            Laserworld (Switzerland) AG\r
+                               Kreuzlingerstrasse 5\r
+                               Lengwil  TG  8574\r
+                               CH\r
+\r
+00-55-DA   (hex)               Speechlab\r
+A00000-AFFFFF     (base 16)            Speechlab\r
+                               Gaasterlandstraat 3\r
+                               Amsterdam  NH  1079RH\r
+                               NL\r
+\r
+A0-3E-6B   (hex)               Shenzhen Neostra Technology Co.Ltd\r
+A00000-AFFFFF     (base 16)            Shenzhen Neostra Technology Co.Ltd\r
+                               7th Building,Huaide Cuihai Industrial Park,Fuyong,\r
+                               Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
  00-55-DA   (hex)               KoolPOS Inc.\r
@@ -12089,11 +12254,23 @@ D00000-DFFFFF     (base 16)           Jining SmartCity Infotech Co.Ltd.
                                 Wuxi  Jiangsu  214135\r
                                 CN\r
  \r
-CC-1B-E0   (hex)               Laserworld (Switzerland) AG\r
-400000-4FFFFF     (base 16)            Laserworld (Switzerland) AG\r
-                               Kreuzlingerstrasse 5\r
-                               Lengwil  TG  8574\r
-                               CH\r
+A0-3E-6B   (hex)               Jining SmartCity Infotech Co.Ltd.\r
+D00000-DFFFFF     (base 16)            Jining SmartCity Infotech Co.Ltd.\r
+                               Technology Center,Renchen District,\r
+                               Jining  Shandong  272000\r
+                               CN\r
+\r
+C8-8E-D1   (hex)               Advanced Micro Controls Inc.\r
+B00000-BFFFFF     (base 16)            Advanced Micro Controls Inc.\r
+                               20 Gear Dr.\r
+                               Terryville  CT  06786\r
+                               US\r
+\r
+00-55-DA   (hex)               Nanoleaf\r
+500000-5FFFFF     (base 16)            Nanoleaf\r
+                               162 John Street\r
+                               Toronto  Ontario  M5V2E5\r
+                               CA\r
  \r
  00-55-DA   (hex)               Datapath Limited\r
  400000-4FFFFF     (base 16)            Datapath Limited\r
@@ -12107,24 +12284,6 @@ CC-1B-E0   (hex)               Laserworld (Switzerland) AG
                                 San Jose  California  95128\r
                                 US\r
  \r
-00-55-DA   (hex)               Nanoleaf\r
-500000-5FFFFF     (base 16)            Nanoleaf\r
-                               162 John Street\r
-                               Toronto  Ontario  M5V2E5\r
-                               CA\r
-\r
-00-55-DA   (hex)               Speechlab\r
-A00000-AFFFFF     (base 16)            Speechlab\r
-                               Gaasterlandstraat 3\r
-                               Amsterdam  NH  1079RH\r
-                               NL\r
-\r
-C8-8E-D1   (hex)               Advanced Micro Controls Inc.\r
-B00000-BFFFFF     (base 16)            Advanced Micro Controls Inc.\r
-                               20 Gear Dr.\r
-                               Terryville  CT  06786\r
-                               US\r
-\r
  C8-8E-D1   (hex)               Electronic Controls Design, Inc.\r
  800000-8FFFFF     (base 16)            Electronic Controls Design, Inc.\r
                                 4287-B SE International Way\r
@@ -12137,11 +12296,17 @@ C8-8E-D1   (hex)              Focalcrest, Ltd.
                                 shenzhen  广东  518040\r
                                 CN\r
  \r
-A0-3E-6B   (hex)               Shenzhen Neostra Technology Co.Ltd\r
-A00000-AFFFFF     (base 16)            Shenzhen Neostra Technology Co.Ltd\r
-                               7th Building,Huaide Cuihai Industrial Park,Fuyong,\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+DC-44-27   (hex)               EK-TEAM Elektronik- u. Kunststoff-Technik GmbH\r
+600000-6FFFFF     (base 16)            EK-TEAM Elektronik- u. Kunststoff-Technik GmbH\r
+                               Schnackenburgallee 43\r
+                               Hamburg  Hamburg  22525\r
+                               DE\r
+\r
+DC-44-27   (hex)               EcoGuard AB\r
+700000-7FFFFF     (base 16)            EcoGuard AB\r
+                               Radiatorvägen 11\r
+                               ÖREBRO  -  70227\r
+                               SE\r
  \r
  B0-C5-CA   (hex)               SunTech Medical, Inc.\r
  600000-6FFFFF     (base 16)            SunTech Medical, Inc.\r
@@ -12155,24 +12320,24 @@ DC-44-27   (hex)              Skywave Technology Co,.Ltd.
                                 Beijing  Chaoyang  100107\r
                                 CN\r
  \r
-DC-44-27   (hex)               EK-TEAM Elektronik- u. Kunststoff-Technik GmbH\r
-600000-6FFFFF     (base 16)            EK-TEAM Elektronik- u. Kunststoff-Technik GmbH\r
-                               Schnackenburgallee 43\r
-                               Hamburg  Hamburg  22525\r
-                               DE\r
-\r
-DC-44-27   (hex)               EcoGuard AB\r
-700000-7FFFFF     (base 16)            EcoGuard AB\r
-                               Radiatorvägen 11\r
-                               ÖREBRO  -  70227\r
-                               SE\r
-\r
  B0-C5-CA   (hex)               shanghai University Ding-Tech software Corp.,ltd\r
  400000-4FFFFF     (base 16)            shanghai University Ding-Tech software Corp.,ltd\r
                                 No.9 Lane3,CaoDong Feeder Rd, Xuhui Area,shanghai,China\r
                                 shanghai  shanghai  200235\r
                                 CN\r
  \r
+78-C2-C0   (hex)               RONIX incorporated\r
+200000-2FFFFF     (base 16)            RONIX incorporated\r
+                               904, 648, Seobusaet-gil,\r
+                               SEOUL  GEUMCHEON-GU  153-803\r
+                               KR\r
+\r
+78-C2-C0   (hex)               Ningbo Sanxing Electric Co., Ltd.\r
+300000-3FFFFF     (base 16)            Ningbo Sanxing Electric Co., Ltd.\r
+                               Fengwan No. 17, Cicheng Town,\r
+                               Ningbo  Zhejiang  315033\r
+                               CN\r
+\r
  78-C2-C0   (hex)               Shanghai Hanyi Technologies Co,.Ltd.\r
  C00000-CFFFFF     (base 16)            Shanghai Hanyi Technologies Co,.Ltd.\r
                                 Room 2008, Feidiao International Building\r
@@ -12185,36 +12350,6 @@ C00000-CFFFFF     (base 16)            NANJING PUTIAN TELECOMMUNICATIONS TECHNOLOGY CO.,LT
                                 Nan Jing  Jiang Su  210022\r
                                 CN\r
  \r
-B4-37-D1   (hex)               Nanjing yuekong Intelligent Technology\r
-900000-9FFFFF     (base 16)            Nanjing yuekong Intelligent Technology\r
-                               Room 923, No.2 Building, Deying International Square, No.222, Changhon\r
-                               Nanjing  Jiangsu  210012\r
-                               CN\r
-\r
-78-C2-C0   (hex)               Ningbo Sanxing Electric Co., Ltd.\r
-300000-3FFFFF     (base 16)            Ningbo Sanxing Electric Co., Ltd.\r
-                               Fengwan No. 17, Cicheng Town,\r
-                               Ningbo  Zhejiang  315033\r
-                               CN\r
-\r
-78-C2-C0   (hex)               RONIX incorporated\r
-200000-2FFFFF     (base 16)            RONIX incorporated\r
-                               904, 648, Seobusaet-gil,\r
-                               SEOUL  GEUMCHEON-GU  153-803\r
-                               KR\r
-\r
-74-F8-DB   (hex)               TBM CO., LTD.\r
-C00000-CFFFFF     (base 16)            TBM CO., LTD.\r
-                               A-806, 282 Hakeui-Ro\r
-                               Anyang-City  Gyeonggi-Do  431-810\r
-                               KR\r
-\r
-74-F8-DB   (hex)               Bernard Krone Holding GmbH & Co. KG\r
-E00000-EFFFFF     (base 16)            Bernard Krone Holding GmbH & Co. KG\r
-                               Heinrich-Krone-Str. 10\r
-                               Spelle  Niedersachsen  48480\r
-                               DE\r
-\r
  B4-37-D1   (hex)               Stratom, Inc.\r
  500000-5FFFFF     (base 16)            Stratom, Inc.\r
                                 5375 Western Avenue Suite A\r
@@ -12227,30 +12362,30 @@ B4-37-D1   (hex)              KOMSIS ELEKTRONIK SISTEMLERI SAN. TIC. LTD.STI
                                 ISTANBUL  UMRANIYE  34775\r
                                 TR\r
  \r
+74-F8-DB   (hex)               Capwave Technologies Inc\r
+B00000-BFFFFF     (base 16)            Capwave Technologies Inc\r
+                               1501 Ocean Ave\r
+                               Asbury Park  NJ  07712\r
+                               US\r
+\r
+74-F8-DB   (hex)               Avantree Corporation\r
+900000-9FFFFF     (base 16)            Avantree Corporation\r
+                               41871 Via San Miguel\r
+                               Fremont  CA  94539\r
+                               US\r
+\r
+B4-37-D1   (hex)               Nanjing yuekong Intelligent Technology\r
+900000-9FFFFF     (base 16)            Nanjing yuekong Intelligent Technology\r
+                               Room 923, No.2 Building, Deying International Square, No.222, Changhon\r
+                               Nanjing  Jiangsu  210012\r
+                               CN\r
+\r
  B4-37-D1   (hex)               eInfochips Limited\r
  800000-8FFFFF     (base 16)            eInfochips Limited\r
                                 303 Parishram Building, 5/B Rashmi Society\r
                                 Ahmedabad  Gujarat  380009\r
                                 IN\r
  \r
-54-9A-11   (hex)               Elite Silicon Technology, Inc.\r
-B00000-BFFFFF     (base 16)            Elite Silicon Technology, Inc.\r
-                               5F-B, No.24-2, Idustry E. Road IV.\r
-                               Hsinchu  Taiwan  300\r
-                               TW\r
-\r
-54-9A-11   (hex)               Tite, Inc.\r
-800000-8FFFFF     (base 16)            Tite, Inc.\r
-                               11040 Bollinger Canyon Road, Suite E-107\r
-                               San Ramon  CA  94582\r
-                               US\r
-\r
-74-F8-DB   (hex)               Enercon Technologies\r
-000000-0FFFFF     (base 16)            Enercon Technologies\r
-                               25 Northbrook Drive\r
-                               Gray  ME  04039\r
-                               US\r
-\r
  88-5D-90   (hex)               Unitac Technology Limited\r
  E00000-EFFFFF     (base 16)            Unitac Technology Limited\r
                                 Unit 01, 10/F Carnival Comm. Bldg,\r
@@ -12263,35 +12398,23 @@ A00000-AFFFFF     (base 16)           Shenzhen Speedrun Technologies Co.,Ltd.
                                 ShenZhen  GuangDong  518067\r
                                 CN\r
  \r
-74-F8-DB   (hex)               Capwave Technologies Inc\r
-B00000-BFFFFF     (base 16)            Capwave Technologies Inc\r
-                               1501 Ocean Ave\r
-                               Asbury Park  NJ  07712\r
-                               US\r
-\r
-74-F8-DB   (hex)               Avantree Corporation\r
-900000-9FFFFF     (base 16)            Avantree Corporation\r
-                               41871 Via San Miguel\r
-                               Fremont  CA  94539\r
-                               US\r
-\r
-88-5D-90   (hex)               Creative Sensor Inc.\r
-800000-8FFFFF     (base 16)            Creative Sensor Inc.\r
-                               9F., No.501, Sec. 6, Nanjing E. Rd., Neihu Dist., Taipei City 114, Taiwan (R.O.C.)\r
-                               Taipei City  Taiwan  114\r
-                               TW\r
-\r
-88-5D-90   (hex)               DAIDONG Industrial System Co., Ltd.\r
-200000-2FFFFF     (base 16)            DAIDONG Industrial System Co., Ltd.\r
-                               153B 3L, Namdong Industrial Complex, 729-2, Gojan-dong\r
-                               Incheon  Kyeong-gi  405-822\r
+74-F8-DB   (hex)               TBM CO., LTD.\r
+C00000-CFFFFF     (base 16)            TBM CO., LTD.\r
+                               A-806, 282 Hakeui-Ro\r
+                               Anyang-City  Gyeonggi-Do  431-810\r
                                 KR\r
  \r
-80-7B-85   (hex)               EFCO\r
-500000-5FFFFF     (base 16)            EFCO\r
-                               10F-3, No.270, SEc 4  Chung Hsiao E Rd\r
-                               Taipei    10674\r
-                               TW\r
+74-F8-DB   (hex)               Bernard Krone Holding GmbH & Co. KG\r
+E00000-EFFFFF     (base 16)            Bernard Krone Holding GmbH & Co. KG\r
+                               Heinrich-Krone-Str. 10\r
+                               Spelle  Niedersachsen  48480\r
+                               DE\r
+\r
+74-F8-DB   (hex)               Enercon Technologies\r
+000000-0FFFFF     (base 16)            Enercon Technologies\r
+                               25 Northbrook Drive\r
+                               Gray  ME  04039\r
+                               US\r
  \r
  80-7B-85   (hex)               Zhuhai TOP Intelligence Electric Co., Ltd.\r
  300000-3FFFFF     (base 16)            Zhuhai TOP Intelligence Electric Co., Ltd.\r
@@ -12305,17 +12428,23 @@ B00000-BFFFFF     (base 16)           Capwave Technologies Inc
                                 Hangzhou  Zhejiang  310053\r
                                 CN\r
  \r
+54-9A-11   (hex)               Elite Silicon Technology, Inc.\r
+B00000-BFFFFF     (base 16)            Elite Silicon Technology, Inc.\r
+                               5F-B, No.24-2, Idustry E. Road IV.\r
+                               Hsinchu  Taiwan  300\r
+                               TW\r
+\r
  80-7B-85   (hex)               Quantel USA, Inc.\r
  400000-4FFFFF     (base 16)            Quantel USA, Inc.\r
                                 601 Haggerty Ln.\r
                                 Bozeman  Montana  59715\r
                                 US\r
  \r
-54-9A-11   (hex)               Alfen BV\r
-900000-9FFFFF     (base 16)            Alfen BV\r
-                               Hefbrugweg\r
-                               Almere  Netherlands  1332AP\r
-                               NL\r
+80-7B-85   (hex)               EFCO\r
+500000-5FFFFF     (base 16)            EFCO\r
+                               10F-3, No.270, SEc 4  Chung Hsiao E Rd\r
+                               Taipei    10674\r
+                               TW\r
  \r
  54-9A-11   (hex)               Torrap Design Limited\r
  200000-2FFFFF     (base 16)            Torrap Design Limited\r
@@ -12323,16 +12452,52 @@ B00000-BFFFFF     (base 16)           Capwave Technologies Inc
                                 Hurstville  New South Wales  2220\r
                                 AU\r
  \r
+88-5D-90   (hex)               Creative Sensor Inc.\r
+800000-8FFFFF     (base 16)            Creative Sensor Inc.\r
+                               9F., No.501, Sec. 6, Nanjing E. Rd., Neihu Dist., Taipei City 114, Taiwan (R.O.C.)\r
+                               Taipei City  Taiwan  114\r
+                               TW\r
+\r
+88-5D-90   (hex)               DAIDONG Industrial System Co., Ltd.\r
+200000-2FFFFF     (base 16)            DAIDONG Industrial System Co., Ltd.\r
+                               153B 3L, Namdong Industrial Complex, 729-2, Gojan-dong\r
+                               Incheon  Kyeong-gi  405-822\r
+                               KR\r
+\r
+54-9A-11   (hex)               Tite, Inc.\r
+800000-8FFFFF     (base 16)            Tite, Inc.\r
+                               11040 Bollinger Canyon Road, Suite E-107\r
+                               San Ramon  CA  94582\r
+                               US\r
+\r
+54-9A-11   (hex)               Alfen BV\r
+900000-9FFFFF     (base 16)            Alfen BV\r
+                               Hefbrugweg\r
+                               Almere  Netherlands  1332AP\r
+                               NL\r
+\r
+1C-CA-E3   (hex)               SIREA\r
+A00000-AFFFFF     (base 16)            SIREA\r
+                               69 Rue de L'industrie\r
+                               CASTRES  Midi-Pyrénée  81100\r
+                               FR\r
+\r
+1C-CA-E3   (hex)               TengFeng\r
+500000-5FFFFF     (base 16)            TengFeng\r
+                               3F, 1st Bldg, Yuejun Zhenxing lnd. Park,\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
  64-FB-81   (hex)               Securosys SA\r
  700000-7FFFFF     (base 16)            Securosys SA\r
                                 Technopark 1\r
                                 Zürich  ZH  8005\r
                                 CH\r
  \r
-1C-CA-E3   (hex)               TengFeng\r
-500000-5FFFFF     (base 16)            TengFeng\r
-                               3F, 1st Bldg, Yuejun Zhenxing lnd. Park,\r
-                               Shenzhen  Guangdong  518000\r
+2C-D1-41   (hex)               PIN SHANG LED Co., LTD.\r
+C00000-CFFFFF     (base 16)            PIN SHANG LED Co., LTD.\r
+                               5-6Floor, Huilongda Industrial Park,shuitian community, ShiYan Town,bao’an district,\r
+                               ShenZhen  Guangdong  518108\r
                                 CN\r
  \r
  80-E4-DA   (hex)               Guangzhou Pinzhong Electronic Technology CO., LTD\r
@@ -12347,72 +12512,18 @@ B00000-BFFFFF     (base 16)           Capwave Technologies Inc
                                 Huntingdon  Cambridgeshire  PE29 7DR\r
                                 GB\r
  \r
-1C-CA-E3   (hex)               SIREA\r
-A00000-AFFFFF     (base 16)            SIREA\r
-                               69 Rue de L'industrie\r
-                               CASTRES  Midi-Pyrénée  81100\r
-                               FR\r
-\r
-2C-D1-41   (hex)               PIN SHANG LED Co., LTD.\r
-C00000-CFFFFF     (base 16)            PIN SHANG LED Co., LTD.\r
-                               5-6Floor, Huilongda Industrial Park,shuitian community, ShiYan Town,bao’an district,\r
-                               ShenZhen  Guangdong  518108\r
-                               CN\r
-\r
  2C-D1-41   (hex)               Shanghai RW ELE&TEC CO.,LTD\r
  400000-4FFFFF     (base 16)            Shanghai RW ELE&TEC CO.,LTD\r
                                 10th Floor, No 6, Lane 2500 Xiupu Road, Pudong New District, Shanghai\r
                                 Shanghai  Shanghai  201315\r
                                 CN\r
  \r
-90-C6-82   (hex)               PowerShield Limited\r
-D00000-DFFFFF     (base 16)            PowerShield Limited\r
-                               12 Target Court\r
-                               Glenfield  Auckland  0627\r
-                               NZ\r
-\r
-2C-6A-6F   (hex)               Holjeron\r
-D00000-DFFFFF     (base 16)            Holjeron\r
-                               9524 SW Tualatin Sherwood Rd.\r
-                               Tualatin  OR  97062\r
-                               US\r
-\r
-2C-6A-6F   (hex)               Sensity Systems\r
-C00000-CFFFFF     (base 16)            Sensity Systems\r
-                               480 Oakmead Parkway\r
-                               Sunnyvale  California  94085\r
-                               US\r
-\r
-90-C6-82   (hex)               Neone, Inc.\r
-400000-4FFFFF     (base 16)            Neone, Inc.\r
-                               2001 Travis Heights Blvd\r
-                               Austin  Texas  78704\r
-                               \r
-\r
-98-02-D8   (hex)               Navroom Beijing, China\r
-900000-9FFFFF     (base 16)            Navroom Beijing, China\r
-                               Floor 22, Suite B, Xi'Ao Center, Datun Road\r
-                               Beijing    100101\r
-                               CN\r
-\r
-98-02-D8   (hex)               HySecurity\r
-A00000-AFFFFF     (base 16)            HySecurity\r
-                               6623 South 228th Street\r
-                               Kent  WA  98032\r
-                               US\r
-\r
  98-02-D8   (hex)               Ormazabal Protection&Automation\r
  700000-7FFFFF     (base 16)            Ormazabal Protection&Automation\r
                                 B/Basauntz, 2\r
                                 Igorre  Bizkaia  48140\r
                                 ES\r
  \r
-A0-BB-3E   (hex)               Beijing Techshino Technology Co., Ltd.\r
-B00000-BFFFFF     (base 16)            Beijing Techshino Technology Co., Ltd.\r
-                               8/F, Building No. 1, Huihuang International Plaza, Shangdi 10th Street, Haidian District,\r
-                               Beijing  Beijing  100085\r
-                               CN\r
-\r
  98-02-D8   (hex)               Promicon Elektronik GmbH + Co.KG\r
  D00000-DFFFFF     (base 16)            Promicon Elektronik GmbH + Co.KG\r
                                 Im Michelreis 6\r
@@ -12425,11 +12536,23 @@ B00000-BFFFFF     (base 16)           HANSHIN MEDICAL CO., LTD.
                                 Incheon  Incheon  403-853\r
                                 KR\r
  \r
-98-02-D8   (hex)               Stoerk-Tronic, Stoerk GmbH & Co.KG\r
-000000-0FFFFF     (base 16)            Stoerk-Tronic, Stoerk GmbH & Co.KG\r
-                               Untere Waldplätze 6\r
-                               Stuttgart  Baden-Wuerttemberg  70569\r
-                               DE\r
+98-02-D8   (hex)               Navroom Beijing, China\r
+900000-9FFFFF     (base 16)            Navroom Beijing, China\r
+                               Floor 22, Suite B, Xi'Ao Center, Datun Road\r
+                               Beijing    100101\r
+                               CN\r
+\r
+98-02-D8   (hex)               HySecurity\r
+A00000-AFFFFF     (base 16)            HySecurity\r
+                               6623 South 228th Street\r
+                               Kent  WA  98032\r
+                               US\r
+\r
+90-C6-82   (hex)               PowerShield Limited\r
+D00000-DFFFFF     (base 16)            PowerShield Limited\r
+                               12 Target Court\r
+                               Glenfield  Auckland  0627\r
+                               NZ\r
  \r
  2C-6A-6F   (hex)               TINYCO\r
  400000-4FFFFF     (base 16)            TINYCO\r
@@ -12443,12 +12566,60 @@ B00000-BFFFFF     (base 16)           HANSHIN MEDICAL CO., LTD.
                                 SAN FRANCISCO  CA  94110\r
                                 US\r
  \r
+90-C6-82   (hex)               Neone, Inc.\r
+400000-4FFFFF     (base 16)            Neone, Inc.\r
+                               2001 Travis Heights Blvd\r
+                               Austin  Texas  78704\r
+                               \r
+\r
  2C-6A-6F   (hex)               Cloudproject Generation Srl\r
  300000-3FFFFF     (base 16)            Cloudproject Generation Srl\r
                                 Via Melchiorre Gioia 82\r
                                 MILANO  MI  20125\r
                                 IT\r
  \r
+2C-6A-6F   (hex)               Sensity Systems\r
+C00000-CFFFFF     (base 16)            Sensity Systems\r
+                               480 Oakmead Parkway\r
+                               Sunnyvale  California  94085\r
+                               US\r
+\r
+2C-6A-6F   (hex)               Holjeron\r
+D00000-DFFFFF     (base 16)            Holjeron\r
+                               9524 SW Tualatin Sherwood Rd.\r
+                               Tualatin  OR  97062\r
+                               US\r
+\r
+A0-BB-3E   (hex)               Beijing Techshino Technology Co., Ltd.\r
+B00000-BFFFFF     (base 16)            Beijing Techshino Technology Co., Ltd.\r
+                               8/F, Building No. 1, Huihuang International Plaza, Shangdi 10th Street, Haidian District,\r
+                               Beijing  Beijing  100085\r
+                               CN\r
+\r
+98-02-D8   (hex)               Stoerk-Tronic, Stoerk GmbH & Co.KG\r
+000000-0FFFFF     (base 16)            Stoerk-Tronic, Stoerk GmbH & Co.KG\r
+                               Untere Waldplätze 6\r
+                               Stuttgart  Baden-Wuerttemberg  70569\r
+                               DE\r
+\r
+28-FD-80   (hex)               Galileo, Inc.\r
+100000-1FFFFF     (base 16)            Galileo, Inc.\r
+                               5-3-29 Tokiwagi\r
+                               Ueda  Nagano  386-0027\r
+                               JP\r
+\r
+A0-BB-3E   (hex)               Link Labs\r
+000000-0FFFFF     (base 16)            Link Labs\r
+                               130 Holiday Court, Suite 100\r
+                               Annapolis  Maryland  21401\r
+                               US\r
+\r
+28-FD-80   (hex)               Grandway Technology (Shenzhen) Limited\r
+D00000-DFFFFF     (base 16)            Grandway Technology (Shenzhen) Limited\r
+                               Block 7, Zhu Keng Industrial Zone\r
+                               Ping Shan District  Shenzhen  518118\r
+                               CN\r
+\r
  A0-BB-3E   (hex)               SIMTEC Elektronik GmbH\r
  700000-7FFFFF     (base 16)            SIMTEC Elektronik GmbH\r
                                 Glonner Strasse 5\r
@@ -12461,6 +12632,12 @@ A0-BB-3E   (hex)               SIMTEC Elektronik GmbH
                                 Halmstad  Halland  30272\r
                                 SE\r
  \r
+28-FD-80   (hex)               University of York\r
+700000-7FFFFF     (base 16)            University of York\r
+                               York Neuroimaging Centre, The Biocentre\r
+                               York  Yorkshire  YO10 5NY\r
+                               GB\r
+\r
  2C-26-5F   (hex)               Itus Networks, LLC\r
  800000-8FFFFF     (base 16)            Itus Networks, LLC\r
                                 6319 Nepo Drive\r
@@ -12473,6 +12650,12 @@ A0-BB-3E   (hex)               SIMTEC Elektronik GmbH
                                 Taoyuan    33393\r
                                 TW\r
  \r
+F8-02-78   (hex)               Dueton Systems s.r.o.\r
+D00000-DFFFFF     (base 16)            Dueton Systems s.r.o.\r
+                               Varsavska 290/13\r
+                               Prague 2  Vinohrady  120 00\r
+                               CZ\r
+\r
  2C-26-5F   (hex)               GTA Electronics Co., Ltd.\r
  400000-4FFFFF     (base 16)            GTA Electronics Co., Ltd.\r
                                 9F., No.788, Zhongzheng Rd., Zhonghe Dist.\r
@@ -12485,41 +12668,23 @@ A0-BB-3E   (hex)              SIMTEC Elektronik GmbH
                                 Luckenwalde    14943\r
                                 DE\r
  \r
-28-FD-80   (hex)               Galileo, Inc.\r
-100000-1FFFFF     (base 16)            Galileo, Inc.\r
-                               5-3-29 Tokiwagi\r
-                               Ueda  Nagano  386-0027\r
-                               JP\r
-\r
-A0-BB-3E   (hex)               Link Labs\r
-000000-0FFFFF     (base 16)            Link Labs\r
-                               130 Holiday Court, Suite 100\r
-                               Annapolis  Maryland  21401\r
-                               US\r
-\r
-28-FD-80   (hex)               Grandway Technology (Shenzhen) Limited\r
-D00000-DFFFFF     (base 16)            Grandway Technology (Shenzhen) Limited\r
-                               Block 7, Zhu Keng Industrial Zone\r
-                               Ping Shan District  Shenzhen  518118\r
-                               CN\r
-\r
-28-FD-80   (hex)               University of York\r
-700000-7FFFFF     (base 16)            University of York\r
-                               York Neuroimaging Centre, The Biocentre\r
-                               York  Yorkshire  YO10 5NY\r
-                               GB\r
-\r
  F8-02-78   (hex)               Luxul Technology Inc\r
  A00000-AFFFFF     (base 16)            Luxul Technology Inc\r
                                 2F., No.3, Yuandong Rd\r
                                 New Taipei City  Taiwan  220\r
                                 TW\r
  \r
-0C-EF-AF   (hex)               Rotel\r
-900000-9FFFFF     (base 16)            Rotel\r
-                               43-59 Queens Road East\r
-                               Wanchai  Hong Kong  00000\r
-                               HK\r
+A4-4F-29   (hex)               DGC Access AB\r
+400000-4FFFFF     (base 16)            DGC Access AB\r
+                               Sveavägen 145\r
+                               Stockholm  Stockholms Län  113 46\r
+                               SE\r
+\r
+A4-4F-29   (hex)               Selektro Power Inc\r
+600000-6FFFFF     (base 16)            Selektro Power Inc\r
+                               3610 NW 115th Ave\r
+                               Doral  Florida  33178\r
+                               US\r
  \r
  0C-EF-AF   (hex)               Firmware Design AS\r
  600000-6FFFFF     (base 16)            Firmware Design AS\r
@@ -12527,23 +12692,29 @@ A00000-AFFFFF     (base 16)           Luxul Technology Inc
                                 Hafrsfjord  Rogaland  N-4044\r
                                 NO\r
  \r
+0C-EF-AF   (hex)               Rotel\r
+900000-9FFFFF     (base 16)            Rotel\r
+                               43-59 Queens Road East\r
+                               Wanchai  Hong Kong  00000\r
+                               HK\r
+\r
+0C-EF-AF   (hex)               Engineering Center ENERGOSERVICE\r
+300000-3FFFFF     (base 16)            Engineering Center ENERGOSERVICE\r
+                               Kotlasskaya 26\r
+                               Arkhangelsk  Arkhangelsk region  163046\r
+                               RU\r
+\r
  F8-02-78   (hex)               Reason Tecnologia SA\r
  100000-1FFFFF     (base 16)            Reason Tecnologia SA\r
                                  Rua Joaquim Carneiro, 192\r
                                 Florianópolis  Santa Catarina  8811120\r
                                 BR\r
  \r
-F8-02-78   (hex)               Dueton Systems s.r.o.\r
-D00000-DFFFFF     (base 16)            Dueton Systems s.r.o.\r
-                               Varsavska 290/13\r
-                               Prague 2  Vinohrady  120 00\r
-                               CZ\r
-\r
-A4-4F-29   (hex)               LUCEOR\r
-200000-2FFFFF     (base 16)            LUCEOR\r
-                               2 Place Jules Gevelot\r
-                               ISSY LES MOULINEAUX  IDF  92138\r
-                               FR\r
+3C-39-E7   (hex)               chipsguide technology Co.,LTD\r
+B00000-BFFFFF     (base 16)            chipsguide technology Co.,LTD\r
+                               NanGuang road, DongHua design house 758 room\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
  \r
  A4-4F-29   (hex)               Olssen B.V.\r
  100000-1FFFFF     (base 16)            Olssen B.V.\r
@@ -12551,29 +12722,17 @@ A4-4F-29   (hex)              Olssen B.V.
                                 Hardinxveld-Giessendam  Zuid-Hollland  3371KJ\r
                                 NL\r
  \r
-A4-4F-29   (hex)               DGC Access AB\r
-400000-4FFFFF     (base 16)            DGC Access AB\r
-                               Sveavägen 145\r
-                               Stockholm  Stockholms Län  113 46\r
-                               SE\r
-\r
-A4-4F-29   (hex)               Selektro Power Inc\r
-600000-6FFFFF     (base 16)            Selektro Power Inc\r
-                               3610 NW 115th Ave\r
-                               Doral  Florida  33178\r
-                               US\r
-\r
  A4-4F-29   (hex)               Shanghai KuanYu Industrial Network Equipment Co.,Ltd\r
  500000-5FFFFF     (base 16)            Shanghai KuanYu Industrial Network Equipment Co.,Ltd\r
                                 15/F,No.3003,Baoyang Road, Baoshan District,\r
                                   Shanghai  201901\r
                                 CN\r
  \r
-3C-39-E7   (hex)               chipsguide technology Co.,LTD\r
-B00000-BFFFFF     (base 16)            chipsguide technology Co.,LTD\r
-                               NanGuang road, DongHua design house 758 room\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+A4-4F-29   (hex)               LUCEOR\r
+200000-2FFFFF     (base 16)            LUCEOR\r
+                               2 Place Jules Gevelot\r
+                               ISSY LES MOULINEAUX  IDF  92138\r
+                               FR\r
  \r
  3C-39-E7   (hex)               ELSA Japan Inc.\r
  300000-3FFFFF     (base 16)            ELSA Japan Inc.\r
@@ -12581,17 +12740,11 @@ B00000-BFFFFF     (base 16)           chipsguide technology Co.,LTD
                                 Minato-ku,  Tokyo  105-0014\r
                                 JP\r
  \r
-0C-EF-AF   (hex)               Engineering Center ENERGOSERVICE\r
-300000-3FFFFF     (base 16)            Engineering Center ENERGOSERVICE\r
-                               Kotlasskaya 26\r
-                               Arkhangelsk  Arkhangelsk region  163046\r
-                               RU\r
-\r
-10-07-23   (hex)               Beijing Assem Technology Co., ltd\r
-100000-1FFFFF     (base 16)            Beijing Assem Technology Co., ltd\r
-                               Floor 6, Jinglong International Plaza,\r
-                               Chaoyang District  Beijing  100107\r
-                               CN\r
+10-07-23   (hex)               ESTONE TECHNOLOGY INC\r
+600000-6FFFFF     (base 16)            ESTONE TECHNOLOGY INC\r
+                               21015 Commerce Point Drive Walnut, CA 91789\r
+                               Los Angeles  California  91789\r
+                               US\r
  \r
  D0-22-12   (hex)               GNS-GmbH\r
  A00000-AFFFFF     (base 16)            GNS-GmbH\r
@@ -12605,11 +12758,17 @@ C00000-CFFFFF     (base 16)           Xperio Labs Ltd.
                                 Hong Kong  Hong Kong  HONG KONG\r
                                 HK\r
  \r
-10-07-23   (hex)               ESTONE TECHNOLOGY INC\r
-600000-6FFFFF     (base 16)            ESTONE TECHNOLOGY INC\r
-                               21015 Commerce Point Drive Walnut, CA 91789\r
-                               Los Angeles  California  91789\r
-                               US\r
+10-07-23   (hex)               Beijing Assem Technology Co., ltd\r
+100000-1FFFFF     (base 16)            Beijing Assem Technology Co., ltd\r
+                               Floor 6, Jinglong International Plaza,\r
+                               Chaoyang District  Beijing  100107\r
+                               CN\r
+\r
+E8-18-63   (hex)               ARTECH SOLUTION CO.,LTD\r
+600000-6FFFFF     (base 16)            ARTECH SOLUTION CO.,LTD\r
+                               470/11 Pattanakarn Rd.,Suanluang，Bkk.10250 Thailand\r
+                               Bangkok  Bangkok  10250\r
+                               TH\r
  \r
  E8-18-63   (hex)               DongGuan Pengxun Electronics Technology Co., Ltd.\r
  300000-3FFFFF     (base 16)            DongGuan Pengxun Electronics Technology Co., Ltd.\r
@@ -12623,34 +12782,46 @@ E8-18-63   (hex)              Guangzhou Tianyi Electronics Co., Ltd
                                  Guangzhou  Guangdong,  511430,\r
                                 CN\r
  \r
-B8-D8-12   (hex)               ZheJiang FangTai Electirc Co., Ltd\r
-E00000-EFFFFF     (base 16)            ZheJiang FangTai Electirc Co., Ltd\r
-                               B11 Block, Science and Technology Park\r
-                               Hangzhou  ZheJiang  310024\r
+E8-18-63   (hex)               JDM Mobile Internet Solution(Shanghai) Co., Ltd.\r
+A00000-AFFFFF     (base 16)            JDM Mobile Internet Solution(Shanghai) Co., Ltd.\r
+                               2F, Building D, BenQ Plaza, No.207\r
+                               Shanghai  Shanghai  200335\r
                                 CN\r
  \r
-E8-18-63   (hex)               DigiMagus Technology (Shenzhen) Co., Ltd\r
-000000-0FFFFF     (base 16)            DigiMagus Technology (Shenzhen) Co., Ltd\r
-                               1206, Shenzhen University-town Business Park, Lishan Road\r
-                               ShenZhen  GuangDong  518055\r
+B8-D8-12   (hex)               XIAMEN XINDECO LTD.\r
+500000-5FFFFF     (base 16)            XIAMEN XINDECO LTD.\r
+                               5F.,XINXI BLDG.,HULI\r
+                               Xiamen  Fujian  361000\r
                                 CN\r
  \r
+B8-D8-12   (hex)               iModesty Technology Corp.\r
+300000-3FFFFF     (base 16)            iModesty Technology Corp.\r
+                               3F-1, No.76, Sec.2 Jiafeng S.Rd.,\r
+                               Zhubei County  Taiwan  302\r
+                               TW\r
+\r
  74-E1-4A   (hex)               aritec gmbh\r
  800000-8FFFFF     (base 16)            aritec gmbh\r
                                 Vorstadtgasse 15\r
                                 Maienfeld  Outside U.S./Canada  7304\r
                                 CH\r
  \r
-B8-D8-12   (hex)               iModesty Technology Corp.\r
-300000-3FFFFF     (base 16)            iModesty Technology Corp.\r
-                               3F-1, No.76, Sec.2 Jiafeng S.Rd.,\r
-                               Zhubei County  Taiwan  302\r
+74-E1-4A   (hex)               AStar Design Service Technologies Co., Ltd.\r
+A00000-AFFFFF     (base 16)            AStar Design Service Technologies Co., Ltd.\r
+                               3F, No219-1, Jianguo Rd. Sindian Dist.\r
+                               New Taipei City  Taiwan  23142\r
                                 TW\r
  \r
-E8-18-63   (hex)               JDM Mobile Internet Solution(Shanghai) Co., Ltd.\r
-A00000-AFFFFF     (base 16)            JDM Mobile Internet Solution(Shanghai) Co., Ltd.\r
-                               2F, Building D, BenQ Plaza, No.207\r
-                               Shanghai  Shanghai  200335\r
+E8-18-63   (hex)               DigiMagus Technology (Shenzhen) Co., Ltd\r
+000000-0FFFFF     (base 16)            DigiMagus Technology (Shenzhen) Co., Ltd\r
+                               1206, Shenzhen University-town Business Park, Lishan Road\r
+                               ShenZhen  GuangDong  518055\r
+                               CN\r
+\r
+B8-D8-12   (hex)               ZheJiang FangTai Electirc Co., Ltd\r
+E00000-EFFFFF     (base 16)            ZheJiang FangTai Electirc Co., Ltd\r
+                               B11 Block, Science and Technology Park\r
+                               Hangzhou  ZheJiang  310024\r
                                 CN\r
  \r
  B8-D8-12   (hex)               Entotem LTD\r
@@ -12659,36 +12830,18 @@ B8-D8-12   (hex)              Entotem LTD
                                 Newbury  Berks  RG20 8SR\r
                                 GB\r
  \r
-B8-D8-12   (hex)               XIAMEN XINDECO LTD.\r
-500000-5FFFFF     (base 16)            XIAMEN XINDECO LTD.\r
-                               5F.,XINXI BLDG.,HULI\r
-                               Xiamen  Fujian  361000\r
-                               CN\r
-\r
-74-E1-4A   (hex)               AStar Design Service Technologies Co., Ltd.\r
-A00000-AFFFFF     (base 16)            AStar Design Service Technologies Co., Ltd.\r
-                               3F, No219-1, Jianguo Rd. Sindian Dist.\r
-                               New Taipei City  Taiwan  23142\r
+BC-66-41   (hex)               Lucent Trans Electronics Co., Ltd\r
+E00000-EFFFFF     (base 16)            Lucent Trans Electronics Co., Ltd\r
+                               9F-1, NO.16, CHIEN PAH RD.,\r
+                               NEW TAIPEI CITY    23511\r
                                 TW\r
  \r
-E8-18-63   (hex)               ARTECH SOLUTION CO.,LTD\r
-600000-6FFFFF     (base 16)            ARTECH SOLUTION CO.,LTD\r
-                               470/11 Pattanakarn Rd.,Suanluang，Bkk.10250 Thailand\r
-                               Bangkok  Bangkok  10250\r
-                               TH\r
-\r
  BC-66-41   (hex)               Shenzhen Crave Communication Co.,ltd\r
  C00000-CFFFFF     (base 16)            Shenzhen Crave Communication Co.,ltd\r
                                 8th Block, Dongfangming Industry Park\r
                                 Shenzhen  GuangDong  518000\r
                                 CN\r
  \r
-BC-66-41   (hex)               Lucent Trans Electronics Co., Ltd\r
-E00000-EFFFFF     (base 16)            Lucent Trans Electronics Co., Ltd\r
-                               9F-1, NO.16, CHIEN PAH RD.,\r
-                               NEW TAIPEI CITY    23511\r
-                               TW\r
-\r
  E4-95-6E   (hex)               eZeLink LLC\r
  900000-9FFFFF     (base 16)            eZeLink LLC\r
                                 Office 1104, Aspect Tower, Executive Towers, Business Bay\r
@@ -12701,50 +12854,41 @@ BC-66-41   (hex)              VSN Mobil
                                 Fort Lauderdale  Florida  33304\r
                                 US\r
  \r
-58-FC-DB   (hex)               SWARCO TRAFFIC SYSTEMS GMBH\r
-B00000-BFFFFF     (base 16)            SWARCO TRAFFIC SYSTEMS GMBH\r
-                               Kelterstr. 67\r
-                               Unterensingen  Baden-Württemberg  72669\r
-                               DE\r
-\r
-B0-1F-81   (hex)               TAIWAN Anjie Electronics Co.,Ltd.\r
-D00000-DFFFFF     (base 16)            TAIWAN Anjie Electronics Co.,Ltd.\r
-                               One 7th Floor,No.125,Lane 235, Pao Chiao Xindian District\r
-                               New Taipei City  Xindian District  231\r
-                               TW\r
-\r
  BC-66-41   (hex)               Sidus Novum Sp. z o. o.\r
  B00000-BFFFFF     (base 16)            Sidus Novum Sp. z o. o.\r
                                 Ul. Ogrodowa 3B/203\r
                                 Zielona Góra  Lubuskie  65462\r
                                 PL\r
  \r
-58-FC-DB   (hex)               Xmodus Systems GmbH\r
-A00000-AFFFFF     (base 16)            Xmodus Systems GmbH\r
-                               Reiherstrasse 2\r
-                               Haiger  Hessen  35708\r
-                               DE\r
-\r
  B0-1F-81   (hex)               SHENZHEN GRID TECHNOLOGY CO.,LTD\r
  500000-5FFFFF     (base 16)            SHENZHEN GRID TECHNOLOGY CO.,LTD\r
                                 6thfloor,jinda Technology Center,No.8 of kefeng Road ,Science and Technology Park,NanshanDist,Shenzhen\r
                                 shenzhen  guangdong  518054\r
                                 CN\r
  \r
-B0-1F-81   (hex)               Private\r
-200000-2FFFFF     (base 16)            Private\r
+58-FC-DB   (hex)               SWARCO TRAFFIC SYSTEMS GMBH\r
+B00000-BFFFFF     (base 16)            SWARCO TRAFFIC SYSTEMS GMBH\r
+                               Kelterstr. 67\r
+                               Unterensingen  Baden-Württemberg  72669\r
+                               DE\r
  \r
-F4-0E-11   (hex)               Shenzhen Grandsun Electronic Co.,Ltd.\r
-700000-7FFFFF     (base 16)            Shenzhen Grandsun Electronic Co.,Ltd.\r
-                               Gaoqiao Industrial Zone,Baishitang Village,\r
-                               Shenzhen  Guangdong  518116\r
-                               CN\r
+B0-1F-81   (hex)               Sound United\r
+300000-3FFFFF     (base 16)            Sound United\r
+                               11433 Cronridge Drive\r
+                               Owings Mills  Maryland  21117\r
+                               US\r
  \r
-F4-0E-11   (hex)               Elektronika Naglic d.o.o.\r
-E00000-EFFFFF     (base 16)            Elektronika Naglic d.o.o.\r
-                               Goricica pri Ihanu 44\r
-                               Domzale    1230\r
-                               SI\r
+58-FC-DB   (hex)               Xmodus Systems GmbH\r
+A00000-AFFFFF     (base 16)            Xmodus Systems GmbH\r
+                               Reiherstrasse 2\r
+                               Haiger  Hessen  35708\r
+                               DE\r
+\r
+B0-1F-81   (hex)               TAIWAN Anjie Electronics Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            TAIWAN Anjie Electronics Co.,Ltd.\r
+                               One 7th Floor,No.125,Lane 235, Pao Chiao Xindian District\r
+                               New Taipei City  Xindian District  231\r
+                               TW\r
  \r
  F4-0E-11   (hex)               NIHON MEGA LOGIC CO.,LTD.\r
  C00000-CFFFFF     (base 16)            NIHON MEGA LOGIC CO.,LTD.\r
@@ -12752,18 +12896,6 @@ C00000-CFFFFF     (base 16)            NIHON MEGA LOGIC CO.,LTD.
                                 Koutou-ku  Tokyo  136-0071\r
                                 JP\r
  \r
-B0-1F-81   (hex)               Sound United\r
-300000-3FFFFF     (base 16)            Sound United\r
-                               11433 Cronridge Drive\r
-                               Owings Mills  Maryland  21117\r
-                               US\r
-\r
-F4-0E-11   (hex)               E-SONG\r
-500000-5FFFFF     (base 16)            E-SONG\r
-                               BUSAN TECHNOPARK Head office & Factory: Unit 102\r
-                               Busan  N/A  618-230\r
-                               KR\r
-\r
  F4-0E-11   (hex)               Shenzhen headsun technology\r
  300000-3FFFFF     (base 16)            Shenzhen headsun technology\r
                                 3 Floor, C Building, NanYuan Industrial\r
@@ -12776,18 +12908,51 @@ C00000-CFFFFF     (base 16)           Swiss Electronic (Shenzhen) Co., Ltd
                                 Shenzhen  Guangdong  518026\r
                                 CN\r
  \r
+B0-1F-81   (hex)               Private\r
+200000-2FFFFF     (base 16)            Private\r
+\r
  14-1F-BA   (hex)               Shenzhen CATIC Information Technology Industry Co.,Ltd\r
  800000-8FFFFF     (base 16)            Shenzhen CATIC Information Technology Industry Co.,Ltd\r
                                 3/FL, Block 1, Shenzhen Software Park, No.2, Gaoxin Middle Street,Nanshan\r
                                 Shen Zhen  Guang Dong  518057\r
                                 CN\r
  \r
+F4-0E-11   (hex)               Shenzhen Grandsun Electronic Co.,Ltd.\r
+700000-7FFFFF     (base 16)            Shenzhen Grandsun Electronic Co.,Ltd.\r
+                               Gaoqiao Industrial Zone,Baishitang Village,\r
+                               Shenzhen  Guangdong  518116\r
+                               CN\r
+\r
+F4-0E-11   (hex)               E-SONG\r
+500000-5FFFFF     (base 16)            E-SONG\r
+                               BUSAN TECHNOPARK Head office & Factory: Unit 102\r
+                               Busan  N/A  618-230\r
+                               KR\r
+\r
  14-1F-BA   (hex)               Winsonic Electronics Co., Ltd.\r
  A00000-AFFFFF     (base 16)            Winsonic Electronics Co., Ltd.\r
                                 No. 290-1, Wen Chung Rd.,\r
                                 Taoyuan City    330\r
                                 TW\r
  \r
+F4-0E-11   (hex)               Elektronika Naglic d.o.o.\r
+E00000-EFFFFF     (base 16)            Elektronika Naglic d.o.o.\r
+                               Goricica pri Ihanu 44\r
+                               Domzale    1230\r
+                               SI\r
+\r
+BC-34-00   (hex)               Parlay Labs dba Highfive\r
+C00000-CFFFFF     (base 16)            Parlay Labs dba Highfive\r
+                               471 Emerson St.\r
+                               Palo Alto  California  94301\r
+                               US\r
+\r
+7C-70-BC   (hex)               XD-GE Automation CO.,LTD\r
+100000-1FFFFF     (base 16)            XD-GE Automation CO.,LTD\r
+                               101# Fengcheng 6 Road\r
+                               Xi'an  ShanXi  710016\r
+                               CN\r
+\r
  14-1F-BA   (hex)               GloQuad\r
  100000-1FFFFF     (base 16)            GloQuad\r
                                 301 Biz Incubation Center, GSBC\r
@@ -12800,16 +12965,16 @@ A00000-AFFFFF     (base 16)           Ametek VIS
                                 Grand Junction  CO  81503\r
                                 US\r
  \r
-BC-34-00   (hex)               Parlay Labs dba Highfive\r
-C00000-CFFFFF     (base 16)            Parlay Labs dba Highfive\r
-                               471 Emerson St.\r
-                               Palo Alto  California  94301\r
-                               US\r
+A4-3B-FA   (hex)               Plus One Japan Ltd.\r
+A00000-AFFFFF     (base 16)            Plus One Japan Ltd.\r
+                               Storia Akasaka 410,\r
+                               Minato-ku  Tokyo  1080052\r
+                               JP\r
  \r
-7C-70-BC   (hex)               XD-GE Automation CO.,LTD\r
-100000-1FFFFF     (base 16)            XD-GE Automation CO.,LTD\r
-                               101# Fengcheng 6 Road\r
-                               Xi'an  ShanXi  710016\r
+A4-3B-FA   (hex)               SHANGHAI XIETONG TECHNOLOGY INC.\r
+C00000-CFFFFF     (base 16)            SHANGHAI XIETONG TECHNOLOGY INC.\r
+                               423 Wuning Road,Shanghai\r
+                                 Shanghai  200063\r
                                 CN\r
  \r
  A4-3B-FA   (hex)               ALSTOM Strongwish (Shenzhen) Co., Ltd\r
@@ -12830,24 +12995,6 @@ BC-34-00   (hex)               IPLINK Technology Corp
                                 New Taipei City    23582\r
                                 TW\r
  \r
-A4-3B-FA   (hex)               Plus One Japan Ltd.\r
-A00000-AFFFFF     (base 16)            Plus One Japan Ltd.\r
-                               Storia Akasaka 410,\r
-                               Minato-ku  Tokyo  1080052\r
-                               JP\r
-\r
-A4-3B-FA   (hex)               SHANGHAI XIETONG TECHNOLOGY INC.\r
-C00000-CFFFFF     (base 16)            SHANGHAI XIETONG TECHNOLOGY INC.\r
-                               423 Wuning Road,Shanghai\r
-                                 Shanghai  200063\r
-                               CN\r
-\r
-D0-76-50   (hex)               DAIKEN AUTOMACAO LTDA\r
-100000-1FFFFF     (base 16)            DAIKEN AUTOMACAO LTDA\r
-                                AVENIDA SAO GABRIEL,481\r
-                               COLOMBO  PARANA  83404000\r
-                               BR\r
-\r
  D0-76-50   (hex)               PelKorea\r
  B00000-BFFFFF     (base 16)            PelKorea\r
                                 60, Haan-ro\r
@@ -12866,17 +13013,11 @@ A4-3B-FA   (hex)              Powell Industries
                                 North Vancouver  British Columbia  V7M 3N2\r
                                 \r
  \r
-D0-76-50   (hex)               ENCORED Technologies, Inc.\r
-700000-7FFFFF     (base 16)            ENCORED Technologies, Inc.\r
-                               8F KTS, 215 Bongeunsa-ro\r
-                                 Seoul  135-831\r
-                               KR\r
-\r
-74-19-F8   (hex)               Trend-tech Technology Co., Limited\r
-100000-1FFFFF     (base 16)            Trend-tech Technology Co., Limited\r
-                               NO. 609, Noble Plaza, Qianjin YiLu\r
-                               Shenzhen  Guangdong  518101\r
-                               CN\r
+D0-76-50   (hex)               DAIKEN AUTOMACAO LTDA\r
+100000-1FFFFF     (base 16)            DAIKEN AUTOMACAO LTDA\r
+                                AVENIDA SAO GABRIEL,481\r
+                               COLOMBO  PARANA  83404000\r
+                               BR\r
  \r
  74-19-F8   (hex)               Cloudvue Technologies Corporation\r
  400000-4FFFFF     (base 16)            Cloudvue Technologies Corporation\r
@@ -12890,10 +13031,16 @@ D0-76-50   (hex)              ENCORED Technologies, Inc.
                                 Marlborough  CT  06447\r
                                 US\r
  \r
-4C-4B-F9   (hex)               Shenzhen HommPro Technology Co.,Ltd\r
-200000-2FFFFF     (base 16)            Shenzhen HommPro Technology Co.,Ltd\r
-                               5F,Building B,Zhengchangda Digital Technology Park,Jian'an Road,Tangwei community,Fuhai street,Bao'an District\r
-                               Shenzhen  GuangDong  518000\r
+D0-76-50   (hex)               ENCORED Technologies, Inc.\r
+700000-7FFFFF     (base 16)            ENCORED Technologies, Inc.\r
+                               8F KTS, 215 Bongeunsa-ro\r
+                                 Seoul  135-831\r
+                               KR\r
+\r
+74-19-F8   (hex)               Trend-tech Technology Co., Limited\r
+100000-1FFFFF     (base 16)            Trend-tech Technology Co., Limited\r
+                               NO. 609, Noble Plaza, Qianjin YiLu\r
+                               Shenzhen  Guangdong  518101\r
                                 CN\r
  \r
  40-11-75   (hex)               Beijing Hexinruitong Electric Power Technology Co., Ltd.\r
@@ -12908,10 +13055,10 @@ D0-76-50   (hex)              ENCORED Technologies, Inc.
                                 Guangzhou  Guangdong  510663\r
                                 CN\r
  \r
-40-11-75   (hex)               NanJing HuaStart Network Technology Co.,Ltd.\r
-D00000-DFFFFF     (base 16)            NanJing HuaStart Network Technology Co.,Ltd.\r
-                               Room 568,Longmian Road,Jiangning District\r
-                               Nanjing   Jiang Su  210000\r
+4C-4B-F9   (hex)               Shenzhen HommPro Technology Co.,Ltd\r
+200000-2FFFFF     (base 16)            Shenzhen HommPro Technology Co.,Ltd\r
+                               5F,Building B,Zhengchangda Digital Technology Park,Jian'an Road,Tangwei community,Fuhai street,Bao'an District\r
+                               Shenzhen  GuangDong  518000\r
                                 CN\r
  \r
  40-11-75   (hex)               Chongqing IQIYI Intelligence Technology Co., Ltd.\r
@@ -12920,11 +13067,11 @@ B00000-BFFFFF     (base 16)           Chongqing IQIYI Intelligence Technology Co., Ltd.
                                 Beijing  Beijing  100027\r
                                 CN\r
  \r
-10-DC-B6   (hex)               Annapurna labs\r
-400000-4FFFFF     (base 16)            Annapurna labs\r
-                               Matam Scientific Industries Center,   Building 8.2\r
-                               Mail box 15123  Haifa  3508409\r
-                               IL\r
+40-11-75   (hex)               NanJing HuaStart Network Technology Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            NanJing HuaStart Network Technology Co.,Ltd.\r
+                               Room 568,Longmian Road,Jiangning District\r
+                               Nanjing   Jiang Su  210000\r
+                               CN\r
  \r
  40-11-75   (hex)               disguise Technologies Limited\r
  C00000-CFFFFF     (base 16)            disguise Technologies Limited\r
@@ -12932,6 +13079,84 @@ C00000-CFFFFF     (base 16)            disguise Technologies Limited
                                 London    SE1 1PP\r
                                 GB\r
  \r
+10-DC-B6   (hex)               CAL-COMP INDUSTRIA E COMERCIO DE ELETRONICOS E INFORMATICA LTDA\r
+200000-2FFFFF     (base 16)            CAL-COMP INDUSTRIA E COMERCIO DE ELETRONICOS E INFORMATICA LTDA\r
+                               AVENIDA TORQUATO TAPAJOS, 7503 TARUMA GALPAO 2 - CNPJ: 07.200.194/0003-80\r
+                               MANAUS  AMAZONAS  69041-025\r
+                               BR\r
+\r
+10-DC-B6   (hex)               Prolan Zrt.\r
+600000-6FFFFF     (base 16)            Prolan Zrt.\r
+                               Szentendrei út 1-3.\r
+                               Budakalasz    2011\r
+                               HU\r
+\r
+10-DC-B6   (hex)               Annapurna labs\r
+400000-4FFFFF     (base 16)            Annapurna labs\r
+                               Matam Scientific Industries Center,   Building 8.2\r
+                               Mail box 15123  Haifa  3508409\r
+                               IL\r
+\r
+10-DC-B6   (hex)               Shenzhen Sunwoda intelligent hardware Co.,Ltd\r
+E00000-EFFFFF     (base 16)            Shenzhen Sunwoda intelligent hardware Co.,Ltd\r
+                               No.6-6,Yan Shan Rd.,Baoan District,Shenzhen City,China\r
+                               Shenzhen  Guangdong  518105\r
+                               CN\r
+\r
+54-A4-93   (hex)               Shenzhen C & D Electronics Co., Ltd.\r
+400000-4FFFFF     (base 16)            Shenzhen C & D Electronics Co., Ltd.\r
+                               9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+10-DC-B6   (hex)               Sanofi (Beijing) Pharmaceutical Co., Ltd.\r
+800000-8FFFFF     (base 16)            Sanofi (Beijing) Pharmaceutical Co., Ltd.\r
+                               No.7, Xingsheng Street, Beijing Economic and Technological Development Zone\r
+                               Beijing  Beijing  100176\r
+                               CN\r
+\r
+54-A4-93   (hex)               AUSOUNDS INTELLIGENCE, LLC\r
+500000-5FFFFF     (base 16)            AUSOUNDS INTELLIGENCE, LLC\r
+                               929 108TH AVE NE STE 1200, BELLEVUE, WA, 98004-4787, UNITED STATES\r
+                               BELLEVUE  WA  98004\r
+                               US\r
+\r
+54-A4-93   (hex)               ASSEM TECHNOLOGY CO.,LTD.\r
+D00000-DFFFFF     (base 16)            ASSEM TECHNOLOGY CO.,LTD.\r
+                               No. 17, Minquan St., Tucheng Dist.,\r
+                               New Taipei City  Taiwan (R.O.C.)  236\r
+                               TW\r
+\r
+04-D1-6E   (hex)               Elotec Fischer Elektronik GmbH\r
+D00000-DFFFFF     (base 16)            Elotec Fischer Elektronik GmbH\r
+                               Nordgaustraße 20\r
+                               Furth im Wald  Bavaria  93437\r
+                               DE\r
+\r
+54-A4-93   (hex)               Nederman Holding AB\r
+E00000-EFFFFF     (base 16)            Nederman Holding AB\r
+                               Sydhamnsgatan 2\r
+                               Helsingborg  Sweden  252 28\r
+                               SE\r
+\r
+54-A4-93   (hex)               ShenZhen Smart&Aspiration Co.,LTD\r
+100000-1FFFFF     (base 16)            ShenZhen Smart&Aspiration Co.,LTD\r
+                               Guanlan\r
+                               ShenZhen  GuangDong  518000\r
+                               CN\r
+\r
+54-A4-93   (hex)               Chengdu EVECCA Technology Co.,Ltd.\r
+800000-8FFFFF     (base 16)            Chengdu EVECCA Technology Co.,Ltd.\r
+                               Floor 20, Building B, Xingchen International, No.555, Middle Section of Yizhou Avenue\r
+                               Chengdu  Sichuan  610015\r
+                               CN\r
+\r
+44-03-77   (hex)               OMNISENSE SYSTEMS PRIVATE LIMITED TAIWAN BRANCH\r
+D00000-DFFFFF     (base 16)            OMNISENSE SYSTEMS PRIVATE LIMITED TAIWAN BRANCH\r
+                               7th Floor, No. 10, Lane 30, Lane 358, Ruiguang Road, Neihu District, Taipei, Taiwan\r
+                               Taipei    114\r
+                               TW\r
+\r
  20-85-93   (hex)               Great Lite International\r
  700000-7FFFFF     (base 16)            Great Lite International\r
                                 11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,\r
@@ -12962,29 +13187,29 @@ E00000-EFFFFF     (base 16)           Shanghai Jinnian information technology Co. Ltd
                                 Mail box 15123  Haifa  3508409\r
                                 IL\r
  \r
+44-D5-F2   (hex)               Auctus Technologies Co.,Ltd.\r
+900000-9FFFFF     (base 16)            Auctus Technologies Co.,Ltd.\r
+                               17F, Building 3, China Science and Technology Development Park, No. 009, 1st South Gaoxin Road, Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
  44-D5-F2   (hex)               Shenzhen Qiutian Technology Co.,Ltd\r
  700000-7FFFFF     (base 16)            Shenzhen Qiutian Technology Co.,Ltd\r
                                 5B01 5F Wangtang Building Xingao Road Xili Nanshan District\r
                                  Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-44-D5-F2   (hex)               neocontrol soluções em automação\r
-C00000-CFFFFF     (base 16)            neocontrol soluções em automação\r
-                               rua santa fe 100\r
-                               belo horizonte  MG  30320-130\r
-                               BR\r
-\r
  44-D5-F2   (hex)               Joint-Stock Company Research and Development Center ELVEES\r
  E00000-EFFFFF     (base 16)            Joint-Stock Company Research and Development Center ELVEES\r
                                 Proezd 4922, Dom 4, Stroenie 2\r
                                 Zelenograd  Moscow  124498\r
                                 RU\r
  \r
-44-D5-F2   (hex)               Auctus Technologies Co.,Ltd.\r
-900000-9FFFFF     (base 16)            Auctus Technologies Co.,Ltd.\r
-                               17F, Building 3, China Science and Technology Development Park, No. 009, 1st South Gaoxin Road, Nanshan District\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+44-D5-F2   (hex)               neocontrol soluções em automação\r
+C00000-CFFFFF     (base 16)            neocontrol soluções em automação\r
+                               rua santa fe 100\r
+                               belo horizonte  MG  30320-130\r
+                               BR\r
  \r
  D0-5F-64   (hex)               Hangzhou ToupTek Photonics Co., Ltd.\r
  100000-1FFFFF     (base 16)            Hangzhou ToupTek Photonics Co., Ltd.\r
@@ -13034,21 +13259,9 @@ B4-A2-EB   (hex)               Katerra Inc
                                 Menlo Park  CA  94025-6981\r
                                 US\r
  \r
-8C-59-3C   (hex)               Fujian Chaozhi Group Co., Ltd.\r
-000000-0FFFFF     (base 16)            Fujian Chaozhi Group Co., Ltd.\r
-                               Chaozhi Group, 13th Floor, Zhongqing Building, Haixi Science and Technology Park, Shangjie Town, Minhou County\r
-                               Fuzhou  Fujian  350000\r
-                               CN\r
-\r
  80-E4-DA   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
-8C-59-3C   (hex)               Chongqing beimoting technology co.ltd\r
-300000-3FFFFF     (base 16)            Chongqing beimoting technology co.ltd\r
-                               97-2 keyuan 2nd street, jiulongpo district,\r
-                               Chongqing  Chongqing  400039\r
-                               CN\r
-\r
  8C-59-3C   (hex)               Qbic Technology Co., Ltd\r
  600000-6FFFFF     (base 16)            Qbic Technology Co., Ltd\r
                                 26F.-12, No.99, Sec. 1, Xintai 5th Rd., Xizhi Dist.,\r
@@ -13061,6 +13274,18 @@ D00000-DFFFFF     (base 16)            IDRO-ELETTRICA S.P.A.
                                 SAN CESARIO SUL PANARO  ITALY/MODENA  41018\r
                                 IT\r
  \r
+8C-59-3C   (hex)               Chongqing beimoting technology co.ltd\r
+300000-3FFFFF     (base 16)            Chongqing beimoting technology co.ltd\r
+                               97-2 keyuan 2nd street, jiulongpo district,\r
+                               Chongqing  Chongqing  400039\r
+                               CN\r
+\r
+8C-59-3C   (hex)               Fujian Chaozhi Group Co., Ltd.\r
+000000-0FFFFF     (base 16)            Fujian Chaozhi Group Co., Ltd.\r
+                               Chaozhi Group, 13th Floor, Zhongqing Building, Haixi Science and Technology Park, Shangjie Town, Minhou County\r
+                               Fuzhou  Fujian  350000\r
+                               CN\r
+\r
  D0-C8-57   (hex)               CHUNGHSIN INTERNATIONAL ELECTRONICS CO.,LTD.\r
  B00000-BFFFFF     (base 16)            CHUNGHSIN INTERNATIONAL ELECTRONICS CO.,LTD.\r
                                 618-2# Gongren West Road,Jiaojiang,\r
@@ -13079,23 +13304,23 @@ B00000-BFFFFF     (base 16)           ForoTel
                                 Rostov-na-Donu  UFO  344079\r
                                 RU\r
  \r
-60-95-CE   (hex)               AdvanWISE Corporation\r
-500000-5FFFFF     (base 16)            AdvanWISE Corporation\r
-                               No.11, Aly. 18, Ln. 85, Fuqun St., Xiangshan Dist.\r
-                               Hsinchu    30067\r
-                               TW\r
-\r
  BC-97-40   (hex)               Gaodi Rus\r
  800000-8FFFFF     (base 16)            Gaodi Rus\r
                                 Korneeva, 14\r
                                 Elektrostal  Moscow region  144009\r
                                 RU\r
  \r
-84-8B-CD   (hex)               Smart Code (Shenzhen) Technology Co.,Ltd\r
-700000-7FFFFF     (base 16)            Smart Code (Shenzhen) Technology Co.,Ltd\r
-                               Keji North 3rd Rd\r
-                               Shenzhen  guangdong  518000\r
-                               CN\r
+60-95-CE   (hex)               AdvanWISE Corporation\r
+500000-5FFFFF     (base 16)            AdvanWISE Corporation\r
+                               No.11, Aly. 18, Ln. 85, Fuqun St., Xiangshan Dist.\r
+                               Hsinchu    30067\r
+                               TW\r
+\r
+84-8B-CD   (hex)               Dunst tronic GmbH\r
+800000-8FFFFF     (base 16)            Dunst tronic GmbH\r
+                               Seevetalstraße, 2\r
+                               Seevetal  Niedersachsen  21217\r
+                               DE\r
  \r
  84-8B-CD   (hex)               Annapurna labs\r
  300000-3FFFFF     (base 16)            Annapurna labs\r
@@ -13115,11 +13340,11 @@ D00000-DFFFFF     (base 16)           ENGISAT LDA
                                 VILAR DE ANDORINHO  PORTO  4430-358\r
                                 PT\r
  \r
-84-8B-CD   (hex)               Dunst tronic GmbH\r
-800000-8FFFFF     (base 16)            Dunst tronic GmbH\r
-                               Seevetalstraße, 2\r
-                               Seevetal  Niedersachsen  21217\r
-                               DE\r
+84-8B-CD   (hex)               Smart Code (Shenzhen) Technology Co.,Ltd\r
+700000-7FFFFF     (base 16)            Smart Code (Shenzhen) Technology Co.,Ltd\r
+                               Keji North 3rd Rd\r
+                               Shenzhen  guangdong  518000\r
+                               CN\r
  \r
  B0-FD-0B   (hex)               Fasii Information Technology (Shanghai) Ltd.\r
  400000-4FFFFF     (base 16)            Fasii Information Technology (Shanghai) Ltd.\r
@@ -13139,18 +13364,6 @@ A00000-AFFFFF     (base 16)            Sphera Telecom
                                 Moscow    108811\r
                                 RU\r
  \r
-E4-1E-0A   (hex)               Shanghai LeXiang Technology Co., Ltd\r
-E00000-EFFFFF     (base 16)            Shanghai LeXiang Technology Co., Ltd\r
-                               Floor 6,Building 8,Yanjiaqiao Road,Pudong Area ,Shanghai ,China\r
-                               shanghai    200125\r
-                               CN\r
-\r
-C8-2C-2B   (hex)               Fungible, Inc.\r
-000000-0FFFFF     (base 16)            Fungible, Inc.\r
-                               3201 Scott Blvd., 2nd floor\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
  C8-2C-2B   (hex)               Shiftall Inc.\r
  A00000-AFFFFF     (base 16)            Shiftall Inc.\r
                                 4F TokyoDaiwa Bldg., 2-6-10 Nihonbashibakurocho, \r
@@ -13163,6 +13376,18 @@ C8-2C-2B   (hex)               BIOT Sp. z o.o.
                                 Zielona Góra  Lubuskie  66-002\r
                                 PL\r
  \r
+E4-1E-0A   (hex)               Shanghai LeXiang Technology Co., Ltd\r
+E00000-EFFFFF     (base 16)            Shanghai LeXiang Technology Co., Ltd\r
+                               Floor 6,Building 8,Yanjiaqiao Road,Pudong Area ,Shanghai ,China\r
+                               shanghai    200125\r
+                               CN\r
+\r
+C8-2C-2B   (hex)               Fungible, Inc.\r
+000000-0FFFFF     (base 16)            Fungible, Inc.\r
+                               3201 Scott Blvd., 2nd floor\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
  B0-FD-0B   (hex)               Habana Labs LTD\r
  D00000-DFFFFF     (base 16)            Habana Labs LTD\r
                                 5 Tarshish St,\r
@@ -13175,18 +13400,18 @@ C00000-CFFFFF     (base 16)           TELETASK BELGIUM
                                 GENT  Oost-Vlaanderen  9000\r
                                 BE\r
  \r
-E4-1E-0A   (hex)               ROMO Wind A/S\r
-D00000-DFFFFF     (base 16)            ROMO Wind A/S\r
-                               Olof Palmes Allé 47\r
-                               Aarhus N    8200\r
-                               DK\r
-\r
  C8-63-14   (hex)               GRINBI PARTNERS\r
  600000-6FFFFF     (base 16)            GRINBI PARTNERS\r
                                 222, Dogok-ro, Gangnam-gu\r
                                 Seoul    06272\r
                                 KR\r
  \r
+E4-1E-0A   (hex)               ROMO Wind A/S\r
+D00000-DFFFFF     (base 16)            ROMO Wind A/S\r
+                               Olof Palmes Allé 47\r
+                               Aarhus N    8200\r
+                               DK\r
+\r
  C8-63-14   (hex)               Shenzhen Wesion Technology Co., Ltd\r
  700000-7FFFFF     (base 16)            Shenzhen Wesion Technology Co., Ltd\r
                                 A511, Mingyou Purchasing Center, Baoyuan Road, Xixiang Street\r
@@ -13199,30 +13424,30 @@ C8-63-14   (hex)              Shenzhen Zero Zero Infinity Technology Co.，Ltd.
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-C8-63-14   (hex)               TrackMan\r
-300000-3FFFFF     (base 16)            TrackMan\r
-                               Stubbeled 2\r
-                               Vedbaek    2950\r
-                               DK\r
-\r
-FC-D2-B6   (hex)               Oviss Labs Inc.\r
-800000-8FFFFF     (base 16)            Oviss Labs Inc.\r
-                               46259 Warm Springs Blvd\r
-                               Fremont  CA  94539\r
-                               US\r
-\r
  C8-63-14   (hex)               Telematix AG\r
  D00000-DFFFFF     (base 16)            Telematix AG\r
                                 Freiburgstrasse 251\r
                                 Bern  Bern  3018\r
                                 CH\r
  \r
+C8-63-14   (hex)               TrackMan\r
+300000-3FFFFF     (base 16)            TrackMan\r
+                               Stubbeled 2\r
+                               Vedbaek    2950\r
+                               DK\r
+\r
  34-E1-D1   (hex)               Annapurna labs\r
  E00000-EFFFFF     (base 16)            Annapurna labs\r
                                 Matam Scientific Industries Center,   Building 8.2\r
                                 Mail box 15123  Haifa  3508409\r
                                 IL\r
  \r
+FC-D2-B6   (hex)               Oviss Labs Inc.\r
+800000-8FFFFF     (base 16)            Oviss Labs Inc.\r
+                               46259 Warm Springs Blvd\r
+                               Fremont  CA  94539\r
+                               US\r
+\r
  34-E1-D1   (hex)               Tianjin Sublue Ocean Science & Technology Co., Ltd\r
  000000-0FFFFF     (base 16)            Tianjin Sublue Ocean Science & Technology Co., Ltd\r
                                 No.29 Factory No.156 Nanhai Road,TEDA\r
@@ -13241,6 +13466,12 @@ E00000-EFFFFF     (base 16)            Annapurna labs
                                 PINEDALE  WY  82941-0648\r
                                 US\r
  \r
+74-5B-C5   (hex)               EDOMO Systems GmbH\r
+800000-8FFFFF     (base 16)            EDOMO Systems GmbH\r
+                               Obertorplatz 2\r
+                               Landau  Deutschland (DEU)  76829\r
+                               DE\r
+\r
  90-C6-82   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
@@ -13274,18 +13505,18 @@ E4-4C-C7   (hex)              IAG GROUP LTD
                                 shenzhen    518000\r
                                 CN\r
  \r
-74-5B-C5   (hex)               EDOMO Systems GmbH\r
-800000-8FFFFF     (base 16)            EDOMO Systems GmbH\r
-                               Obertorplatz 2\r
-                               Landau  Deutschland (DEU)  76829\r
-                               DE\r
-\r
  74-5B-C5   (hex)               uGrid Network Inc.\r
  400000-4FFFFF     (base 16)            uGrid Network Inc.\r
                                 602 Gabriola Way\r
                                 Ottawa  Ontario  K2T 0M2\r
                                 CA\r
  \r
+E4-4C-C7   (hex)               Muzik Inc\r
+A00000-AFFFFF     (base 16)            Muzik Inc\r
+                               9220 Sunset Blvd #112\r
+                               West Hollywood    CA 90069\r
+                               US\r
+\r
  4C-BC-98   (hex)               Airtex Manufacturing Partnership\r
  900000-9FFFFF     (base 16)            Airtex Manufacturing Partnership\r
                                 1441 Hastings Cres. SE\r
@@ -13310,12 +13541,6 @@ C00000-CFFFFF     (base 16)            Heliotis AG
                                 Beijing  Beijing  100089\r
                                 CN\r
  \r
-E4-4C-C7   (hex)               Muzik Inc\r
-A00000-AFFFFF     (base 16)            Muzik Inc\r
-                               9220 Sunset Blvd #112\r
-                               West Hollywood    CA 90069\r
-                               US\r
-\r
  2C-26-5F   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
@@ -13325,17 +13550,11 @@ F00000-FFFFFF     (base 16)           Private
  2C-6A-6F   (hex)               Private\r
  F00000-FFFFFF     (base 16)            Private\r
  \r
-E0-5A-9F   (hex)               Mountz, Inc.\r
-D00000-DFFFFF     (base 16)            Mountz, Inc.\r
-                               1080 N. 11th Street\r
-                               San Jose  CA  95112\r
-                               US\r
-\r
-E0-5A-9F   (hex)               TRYEN\r
-500000-5FFFFF     (base 16)            TRYEN\r
-                               Manan-gu Anyang-ro 110\r
-                               Anyang  Kyeong-gi  14035\r
-                               KR\r
+4C-65-A8   (hex)               ZMIN Technologies\r
+B00000-BFFFFF     (base 16)            ZMIN Technologies\r
+                               Room 403-405, Building C, Baoan New Generation Information Technology Industrial Park, No.139, Chuangye 2 Rd., Baoan District\r
+                               ShenZhen  GuangDong  518101\r
+                               CN\r
  \r
  E0-5A-9F   (hex)               Chengdu Song Yuan Electronic Technology Co.,Ltd\r
  200000-2FFFFF     (base 16)            Chengdu Song Yuan Electronic Technology Co.,Ltd\r
@@ -13355,11 +13574,17 @@ E0-5A-9F   (hex)              Annapurna labs
                                 Mail box 15123  Haifa  3508409\r
                                 IL\r
  \r
-4C-65-A8   (hex)               ZMIN Technologies\r
-B00000-BFFFFF     (base 16)            ZMIN Technologies\r
-                               Room 403-405, Building C, Baoan New Generation Information Technology Industrial Park, No.139, Chuangye 2 Rd., Baoan District\r
-                               ShenZhen  GuangDong  518101\r
-                               CN\r
+E0-5A-9F   (hex)               Mountz, Inc.\r
+D00000-DFFFFF     (base 16)            Mountz, Inc.\r
+                               1080 N. 11th Street\r
+                               San Jose  CA  95112\r
+                               US\r
+\r
+E0-5A-9F   (hex)               TRYEN\r
+500000-5FFFFF     (base 16)            TRYEN\r
+                               Manan-gu Anyang-ro 110\r
+                               Anyang  Kyeong-gi  14035\r
+                               KR\r
  \r
  38-B1-9E   (hex)               Freedompro Srl\r
  100000-1FFFFF     (base 16)            Freedompro Srl\r
@@ -13367,17 +13592,47 @@ B00000-BFFFFF     (base 16)           ZMIN Technologies
                                 Cinisello Balsamo    20092\r
                                 IT\r
  \r
+D8-86-0B   (hex)               Krspace\r
+100000-1FFFFF     (base 16)            Krspace\r
+                               Building 1, Junhao Central Park Plaza\r
+                               ChaoYang District  Beijing  100125\r
+                               CN\r
+\r
+38-B1-9E   (hex)               Doepke Schaltgeräte GmbH\r
+900000-9FFFFF     (base 16)            Doepke Schaltgeräte GmbH\r
+                               Stellmacherstr. 11\r
+                               Norden  Niedersachsen  26506\r
+                               DE\r
+\r
  28-36-38   (hex)               Swisson AG\r
  C00000-CFFFFF     (base 16)            Swisson AG\r
                                 Fabrikstrasse 21\r
                                 Lyss    3250\r
                                 CH\r
  \r
-D8-86-0B   (hex)               Krspace\r
-100000-1FFFFF     (base 16)            Krspace\r
-                               Building 1, Junhao Central Park Plaza\r
-                               ChaoYang District  Beijing  100125\r
-                               CN\r
+CC-D3-9D   (hex)               Evoko Unlimited AB\r
+100000-1FFFFF     (base 16)            Evoko Unlimited AB\r
+                               Hästholmsvägen 32\r
+                               Nacka    13130\r
+                               SE\r
+\r
+D4-25-CC   (hex)               bvk technology\r
+500000-5FFFFF     (base 16)            bvk technology\r
+                               Mithatpasa Mah. Serin Cikmazi No:4 C Blok Kemerburgaz, Eyupsultan\r
+                               Istanbul  Istanbul  34075\r
+                               TR\r
+\r
+D4-25-CC   (hex)               POSNET Polska S.A.\r
+C00000-CFFFFF     (base 16)            POSNET Polska S.A.\r
+                               ul. Municypalna 33\r
+                               Warszawa    02-281\r
+                               PL\r
+\r
+D4-25-CC   (hex)               MusicLens Inc.\r
+200000-2FFFFF     (base 16)            MusicLens Inc.\r
+                               311 E VALLEY BLVD#112 PMB27\r
+                               SANGABRIEL  CA  91776\r
+                               US\r
  \r
  CC-D3-9D   (hex)               Lubelskie Fabryki Wag FAWAG S.A.\r
  A00000-AFFFFF     (base 16)            Lubelskie Fabryki Wag FAWAG S.A.\r
@@ -13391,60 +13646,36 @@ A00000-AFFFFF     (base 16)           Lubelskie Fabryki Wag FAWAG S.A.
                                 Beijing  Beijing  100192\r
                                 CN\r
  \r
-38-B1-9E   (hex)               Doepke Schaltgeräte GmbH\r
-900000-9FFFFF     (base 16)            Doepke Schaltgeräte GmbH\r
-                               Stellmacherstr. 11\r
-                               Norden  Niedersachsen  26506\r
-                               DE\r
-\r
-D4-25-CC   (hex)               DOLBY LABORATORIES, INC.\r
-800000-8FFFFF     (base 16)            DOLBY LABORATORIES, INC.\r
-                               100 Potrero Avenue\r
-                               San Francisco  CA  94103-4938\r
-                               US\r
-\r
  9C-69-B4   (hex)               EA Technology Ltd\r
  100000-1FFFFF     (base 16)            EA Technology Ltd\r
                                 Capenhurst Technology Park\r
                                 Chester  Cheshire  CH16ES\r
                                 GB\r
  \r
-D4-25-CC   (hex)               MusicLens Inc.\r
-200000-2FFFFF     (base 16)            MusicLens Inc.\r
-                               311 E VALLEY BLVD#112 PMB27\r
-                               SANGABRIEL  CA  91776\r
+D4-25-CC   (hex)               DOLBY LABORATORIES, INC.\r
+800000-8FFFFF     (base 16)            DOLBY LABORATORIES, INC.\r
+                               100 Potrero Avenue\r
+                               San Francisco  CA  94103-4938\r
                                 US\r
  \r
+68-91-D0   (hex)               G-TECH Instruments Inc.\r
+400000-4FFFFF     (base 16)            G-TECH Instruments Inc.\r
+                               2F.-2, No.83, Sec. 2, Gongdao 5th Rd., East Dist.\r
+                               Hsinchu    30070\r
+                               TW\r
+\r
  9C-69-B4   (hex)               Intellect module LLC\r
  D00000-DFFFFF     (base 16)            Intellect module LLC\r
                                 Krasnogo kursanta str. 25 lit. J\r
                                 Saint-Petersburg    197110\r
                                 RU\r
  \r
-D4-25-CC   (hex)               bvk technology\r
-500000-5FFFFF     (base 16)            bvk technology\r
-                               Mithatpasa Mah. Serin Cikmazi No:4 C Blok Kemerburgaz, Eyupsultan\r
-                               Istanbul  Istanbul  34075\r
-                               TR\r
-\r
-D4-25-CC   (hex)               POSNET Polska S.A.\r
-C00000-CFFFFF     (base 16)            POSNET Polska S.A.\r
-                               ul. Municypalna 33\r
-                               Warszawa    02-281\r
-                               PL\r
-\r
  D4-25-CC   (hex)               BlueCats US, LLC\r
  700000-7FFFFF     (base 16)            BlueCats US, LLC\r
                                 6767 OLD MADISON PIKE NW, SUITE 300\r
                                 Huntsville  AL  35806\r
                                 US\r
  \r
-CC-D3-9D   (hex)               Evoko Unlimited AB\r
-100000-1FFFFF     (base 16)            Evoko Unlimited AB\r
-                               Hästholmsvägen 32\r
-                               Nacka    13130\r
-                               SE\r
-\r
  4C-91-7A   (hex)               Annapurna labs\r
  E00000-EFFFFF     (base 16)            Annapurna labs\r
                                 Matam Scientific Industries Center,   Building 8.2\r
@@ -13457,17 +13688,23 @@ A00000-AFFFFF     (base 16)           Erlab DFS SAS
                                 Val de Reuil    27104\r
                                 FR\r
  \r
+6C-DF-FB   (hex)               Sercomm Corporation.\r
+200000-2FFFFF     (base 16)            Sercomm Corporation.\r
+                               3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
+                               Miao-Lih Hsuan    115\r
+                               TW\r
+\r
  4C-91-7A   (hex)               AvertX\r
  B00000-BFFFFF     (base 16)            AvertX\r
                                 23221 E. Knox Ave\r
                                 Liberty Lake  WA  99019\r
                                 US\r
  \r
-68-91-D0   (hex)               G-TECH Instruments Inc.\r
-400000-4FFFFF     (base 16)            G-TECH Instruments Inc.\r
-                               2F.-2, No.83, Sec. 2, Gongdao 5th Rd., East Dist.\r
-                               Hsinchu    30070\r
-                               TW\r
+6C-DF-FB   (hex)               Shenzhen HDCVT Technology\r
+000000-0FFFFF     (base 16)            Shenzhen HDCVT Technology\r
+                               Floor 7, Building 5, Lihe Industrial Park, Songbai Road, Xili Street, Nanshan District\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
  \r
  7C-BC-84   (hex)               Guangzhou Puppyrobot Technology Co.Ltd Beijing Branch\r
  B00000-BFFFFF     (base 16)            Guangzhou Puppyrobot Technology Co.Ltd Beijing Branch\r
@@ -13487,22 +13724,22 @@ C00000-CFFFFF     (base 16)           Tibit Communications
                                 Petaluma  CA  94954\r
                                 US\r
  \r
+7C-BC-84   (hex)               CONTINENTAL\r
+400000-4FFFFF     (base 16)            CONTINENTAL\r
+                               1 AVENUE PAUL OURLIAC\r
+                               TOULOUSE    31100\r
+                               FR\r
+\r
  7C-BC-84   (hex)               3S Technology Co., Ltd.\r
  200000-2FFFFF     (base 16)            3S Technology Co., Ltd.\r
                                 301-1103, 345, Seokcheon-ro\r
                                 Bucheon-si  Gyeonggi-do  14501\r
                                 KR\r
  \r
-6C-DF-FB   (hex)               Shenzhen HDCVT Technology\r
-000000-0FFFFF     (base 16)            Shenzhen HDCVT Technology\r
-                               Floor 7, Building 5, Lihe Industrial Park, Songbai Road, Xili Street, Nanshan District\r
-                               Shenzhen  Guangdong  518055\r
-                               CN\r
-\r
-6C-DF-FB   (hex)               Sercomm Corporation.\r
-200000-2FFFFF     (base 16)            Sercomm Corporation.\r
-                               3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
-                               Miao-Lih Hsuan    115\r
+7C-BC-84   (hex)               AG Neovo\r
+000000-0FFFFF     (base 16)            AG Neovo\r
+                               5F-1, No. 3-1, Park Street, Nangang District, Taipei, 11503, Taiwan\r
+                               Taipei    11503\r
                                 TW\r
  \r
  98-F9-C7   (hex)               Beijing Horizon Information Technology Co., Ltd\r
@@ -13517,11 +13754,11 @@ C00000-CFFFFF     (base 16)           Tibit Communications
                                 Seoul    06178\r
                                 KR\r
  \r
-7C-BC-84   (hex)               AG Neovo\r
-000000-0FFFFF     (base 16)            AG Neovo\r
-                               5F-1, No. 3-1, Park Street, Nangang District, Taipei, 11503, Taiwan\r
-                               Taipei    11503\r
-                               TW\r
+0C-FE-5D   (hex)               Maksat Technologies P Ltd\r
+D00000-DFFFFF     (base 16)            Maksat Technologies P Ltd\r
+                               D-10/6, Okhla, Phase-I, Okhla\r
+                               New Delhi  Delhi  110020\r
+                               IN\r
  \r
  98-F9-C7   (hex)               ShenZhen Chuangwei Electronic Appliance Co.,Ltd\r
  C00000-CFFFFF     (base 16)            ShenZhen Chuangwei Electronic Appliance Co.,Ltd\r
@@ -13535,17 +13772,11 @@ B00000-BFFFFF     (base 16)           HIROIA Communications Pte. Ltd. Taiwan Branch
                                 Taipei City    11494\r
                                 TW\r
  \r
-7C-BC-84   (hex)               CONTINENTAL\r
-400000-4FFFFF     (base 16)            CONTINENTAL\r
-                               1 AVENUE PAUL OURLIAC\r
-                               TOULOUSE    31100\r
-                               FR\r
-\r
-0C-FE-5D   (hex)               Maksat Technologies P Ltd\r
-D00000-DFFFFF     (base 16)            Maksat Technologies P Ltd\r
-                               D-10/6, Okhla, Phase-I, Okhla\r
-                               New Delhi  Delhi  110020\r
-                               IN\r
+0C-FE-5D   (hex)               Celerway Communication AS\r
+900000-9FFFFF     (base 16)            Celerway Communication AS\r
+                               Martin Lingesvei 25\r
+                               Fornebu    1364\r
+                               NO\r
  \r
  0C-FE-5D   (hex)               Fender Musical Instrument\r
  100000-1FFFFF     (base 16)            Fender Musical Instrument\r
@@ -13553,27 +13784,18 @@ D00000-DFFFFF     (base 16)           Maksat Technologies P Ltd
                                 Scottsdale  AZ  85255\r
                                 US\r
  \r
-0C-FE-5D   (hex)               Celerway Communication AS\r
-900000-9FFFFF     (base 16)            Celerway Communication AS\r
-                               Martin Lingesvei 25\r
-                               Fornebu    1364\r
-                               NO\r
-\r
  0C-FE-5D   (hex)               YINUO-LINK LIMITED\r
  B00000-BFFFFF     (base 16)            YINUO-LINK LIMITED\r
                                 5 Floor, Chuangyecheng,Xinghua Road,Xingwei,Fuyong\r
                                 Shenzhen  Guangdong  518103\r
                                 CN\r
  \r
+80-0A-80   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  C0-D3-91   (hex)               Private\r
  B00000-BFFFFF     (base 16)            Private\r
  \r
-6C-5C-3D   (hex)               KWONG MING ELECTRICAL MANUFACTORY LIMITED\r
-300000-3FFFFF     (base 16)            KWONG MING ELECTRICAL MANUFACTORY LIMITED\r
-                               A3 bldg, Kwong Ming, Technology Industrial Zone, Shiwan Town, Boluo County \r
-                               Huizhou  Guangdong  516100\r
-                               CN\r
-\r
  1C-FD-08   (hex)               MESHBOX FOUNDATION PTE. LTD.\r
  E00000-EFFFFF     (base 16)            MESHBOX FOUNDATION PTE. LTD.\r
                                 152 Beach Road #14-02 GATEWAY EAST TOWER\r
@@ -13586,39 +13808,12 @@ D00000-DFFFFF     (base 16)           Tianjin Keyvia Electric Co.,Ltd
                                 Tianjin  Tianjin  300392\r
                                 CN\r
  \r
-80-0A-80   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
-6C-5C-3D   (hex)               Vertiv Industrial Systems\r
-200000-2FFFFF     (base 16)            Vertiv Industrial Systems\r
-                               30 avenue Montgolfier\r
-                               Chassieu    69684\r
-                               FR\r
-\r
  1C-FD-08   (hex)               Shanghai YottaTech Co Ltd (上海尧它科技有限公司）\r
  C00000-CFFFFF     (base 16)            Shanghai YottaTech Co Ltd (上海尧它科技有限公司）\r
                                 399 keyuan Rd, Pudong New District\r
                                 Shanghai    201203\r
                                 CN\r
  \r
-A8-3F-A1   (hex)               Sercomm Corporation.\r
-500000-5FFFFF     (base 16)            Sercomm Corporation.\r
-                               3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
-                               Miao-Lih Hsuan    115\r
-                               TW\r
-\r
-3C-6A-2C   (hex)               WICKS Co., Ltd.\r
-900000-9FFFFF     (base 16)            WICKS Co., Ltd.\r
-                               202,1-29 shingi takasu\r
-                               kochi City  Kochi  781-8103\r
-                               JP\r
-\r
-A8-3F-A1   (hex)               Shenzhen ITLONG Intelligent Technology Co.,Ltd\r
-900000-9FFFFF     (base 16)            Shenzhen ITLONG Intelligent Technology Co.,Ltd\r
-                               12th floor, Building C1, Nanshan Zhiyuan, 1001 Xueyuan Avenue , Nanshan District\r
-                               Shenzhen  Guangdong  518055\r
-                               CN\r
-\r
  1C-FD-08   (hex)               Banmak Technogies Co.,Ltd\r
  A00000-AFFFFF     (base 16)            Banmak Technogies Co.,Ltd\r
                                 302, Building R3-B, High-Tech Park\r
@@ -13631,14 +13826,44 @@ A00000-AFFFFF     (base 16)           Banmak Technogies Co.,Ltd
                                 Shenzhen  Guangdong  518112\r
                                 CN\r
  \r
+6C-5C-3D   (hex)               Vertiv Industrial Systems\r
+200000-2FFFFF     (base 16)            Vertiv Industrial Systems\r
+                               30 avenue Montgolfier\r
+                               Chassieu    69684\r
+                               FR\r
+\r
+6C-5C-3D   (hex)               KWONG MING ELECTRICAL MANUFACTORY LIMITED\r
+300000-3FFFFF     (base 16)            KWONG MING ELECTRICAL MANUFACTORY LIMITED\r
+                               A3 bldg, Kwong Ming, Technology Industrial Zone, Shiwan Town, Boluo County \r
+                               Huizhou  Guangdong  516100\r
+                               CN\r
+\r
+B8-D8-12   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
  A8-3F-A1   (hex)               Imecon Engineering SrL\r
  000000-0FFFFF     (base 16)            Imecon Engineering SrL\r
                                 via Gerola 13/15\r
                                 Fiesco  CR  26010\r
                                 IT\r
  \r
-B8-D8-12   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
+A8-3F-A1   (hex)               Shenzhen ITLONG Intelligent Technology Co.,Ltd\r
+900000-9FFFFF     (base 16)            Shenzhen ITLONG Intelligent Technology Co.,Ltd\r
+                               12th floor, Building C1, Nanshan Zhiyuan, 1001 Xueyuan Avenue , Nanshan District\r
+                               Shenzhen  Guangdong  518055\r
+                               CN\r
+\r
+3C-6A-2C   (hex)               WICKS Co., Ltd.\r
+900000-9FFFFF     (base 16)            WICKS Co., Ltd.\r
+                               202,1-29 shingi takasu\r
+                               kochi City  Kochi  781-8103\r
+                               JP\r
+\r
+A8-3F-A1   (hex)               Sercomm Corporation.\r
+500000-5FFFFF     (base 16)            Sercomm Corporation.\r
+                               3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
+                               Miao-Lih Hsuan    115\r
+                               TW\r
  \r
  30-0A-60   (hex)               AVIC JONHON OPTRONIC TECHNOLOGY CO., LTD.\r
  400000-4FFFFF     (base 16)            AVIC JONHON OPTRONIC TECHNOLOGY CO., LTD.\r
@@ -13652,46 +13877,28 @@ F00000-FFFFFF     (base 16)           Private
                                 Ruurlo  Gelderland  NL-7261AK\r
                                 NL\r
  \r
-A4-ED-43   (hex)               Shanghai Mission Information Technologies (Group) Co.,Ltd\r
-200000-2FFFFF     (base 16)            Shanghai Mission Information Technologies (Group) Co.,Ltd\r
-                               Room 803, modern traffic building (East District), 218 Hengfeng Road, Jingan District\r
-                               Shanghai    200041\r
-                               CN\r
-\r
  A4-ED-43   (hex)               Paragon Business Solutions Ltd.\r
  B00000-BFFFFF     (base 16)            Paragon Business Solutions Ltd.\r
                                 303-5th Avenue, Suite # 1007\r
                                 New York    10016\r
                                 US\r
  \r
-A0-28-33   (hex)               Precision Planting, LLC.\r
-E00000-EFFFFF     (base 16)            Precision Planting, LLC.\r
-                               23207 Townline Rd.\r
-                               Tremont  IL  61568\r
-                               US\r
+A4-ED-43   (hex)               Shanghai Mission Information Technologies (Group) Co.,Ltd\r
+200000-2FFFFF     (base 16)            Shanghai Mission Information Technologies (Group) Co.,Ltd\r
+                               Room 803, modern traffic building (East District), 218 Hengfeng Road, Jingan District\r
+                               Shanghai    200041\r
+                               CN\r
  \r
  A4-ED-43   (hex)               Sweam AB\r
  000000-0FFFFF     (base 16)            Sweam AB\r
-                               Kistagången 12\r
-                               Kista  Stockholm  16440\r
-                               SE\r
-\r
-A0-28-33   (hex)               FlexLink AB\r
-B00000-BFFFFF     (base 16)            FlexLink AB\r
-                               BYFOGDEGATAN 11\r
-                               GOTEBORG    41505\r
-                               SE\r
-\r
-84-89-EC   (hex)               Aerionics Inc.\r
-300000-3FFFFF     (base 16)            Aerionics Inc.\r
-                               3601 N St Paul Avenue\r
-                               Sioux Falls  SD  57104\r
-                               US\r
+                               Kistagången 12\r
+                               Kista  Stockholm  16440\r
+                               SE\r
  \r
-84-89-EC   (hex)               Shenzhen Xtooltech Co., Ltd\r
-900000-9FFFFF     (base 16)            Shenzhen Xtooltech Co., Ltd\r
-                               10574 Acacia St, Suite D4\r
-                               Rancho Cucamonga  CA  91730\r
+A0-28-33   (hex)               Precision Planting, LLC.\r
+E00000-EFFFFF     (base 16)            Precision Planting, LLC.\r
+                               23207 Townline Rd.\r
+                               Tremont  IL  61568\r
                                 US\r
  \r
  84-89-EC   (hex)               SmartGiant Technology\r
@@ -13706,6 +13913,18 @@ B00000-BFFFFF     (base 16)            FlexLink AB
                                 Tempe  AZ  85282\r
                                 US\r
  \r
+84-89-EC   (hex)               Aerionics Inc.\r
+300000-3FFFFF     (base 16)            Aerionics Inc.\r
+                               3601 N St Paul Avenue\r
+                               Sioux Falls  SD  57104\r
+                               US\r
+\r
+A0-28-33   (hex)               FlexLink AB\r
+B00000-BFFFFF     (base 16)            FlexLink AB\r
+                               BYFOGDEGATAN 11\r
+                               GOTEBORG    41505\r
+                               SE\r
+\r
  68-91-D0   (hex)               Ambitio LLC\r
  300000-3FFFFF     (base 16)            Ambitio LLC\r
                                 10505 NW 27th ST\r
@@ -13724,22 +13943,16 @@ D4-7C-44   (hex)              Sammi Onformation Systems
                                 Rancho Cucamonga  CA  91730\r
                                 US\r
  \r
-30-09-F9   (hex)               Beijing Netswift Technology Co.,Ltd.\r
-200000-2FFFFF     (base 16)            Beijing Netswift Technology Co.,Ltd.\r
-                               No. 7, 7th floor, No.49 Zhichun Road, Haidian District\r
-                               Beijing  Beijing  100190 \r
-                               CN\r
-\r
  78-C2-C0   (hex)               Ory Laboratory Co., Ltd.\r
  400000-4FFFFF     (base 16)            Ory Laboratory Co., Ltd.\r
                                 502 Bravi Mitaka, 1-3-11 Nishikubo\r
                                 Musashino-shi  Tokyo  180-0013\r
                                 JP\r
  \r
-9C-F6-DD   (hex)               Foshan Synwit Technology Co.,Ltd.\r
-D00000-DFFFFF     (base 16)            Foshan Synwit Technology Co.,Ltd.\r
-                               Room 501, Building 10, Leaguar Science Park, Shishan town, Nanhai\r
-                               FoShan  Guangdong  528225\r
+30-09-F9   (hex)               Beijing Netswift Technology Co.,Ltd.\r
+200000-2FFFFF     (base 16)            Beijing Netswift Technology Co.,Ltd.\r
+                               No. 7, 7th floor, No.49 Zhichun Road, Haidian District\r
+                               Beijing  Beijing  100190 \r
                                 CN\r
  \r
  30-09-F9   (hex)               Bonraybio\r
@@ -13754,11 +13967,17 @@ D00000-DFFFFF     (base 16)           Foshan Synwit Technology Co.,Ltd.
                                 New Taipei City     235\r
                                 TW\r
  \r
-04-C3-E6   (hex)               DREAMKAS LLC\r
-000000-0FFFFF     (base 16)            DREAMKAS LLC\r
-                               Bolshoy  Sampsoniyevskiy pr., 62A, office 2H\r
-                               Saint-Petersburg    194044\r
-                               RU\r
+84-89-EC   (hex)               Shenzhen Xtooltech Co., Ltd\r
+900000-9FFFFF     (base 16)            Shenzhen Xtooltech Co., Ltd\r
+                               10574 Acacia St, Suite D4\r
+                               Rancho Cucamonga  CA  91730\r
+                               US\r
+\r
+C0-83-59   (hex)               ANTS\r
+400000-4FFFFF     (base 16)            ANTS\r
+                               88, Simindae-ro, Dongan-Gu\r
+                               Anyang    14079\r
+                               KR\r
  \r
  C0-83-59   (hex)               Gemvax Technology ,. Co.Ltd\r
  100000-1FFFFF     (base 16)            Gemvax Technology ,. Co.Ltd\r
@@ -13766,11 +13985,17 @@ C0-83-59   (hex)              Gemvax Technology ,. Co.Ltd
                                 Daejeon    34016\r
                                 KR\r
  \r
-C0-83-59   (hex)               ANTS\r
-400000-4FFFFF     (base 16)            ANTS\r
-                               88, Simindae-ro, Dongan-Gu\r
-                               Anyang    14079\r
-                               KR\r
+9C-F6-DD   (hex)               Foshan Synwit Technology Co.,Ltd.\r
+D00000-DFFFFF     (base 16)            Foshan Synwit Technology Co.,Ltd.\r
+                               Room 501, Building 10, Leaguar Science Park, Shishan town, Nanhai\r
+                               FoShan  Guangdong  528225\r
+                               CN\r
+\r
+04-C3-E6   (hex)               DREAMKAS LLC\r
+000000-0FFFFF     (base 16)            DREAMKAS LLC\r
+                               Bolshoy  Sampsoniyevskiy pr., 62A, office 2H\r
+                               Saint-Petersburg    194044\r
+                               RU\r
  \r
  04-C3-E6   (hex)               SHANTOU YINGSHENG IMPORT & EXPORT TRADING CO.,LTD.\r
  C00000-CFFFFF     (base 16)            SHANTOU YINGSHENG IMPORT & EXPORT TRADING CO.,LTD.\r
@@ -13778,24 +14003,30 @@ C00000-CFFFFF     (base 16)           SHANTOU YINGSHENG IMPORT & EXPORT TRADING CO.,LTD.
                                 Shantou City  Guangdong  515800\r
                                 CN\r
  \r
-3C-42-7E   (hex)               UBTECH ROBOTICS CORP\r
-800000-8FFFFF     (base 16)            UBTECH ROBOTICS CORP\r
-                               22 Floor, Block C1, Nanshan I Park, No. 1001 Xueyuan Road, Nanshan District,\r
-                               Shenzhen  guangdong  518071\r
-                               CN\r
-\r
  3C-42-7E   (hex)               Edit Srl\r
  600000-6FFFFF     (base 16)            Edit Srl\r
                                 Via Grotte di Nottola 10\r
                                 Cisterna di Latina  Latina  04012\r
                                 IT\r
  \r
+3C-42-7E   (hex)               UBTECH ROBOTICS CORP\r
+800000-8FFFFF     (base 16)            UBTECH ROBOTICS CORP\r
+                               22 Floor, Block C1, Nanshan I Park, No. 1001 Xueyuan Road, Nanshan District,\r
+                               Shenzhen  guangdong  518071\r
+                               CN\r
+\r
  A0-C5-F2   (hex)               Quantlab Financial, LLC\r
  000000-0FFFFF     (base 16)            Quantlab Financial, LLC\r
                                 3 Greenway Plaza, Suite 200\r
                                 3 Greenway Plaza  TX  77046\r
                                 US\r
  \r
+B4-4B-D6   (hex)               ShenZhen Comstar Technology Company\r
+500000-5FFFFF     (base 16)            ShenZhen Comstar Technology Company\r
+                               Pengnian Science Park Building A 314\r
+                               Shenzhen  Guangdong  518040\r
+                               CN\r
+\r
  B4-4B-D6   (hex)               Shenzhen Cudy Technology Co., Ltd.\r
  200000-2FFFFF     (base 16)            Shenzhen Cudy Technology Co., Ltd.\r
                                 The Great Wall Building,No3 Kefa Road\r
@@ -13808,12 +14039,6 @@ D00000-DFFFFF     (base 16)            ELLETA SOLUTIONS LTD
                                 Hadera    3848427\r
                                 IL\r
  \r
-B4-4B-D6   (hex)               ShenZhen Comstar Technology Company\r
-500000-5FFFFF     (base 16)            ShenZhen Comstar Technology Company\r
-                               Pengnian Science Park Building A 314\r
-                               Shenzhen  Guangdong  518040\r
-                               CN\r
-\r
  3C-42-7E   (hex)               Compal Electronics INC.\r
  B00000-BFFFFF     (base 16)            Compal Electronics INC.\r
                                 No.8 , Nandong Road , PingZhen Dist.\r
@@ -13832,16 +14057,10 @@ A0-19-B2   (hex)              El Sewedy Electrometer Egypt S.A.E.
                                 ET-6th October City    \r
                                 EG\r
  \r
-2C-48-35   (hex)               GEARTECH LTD\r
-400000-4FFFFF     (base 16)            GEARTECH LTD\r
-                               R310/312,3/F,Beike Venture Building,No.1077,Nanhai Avenue,Nanshan District\r
-                               Shenzhen  Guangdong  518067\r
-                               CN\r
-\r
-8C-1C-DA   (hex)               GESAS GmbH\r
-100000-1FFFFF     (base 16)            GESAS GmbH\r
-                               Pfaelzer Ring 18\r
-                               Hockenheim  Baden-Wuerttemberg  68766\r
+2C-48-35   (hex)               Collatz+Trojan GmbH\r
+A00000-AFFFFF     (base 16)            Collatz+Trojan GmbH\r
+                               Borsteler Chaussee85-99a\r
+                               Hamburg  Hamburg  22453\r
                                 DE\r
  \r
  8C-1C-DA   (hex)               Raychem RPG PVT. LTD.\r
@@ -13856,11 +14075,11 @@ A0-19-B2   (hex)              El Sewedy Electrometer Egypt S.A.E.
                                 Moscow    127015\r
                                 RU\r
  \r
-2C-48-35   (hex)               Collatz+Trojan GmbH\r
-A00000-AFFFFF     (base 16)            Collatz+Trojan GmbH\r
-                               Borsteler Chaussee85-99a\r
-                               Hamburg  Hamburg  22453\r
-                               DE\r
+2C-48-35   (hex)               GEARTECH LTD\r
+400000-4FFFFF     (base 16)            GEARTECH LTD\r
+                               R310/312,3/F,Beike Venture Building,No.1077,Nanhai Avenue,Nanshan District\r
+                               Shenzhen  Guangdong  518067\r
+                               CN\r
  \r
  3C-24-F0   (hex)               Shenzhen Bestway Technology Co., Ltd\r
  A00000-AFFFFF     (base 16)            Shenzhen Bestway Technology Co., Ltd\r
@@ -13880,24 +14099,18 @@ E00000-EFFFFF     (base 16)           GETMOBIT LLC
                                 Pordenone  PN  33170\r
                                 IT\r
  \r
+8C-1C-DA   (hex)               GESAS GmbH\r
+100000-1FFFFF     (base 16)            GESAS GmbH\r
+                               Pfaelzer Ring 18\r
+                               Hockenheim  Baden-Wuerttemberg  68766\r
+                               DE\r
+\r
  3C-24-F0   (hex)               Authentico Technologies\r
  C00000-CFFFFF     (base 16)            Authentico Technologies\r
                                 Erikdahlbergsgatan 4\r
                                 Göteborg    41126\r
                                 SE\r
  \r
-0C-73-EB   (hex)               Husty M.Styczen J.Hupert Sp.J.\r
-500000-5FFFFF     (base 16)            Husty M.Styczen J.Hupert Sp.J.\r
-                               Rzepakowa 5e\r
-                               Krakow  malopolska  31-989\r
-                               PL\r
-\r
-0C-73-EB   (hex)               Gemini Data Loggers (UK) Limited\r
-000000-0FFFFF     (base 16)            Gemini Data Loggers (UK) Limited\r
-                               Scientific House, Terminus Road\r
-                               Chichester  West Sussex  PO19 8UJ\r
-                               GB\r
-\r
  8C-1C-DA   (hex)               T+A elektroakustik GmbH & Co.KG\r
  B00000-BFFFFF     (base 16)            T+A elektroakustik GmbH & Co.KG\r
                                 Planckstr. 9-11\r
@@ -13928,11 +14141,17 @@ E00000-EFFFFF     (base 16)           Beijing MFOX technology Co., Ltd.
                                 BeiJing  BeiJing  100176\r
                                 CN\r
  \r
-88-5F-E8   (hex)               Shenzhen Xin Kingbrand Enterprises Co.,Ltd     \r
-600000-6FFFFF     (base 16)            Shenzhen Xin Kingbrand Enterprises Co.,Ltd     \r
-                               KingBrand Industrial Zone, Nanpu Road,Shang Liao Lin Pikeng,Shajing Town,Baoan District\r
-                               Shenzhen     518000\r
-                               CN\r
+0C-73-EB   (hex)               Husty M.Styczen J.Hupert Sp.J.\r
+500000-5FFFFF     (base 16)            Husty M.Styczen J.Hupert Sp.J.\r
+                               Rzepakowa 5e\r
+                               Krakow  malopolska  31-989\r
+                               PL\r
+\r
+0C-73-EB   (hex)               Gemini Data Loggers (UK) Limited\r
+000000-0FFFFF     (base 16)            Gemini Data Loggers (UK) Limited\r
+                               Scientific House, Terminus Road\r
+                               Chichester  West Sussex  PO19 8UJ\r
+                               GB\r
  \r
  88-5F-E8   (hex)               Lisle Design Ltd\r
  A00000-AFFFFF     (base 16)            Lisle Design Ltd\r
@@ -13940,17 +14159,29 @@ A00000-AFFFFF     (base 16)           Lisle Design Ltd
                                 St. Andrews  Fife  KY16 9SR\r
                                 GB\r
  \r
+30-1F-9A   (hex)               YiSheng technology  co.,LTD\r
+600000-6FFFFF     (base 16)            YiSheng technology  co.,LTD\r
+                               Xintian road no:71,  F#202\r
+                               shenzhen  baoan  518103\r
+                               CN\r
+\r
+88-5F-E8   (hex)               Shenzhen Xin Kingbrand Enterprises Co.,Ltd     \r
+600000-6FFFFF     (base 16)            Shenzhen Xin Kingbrand Enterprises Co.,Ltd     \r
+                               KingBrand Industrial Zone, Nanpu Road,Shang Liao Lin Pikeng,Shajing Town,Baoan District\r
+                               Shenzhen     518000\r
+                               CN\r
+\r
  2C-D1-41   (hex)               Beijing Hexing Chuangxiang Technology Co., Ltd.\r
  900000-9FFFFF     (base 16)            Beijing Hexing Chuangxiang Technology Co., Ltd.\r
                                 1306,A block,No.6 Zhichun Road\r
                                 Haidian District,  Beijing  100088\r
                                 CN\r
  \r
-30-1F-9A   (hex)               YiSheng technology  co.,LTD\r
-600000-6FFFFF     (base 16)            YiSheng technology  co.,LTD\r
-                               Xintian road no:71,  F#202\r
-                               shenzhen  baoan  518103\r
-                               CN\r
+30-1F-9A   (hex)               OLIMEX Ltd\r
+D00000-DFFFFF     (base 16)            OLIMEX Ltd\r
+                               2 Pravda\r
+                               Plovidv    4000\r
+                               BG\r
  \r
  88-5F-E8   (hex)               Jungheinrich Norderstedt AG & Co. KG\r
  000000-0FFFFF     (base 16)            Jungheinrich Norderstedt AG & Co. KG\r
@@ -13964,39 +14195,15 @@ A00000-AFFFFF     (base 16)           Lisle Design Ltd
                                 Mantova    46100\r
                                 IT\r
  \r
-30-1F-9A   (hex)               OLIMEX Ltd\r
-D00000-DFFFFF     (base 16)            OLIMEX Ltd\r
-                               2 Pravda\r
-                               Plovidv    4000\r
-                               BG\r
-\r
  30-1F-9A   (hex)               Private\r
  900000-9FFFFF     (base 16)            Private\r
  \r
-A4-DA-22   (hex)               General Electric Company\r
-000000-0FFFFF     (base 16)            General Electric Company\r
-                               Valle del Cedro #1551\r
-                               Ciudad Juarez  Chih  32575\r
-                               MX\r
-\r
  F0-41-C8   (hex)               Shenzhen  Nufilo Electronic Technology Co., Ltd.\r
  900000-9FFFFF     (base 16)            Shenzhen  Nufilo Electronic Technology Co., Ltd.\r
                                 Tianliao Building West Unit F1315, (New Materials Industrial Park),  Xueyuan Road,  Nanshan District\r
                                 Shenzhen   Guangdong  518055\r
                                 CN\r
  \r
-F0-41-C8   (hex)               AED Engineering GmbH\r
-600000-6FFFFF     (base 16)            AED Engineering GmbH\r
-                               Taunusstr. 51\r
-                               Munich  Bavaria  80807\r
-                               DE\r
-\r
-A4-DA-22   (hex)               Quuppa Oy\r
-E00000-EFFFFF     (base 16)            Quuppa Oy\r
-                               Keilaranta 1\r
-                               Espoo    02150\r
-                               FI\r
-\r
  F0-41-C8   (hex)               Nanchang BlackShark Co.,Ltd.\r
  700000-7FFFFF     (base 16)            Nanchang BlackShark Co.,Ltd.\r
                                 Room 319, Jiaoqiao Town Office Building, Economic and Technical development zone, Nanchang City, Jiangxi Province.\r
@@ -14015,12 +14222,24 @@ E00000-EFFFFF     (base 16)           Impact Distribution
                                 Pirmasens    66955\r
                                 DE\r
  \r
+F0-41-C8   (hex)               AED Engineering GmbH\r
+600000-6FFFFF     (base 16)            AED Engineering GmbH\r
+                               Taunusstr. 51\r
+                               Munich  Bavaria  80807\r
+                               DE\r
+\r
  88-A9-A7   (hex)               Solaredge LTD.\r
  100000-1FFFFF     (base 16)            Solaredge LTD.\r
                                 Hamada 1\r
                                 Herzelia    4673335\r
                                 IL\r
  \r
+A4-DA-22   (hex)               General Electric Company\r
+000000-0FFFFF     (base 16)            General Electric Company\r
+                               Valle del Cedro #1551\r
+                               Ciudad Juarez  Chih  32575\r
+                               MX\r
+\r
  88-A9-A7   (hex)               kimura giken corporation\r
  700000-7FFFFF     (base 16)            kimura giken corporation\r
                                 4-9-19 kamiyoga\r
@@ -14033,11 +14252,11 @@ A4-DA-22   (hex)              Wyze Labs Inc
                                 BOTHELL  WA  98021\r
                                 US\r
  \r
-DC-E5-33   (hex)               Controls Inc\r
-500000-5FFFFF     (base 16)            Controls Inc\r
-                               5204 Portside Drive\r
-                               Medina  OH  44256\r
-                               US\r
+A4-DA-22   (hex)               Quuppa Oy\r
+E00000-EFFFFF     (base 16)            Quuppa Oy\r
+                               Keilaranta 1\r
+                               Espoo    02150\r
+                               FI\r
  \r
  9C-43-1E   (hex)               ST Access Control System Corp.\r
  A00000-AFFFFF     (base 16)            ST Access Control System Corp.\r
@@ -14045,6 +14264,12 @@ A00000-AFFFFF     (base 16)            ST Access Control System Corp.
                                 New Taipei City    22054\r
                                 TW\r
  \r
+DC-E5-33   (hex)               Controls Inc\r
+500000-5FFFFF     (base 16)            Controls Inc\r
+                               5204 Portside Drive\r
+                               Medina  OH  44256\r
+                               US\r
+\r
  C4-FF-BC   (hex)               Danego BV\r
  000000-0FFFFF     (base 16)            Danego BV\r
                                 Protonenlaan 24\r
@@ -14057,28 +14282,16 @@ C4-FF-BC   (hex)              Critical Link
                                 Syracuse  null  13211\r
                                 US\r
  \r
-28-2C-02   (hex)               Capintec, Inc.\r
-E00000-EFFFFF     (base 16)            Capintec, Inc.\r
-                               7 Vreeland Road\r
-                               Florham Park  NJ  07932\r
-                               US\r
-\r
-18-9B-A5   (hex)               Innominds Software Inc\r
-400000-4FFFFF     (base 16)            Innominds Software Inc\r
-                               2055 Junction Ave Suite 122, San Jose CA 95131\r
-                               San Jose  CA  95131\r
-                               US\r
-\r
  28-2C-02   (hex)               Shenzhen Neoway Technology Co.,Ltd.\r
  800000-8FFFFF     (base 16)            Shenzhen Neoway Technology Co.,Ltd.\r
                                 4F-2#,Lian Jian Science & Industry Park,Huarong Road,Dalang Street,Longhua District\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-28-2C-02   (hex)               Astronics AES\r
-100000-1FFFFF     (base 16)            Astronics AES\r
-                               12950 Willows Rd NE \r
-                               Kirkland  WA  98034\r
+28-2C-02   (hex)               Capintec, Inc.\r
+E00000-EFFFFF     (base 16)            Capintec, Inc.\r
+                               7 Vreeland Road\r
+                               Florham Park  NJ  07932\r
                                 US\r
  \r
  28-2C-02   (hex)               SHENZHEN DOMENOR TECHNOLOGY LLC\r
@@ -14087,28 +14300,34 @@ D00000-DFFFFF     (base 16)           SHENZHEN DOMENOR TECHNOLOGY LLC
                                 SHENZHEN  GUANGDONG  518110\r
                                 CN\r
  \r
-40-48-FD   (hex)               Shenzhen Yifang Digital Technology Co., LTD. \r
-A00000-AFFFFF     (base 16)            Shenzhen Yifang Digital Technology Co., LTD. \r
-                               Building NO. 23, Fifth Region, Baiwangxin  Industrial Park, Songbai Rd. Nanshan, Shenzhen \r
-                               Shenzhen     518108\r
-                               CN\r
-\r
  F8-B5-68   (hex)               Solarius\r
  D00000-DFFFFF     (base 16)            Solarius\r
                                 Kaeshaldenstrasse 39\r
                                 Zurich    8052\r
                                 CH\r
  \r
+28-2C-02   (hex)               Astronics AES\r
+100000-1FFFFF     (base 16)            Astronics AES\r
+                               12950 Willows Rd NE \r
+                               Kirkland  WA  98034\r
+                               US\r
+\r
  F8-B5-68   (hex)               Package Guard, Inc\r
  600000-6FFFFF     (base 16)            Package Guard, Inc\r
                                 2819 33rd ave so\r
                                 seattle  WA  98144\r
                                 US\r
  \r
-38-73-EA   (hex)               KingWay Information Co.,Ltd.\r
-100000-1FFFFF     (base 16)            KingWay Information Co.,Ltd.\r
-                               3/F Rongxin business organization #56 Jinyan Road\r
-                               Fuzhou  Fujian  350000\r
+18-9B-A5   (hex)               Innominds Software Inc\r
+400000-4FFFFF     (base 16)            Innominds Software Inc\r
+                               2055 Junction Ave Suite 122, San Jose CA 95131\r
+                               San Jose  CA  95131\r
+                               US\r
+\r
+40-48-FD   (hex)               Shenzhen Yifang Digital Technology Co., LTD. \r
+A00000-AFFFFF     (base 16)            Shenzhen Yifang Digital Technology Co., LTD. \r
+                               Building NO. 23, Fifth Region, Baiwangxin  Industrial Park, Songbai Rd. Nanshan, Shenzhen \r
+                               Shenzhen     518108\r
                                 CN\r
  \r
  38-73-EA   (hex)               Shanghai ZoomSmart Technology Co., Ltd.\r
@@ -14123,6 +14342,18 @@ E00000-EFFFFF     (base 16)            MAX Technologies
                                 St-Lambert  Quebec  J4S1H1\r
                                 CA\r
  \r
+38-73-EA   (hex)               KingWay Information Co.,Ltd.\r
+100000-1FFFFF     (base 16)            KingWay Information Co.,Ltd.\r
+                               3/F Rongxin business organization #56 Jinyan Road\r
+                               Fuzhou  Fujian  350000\r
+                               CN\r
+\r
+EC-9F-0D   (hex)               Waverly Labs Inc.\r
+300000-3FFFFF     (base 16)            Waverly Labs Inc.\r
+                               19 Morris Avenue\r
+                               Brooklyn  NY  11205\r
+                               US\r
+\r
  34-D0-B8   (hex)               Kongqiguanjia (Beijing)Technology co.，ltd\r
  E00000-EFFFFF     (base 16)            Kongqiguanjia (Beijing)Technology co.，ltd\r
                                 Room 1201,Block A，Building of Fesco，Xidawang Road，Chaoyang district\r
@@ -14135,24 +14366,6 @@ E00000-EFFFFF     (base 16)            Kongqiguanjia (Beijing)Technology co.，ltd
                                 Berlin    10119\r
                                 DE\r
  \r
-34-D0-B8   (hex)               Shenzhen Rikomagic Tech Corp.,Ltd\r
-700000-7FFFFF     (base 16)            Shenzhen Rikomagic Tech Corp.,Ltd\r
-                               7021,7F Beifang Junyi Business Center, Lixin South RD,Fuyong Street,Bao'an \r
-                               Shenzhen   Guangdong  518103\r
-                               CN\r
-\r
-34-D0-B8   (hex)               Shenzhen Bao Lai Wei Intelligent Technology Co., L\r
-100000-1FFFFF     (base 16)            Shenzhen Bao Lai Wei Intelligent Technology Co., L\r
-                               Longgang Street Baolong Wu Road on the 2nd\r
-                               Shenzhen  Guangdong Province  518116\r
-                               CN\r
-\r
-EC-9F-0D   (hex)               Waverly Labs Inc.\r
-300000-3FFFFF     (base 16)            Waverly Labs Inc.\r
-                               19 Morris Avenue\r
-                               Brooklyn  NY  11205\r
-                               US\r
-\r
  EC-9F-0D   (hex)               DRB Systems\r
  200000-2FFFFF     (base 16)            DRB Systems\r
                                 3245 Pickle Road\r
@@ -14165,28 +14378,40 @@ D00000-DFFFFF     (base 16)           SKS Control Oy
                                 Vantaa    01720\r
                                 FI\r
  \r
+AC-1D-DF   (hex)               PiOctave Solutions Pvt Ltd\r
+000000-0FFFFF     (base 16)            PiOctave Solutions Pvt Ltd\r
+                               #1217, Ground Floor,4th Cross Road, 1st Block, HAL 3rd Stage\r
+                               BENGALURU  KARNATAKA  560 075\r
+                               IN\r
+\r
  AC-1D-DF   (hex)               Duravit AG\r
  E00000-EFFFFF     (base 16)            Duravit AG\r
                                 Werderstr. 36\r
                                 Hornberg  Baden Wuerttemberg  78132\r
                                 DE\r
  \r
+34-D0-B8   (hex)               Shenzhen Rikomagic Tech Corp.,Ltd\r
+700000-7FFFFF     (base 16)            Shenzhen Rikomagic Tech Corp.,Ltd\r
+                               7021,7F Beifang Junyi Business Center, Lixin South RD,Fuyong Street,Bao'an \r
+                               Shenzhen   Guangdong  518103\r
+                               CN\r
+\r
  AC-1D-DF   (hex)               Beijing Chunhong Technology Co., Ltd.\r
  C00000-CFFFFF     (base 16)            Beijing Chunhong Technology Co., Ltd.\r
                                 Room1502 Hailong Plaza, Zhongguancun, Haidian, Beijing\r
                                 Beijing    100000\r
                                 CN\r
  \r
-AC-1D-DF   (hex)               PiOctave Solutions Pvt Ltd\r
-000000-0FFFFF     (base 16)            PiOctave Solutions Pvt Ltd\r
-                               #1217, Ground Floor,4th Cross Road, 1st Block, HAL 3rd Stage\r
-                               BENGALURU  KARNATAKA  560 075\r
-                               IN\r
+34-D0-B8   (hex)               Shenzhen Bao Lai Wei Intelligent Technology Co., L\r
+100000-1FFFFF     (base 16)            Shenzhen Bao Lai Wei Intelligent Technology Co., L\r
+                               Longgang Street Baolong Wu Road on the 2nd\r
+                               Shenzhen  Guangdong Province  518116\r
+                               CN\r
  \r
-AC-1D-DF   (hex)               Shenzheng SenseTime Technology Co. Ltd\r
-600000-6FFFFF     (base 16)            Shenzheng SenseTime Technology Co. Ltd\r
-                               7F,Haixiang plaza, No.1052 Nanhai Road, Nanshan district\r
-                               Shenzhen  Guangdong  518000\r
+74-1A-E0   (hex)               SHEN ZHEN YINGJIACHUANG ELECTRONICS TECHNOLOGY CO.,LTD.\r
+B00000-BFFFFF     (base 16)            SHEN ZHEN YINGJIACHUANG ELECTRONICS TECHNOLOGY CO.,LTD.\r
+                               Building A,Baishunjia Industrial Park,Guangming New District\r
+                               Shenzhen    518107\r
                                 CN\r
  \r
  74-1A-E0   (hex)               Philips Personal Health Solutions\r
@@ -14195,17 +14420,23 @@ AC-1D-DF   (hex)              Shenzheng SenseTime Technology Co. Ltd
                                 Eindhoven    5656 AE\r
                                 NL\r
  \r
+AC-1D-DF   (hex)               Shenzheng SenseTime Technology Co. Ltd\r
+600000-6FFFFF     (base 16)            Shenzheng SenseTime Technology Co. Ltd\r
+                               7F,Haixiang plaza, No.1052 Nanhai Road, Nanshan district\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
  CC-22-37   (hex)               Beijing Safesoft Greatmaker Co.,ltd\r
  500000-5FFFFF     (base 16)            Beijing Safesoft Greatmaker Co.,ltd\r
                                 Room 501 ,Unit. D, Jinyujiahua Building ,No. 9 ,Shangdi Three Street , Haidian District \r
                                 Beijing    100144\r
                                 CN\r
  \r
-74-1A-E0   (hex)               SHEN ZHEN YINGJIACHUANG ELECTRONICS TECHNOLOGY CO.,LTD.\r
-B00000-BFFFFF     (base 16)            SHEN ZHEN YINGJIACHUANG ELECTRONICS TECHNOLOGY CO.,LTD.\r
-                               Building A,Baishunjia Industrial Park,Guangming New District\r
-                               Shenzhen    518107\r
-                               CN\r
+CC-22-37   (hex)               Siemens AG Austria\r
+600000-6FFFFF     (base 16)            Siemens AG Austria\r
+                               Siemensstrasse 90\r
+                               Wien    A-1210\r
+                               AT\r
  \r
  CC-22-37   (hex)               Shanghai Doit IOT Technology Co.,Ltd.\r
  700000-7FFFFF     (base 16)            Shanghai Doit IOT Technology Co.,Ltd.\r
@@ -14219,18 +14450,6 @@ CC-22-37   (hex)               MEDCOM sp. z o.o.
                                 Warszawa  woj. mazowieckie  02-230\r
                                 PL\r
  \r
-CC-22-37   (hex)               Siemens AG Austria\r
-600000-6FFFFF     (base 16)            Siemens AG Austria\r
-                               Siemensstrasse 90\r
-                               Wien    A-1210\r
-                               AT\r
-\r
-2C-27-9E   (hex)               WAYCOM Technology Co.,Ltd\r
-C00000-CFFFFF     (base 16)            WAYCOM Technology Co.,Ltd\r
-                               E-605,BLDG 201,A10 Jiuxianqiao North Road Chaoyang District,Beijing 100015,China\r
-                               Beijing    100000\r
-                               CN\r
-\r
  90-4E-91   (hex)               Shenzhen Cloudynamo Internet Technologies Co.,LTD.\r
  E00000-EFFFFF     (base 16)            Shenzhen Cloudynamo Internet Technologies Co.,LTD.\r
                                 NO.502 lingyun Building honglang north second road\r
@@ -14249,12 +14468,6 @@ A00000-AFFFFF     (base 16)            Kaertech Limited
                                 Hong Kong  Sheung Wan  00000\r
                                 HK\r
  \r
-34-29-8F   (hex)               ARC Technology Co., Ltd\r
-E00000-EFFFFF     (base 16)            ARC Technology Co., Ltd\r
-                               4F.-2, No.26, Wuquan 2nd Road, \r
-                               Xinzhuang District,  New Taipei City  24892\r
-                               TW\r
-\r
  18-9B-A5   (hex)               Mantra Softech India Pvt Ltd\r
  600000-6FFFFF     (base 16)            Mantra Softech India Pvt Ltd\r
                                 B203, Shapath Hexa, S.G. Highway, Sola,\r
@@ -14267,16 +14480,16 @@ B00000-BFFFFF     (base 16)           Eutron SPA
                                 Pradalunga  Bergamo  24020\r
                                 IT\r
  \r
-18-9B-A5   (hex)               Airprotec\r
-200000-2FFFFF     (base 16)            Airprotec\r
-                               Avenue de l'Industrie 22\r
-                               Braine-l'Alleud    1420\r
-                               BE\r
+2C-27-9E   (hex)               WAYCOM Technology Co.,Ltd\r
+C00000-CFFFFF     (base 16)            WAYCOM Technology Co.,Ltd\r
+                               E-605,BLDG 201,A10 Jiuxianqiao North Road Chaoyang District,Beijing 100015,China\r
+                               Beijing    100000\r
+                               CN\r
  \r
-34-00-8A   (hex)               ZQAM Communications\r
-100000-1FFFFF     (base 16)            ZQAM Communications\r
-                               3F., No.6, Innovation Road II, Science Park, \r
-                               Hsinchu    30076\r
+34-29-8F   (hex)               ARC Technology Co., Ltd\r
+E00000-EFFFFF     (base 16)            ARC Technology Co., Ltd\r
+                               4F.-2, No.26, Wuquan 2nd Road, \r
+                               Xinzhuang District,  New Taipei City  24892\r
                                 TW\r
  \r
  34-00-8A   (hex)               Federal Aviation Administration \r
@@ -14297,30 +14510,42 @@ B00000-BFFFFF     (base 16)           Eutron SPA
                                 Plouzane    29280\r
                                 FR\r
  \r
+34-29-8F   (hex)               Dongguan Kingtron Electronics Tech Co., Ltd\r
+700000-7FFFFF     (base 16)            Dongguan Kingtron Electronics Tech Co., Ltd\r
+                               No.3 Fumin North Rd,Shu'an Industrial Park, Humen Town\r
+                               Dongguan  Guangdong China  523929\r
+                               CN\r
+\r
+18-9B-A5   (hex)               Airprotec\r
+200000-2FFFFF     (base 16)            Airprotec\r
+                               Avenue de l'Industrie 22\r
+                               Braine-l'Alleud    1420\r
+                               BE\r
+\r
  34-00-8A   (hex)               Globex 99 LTD\r
  300000-3FFFFF     (base 16)            Globex 99 LTD\r
                                 Trakia bl. 240\r
                                 Plovdiv    4000\r
                                 BG\r
  \r
-34-29-8F   (hex)               Dongguan Kingtron Electronics Tech Co., Ltd\r
-700000-7FFFFF     (base 16)            Dongguan Kingtron Electronics Tech Co., Ltd\r
-                               No.3 Fumin North Rd,Shu'an Industrial Park, Humen Town\r
-                               Dongguan  Guangdong China  523929\r
+0C-EF-AF   (hex)               Hubei Century Network Technology Co., Ltd\r
+B00000-BFFFFF     (base 16)            Hubei Century Network Technology Co., Ltd\r
+                               9-11th floor, B7, FinancialHarbour, NO.77, Guanggu Avenue, East Lake New Technology Development Zone\r
+                               Wuhan  Hubei  430074\r
                                 CN\r
  \r
+34-00-8A   (hex)               ZQAM Communications\r
+100000-1FFFFF     (base 16)            ZQAM Communications\r
+                               3F., No.6, Innovation Road II, Science Park, \r
+                               Hsinchu    30076\r
+                               TW\r
+\r
  28-F5-37   (hex)               Matricx Singapore Pte Ltd\r
  C00000-CFFFFF     (base 16)            Matricx Singapore Pte Ltd\r
                                 2nd Flr. 2 Bldg., Detai Technology Industrial Park, Huarong Road No. 460, Dalang, Longhua district,\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-0C-EF-AF   (hex)               Hubei Century Network Technology Co., Ltd\r
-B00000-BFFFFF     (base 16)            Hubei Century Network Technology Co., Ltd\r
-                               9-11th floor, B7, FinancialHarbour, NO.77, Guanggu Avenue, East Lake New Technology Development Zone\r
-                               Wuhan  Hubei  430074\r
-                               CN\r
-\r
  28-F5-37   (hex)               Unicair Communication Tec Co., Ltd.\r
  200000-2FFFFF     (base 16)            Unicair Communication Tec Co., Ltd.\r
                                 深圳市宝安区西乡航空路与顺昌路交汇处梧桐岛1号楼8楼\r
@@ -14351,6 +14576,12 @@ B00000-BFFFFF     (base 16)            Hubei Century Network Technology Co., Ltd
                                 Shanghai    200120\r
                                 CN\r
  \r
+7C-BA-CC   (hex)               Maco Lighting Pty. Ltd.\r
+200000-2FFFFF     (base 16)            Maco Lighting Pty. Ltd.\r
+                               5/9 Stockwell Place\r
+                               Archerfield  Queensland  4108\r
+                               AU\r
+\r
  7C-BA-CC   (hex)               Collinear Networks Inc.\r
  800000-8FFFFF     (base 16)            Collinear Networks Inc.\r
                                 2901 Tasman Drive\r
@@ -14363,35 +14594,17 @@ B00000-BFFFFF     (base 16)           Hubei Century Network Technology Co., Ltd
                                 Plymouth  MN  55447\r
                                 US\r
  \r
-7C-BA-CC   (hex)               TGT Limited\r
-000000-0FFFFF     (base 16)            TGT Limited\r
-                               Flat/Rm 1003 10/F, Witty Commercial Building, 1A-1L Tung Choi Street, Hong Kong \r
-                               HongKong    529060\r
-                               HK\r
-\r
-7C-BA-CC   (hex)               Maco Lighting Pty. Ltd.\r
-200000-2FFFFF     (base 16)            Maco Lighting Pty. Ltd.\r
-                               5/9 Stockwell Place\r
-                               Archerfield  Queensland  4108\r
-                               AU\r
-\r
  F8-8A-3C   (hex)               withus\r
  900000-9FFFFF     (base 16)            withus\r
                                 Rua Dr. Mario Sacramento Ed. Colombo II N22\r
                                 Aveiro    3810-106\r
                                 PT\r
  \r
-F8-8A-3C   (hex)               EXCETOP TECHNOLOGY (BEIJING) CO., LTD.\r
-C00000-CFFFFF     (base 16)            EXCETOP TECHNOLOGY (BEIJING) CO., LTD.\r
-                               A03, 9th Floor, Horizon International Tower, No.6, Zhichun Road, Haidian District\r
-                               Beijing    100191\r
-                               CN\r
-\r
-A0-C5-F2   (hex)               Shenzhen Feima Robotics Technology Co.,Ltd\r
-300000-3FFFFF     (base 16)            Shenzhen Feima Robotics Technology Co.,Ltd\r
-                               1/f,16 ,Zhiheng Industrial Park, Nantou Second Road, Nantou Street, Nanshan District\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+7C-BA-CC   (hex)               TGT Limited\r
+000000-0FFFFF     (base 16)            TGT Limited\r
+                               Flat/Rm 1003 10/F, Witty Commercial Building, 1A-1L Tung Choi Street, Hong Kong \r
+                               HongKong    529060\r
+                               HK\r
  \r
  F8-8A-3C   (hex)               THK Co.,LTD.\r
  D00000-DFFFFF     (base 16)            THK Co.,LTD.\r
@@ -14399,28 +14612,22 @@ D00000-DFFFFF     (base 16)           THK Co.,LTD.
                                 Ota  Tokyo  1440033\r
                                 JP\r
  \r
+F8-8A-3C   (hex)               EXCETOP TECHNOLOGY (BEIJING) CO., LTD.\r
+C00000-CFFFFF     (base 16)            EXCETOP TECHNOLOGY (BEIJING) CO., LTD.\r
+                               A03, 9th Floor, Horizon International Tower, No.6, Zhichun Road, Haidian District\r
+                               Beijing    100191\r
+                               CN\r
+\r
  4C-65-A8   (hex)               Qingping Technology (Beijing) Co., Ltd.\r
  D00000-DFFFFF     (base 16)            Qingping Technology (Beijing) Co., Ltd.\r
                                 Room 401, Block B, Fangheng Times Square, No. 10 Wangjing Street, Chaoyang District\r
                                 Beijing    100102\r
                                 CN\r
  \r
-A0-C5-F2   (hex)               Spacepath Communications Ltd\r
-500000-5FFFFF     (base 16)            Spacepath Communications Ltd\r
-                               Unit 4, Bartley Point, Osborn Way\r
-                               Hook, Hampshire    RG27 9GX\r
-                               GB\r
-\r
-8C-14-7D   (hex)               V2 S.p.A.\r
-800000-8FFFFF     (base 16)            V2 S.p.A.\r
-                               Corso Principi di Piemonte 65/67\r
-                               Racconigi  Cuneo  12035\r
-                               IT\r
-\r
-A0-C5-F2   (hex)               ShenZhen JuWangShi Tech\r
-600000-6FFFFF     (base 16)            ShenZhen JuWangShi Tech\r
-                               Room 1701 Unit B2,Kexing Science Park,Keyuan Road\r
-                               ShenZhen  NanShan  518057\r
+A0-C5-F2   (hex)               Shenzhen Feima Robotics Technology Co.,Ltd\r
+300000-3FFFFF     (base 16)            Shenzhen Feima Robotics Technology Co.,Ltd\r
+                               1/f,16 ,Zhiheng Industrial Park, Nantou Second Road, Nantou Street, Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
  F0-23-B9   (hex)               Raysgem Electronics and Technology Co.Ltd\r
@@ -14441,11 +14648,23 @@ C00000-CFFFFF     (base 16)           Reynaers Aluminium
                                 HONG KONG    00000\r
                                 HK\r
  \r
-F0-23-B9   (hex)               Transcend Building Automation control network corporation\r
-700000-7FFFFF     (base 16)            Transcend Building Automation control network corporation\r
-                               15F. No.145 Ren’ai Rd. Xizhi Dist.\r
-                               New Taipei City  Taiwan  22164\r
-                               TW\r
+8C-14-7D   (hex)               V2 S.p.A.\r
+800000-8FFFFF     (base 16)            V2 S.p.A.\r
+                               Corso Principi di Piemonte 65/67\r
+                               Racconigi  Cuneo  12035\r
+                               IT\r
+\r
+A0-C5-F2   (hex)               ShenZhen JuWangShi Tech\r
+600000-6FFFFF     (base 16)            ShenZhen JuWangShi Tech\r
+                               Room 1701 Unit B2,Kexing Science Park,Keyuan Road\r
+                               ShenZhen  NanShan  518057\r
+                               CN\r
+\r
+A0-C5-F2   (hex)               Spacepath Communications Ltd\r
+500000-5FFFFF     (base 16)            Spacepath Communications Ltd\r
+                               Unit 4, Bartley Point, Osborn Way\r
+                               Hook, Hampshire    RG27 9GX\r
+                               GB\r
  \r
  8C-14-7D   (hex)               Agilent S.p.A\r
  200000-2FFFFF     (base 16)            Agilent S.p.A\r
@@ -14459,17 +14678,17 @@ F0-23-B9   (hex)              Transcend Building Automation control network corporation
                                 Paris    75004\r
                                 FR\r
  \r
-04-71-4B   (hex)               Armstrong Fluid Technology\r
-600000-6FFFFF     (base 16)            Armstrong Fluid Technology\r
-                               23 Bertrand Avenue\r
-                               Toronto  Ontario  M1L2P3\r
-                               CA\r
+F0-23-B9   (hex)               Transcend Building Automation control network corporation\r
+700000-7FFFFF     (base 16)            Transcend Building Automation control network corporation\r
+                               15F. No.145 Ren’ai Rd. Xizhi Dist.\r
+                               New Taipei City  Taiwan  22164\r
+                               TW\r
  \r
-04-71-4B   (hex)               Omylis Pte Ltd\r
-700000-7FFFFF     (base 16)            Omylis Pte Ltd\r
-                               150, South Bridge Road #06-04B, Fook Hai Building\r
-                               Singapore    058727\r
-                               SG\r
+04-71-4B   (hex)               Armstrong Fluid Technology\r
+600000-6FFFFF     (base 16)            Armstrong Fluid Technology\r
+                               23 Bertrand Avenue\r
+                               Toronto  Ontario  M1L2P3\r
+                               CA\r
  \r
  60-D7-E3   (hex)                LongSung Technology (Shanghai) Co.,Ltd.   \r
  900000-9FFFFF     (base 16)             LongSung Technology (Shanghai) Co.,Ltd.   \r
@@ -14477,17 +14696,11 @@ F0-23-B9   (hex)              Transcend Building Automation control network corporation
                                 ShangHai    201203\r
                                 CN\r
  \r
-08-ED-02   (hex)               Victiana SRL\r
-A00000-AFFFFF     (base 16)            Victiana SRL\r
-                               Strada A. Hasdeu, nr. 66/3\r
-                               Chisinau    MD-2001\r
-                               MD\r
-\r
-60-D7-E3   (hex)               Phase One A/S\r
-700000-7FFFFF     (base 16)            Phase One A/S\r
-                               Roskildevej 39\r
-                               Frederiksberg    2000\r
-                               DK\r
+04-71-4B   (hex)               Omylis Pte Ltd\r
+700000-7FFFFF     (base 16)            Omylis Pte Ltd\r
+                               150, South Bridge Road #06-04B, Fook Hai Building\r
+                               Singapore    058727\r
+                               SG\r
  \r
  60-D7-E3   (hex)               Novo innovations Ltd\r
  200000-2FFFFF     (base 16)            Novo innovations Ltd\r
@@ -14519,6 +14732,18 @@ A00000-AFFFFF     (base 16)            Victiana SRL
                                 Toronto  ON  M5C 1S2\r
                                 CA\r
  \r
+08-ED-02   (hex)               Victiana SRL\r
+A00000-AFFFFF     (base 16)            Victiana SRL\r
+                               Strada A. Hasdeu, nr. 66/3\r
+                               Chisinau    MD-2001\r
+                               MD\r
+\r
+60-D7-E3   (hex)               Phase One A/S\r
+700000-7FFFFF     (base 16)            Phase One A/S\r
+                               Roskildevej 39\r
+                               Frederiksberg    2000\r
+                               DK\r
+\r
  98-AA-FC   (hex)               Shenzhen Hubsan Technology Co.，LTD.\r
  700000-7FFFFF     (base 16)            Shenzhen Hubsan Technology Co.，LTD.\r
                                  Xuefu Road, Nanshan District, \r
@@ -14531,24 +14756,6 @@ A00000-AFFFFF     (base 16)            Victiana SRL
                                 Strängnäs    SE-64525\r
                                 SE\r
  \r
-14-4F-D7   (hex)               Shenzhen V-Streaming Technology Co., Ltd.\r
-700000-7FFFFF     (base 16)            Shenzhen V-Streaming Technology Co., Ltd.\r
-                               Room610, LangShanGe Building, Yugu Hi-Tech Park, Liuxin Road 1183, Nanshan District\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
-\r
-A4-11-63   (hex)               INTER CONTROL Hermann Köhler Elektrik GmbH & Co.KG\r
-100000-1FFFFF     (base 16)            INTER CONTROL Hermann Köhler Elektrik GmbH & Co.KG\r
-                               Schafhofstrasse 30\r
-                               Nuernberg    90411\r
-                               DE\r
-\r
-A4-11-63   (hex)               Allgo Tech. (Beijing) Co.,Ltd\r
-200000-2FFFFF     (base 16)            Allgo Tech. (Beijing) Co.,Ltd\r
-                               Room 6012 Innovation Building ,NO.101 Southwest of 4th Ring Road, Fengtai District\r
-                               Beijing  Beijing  100070\r
-                               CN\r
-\r
  A4-11-63   (hex)               Viloc\r
  C00000-CFFFFF     (base 16)            Viloc\r
                                 Langestraat, 221\r
@@ -14567,17 +14774,29 @@ A4-11-63   (hex)              Adetel Equipment
                                 Montréal  Québec  H4S 2G5\r
                                 CA\r
  \r
+A4-11-63   (hex)               tinylogics\r
+E00000-EFFFFF     (base 16)            tinylogics\r
+                               St John's Innovation Centre, Cambridge\r
+                               London    CB4 0WS\r
+                               GB\r
+\r
  A4-11-63   (hex)               ISE GmbH\r
  A00000-AFFFFF     (base 16)            ISE GmbH\r
                                 Osterstrasse 15\r
                                 Oldenburg    26122\r
                                 DE\r
  \r
-A4-11-63   (hex)               tinylogics\r
-E00000-EFFFFF     (base 16)            tinylogics\r
-                               St John's Innovation Centre, Cambridge\r
-                               London    CB4 0WS\r
-                               GB\r
+A4-11-63   (hex)               Allgo Tech. (Beijing) Co.,Ltd\r
+200000-2FFFFF     (base 16)            Allgo Tech. (Beijing) Co.,Ltd\r
+                               Room 6012 Innovation Building ,NO.101 Southwest of 4th Ring Road, Fengtai District\r
+                               Beijing  Beijing  100070\r
+                               CN\r
+\r
+14-4F-D7   (hex)               Shenzhen V-Streaming Technology Co., Ltd.\r
+700000-7FFFFF     (base 16)            Shenzhen V-Streaming Technology Co., Ltd.\r
+                               Room610, LangShanGe Building, Yugu Hi-Tech Park, Liuxin Road 1183, Nanshan District\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
  \r
  1C-A0-D3   (hex)               LYT inc.\r
  C00000-CFFFFF     (base 16)            LYT inc.\r
@@ -14591,6 +14810,12 @@ C00000-CFFFFF     (base 16)            LYT inc.
                                 Illescas  Toledo  45200\r
                                 ES\r
  \r
+A4-11-63   (hex)               INTER CONTROL Hermann Köhler Elektrik GmbH & Co.KG\r
+100000-1FFFFF     (base 16)            INTER CONTROL Hermann Köhler Elektrik GmbH & Co.KG\r
+                               Schafhofstrasse 30\r
+                               Nuernberg    90411\r
+                               DE\r
+\r
  38-FD-FE   (hex)               New Garden Co., Ltd.\r
  C00000-CFFFFF     (base 16)            New Garden Co., Ltd.\r
                                 2F, NO.58, Xingshan Rd., Neihu.,\r
@@ -14609,12 +14834,6 @@ A4-11-63   (hex)               AlterG, Inc.
                                 marcianise  caserta  81025\r
                                 IT\r
  \r
-40-F3-85   (hex)               Fast Precision Technologies Co. Ltd.\r
-900000-9FFFFF     (base 16)            Fast Precision Technologies Co. Ltd.\r
-                               4th Floor, Yang Tian Bldg., Chuang Ye Er Road & Yang Tian Road, Bao An District\r
-                               Shenzhen  Guangdong  518101\r
-                               CN\r
-\r
  1C-A0-D3   (hex)               DSM Messtechnik GmbH\r
  A00000-AFFFFF     (base 16)            DSM Messtechnik GmbH\r
                                 Dieselstrasse 16\r
@@ -14645,11 +14864,11 @@ B00000-BFFFFF     (base 16)           ZHENG DIAN ELECTRONICS LIMITED
                                 Beijing  Beijing  100085\r
                                 CN\r
  \r
-50-A4-D0   (hex)               Seneco A/S\r
-200000-2FFFFF     (base 16)            Seneco A/S\r
-                               Bøgekildevej 4\r
-                               Hasselager  Danmark  8361\r
-                               DK\r
+40-F3-85   (hex)               Lennox International Incorporated\r
+600000-6FFFFF     (base 16)            Lennox International Incorporated\r
+                               1600 Metrocrest Drive\r
+                               Carrollton  TX  75006\r
+                               US\r
  \r
  80-7B-85   (hex)               Chendu Ningshui Technology Co.,Ltd\r
  700000-7FFFFF     (base 16)            Chendu Ningshui Technology Co.,Ltd\r
@@ -14657,11 +14876,17 @@ B00000-BFFFFF     (base 16)           ZHENG DIAN ELECTRONICS LIMITED
                                 Chengdu  Sichuan  610500\r
                                 CN\r
  \r
-40-F3-85   (hex)               Lennox International Incorporated\r
-600000-6FFFFF     (base 16)            Lennox International Incorporated\r
-                               1600 Metrocrest Drive\r
-                               Carrollton  TX  75006\r
-                               US\r
+40-F3-85   (hex)               Fast Precision Technologies Co. Ltd.\r
+900000-9FFFFF     (base 16)            Fast Precision Technologies Co. Ltd.\r
+                               4th Floor, Yang Tian Bldg., Chuang Ye Er Road & Yang Tian Road, Bao An District\r
+                               Shenzhen  Guangdong  518101\r
+                               CN\r
+\r
+50-A4-D0   (hex)               Seneco A/S\r
+200000-2FFFFF     (base 16)            Seneco A/S\r
+                               Bøgekildevej 4\r
+                               Hasselager  Danmark  8361\r
+                               DK\r
  \r
  34-04-9E   (hex)               Pebble Technology\r
  700000-7FFFFF     (base 16)            Pebble Technology\r
@@ -14693,12 +14918,6 @@ A4-58-0F   (hex)               BLOKS. GmbH
                                 Munich    80992\r
                                 DE\r
  \r
-50-0B-91   (hex)               SPD Development Company Ltd\r
-100000-1FFFFF     (base 16)            SPD Development Company Ltd\r
-                               Stannard Way, Priory Business Park\r
-                               Bedford    MK44 3UP\r
-                               GB\r
-\r
  A4-58-0F   (hex)               INNOPRO\r
  000000-0FFFFF     (base 16)            INNOPRO\r
                                 Building 33, Dahe Industrial Zone, Huanguan South Rd., Guanlan Street,\r
@@ -14747,6 +14966,12 @@ A00000-AFFFFF     (base 16)            Shanghai Institute of Applied Physics, Chinese Acad
                                 Shanghai  Shanghai  201203\r
                                 CN\r
  \r
+50-0B-91   (hex)               SPD Development Company Ltd\r
+100000-1FFFFF     (base 16)            SPD Development Company Ltd\r
+                               Stannard Way, Priory Business Park\r
+                               Bedford    MK44 3UP\r
+                               GB\r
+\r
  50-0B-91   (hex)               thumbzup UK Limited\r
  B00000-BFFFFF     (base 16)            thumbzup UK Limited\r
                                 6th Floor, 94 Wigmore Street\r
@@ -14789,12 +15014,6 @@ C00000-CFFFFF     (base 16)            DNV GL
                                 Arnhem    6812 AR\r
                                 NL\r
  \r
-1C-C0-E1   (hex)               Yun Yang Fire Safety Equipment Co.,Ltd.\r
-E00000-EFFFFF     (base 16)            Yun Yang Fire Safety Equipment Co.,Ltd.\r
-                               No.11-4, Wanjin Rd., Dashe Dist., \r
-                               Kaohsiung City     815\r
-                               TW\r
-\r
  1C-C0-E1   (hex)               Kids Wireless Inc\r
  500000-5FFFFF     (base 16)            Kids Wireless Inc\r
                                 200 Bathurst Dr.\r
@@ -14807,17 +15026,11 @@ E00000-EFFFFF     (base 16)           Yun Yang Fire Safety Equipment Co.,Ltd.
                                 Hangzhou    311232\r
                                 CN\r
  \r
-AC-64-DD   (hex)               Micro Connect Pty Ltd\r
-900000-9FFFFF     (base 16)            Micro Connect Pty Ltd\r
-                               22 Gardenia Place\r
-                               FOREST GLEN  QLD  4556\r
-                               AU\r
-\r
-AC-64-DD   (hex)               SHANGHAI ZTE TECHNOLOGIES CO.,LTD\r
-500000-5FFFFF     (base 16)            SHANGHAI ZTE TECHNOLOGIES CO.,LTD\r
-                               Bibo Road, Shanghai Pudong Zhangjiang Hi-Tech Park, Building No. 889, ZTE H Block 6F\r
-                               SHANGHAI  SHANGHAI  201210\r
-                               CN\r
+1C-C0-E1   (hex)               Yun Yang Fire Safety Equipment Co.,Ltd.\r
+E00000-EFFFFF     (base 16)            Yun Yang Fire Safety Equipment Co.,Ltd.\r
+                               No.11-4, Wanjin Rd., Dashe Dist., \r
+                               Kaohsiung City     815\r
+                               TW\r
  \r
  AC-64-DD   (hex)               Kpnetworks Ltd.\r
  600000-6FFFFF     (base 16)            Kpnetworks Ltd.\r
@@ -14825,6 +15038,12 @@ AC-64-DD   (hex)               Kpnetworks Ltd.
                                 Minato-ku  Tokyo  108-0014\r
                                 JP\r
  \r
+AC-64-DD   (hex)               SHANGHAI ZTE TECHNOLOGIES CO.,LTD\r
+500000-5FFFFF     (base 16)            SHANGHAI ZTE TECHNOLOGIES CO.,LTD\r
+                               Bibo Road, Shanghai Pudong Zhangjiang Hi-Tech Park, Building No. 889, ZTE H Block 6F\r
+                               SHANGHAI  SHANGHAI  201210\r
+                               CN\r
+\r
  4C-E1-73   (hex)               jvi\r
  A00000-AFFFFF     (base 16)            jvi\r
                                 Ettenbergstrasse 19\r
@@ -14837,6 +15056,12 @@ AC-64-DD   (hex)               Jia-Teng
                                 Taipei  Taipei  114\r
                                 TW\r
  \r
+AC-64-DD   (hex)               Micro Connect Pty Ltd\r
+900000-9FFFFF     (base 16)            Micro Connect Pty Ltd\r
+                               22 Gardenia Place\r
+                               FOREST GLEN  QLD  4556\r
+                               AU\r
+\r
  4C-E1-73   (hex)               Lenovo Data Center Group\r
  200000-2FFFFF     (base 16)            Lenovo Data Center Group\r
                                 8001 Development Dr\r
@@ -14885,18 +15110,6 @@ E00000-EFFFFF     (base 16)            CUAV
                                 BEIJING  Beijing  10000\r
                                 CN\r
  \r
-70-F8-E7   (hex)               System-on-Chip engineering\r
-D00000-DFFFFF     (base 16)            System-on-Chip engineering\r
-                               Jose María Escuza 23 Entreplanta Dcha D\r
-                               Bilbao  Bizkaia  ES48013\r
-                               ES\r
-\r
-84-E0-F4   (hex)               Hangzhou Nationalchip Science & Technology Co.,Ltd.\r
-500000-5FFFFF     (base 16)            Hangzhou Nationalchip Science & Technology Co.,Ltd.\r
-                               5-6th Floor, Innovation Mansion East Software Park,90# Wensan Road\r
-                               Hangzhou  Zhejiang  310012\r
-                               CN\r
-\r
  70-F8-E7   (hex)               NST Technology Limited Co.,Ltd.\r
  700000-7FFFFF     (base 16)            NST Technology Limited Co.,Ltd.\r
                                 1F,ABuilding,Juxie Zuo,No.18 Zhenze Road, \r
@@ -14909,18 +15122,24 @@ D00000-DFFFFF     (base 16)           System-on-Chip engineering
                                 Osaka-city  Osaka-fu  541-0053\r
                                 JP\r
  \r
+84-E0-F4   (hex)               Hangzhou Nationalchip Science & Technology Co.,Ltd.\r
+500000-5FFFFF     (base 16)            Hangzhou Nationalchip Science & Technology Co.,Ltd.\r
+                               5-6th Floor, Innovation Mansion East Software Park,90# Wensan Road\r
+                               Hangzhou  Zhejiang  310012\r
+                               CN\r
+\r
+70-F8-E7   (hex)               System-on-Chip engineering\r
+D00000-DFFFFF     (base 16)            System-on-Chip engineering\r
+                               Jose María Escuza 23 Entreplanta Dcha D\r
+                               Bilbao  Bizkaia  ES48013\r
+                               ES\r
+\r
  70-F8-E7   (hex)               Photonfocus AG\r
  B00000-BFFFFF     (base 16)            Photonfocus AG\r
                                 Bahnhofplatz 10\r
                                 Lachen  SZ  8853\r
                                 CH\r
  \r
-84-E0-F4   (hex)               PetroInTrade\r
-400000-4FFFFF     (base 16)            PetroInTrade\r
-                               Engelsa 71\r
-                               Saint-Peterburg    194214\r
-                               RU\r
-\r
  84-E0-F4   (hex)               SHENZHEN HCN.ELECTRONICS CO.,LTD.\r
  900000-9FFFFF     (base 16)            SHENZHEN HCN.ELECTRONICS CO.,LTD.\r
                                 8F, Block C3, Nanshan I Park, No.1001 Xueyuan Road, Nanshan District\r
@@ -14933,10 +15152,16 @@ D00000-DFFFFF     (base 16)           Logos01 Srl
                                 Marmirolo  MN  46045\r
                                 IT\r
  \r
-5C-F2-86   (hex)               Shenzhen VST Automotive Electronics Co., LTD\r
-900000-9FFFFF     (base 16)            Shenzhen VST Automotive Electronics Co., LTD\r
-                               3 floor,1Building, No.3 West of ShangXue Science and technology park, Bantian town, LongGang District\r
-                               ShenZhen  Guangdong  518100\r
+84-E0-F4   (hex)               PetroInTrade\r
+400000-4FFFFF     (base 16)            PetroInTrade\r
+                               Engelsa 71\r
+                               Saint-Peterburg    194214\r
+                               RU\r
+\r
+C0-D3-91   (hex)               Fuzhou Jinshi Technology Co.,Ltd.\r
+000000-0FFFFF     (base 16)            Fuzhou Jinshi Technology Co.,Ltd.\r
+                               Block A, Building 39#，District D, Software Park\r
+                               Fuzhou  Fujian Province  350003\r
                                 CN\r
  \r
  C0-D3-91   (hex)               Vernier Software & Technology\r
@@ -14945,12 +15170,18 @@ C0-D3-91   (hex)              Vernier Software & Technology
                                 Beaverton  OR  97005\r
                                 US\r
  \r
-C0-D3-91   (hex)               Fuzhou Jinshi Technology Co.,Ltd.\r
-000000-0FFFFF     (base 16)            Fuzhou Jinshi Technology Co.,Ltd.\r
-                               Block A, Building 39#，District D, Software Park\r
-                               Fuzhou  Fujian Province  350003\r
+5C-F2-86   (hex)               Shenzhen VST Automotive Electronics Co., LTD\r
+900000-9FFFFF     (base 16)            Shenzhen VST Automotive Electronics Co., LTD\r
+                               3 floor,1Building, No.3 West of ShangXue Science and technology park, Bantian town, LongGang District\r
+                               ShenZhen  Guangdong  518100\r
                                 CN\r
  \r
+C0-D3-91   (hex)               Ernitec\r
+600000-6FFFFF     (base 16)            Ernitec\r
+                               Tempovej 41\r
+                               Ballerup    2750\r
+                               DK\r
+\r
  58-E8-76   (hex)               Beijing Perabytes IS Technology Co., Ltd\r
  100000-1FFFFF     (base 16)            Beijing Perabytes IS Technology Co., Ltd\r
                                 2F, Office Building, No. 2 Yard, Longxiang Printing-plate Group, North of Huilongguan Village, Huilongguan Town, ChangPing District，Beijing 102208, P.R. China\r
@@ -14969,12 +15200,6 @@ E00000-EFFFFF     (base 16)             Baoruh Electronic Co., Ltd.
                                 Stockholm    11451\r
                                 SE\r
  \r
-C0-D3-91   (hex)               Ernitec\r
-600000-6FFFFF     (base 16)            Ernitec\r
-                               Tempovej 41\r
-                               Ballerup    2750\r
-                               DK\r
-\r
  58-E8-76   (hex)               Chronos Technology Ltd.\r
  700000-7FFFFF     (base 16)            Chronos Technology Ltd.\r
                                 Stowfield House\r
@@ -14987,22 +15212,16 @@ C00000-CFFFFF     (base 16)           Simprints Technology Ltd
                                 Cambridge    CB4 1DZ\r
                                 GB\r
  \r
-F0-AC-D7   (hex)               U3storage Technologies Co., Ltd\r
-900000-9FFFFF     (base 16)            U3storage Technologies Co., Ltd\r
-                               information Road No. 26 , Haidian District \r
-                               BEIJING    100085\r
-                               CN\r
-\r
  B0-C5-CA   (hex)               SHENZHEN KTC TECHNOLOGY GROUP \r
  700000-7FFFFF     (base 16)            SHENZHEN KTC TECHNOLOGY GROUP \r
                                 Northern Wuhe Road,Banxuegang Industry Area,Buji,Shenzhen,China\r
                                 Shenzhen  Guangdong  518129\r
                                 CN\r
  \r
-28-36-38   (hex)               Sabinetek\r
-300000-3FFFFF     (base 16)            Sabinetek\r
-                               NO.1406  Hong Yuan Building  ,Jiu Xian Qiao Road A 4,Chao Yang Beijing China\r
-                               Beijing  Beijing  100000\r
+F0-AC-D7   (hex)               U3storage Technologies Co., Ltd\r
+900000-9FFFFF     (base 16)            U3storage Technologies Co., Ltd\r
+                               information Road No. 26 , Haidian District \r
+                               BEIJING    100085\r
                                 CN\r
  \r
  28-36-38   (hex)               SHENZHEN GOSPELL SMARTHOME ELECTRONIC CO., LTD.\r
@@ -15011,23 +15230,29 @@ B0-C5-CA   (hex)              SHENZHEN KTC TECHNOLOGY GROUP
                                 Shenzhen  Guangdong  518102\r
                                 CN\r
  \r
+28-36-38   (hex)               Sabinetek\r
+300000-3FFFFF     (base 16)            Sabinetek\r
+                               NO.1406  Hong Yuan Building  ,Jiu Xian Qiao Road A 4,Chao Yang Beijing China\r
+                               Beijing  Beijing  100000\r
+                               CN\r
+\r
  78-CA-83   (hex)               Hubei Boyuan Zhijia Network Media Co. Ltd.\r
  D00000-DFFFFF     (base 16)            Hubei Boyuan Zhijia Network Media Co. Ltd.\r
                                 Wuhan City, Hubei City, Optics Valley Province, Optics Valley 77, city, financial port A3 12\r
                                 Wuhan  Hubei  42000\r
                                 CN\r
  \r
+78-C2-C0   (hex)               SICHUAN TIANYI COMHEART TELECOMCO.,LTD\r
+600000-6FFFFF     (base 16)            SICHUAN TIANYI COMHEART TELECOMCO.,LTD\r
+                               FL12,TowerB,Tianyi international Hotel,No.2 West Section One, Second Ring Road, Chengdu, Sichuan\r
+                               Chengdu  Sichuan  610000\r
+                               CN\r
+\r
  8C-19-2D   (hex)               Elcon AB\r
  E00000-EFFFFF     (base 16)            Elcon AB\r
-                               Hyttrisvagen 27\r
-                               Nyhammar    77014\r
-                               SE\r
-\r
-D0-D9-4F   (hex)               APPOTRONICS CO., LTD\r
-E00000-EFFFFF     (base 16)            APPOTRONICS CO., LTD\r
-                               4th Floor,SZICC,NO.1089,Chaguang Road,Nanshan District, Shenzhen, China\r
-                               Shenzhen  Guangdong  518000\r
-                               CN\r
+                               Hyttrisvagen 27\r
+                               Nyhammar    77014\r
+                               SE\r
  \r
  8C-19-2D   (hex)               Greenfield Technology\r
  300000-3FFFFF     (base 16)            Greenfield Technology\r
@@ -15035,10 +15260,10 @@ E00000-EFFFFF     (base 16)           APPOTRONICS CO., LTD
                                 massy    91300\r
                                 FR\r
  \r
-78-C2-C0   (hex)               SICHUAN TIANYI COMHEART TELECOMCO.,LTD\r
-600000-6FFFFF     (base 16)            SICHUAN TIANYI COMHEART TELECOMCO.,LTD\r
-                               FL12,TowerB,Tianyi international Hotel,No.2 West Section One, Second Ring Road, Chengdu, Sichuan\r
-                               Chengdu  Sichuan  610000\r
+D0-D9-4F   (hex)               APPOTRONICS CO., LTD\r
+E00000-EFFFFF     (base 16)            APPOTRONICS CO., LTD\r
+                               4th Floor,SZICC,NO.1089,Chaguang Road,Nanshan District, Shenzhen, China\r
+                               Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
  CC-D3-1E   (hex)               Shenzhen Decnta Technology Co.,LTD.\r
@@ -15047,11 +15272,11 @@ CC-D3-1E   (hex)              Shenzhen Decnta Technology Co.,LTD.
                                 shenzhen  Guangdong  518057\r
                                 CN\r
  \r
-CC-D3-1E   (hex)               inoage GmbH\r
-800000-8FFFFF     (base 16)            inoage GmbH\r
-                               Wiener Str. 56\r
-                               Dresden    01219\r
-                               DE\r
+C4-7C-8D   (hex)               Star2Star Communications, LLC\r
+200000-2FFFFF     (base 16)            Star2Star Communications, LLC\r
+                               600 Tallevast Road, Suite 202\r
+                               Sarasota  FL  34243\r
+                               US\r
  \r
  CC-D3-1E   (hex)               NTmore.Co.,Ltd\r
  500000-5FFFFF     (base 16)            NTmore.Co.,Ltd\r
@@ -15059,17 +15284,23 @@ CC-D3-1E   (hex)              NTmore.Co.,Ltd
                                 Anyang  Gyeonggi  431-801\r
                                 KR\r
  \r
+CC-D3-1E   (hex)               inoage GmbH\r
+800000-8FFFFF     (base 16)            inoage GmbH\r
+                               Wiener Str. 56\r
+                               Dresden    01219\r
+                               DE\r
+\r
  C4-7C-8D   (hex)               Anhui GuangXing Linked-Video Communication Technology Co, Ltd.\r
  D00000-DFFFFF     (base 16)            Anhui GuangXing Linked-Video Communication Technology Co, Ltd.\r
                                 Floor 6, Block B, Idiopathic Information Technology Port, Kefeng Road No. 2, Nanshan District\r
                                 Shenzhen  Guangdong  518057\r
                                 CN\r
  \r
-C4-7C-8D   (hex)               Star2Star Communications, LLC\r
-200000-2FFFFF     (base 16)            Star2Star Communications, LLC\r
-                               600 Tallevast Road, Suite 202\r
-                               Sarasota  FL  34243\r
-                               US\r
+68-91-D0   (hex)               solvimus GmbH\r
+800000-8FFFFF     (base 16)            solvimus GmbH\r
+                               Ehrenbergstr. 11\r
+                               Ilmenau    98693\r
+                               DE\r
  \r
  68-91-D0   (hex)               Spraying Systems Co.\r
  C00000-CFFFFF     (base 16)            Spraying Systems Co.\r
@@ -15083,11 +15314,11 @@ D00000-DFFFFF     (base 16)           Fuzhou x-speed information technology Co.,Ltd.
                                 Fuzhou  Fujian  350008\r
                                 CN\r
  \r
-68-91-D0   (hex)               solvimus GmbH\r
-800000-8FFFFF     (base 16)            solvimus GmbH\r
-                               Ehrenbergstr. 11\r
-                               Ilmenau    98693\r
-                               DE\r
+E0-B6-F5   (hex)               Moog Crossbow\r
+B00000-BFFFFF     (base 16)            Moog Crossbow\r
+                               1421 McCarthy Blvd\r
+                               Milpitas  CA  95035\r
+                               US\r
  \r
  E0-B6-F5   (hex)               START TODAY CO.,LTD.\r
  100000-1FFFFF     (base 16)            START TODAY CO.,LTD.\r
@@ -15101,24 +15332,12 @@ A00000-AFFFFF     (base 16)           metraTec GmbH
                                 Magdeburg  Sachsen-Anh.  39106\r
                                 DE\r
  \r
-E0-B6-F5   (hex)               Moog Crossbow\r
-B00000-BFFFFF     (base 16)            Moog Crossbow\r
-                               1421 McCarthy Blvd\r
-                               Milpitas  CA  95035\r
-                               US\r
-\r
  50-FF-99   (hex)               Dolphin Concepts Limited\r
  800000-8FFFFF     (base 16)            Dolphin Concepts Limited\r
                                 A 10, Unit B-E\r
                                 11/F, Genesis, 33-35 Wong Chuk Hang Road,  Hong Kong  11111\r
                                 HK\r
  \r
-98-6D-35   (hex)               BAYCOM OPTO-ELECTRONICS TECHNOLGY CO., LTD.\r
-E00000-EFFFFF     (base 16)            BAYCOM OPTO-ELECTRONICS TECHNOLGY CO., LTD.\r
-                               3F, NO.9, INDUSTRIAL EAST 9TH RD. HSINCHU SCIENCE PARK, HSIN-CHU CITY, TAIWAN, R.O.C.\r
-                               HSIN-CHU    30075\r
-                               TW\r
-\r
  98-6D-35   (hex)               SHENZHEN FISE TECHNOLOGY HOLDING CO.,LTD.\r
  200000-2FFFFF     (base 16)            SHENZHEN FISE TECHNOLOGY HOLDING CO.,LTD.\r
                                 No.6 Building, Longfu Industrial Area, Huarong Road, Tongsheng Community, Dalang Street, Longhua New District, Shenzhen, Guangdong, China\r
@@ -15131,6 +15350,18 @@ B00000-BFFFFF     (base 16)            INTECH
                                 Xiamen  Fujian  361008\r
                                 CN\r
  \r
+98-6D-35   (hex)               BAYCOM OPTO-ELECTRONICS TECHNOLGY CO., LTD.\r
+E00000-EFFFFF     (base 16)            BAYCOM OPTO-ELECTRONICS TECHNOLGY CO., LTD.\r
+                               3F, NO.9, INDUSTRIAL EAST 9TH RD. HSINCHU SCIENCE PARK, HSIN-CHU CITY, TAIWAN, R.O.C.\r
+                               HSIN-CHU    30075\r
+                               TW\r
+\r
+98-6D-35   (hex)               iWave Japan, Inc.\r
+A00000-AFFFFF     (base 16)            iWave Japan, Inc.\r
+                               8F-B,Kannai Sumiyoshi Building,3-29 Sumiyoshi-Cho,Naka-Ku,\r
+                               Yokohama, Kanagawa    231-0013\r
+                               JP\r
+\r
  10-07-23   (hex)               Diginet Control Systems Pty Ltd\r
  200000-2FFFFF     (base 16)            Diginet Control Systems Pty Ltd\r
                                 96-112 Gow Street\r
@@ -15143,41 +15374,23 @@ B00000-BFFFFF     (base 16)           Hangzhou Yiyitaidi Information Technology Co., Ltd.
                                 Hangzhou  Zhejiang  310019\r
                                 CN\r
  \r
-98-6D-35   (hex)               iWave Japan, Inc.\r
-A00000-AFFFFF     (base 16)            iWave Japan, Inc.\r
-                               8F-B,Kannai Sumiyoshi Building,3-29 Sumiyoshi-Cho,Naka-Ku,\r
-                               Yokohama, Kanagawa    231-0013\r
-                               JP\r
-\r
  5C-F2-86   (hex)               Itron UK Limited\r
  B00000-BFFFFF     (base 16)            Itron UK Limited\r
                                 Harfreys Road , Harfreys Ind. Estate\r
                                 Great Yarmouth    NR31 0LS\r
                                 GB\r
  \r
-7C-47-7C   (hex)               POWERLAND LIMITED\r
-200000-2FFFFF     (base 16)            POWERLAND LIMITED\r
-                               7F, Buiding A2, ZhongTai Information Industry Park, DeZheng Road, ShiYan Street.\r
-                               ShenZhen  GuangDong  518108\r
-                               CN\r
-\r
  38-FD-FE   (hex)               WAYTONE (BEIIJNG) COMMUNICATIONS CO.,LTD\r
  100000-1FFFFF     (base 16)            WAYTONE (BEIIJNG) COMMUNICATIONS CO.,LTD\r
                                 ROOM 201B,KESHI BUILDING,NO.28 XINXI ROAD HAIDIAN BEIJING,P.R.CHINA \r
                                 Beijing  Beijing  100085 \r
                                 CN\r
  \r
-38-FD-FE   (hex)               Siemens AG, PG IE R&D\r
-300000-3FFFFF     (base 16)            Siemens AG, PG IE R&D\r
-                               Siemensalle 84\r
-                               Karlsruhe    76187\r
-                               DE\r
-\r
-38-B8-EB   (hex)               barox Kommunikation GmbH\r
-200000-2FFFFF     (base 16)            barox Kommunikation GmbH\r
-                               Marie-Curie-Strasse 8\r
-                               Lörrach    DE-79539\r
-                               DE\r
+7C-47-7C   (hex)               POWERLAND LIMITED\r
+200000-2FFFFF     (base 16)            POWERLAND LIMITED\r
+                               7F, Buiding A2, ZhongTai Information Industry Park, DeZheng Road, ShiYan Street.\r
+                               ShenZhen  GuangDong  518108\r
+                               CN\r
  \r
  38-B8-EB   (hex)               Yellowbrick Data, Inc.\r
  D00000-DFFFFF     (base 16)            Yellowbrick Data, Inc.\r
@@ -15185,12 +15398,24 @@ D00000-DFFFFF     (base 16)           Yellowbrick Data, Inc.
                                 Palo Alto  CA  94306\r
                                 US\r
  \r
+38-FD-FE   (hex)               Siemens AG, PG IE R&D\r
+300000-3FFFFF     (base 16)            Siemens AG, PG IE R&D\r
+                               Siemensalle 84\r
+                               Karlsruhe    76187\r
+                               DE\r
+\r
  38-B8-EB   (hex)               MATRIXSTREAM TECHNOLOGIES, INC.\r
  600000-6FFFFF     (base 16)            MATRIXSTREAM TECHNOLOGIES, INC.\r
                                 303 Twin Dolphins Drive 6th Floor Redwood Shores, california,USA 94065 \r
                                 california     94065 \r
                                 AM\r
  \r
+38-B8-EB   (hex)               barox Kommunikation GmbH\r
+200000-2FFFFF     (base 16)            barox Kommunikation GmbH\r
+                               Marie-Curie-Strasse 8\r
+                               Lörrach    DE-79539\r
+                               DE\r
+\r
  1C-88-79   (hex)               gekartel AG\r
  B00000-BFFFFF     (base 16)            gekartel AG\r
                                 Julius-Otto-Straße 7\r
@@ -15203,6 +15428,18 @@ B00000-BFFFFF     (base 16)            gekartel AG
                                 Daegu  Korea  41502\r
                                 KR\r
  \r
+1C-87-74   (hex)               Quest Integrity\r
+E00000-EFFFFF     (base 16)            Quest Integrity\r
+                               19823 58TH PL S, STE 100\r
+                               Kent  WA  98032\r
+                               US\r
+\r
+1C-88-79   (hex)               ITW-FEG\r
+A00000-AFFFFF     (base 16)            ITW-FEG\r
+                               155 Harlem Avenue\r
+                               Glenview  IL  60025\r
+                               US\r
+\r
  1C-87-76   (hex)               Artis GmbH\r
  E00000-EFFFFF     (base 16)            Artis GmbH\r
                                 Buchenring 40\r
@@ -15221,18 +15458,6 @@ E00000-EFFFFF     (base 16)            ASSYSTEM France
                                 TOULOUSE    31024\r
                                 FR\r
  \r
-1C-87-74   (hex)               Quest Integrity\r
-E00000-EFFFFF     (base 16)            Quest Integrity\r
-                               19823 58TH PL S, STE 100\r
-                               Kent  WA  98032\r
-                               US\r
-\r
-1C-88-79   (hex)               ITW-FEG\r
-A00000-AFFFFF     (base 16)            ITW-FEG\r
-                               155 Harlem Avenue\r
-                               Glenview  IL  60025\r
-                               US\r
-\r
  1C-87-74   (hex)               Nichigaku\r
  200000-2FFFFF     (base 16)            Nichigaku\r
                                 Oimachi 1-49-15\r
@@ -15263,6 +15488,12 @@ B00000-BFFFFF     (base 16)            Hekatron Vertriebs GmbH
                                 Langley  BRITISH COLUMBIA  V1M4B5\r
                                 CA\r
  \r
+1C-87-79   (hex)               SMARTMOVT TECHNOLOGY Co.， LTD\r
+200000-2FFFFF     (base 16)            SMARTMOVT TECHNOLOGY Co.， LTD\r
+                               Room204-210, F3 building, F518 Idea Land, Baoyuan road, Xixiang Ave, Bao’an District\r
+                               Shenzhen  Guangdong  518100 \r
+                               CN\r
+\r
  1C-87-79   (hex)               Beijing Geedeen Technology Co., Ltd\r
  B00000-BFFFFF     (base 16)            Beijing Geedeen Technology Co., Ltd\r
                                 Room 1701, Building A, Boya International Center, Lizezhongerlu, Chaoyang District\r
@@ -15275,12 +15506,6 @@ B00000-BFFFFF     (base 16)            Beijing Geedeen Technology Co., Ltd
                                 Guangzhou  Guangdong  510000\r
                                 CN\r
  \r
-1C-87-79   (hex)               SMARTMOVT TECHNOLOGY Co.， LTD\r
-200000-2FFFFF     (base 16)            SMARTMOVT TECHNOLOGY Co.， LTD\r
-                               Room204-210, F3 building, F518 Idea Land, Baoyuan road, Xixiang Ave, Bao’an District\r
-                               Shenzhen  Guangdong  518100 \r
-                               CN\r
-\r
  70-88-6B   (hex)               Church & Dwight Co., Inc.\r
  600000-6FFFFF     (base 16)            Church & Dwight Co., Inc.\r
                                 500 Charles Ewing Blvd\r
@@ -15293,29 +15518,47 @@ C00000-CFFFFF     (base 16)           Onion Corporation
                                 Markham  Ontario  L3R 1B5\r
                                 CA\r
  \r
-70-88-6B   (hex)               Cable Matters Inc.\r
-800000-8FFFFF     (base 16)            Cable Matters Inc.\r
-                               153 Northboro Road, Suite 5\r
-                               Southborough  MA  01772\r
-                               US\r
-\r
  70-88-6B   (hex)               Bitfinder Inc\r
  100000-1FFFFF     (base 16)            Bitfinder Inc\r
                                 20660 Stevens Creeks #345\r
                                 Cupertino  CA  95014\r
                                 US\r
  \r
+40-A3-6B   (hex)               TW-TeamWare\r
+100000-1FFFFF     (base 16)            TW-TeamWare\r
+                               Via Pindaro, 19\r
+                               Milano    20128\r
+                               IT\r
+\r
+70-88-6B   (hex)               Cable Matters Inc.\r
+800000-8FFFFF     (base 16)            Cable Matters Inc.\r
+                               153 Northboro Road, Suite 5\r
+                               Southborough  MA  01772\r
+                               US\r
+\r
  70-88-6B   (hex)               Shenzhen Coolhear Information Technology Co., Ltd.\r
  900000-9FFFFF     (base 16)            Shenzhen Coolhear Information Technology Co., Ltd.\r
                                 Room 502,Building A4, Kexing Science Park, Keyuan Road, Nanshan Distrct, Shenzhen, Guangdong,\r
                                 Shenzhen  Guangdong  518000\r
                                 CN\r
  \r
-40-A3-6B   (hex)               TW-TeamWare\r
-100000-1FFFFF     (base 16)            TW-TeamWare\r
-                               Via Pindaro, 19\r
-                               Milano    20128\r
-                               IT\r
+00-55-DA   (hex)               OOO DEKATRON\r
+600000-6FFFFF     (base 16)            OOO DEKATRON\r
+                               Oseny boulevard 15 apart. 394\r
+                               Moscow  Moscow  121609\r
+                               RU\r
+\r
+00-55-DA   (hex)               Quantum Communication Technology Co., Ltd.,Anhui\r
+900000-9FFFFF     (base 16)            Quantum Communication Technology Co., Ltd.,Anhui\r
+                               D3 Innovation Industrial Park, No. 800 Wangjiang West Road, Hefei Hi-tech Industrial Development Zone, Hefei City, Anhui Province, China\r
+                               Hefei  Anhui  230088\r
+                               CN\r
+\r
+CC-1B-E0   (hex)               Cassia Networks\r
+E00000-EFFFFF     (base 16)            Cassia Networks\r
+                               Room B206 , ZhongGuanCun FaZhanDaSha\r
+                               Beijing  Beijing  100085\r
+                               CN\r
  \r
  80-0A-80   (hex)               Golana Technology (Shenzhen) Co., Ltd.\r
  000000-0FFFFF     (base 16)            Golana Technology (Shenzhen) Co., Ltd.\r
@@ -15335,24 +15578,30 @@ CC-1B-E0   (hex)              Beijing Daotongtianxia Co.Ltd.
                                 Beijing  Beijing  100088\r
                                 CN\r
  \r
-00-55-DA   (hex)               OOO DEKATRON\r
-600000-6FFFFF     (base 16)            OOO DEKATRON\r
-                               Oseny boulevard 15 apart. 394\r
-                               Moscow  Moscow  121609\r
-                               RU\r
-\r
-CC-1B-E0   (hex)               Cassia Networks\r
-E00000-EFFFFF     (base 16)            Cassia Networks\r
-                               Room B206 , ZhongGuanCun FaZhanDaSha\r
-                               Beijing  Beijing  100085\r
+A0-3E-6B   (hex)               Shenzhen Nufilo Inc.\r
+400000-4FFFFF     (base 16)            Shenzhen Nufilo Inc.\r
+                               Tianliao Building F3,(New Materials Industrial Park),Xueyuan Road,Nanshan District,Shenzhen City,P.R.China\r
+                               Shenzhen  Guangdong  518055\r
                                 CN\r
  \r
-00-55-DA   (hex)               Quantum Communication Technology Co., Ltd.,Anhui\r
-900000-9FFFFF     (base 16)            Quantum Communication Technology Co., Ltd.,Anhui\r
-                               D3 Innovation Industrial Park, No. 800 Wangjiang West Road, Hefei Hi-tech Industrial Development Zone, Hefei City, Anhui Province, China\r
-                               Hefei  Anhui  230088\r
+C8-8E-D1   (hex)               Ube, Inc. (dba Plum)\r
+700000-7FFFFF     (base 16)            Ube, Inc. (dba Plum)\r
+                               9800 N. Lamar Blvd., STE 310\r
+                               Austin  TX  78753-4160\r
+                               US\r
+\r
+C8-8E-D1   (hex)               Shanghai Bwave Technology Co.,Ltd\r
+C00000-CFFFFF     (base 16)            Shanghai Bwave Technology Co.,Ltd\r
+                               6F,Building12,399 Keyuan Road, Zhangjiang Hi-Tech Park,shanghai,china\r
+                               Shanghai  Shanghai  201203\r
                                 CN\r
  \r
+A0-3E-6B   (hex)               KoCoS Messtechnik AG\r
+B00000-BFFFFF     (base 16)            KoCoS Messtechnik AG\r
+                               Südring 42\r
+                               Korbach  Hessen  34497\r
+                               DE\r
+\r
  C8-8E-D1   (hex)               PHOENIX ENGINEERING CORP.\r
  D00000-DFFFFF     (base 16)            PHOENIX ENGINEERING CORP.\r
                                 466-3 Fujikubo\r
@@ -15365,29 +15614,29 @@ A0-3E-6B   (hex)              s&t embedded GmbH
                                 Eching  Bayern  85386\r
                                 DE\r
  \r
-C8-8E-D1   (hex)               Shanghai Bwave Technology Co.,Ltd\r
-C00000-CFFFFF     (base 16)            Shanghai Bwave Technology Co.,Ltd\r
-                               6F,Building12,399 Keyuan Road, Zhangjiang Hi-Tech Park,shanghai,china\r
-                               Shanghai  Shanghai  201203\r
-                               CN\r
+1C-21-D1   (hex)               LG CNS\r
+A00000-AFFFFF     (base 16)            LG CNS\r
+                               21F, FKI Tower, 24, Yeoui-daero, Yeongdeungpo-gu\r
+                               Seoul    150-881\r
+                               KR\r
  \r
-A0-3E-6B   (hex)               Shenzhen Nufilo Inc.\r
-400000-4FFFFF     (base 16)            Shenzhen Nufilo Inc.\r
-                               Tianliao Building F3,(New Materials Industrial Park),Xueyuan Road,Nanshan District,Shenzhen City,P.R.China\r
-                               Shenzhen  Guangdong  518055\r
-                               CN\r
+1C-21-D1   (hex)               Global Design Solutions Ltd\r
+B00000-BFFFFF     (base 16)            Global Design Solutions Ltd\r
+                               Unit 13\r
+                               Bristol  England  BS44ED\r
+                               GB\r
  \r
-C8-8E-D1   (hex)               Ube, Inc. (dba Plum)\r
-700000-7FFFFF     (base 16)            Ube, Inc. (dba Plum)\r
-                               9800 N. Lamar Blvd., STE 310\r
-                               Austin  TX  78753-4160\r
-                               US\r
+1C-21-D1   (hex)               Wuhan TieChi Detection Technology Co., Ltd.\r
+600000-6FFFFF     (base 16)            Wuhan TieChi Detection Technology Co., Ltd.\r
+                               Hongshan District Luo Yu RoadBainaohui room 1513\r
+                               Wuhan  Hubei  430000\r
+                               CN\r
  \r
-A0-3E-6B   (hex)               KoCoS Messtechnik AG\r
-B00000-BFFFFF     (base 16)            KoCoS Messtechnik AG\r
-                               Südring 42\r
-                               Korbach  Hessen  34497\r
-                               DE\r
+1C-21-D1   (hex)               Toyo System CO.,LTD.\r
+000000-0FFFFF     (base 16)            Toyo System CO.,LTD.\r
+                               106-1,Zenita,Joban-Nishigo,\r
+                               Iwaki,  Fukushima  972-8316\r
+                               JP\r
  \r
  1C-21-D1   (hex)               Varaani Works Oy\r
  200000-2FFFFF     (base 16)            Varaani Works Oy\r
@@ -15401,48 +15650,30 @@ D00000-DFFFFF     (base 16)           Rohde&Schwarz Topex SA
                                 Bucuresti  Romania  014142\r
                                 RO\r
  \r
-DC-44-27   (hex)               VerifEye Technologies\r
-E00000-EFFFFF     (base 16)            VerifEye Technologies\r
-                               2-151 Whitehall Dr.\r
-                               Markham  ON  L3R9T1\r
-                               CA\r
-\r
-1C-21-D1   (hex)               Wuhan TieChi Detection Technology Co., Ltd.\r
-600000-6FFFFF     (base 16)            Wuhan TieChi Detection Technology Co., Ltd.\r
-                               Hongshan District Luo Yu RoadBainaohui room 1513\r
-                               Wuhan  Hubei  430000\r
-                               CN\r
-\r
-1C-21-D1   (hex)               Soundtrack Your Brand Sweden AB\r
-700000-7FFFFF     (base 16)            Soundtrack Your Brand Sweden AB\r
-                               Birger Jarlsgatan 43\r
-                               Stockholm    11145\r
-                               SE\r
-\r
  1C-21-D1   (hex)               Liscotech System Co., Ltd.\r
  D00000-DFFFFF     (base 16)            Liscotech System Co., Ltd.\r
                                 4F. No. 342 Sec.4 Chenggong Rd. Neihu Dist.\r
                                 Taipei  TW  11458\r
                                 TW\r
  \r
-1C-21-D1   (hex)               LG CNS\r
-A00000-AFFFFF     (base 16)            LG CNS\r
-                               21F, FKI Tower, 24, Yeoui-daero, Yeongdeungpo-gu\r
-                               Seoul    150-881\r
-                               KR\r
-\r
-1C-21-D1   (hex)               Global Design Solutions Ltd\r
-B00000-BFFFFF     (base 16)            Global Design Solutions Ltd\r
-                               Unit 13\r
-                               Bristol  England  BS44ED\r
-                               GB\r
+1C-21-D1   (hex)               Soundtrack Your Brand Sweden AB\r
+700000-7FFFFF     (base 16)            Soundtrack Your Brand Sweden AB\r
+                               Birger Jarlsgatan 43\r
+                               Stockholm    11145\r
+                               SE\r
  \r
-1C-21-D1   (hex)               Toyo System CO.,LTD.\r
-000000-0FFFFF     (base 16)            Toyo System CO.,LTD.\r
-                               106-1,Zenita,Joban-Nishigo,\r
-                               Iwaki,  Fukushima  972-8316\r
+C8-8E-D1   (hex)               Fibergate.Inc\r
+500000-5FFFFF     (base 16)            Fibergate.Inc\r
+                               KDX Shibadaimon.Bld 2F Shibadaimon Minato-ku Tokyo 105-0012 Japan\r
+                               Tokyo  Minato-ku  105-0012\r
                                 JP\r
  \r
+DC-44-27   (hex)               VerifEye Technologies\r
+E00000-EFFFFF     (base 16)            VerifEye Technologies\r
+                               2-151 Whitehall Dr.\r
+                               Markham  ON  L3R9T1\r
+                               CA\r
+\r
  C8-8E-D1   (hex)               Linx Technologies\r
  300000-3FFFFF     (base 16)            Linx Technologies\r
                                 159 Ort Lane\r
@@ -15455,12 +15686,6 @@ C8-8E-D1   (hex)               Comlab AG
                                 Ittigen  BE  3076\r
                                 CH\r
  \r
-C8-8E-D1   (hex)               Fibergate.Inc\r
-500000-5FFFFF     (base 16)            Fibergate.Inc\r
-                               KDX Shibadaimon.Bld 2F Shibadaimon Minato-ku Tokyo 105-0012 Japan\r
-                               Tokyo  Minato-ku  105-0012\r
-                               JP\r
-\r
  B0-C5-CA   (hex)               TEM Mobile Limited\r
  A00000-AFFFFF     (base 16)            TEM Mobile Limited\r
                                 RM1703, North Block, Cangsong Building, Tairan 6 road, Futian District, Shenzhen.\r
@@ -15473,18 +15698,18 @@ B00000-BFFFFF     (base 16)           RISECOMM  (HK) TECHNOLOGY CO. LIMITED
                                 shenzhan  guangdong  518057\r
                                 CN\r
  \r
-DC-44-27   (hex)               Tesla Motors, Inc\r
-100000-1FFFFF     (base 16)            Tesla Motors, Inc\r
-                               3500 Deer Creek Road\r
-                               Palo Alto  CA  94304\r
-                               US\r
-\r
  B0-C5-CA   (hex)               LOWOTEC GmbH\r
  200000-2FFFFF     (base 16)            LOWOTEC GmbH\r
                                 Marie-Curie-Str. 1\r
                                 Oldenburg  Niedersachsen  26129\r
                                 DE\r
  \r
+DC-44-27   (hex)               Tesla Motors, Inc\r
+100000-1FFFFF     (base 16)            Tesla Motors, Inc\r
+                               3500 Deer Creek Road\r
+                               Palo Alto  CA  94304\r
+                               US\r
+\r
  78-C2-C0   (hex)               ShenZhen TuLing Robot CO.,LTD\r
  500000-5FFFFF     (base 16)            ShenZhen TuLing Robot CO.,LTD\r
                                 BLK 9, No 28, Langshan Road, Northern District of High Tech. Industry Park, Nanshan Dist., SZ., PRC.\r
@@ -15509,12 +15734,6 @@ D00000-DFFFFF     (base 16)            Hangzhou duotin Technology Co., Ltd.
                                 hangzhou  Zhejiang  311100\r
                                 CN\r
  \r
-54-9A-11   (hex)               VendNovation LLC\r
-A00000-AFFFFF     (base 16)            VendNovation LLC\r
-                               13400 NE 20th Street\r
-                               Bellevue  WA  98005\r
-                               US\r
-\r
  88-5D-90   (hex)               Gigatech R&D Corp.\r
  900000-9FFFFF     (base 16)            Gigatech R&D Corp.\r
                                 7F-5, 16 Jian 8th road, Zhonghe Dist.\r
@@ -15533,17 +15752,11 @@ A00000-AFFFFF     (base 16)           VendNovation LLC
                                 Butterworth  Pulau Pinang  13400\r
                                 MY\r
  \r
-64-FB-81   (hex)               Sichuan Haige Actec Communication Technology Co.,Ltd.\r
-B00000-BFFFFF     (base 16)            Sichuan Haige Actec Communication Technology Co.,Ltd.\r
-                               8 Mintai Road, Youxian District, Mianyang City, Sichuan\r
-                               Mianyang City  Sichuan  621022\r
-                               CN\r
-\r
-64-FB-81   (hex)               Narrative AB\r
-100000-1FFFFF     (base 16)            Narrative AB\r
-                               Agatan 55A\r
-                               Linkoping  -  58222\r
-                               SE\r
+54-9A-11   (hex)               VendNovation LLC\r
+A00000-AFFFFF     (base 16)            VendNovation LLC\r
+                               13400 NE 20th Street\r
+                               Bellevue  WA  98005\r
+                               US\r
  \r
  80-7B-85   (hex)               Shiroshita Industrial Co., Ltd.\r
  000000-0FFFFF     (base 16)            Shiroshita Industrial Co., Ltd.\r
@@ -15557,6 +15770,12 @@ B00000-BFFFFF     (base 16)            Sichuan Haige Actec Communication Technology Co.,Lt
                                 Chiyoda-ku  Tokyo  102-0072\r
                                 JP\r
  \r
+64-FB-81   (hex)               Sichuan Haige Actec Communication Technology Co.,Ltd.\r
+B00000-BFFFFF     (base 16)            Sichuan Haige Actec Communication Technology Co.,Ltd.\r
+                               8 Mintai Road, Youxian District, Mianyang City, Sichuan\r
+                               Mianyang City  Sichuan  621022\r
+                               CN\r
+\r
  80-7B-85   (hex)               IDair, LLC\r
  800000-8FFFFF     (base 16)            IDair, LLC\r
                                 6767 Old Madison Pike\r
@@ -15569,17 +15788,11 @@ A00000-AFFFFF     (base 16)           Neutronics
                                 Exton  Pennsylvania  19341\r
                                 US\r
  \r
-1C-CA-E3   (hex)               TOKAI RIKA CO., LTD.\r
-600000-6FFFFF     (base 16)            TOKAI RIKA CO., LTD.\r
-                               3-260\r
-                               Niwa-gun, Oguchi-cho  Aichi  480-0195\r
-                               JP\r
-\r
-80-E4-DA   (hex)               Akenori PTE LTD\r
-E00000-EFFFFF     (base 16)            Akenori PTE LTD\r
-                               176 JOO CHIAT ROAD #02-02\r
-                                   427447\r
-                               SG\r
+64-FB-81   (hex)               Narrative AB\r
+100000-1FFFFF     (base 16)            Narrative AB\r
+                               Agatan 55A\r
+                               Linkoping  -  58222\r
+                               SE\r
  \r
  1C-CA-E3   (hex)               Insigma Inc\r
  200000-2FFFFF     (base 16)            Insigma Inc\r
@@ -15587,6 +15800,12 @@ E00000-EFFFFF     (base 16)            Akenori PTE LTD
                                 Ashburn  VA  20147\r
                                 US\r
  \r
+80-E4-DA   (hex)               Akenori PTE LTD\r
+E00000-EFFFFF     (base 16)            Akenori PTE LTD\r
+                               176 JOO CHIAT ROAD #02-02\r
+                                   427447\r
+                               SG\r
+\r
  1C-CA-E3   (hex)               Dream Visions Co., LTD\r
  B00000-BFFFFF     (base 16)            Dream Visions Co., LTD\r
                                 90 Chongpa_Ro YoungSan-Gu\r
@@ -15599,11 +15818,11 @@ C00000-CFFFFF     (base 16)           Gahdeung Elecom
                                 ANSAN  Kyeonggi-Do  ASI|KR|KS009|ANSAN\r
                                 KR\r
  \r
-2C-D1-41   (hex)               Minno LLC\r
-800000-8FFFFF     (base 16)            Minno LLC\r
-                               421 North Milpas Street\r
-                               Santa Barbara  CA  93103\r
-                               US\r
+1C-CA-E3   (hex)               TOKAI RIKA CO., LTD.\r
+600000-6FFFFF     (base 16)            TOKAI RIKA CO., LTD.\r
+                               3-260\r
+                               Niwa-gun, Oguchi-cho  Aichi  480-0195\r
+                               JP\r
  \r
  90-C6-82   (hex)               Shenzhen Photon Broadband Technology CO., LTD\r
  100000-1FFFFF     (base 16)            Shenzhen Photon Broadband Technology CO., LTD\r
@@ -15617,11 +15836,17 @@ C00000-CFFFFF     (base 16)           Gahdeung Elecom
                                 Linz  Upper Austria  4020\r
                                 AT\r
  \r
-2C-6A-6F   (hex)               Schneider Electric Korea\r
-B00000-BFFFFF     (base 16)            Schneider Electric Korea\r
-                               14F Kbiz DMC tower,\r
-                                 Seoul  121-904\r
-                               KR\r
+90-C6-82   (hex)               ACT\r
+900000-9FFFFF     (base 16)            ACT\r
+                               Unit C1, South City Business Center\r
+                               Dublin    \r
+                               IE\r
+\r
+2C-D1-41   (hex)               AOptix Technologies, Inc\r
+300000-3FFFFF     (base 16)            AOptix Technologies, Inc\r
+                               675 Campbell Technology Pkwy\r
+                               Campbell  CA  95008\r
+                               US\r
  \r
  2C-D1-41   (hex)               iCIRROUND Inc\r
  000000-0FFFFF     (base 16)            iCIRROUND Inc\r
@@ -15635,17 +15860,29 @@ A00000-AFFFFF     (base 16)           Beijing Acorn Networks Corporation
                                 Beijing  Beijing  100102\r
                                 CN\r
  \r
-2C-D1-41   (hex)               AOptix Technologies, Inc\r
-300000-3FFFFF     (base 16)            AOptix Technologies, Inc\r
-                               675 Campbell Technology Pkwy\r
-                               Campbell  CA  95008\r
+2C-6A-6F   (hex)               Schneider Electric Korea\r
+B00000-BFFFFF     (base 16)            Schneider Electric Korea\r
+                               14F Kbiz DMC tower,\r
+                                 Seoul  121-904\r
+                               KR\r
+\r
+2C-D1-41   (hex)               Minno LLC\r
+800000-8FFFFF     (base 16)            Minno LLC\r
+                               421 North Milpas Street\r
+                               Santa Barbara  CA  93103\r
                                 US\r
  \r
-90-C6-82   (hex)               ACT\r
-900000-9FFFFF     (base 16)            ACT\r
-                               Unit C1, South City Business Center\r
-                               Dublin    \r
-                               IE\r
+A0-BB-3E   (hex)               COMSYS Communications Systems Service GmbH\r
+400000-4FFFFF     (base 16)            COMSYS Communications Systems Service GmbH\r
+                               TecCenter\r
+                               Bad Salzdetfurth  Niedersachsen  31162\r
+                               DE\r
+\r
+98-02-D8   (hex)               Fritz Kuebler GmbH\r
+600000-6FFFFF     (base 16)            Fritz Kuebler GmbH\r
+                               Schubertstrasse 47\r
+                               Villingen-Schwenningen  Baden-Wuerttemberg  78054\r
+                               DE\r
  \r
  98-02-D8   (hex)               Grammer EiA Electronics nv\r
  300000-3FFFFF     (base 16)            Grammer EiA Electronics nv\r
@@ -15659,41 +15896,29 @@ E00000-EFFFFF     (base 16)           Messtechnik Sachs GmbH
                                 Schorndorf  Germany  73614\r
                                 DE\r
  \r
-28-FD-80   (hex)               T-Radio AS\r
-E00000-EFFFFF     (base 16)            T-Radio AS\r
-                               Stensarmen 3A\r
-                               Tønsberg    3112\r
-                               NO\r
-\r
-A0-BB-3E   (hex)               COMSYS Communications Systems Service GmbH\r
-400000-4FFFFF     (base 16)            COMSYS Communications Systems Service GmbH\r
-                               TecCenter\r
-                               Bad Salzdetfurth  Niedersachsen  31162\r
-                               DE\r
-\r
-98-02-D8   (hex)               Fritz Kuebler GmbH\r
-600000-6FFFFF     (base 16)            Fritz Kuebler GmbH\r
-                               Schubertstrasse 47\r
-                               Villingen-Schwenningen  Baden-Wuerttemberg  78054\r
-                               DE\r
-\r
  98-02-D8   (hex)               SHENZHEN ATEKO PHOTOELECTRICITY CO LTD\r
  100000-1FFFFF     (base 16)            SHENZHEN ATEKO PHOTOELECTRICITY CO LTD\r
                                  4-5F, E1 Building, TCL International E City, No.1001 Zhongshanyuan Road, Nanshan District\r
                                 Shenzhen,  Guangdong  518052\r
                                 CN\r
  \r
+F8-02-78   (hex)               Lit Technologies\r
+E00000-EFFFFF     (base 16)            Lit Technologies\r
+                               2011 Stampede Dr\r
+                               Farmington  Utah  84025\r
+                               US\r
+\r
  2C-26-5F   (hex)               XIAMEN VORLINK IOT TECHNOLOGY CO.,LTD.\r
  000000-0FFFFF     (base 16)            XIAMEN VORLINK IOT TECHNOLOGY CO.,LTD.\r
                                 No.306 of Chengye Bldg., Xiamen Pioneering Park for Overseas Chinese Scholars\r
                                 xiamen  fujian  361000\r
                                 CN\r
  \r
-F8-02-78   (hex)               Lit Technologies\r
-E00000-EFFFFF     (base 16)            Lit Technologies\r
-                               2011 Stampede Dr\r
-                               Farmington  Utah  84025\r
-                               US\r
+28-FD-80   (hex)               T-Radio AS\r
+E00000-EFFFFF     (base 16)            T-Radio AS\r
+                               Stensarmen 3A\r
+                               Tønsberg    3112\r
+                               NO\r
  \r
  2C-26-5F   (hex)               Appostar Technology Co. Ltd\r
  600000-6FFFFF     (base 16)            Appostar Technology Co. Ltd\r
@@ -15719,6 +15944,18 @@ E00000-EFFFFF     (base 16)            Lit Technologies
                                 Hospitalet del Llobregat  Barcelona  08908\r
                                 ES\r
  \r
+F8-02-78   (hex)               Technology Research, LLC\r
+C00000-CFFFFF     (base 16)            Technology Research, LLC\r
+                               4525 140th Ave North\r
+                               Clearwater  FL  33762\r
+                               US\r
+\r
+0C-EF-AF   (hex)               BSX Athletics\r
+800000-8FFFFF     (base 16)            BSX Athletics\r
+                               2500 E T C Jester Blvd.\r
+                               Houston  TX  77008\r
+                               US\r
+\r
  F8-02-78   (hex)               3Shape Holding A/S\r
  300000-3FFFFF     (base 16)            3Shape Holding A/S\r
                                 Holmens Kanal 7,2\r
@@ -15731,48 +15968,24 @@ F8-02-78   (hex)              Digatron Power Electronics GmbH
                                 Aachen  NRW  52068\r
                                 DE\r
  \r
-F8-02-78   (hex)               Technology Research, LLC\r
-C00000-CFFFFF     (base 16)            Technology Research, LLC\r
-                               4525 140th Ave North\r
-                               Clearwater  FL  33762\r
+F8-02-78   (hex)               Electric Objects\r
+500000-5FFFFF     (base 16)            Electric Objects\r
+                               356 Bowery\r
+                               New York  NY  10021\r
                                 US\r
  \r
-0C-EF-AF   (hex)               LUMEL S.A.\r
-200000-2FFFFF     (base 16)            LUMEL S.A.\r
-                               Ul.Slubicka 1\r
-                               Zielona Gora    65-127\r
-                               PL\r
-\r
  A4-4F-29   (hex)               Neotech Systems Pvt. Ltd.\r
  E00000-EFFFFF     (base 16)            Neotech Systems Pvt. Ltd.\r
                                 B-25, 2nd floor\r
                                 New Delhi  Delhi  110049\r
                                 IN\r
  \r
-0C-EF-AF   (hex)               BSX Athletics\r
-800000-8FFFFF     (base 16)            BSX Athletics\r
-                               2500 E T C Jester Blvd.\r
-                               Houston  TX  77008\r
-                               US\r
-\r
-F8-02-78   (hex)               Electric Objects\r
-500000-5FFFFF     (base 16)            Electric Objects\r
-                               356 Bowery\r
-                               New York  NY  10021\r
-                               US\r
-\r
-10-07-23   (hex)               Ion Professional Solutions\r
-800000-8FFFFF     (base 16)            Ion Professional Solutions\r
-                               4514 Flower Bridge Ct\r
-                               Humble  Texas  77396\r
+A4-4F-29   (hex)               HALLIBURTON\r
+D00000-DFFFFF     (base 16)            HALLIBURTON\r
+                               445 WOODLINE DR\r
+                               SPRING  TX  77386\r
                                 US\r
  \r
-10-07-23   (hex)               First Chair Acoustics Co., Ltd.\r
-E00000-EFFFFF     (base 16)            First Chair Acoustics Co., Ltd.\r
-                               No. 53, Lane 17, Yuhe Street\r
-                               Taoyuan City, Taoyuan County    33057\r
-                               TW\r
-\r
  3C-39-E7   (hex)               iiM AG\r
  A00000-AFFFFF     (base 16)            iiM AG\r
                                 Neuer Friedberg 5\r
@@ -15785,18 +15998,30 @@ A00000-AFFFFF     (base 16)           iiM AG
                                 Västerhaninge  Stockholms län  137 37\r
                                 SE\r
  \r
-A4-4F-29   (hex)               HALLIBURTON\r
-D00000-DFFFFF     (base 16)            HALLIBURTON\r
-                               445 WOODLINE DR\r
-                               SPRING  TX  77386\r
-                               US\r
-\r
  3C-39-E7   (hex)               Sensor to Image GmbH\r
  700000-7FFFFF     (base 16)            Sensor to Image GmbH\r
                                 Lechtorstrasse 20\r
                                 Schongau  Bavaria  86956\r
                                 DE\r
  \r
+0C-EF-AF   (hex)               LUMEL S.A.\r
+200000-2FFFFF     (base 16)            LUMEL S.A.\r
+                               Ul.Slubicka 1\r
+                               Zielona Gora    65-127\r
+                               PL\r
+\r
+10-07-23   (hex)               Ion Professional Solutions\r
+800000-8FFFFF     (base 16)            Ion Professional Solutions\r
+                               4514 Flower Bridge Ct\r
+                               Humble  Texas  77396\r
+                               US\r
+\r
+10-07-23   (hex)               First Chair Acoustics Co., Ltd.\r
+E00000-EFFFFF     (base 16)            First Chair Acoustics Co., Ltd.\r
+                               No. 53, Lane 17, Yuhe Street\r
+                               Taoyuan City, Taoyuan County    33057\r
+                               TW\r
+\r
  10-07-23   (hex)               Fujian Quanzhou Dong Ang Electronics Co., Ltd.\r
  B00000-BFFFFF     (base 16)            Fujian Quanzhou Dong Ang Electronics Co., Ltd.\r
                                 5th floor of Hengtaixing mansion, Yingbin Road\r
@@ -15809,17 +16034,11 @@ B00000-BFFFFF     (base 16)           Fujian Quanzhou Dong Ang Electronics Co., Ltd.
                                 Yamato  Kanagawa  242-0007\r
                                 JP\r
  \r
-D0-22-12   (hex)               Shanghai Routech Co., Ltd\r
-500000-5FFFFF     (base 16)            Shanghai Routech Co., Ltd\r
-                               R.709-(2), B Zone, No.668 Eastern Beijing Rd. Shanghai P.R.C\r
-                               Shanghai  Shanghai  200001\r
-                               CN\r
-\r
-E8-18-63   (hex)               Acopian Technical Company\r
-E00000-EFFFFF     (base 16)            Acopian Technical Company\r
-                               131 Loomis Street\r
-                               Easton  PA  18045\r
-                               US\r
+D0-22-12   (hex)               UAB &quot;SALDA&quot;\r
+900000-9FFFFF     (base 16)            UAB &quot;SALDA&quot;\r
+                               Ragaines 100\r
+                               Šiauliai  Europe  LT-78109\r
+                               LT\r
  \r
  D0-22-12   (hex)               Schleifenbauer Holding BV\r
  B00000-BFFFFF     (base 16)            Schleifenbauer Holding BV\r
@@ -15827,17 +16046,11 @@ B00000-BFFFFF     (base 16)           Schleifenbauer Holding BV
                                 Hertogenbosch    5236WC \r
                                 NL\r
  \r
-D0-22-12   (hex)               u::Lux GmbH\r
-E00000-EFFFFF     (base 16)            u::Lux GmbH\r
-                               Rechtes Salzachufer 42\r
-                               Bergheim  Salzburg  5101\r
-                               AT\r
-\r
-D0-22-12   (hex)               UAB &quot;SALDA&quot;\r
-900000-9FFFFF     (base 16)            UAB &quot;SALDA&quot;\r
-                               Ragaines 100\r
-                               Šiauliai  Europe  LT-78109\r
-                               LT\r
+D0-22-12   (hex)               Shanghai Routech Co., Ltd\r
+500000-5FFFFF     (base 16)            Shanghai Routech Co., Ltd\r
+                               R.709-(2), B Zone, No.668 Eastern Beijing Rd. Shanghai P.R.C\r
+                               Shanghai  Shanghai  200001\r
+                               CN\r
  \r
  D0-22-12   (hex)               Cliptech Industria e Comercio Ltda\r
  700000-7FFFFF     (base 16)            Cliptech Industria e Comercio Ltda\r
@@ -15845,36 +16058,36 @@ D0-22-12   (hex)              Cliptech Industria e Comercio Ltda
                                 ITUPEVA  SAO PAULO  13295000\r
                                 BR\r
  \r
+D0-22-12   (hex)               u::Lux GmbH\r
+E00000-EFFFFF     (base 16)            u::Lux GmbH\r
+                               Rechtes Salzachufer 42\r
+                               Bergheim  Salzburg  5101\r
+                               AT\r
+\r
+74-E1-4A   (hex)               Knog Pty Ltd\r
+D00000-DFFFFF     (base 16)            Knog Pty Ltd\r
+                               453 Church St\r
+                               Richmond  VIC  3128\r
+                               AU\r
+\r
  74-E1-4A   (hex)               Loctek Visual Technology Corp.\r
  B00000-BFFFFF     (base 16)            Loctek Visual Technology Corp.\r
                                 Floor 20 Aux Building No.757 Rili Middle Road Yinzhou District Ningbo China\r
                                 Ningbo  zhejiang  315199\r
                                 CN\r
  \r
+E8-18-63   (hex)               Acopian Technical Company\r
+E00000-EFFFFF     (base 16)            Acopian Technical Company\r
+                               131 Loomis Street\r
+                               Easton  PA  18045\r
+                               US\r
+\r
  B8-D8-12   (hex)               Docobo Limited\r
  B00000-BFFFFF     (base 16)            Docobo Limited\r
                                 The Old Granary, 21 High Street\r
                                 Leatherhead  Surrey  KT23 4AA\r
                                 GB\r
  \r
-74-E1-4A   (hex)               Knog Pty Ltd\r
-D00000-DFFFFF     (base 16)            Knog Pty Ltd\r
-                               453 Church St\r
-                               Richmond  VIC  3128\r
-                               AU\r
-\r
-74-E1-4A   (hex)               UTU Oy\r
-500000-5FFFFF     (base 16)            UTU Oy\r
-                               Ahjontie 1\r
-                               Ulvila  Finland  28400\r
-                               FI\r
-\r
-E4-95-6E   (hex)               Shenzhen Arronna Telecom Co.,Ltd\r
-C00000-CFFFFF     (base 16)            Shenzhen Arronna Telecom Co.,Ltd\r
-                               4F, Block 1, No 17-2, Pingxi South Rd\r
-                               Shenzhen  Guangdong  518117\r
-                               CN\r
-\r
  E4-95-6E   (hex)               iConservo Inc\r
  B00000-BFFFFF     (base 16)            iConservo Inc\r
                                 35 Tesla\r
@@ -15887,11 +16100,11 @@ A00000-AFFFFF     (base 16)           Red Point Positioning, Corp.
                                 Brookline  MASSACHUSETTS  02446\r
                                 US\r
  \r
-BC-66-41   (hex)               ARGUS-SPECTRUM\r
-400000-4FFFFF     (base 16)            ARGUS-SPECTRUM\r
-                               Serdobolskaya str.,65\r
-                               St-Petersburg    197342\r
-                               RU\r
+74-E1-4A   (hex)               UTU Oy\r
+500000-5FFFFF     (base 16)            UTU Oy\r
+                               Ahjontie 1\r
+                               Ulvila  Finland  28400\r
+                               FI\r
  \r
  E4-95-6E   (hex)               ELAN SYSTEMS\r
  500000-5FFFFF     (base 16)            ELAN SYSTEMS\r
@@ -15899,11 +16112,11 @@ E4-95-6E   (hex)              ELAN SYSTEMS
                                 BUDAPEST    1105\r
                                 HU\r
  \r
-B0-1F-81   (hex)               Steffens Systems GmbH\r
-A00000-AFFFFF     (base 16)            Steffens Systems GmbH\r
-                               Mathias-Brüggenstr. 83\r
-                               Cologne  NRW  50829\r
-                               DE\r
+E4-95-6E   (hex)               Shenzhen Arronna Telecom Co.,Ltd\r
+C00000-CFFFFF     (base 16)            Shenzhen Arronna Telecom Co.,Ltd\r
+                               4F, Block 1, No 17-2, Pingxi South Rd\r
+                               Shenzhen  Guangdong  518117\r
+                               CN\r
  \r
  B0-1F-81   (hex)               CIDE Interactive\r
  900000-9FFFFF     (base 16)            CIDE Interactive\r
@@ -15917,11 +16130,17 @@ B0-1F-81   (hex)              CIDE Interactive
                                 Middlebury  CT  06762\r
                                 US\r
  \r
-14-1F-BA   (hex)               AJIS(DALIAN)co.,LTD\r
-D00000-DFFFFF     (base 16)            AJIS(DALIAN)co.,LTD\r
-                               Room 202B\r
-                               Dalian  Liaoning  116023\r
-                               CN\r
+BC-66-41   (hex)               ARGUS-SPECTRUM\r
+400000-4FFFFF     (base 16)            ARGUS-SPECTRUM\r
+                               Serdobolskaya str.,65\r
+                               St-Petersburg    197342\r
+                               RU\r
+\r
+B0-1F-81   (hex)               Steffens Systems GmbH\r
+A00000-AFFFFF     (base 16)            Steffens Systems GmbH\r
+                               Mathias-Brüggenstr. 83\r
+                               Cologne  NRW  50829\r
+                               DE\r
  \r
  F4-0E-11   (hex)               Zeepro Inc.\r
  800000-8FFFFF     (base 16)            Zeepro Inc.\r
@@ -15935,30 +16154,36 @@ F4-0E-11   (hex)              Alpha Design Technologies Pvt Ltd
                                 Bangalore  Karnataka  560008\r
                                 IN\r
  \r
+14-1F-BA   (hex)               AJIS(DALIAN)co.,LTD\r
+D00000-DFFFFF     (base 16)            AJIS(DALIAN)co.,LTD\r
+                               Room 202B\r
+                               Dalian  Liaoning  116023\r
+                               CN\r
+\r
  F4-0E-11   (hex)               BRADAR INDUSTRIA SA\r
  B00000-BFFFFF     (base 16)            BRADAR INDUSTRIA SA\r
                                 AVENIDA SHISHIMA HIFUMI,2911\r
                                 SÃO JOSE DOS CAMPOS  SÃO PAULO  12244-000\r
                                 BR\r
  \r
-14-1F-BA   (hex)               Thales Communications & Security SAS\r
-600000-6FFFFF     (base 16)            Thales Communications & Security SAS\r
-                               BP 57\r
-                               Bretigny-sur-Orge CEDEX  France  F 91229\r
-                               FR\r
-\r
-14-1F-BA   (hex)               Inttelix Brasil Tecnologia e Sistemas Ltda\r
-500000-5FFFFF     (base 16)            Inttelix Brasil Tecnologia e Sistemas Ltda\r
-                                Rua Desembargador Jorge Fontana, 112B, Belvedere\r
-                               Belo Horizonte  Minas Gerais  30320-670\r
-                               BR\r
-\r
  BC-34-00   (hex)               MATICA TECHNOLOGIES AG\r
  800000-8FFFFF     (base 16)            MATICA TECHNOLOGIES AG\r
                                 52 TECKSTRASSE\r
                                 ESSLINGEN AM NECKAR  BADEN WUERTTENBERG  73734\r
                                 DE\r
  \r
+BC-34-00   (hex)               Shenzhen PHilorise Technical Limited\r
+900000-9FFFFF     (base 16)            Shenzhen PHilorise Technical Limited\r
+                               Floor 4, Building 2, TingWeiGongYeQu,\r
+                               ShenZhen  GuangDong  518010\r
+                               CN\r
+\r
+14-1F-BA   (hex)               Thales Communications & Security SAS\r
+600000-6FFFFF     (base 16)            Thales Communications & Security SAS\r
+                               BP 57\r
+                               Bretigny-sur-Orge CEDEX  France  F 91229\r
+                               FR\r
+\r
  BC-34-00   (hex)               Hangzhou Linker Digital Technology Co., Ltd\r
  D00000-DFFFFF     (base 16)            Hangzhou Linker Digital Technology Co., Ltd\r
                                 4-5F, C Building, Jinrun Tech-Garden, 399# Qiuyi Road, Binjiang District\r
@@ -15977,17 +16202,23 @@ B00000-BFFFFF     (base 16)           FARO TECHNOLOGIES, INC.
                                 Lake Mary  FL  32746\r
                                 US\r
  \r
+7C-70-BC   (hex)               mk-messtechnik GmbH\r
+D00000-DFFFFF     (base 16)            mk-messtechnik GmbH\r
+                               Zeppelinstr. 1\r
+                               Notzingen  D  73274\r
+                               DE\r
+\r
  7C-70-BC   (hex)               Bidgely\r
  600000-6FFFFF     (base 16)            Bidgely\r
                                 298  S Sunnyvale Ave\r
                                 Sunnyvale  CA  94086\r
                                 US\r
  \r
-7C-70-BC   (hex)               mk-messtechnik GmbH\r
-D00000-DFFFFF     (base 16)            mk-messtechnik GmbH\r
-                               Zeppelinstr. 1\r
-                               Notzingen  D  73274\r
-                               DE\r
+14-1F-BA   (hex)               Inttelix Brasil Tecnologia e Sistemas Ltda\r
+500000-5FFFFF     (base 16)            Inttelix Brasil Tecnologia e Sistemas Ltda\r
+                                Rua Desembargador Jorge Fontana, 112B, Belvedere\r
+                               Belo Horizonte  Minas Gerais  30320-670\r
+                               BR\r
  \r
  14-1F-BA   (hex)               Shenzhen Mining Technology Co.,Ltd.\r
  000000-0FFFFF     (base 16)            Shenzhen Mining Technology Co.,Ltd.\r
@@ -16001,11 +16232,11 @@ BC-34-00   (hex)              LifeSmart
                                 Hangzhou  Zhejiang  310052\r
                                 CN\r
  \r
-BC-34-00   (hex)               Shenzhen PHilorise Technical Limited\r
-900000-9FFFFF     (base 16)            Shenzhen PHilorise Technical Limited\r
-                               Floor 4, Building 2, TingWeiGongYeQu,\r
-                               ShenZhen  GuangDong  518010\r
-                               CN\r
+D0-76-50   (hex)               Electro-Motive Diesel\r
+C00000-CFFFFF     (base 16)            Electro-Motive Diesel\r
+                               9301 W. 55th Street\r
+                               La Grange  IL  60525\r
+                               US\r
  \r
  BC-34-00   (hex)               NDSL, Inc.\r
  500000-5FFFFF     (base 16)            NDSL, Inc.\r
@@ -16019,12 +16250,6 @@ A4-3B-FA   (hex)               BOI Solutions
                                 Miamisburg  Ohio  45342\r
                                 US\r
  \r
-74-19-F8   (hex)               Baudisch Electronic GmbH\r
-600000-6FFFFF     (base 16)            Baudisch Electronic GmbH\r
-                               Im Gewerbegebiet 7-9\r
-                               Wäschenbeuren  Baden-Württemberg  73116\r
-                               DE\r
-\r
  D0-76-50   (hex)               Happo Solutions Oy\r
  200000-2FFFFF     (base 16)            Happo Solutions Oy\r
                                 Graanintie 5\r
@@ -16037,18 +16262,18 @@ E00000-EFFFFF     (base 16)           Volacomm Co., Ltd
                                 Xinzhuang Dist.  New Taipei City  242\r
                                 TW\r
  \r
+74-19-F8   (hex)               Baudisch Electronic GmbH\r
+600000-6FFFFF     (base 16)            Baudisch Electronic GmbH\r
+                               Im Gewerbegebiet 7-9\r
+                               Wäschenbeuren  Baden-Württemberg  73116\r
+                               DE\r
+\r
  D0-76-50   (hex)               TAPKO Technologies GmbH\r
  300000-3FFFFF     (base 16)            TAPKO Technologies GmbH\r
                                 Im Gewerbepark A15\r
                                 Regensburg  Bayern  93059\r
                                 DE\r
  \r
-D0-76-50   (hex)               Electro-Motive Diesel\r
-C00000-CFFFFF     (base 16)            Electro-Motive Diesel\r
-                               9301 W. 55th Street\r
-                               La Grange  IL  60525\r
-                               US\r
-\r
  74-19-F8   (hex)               Marmitek\r
  000000-0FFFFF     (base 16)            Marmitek\r
                                 Postbus 4257\r
@@ -16061,6 +16286,18 @@ C00000-CFFFFF     (base 16)            Electro-Motive Diesel
                                 SHENZHEN    518104\r
                                 CN\r
  \r
+10-DC-B6   (hex)               BBPOS International Limited\r
+C00000-CFFFFF     (base 16)            BBPOS International Limited\r
+                               Suite 1602, Tower 2, Nina Tower, 8 Yeung Uk Road, Tsuen Wan, NT\r
+                               Hong Kong  China  00000\r
+                               HK\r
+\r
+10-DC-B6   (hex)               Eyeball Fintech Company\r
+B00000-BFFFFF     (base 16)            Eyeball Fintech Company\r
+                               Rm. 545, 5F., No. 19-11, Sanchong Rd., Nangang Dist.\r
+                               Taipei City  Taiwan  11501\r
+                               TW\r
+\r
  10-DC-B6   (hex)               HANACNS \r
  300000-3FFFFF     (base 16)            HANACNS \r
                                 42-11, Taejanggongdan-gil, Wonju-si\r
@@ -16073,14 +16310,86 @@ D00000-DFFFFF     (base 16)           LeoLabs
                                 Rybnik    44-218\r
                                 PL\r
  \r
-10-DC-B6   (hex)               BBPOS International Limited\r
-C00000-CFFFFF     (base 16)            BBPOS International Limited\r
-                               Suite 1602, Tower 2, Nina Tower, 8 Yeung Uk Road, Tsuen Wan, NT\r
-                               Hong Kong  China  00000\r
-                               HK\r
+10-DC-B6   (hex)               Fuzhou Rockchip Electronics Co.,Ltd\r
+900000-9FFFFF     (base 16)            Fuzhou Rockchip Electronics Co.,Ltd\r
+                               No. 18 Building, A District, No.89,software Boulevard Fuzhou,Fujian,PRC\r
+                               Fuzhou  FuJian  350003\r
+                               CN\r
  \r
-10-DC-B6   (hex)               Eyeball Fintech Company\r
-B00000-BFFFFF     (base 16)            Eyeball Fintech Company\r
-                               Rm. 545, 5F., No. 19-11, Sanchong Rd., Nangang Dist.\r
-                               Taipei City  Taiwan  11501\r
+10-DC-B6   (hex)               ABB Switzerland Ltd.\r
+100000-1FFFFF     (base 16)            ABB Switzerland Ltd.\r
+                               Fabrikstrasse 3\r
+                               Lenzburg    5600\r
+                               CH\r
+\r
+10-DC-B6   (hex)               Milesight Taiwan\r
+500000-5FFFFF     (base 16)            Milesight Taiwan\r
+                               10F., No. 87, Sec. 4, Chongxin Rd\r
+                               Sanchong Dist  New Taipei City  24161\r
                                 TW\r
+\r
+54-A4-93   (hex)               BJ COTYTECH TECHNOLOGY CO.,LTD\r
+C00000-CFFFFF     (base 16)            BJ COTYTECH TECHNOLOGY CO.,LTD\r
+                               Rm2302,Block B,Haojing Building,Zhichun Road,Haidian District\r
+                               BeiJing  BeiJing  100086\r
+                               CN\r
+\r
+54-A4-93   (hex)               Hannto Technology Co., Ltd\r
+600000-6FFFFF     (base 16)            Hannto Technology Co., Ltd\r
+                               Rm 704,No.1,Lane 88,Shengrong Road, Free Trade Pilot Area,\r
+                               Shanghai  Shanghai  200120\r
+                               CN\r
+\r
+54-A4-93   (hex)               genua GmbH\r
+200000-2FFFFF     (base 16)            genua GmbH\r
+                               Domagkstr. 7\r
+                               Kirchheim    85551\r
+                               DE\r
+\r
+04-D1-6E   (hex)               Metra Electronics\r
+A00000-AFFFFF     (base 16)            Metra Electronics\r
+                               460 Walker Street\r
+                               Holly Hill  FL  32117\r
+                               US\r
+\r
+04-D1-6E   (hex)               ETL Elektrotechnik Lauter GmbH\r
+600000-6FFFFF     (base 16)            ETL Elektrotechnik Lauter GmbH\r
+                               Konrad-Zuse-Str. 2\r
+                               Mauerstetten  Bavaria  87665\r
+                               DE\r
+\r
+04-D1-6E   (hex)                Beijing Huaxia Qixin Technology Co., Ltd.\r
+300000-3FFFFF     (base 16)             Beijing Huaxia Qixin Technology Co., Ltd.\r
+                                7th Floor, Building 1, No. 18, Yangfangdian Road, Haidian District, Beijing 705 \r
+                               Beijing  Beijing  100038\r
+                               CN\r
+\r
+04-D1-6E   (hex)               National Radio & Telecommunication Corporation - NRTC\r
+B00000-BFFFFF     (base 16)            National Radio & Telecommunication Corporation - NRTC\r
+                               House 420, Street 13, Chaklala Scheme 3\r
+                               Rawalpindi  Islamabad  46000\r
+                               PK\r
+\r
+04-D1-6E   (hex)               INTRIPLE, a.s.\r
+000000-0FFFFF     (base 16)            INTRIPLE, a.s.\r
+                               K Zelenci 2957/5\r
+                               Praha 9 - Horni Pocernice    193 00\r
+                               CZ\r
+\r
+44-03-77   (hex)               SHENZHEN UT-KING TECHNOLOGY CO.,LTD\r
+900000-9FFFFF     (base 16)            SHENZHEN UT-KING TECHNOLOGY CO.,LTD\r
+                               504, Building B ,Guangming Industrial Park, Zhonghua  Road, Minzhi, Longhua District\r
+                               SHENZHEN  GUANGDONG  518131\r
+                               CN\r
+\r
+44-03-77   (hex)               Gemmy Electronics (Shenzhen) Co, Ltd\r
+800000-8FFFFF     (base 16)            Gemmy Electronics (Shenzhen) Co, Ltd\r
+                               Datianyang Ind. Estate, Dongfang Road, Dangfang Road, Songgang Town, Bao'an District\r
+                               Shenzhen  Guangdong  518105\r
+                               CN\r
+\r
+44-03-77   (hex)               BIG Climatic Manufacture, Co. LTD, Zhongshan Branch\r
+C00000-CFFFFF     (base 16)            BIG Climatic Manufacture, Co. LTD, Zhongshan Branch\r
+                               Nantou Dadao, 20\r
+                               Zhongshan  Guangdong  528427\r
+                               CN\r
diff --git a/hwdb/ma-small.txt b/hwdb/ma-small.txt

index 8e40e7296d195ce22c5604a4a6a003e8d2bc8324..9420f18ef354aa765417f78b65ebea0a215f0d59 100644 (file)
--- a/hwdb/ma-small.txt
+++ b/hwdb/ma-small.txt
@@ -3980,6 +3980,84 @@ BFD000-BFDFFF     (base 16)              Lumentum
                                 Milpitas  CA  95035\r
                                 US\r
  \r
+70-B3-D5   (hex)               iREA System Industry\r
+113000-113FFF     (base 16)            iREA System Industry\r
+                               Rm 210, Sahwa-ro 210, Uichang-gu\r
+                               Changwon-si  Gyeongsangnam-do  51390\r
+                               KR\r
+\r
+70-B3-D5   (hex)               TATTILE SRL\r
+EC5000-EC5FFF     (base 16)            TATTILE SRL\r
+                               VIA DONIZETTI, 1/3/5\r
+                               MAIRANO  BRESCIA  25030\r
+                               IT\r
+\r
+70-B3-D5   (hex)               IHI Rotating Machinery Engineering Co.,Ltd.\r
+89C000-89CFFF     (base 16)            IHI Rotating Machinery Engineering Co.,Ltd.\r
+                               1, Shin-nakahara-cho, Isogo-ku\r
+                               Yokohama  Kanagawa  235-8501\r
+                               JP\r
+\r
+70-B3-D5   (hex)               Nuance Hearing Ltd.\r
+569000-569FFF     (base 16)            Nuance Hearing Ltd.\r
+                               Raoul Wallenberg 24, Building A1, Floor 3\r
+                               Tel Aviv    6971920\r
+                               IL\r
+\r
+70-B3-D5   (hex)               Connected Response\r
+C9C000-C9CFFF     (base 16)            Connected Response\r
+                               12 Meiklejohn Street\r
+                               Stirling  Stirling  FK9 5HQ\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Suzhou Sapa Automotive Technology Co.,Ltd\r
+9AC000-9ACFFF     (base 16)            Suzhou Sapa Automotive Technology Co.,Ltd\r
+                               Room 812, Building 1, Suhong Road 177\r
+                               Suzhou  Jiangsu  215000\r
+                               CN\r
+\r
+70-B3-D5   (hex)               Netzikon GmbH\r
+D3D000-D3DFFF     (base 16)            Netzikon GmbH\r
+                               Gerberstrasse 34\r
+                               Backnang    71522\r
+                               DE\r
+\r
+70-B3-D5   (hex)               WiFi Nation Ltd\r
+95F000-95FFFF     (base 16)            WiFi Nation Ltd\r
+                               Unit 53, CoWorkz Business Centre, Chester West Employment Park, Minerva Avenue,\r
+                               Chester  Cheshire  CH1 4QL\r
+                               GB\r
+\r
+70-B3-D5   (hex)               i-View Communication Inc.\r
+CA7000-CA7FFF     (base 16)            i-View Communication Inc.\r
+                               2F, No.70, Min De Rd, Chutung, 310-48 Hsinchu, Taiwan\r
+                               Hsinchu County  Chutung  310148\r
+                               TW\r
+\r
+70-B3-D5   (hex)               Amazon Technologies Inc.\r
+270000-270FFF     (base 16)            Amazon Technologies Inc.\r
+                               P.O Box 8102\r
+                               Reno    89507\r
+                               US\r
+\r
+70-B3-D5   (hex)               LX Design House\r
+221000-221FFF     (base 16)            LX Design House\r
+                               4 Cornwallis Street\r
+                               Eveleigh  NSW  2015\r
+                               AU\r
+\r
+70-B3-D5   (hex)               Leidos\r
+E10000-E10FFF     (base 16)            Leidos\r
+                               7031 Albert Einstein Drive\r
+                               Columbia  MD  21046\r
+                               US\r
+\r
+70-B3-D5   (hex)               Combilent\r
+C50000-C50FFF     (base 16)            Combilent\r
+                               Ryttermarken 5\r
+                               Farum    3520\r
+                               DK\r
+\r
  70-B3-D5   (hex)               EVCO SPA\r
  A80000-A80FFF     (base 16)            EVCO SPA\r
                                 VIA FELTRE N. 81\r
@@ -4346,12 +4424,6 @@ F43000-F43FFF     (base 16)              Divelbiss Corporation
                                 Seoul    06131\r
                                 KR\r
  \r
-70-B3-D5   (hex)               Independent Project Engineering Lmited\r
-E3C000-E3CFFF     (base 16)            Independent Project Engineering Lmited\r
-                               Unit 1, Saxon Way\r
-                               Melbourn  Hertfordshire  SG8 6DN\r
-                               GB\r
-\r
  70-B3-D5   (hex)               MECT SRL\r
  7C4000-7C4FFF     (base 16)            MECT SRL\r
                                 VIA E. FERMI 57/59\r
@@ -8012,11 +8084,11 @@ F0F000-F0FFFF     (base 16)             Kyoto Denkiki
                                 Uji    6110041\r
                                 JP\r
  \r
-70-B3-D5   (hex)               Harmonic Design GmbH\r
-1F0000-1F0FFF     (base 16)            Harmonic Design GmbH\r
-                               Bahnhofstraße 1\r
-                               Steinheim    71711\r
-                               DE\r
+70-B3-D5   (hex)               Copious Imaging LLC\r
+4E8000-4E8FFF     (base 16)            Copious Imaging LLC\r
+                               83 Hartwell Ave, Suite 150\r
+                               Lexington  MA  02421\r
+                               US\r
  \r
  70-B3-D5   (hex)               APEX Stabilizations GmbH\r
  A52000-A52FFF     (base 16)            APEX Stabilizations GmbH\r
@@ -8024,18 +8096,84 @@ A52000-A52FFF     (base 16)             APEX Stabilizations GmbH
                                 Vienna    1150\r
                                 AT\r
  \r
+70-B3-D5   (hex)               NEOPATH INTEGRATED SYSTEMS LTDA\r
+067000-067FFF     (base 16)            NEOPATH INTEGRATED SYSTEMS LTDA\r
+                               Rua Paulo Emídio Barbosa, 485 - sala 302\r
+                               Rio de Janeiro  Rio de Janeiro  21941-907\r
+                               BR\r
+\r
+70-B3-D5   (hex)               Waco Giken Co.,  Ltd.\r
+815000-815FFF     (base 16)            Waco Giken Co.,  Ltd.\r
+                               1-1-50, Suehiro-Cho, \r
+                               Tsurumi-Ku, Yokohama    230-0045\r
+                               JP\r
+\r
+70-B3-D5   (hex)               Monnit Corporation\r
+D16000-D16FFF     (base 16)            Monnit Corporation\r
+                               3400 S West Temple\r
+                               Salt Lake City    84115\r
+                               US\r
+\r
+70-B3-D5   (hex)               Harmonic Design GmbH\r
+1F0000-1F0FFF     (base 16)            Harmonic Design GmbH\r
+                               Bahnhofstraße 1\r
+                               Steinheim    71711\r
+                               DE\r
+\r
  70-B3-D5   (hex)               hmt telematik GmbH\r
  EC4000-EC4FFF     (base 16)            hmt telematik GmbH\r
                                 Grazer Str. 34b\r
                                 Graz    8045\r
                                 AT\r
  \r
-70-B3-D5   (hex)               Copious Imaging LLC\r
-4E8000-4E8FFF     (base 16)            Copious Imaging LLC\r
-                               83 Hartwell Ave, Suite 150\r
-                               Lexington  MA  02421\r
+70-B3-D5   (hex)               Exsom Computers LLC\r
+4BF000-4BFFFF     (base 16)            Exsom Computers LLC\r
+                               Office 3206, The Citadel Tower, Business Bay\r
+                               Dubai  Dubai  72891\r
+                               AE\r
+\r
+70-B3-D5   (hex)               Piranha EMS Inc.\r
+8CC000-8CCFFF     (base 16)            Piranha EMS Inc.\r
+                               2681 Zanker Road\r
+                               San Jose  CA  95134\r
                                 US\r
  \r
+70-B3-D5   (hex)               Small Data Garden Oy\r
+568000-568FFF     (base 16)            Small Data Garden Oy\r
+                               Paloheimonkatu 2\r
+                               Riihimäki    11130\r
+                               FI\r
+\r
+70-B3-D5   (hex)               Densitron Technologies Ltd\r
+E3C000-E3CFFF     (base 16)            Densitron Technologies Ltd\r
+                               16 South Park\r
+                               Sevenoaks  Kent  TN13 1AN\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Shanghai AiGentoo Information Technology Co.,Ltd.\r
+4FF000-4FFFFF     (base 16)            Shanghai AiGentoo Information Technology Co.,Ltd.\r
+                               No.309 room 2445 14C?Tanggu Road?Hongkou District\r
+                               Shanghai    200080\r
+                               CN\r
+\r
+70-B3-D5   (hex)               GENTEC ELECTRO-OPTICS\r
+CF7000-CF7FFF     (base 16)            GENTEC ELECTRO-OPTICS\r
+                               445 ST-JEAN-BAPTISTE SUITE 160\r
+                               Quebec  Quebec  G2E 5N7\r
+                               CA\r
+\r
+70-B3-D5   (hex)               Ossiaco\r
+CB0000-CB0FFF     (base 16)            Ossiaco\r
+                               355 Peel St.\r
+                               Montreal  Quebec  H3C2G9\r
+                               CA\r
+\r
+70-B3-D5   (hex)               MB connect line GmbH Fernwartungssysteme\r
+519000-519FFF     (base 16)            MB connect line GmbH Fernwartungssysteme\r
+                               Winnettener Straße 6\r
+                               Dinkelsbuehl  Bavaria  91550\r
+                               DE\r
+\r
  70-B3-D5   (hex)               System West dba ICS Electronics\r
  E06000-E06FFF     (base 16)            System West dba ICS Electronics\r
                                 7034 Commerce Circle Suite A\r
@@ -11945,6 +12083,18 @@ F63000-F63FFF     (base 16)            Ars Products
                                 Gap  France  05000\r
                                 FR\r
  \r
+70-B3-D5   (hex)               Bolide Technology Group, Inc.\r
+9E1000-9E1FFF     (base 16)            Bolide Technology Group, Inc.\r
+                               468 S. San Dimas Ave.,\r
+                               San Dimas  CA  91773\r
+                               US\r
+\r
+70-B3-D5   (hex)               CYNIX Systems Inc\r
+320000-320FFF     (base 16)            CYNIX Systems Inc\r
+                               Dunchon-daero\r
+                               Seongnam-si  Gyeonggi-do  13215\r
+                               KR\r
+\r
  70-B3-D5   (hex)               OOO Research and Production Center Computer Technologies\r
  B84000-B84FFF     (base 16)            OOO Research and Production Center Computer Technologies\r
                                 Komsomolsky avenue, 90-17\r
@@ -11957,6 +12107,48 @@ F44000-F44FFF     (base 16)            Magneti Marelli S.p.A. Electronics
                                 Corbetta  MI  20011\r
                                 IT\r
  \r
+70-B3-D5   (hex)               RCH ITALIA SPA \r
+BF8000-BF8FFF     (base 16)            RCH ITALIA SPA \r
+                               VIA CENDON 39\r
+                               SILEA   TREVISO   31057\r
+                               IT\r
+\r
+70-B3-D5   (hex)               Orion S.r.l.\r
+41F000-41FFFF     (base 16)            Orion S.r.l.\r
+                               Via Alessandro Volta 25/B\r
+                               Veggiano  Padova  35030\r
+                               IT\r
+\r
+70-B3-D5   (hex)               Digifocus Technology Inc.\r
+ECC000-ECCFFF     (base 16)            Digifocus Technology Inc.\r
+                               6F, No.89, Xinhu 1st Rd., Neihu Dist.\r
+                               Taipei City     11494\r
+                               TW\r
+\r
+70-B3-D5   (hex)               Palarum LLC\r
+45A000-45AFFF     (base 16)            Palarum LLC\r
+                               986 BELVEDERE DRIVE, Suite B\r
+                               LEBANON  OH  45036\r
+                               US\r
+\r
+70-B3-D5   (hex)               Foxtel srl\r
+4F7000-4F7FFF     (base 16)            Foxtel srl\r
+                               via della chimica 25\r
+                               viterbo    01100\r
+                               IT\r
+\r
+70-B3-D5   (hex)               DynaMount LLC\r
+B5B000-B5BFFF     (base 16)            DynaMount LLC\r
+                               16357 Whispering Oaks Dr\r
+                               Ramona  CA  92065\r
+                               US\r
+\r
+70-B3-D5   (hex)               Cubitech\r
+AED000-AEDFFF     (base 16)            Cubitech\r
+                               4-6 Kiprou str\r
+                               Tavros  Athens  17778\r
+                               GR\r
+\r
  70-B3-D5   (hex)               YUYAMA MFG Co.,Ltd\r
  BBB000-BBBFFF     (base 16)            YUYAMA MFG Co.,Ltd\r
                                 3-3-1\r
@@ -15722,9 +15914,6 @@ C27000-C27FFF     (base 16)              GD Mission Systems
                                 Beaverton  Oregon  97003\r
                                 US\r
  \r
-00-1B-C5   (hex)               Private\r
-0AB000-0ABFFF     (base 16)            Private\r
-\r
  00-1B-C5   (hex)               Tesla Controls\r
  0A5000-0A5FFF     (base 16)            Tesla Controls\r
                                 8400 Miramar Road\r
@@ -15941,6 +16130,87 @@ ACC000-ACCFFF     (base 16)            Schneider Electric Motion USA
                                 Angoulême    16800\r
                                 FR\r
  \r
+70-B3-D5   (hex)               ARROW (CHINA) ELECTRONICS TRADING CO., LTD.\r
+6AB000-6ABFFF     (base 16)            ARROW (CHINA) ELECTRONICS TRADING CO., LTD.\r
+                               Floor 28, taikang financial building, building 1, yard 38, dongsanhuan north road, chaoyang district, Beijing\r
+                               beijing  beijing  100033\r
+                               CN\r
+\r
+70-B3-D5   (hex)               Shenzhen Chanslink Network Technology Co., Ltd\r
+49D000-49DFFF     (base 16)            Shenzhen Chanslink Network Technology Co., Ltd\r
+                               Room 432, Block A,CMEC Plaza, Buji Road 1028\r
+                               Shenzhen  Guangdong  518001\r
+                               CN\r
+\r
+70-B3-D5   (hex)               Aloxy\r
+7BB000-7BBFFF     (base 16)            Aloxy\r
+                               Sint-Pietersvliet 7\r
+                               Antwerp    2000\r
+                               BE\r
+\r
+70-B3-D5   (hex)               Umweltanalytik Holbach GmbH\r
+DD6000-DD6FFF     (base 16)            Umweltanalytik Holbach GmbH\r
+                               Sperberweg 3\r
+                               Wadern    66687\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Azmoon Keifiat\r
+41D000-41DFFF     (base 16)            Azmoon Keifiat\r
+                               #3,19th Alley,Gandi Ave,Tehran\r
+                               Tehran  Tehran  1517865314\r
+                               IR\r
+\r
+70-B3-D5   (hex)               Becton Dickinson\r
+6B9000-6B9FFF     (base 16)            Becton Dickinson\r
+                               7 Loveton Circle\r
+                               Sparks  MD  21152\r
+                               US\r
+\r
+70-B3-D5   (hex)               Changzhou Rapid Information Technology Co,Ltd\r
+E80000-E80FFF     (base 16)            Changzhou Rapid Information Technology Co,Ltd\r
+                               Sanjing World Tech Park,3rd Floor,Bld NO3 NO.18huashan Road \r
+                               Changzhou  Jiangsu  213001\r
+                               CN\r
+\r
+70-B3-D5   (hex)               SC3 Automation\r
+EE9000-EE9FFF     (base 16)            SC3 Automation\r
+                               790 Principale Ouest\r
+                               Magog  Quebec  J1X2B3\r
+                               CA\r
+\r
+00-1B-C5   (hex)               Private\r
+0AB000-0ABFFF     (base 16)            Private\r
+\r
+70-B3-D5   (hex)               Navaero Avionics AB\r
+045000-045FFF     (base 16)            Navaero Avionics AB\r
+                               Forradsgatan 4\r
+                               Sundsvall  Vasternorrland  85633\r
+                               SE\r
+\r
+70-B3-D5   (hex)               ResIOT UBLSOFTWARE SRL\r
+DD4000-DD4FFF     (base 16)            ResIOT UBLSOFTWARE SRL\r
+                               Ripa di Porta Ticinese, 39\r
+                               Milano  Mi  20143\r
+                               IT\r
+\r
+70-B3-D5   (hex)               AZ-TECHNOLOGY SDN BHD\r
+C69000-C69FFF     (base 16)            AZ-TECHNOLOGY SDN BHD\r
+                               A108 & A109 BLOCK A KELANA BUSINESS CENTRE NO: 97 JALAN SS7/2 KELANA JAYA\r
+                               PETALING JAYA  SELANGOR  47301\r
+                               MY\r
+\r
+70-B3-D5   (hex)               GTI Technologies Inc\r
+B5A000-B5AFFF     (base 16)            GTI Technologies Inc\r
+                               12707 High Bluff Dr, ste 200\r
+                               San Diego  CA  92130\r
+                               US\r
+\r
+70-B3-D5   (hex)               JSC «SATIS-TL-94»\r
+CB9000-CB9FFF     (base 16)            JSC «SATIS-TL-94»\r
+                               1, bld.2, Timiryazevskaya str. \r
+                               Moscow    127422\r
+                               RU\r
+\r
  70-B3-D5   (hex)               DISMUNTEL SAL\r
  92C000-92CFFF     (base 16)            DISMUNTEL SAL\r
                                 Pol ind cotes\r
@@ -17048,9 +17318,6 @@ D62000-D62FFF     (base 16)             Andasis Elektronik San. ve Tic. A.Ş.
                                 Kwai Chung    852\r
                                 HK\r
  \r
-70-B3-D5   (hex)               Private\r
-90E000-90EFFF     (base 16)            Private\r
-\r
  70-B3-D5   (hex)               GS Elektromedizinsiche Geräte G. Stemple GmbH\r
  144000-144FFF     (base 16)            GS Elektromedizinsiche Geräte G. Stemple GmbH\r
                                 Hauswiesenstr. 26\r
@@ -19952,20 +20219,104 @@ A38000-A38FFF     (base 16)          Aditec GmbH
                                 Offenau  Baden-Wuerttemberg  74254\r
                                 DE\r
  \r
+70-B3-D5   (hex)               Dataflex International BV\r
+52A000-52AFFF     (base 16)            Dataflex International BV\r
+                               van Nassauweg 2-6\r
+                               Krimpen aan den IJssel  Zuid-Holland  2921 LX\r
+                               NL\r
+\r
  70-B3-D5   (hex)               Argosy Labs Inc.\r
  E5B000-E5BFFF     (base 16)            Argosy Labs Inc.\r
                                 490 Canal St #14\r
                                 San Rafael  CA  94901\r
                                 US\r
  \r
+70-B3-D5   (hex)               Brayden Automation Corp\r
+B19000-B19FFF     (base 16)            Brayden Automation Corp\r
+                               6230 Aviation Circle\r
+                               Loveland   CO  80538\r
+                               US\r
+\r
  70-B3-D5   (hex)               PEEK TRAFFIC\r
  691000-691FFF     (base 16)            PEEK TRAFFIC\r
                                 5401 N SAM HOUSTON PKWY W\r
                                 HOUSTON    77086\r
                                 US\r
  \r
-70-B3-D5   (hex)               Brayden Automation Corp\r
-B19000-B19FFF     (base 16)            Brayden Automation Corp\r
-                               6230 Aviation Circle\r
-                               Loveland   CO  80538\r
+70-B3-D5   (hex)               MATELEX\r
+372000-372FFF     (base 16)            MATELEX\r
+                               26, AVENUE DU PETIT PARC\r
+                               VINCENNES    94683\r
+                               FR\r
+\r
+70-B3-D5   (hex)               ETL Elektrotechnik Lauter GmbH\r
+DE3000-DE3FFF     (base 16)            ETL Elektrotechnik Lauter GmbH\r
+                               Konrad-Zuse-Str. 2\r
+                               Mauerstetten  Bavaria  87665\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Phytron GmbH\r
+7BE000-7BEFFF     (base 16)            Phytron GmbH\r
+                               Industriestr. 12\r
+                               Groebenzell  Bayern  82194\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Light field Lab\r
+D27000-D27FFF     (base 16)            Light field Lab\r
+                               699 E Brokaw Rd\r
+                               San Jose  CA  95112\r
+                               US\r
+\r
+70-B3-D5   (hex)               Solarlytics, Inc.\r
+366000-366FFF     (base 16)            Solarlytics, Inc.\r
+                               288 Lindbergh Avenue\r
+                               LIVERMORE  CA  94551\r
+                               US\r
+\r
+70-B3-D5   (hex)               CENSIS, Uiversity of Glasgow\r
+1C2000-1C2FFF     (base 16)            CENSIS, Uiversity of Glasgow\r
+                               121 George Street\r
+                               Glasgow    G1 1RD\r
+                               GB\r
+\r
+70-B3-D5   (hex)               Gstar Creation Co .,Ltd\r
+A67000-A67FFF     (base 16)            Gstar Creation Co .,Ltd\r
+                               1F NO53 Jimay Street san chong district\r
+                               New Taipei    241\r
+                               TW\r
+\r
+70-B3-D5   (hex)               KSE GmbH\r
+38A000-38AFFF     (base 16)            KSE GmbH\r
+                               Frühlingstraße 31-33\r
+                               Ingolstadt    85055\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Maytronics Ltd.\r
+90E000-90EFFF     (base 16)            Maytronics Ltd.\r
+                               \r
+                                   \r
+                               \r
+\r
+70-B3-D5   (hex)               InterTalk Critical Information Systems\r
+5D0000-5D0FFF     (base 16)            InterTalk Critical Information Systems\r
+                               371 Cutler Avenue\r
+                               Dartmouth  Nova Scotia  B3B 0J5\r
+                               CA\r
+\r
+70-B3-D5   (hex)               fpgalabs.com\r
+BA5000-BA5FFF     (base 16)            fpgalabs.com\r
+                               p.Moskovskiy, d. Rumyantsevo, str.4\r
+                               Moscow    108811\r
+                               RU\r
+\r
+70-B3-D5   (hex)               JSC Kaluga Astral\r
+E89000-E89FFF     (base 16)            JSC Kaluga Astral\r
+                               Tsyolkovsky 4\r
+                               Kaluga  Kaluga  248000\r
+                               RU\r
+\r
+70-B3-D5   (hex)               Sunsa, Inc\r
+BFF000-BFFFFF     (base 16)            Sunsa, Inc\r
+                               3422 Fait Ave\r
+                               Baltimore  MD  21224\r
                                 US\r
diff --git a/hwdb/pci.ids b/hwdb/pci.ids

index dd0030d67a80816479705f49d5f2ec321e39b122..7a7da5c192723be4786f69d71a9669df824a8831 100644 (file)
--- a/hwdb/pci.ids
+++ b/hwdb/pci.ids
@@ -1,8 +1,8 @@
  #
  #      List of PCI ID's
  #
-#      Version: 2019.06.30
-#      Date:    2019-06-30 03:15:01
+#      Version: 2019.08.22
+#      Date:    2019-08-22 03:15:01
  #
  #      Maintained by Albert Pool, Martin Mares, and other volunteers from
  #      the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -608,6 +608,7 @@
                 1000 3060  SAS9217-4i4e
                 1014 0472  N2125 External Host Bus Adapter
                 1590 0041  H220i
+               1590 0042  H221 / 9207-8e
                 1590 0044  H220i
                 8086 3000  RS25GB008 RAID Controller
                 8086 3060  RS25FB044 RAID Controller
@@ -683,7 +684,11 @@
                 1028 200c  HBA355i Front
                 1028 200d  HBA355e Adapter
                 1028 200e  HBA355i MX
+               1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
+               1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
         00e6  Fusion-MPT 12GSAS/PCIe Secure SAS38xx
+               1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
+               1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
         00e7  Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
         02b0  Virtual Endpoint on PCIe Switch
                 1d49 0001  ThinkSystem 1610-4P NVMe Switch Adapter
@@ -766,11 +771,23 @@
                 1028 1ae1  PERC H755 Front
                 1028 1ae2  PERC H755N Front
                 1028 1ae3  PERC H755 MX
+               1d49 060a  ThinkSystem RAID 940-8i 4GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060b  ThinkSystem RAID 940-8i 8GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060c  ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060d  ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Internal Adapter
+               1d49 060e  ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060f  ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter
         10e2  MegaRAID 12GSAS/PCIe Secure SAS39xx
                 1028 1ae0  PERC H755 Adapter
                 1028 1ae1  PERC H755 Front
                 1028 1ae2  PERC H755N Front
                 1028 1ae3  PERC H755 MX
+               1d49 060a  ThinkSystem RAID 940-8i 4GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060b  ThinkSystem RAID 940-8i 8GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060c  ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060d  ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Internal Adapter
+               1d49 060e  ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter
+               1d49 060f  ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter
         10e3  MegaRAID 12GSAS/PCIe Unsupported SAS39xx
         10e4  MegaRAID 12GSAS/PCIe Unsupported SAS38xx
         10e5  MegaRAID 12GSAS/PCIe SAS38xx
@@ -2521,6 +2538,7 @@
                 1028 1726  Radeon RX 560DX
                 103c 8479  Radeon RX 560X Mobile
                 1043 04bc  Radeon RX 560
+               1043 052f  Radeon RX 560
                 1458 22ed  Radeon RX 560
                 148c 2381  Radeon RX 560
                 1682 9560  Radeon RX 560
@@ -3213,7 +3231,7 @@
                 174b e180  Radeon HD 7350
                 17af 3015  Radeon HD 7350
         68fe  Cedar LE
-       6900  Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445]
+       6900  Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 / 530/535 / 620/625 Mobile]
                 1025 1056  Radeon R7 M360 / R8 M365DX
                 1028 0640  Radeon R7 M260/M265
                 1028 0643  Radeon R7 M260/M265
@@ -3424,7 +3442,7 @@
                 1043 04a0  Radeon R9 FURY X
                 174b e329  Radeon R9 FURY
         7310  Navi 10
-       731f  Navi 10
+       731f  Navi 10 [Radeon RX 5700 / 5700 XT]
         7833  RS350 Host Bridge
         7834  RS350 [Radeon 9100 PRO/XT IGP]
         7835  RS350M [Mobility Radeon 9000 IGP]
@@ -6233,6 +6251,7 @@
         81c3  VO-4 [PSP TOOL Video Output Device]
         81ce  SxS Pro memory card
         81ff  PS3 TOOL MRP
+       8200  PS3 TOOL RSX Tracing FPGA
         820e  CXD9208GP [PS3 PS2 emulation subsystem adapter]
  # 2nd ID
         905c  SxS Pro memory card
@@ -10793,7 +10812,7 @@
         0fc0  GK107 [GeForce GT 640 OEM]
         0fc1  GK107 [GeForce GT 640]
         0fc2  GK107 [GeForce GT 630 OEM]
-       0fc5  GK107
+       0fc5  GK107 [GeForce GT 1030]
         0fc6  GK107 [GeForce GTX 650]
                 1043 8428  GTX650-DC-1GD5
         0fc8  GK107 [GeForce GT 740]
@@ -11725,7 +11744,9 @@
         1e3c  TU102GL
         1e3d  TU102GL
         1e3e  TU102GL
+       1e81  TU104 [GeForce RTX 2080 SUPER]
         1e82  TU104 [GeForce RTX 2080]
+       1e84  TU104 [GeForce RTX 2070 SUPER]
         1e87  TU104 [GeForce RTX 2080 Rev. A]
         1e90  TU104M [GeForce RTX 2080 Mobile]
         1eab  TU104M
@@ -11741,6 +11762,7 @@
         1f02  TU106 [GeForce RTX 2070]
                 1043 8673  TURBO RTX 2070
         1f04  TU106
+       1f06  TU106 [GeForce RTX 2060 SUPER]
         1f07  TU106 [GeForce RTX 2070 Rev. A]
         1f08  TU106 [GeForce RTX 2060 Rev. A]
         1f10  TU106M [GeForce RTX 2070 Mobile]
@@ -18770,6 +18792,7 @@
         4412  BCM4412 10/100BaseT
         4430  BCM44xx CardBus iLine32 HomePNA 2.0
         4432  BCM4432 CardBus 10/100BaseT
+       4464  BCM4464 802.11ac Wireless Network Adapter
         4610  BCM4610 Sentry5 PCI to SB Bridge
         4611  BCM4610 Sentry5 iLine32 HomePNA 1.0
         4612  BCM4610 Sentry5 V.90 56k Modem
@@ -18845,6 +18868,7 @@
                 14e4 8023  PS410T-H04 NetXtreme-S 4x10G 10GBaseT PCIe SmartNIC
                 14e4 8024  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w4GB DRAM (Part No BCM958802A8044C)
                 14e4 8028  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w8GB DRAM (Part No BCM958802A8048C)
+               1bb0 0021  HPE SimpliVity Accelerator
         d804  BCM58804 Stingray 100Gb Ethernet SoC
  14e5  Pixelfusion Ltd
  14e6  SHINING Technology Inc
@@ -19320,6 +19344,9 @@
         9278  10 Volt Delta Sigma Converter Card
         9287  Analog Output Card
         9290  FPGA Card
+       9300  Universal Exhaust Gas Oxygen Sensor Simulator
+       9310  Digital Programmable Resistor
+       9350  Analog Input Card
  1543  SILICON Laboratories
         3052  Intel 537 [Winmodem]
         4c22  Si3036 MC'97 DAA
@@ -19602,6 +19629,8 @@
         1021  MT28861
         1974  MT28800 Family [ConnectX-5 PCIe Bridge]
         1975  MT416842 Family [BlueField SoC PCIe Bridge]
+       1976  MT28908 Family [ConnectX-6 PCIe Bridge]
+       1977  MT2892 Family [ConnectX-6 Dx PCIe Bridge]
         1978  MT42822 Family [BlueField-2 SoC PCIe Bridge]
         4117  MT27712A0-FDCF-AE
                 1bd4 0039  SN10XMP2P25
@@ -21789,6 +21818,7 @@
                 13c2 3016  TT-budget S2-4200 Twin
                 4254 0552  S952 v3
  1ae0  Google, Inc.
+       0042  Compute Engine Virtual Ethernet [gVNIC]
  1ae3  SANBlaze Technology, Inc.
  1ae7  First Wise Media GmbH
         0520  HFC-S PCI A [X-TENSIONS XC-520]
@@ -22149,6 +22179,7 @@
         0003  Ultrastar SN100 Series NVMe SSD
                 1014 04f5  PCIe3 1.6TB NVMe Flash Adapter
                 1014 04f6  PCIe3 3.2TB NVMe Flash Adapter
+               1c58 0003  Ultrastar SN100/SN150 NVMe SSD
         0023  Ultrastar SN200 Series NVMe SSD
                 1c58 8823  Ultrastar Memory (ME200)
  1c5c  SK hynix
@@ -22204,6 +22235,8 @@
         0007  ExaNIC X40
         0008  ExaNIC V5P
         0009  ExaNIC X25
+       000a  ExaNIC X100
+       000b  ExaNIC V9P
         0100  ExaDISK FX1
  1cf0  Akitio
  1cf7  Subspace Dynamics
@@ -22222,41 +22255,41 @@
         0714  ZX-100/ZX-200 PCI Express Root Port
         0715  ZX-100/ZX-200 PCI Express Root Port
         0716  ZX-D PCI Express Root Port
-       0717  ZX-D PCI Express Root Port
-       0718  ZX-D PCI Express Root Port
-       0719  ZX-D PCI Express Root Port
-       071a  ZX-D PCI Express Root Port
-       071b  ZX-D PCI Express Root Port
-       071c  ZX-D PCI Express Root Port
-       071d  ZX-D PCI Express Root Port
-       071e  ZX-D PCI Express Root Port
+       0717  ZX-D/ZX-E PCI Express Root Port
+       0718  ZX-D/ZX-E PCI Express Root Port
+       0719  ZX-D/ZX-E PCI Express Root Port
+       071a  ZX-D/ZX-E PCI Express Root Port
+       071b  ZX-D/ZX-E PCI Express Root Port
+       071c  ZX-D/ZX-E PCI Express Root Port
+       071d  ZX-D/ZX-E PCI Express Root Port
+       071e  ZX-D/ZX-E PCI Express Root Port
         071f  ZX-200 Upstream Port of PCI Express Switch
         0720  ZX-200 PCIE RC6 controller
         0721  ZX-200 Downstream Port of PCI Express Switch
         0722  ZX-200 PCIE P2C bridge
         1000  ZX-D Standard Host Bridge
-       1001  ZX-D Miscellaneous Bus
+       1001  ZX-D/ZX-E Miscellaneous Bus
         3001  ZX-100 Standard Host Bridge
         300a  ZX-100 Miscellaneous Bus
-       3038  ZX-100/ZX-200 Standard Universal PCI to USB Host Controller
-       3104  ZX-100/ZX-200 Standard Enhanced PCI to USB Host Controller
+       3038  ZX-100/ZX-200/ZX-E Standard Universal PCI to USB Host Controller
+       3104  ZX-100/ZX-200/ZX-E Standard Enhanced PCI to USB Host Controller
         31b0  ZX-100/ZX-D Standard Host Bridge
         31b1  ZX-100/ZX-D Standard Host Bridge
         31b2  ZX-100/ZX-D DRAM Controller
         31b3  ZX-100/ZX-D Power Management Controller
         31b4  ZX-100/ZX-D I/O APIC
         31b5  ZX-100/ZX-D Scratch Device
-       31b7  ZX-100/ZX-D Standard Host Bridge
+       31b7  ZX-100/ZX-D/ZX-E Standard Host Bridge
         31b8  ZX-100/ZX-D PCI to PCI Bridge
-       3288  ZX-100/ZX-D High Definition Audio Controller
-       345b  ZX-100/ZX-D Miscellaneous Bus
+       3288  ZX-100/ZX-D/ZX-E High Definition Audio Controller
+       345b  ZX-100/ZX-D/ZX-E Miscellaneous Bus
         3a02  ZX-100 C-320 GPU
         3a03  ZX-D C-860 GPU
         9002  ZX-100/ZX-200 EIDE Controller
-       9003  ZX-100 EIDE Controller
-       9045  ZX-100/ZX-D RAID Accelerator
-       9046  ZX-D RAID Accelerator
-       9083  ZX-100/ZX-200 StorX AHCI Controller
+       9003  ZX-100/ZX-E EIDE Controller
+       9045  ZX-100/ZX-D/ZX-E RAID Accelerator 0
+       9046  ZX-D/ZX-E RAID Accelerator 1
+       9083  ZX-100/ZX-200/ZX-E StorX AHCI Controller
         9084  ZX-100 StorX AHCI Controller
         9100  ZX-200 Cross bus
         9101  ZX-200 Traffic Controller
@@ -22265,10 +22298,11 @@
         9180  ZX-200 Networking Gigabit Ethernet Adapter
         9202  ZX-100 USB eXtensible Host Controller
         9203  ZX-200 USB eXtensible Host Controller
+       9204  ZX-E USB eXtensible Host Controller
         9286  ZX-D eMMC Host Controller
-       9300  ZX-D eSPI Host Controller
+       9300  ZX-D/ZX-E eSPI Host Controller
         95d0  ZX-100 Universal SD Host Controller
-       f410  ZX-100/ZX-D PCI Com Port
+       f410  ZX-100/ZX-D/ZX-E PCI Com Port
  1d18  RME
         0001  Fireface UFX+
  1d1d  CNEX Labs
@@ -22284,6 +22318,11 @@
         00c0  Turbocard3 Accelerator
         0140  Open Network Interface Card 40G
         e004  AB01/EMB01 Development Board
+1d37  NovaSparks
+       0013  PM3
+       0014  PM4
+       0015  PM4edge
+       0016  PM4edge User Device
  1d40  Techman Electronics (Changshu) Co., Ltd.
  1d44  DPT
         a400  PM2x24/PM3224
@@ -22321,6 +22360,8 @@
                 1d6c 2001  DPDK-Aware Virtual Function [Arkville VF]
         100e  AR-ARKA-FX1 [Arkville 64B DPDK Data Mover]
                 1d6c 2001  DPDK-Aware Virtual Function [Arkville VF]
+       100f  AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Versal]
+       1010  AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Agilex]
         4200  A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
  1d72  Xiaomi
  1d78  DERA
@@ -22421,6 +22462,12 @@
         0215  Acorn CLE-215
         021f  Acorn CLE-215+
         1525  Xilinx BCU-1525
+# VU33P FPGA Accelerator
+       1533  ForestKitten 33
+# JungleCat VU33P Module
+       1633  JCM33
+# JungleCat VU35P Module
+       1635  JCM35
  1e26  Fujitsu Client Computing Limited
  1e38  Thinci, Inc
  1e3d  Burlywood, Inc
@@ -22432,6 +22479,7 @@
         0001  PY8800
         0100  PY8800
                 0000 0100  PY8800 64GB Accelerator
+1e6b  Axiado Corp.
  # nee Tumsan Oy
  1fc0  Ascom (Finland) Oy
         0300  E2200 Dual E1/Rawpipe Card
@@ -22506,6 +22554,7 @@
  20f4  TRENDnet
  2116  ZyDAS Technology Corp.
  21c3  21st Century Computer Corp.
+22b8  Flex-Logix Technologies
  22db  Missing Link Electronics, Inc.
  2304  Colorgraphic Communications Corp.
  2348  Racore
@@ -22901,6 +22950,11 @@
         0030  [mvHYPERION-HD-SDI-Merger] HD-SDI PCI Express x4 Frame Grabber
  4ddc  ILC Data Device Corp
         0100  DD-42924I5-300 (ARINC 429 Data Bus)
+       0300  SB-3620 Motion Feedback Device
+       0340  SB-3623 Motion Feedback Device
+       0400  SB-3622 Motion Feedback Device
+       0500  SB-3621 Motion Feedback Device
+       0510  SB-3624 Motion Feedback Device
         0801  BU-65570I1 MIL-STD-1553 Test and Simulation
         0802  BU-65570I2 MIL-STD-1553 Test and Simulation
         0811  BU-65572I1 MIL-STD-1553 Test and Simulation
@@ -22917,6 +22971,10 @@
         0b02  BU-65569I2 MIL-STD-1553 Data Bus
         0b03  BU-65569I3 MIL-STD-1553 Data Bus
         0b04  BU-65569I4 MIL-STD-1553 Data Bus
+       0d01  SB-3641 Motion Feedback Device
+       0d10  SB-365x Motion Feedback Device
+       2f00  SB-3642 Motion Feedback Device
+       3000  SB-3644 Motion Feedback Device
  5045  University of Toronto
         4243  BLASTbus PCI Interface Card v1
  5046  GemTek Technology Corporation
@@ -23855,6 +23913,10 @@
                 1590 0264  NVMe Datacenter SSD [3DNAND] 3.2TB 2.5" U.2 (P4600)
                 1590 0265  NVMe Datacenter SSD [3DNAND] 6.4TB 2.5" U.2 (P4600)
                 1590 026c  NVMe Datacenter SSD [3DNAND] 4.0TB AIC (P4500)
+               1d49 4702  Thinksystem Intel P4500 NVMe U.2
+               1d49 4704  Thinksystem Intel P4500 NVMe AIC
+               1d49 4712  Thinksystem Intel P4600 NVMe U.2
+               1d49 4714  Thinksystem Intel P4600 NVMe AIC
                 1d49 4802  Thinksystem U.2 P4510 NVMe SSD
                 1d49 4812  Thinksystem U.2 P4610 NVMe SSD
                 8086 4308  Intel SSD D5-P4320 and D5-P4326
@@ -25095,6 +25157,8 @@
         1563  Ethernet Controller 10G X550T
                 1028 1fa8  Ethernet 10G 4P X550/I350 rNDC
                 1028 1fa9  Ethernet 10G 4P X550 rNDC
+               1137 02b2  X550-TX 10 Gig LOM
+               1137 02b3  X550-TX 10 Gig LOM
                 1170 0001  Intel Ethernet Controller X550-T2 OCP card
                 14c0 1201  X550 10Gb 2P RJ45 OCP Mezz
                 1590 00d1  Ethernet 10Gb 2-port 562T Adapter
@@ -25165,6 +25229,7 @@
                 8086 4005  Ethernet Controller X710 for 10GbE SFP+
                 8086 4006  Ethernet Controller X710 for 10GbE SFP+
                 8086 4007  Ethernet Controller X710 for 10GbE SFP+
+       1574  Ethernet Controller XL710 Emulation
         1575  DSL6340 Thunderbolt 3 NHI [Alpine Ridge 2C 2015]
         1576  DSL6340 Thunderbolt 3 Bridge [Alpine Ridge 2C 2015]
         1577  DSL6540 Thunderbolt 3 NHI [Alpine Ridge 4C 2015]
@@ -25188,6 +25253,7 @@
                 1028 1f9f  Ethernet 40G 2P XL710 QSFP+ rNDC
                 108e 0000  10 Gb/40 Gb Ethernet Adapter
                 108e 7b1b  10 Gb/40 Gb Ethernet Adapter
+               108e 7b1d  10Gb/40Gb Ethernet Adapter
                 1137 0000  Ethernet Converged NIC XL710-QDA2
                 1137 013c  Ethernet Converged NIC XL710-QDA2
                 8086 0000  Ethernet Converged Network Adapter XL710-Q2
@@ -25226,11 +25292,14 @@
         158a  Ethernet Controller XXV710 for 25GbE backplane
                 1590 0000  10/25Gb Ethernet Adapter
                 1590 0286  Synergy 4610C 10/25Gb Ethernet Adapter
+               8086 0000  Ethernet Controller XXV710 for 25GbE backplane
                 8086 000a  Ethernet 25G 2P XXV710 Mezz
         158b  Ethernet Controller XXV710 for 25GbE SFP28
                 1137 0000  Ethernet Network Adapter XXV710
                 1137 0225  Ethernet Network Adapter XXV710
                 1137 02b4  Ethernet Network Adapter XXV710 OCP 2.0
+               1590 0000  Ethernet Network Adapter XXV710-2
+               1590 0253  Ethernet 10/25/Gb 2-port 661SFP28 Adapter
                 8086 0000  Ethernet Network Adapter XXV710
                 8086 0001  Ethernet Network Adapter XXV710-2
                 8086 0002  Ethernet Network Adapter XXV710-2
@@ -25372,6 +25441,8 @@
         163d  Broadwell-U Integrated Graphics
         163e  Broadwell-U Integrated Graphics
         1889  Ethernet Adaptive Virtual Function
+       18a0  C4xxx Series QAT
+       18a1  C4XXX Series QAT Virtual Function
         1900  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
         1901  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x16)
         1902  HD Graphics 510
@@ -25981,6 +26052,7 @@
         2084  Sky Lake-E PCU Registers
         2085  Sky Lake-E PCU Registers
         2086  Sky Lake-E PCU Registers
+       2088  Sky Lake-E DDRIO Registers
         208d  Sky Lake-E CHA Registers
         208e  Sky Lake-E CHA Registers
         2241  Larrabee
@@ -27235,6 +27307,8 @@
                 1028 200a  Express Flash NVMe [Optane] 375GB AIC (P4800X)
                 8086 3904  NVMe Datacenter SSD [Optane] x4 AIC (P4800X)
                 8086 3905  NVMe Datacenter SSD [Optane] 15mm 2.5" U.2 (P4800X)
+       2723  Wi-Fi 6 AX200
+               8086 2723  Wireless AX200
         2770  82945G/GZ/P/PL Memory Controller Hub
                 1028 01ad  OptiPlex GX620
                 103c 2a3b  Pavilion A1512X
@@ -28669,10 +28743,13 @@
                 8086 4210  Dual Band Wireless AC 3165
         3166  Dual Band Wireless-AC 3165 Plus Bluetooth
         3184  UHD Graphics 605
+       3185  UHD Graphics 605
         318c  Celeron/Pentium Silver Processor Dynamic Platform and Thermal Framework Processor Participant
         318e  Celeron/Pentium Silver Processor NorthPeak
+       3192  Gemini Lake P2SB
         3197  Celeron/Pentium Silver Processor PCI-default ISA-bridge
         319a  Celeron/Pentium Silver Processor Trusted Execution Engine Interface
+       31a2  Celeron/Pentium Silver Processor Integrated Sensor Solution
         31ac  Celeron/Pentium Silver Processor Serial IO I2C Host Controller
         31ae  Celeron/Pentium Silver Processor Serial IO I2C Host Controller
         31bc  Celeron/Pentium Silver Processor Serial IO UART Host Controller
@@ -28683,7 +28760,14 @@
         31c6  Celeron/Pentium Silver Processor Serial IO SPI Host Controller
         31cc  Celeron/Pentium Silver Processor SDA Standard Compliant SD Host Controller
         31d4  Celeron/Pentium Silver Processor Gaussian Mixture Model
+       31d6  Gemini Lake PCI Express Root Port
+       31d7  Gemini Lake PCI Express Root Port
+       31d8  Gemini Lake PCI Express Root Port
+       31d9  Gemini Lake PCI Express Root Port
+       31da  Gemini Lake PCI Express Root Port
+       31db  Gemini Lake PCI Express Root Port
         31ee  Celeron/Pentium Silver Processor Serial IO UART Host Controller
+       31f0  Gemini Lake Host Bridge
         3200  GD31244 PCI-X SATA HBA
                 1775 c200  C2K onboard SATA host bus adapter
         3310  IOP348 I/O Processor
@@ -28993,6 +29077,7 @@
                 17aa 4020  Ethernet Connection X722 for 1GbE
                 17aa 4021  Ethernet Connection X722 for 1GbE
                 17aa 4022  Ethernet Connection X722 for 1GbE
+               17aa 4024  Ethernet Connection X722 for 1GbE
         37d2  Ethernet Connection X722 for 10GBASE-T
                 1170 37d2  Ethernet Connection X722 for 10GBASE-T
                 14cd 0030  Ethernet OCP 2x10G RJ45 Phy Card [USI-X557-10GbaseT]
@@ -29000,6 +29085,7 @@
                 17aa 4020  Ethernet Connection X722 for 10GBASE-T
                 17aa 4021  Ethernet Connection X722 for 10GBASE-T
                 17aa 4022  Ethernet Connection X722 for 10GBASE-T
+               17aa 4024  Ethernet Connection X722 for 10GBASE-T
                 17aa 4025  Ethernet Connection X722 for 10GBASE-T
         37d3  Ethernet Connection X722 for 10GbE SFP+
                 1590 0219  Ethernet 10Gb 2-port 568FLR-MMSFP+ Adapter
@@ -29378,6 +29464,7 @@
         3e1f  8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
                 1458 5000  Z370 AORUS Gaming K3-CF
         3e30  8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
+       3e34  Coffee Lake HOST and DRAM Controller
         3e81  8th Gen Core Processor PCIe Controller (x16)
         3e85  8th Gen Core Processor PCIe Controller (x8)
         3e89  8th Gen Core Processor PCIe Controller (x4)
@@ -29731,6 +29818,7 @@
         6f52  Xeon Processor D Family QuickData Technology Register DMA Channel 2
         6f53  Xeon Processor D Family QuickData Technology Register DMA Channel 3
         6f54  Xeon Processor D Family QuickAssist Technology
+       6f55  Xeon Processor D Family QuickAssist Technology Virtual Fuction
         6f60  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Home Agent 1
         6f68  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Target Address/Thermal/RAS
         6f6a  Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D Channel Target Address Decoder
@@ -29989,6 +30077,13 @@
         8817  Platform Controller Hub EG20T I2C Controller
         8818  Platform Controller Hub EG20T Controller Area Network (CAN) Controller
         8819  Platform Controller Hub EG20T IEEE 1588 Hardware Assist
+       8a0d  Ice Lake Thunderbolt 3 NHI #1
+       8a13  Ice Lake Thunderbolt 3 USB Controller
+       8a17  Ice Lake Thunderbolt 3 NHI #0
+       8a1d  Ice Lake Thunderbolt 3 PCI Express Root Port #0
+       8a1f  Ice Lake Thunderbolt 3 PCI Express Root Port #1
+       8a21  Ice Lake Thunderbolt 3 PCI Express Root Port #2
+       8a23  Ice Lake Thunderbolt 3 PCI Express Root Port #3
         8c00  8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode]
         8c01  8 Series Chipset Family 4-port SATA Controller 1 [IDE mode] - Mobile
         8c02  8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode]
@@ -30753,8 +30848,7 @@
         d158  Core Processor Miscellaneous Registers
         f1a5  SSD 600P Series
         f1a6  SSD Pro 7600p/760p/E 6100p Series
-       f1a8  SSDPEKNW020T8 [660p, 2TB]
-               8086 390d  SSDPEKNW020T8 [660p, 2TB]
+       f1a8  SSD 660P Series
  8088  Beijing Wangxun Technology Co., Ltd.
         1001  Ethernet Controller RP1000 for 10GbE SFP+
                 8088 0000  Ethernet Network Adaptor RP1000 for 10GbE SFP+
@@ -31824,6 +31918,8 @@ C 11  Signal processing controller
         80  Signal processing controller
  C 12  Processing accelerators
         00  Processing accelerators
+# For the class of PCI attached devices which perform a function of Deep Learning Neural Network inference acceleration
+       01  AI Inference Accelerator
  C 13  Non-Essential Instrumentation
  C 40  Coprocessor
  C ff  Unassigned class
diff --git a/hwdb/usb.ids b/hwdb/usb.ids

index 8192648b52f64bace711eba57166a2ffa0ffb493..7d136519fb921b1cd81d8a47e135ca6a16c2d834 100644 (file)
--- a/hwdb/usb.ids
+++ b/hwdb/usb.ids
@@ -9,8 +9,8 @@
  #      The latest version can be obtained from
  #              http://www.linux-usb.org/usb.ids
  #
-# Version: 2019.05.08
-# Date:    2019-05-08 20:34:05
+# Version: 2019.08.21
+# Date:    2019-08-21 20:34:05
  #
  
  # Vendors, devices and interfaces. Please keep sorted.
@@ -7644,6 +7644,10 @@
         0002  CVA122 Cable Voice Adapter (WDM)
         0003  CVA124E Cable Voice Adapter (WDM)
         0004  CVA122E Cable Voice Adapter (WDM)
+       0a00  Integrated Management Controller Hub
+       0a01  Virtual Keyboard/Mouse
+       0a02  Virtual Mass Storage
+       0a03  Virtual Ethernet/RNDIS
  05a7  Bose Corp.
         4000  Bluetooth Headset
         4001  Bluetooth Headset in DFU mode
@@ -19196,6 +19200,7 @@
         0101  RTL8812AU Archer T4U 802.11ac
         0103  Archer T4UH wireless Realtek 8812AU
         0105  Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U]
+       0106  Archer T9UH v1 [Realtek RTL8814AU]
         0107  TL-WN821N Version 5 RTL8192EU
         0108  TL-WN822N Version 4 RTL8192EU
         0109  TL WN823N RTL8192EU
@@ -19442,6 +19447,8 @@
         0001  Nitrogen Bootloader
  30a4  Blues Wireless
         0001  Notecard
+30c2  UNPARALLEL Innovation, Lda
+       1388  SPL Meter
  30ee  Fujitsu Connected Technologies Limited
         1001  F-01L
  3125  Eagletron
diff --git a/man/journalctl.xml b/man/journalctl.xml

index 0ecab521fa0aae8f18f6e16db126ed7e1a217465..f6703b06d65c9f7b7cafec725d9132ba0fab6221 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -544,7 +544,12 @@
          the unit
          (<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>),
          along with additional matches for messages from systemd and
-        messages about coredumps for the specified unit.</para>
+        messages about coredumps for the specified unit. A match
+        is also added for <literal>_SYSTEMD_SLICE=<replaceable>UNIT</replaceable></literal>,
+        such that if the provided <replaceable>UNIT</replaceable> is a
+        <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        unit, all logs of the children of the slice will be logged.
+       </para>
  
          <para>This parameter can be specified multiple times.</para>
          </listitem>
@@ -558,7 +563,11 @@
          (<literal>_SYSTEMD_USER_UNIT=</literal> and
          <literal>_UID=</literal>) and additional matches for messages
          from session systemd and messages about coredumps for the
-        specified unit.</para>
+        specified unit. A match
+        is also added for <literal>_SYSTEMD_USER_SLICE=<replaceable>UNIT</replaceable></literal>,
+        such that if the provided <replaceable>UNIT</replaceable> is a
+        <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        unit, all logs of the children of the unit will be logged.</para>
  
          <para>This parameter can be specified multiple times.</para>
          </listitem>
diff --git a/man/machine-id.xml b/man/machine-id.xml

index f4d94e880097b751ac36f63e1c2751c6f19a6eb9..ebee065a614f901e1000a5ab723be5c1c8ad43db 100644 (file)
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -99,8 +99,8 @@
      be used. If this file is empty or missing, <filename>systemd</filename> will attempt
      to use the D-Bus machine ID from <filename>/var/lib/dbus/machine-id</filename>, the
      value of the kernel command line option <varname>container_uuid</varname>, the KVM DMI
-    <filename>product_uuid</filename> (on KVM systems), and finally a randomly generated
-    UUID.</para>
+    <filename>product_uuid</filename> or the devicetree <filename>vm,uuid</filename>
+    (on KVM systems), and finally a randomly generated UUID.</para>
  
      <para>After the machine ID is established,
      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/man/runlevel.xml b/man/runlevel.xml

index d8bfcd73fce96c5ae0e1996162a24896ad3cd8f2..87e2ed234adccee7d136bde645615520156ce7fd 100644 (file)
--- a/man/runlevel.xml
+++ b/man/runlevel.xml
@@ -4,8 +4,7 @@
  <!-- SPDX-License-Identifier: LGPL-2.1+ -->
  
  <refentry id="runlevel"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    conditional="ENABLE_UTMP">
+    xmlns:xi="http://www.w3.org/2001/XInclude">
  
    <refentryinfo>
      <title>runlevel</title>
diff --git a/man/sd_event_set_watchdog.xml b/man/sd_event_set_watchdog.xml

index faaaad39d967496c9a0bd12b1e2192a20108c66d..cacc683b578814f8d22034943f8fe2aa1388e3a8 100644 (file)
--- a/man/sd_event_set_watchdog.xml
+++ b/man/sd_event_set_watchdog.xml
@@ -69,7 +69,7 @@
      this feature disabled.</para>
  
      <para>The first watchdog notification message is sent immediately
-    when <function>set_event_set_watchdog()</function> is invoked with
+    when <function>sd_event_set_watchdog()</function> is invoked with
      a true <parameter>b</parameter> parameter.</para>
  
      <para>The watchdog logic is designed to allow the service manager
diff --git a/man/systemctl.xml b/man/systemctl.xml

index 0f06a88f4243b412a3bea9f409727ef87fc86e71..9abbb851aa9df4056ee9487f89d781e78a886e3a 100644 (file)
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -818,7 +818,7 @@ Sun 2017-02-26 20:57:49 EST  2h 3min left  Sun 2017-02-26 11:56:36 EST  6h ago
            <listitem>
              <para>Stop (deactivate) one or more units specified on the command line.</para>
  
-            <para>This command will fail if the unit does exist or if stopping of the unit is prohibited (see
+            <para>This command will fail if the unit does not exist or if stopping of the unit is prohibited (see
              <varname>RefuseManualStop=</varname> in
              <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
              It will <emphasis>not</emphasis> fail if any of the commands configured to stop the unit
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml

index 9f0be96b260746eeb411fd555fd7497bc4fa2935..db3f10c3a2aa92ddf686049f47a3f66e35085ea3 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -713,10 +713,10 @@
        <varlistentry>
          <term><option>--private-users-chown</option></term>
  
-        <listitem><para>If specified, all files and directories in the container's directory tree will adjusted so that
-        they are owned to the appropriate UIDs/GIDs selected for the container (see above). This operation is
-        potentially expensive, as it involves descending and iterating through the full directory tree of the
-        container. Besides actual file ownership, file ACLs are adjusted as well.</para>
+        <listitem><para>If specified, all files and directories in the container's directory tree will be
+        adjusted so that they are owned by the appropriate UIDs/GIDs selected for the container (see above).
+        This operation is potentially expensive, as it involves iterating through the full directory tree of
+        the container. Besides actual file ownership, file ACLs are adjusted as well.</para>
  
          <para>This option is implied if <option>--private-users=pick</option> is used. This option has no effect if
          user namespacing is not used.</para></listitem>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml

index 268e69c0e7f72312a2c9a0826b835be0fce2f726..7e763837201b054ca441be0bca96a6a6819c71b6 100644 (file)
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -33,7 +33,7 @@
      <title>Description</title>
  
      <para><filename>systemd-vconsole-setup</filename> sets up and configures either all virtual consoles, or — if the
-    optional <replaceable>TTY</replaceable> parameter is provided — a specific one. When the system is booting up it's
+    optional <replaceable>TTY</replaceable> parameter is provided — a specific one. When the system is booting up, it's
      called by <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry> during
      VT console subsystem initialization.  Also,
      <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> invokes
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml

index fbbfd4f5146852b3e58c24ee500d9e8057045ed2..6dcccc38b4f49eb9b6ddedb5e1dac0761b0b9bd1 100644 (file)
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1035,6 +1035,16 @@ StateDirectory=aaa/bbb ccc</programlisting>
          <varname>RuntimeDirectory=</varname> are removed when the system is rebooted.</para></listitem>
        </varlistentry>
  
+      <varlistentry>
+        <term><varname>TimeoutCleanSec=</varname></term>
+        <listitem><para>Configures a timeout on the clean-up operation requested through <command>systemctl
+        clean …</command>, see
+        <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
+        details. Takes the usual time values and defaults to <constant>infinity</constant>, i.e. by default
+        no time-out is applied. If a time-out is configured the clean operation will be aborted forcibly when
+        the time-out is reached, potentially leaving resources on disk.</para></listitem>
+      </varlistentry>
+
        <varlistentry>
          <term><varname>ReadWritePaths=</varname></term>
          <term><varname>ReadOnlyPaths=</varname></term>
@@ -2152,16 +2162,17 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy
        <varlistentry>
          <term><varname>LogExtraFields=</varname></term>
  
-        <listitem><para>Configures additional log metadata fields to include in all log records generated by processes
-        associated with this unit. This setting takes one or more journal field assignments in the format
-        <literal>FIELD=VALUE</literal> separated by whitespace. See
-        <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-        details on the journal field concept. Even though the underlying journal implementation permits binary field
-        values, this setting accepts only valid UTF-8 values. To include space characters in a journal field value,
-        enclose the assignment in double quotes ("). The usual specifiers are expanded in all assignments (see
-        below). Note that this setting is not only useful for attaching additional metadata to log records of a unit,
-        but given that all fields and values are indexed may also be used to implement cross-unit log record
-        matching. Assign an empty string to reset the list.</para></listitem>
+        <listitem><para>Configures additional log metadata fields to include in all log records generated by
+        processes associated with this unit. This setting takes one or more journal field assignments in the
+        format <literal>FIELD=VALUE</literal> separated by whitespace. See
+        <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+        for details on the journal field concept. Even though the underlying journal implementation permits
+        binary field values, this setting accepts only valid UTF-8 values. To include space characters in a
+        journal field value, enclose the assignment in double quotes ("). <!-- " fake closing quote for emacs-->
+        The usual specifiers are expanded in all assignments (see below). Note that this setting is not only
+        useful for attaching additional metadata to log records of a unit, but given that all fields and
+        values are indexed may also be used to implement cross-unit log record matching. Assign an empty
+        string to reset the list.</para></listitem>
        </varlistentry>
  
        <varlistentry>
@@ -2355,10 +2366,16 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy
        <varlistentry>
          <term><varname>$PATH</varname></term>
  
-        <listitem><para>Colon-separated list of directories to use
-        when launching executables. systemd uses a fixed value of
-        <filename>/usr/local/sbin</filename>:<filename>/usr/local/bin</filename>:<filename>/usr/sbin</filename>:<filename>/usr/bin</filename>:<filename>/sbin</filename>:<filename>/bin</filename>.
-        </para></listitem>
+        <listitem><para>Colon-separated list of directories to use when launching
+        executables. <command>systemd</command> uses a fixed value of
+        <literal><filename>/usr/local/sbin</filename>:<filename>/usr/local/bin</filename>:<filename>/usr/sbin</filename>:<filename>/usr/bin</filename></literal>
+        in the system manager. When compiled for systems with "unmerged /usr" (<filename>/bin</filename> is
+        not a symlink to <filename>/usr/bin</filename>),
+        <literal>:<filename>/sbin</filename>:<filename>/bin</filename></literal> is appended. In case of the
+        the user manager, each <filename>bin/</filename> and <filename>sbin/</filename> pair is switched, so
+        that programs from <filename>/usr/bin</filename> have higher priority than programs from
+        <filename>/usr/sbin</filename>, etc. It is recommended to not rely on this in any way, and have only
+        one program with a given name in <varname>$PATH</varname>.</para></listitem>
        </varlistentry>
  
        <varlistentry>
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml

index fa374bf0f804d1cdc487a8fed111cd00e5c9e274..c11ec050e5ae9323bf42a8c24bd8b6527f31ecf7 100644 (file)
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -188,6 +188,7 @@
          <term><varname>_SYSTEMD_SLICE=</varname></term>
          <term><varname>_SYSTEMD_UNIT=</varname></term>
          <term><varname>_SYSTEMD_USER_UNIT=</varname></term>
+        <term><varname>_SYSTEMD_USER_SLICE=</varname></term>
          <term><varname>_SYSTEMD_SESSION=</varname></term>
          <term><varname>_SYSTEMD_OWNER_UID=</varname></term>
  
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml

index 0775e00bd2fff6c9aa7908073fad7a0e7f526170..43133559b394a6a4b5608f71fd0c628e91165278 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1742,8 +1742,8 @@
        <varlistentry>
          <term><varname>ARPIntervalSec=</varname></term>
          <listitem>
-          <para>Specifies the ARP link monitoring frequency in milliseconds.
-          A value of 0 disables ARP monitoring. The default value is 0.
+          <para>Specifies the ARP link monitoring frequency. A value of 0 disables ARP monitoring. The
+          default value is 0, and the default unit seconds.
            </para>
          </listitem>
        </varlistentry>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml

index cdcca4aca802be3f62c9f013bfcb1d8bed17ec3a..155c0868b207f11033ca7ea4ec9ff31b302d1124 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -57,7 +57,7 @@
      <filename>/run/systemd/network</filename> directories. Drop-in files in
      <filename>/etc</filename> take precedence over those in <filename>/run</filename> which in turn
      take precedence over those in <filename>/usr/lib</filename>. Drop-in files under any of these
-    directories take precedence over the main netdev file wherever located.</para>
+    directories take precedence over the main network file wherever located.</para>
  
      <para>Note that an interface without any static IPv6 addresses configured, and neither DHCPv6
      nor IPv6LL enabled, shall be considered to have no IPv6 support. IPv6 will be automatically
@@ -90,7 +90,7 @@
            <term><varname>MACAddress=</varname></term>
            <listitem>
              <para>A whitespace-separated list of hardware addresses. Use full colon-, hyphen- or dot-delimited hexadecimal. See the example below.
-            This option may appear more than one, in which case the lists are merged. If the empty string is assigned to this option, the list
+            This option may appear more than once, in which case the lists are merged. If the empty string is assigned to this option, the list
              of hardware addresses defined prior to this is reset.</para>
  
              <para>Example:
@@ -1139,6 +1139,16 @@
              <para>A boolean. Specifies whether the rule to be inverted. Defaults to false.</para>
            </listitem>
          </varlistentry>
+        <varlistentry>
+          <term><varname>Family=</varname></term>
+          <listitem>
+            <para>Takes a special value <literal>ipv4</literal>, <literal>ipv6</literal>, or
+            <literal>both</literal>. By default, the address family is determined by the address
+            specified in <varname>To=</varname> or <varname>From=</varname>. If neither
+            <varname>To=</varname> nor <varname>From=</varname> are specified, then defaults to
+            <literal>ipv4</literal>.</para>
+          </listitem>
+        </varlistentry>
        </variablelist>
    </refsect1>
  
@@ -2206,6 +2216,27 @@ DHCP=yes</programlisting>
        <literal>en</literal> (i.e. ethernet interfaces).</para>
      </example>
  
+    <example>
+      <title>IPv6 Prefix Delegation</title>
+
+      <programlisting># /etc/systemd/network/55-ipv6-pd-upstream.network
+[Match]
+Name=enp1s0
+
+[Network]
+DHCP=ipv6</programlisting>
+
+      <programlisting># /etc/systemd/network/56-ipv6-pd-downstream.network
+[Match]
+Name=enp2s0
+
+[Network]
+IPv6PrefixDelegation=dhcpv6</programlisting>
+
+      <para>This will enable IPv6 PD on the interface enp1s0 as an upstream interface where the
+      DHCPv6 client is running and enp2s0 as a downstream interface where the prefix is delegated to.</para>
+    </example>
+
      <example>
        <title>A bridge with two enslaved links</title>
  
diff --git a/man/systemd.service.xml b/man/systemd.service.xml

index 40ac052ba5c9b246c42660bbd82d277dd5f79f7e..14840c2e16d80200039145142d82cd6d2a235378 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -636,16 +636,6 @@
          </para></listitem>
        </varlistentry>
  
-      <varlistentry>
-        <term><varname>TimeoutCleanSec=</varname></term>
-        <listitem><para>Configures a timeout on the clean-up operation requested through <command>systemctl
-        clean …</command>, see
-        <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> for
-        details. Takes the usual time values and defaults to <constant>infinity</constant>, i.e. by default
-        no time-out is applied. If a time-out is configured the clean operation will be aborted forcibly when
-        the time-out is reached, potentially leaving resources on disk.</para></listitem>
-      </varlistentry>
-
        <varlistentry>
          <term><varname>RuntimeMaxSec=</varname></term>
  
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml

index 8307be1d33f66118f549d5df2a96f71f578018f1..d812108d3cd7ab8283adc5265292b16db0fe8ddf 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -104,16 +104,24 @@
      <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
      </para>
  
-    <para>Unit files are loaded from a set of paths determined during
-    compilation, described in the next section.</para>
-
-    <para>Unit files can be parameterized by a single argument called the "instance name". The unit
-    is then constructed based on a "template file" which serves as the definition of multiple
-    services or other units. A template unit must have a single <literal>@</literal> at the end of
-    the name (right before the type suffix). The name of the full unit is formed by inserting the
-    instance name between <literal>@</literal> and the unit type suffix. In the unit file itself,
-    the instance parameter may be referred to using <literal>%i</literal> and other specifiers, see
-    below.</para>
+    <para>Unit files are loaded from a set of paths determined during compilation, described in the next
+    section.</para>
+
+    <para>Valid unit names consist of a "name prefix" and a dot and a suffix specifying the unit type. The
+    "unit prefix" must consist of one or more valid characters (ASCII letters, digits, <literal>:</literal>,
+    <literal>-</literal>, <literal>_</literal>, <literal>.</literal>, and <literal>\</literal>). The total
+    length of the unit name including the suffix must not exceed 256 characters. The type suffix must be one
+    of <literal>.service</literal>, <literal>.socket</literal>, <literal>.device</literal>,
+    <literal>.mount</literal>, <literal>.automount</literal>, <literal>.swap</literal>,
+    <literal>.target</literal>, <literal>.path</literal>, <literal>.timer</literal>,
+    <literal>.slice</literal>, or <literal>.scope</literal>.</para>
+
+    <para>Units names can be parameterized by a single argument called the "instance name". The unit is then
+    constructed based on a "template file" which serves as the definition of multiple services or other
+    units. A template unit must have a single <literal>@</literal> at the end of the name (right before the
+    type suffix). The name of the full unit is formed by inserting the instance name between
+    <literal>@</literal> and the unit type suffix. In the unit file itself, the instance parameter may be
+    referred to using <literal>%i</literal> and other specifiers, see below.</para>
  
      <para>Unit files may contain additional options on top of those
      listed here. If systemd encounters an unknown option, it will
@@ -155,7 +163,7 @@
      <varname>Wants=</varname>, see below. The preferred way to create symlinks in the
      <filename>.wants/</filename> or <filename>.requires/</filename> directory of a unit file is by embedding
      the dependency in [Install] section of the target unit, and creating the symlink in the file system with
-    the with the <command>enable</command> or <command>preset</command> commands of
+    the <command>enable</command> or <command>preset</command> commands of
      <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
  
      <para>Along with a unit file <filename>foo.service</filename>, a "drop-in" directory
diff --git a/man/udevadm.xml b/man/udevadm.xml

index d12c39b7651a4c3a7cd781bd2406496f0140be10..c2f2bc95d217dcb0a43e5ff0554ff769e6f9703f 100644 (file)
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -528,8 +528,11 @@
            <term><option>-a</option></term>
            <term><option>--action=<replaceable>ACTION</replaceable></option></term>
            <listitem>
-            <para>The action string. The special value <literal>help</literal> may be used to list
-            known values.</para>
+            <para>Type of event to be simulated. Possible actions are <literal>add</literal>,
+            <literal>remove</literal>, <literal>change</literal>, <literal>move</literal>,
+            <literal>online</literal>, <literal>offline</literal>, <literal>bind</literal>,
+            and <literal>unbind</literal>. Also, the special value <literal>help</literal> can be used
+            to list the possible actions. The default value is <literal>add</literal>.</para>
            </listitem>
          </varlistentry>
          <varlistentry>
diff --git a/meson_options.txt b/meson_options.txt

index 67aaa89919bc78ee365bf1dddb906e1261eef101..5dc898eb804803a3f90f2ea20aff6e42ec8eb449 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -144,9 +144,9 @@ option('dbussessionservicedir', type : 'string',
  option('dbussystemservicedir', type : 'string',
         description : 'D-Bus system service directory')
  option('pkgconfigdatadir', type : 'string', value : '',
-       description : 'directory for ')
+       description : 'directory for arch-independent pkg-config files')
  option('pkgconfiglibdir', type : 'string', value : '',
-       description : 'directory for ')
+       description : 'directory for standard pkg-config files')
  option('rpmmacrosdir', type : 'string', value : 'lib/rpm/macros.d',
         description : 'directory for rpm macros ["no" disables]')
  option('pamlibdir', type : 'string',
diff --git a/po/ja.po b/po/ja.po

index e74cf6543d23e781d0029cbef668bc56b50c3559..6b550b17ddc9baec5cb48c545301384ed1297d8e 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: systemd\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-28 22:13+0900\n"
+"POT-Creation-Date: 2019-09-04 09:15+0900\n"
  "PO-Revision-Date: 2018-10-27 07:41+0900\n"
  "Last-Translator: Yu Watanabe <watanabe.yu+github@gmail.com>\n"
  "Language-Team: \n"
@@ -558,66 +558,82 @@ msgid "Authentication is required to set NTP servers."
  msgstr "NTPサーバを設定するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:33
+#: src/resolve/org.freedesktop.resolve1.policy:44
  msgid "Set DNS servers"
  msgstr "DNSサーバの設定"
  
  #: src/network/org.freedesktop.network1.policy:34
+#: src/resolve/org.freedesktop.resolve1.policy:45
  msgid "Authentication is required to set DNS servers."
  msgstr "DNSサーバを設定するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:44
+#: src/resolve/org.freedesktop.resolve1.policy:55
  msgid "Set domains"
  msgstr "ドメインの設定"
  
  #: src/network/org.freedesktop.network1.policy:45
+#: src/resolve/org.freedesktop.resolve1.policy:56
  msgid "Authentication is required to set domains."
  msgstr "ドメインを設定するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:55
+#: src/resolve/org.freedesktop.resolve1.policy:66
  msgid "Set default route"
  msgstr "デフォルトルートの設定"
  
  #: src/network/org.freedesktop.network1.policy:56
+#: src/resolve/org.freedesktop.resolve1.policy:67
  msgid "Authentication is required to set default route."
  msgstr "デフォルトルートを設定するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:66
+#: src/resolve/org.freedesktop.resolve1.policy:77
  msgid "Enable/disable LLMNR"
  msgstr "LLMNRの有効化/無効化"
  
  #: src/network/org.freedesktop.network1.policy:67
+#: src/resolve/org.freedesktop.resolve1.policy:78
  msgid "Authentication is required to enable or disable LLMNR."
  msgstr "LLMNRを有効化もしくは無効化するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:77
+#: src/resolve/org.freedesktop.resolve1.policy:88
  msgid "Enable/disable multicast DNS"
  msgstr "マルチキャストDNSの有効化/無効化"
  
  #: src/network/org.freedesktop.network1.policy:78
+#: src/resolve/org.freedesktop.resolve1.policy:89
  msgid "Authentication is required to enable or disable multicast DNS."
  msgstr "マルチキャストDNSを有効化もしくは無効化するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:88
+#: src/resolve/org.freedesktop.resolve1.policy:99
  msgid "Enable/disable DNS over TLS"
  msgstr "DNS over TLSの有効化/無効化"
  
  #: src/network/org.freedesktop.network1.policy:89
+#: src/resolve/org.freedesktop.resolve1.policy:100
  msgid "Authentication is required to enable or disable DNS over TLS."
  msgstr "DNS over TLSを有効化もしくは無効化するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:99
+#: src/resolve/org.freedesktop.resolve1.policy:110
  msgid "Enable/disable DNSSEC"
  msgstr "DNSSECの有効化/無効化"
  
  #: src/network/org.freedesktop.network1.policy:100
+#: src/resolve/org.freedesktop.resolve1.policy:111
  msgid "Authentication is required to enable or disable DNSSEC."
  msgstr "DNSSECを有効化もしくは無効化するには認証が必要です。"
  
  #: src/network/org.freedesktop.network1.policy:110
+#: src/resolve/org.freedesktop.resolve1.policy:121
  msgid "Set DNSSEC Negative Trust Anchors"
  msgstr "DNSSEC Negative Trust Anchorsの設定"
  
  #: src/network/org.freedesktop.network1.policy:111
+#: src/resolve/org.freedesktop.resolve1.policy:122
  msgid "Authentication is required to set DNSSEC Negative Trust Anchros."
  msgstr "DNSSEC Negative Trust Anchrosを設定するには認証が必要です。"
  
@@ -679,6 +695,14 @@ msgstr "DNS-SDサービスへの登録を解除"
  msgid "Authentication is required to unregister a DNS-SD service"
  msgstr "DNS-SDサービスへの登録を解除するには認証が必要です。"
  
+#: src/resolve/org.freedesktop.resolve1.policy:132
+msgid "Revert name resolution settings"
+msgstr "名前解決の設定の破棄"
+
+#: src/resolve/org.freedesktop.resolve1.policy:133
+msgid "Authentication is required to reset name resolution settings."
+msgstr "名前解決の設定を破棄するには認証が必要です。"
+
  #: src/timedate/org.freedesktop.timedate1.policy:22
  msgid "Set system time"
  msgstr "システムの時刻設定"
diff --git a/po/pl.po b/po/pl.po

index df5538c92f070e9765a45c82b6985b8adb0f3533..514625a10ccd0f13e690c31b4eaaa0eb62f6ad33 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
  msgstr ""
  "Project-Id-Version: systemd\n"
  "Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2019-07-29 15:34+0000\n"
-"PO-Revision-Date: 2019-07-30 20:24+0200\n"
+"POT-Creation-Date: 2019-09-13 15:30+0000\n"
+"PO-Revision-Date: 2019-09-14 12:44+0200\n"
  "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
  "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
  "Language: pl\n"
@@ -610,68 +610,84 @@ msgid "Authentication is required to set NTP servers."
  msgstr "Wymagane jest uwierzytelnienie, aby ustawić serwery NTP."
  
  #: src/network/org.freedesktop.network1.policy:33
+#: src/resolve/org.freedesktop.resolve1.policy:44
  msgid "Set DNS servers"
  msgstr "Ustawienie serwerów DNS"
  
  #: src/network/org.freedesktop.network1.policy:34
+#: src/resolve/org.freedesktop.resolve1.policy:45
  msgid "Authentication is required to set DNS servers."
  msgstr "Wymagane jest uwierzytelnienie, aby ustawić serwery DNS."
  
  #: src/network/org.freedesktop.network1.policy:44
+#: src/resolve/org.freedesktop.resolve1.policy:55
  msgid "Set domains"
  msgstr "Ustawienie domen"
  
  #: src/network/org.freedesktop.network1.policy:45
+#: src/resolve/org.freedesktop.resolve1.policy:56
  msgid "Authentication is required to set domains."
  msgstr "Wymagane jest uwierzytelnienie, aby ustawić domeny."
  
  #: src/network/org.freedesktop.network1.policy:55
+#: src/resolve/org.freedesktop.resolve1.policy:66
  msgid "Set default route"
  msgstr "Ustawienie domyślnej trasy"
  
  #: src/network/org.freedesktop.network1.policy:56
+#: src/resolve/org.freedesktop.resolve1.policy:67
  msgid "Authentication is required to set default route."
  msgstr "Wymagane jest uwierzytelnienie, aby ustawić domyślną trasę."
  
  #: src/network/org.freedesktop.network1.policy:66
+#: src/resolve/org.freedesktop.resolve1.policy:77
  msgid "Enable/disable LLMNR"
  msgstr "Włączenie/wyłączenie LLMNR"
  
  #: src/network/org.freedesktop.network1.policy:67
+#: src/resolve/org.freedesktop.resolve1.policy:78
  msgid "Authentication is required to enable or disable LLMNR."
  msgstr "Wymagane jest uwierzytelnienie, aby włączyć lub wyłączyć LLMNR."
  
  #: src/network/org.freedesktop.network1.policy:77
+#: src/resolve/org.freedesktop.resolve1.policy:88
  msgid "Enable/disable multicast DNS"
  msgstr "Włączenie/wyłączenie multikastowego DNS"
  
  #: src/network/org.freedesktop.network1.policy:78
+#: src/resolve/org.freedesktop.resolve1.policy:89
  msgid "Authentication is required to enable or disable multicast DNS."
  msgstr ""
  "Wymagane jest uwierzytelnienie, aby włączyć lub wyłączyć multikastowe DNS."
  
  #: src/network/org.freedesktop.network1.policy:88
+#: src/resolve/org.freedesktop.resolve1.policy:99
  msgid "Enable/disable DNS over TLS"
  msgstr "Włączenie/wyłączenie DNS przez TLS"
  
  #: src/network/org.freedesktop.network1.policy:89
+#: src/resolve/org.freedesktop.resolve1.policy:100
  msgid "Authentication is required to enable or disable DNS over TLS."
  msgstr ""
  "Wymagane jest uwierzytelnienie, aby włączyć lub wyłączyć DNS przez TLS."
  
  #: src/network/org.freedesktop.network1.policy:99
+#: src/resolve/org.freedesktop.resolve1.policy:110
  msgid "Enable/disable DNSSEC"
  msgstr "Włączenie/wyłączenie DNSSEC"
  
  #: src/network/org.freedesktop.network1.policy:100
+#: src/resolve/org.freedesktop.resolve1.policy:111
  msgid "Authentication is required to enable or disable DNSSEC."
  msgstr "Wymagane jest uwierzytelnienie, aby włączyć lub wyłączyć DNSSEC."
  
  #: src/network/org.freedesktop.network1.policy:110
+#: src/resolve/org.freedesktop.resolve1.policy:121
  msgid "Set DNSSEC Negative Trust Anchors"
  msgstr "Ustawienie negatywnych kotwic zaufania DNSSEC"
  
  #: src/network/org.freedesktop.network1.policy:111
+#: src/resolve/org.freedesktop.resolve1.policy:122
  msgid "Authentication is required to set DNSSEC Negative Trust Anchros."
  msgstr ""
  "Wymagane jest uwierzytelnienie, aby ustawić negatywne kotwice zaufania "
@@ -682,7 +698,7 @@ msgid "Revert NTP settings"
  msgstr "Przywrócenie ustawień NTP"
  
  #: src/network/org.freedesktop.network1.policy:122
-msgid "Authentication is required to revert NTP settings."
+msgid "Authentication is required to reset NTP settings."
  msgstr "Wymagane jest uwierzytelnienie, aby przywrócić ustawienia NTP."
  
  #: src/network/org.freedesktop.network1.policy:132
@@ -690,7 +706,7 @@ msgid "Revert DNS settings"
  msgstr "Przywrócenie ustawień DNS"
  
  #: src/network/org.freedesktop.network1.policy:133
-msgid "Authentication is required to revert DNS settings."
+msgid "Authentication is required to reset DNS settings."
  msgstr "Wymagane jest uwierzytelnienie, aby przywrócić ustawienia DNS."
  
  #: src/portable/org.freedesktop.portable1.policy:13
@@ -739,6 +755,15 @@ msgstr "Wyrejestrowanie usługi DNS-SD"
  msgid "Authentication is required to unregister a DNS-SD service"
  msgstr "Wymagane jest uwierzytelnienie, aby wyrejestrować usługę DNS-SD"
  
+#: src/resolve/org.freedesktop.resolve1.policy:132
+msgid "Revert name resolution settings"
+msgstr "Przywrócenie ustawień rozwiązywania nazw"
+
+#: src/resolve/org.freedesktop.resolve1.policy:133
+msgid "Authentication is required to reset name resolution settings."
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby przywrócić ustawienia rozwiązywania nazw."
+
  #: src/timedate/org.freedesktop.timedate1.policy:22
  msgid "Set system time"
  msgstr "Ustawienie czasu systemu"
diff --git a/po/pt_BR.po b/po/pt_BR.po

index 4f37f99bdc0c26707e6f2cfc182ebbf077150f14..09779f7a76f9615eeddf9e09816cc0d81a8c63a9 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,8 +9,8 @@ msgid ""
  msgstr ""
  "Project-Id-Version: systemd\n"
  "Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2019-05-04 03:28+0000\n"
-"PO-Revision-Date: 2019-05-04 11:12-0300\n"
+"POT-Creation-Date: 2019-09-08 15:28+0000\n"
+"PO-Revision-Date: 2019-09-08 19:00-0300\n"
  "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
  "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
  "Language: pt_BR\n"
@@ -608,6 +608,110 @@ msgstr ""
  "É necessária autenticação para gerenciar máquinas virtuais locais e imagens "
  "contêineres."
  
+#: src/network/org.freedesktop.network1.policy:22
+msgid "Set NTP servers"
+msgstr "Definir servidores NTP"
+
+#: src/network/org.freedesktop.network1.policy:23
+msgid "Authentication is required to set NTP servers."
+msgstr "É necessária autenticação para definir os servidores NTP."
+
+#: src/network/org.freedesktop.network1.policy:33
+#: src/resolve/org.freedesktop.resolve1.policy:44
+msgid "Set DNS servers"
+msgstr "Definir servidores DNS"
+
+#: src/network/org.freedesktop.network1.policy:34
+#: src/resolve/org.freedesktop.resolve1.policy:45
+msgid "Authentication is required to set DNS servers."
+msgstr "É necessária autenticação para definir os servidores DNS."
+
+#: src/network/org.freedesktop.network1.policy:44
+#: src/resolve/org.freedesktop.resolve1.policy:55
+msgid "Set domains"
+msgstr "Definir domínios"
+
+#: src/network/org.freedesktop.network1.policy:45
+#: src/resolve/org.freedesktop.resolve1.policy:56
+msgid "Authentication is required to set domains."
+msgstr "É necessária autenticação para definir domínios."
+
+#: src/network/org.freedesktop.network1.policy:55
+#: src/resolve/org.freedesktop.resolve1.policy:66
+msgid "Set default route"
+msgstr "Definir rota padrão"
+
+#: src/network/org.freedesktop.network1.policy:56
+#: src/resolve/org.freedesktop.resolve1.policy:67
+msgid "Authentication is required to set default route."
+msgstr "É necessária autenticação para definir a rota padrão."
+
+#: src/network/org.freedesktop.network1.policy:66
+#: src/resolve/org.freedesktop.resolve1.policy:77
+msgid "Enable/disable LLMNR"
+msgstr "Habilitar/desabilitar LLMNR"
+
+#: src/network/org.freedesktop.network1.policy:67
+#: src/resolve/org.freedesktop.resolve1.policy:78
+msgid "Authentication is required to enable or disable LLMNR."
+msgstr "É necessária autenticação para definir habilitar ou desabilitar LLMNR."
+
+#: src/network/org.freedesktop.network1.policy:77
+#: src/resolve/org.freedesktop.resolve1.policy:88
+msgid "Enable/disable multicast DNS"
+msgstr "Habilitar/desabilitar DNS multicast"
+
+#: src/network/org.freedesktop.network1.policy:78
+#: src/resolve/org.freedesktop.resolve1.policy:89
+msgid "Authentication is required to enable or disable multicast DNS."
+msgstr "É necessária autenticação para habilitar ou desabilitar DNS multicast."
+
+#: src/network/org.freedesktop.network1.policy:88
+#: src/resolve/org.freedesktop.resolve1.policy:99
+msgid "Enable/disable DNS over TLS"
+msgstr "Habilitar/desabilitar DNS por TLS"
+
+#: src/network/org.freedesktop.network1.policy:89
+#: src/resolve/org.freedesktop.resolve1.policy:100
+msgid "Authentication is required to enable or disable DNS over TLS."
+msgstr "É necessária autenticação para habilitar ou desabilitar DNS por TLS."
+
+#: src/network/org.freedesktop.network1.policy:99
+#: src/resolve/org.freedesktop.resolve1.policy:110
+msgid "Enable/disable DNSSEC"
+msgstr "Habilitar/desabilitar DNSSEC"
+
+#: src/network/org.freedesktop.network1.policy:100
+#: src/resolve/org.freedesktop.resolve1.policy:111
+msgid "Authentication is required to enable or disable DNSSEC."
+msgstr "É necessária autenticação para habilitar ou desabilitar DNSSEC."
+
+#: src/network/org.freedesktop.network1.policy:110
+#: src/resolve/org.freedesktop.resolve1.policy:121
+msgid "Set DNSSEC Negative Trust Anchors"
+msgstr "Definir DNSSEC Negative Trust Anchors"
+
+#: src/network/org.freedesktop.network1.policy:111
+#: src/resolve/org.freedesktop.resolve1.policy:122
+msgid "Authentication is required to set DNSSEC Negative Trust Anchros."
+msgstr "É necessária autenticação para definir DNSSEC Negative Trust Anchros."
+
+#: src/network/org.freedesktop.network1.policy:121
+msgid "Revert NTP settings"
+msgstr "Reverter configurações de NTP"
+
+#: src/network/org.freedesktop.network1.policy:122
+msgid "Authentication is required to revert NTP settings."
+msgstr "É necessária autenticação para reverter as configurações de NTP."
+
+#: src/network/org.freedesktop.network1.policy:132
+msgid "Revert DNS settings"
+msgstr "Reverter configurações de DNS"
+
+#: src/network/org.freedesktop.network1.policy:133
+msgid "Authentication is required to revert DNS settings."
+msgstr "É necessária autenticação para reverter as configurações de DNS."
+
  #: src/portable/org.freedesktop.portable1.policy:13
  msgid "Inspect a portable service image"
  msgstr "Inspecionar uma imagem de serviço portável"
@@ -655,6 +759,16 @@ msgstr "Remover um serviço DNS-SD"
  msgid "Authentication is required to unregister a DNS-SD service"
  msgstr "É necessária autenticação para remover um serviço DNS-SD"
  
+#: src/resolve/org.freedesktop.resolve1.policy:132
+msgid "Revert name resolution settings"
+msgstr "Reverter configurações de resolução de nome"
+
+#: src/resolve/org.freedesktop.resolve1.policy:133
+msgid "Authentication is required to revert name resolution settings."
+msgstr ""
+"É necessária autenticação para reverter as configurações de resolução de "
+"nome."
+
  #: src/timedate/org.freedesktop.timedate1.policy:22
  msgid "Set system time"
  msgstr "Definir horário do sistema"
@@ -695,23 +809,23 @@ msgstr ""
  "É necessária autenticação para controlar se deve ser habilitada, ou não, a "
  "sincronização de horário através de rede."
  
-#: src/core/dbus-unit.c:317
+#: src/core/dbus-unit.c:354
  msgid "Authentication is required to start '$(unit)'."
  msgstr "É necessária autenticação para iniciar “$(unit)”."
  
-#: src/core/dbus-unit.c:318
+#: src/core/dbus-unit.c:355
  msgid "Authentication is required to stop '$(unit)'."
  msgstr "É necessária autenticação para parar “$(unit)”."
  
-#: src/core/dbus-unit.c:319
+#: src/core/dbus-unit.c:356
  msgid "Authentication is required to reload '$(unit)'."
  msgstr "É necessária autenticação para recarregar “$(unit)”."
  
-#: src/core/dbus-unit.c:320 src/core/dbus-unit.c:321
+#: src/core/dbus-unit.c:357 src/core/dbus-unit.c:358
  msgid "Authentication is required to restart '$(unit)'."
  msgstr "É necessária autenticação para reiniciar “$(unit)”."
  
-#: src/core/dbus-unit.c:493
+#: src/core/dbus-unit.c:530
  msgid ""
  "Authentication is required to send a UNIX signal to the processes of "
  "'$(unit)'."
@@ -719,14 +833,22 @@ msgstr ""
  "É necessária autenticação para enviar um sinal UNIX para os processos de "
  "“$(unit)”."
  
-#: src/core/dbus-unit.c:524
+#: src/core/dbus-unit.c:561
  msgid "Authentication is required to reset the \"failed\" state of '$(unit)'."
  msgstr ""
  "É necessária autenticação para reiniciar o estado “failed” de “$(unit)”."
  
-#: src/core/dbus-unit.c:557
+#: src/core/dbus-unit.c:594
  msgid "Authentication is required to set properties on '$(unit)'."
  msgstr "É necessária autenticação para definir propriedades em “$(unit)”."
  
+#: src/core/dbus-unit.c:703
+msgid ""
+"Authentication is required to delete files and directories associated with "
+"'$(unit)'."
+msgstr ""
+"É necessária autenticação para excluir arquivos e diretórios associados com "
+"“$(unit)”."
+
  #~ msgid "Authentication is required to kill '$(unit)'."
  #~ msgstr "É necessária autenticação para matar “$(unit)”."
diff --git a/po/uk.po b/po/uk.po

index 809ab60051bb5d340be3fe95608b64e7332b8770..92893607bf51dc9782ffb3dcf8e03a64fb90cf7e 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
  msgstr ""
  "Project-Id-Version: systemd master\n"
  "Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2019-03-26 15:29+0000\n"
-"PO-Revision-Date: 2019-04-29 19:03+0300\n"
+"POT-Creation-Date: 2019-07-29 15:34+0000\n"
+"PO-Revision-Date: 2019-08-16 09:11+0300\n"
  "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
  "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
  "Language: uk\n"
@@ -17,7 +17,7 @@ msgstr ""
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
  "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 19.11.70\n"
  
  #: src/core/org.freedesktop.systemd1.policy.in:22
  msgid "Send passphrase back to system"
@@ -502,8 +502,8 @@ msgid ""
  "Authentication is required to indicate to the boot loader to boot to the "
  "boot loader menu."
  msgstr ""
-"Потрібна автентифікація, щоб вказати завантажувачу, що слід завантажитися до"
-" меню завантажувача."
+"Потрібна автентифікація, щоб вказати завантажувачу, що слід завантажитися до "
+"меню завантажувача."
  
  #: src/login/org.freedesktop.login1.policy:374
  msgid "Indicate to the boot loader to boot a specific entry"
@@ -514,8 +514,8 @@ msgid ""
  "Authentication is required to indicate to the boot loader to boot into a "
  "specific boot loader entry."
  msgstr ""
-"Потрібна автентифікація, щоб вказати завантажувачу, що слід завантажити"
-" певний пункт меню завантаження."
+"Потрібна автентифікація, щоб вказати завантажувачу, що слід завантажити "
+"певний пункт меню завантаження."
  
  #: src/login/org.freedesktop.login1.policy:385
  msgid "Set a wall message"
@@ -599,6 +599,95 @@ msgstr ""
  "Потрібна автентифікація, щоб керувати локальними образами віртуальних машин "
  "і контейнерів."
  
+#: src/network/org.freedesktop.network1.policy:22
+msgid "Set NTP servers"
+msgstr "Встановлення серверів NTP"
+
+#: src/network/org.freedesktop.network1.policy:23
+msgid "Authentication is required to set NTP servers."
+msgstr "Потрібна автентифікація, щоб встановити сервери NTP."
+
+#: src/network/org.freedesktop.network1.policy:33
+msgid "Set DNS servers"
+msgstr "Встановлення серверів DNS"
+
+#: src/network/org.freedesktop.network1.policy:34
+msgid "Authentication is required to set DNS servers."
+msgstr "Потрібна автентифікація, щоб встановити сервери DNS."
+
+#: src/network/org.freedesktop.network1.policy:44
+msgid "Set domains"
+msgstr "Встановлення доменів"
+
+#: src/network/org.freedesktop.network1.policy:45
+msgid "Authentication is required to set domains."
+msgstr "Потрібна автентифікація, щоб встановити домени."
+
+#: src/network/org.freedesktop.network1.policy:55
+msgid "Set default route"
+msgstr "Встановлення типового маршруту"
+
+#: src/network/org.freedesktop.network1.policy:56
+msgid "Authentication is required to set default route."
+msgstr "Потрібна автентифікація, щоб встановити типовий маршрут."
+
+#: src/network/org.freedesktop.network1.policy:66
+msgid "Enable/disable LLMNR"
+msgstr "Вмикання або вимикання LLMNR"
+
+#: src/network/org.freedesktop.network1.policy:67
+msgid "Authentication is required to enable or disable LLMNR."
+msgstr "Потрібна автентифікація, щоб увімкнути або вимкнути LLMNR."
+
+#: src/network/org.freedesktop.network1.policy:77
+msgid "Enable/disable multicast DNS"
+msgstr "Вмикання або вимикання трансляційного DNS"
+
+#: src/network/org.freedesktop.network1.policy:78
+msgid "Authentication is required to enable or disable multicast DNS."
+msgstr "Потрібна автентифікація, щоб увімкнути або вимкнути трансляційну DNS."
+
+#: src/network/org.freedesktop.network1.policy:88
+msgid "Enable/disable DNS over TLS"
+msgstr "Вмикання і вимикання DNS через TLS"
+
+#: src/network/org.freedesktop.network1.policy:89
+msgid "Authentication is required to enable or disable DNS over TLS."
+msgstr "Потрібна автентифікація, щоб увімкнути або вимкнути DNS через TLS."
+
+#: src/network/org.freedesktop.network1.policy:99
+msgid "Enable/disable DNSSEC"
+msgstr "Вмикання або вимикання DNSSEC"
+
+#: src/network/org.freedesktop.network1.policy:100
+msgid "Authentication is required to enable or disable DNSSEC."
+msgstr "Потрібна автентифікація, щоб увімкнути або вимкнути DNSSEC."
+
+#: src/network/org.freedesktop.network1.policy:110
+msgid "Set DNSSEC Negative Trust Anchors"
+msgstr "Встановлення прив'язок від'ємної довіри DNSSEC"
+
+#: src/network/org.freedesktop.network1.policy:111
+msgid "Authentication is required to set DNSSEC Negative Trust Anchros."
+msgstr ""
+"Потрібна автентифікація, щоб встановити прив'язки від'ємної довіри DNSSEC."
+
+#: src/network/org.freedesktop.network1.policy:121
+msgid "Revert NTP settings"
+msgstr "Повернення до початкових параметрів NTP"
+
+#: src/network/org.freedesktop.network1.policy:122
+msgid "Authentication is required to revert NTP settings."
+msgstr "Потрібна автентифікація, щоб повернутися до початкових параметрів NTP."
+
+#: src/network/org.freedesktop.network1.policy:132
+msgid "Revert DNS settings"
+msgstr "Повернення до початкових параметрів DNS"
+
+#: src/network/org.freedesktop.network1.policy:133
+msgid "Authentication is required to revert DNS settings."
+msgstr "Потрібна автентифікація, щоб повернутися до початкових параметрів DNS."
+
  #: src/portable/org.freedesktop.portable1.policy:13
  msgid "Inspect a portable service image"
  msgstr "Інспектування образу портативної служби"
@@ -625,8 +714,8 @@ msgstr "Вилучення або внесення змін до образу п
  msgid ""
  "Authentication is required to delete or modify a portable service image."
  msgstr ""
-"Потрібна автентифікація, щоб вилучити образ портативної служби або внести до"
-" нього зміни."
+"Потрібна автентифікація, щоб вилучити образ портативної служби або внести до "
+"нього зміни."
  
  #: src/resolve/org.freedesktop.resolve1.policy:22
  msgid "Register a DNS-SD service"
@@ -684,34 +773,41 @@ msgstr ""
  "Потрібна автентифікація, щоб контролювати, чи синхронізування часу через "
  "мережу запущено."
  
-#: src/core/dbus-unit.c:325
+#: src/core/dbus-unit.c:354
  msgid "Authentication is required to start '$(unit)'."
  msgstr "Потрібна автентифікація, щоб запустити «$(unit)»."
  
-#: src/core/dbus-unit.c:326
+#: src/core/dbus-unit.c:355
  msgid "Authentication is required to stop '$(unit)'."
  msgstr "Потрібна автентифікація, щоб зупинити «$(unit)»."
  
-#: src/core/dbus-unit.c:327
+#: src/core/dbus-unit.c:356
  msgid "Authentication is required to reload '$(unit)'."
  msgstr "Потрібна автентифікація, щоб перезавантажити «$(unit)»."
  
-#: src/core/dbus-unit.c:328 src/core/dbus-unit.c:329
+#: src/core/dbus-unit.c:357 src/core/dbus-unit.c:358
  msgid "Authentication is required to restart '$(unit)'."
  msgstr "Потрібна автентифікація, щоб перезапустити «$(unit)»."
  
-#: src/core/dbus-unit.c:434
+#: src/core/dbus-unit.c:530
  msgid ""
  "Authentication is required to send a UNIX signal to the processes of "
  "'$(unit)'."
  msgstr ""
  "Потрібна автентифікація, щоб надіслати сигнал UNIX до процесів «$(unit)»."
  
-#: src/core/dbus-unit.c:465
+#: src/core/dbus-unit.c:561
  msgid "Authentication is required to reset the \"failed\" state of '$(unit)'."
  msgstr "Потрібна автентифікація, щоб скинути «пошкоджений» стан з «$(unit)»."
  
-#: src/core/dbus-unit.c:498
+#: src/core/dbus-unit.c:594
  msgid "Authentication is required to set properties on '$(unit)'."
  msgstr "Потрібна автентифікація, щоб вказати властивості на «$(unit)»."
  
+#: src/core/dbus-unit.c:703
+msgid ""
+"Authentication is required to delete files and directories associated with "
+"'$(unit)'."
+msgstr ""
+"Потрібна автентифікація, щоб вилучити файли і каталоги, які пов'язано із"
+" «$(unit)»."
diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in

index 580b8971a6687058c4c510c7de3ae869ce43154f..50747a19881d8adbe1433978123507a3f26bdcfc 100644 (file)
--- a/rules/50-udev-default.rules.in
+++ b/rules/50-udev-default.rules.in
@@ -39,6 +39,9 @@ SUBSYSTEM=="cec", GROUP="video"
  SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="render", MODE="@GROUP_RENDER_MODE@"
  SUBSYSTEM=="kfd", GROUP="render", MODE="@GROUP_RENDER_MODE@"
  
+# When using static_node= with non-default permissions, also update
+# tmpfiles.d/static-nodes-permissions.conf.in to keep permissions synchronized.
+
  SUBSYSTEM=="sound", GROUP="audio", \
    OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer"
  
diff --git a/rules/60-block.rules b/rules/60-block.rules

index 491081f0b2bd7a4a8e58558fd137557552f130fa..3134ab995ecef2c098eaa88cd8e8b8d99b74f134 100644 (file)
--- a/rules/60-block.rules
+++ b/rules/60-block.rules
@@ -8,4 +8,6 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
  ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
  
  # watch metadata changes, caused by tools closing the device node which was opened for writing
-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*", OPTIONS+="watch"
+ACTION!="remove", SUBSYSTEM=="block", \
+  KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", \
+  OPTIONS+="watch"
diff --git a/rules/60-fido-id.rules b/rules/60-fido-id.rules

new file mode 100644 (file)

index 0000000..fcf5079
--- /dev/null
+++ b/rules/60-fido-id.rules
@@ -0,0 +1,7 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION=="remove", GOTO="fido_id_end"
+
+SUBSYSTEM=="hidraw", IMPORT{program}="fido_id"
+
+LABEL="fido_id_end"
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules

index 1d8880ef0290137e29f9b416c347e8a08505ecf9..7802b1c94f4aee167e30bdda833e1be7d7a1e0d5 100644 (file)
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
  ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
  
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
  
  # ignore partitions that span the entire disk
  TEST=="whole_disk", GOTO="persistent_storage_end"
diff --git a/rules/meson.build b/rules/meson.build

index b6a32ba77e23aee6763182da060caee56af5fb7a..79423cc2c45f7eb047f63249d36884dd6afbfebd 100644 (file)
--- a/rules/meson.build
+++ b/rules/meson.build
@@ -5,6 +5,7 @@ rules = files('''
          60-cdrom_id.rules
          60-drm.rules
          60-evdev.rules
+        60-fido-id.rules
          60-input-id.rules
          60-persistent-alsa.rules
          60-persistent-input.rules
diff --git a/semaphoreci/semaphore-runner.sh b/semaphoreci/semaphore-runner.sh

index fb5392aee3ddc6a478e957ab8baf83201c59ab9a..184134e6a36d61cbdd4b01cfb1db7376921bf0ef 100755 (executable)
--- a/semaphoreci/semaphore-runner.sh
+++ b/semaphoreci/semaphore-runner.sh
@@ -5,7 +5,7 @@ set -eux
  # default to Debian testing
  DISTRO=${DISTRO:-debian}
  RELEASE=${RELEASE:-buster}
-BRANCH=${BRANCH:-experimental}
+BRANCH=${BRANCH:-master}
  ARCH=${ARCH:-amd64}
  CONTAINER=${RELEASE}-${ARCH}
  CACHE_DIR=${SEMAPHORE_CACHE_DIR:=/tmp}
@@ -18,7 +18,7 @@ create_container() {
      # create autopkgtest LXC image; this sometimes fails with "Unable to fetch
      # GPG key from keyserver", so retry a few times
      for retry in $(seq 5); do
-        sudo lxc-create -n $CONTAINER -t download -- -d $DISTRO -r $RELEASE -a $ARCH && break
+        sudo lxc-create -n $CONTAINER -t download -- -d $DISTRO -r $RELEASE -a $ARCH --keyserver hkp://keyserver.ubuntu.com:80 && break
          sleep $((retry*retry))
      done
  
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl

index 3be0600b9b67c28cee128853409612f2e19f5839..96bf9ae290140193e7e3ab7b78ece3894c687078 100644 (file)
--- a/shell-completion/bash/busctl
+++ b/shell-completion/bash/busctl
@@ -32,7 +32,7 @@ __get_machines() {
  __get_busnames() {
      local mode=$1
      local a b
-    busctl $mode list --no-legend --no-pager 2>/dev/null |
+    COLUMNS=65535 busctl $mode list --no-legend --no-pager 2>/dev/null |
          { while read a b; do echo " $a"; done; };
  }
  
diff --git a/shell-completion/zsh/_bootctl b/shell-completion/zsh/_bootctl

index f0ac89252149437b6931a5a78bdd479de1e34db7..a84601ae6597baee6ff1576467367a652c165d81 100644 (file)
--- a/shell-completion/zsh/_bootctl
+++ b/shell-completion/zsh/_bootctl
@@ -1,6 +1,29 @@
  #compdef bootctl                    -*- shell-script -*-
  # SPDX-License-Identifier: LGPL-2.1+
  
+__bootctl() {
+    bootctl --no-pager $@ 2>/dev/null
+}
+
+_bootctl_comp_ids() {
+    local expl
+    local -a ids
+    __bootctl list | while read a b; do
+        if [[ "$a" == "id:" ]]; then
+            ids+="$b"
+        fi
+    done
+    _wanted id expl 'boot id' compadd "$@" -a ids
+}
+
+_bootctl_set-default() {
+    _bootctl_comp_ids
+}
+
+_bootctl_set-oneshot() {
+    _bootctl_comp_ids
+}
+
  (( $+functions[_bootctl_commands] )) || _bootctl_commands()
  {
      local -a _bootctl_cmds
@@ -9,6 +32,10 @@
          "install:Install systemd-boot to the ESP and EFI variables"
          "update:Update systemd-boot in the ESP and EFI variables"
          "remove:Remove systemd-boot from the ESP and EFI variables"
+        "random-seed:Initialize random seed in ESP and EFI variables"
+        "is-installed:Test whether systemd-boot is installed in the ESP"
+        "set-default:Set the default boot loader entry"
+        "set-oneshot:Set the default boot loader entry only for the next boot"
      )
      if (( CURRENT == 1 )); then
          _describe -t commands 'bootctl command' _bootctl_cmds || compadd "$@"
@@ -26,6 +53,10 @@
  _arguments \
      {-h,--help}'[Prints a short help text and exits.]' \
      '--version[Prints a short version string and exits.]' \
-    '--path=[Path to the EFI System Partition (ESP)]:path:_directories' \
+    '--esp-path=[Path to the EFI System Partition (ESP)]:path:_directories' \
+    '--boot-path=[Path to the $BOOT partition]:path:_directories' \
+    {-p,--print-esp-path}'[Print path to the EFI system partition]' \
+    {-x,--print-boot-path}'[Print path to the $BOOT partition]' \
      '--no-variables[Do not touch EFI variables]' \
+    '--no-pager[Do not pipe output into a pager]' \
      '*::bootctl command:_bootctl_commands'
diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl

index 4e0362423c6549e8b2445d286c8dcc7f4ebe9447..0589e993265ac58f886305c038d41c87a7b9307c 100644 (file)
--- a/shell-completion/zsh/_busctl
+++ b/shell-completion/zsh/_busctl
@@ -37,6 +37,7 @@
      else
          local curcontext="$curcontext"
          cmd="${${_busctl_cmds[(r)$words[1]:*]%%:*}}"
+        curcontext="${curcontext%:*:*}:busctl-${cmd}:"
          if (( $+functions[_busctl_$cmd] )); then
              _busctl_$cmd
          else
@@ -45,6 +46,218 @@
      fi
  }
  
+__busctl() {
+    busctl $_bus_address --no-pager --no-legend "$@" 2>/dev/null
+}
+
+__dbus_matchspec() {
+    # https://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing
+    _values -s, 'rules' \
+        'type[Match on message type]:type:(signal method_call method_return error)' \
+        'eavesdrop[Include unicast messages]:bool:(true false)' \
+        'sender[Match messages sent by a particular sender]:sender:{compadd $(_busctl_get_service_names)}'\
+        'interface[Match messages sent over or to a particular interface]:interface' \
+        'member[Match messages which have the given method or signal name]:member' \
+        'path[Match messages which are sent from or to the given object]:path' \
+        'path_namespace[Match messages which are sent from or to the given namespace]:namespace' \
+        'destination[Match messaged sent to the given unique name]:unique name:{compadd $(_busctl_get_unique_names)}'
+}
+
+(( $+functions[_busctl_get_json] )) || _busctl_get_json()
+{
+    local -a _json_forms
+    _json_forms=( $(__busctl --json=help; echo help) )
+    _values 'format' $_json_forms
+}
+
+(( $+functions[_busctl_get_service_names] )) || _busctl_get_service_names()
+{
+    local -a bus_names
+    bus_names=( $(__busctl call \
+        "org.freedesktop.DBus"  \
+        "/org/freedesktop/DBus" \
+        "org.freedesktop.DBus"  \
+        ListNames) )
+    echo ${(Q)bus_names[3,-1]}
+}
+
+(( $+functions[_busctl_get_unique_names] )) || _busctl_get_unique_names()
+{
+    local -a bus_names
+    local NAME OTHER
+    __busctl --unique list |
+    while read NAME OTHER; do
+        echo $NAME
+    done
+}
+
+(( $+functions[_busctl_get_objects] )) || _busctl_get_objects()
+{
+    local -a objects
+    local name="$1"
+    objects=($(__busctl --list tree $name ))
+    echo $objects
+}
+
+(( $+functions[_busctl_get_interfaces] )) || _busctl_get_interfaces()
+{
+    local NAME TYPE OTHER
+    __busctl introspect "$1" "$2" |
+    while read NAME TYPE OTHER; do
+        if [[ ${TYPE} == "interface" ]]; then
+            echo ${NAME}
+        fi
+    done
+}
+
+(( $+functions[_busctl_get_members] )) || _busctl_get_members()
+{
+    local member="$4"
+    local required="$5"
+    local NAME TYPE SIGNATURE VALUE FLAGS
+    __busctl introspect "$1" "$2" "$3" |
+    while read NAME TYPE SIGNATURE VALUE FLAGS; do
+        [[ -z "$member" || ${TYPE} == "$member" ]] &&
+        [[ -z "$required" || ${${(s: :)FLAGS}[-1]} == "$required" ]] &&
+        echo ${NAME#.}
+    done
+}
+
+(( $+functions[_busctl_get_signature] )) || _busctl_get_signature()
+{
+    local NAME TYPE SIGNATURE VALUE FLAGS
+    __busctl introspect "$1" "$2" "$3" |
+    while read NAME TYPE SIGNATURE VALUE FLAGS; do
+        if [[ ${NAME#.} == "$4" ]]; then
+            [[ ${SIGNATURE} != "-" ]] && echo ${SIGNATURE}
+        fi
+    done
+}
+
+(( $+functions[_busctl_status] )) || _busctl_status()
+{
+    local expl
+    _wanted busname expl 'busname' compadd "$@" - $(_busctl_get_service_names)
+}
+
+(( $+functions[_busctl_monitor] )) || _busctl_monitor()
+{
+    local expl
+    _wanted busname expl 'busname' compadd "$@" - $(_busctl_get_service_names)
+}
+
+(( $+functions[_busctl_tree] )) || _busctl_tree()
+{
+    local expl
+    _wanted busname expl 'busname' compadd "$@" - $(_busctl_get_service_names)
+}
+
+(( $+functions[_busctl_introspect] )) || _busctl_introspect()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+(( $+functions[_busctl_call] )) || _busctl_call()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        5)
+            _wanted method expl 'method' \
+            compadd "$@" - $(_busctl_get_members $words[2,4] "method")
+            ;;
+        6)
+            compadd "$@" - $(_busctl_get_signature $words[2,5])
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+(( $+functions[_busctl_get-property] )) || _busctl_get-property()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        5)
+            _wanted property expl 'property' \
+            compadd "$@" - $(_busctl_get_members $words[2,4] "property")
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+(( $+functions[_busctl_set-property] )) || _busctl_set-property()
+{
+    local expl
+    case $CURRENT in
+        2)
+            _wanted busname expl 'busname' \
+            compadd "$@" - $(_busctl_get_service_names)
+            ;;
+        3)
+            _wanted path expl 'path' \
+            compadd "$@" - $(_busctl_get_objects $words[2])
+            ;;
+        4)
+            _wanted interface expl 'interface' \
+            compadd "$@" - $(_busctl_get_interfaces $words[2,3])
+            ;;
+        5)
+            _wanted property expl 'property' \
+            compadd "$@" - $(_busctl_get_members $words[2,4] "property" "writable")
+            ;;
+        6)
+            compadd "$@" - $(_busctl_get_signature $words[2,5])
+            ;;
+        *)
+            _message "no more options"
+    esac
+}
+
+local -a _modes; _modes=("--user" "--system")
+# Use the last mode (they are exclusive and the last one is used).
+local _bus_address=${${words:*_modes}[(R)(${(j.|.)_modes})]}
+local curcontext=$curcontext state line
  _arguments \
      {-h,--help}'[Prints a short help text and exits.]' \
      '--version[Prints a short version string and exits.]' \
@@ -59,10 +272,12 @@ _arguments \
      '--unique[Only show unique names]' \
      '--acquired[Only show acquired names]' \
      '--activatable[Only show activatable names]' \
-    '--match=[Only show matching messages]:match' \
+    '--match=[Only show matching messages]:match:__dbus_matchspec' \
      '--list[Do not show tree, but simple object path list]' \
-    '--quiet[Do not show method call reply]'\
+    {-q,--quiet}'[Do not show method call reply]'\
      '--verbose[Show result values in long format]' \
+    '--json=[Show result values in long format]:format:_busctl_get_json' \
+    '-j[Show pretty json in interactive sessions, short json otherwise]' \
      '--expect-reply=[Expect a method call reply]:boolean:(1 0)' \
      '--auto-start=[Auto-start destination service]:boolean:(1 0)' \
      '--allow-interactive-authorization=[Allow interactive authorization for operation]:boolean:(1 0)' \
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl

index 019ffbe87ac8e8a0188540fb93067dadef94c302..43bec9b1d62cebd976c1ef774e883b40de5dd7af 100644 (file)
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -116,15 +116,21 @@ _arguments -s \
      '(--directory -D -M --machine --root --file)'{-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
      '(--directory -D -M --machine --root --file)--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
      '(--directory -D -M --machine --root)*--file=[Operate on specified journal files]:file:_files' \
-    '--new-id128[Generate a new 128 Bit ID]' \
-    '--header[Show journal header information]' \
      '--disk-usage[Show total disk usage]' \
-    '--list-catalog[List messages in catalog]' \
      '--dump-catalog[Dump messages in catalog]' \
-    '--update-catalog[Update binary catalog database]' \
-    '--setup-keys[Generate a new FSS key pair]' \
+    '--flush[Flush all journal data from /run into /var]' \
      '--force[Force recreation of the FSS keys]' \
+    '--header[Show journal header information]' \
      '--interval=[Time interval for changing the FSS sealing key]:time interval' \
-    '--verify[Verify journal file consistency]' \
+    '--list-catalog[List messages in catalog]' \
+    '--new-id128[Generate a new 128 Bit ID]' \
+    '--rotate[Request immediate rotation of the journal files]' \
+    '--setup-keys[Generate a new FSS key pair]' \
+    '--sync[Synchronize unwritten journal messages to disk]' \
+    '--update-catalog[Update binary catalog database]' \
+    '--vacuum-files=[Leave only the specified number of journal files]:integer' \
+    '--vacuum-size=[Reduce disk usage below specified size]:bytes' \
+    '--vacuum-time=[Remove journal files older than specified time]:time' \
      '--verify-key=[Specify FSS verification key]:FSS key' \
+    '--verify[Verify journal file consistency]' \
      '*::default: _journalctl_none'
diff --git a/shell-completion/zsh/_systemd-resolve b/shell-completion/zsh/_resolvectl

similarity index 50%

rename from shell-completion/zsh/_systemd-resolve

rename to shell-completion/zsh/_resolvectl

index 3b0ce311f274e11968f72650de4e93f58b8fc2b9..7458f436a54b4297e56a9bcacbcbedae2b83448f 100644 (file)
--- a/shell-completion/zsh/_systemd-resolve
+++ b/shell-completion/zsh/_resolvectl
@@ -1,4 +1,4 @@
-#compdef systemd-resolve                    -*- shell-script -*-
+#compdef resolvectl systemd-resolve         -*- shell-script -*-
  # SPDX-License-Identifier: LGPL-2.1+
  #
  # This file is part of systemd.
@@ -16,33 +16,54 @@
  # You should have received a copy of the GNU Lesser General Public License
  # along with systemd; If not, see <http://www.gnu.org/licenses/>.
  
-(( $+functions[_systemd-resolve_protocols] )) ||
-    _systemd-resolve_protocols() {
+(( $+functions[_resolvectl_protocols] )) ||
+    _resolvectl_protocols() {
          local -a _protocol
          _protocol=( $(_call_program protocol ${service} --legend=no --protocol help; echo help) )
          _values 'protocol' "$_protocol[@]"
      }
  
-(( $+functions[_systemd-resolve_types] )) ||
-    _systemd-resolve_types() {
+(( $+functions[_resolvectl_types] )) ||
+    _resolvectl_types() {
          local -a _type
          _type=( $(_call_program type ${service} --legend=no --type help; echo help) )
          _values 'type' "$_type[@]"
      }
  
-(( $+functions[_systemd-resolve_classes] )) ||
-    _systemd-resolve_classes() {
+(( $+functions[_resolvectl_classes] )) ||
+    _resolvectl_classes() {
          local -a _class
          _class=( $(_call_program class ${service} --legend=no --class help; echo help) )
          _values 'class' "$_class[@]"
      }
  
-(( $+functions[_systemd-resolve_none] )) ||
-    _systemd-resolve_none() {
-        _alternative : \
-                     'domain:DNS address:' \
-                     'address:email address:'
-    }
+(( $+functions[_resolvectl_commands] )) ||
+    _resolvectl_commands() {
+    local -a _resolvectl_cmds
+    _resolvectl_cmds=(
+        default-route:"Configure per-interface default-route setting"
+        dns:"Configure per-interface DNS configuration"
+        dnsovertls:"Configure per-interface dnsovertls enabled status"
+        dnssec:"Configure per-interface dnssec enabled status"
+        domain:"Configure per-interface search and route-only domains"
+        flush-caches:"Flushes all DNS resource record caches the service maintains locally"
+        llmnr:"Configure per-interface llmnr enabled status"
+        mdns:"Configure per-interface mdns enabled status"
+        nta:"Configure per-interface nta domains"
+        openpgp:"Retrieve openpgp keys for an email"
+        query:"Resolve domain names, IPv4 and IPv6 addresses"
+        reset-server-features:"Flushes all feature level information the resolver has learned about specific servers"
+        reset-statistics:"Resets the statistics counter show in statistics to zero"
+        revert:"Revert the per-interfce DNS configuration"
+        service:"Resolve DNS-SD and SRV services"
+        status:"Show the global and per-link DNS settings currently in effect"
+        tlsa:"Query tlsa public keys stored as TLSA resource records"
+    )
+
+    if (( CURRENT == 1 )); then
+        _describe -t commands 'resolvectl commands' _resolvectl_cmds
+    fi
+}
  
  _arguments \
      {-h,--help}'[Print a short help text and exit]' \
@@ -51,9 +72,9 @@ _arguments \
      '-4[Resolve IPv4 addresses]' \
      '-6[Resolve IPv6 addresses]' \
      {-i+,--interface=}'[Look on interface]:interface:_net_interfaces' \
-    {-p+,--protocol=}'[Look via protocol]:protocol:_systemd-resolve_protocols' \
-    {-t+,--type=}'[Query RR with DNS type]:type:_systemd-resolve_types' \
-    {-c+,--class=}'[Query RR with DNS class]:class:_systemd-resolve_classes' \
+    {-p+,--protocol=}'[Look via protocol]:protocol:_resolvectl_protocols' \
+    {-t+,--type=}'[Query RR with DNS type]:type:_resolvectl_types' \
+    {-c+,--class=}'[Query RR with DNS class]:class:_resolvectl_classes' \
      '--service[Resolve services]' \
      '--service-address=no[Do not resolve address for services]' \
      '--service-txt=no[Do not resolve TXT records for services]' \
@@ -63,4 +84,4 @@ _arguments \
      '--search=no[Do not use search domains]' \
      '--statistics[Show resolver statistics]' \
      '--reset-statistics[Reset resolver statistics]' \
-    '*::default: _systemd-resolve_none'
+    '*::default: _resolvectl_commands'
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build

index 792b06122f5207293f851fbb9d87d2323dda08a9..6df9cc6ac2beeabf40a10ed0cf0427f058b90680 100644 (file)
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -33,7 +33,7 @@ if zshcompletiondir != 'no'
                   ['_machinectl',               'ENABLE_MACHINED'],
                   ['_networkctl',               'ENABLE_NETWORKD'],
                   ['_systemd-inhibit',          'ENABLE_LOGIND'],
-                 ['_systemd-resolve',          'ENABLE_RESOLVE'],
+                 ['_resolvectl',               'ENABLE_RESOLVE'],
                   ['_systemd-tmpfiles',         'ENABLE_TMPFILES'],
                   ['_timedatectl',              'ENABLE_TIMEDATED'],
                  ]
diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c

index dd85f282885c29187a423b8558d912325c8db89f..848aeaed8041c838cd2d2d08ddf4a6c19cb6eafd 100644 (file)
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -603,7 +603,7 @@ static int assess_ip_address_allow(
                  d = strdup("Service defines IP address whitelist with non-localhost entries");
                  b = 5;
          } else if (info->ip_address_allow_localhost) {
-                d = strdup("Service defines IP address whitelits with only localhost entries");
+                d = strdup("Service defines IP address whitelist with only localhost entries");
                  b = 2;
          } else {
                  d = strdup("Service blocks all IP address ranges");
diff --git a/src/basic/build.h b/src/basic/build.h

index 7a59059080d384a7d87e795284139ec5692cd198..c47e912eb0ac4617de7bc2b03c148cfcda143224 100644 (file)
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -129,7 +129,7 @@
  #define _PCRE2_FEATURE_ "-PCRE2"
  #endif
  
-#define _CGROUP_HIEARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME
+#define _CGROUP_HIERARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME
  
  #define SYSTEMD_FEATURES                                                \
          _PAM_FEATURE_ " "                                               \
@@ -153,4 +153,4 @@
          _IDN2_FEATURE_ " "                                              \
          _IDN_FEATURE_ " "                                               \
          _PCRE2_FEATURE_ " "                                             \
-        _CGROUP_HIEARCHY_
+        _CGROUP_HIERARCHY_
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c

index dff6543bf595eb117ad86750d6f3b12283bfa99d..7b5839ccd6088ec12dab399ae99527f5b00d96dc 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -342,7 +342,8 @@ int cg_kill(
                  return r;
  
          /* Only in case of killing with SIGKILL and when using cgroupsv2, kill remaining threads manually as
-           a workaround for kernel bug. It was fixed in 5.2-rc5 (c03cd7738a83). */
+           a workaround for kernel bug. It was fixed in 5.2-rc5 (c03cd7738a83), backported to 4.19.66
+           (4340d175b898) and 4.14.138 (feb6b123b7dd). */
          r = cg_unified_controller(controller);
          if (r < 0)
                  return r;
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c

index 3f36b5cc340d191634bed5490d5cdf616ff7e152..de44f45f53f2f61f086a9a83b5357ba170c75225 100644 (file)
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -261,16 +261,12 @@ int conf_files_list_strv(char ***strv, const char *suffix, const char *root, uns
          return conf_files_list_strv_internal(strv, suffix, root, flags, copy);
  }
  
-int conf_files_list(char ***strv, const char *suffix, const char *root, unsigned flags, const char *dir, ...) {
+int conf_files_list(char ***strv, const char *suffix, const char *root, unsigned flags, const char *dir) {
          _cleanup_strv_free_ char **dirs = NULL;
-        va_list ap;
  
          assert(strv);
  
-        va_start(ap, dir);
-        dirs = strv_new_ap(dir, ap);
-        va_end(ap);
-
+        dirs = strv_new(dir);
          if (!dirs)
                  return -ENOMEM;
  
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h

index 55ab32640202a9ee194792040cd5ef2be7abd2ae..7d7be5c90fc31845c811f83eec91efa785b1fdbb 100644 (file)
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -11,7 +11,7 @@ enum {
          CONF_FILES_FILTER_MASKED = 1 << 4,
  };
  
-int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir, ...) _sentinel_;
+int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir);
  int conf_files_list_strv(char ***ret, const char *suffix, const char *root, unsigned flags, const char* const* dirs);
  int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dirs);
  int conf_files_insert(char ***strv, const char *root, char **dirs, const char *path);
diff --git a/src/basic/env-file.c b/src/basic/env-file.c

index 83767b0a24a5769f4754bf175a09d6d21673c628..26470796eb9acf5169031df717ac75b6282441b3 100644 (file)
--- a/src/basic/env-file.c
+++ b/src/basic/env-file.c
@@ -485,6 +485,8 @@ static int merge_env_file_push(
  
          free_and_replace(value, expanded_value);
  
+        log_debug("%s:%u: setting %s=%s", filename, line, key, value);
+
          return load_env_file_push(filename, line, key, value, env, n_pushed);
  }
  
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c

index b7ae2ed1cd59085521d0d60356302a9d87630f07..34cfb36a4a806ce0ffa646de28c73340af5f684f 100644 (file)
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -28,8 +28,6 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
  
          assert(p);
          assert(ret);
-        /* Those two don't make sense together. */
-        assert(!FLAGS_SET(flags, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE));
  
          /* Bail early if called after last value or with no input */
          if (!*p)
diff --git a/src/basic/fileio.c b/src/basic/fileio.c

index 623e43e4caeae97e9f1c1c78c2c84d581f8e51f9..a9c0fd20e14fa989a0f42701a760b9afa6442d8e 100644 (file)
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -930,10 +930,10 @@ int warn_file_is_world_accessible(const char *filename, struct stat *st, const c
  
          if (unit)
                  log_syntax(unit, LOG_WARNING, filename, line, 0,
-                           "%s has %04o mode that is too permissive, please adjust the access mode.",
+                           "%s has %04o mode that is too permissive, please adjust the ownership and access mode.",
                             filename, st->st_mode & 07777);
          else
-                log_warning("%s has %04o mode that is too permissive, please adjust the access mode.",
+                log_warning("%s has %04o mode that is too permissive, please adjust the ownership and access mode.",
                              filename, st->st_mode & 07777);
          return 0;
  }
diff --git a/src/basic/log.c b/src/basic/log.c

index f0472032716a3cfd28df19a3d8e747642b0cc11b..8bcc18bc809abd833e25a54cbab89052a39a30f3 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -87,11 +87,13 @@ static int log_open_console(void) {
          }
  
          if (console_fd < 3) {
-                console_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-                if (console_fd < 0)
-                        return console_fd;
+                int fd;
  
-                console_fd = fd_move_above_stdio(console_fd);
+                fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
+                if (fd < 0)
+                        return fd;
+
+                console_fd = fd_move_above_stdio(fd);
          }
  
          return 0;
@@ -372,13 +374,11 @@ static int write_to_console(
  
                  if (errno == EIO && getpid_cached() == 1) {
  
-                        /* If somebody tried to kick us from our
-                         * console tty (via vhangup() or suchlike),
-                         * try to reconnect */
+                        /* If somebody tried to kick us from our console tty (via vhangup() or suchlike), try
+                         * to reconnect. */
  
                          log_close_console();
-                        log_open_console();
-
+                        (void) log_open_console();
                          if (console_fd < 0)
                                  return 0;
  
@@ -586,7 +586,7 @@ int log_dispatch_internal(
                  level |= log_facility;
  
          if (open_when_needed)
-                log_open();
+                (void) log_open();
  
          do {
                  char *e;
@@ -629,7 +629,7 @@ int log_dispatch_internal(
                          k = write_to_kmsg(level, error, file, line, func, buffer);
                          if (k < 0) {
                                  log_close_kmsg();
-                                log_open_console();
+                                (void) log_open_console();
                          }
                  }
  
@@ -795,7 +795,7 @@ _noreturn_ void log_assert_failed_realm(
                  const char *file,
                  int line,
                  const char *func) {
-        log_open();
+        (void) log_open();
          log_assert(LOG_REALM_PLUS_LEVEL(realm, LOG_CRIT), text, file, line, func,
                     "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
          abort();
@@ -807,7 +807,7 @@ _noreturn_ void log_assert_failed_unreachable_realm(
                  const char *file,
                  int line,
                  const char *func) {
-        log_open();
+        (void) log_open();
          log_assert(LOG_REALM_PLUS_LEVEL(realm, LOG_CRIT), text, file, line, func,
                     "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
          abort();
@@ -1356,5 +1356,5 @@ void log_setup_service(void) {
  
          log_set_target(LOG_TARGET_AUTO);
          log_parse_environment();
-        log_open();
+        (void) log_open();
  }
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h

index f590b91c661cdfcf4f9071bd4c5b5f41140defba..6d9b12544d23cded17afc123cee2c84fcce33ddd 100644 (file)
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -32,7 +32,11 @@ static inline int missing_pivot_root(const char *new_root, const char *put_old)
  /* ======================================================================= */
  
  #if !HAVE_MEMFD_CREATE
-#  ifndef __NR_memfd_create
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_memfd_create && __NR_memfd_create > 0)
+#    if defined __NR_memfd_create
+#      undef __NR_memfd_create
+#    endif
  #    if defined __x86_64__
  #      define __NR_memfd_create 319
  #    elif defined __arm__
@@ -75,7 +79,11 @@ static inline int missing_memfd_create(const char *name, unsigned int flags) {
  /* ======================================================================= */
  
  #if !HAVE_GETRANDOM
-#  ifndef __NR_getrandom
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_getrandom && __NR_getrandom > 0)
+#    if defined __NR_getrandom
+#      undef __NR_getrandom
+#    endif
  #    if defined __x86_64__
  #      define __NR_getrandom 318
  #    elif defined(__i386__)
@@ -134,7 +142,11 @@ static inline pid_t missing_gettid(void) {
  /* ======================================================================= */
  
  #if !HAVE_NAME_TO_HANDLE_AT
-#  ifndef __NR_name_to_handle_at
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_name_to_handle_at && __NR_name_to_handle_at > 0)
+#    if defined __NR_name_to_handle_at
+#      undef __NR_name_to_handle_at
+#    endif
  #    if defined(__x86_64__)
  #      define __NR_name_to_handle_at 303
  #    elif defined(__i386__)
@@ -171,7 +183,11 @@ static inline int missing_name_to_handle_at(int fd, const char *name, struct fil
  /* ======================================================================= */
  
  #if !HAVE_SETNS
-#  ifndef __NR_setns
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_setns && __NR_setns > 0)
+#    if defined __NR_setns
+#      undef __NR_setns
+#    endif
  #    if defined(__x86_64__)
  #      define __NR_setns 308
  #    elif defined(__i386__)
@@ -208,7 +224,11 @@ static inline pid_t raw_getpid(void) {
  /* ======================================================================= */
  
  #if !HAVE_RENAMEAT2
-#  ifndef __NR_renameat2
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_renameat2 && __NR_renameat2 > 0)
+#    if defined __NR_renameat2
+#      undef __NR_renameat2
+#    endif
  #    if defined __x86_64__
  #      define __NR_renameat2 316
  #    elif defined __arm__
@@ -305,7 +325,11 @@ static inline key_serial_t missing_request_key(const char *type, const char *des
  /* ======================================================================= */
  
  #if !HAVE_COPY_FILE_RANGE
-#  ifndef __NR_copy_file_range
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_copy_file_range && __NR_copy_file_range > 0)
+#    if defined __NR_copy_file_range
+#      undef __NR_copy_file_range
+#    endif
  #    if defined(__x86_64__)
  #      define __NR_copy_file_range 326
  #    elif defined(__i386__)
@@ -343,7 +367,11 @@ static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in,
  /* ======================================================================= */
  
  #if !HAVE_BPF
-#  ifndef __NR_bpf
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_bpf && __NR_bpf > 0)
+#    if defined __NR_bpf
+#      undef __NR_bpf
+#    endif
  #    if defined __i386__
  #      define __NR_bpf 357
  #    elif defined __x86_64__
@@ -380,7 +408,11 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) {
  /* ======================================================================= */
  
  #ifndef __IGNORE_pkey_mprotect
-#  ifndef __NR_pkey_mprotect
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_pkey_mprotect && __NR_pkey_mprotect > 0)
+#    if defined __NR_pkey_mprotect
+#      undef __NR_pkey_mprotect
+#    endif
  #    if defined __i386__
  #      define __NR_pkey_mprotect 380
  #    elif defined __x86_64__
@@ -391,6 +423,8 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) {
  #      define __NR_pkey_mprotect 394
  #    elif defined __powerpc__
  #      define __NR_pkey_mprotect 386
+#    elif defined __s390__
+#      define __NR_pkey_mprotect 384
  #    elif defined _MIPS_SIM
  #      if _MIPS_SIM == _MIPS_SIM_ABI32
  #        define __NR_pkey_mprotect 4363
@@ -410,7 +444,11 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) {
  /* ======================================================================= */
  
  #if !HAVE_STATX
-#  ifndef __NR_statx
+/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+#  if ! (defined __NR_statx && __NR_statx > 0)
+#    if defined __NR_statx
+#      undef __NR_statx
+#    endif
  #    if defined __aarch64__ || defined __arm__
  #      define __NR_statx 397
  #    elif defined __alpha__
diff --git a/src/basic/path-util.h b/src/basic/path-util.h

index 1f46cd65c96a0a4e0905576d67b2011c7cd038ec..71fb7041a3cbf8d794ac55f9d09ec3b733dd961c 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -11,30 +11,38 @@
  #include "time-util.h"
  
  #define PATH_SPLIT_SBIN_BIN(x) x "sbin:" x "bin"
+#define PATH_SPLIT_BIN_SBIN(x) x "bin:" x "sbin"
  #define PATH_SPLIT_SBIN_BIN_NULSTR(x) x "sbin\0" x "bin\0"
  
  #define PATH_NORMAL_SBIN_BIN(x) x "bin"
+#define PATH_NORMAL_BIN_SBIN(x) x "bin"
  #define PATH_NORMAL_SBIN_BIN_NULSTR(x) x "bin\0"
  
  #if HAVE_SPLIT_BIN
  #  define PATH_SBIN_BIN(x) PATH_SPLIT_SBIN_BIN(x)
+#  define PATH_BIN_SBIN(x) PATH_SPLIT_BIN_SBIN(x)
  #  define PATH_SBIN_BIN_NULSTR(x) PATH_SPLIT_SBIN_BIN_NULSTR(x)
  #else
  #  define PATH_SBIN_BIN(x) PATH_NORMAL_SBIN_BIN(x)
+#  define PATH_BIN_SBIN(x) PATH_NORMAL_BIN_SBIN(x)
  #  define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x)
  #endif
  
  #define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/")
+#define DEFAULT_USER_PATH_NORMAL PATH_BIN_SBIN("/usr/local/") ":" PATH_BIN_SBIN("/usr/")
  #define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/")
  #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/")
+#define DEFAULT_USER_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_BIN_SBIN("/")
  #define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/")
  #define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/")
  
  #if HAVE_SPLIT_USR
  #  define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR
+#  define DEFAULT_USER_PATH DEFAULT_USER_PATH_SPLIT_USR
  #  define DEFAULT_PATH_NULSTR DEFAULT_PATH_SPLIT_USR_NULSTR
  #else
  #  define DEFAULT_PATH DEFAULT_PATH_NORMAL
+#  define DEFAULT_USER_PATH DEFAULT_USER_PATH_NORMAL
  #  define DEFAULT_PATH_NULSTR DEFAULT_PATH_NORMAL_NULSTR
  #endif
  
diff --git a/src/basic/strv.h b/src/basic/strv.h

index e80964acd17bcee0f70fc226c2408b9be88aa514..fbfa96a566589d7da35db2eb8ccc4bc05aeff8b2 100644 (file)
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -157,6 +157,18 @@ void strv_print(char **l);
                  _found;                                         \
          })
  
+#define ENDSWITH_SET(p, ...)                                    \
+        ({                                                      \
+                const char *_p = (p);                           \
+                char  *_found = NULL, **_i;                     \
+                STRV_FOREACH(_i, STRV_MAKE(__VA_ARGS__)) {      \
+                        _found = endswith(_p, *_i);             \
+                        if (_found)                             \
+                                break;                          \
+                }                                               \
+                _found;                                         \
+        })
+
  #define FOREACH_STRING(x, y, ...)                                       \
          for (char **_l = STRV_MAKE(({ x = y; }), ##__VA_ARGS__);        \
               x;                                                         \
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c

index cf6af45fbb4ff6670cc579ec3cae59d0246f5ca1..c732e8021cf77779ba58f69693c980b20df92764 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -578,22 +578,29 @@ int vt_disallocate(const char *name) {
  int make_console_stdio(void) {
          int fd, r;
  
-        /* Make /dev/console the controlling terminal and stdin/stdout/stderr */
+        /* Make /dev/console the controlling terminal and stdin/stdout/stderr, if we can. If we can't use
+         * /dev/null instead. This is particularly useful if /dev/console is turned off, e.g. if console=null
+         * is specified on the kernel command line. */
  
          fd = acquire_terminal("/dev/console", ACQUIRE_TERMINAL_FORCE|ACQUIRE_TERMINAL_PERMISSIVE, USEC_INFINITY);
-        if (fd < 0)
-                return log_error_errno(fd, "Failed to acquire terminal: %m");
+        if (fd < 0) {
+                log_warning_errno(fd, "Failed to acquire terminal, using /dev/null stdin/stdout/stderr instead: %m");
  
-        r = reset_terminal_fd(fd, true);
-        if (r < 0)
-                log_warning_errno(r, "Failed to reset terminal, ignoring: %m");
+                r = make_null_stdio();
+                if (r < 0)
+                        return log_error_errno(r, "Failed to make /dev/null stdin/stdout/stderr: %m");
  
-        r = rearrange_stdio(fd, fd, fd); /* This invalidates 'fd' both on success and on failure. */
-        if (r < 0)
-                return log_error_errno(r, "Failed to make terminal stdin/stdout/stderr: %m");
+        } else {
+                r = reset_terminal_fd(fd, true);
+                if (r < 0)
+                        log_warning_errno(r, "Failed to reset terminal, ignoring: %m");
  
-        reset_terminal_feature_caches();
+                r = rearrange_stdio(fd, fd, fd); /* This invalidates 'fd' both on success and on failure. */
+                if (r < 0)
+                        return log_error_errno(r, "Failed to make terminal stdin/stdout/stderr: %m");
+        }
  
+        reset_terminal_feature_caches();
          return 0;
  }
  
diff --git a/src/basic/unit-def.c b/src/basic/unit-def.c

index cc7e953c10560676f9014703325805933840240f..dba218b38869f755bc3f49a67f663cc834f7d200 100644 (file)
--- a/src/basic/unit-def.c
+++ b/src/basic/unit-def.c
@@ -136,7 +136,8 @@ static const char* const mount_state_table[_MOUNT_STATE_MAX] = {
          [MOUNT_REMOUNTING_SIGKILL] = "remounting-sigkill",
          [MOUNT_UNMOUNTING_SIGTERM] = "unmounting-sigterm",
          [MOUNT_UNMOUNTING_SIGKILL] = "unmounting-sigkill",
-        [MOUNT_FAILED] = "failed"
+        [MOUNT_FAILED] = "failed",
+        [MOUNT_CLEANING] = "cleaning",
  };
  
  DEFINE_STRING_TABLE_LOOKUP(mount_state, MountState);
@@ -204,7 +205,8 @@ static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
          [SOCKET_STOP_POST] = "stop-post",
          [SOCKET_FINAL_SIGTERM] = "final-sigterm",
          [SOCKET_FINAL_SIGKILL] = "final-sigkill",
-        [SOCKET_FAILED] = "failed"
+        [SOCKET_FAILED] = "failed",
+        [SOCKET_CLEANING] = "cleaning",
  };
  
  DEFINE_STRING_TABLE_LOOKUP(socket_state, SocketState);
@@ -217,7 +219,8 @@ static const char* const swap_state_table[_SWAP_STATE_MAX] = {
          [SWAP_DEACTIVATING] = "deactivating",
          [SWAP_DEACTIVATING_SIGTERM] = "deactivating-sigterm",
          [SWAP_DEACTIVATING_SIGKILL] = "deactivating-sigkill",
-        [SWAP_FAILED] = "failed"
+        [SWAP_FAILED] = "failed",
+        [SWAP_CLEANING] = "cleaning",
  };
  
  DEFINE_STRING_TABLE_LOOKUP(swap_state, SwapState);
diff --git a/src/basic/unit-def.h b/src/basic/unit-def.h

index c7b4235bea7bdbafb47a028c6f06ae9cb7b05c02..5979819dc095240812b5f95de62ab52e3a9a8ffa 100644 (file)
--- a/src/basic/unit-def.h
+++ b/src/basic/unit-def.h
@@ -79,6 +79,7 @@ typedef enum MountState {
          MOUNT_UNMOUNTING_SIGTERM,
          MOUNT_UNMOUNTING_SIGKILL,
          MOUNT_FAILED,
+        MOUNT_CLEANING,
          _MOUNT_STATE_MAX,
          _MOUNT_STATE_INVALID = -1
  } MountState;
@@ -147,6 +148,7 @@ typedef enum SocketState {
          SOCKET_FINAL_SIGTERM,
          SOCKET_FINAL_SIGKILL,
          SOCKET_FAILED,
+        SOCKET_CLEANING,
          _SOCKET_STATE_MAX,
          _SOCKET_STATE_INVALID = -1
  } SocketState;
@@ -160,6 +162,7 @@ typedef enum SwapState {
          SWAP_DEACTIVATING_SIGTERM,
          SWAP_DEACTIVATING_SIGKILL,
          SWAP_FAILED,
+        SWAP_CLEANING,
          _SWAP_STATE_MAX,
          _SWAP_STATE_INVALID = -1
  } SwapState;
diff --git a/src/basic/user-util.c b/src/basic/user-util.c

index d127b0c107282562e6a6d41cb077eae45765a908..957285c091417968cace4c99f6bafaec7777e894 100644 (file)
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -410,9 +410,8 @@ char* gid_to_name(gid_t gid) {
  }
  
  int in_gid(gid_t gid) {
-        long ngroups_max;
          gid_t *gids;
-        int r, i;
+        int ngroups, r, i;
  
          if (getgid() == gid)
                  return 1;
@@ -423,12 +422,15 @@ int in_gid(gid_t gid) {
          if (!gid_is_valid(gid))
                  return -EINVAL;
  
-        ngroups_max = sysconf(_SC_NGROUPS_MAX);
-        assert(ngroups_max > 0);
+        ngroups = getgroups(0, NULL);
+        if (ngroups < 0)
+                return -errno;
+        if (ngroups == 0)
+                return 0;
  
-        gids = newa(gid_t, ngroups_max);
+        gids = newa(gid_t, ngroups);
  
-        r = getgroups(ngroups_max, gids);
+        r = getgroups(ngroups, gids);
          if (r < 0)
                  return -errno;
  
@@ -620,16 +622,19 @@ int take_etc_passwd_lock(const char *root) {
          return fd;
  }
  
-bool valid_user_group_name(const char *u) {
+bool valid_user_group_name_full(const char *u, bool strict) {
          const char *i;
          long sz;
  
          /* Checks if the specified name is a valid user/group name. Also see POSIX IEEE Std 1003.1-2008, 2016 Edition,
           * 3.437. We are a bit stricter here however. Specifically we deviate from POSIX rules:
           *
-         * - We don't allow any dots (this would break chown syntax which permits dots as user/group name separator)
           * - We require that names fit into the appropriate utmp field
           * - We don't allow empty user names
+         * - No dots or digits in the first character
+         *
+         * If strict==true, additionally:
+         * - We don't allow any dots (this conflicts with chown syntax which permits dots as user/group name separator)
           *
           * Note that other systems are even more restrictive, and don't permit underscores or uppercase characters.
           */
@@ -642,12 +647,25 @@ bool valid_user_group_name(const char *u) {
              u[0] != '_')
                  return false;
  
+        bool warned = false;
+
          for (i = u+1; *i; i++) {
-                if (!(*i >= 'a' && *i <= 'z') &&
-                    !(*i >= 'A' && *i <= 'Z') &&
-                    !(*i >= '0' && *i <= '9') &&
-                    !IN_SET(*i, '_', '-'))
-                        return false;
+                if (((*i >= 'a' && *i <= 'z') ||
+                     (*i >= 'A' && *i <= 'Z') ||
+                     (*i >= '0' && *i <= '9') ||
+                     IN_SET(*i, '_', '-')))
+                        continue;
+
+                if (*i == '.' && !strict) {
+                        if (!warned) {
+                                log_warning("Bad user or group name \"%s\", accepting for compatibility.", u);
+                                warned = true;
+                        }
+
+                        continue;
+                }
+
+                return false;
          }
  
          sz = sysconf(_SC_LOGIN_NAME_MAX);
@@ -662,15 +680,15 @@ bool valid_user_group_name(const char *u) {
          return true;
  }
  
-bool valid_user_group_name_or_id(const char *u) {
+bool valid_user_group_name_or_id_full(const char *u, bool strict) {
  
-        /* Similar as above, but is also fine with numeric UID/GID specifications, as long as they are in the right
-         * range, and not the invalid user ids. */
+        /* Similar as above, but is also fine with numeric UID/GID specifications, as long as they are in the
+         * right range, and not the invalid user ids. */
  
          if (isempty(u))
                  return false;
  
-        if (valid_user_group_name(u))
+        if (valid_user_group_name_full(u, strict))
                  return true;
  
          return parse_uid(u, NULL) >= 0;
diff --git a/src/basic/user-util.h b/src/basic/user-util.h

index 52f3df792d7754e9efdc1b3246bf18f82007b278..cfa515f5e8a26be33e2a354dfc206ce84d91f170 100644 (file)
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -85,8 +85,20 @@ static inline bool userns_supported(void) {
          return access("/proc/self/uid_map", F_OK) >= 0;
  }
  
-bool valid_user_group_name(const char *u);
-bool valid_user_group_name_or_id(const char *u);
+bool valid_user_group_name_full(const char *u, bool strict);
+bool valid_user_group_name_or_id_full(const char *u, bool strict);
+static inline bool valid_user_group_name(const char *u) {
+        return valid_user_group_name_full(u, true);
+}
+static inline bool valid_user_group_name_or_id(const char *u) {
+        return valid_user_group_name_or_id_full(u, true);
+}
+static inline bool valid_user_group_name_compat(const char *u) {
+        return valid_user_group_name_full(u, false);
+}
+static inline bool valid_user_group_name_or_id_compat(const char *u) {
+        return valid_user_group_name_or_id_full(u, false);
+}
  bool valid_gecos(const char *d);
  bool valid_home(const char *p);
  
diff --git a/src/basic/virt.c b/src/basic/virt.c

index 7a7400773bd8f168931651757708fae1f951c52b..3be3852e35c0e0829e45284a06bce54f7b610423 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -140,17 +140,17 @@ static int detect_vm_dmi(void) {
                  const char *vendor;
                  int id;
          } dmi_vendor_table[] = {
-                { "KVM",           VIRTUALIZATION_KVM       },
-                { "QEMU",          VIRTUALIZATION_QEMU      },
-                /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
-                { "VMware",        VIRTUALIZATION_VMWARE    },
-                { "VMW",           VIRTUALIZATION_VMWARE    },
-                { "innotek GmbH",  VIRTUALIZATION_ORACLE    },
-                { "Xen",           VIRTUALIZATION_XEN       },
-                { "Bochs",         VIRTUALIZATION_BOCHS     },
-                { "Parallels",     VIRTUALIZATION_PARALLELS },
+                { "KVM",                 VIRTUALIZATION_KVM       },
+                { "QEMU",                VIRTUALIZATION_QEMU      },                
+                { "VMware",              VIRTUALIZATION_VMWARE    }, /* https://kb.vmware.com/s/article/1009458 */
+                { "VMW",                 VIRTUALIZATION_VMWARE    },
+                { "innotek GmbH",        VIRTUALIZATION_ORACLE    },
+                { "Oracle Corporation",  VIRTUALIZATION_ORACLE    },
+                { "Xen",                 VIRTUALIZATION_XEN       },
+                { "Bochs",               VIRTUALIZATION_BOCHS     },
+                { "Parallels",           VIRTUALIZATION_PARALLELS },
                  /* https://wiki.freebsd.org/bhyve */
-                { "BHYVE",         VIRTUALIZATION_BHYVE     },
+                { "BHYVE",               VIRTUALIZATION_BHYVE     },
          };
          unsigned i;
          int r;
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c

index 9ecd9f78f3f20779d8d1d1f155a0a184e9e83ffc..ddc267401f5431b5a3e293a4e6b9cb5b6f5ede4a 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -103,6 +103,7 @@ static int acquire_xbootldr(bool unprivileged_mode, sd_id128_t *ret_uuid) {
                  log_debug_errno(r, "Didn't find an XBOOTLDR partition, using the ESP as $BOOT.");
                  if (ret_uuid)
                          *ret_uuid = SD_ID128_NULL;
+                arg_xbootldr_path = mfree(arg_xbootldr_path);
                  return 0;
          }
          if (r < 0)
@@ -1175,7 +1176,11 @@ static int verb_status(int argc, char *argv[], void *userdata) {
                  if (r < 0)
                          return r;
  
-                puts(arg_dollar_boot_path());
+                const char *path = arg_dollar_boot_path();
+                if (!path)
+                        return log_error_errno(SYNTHETIC_ERRNO(EACCES), "Failed to determine XBOOTLDR location: %m");
+
+                puts(path);
          }
  
          if (arg_print_esp_path || arg_print_dollar_boot_path)
diff --git a/src/boot/efi/linux.c b/src/boot/efi/linux.c

index 5b623f4b71e20b8ad4df82be24a3c0bdcf77a2b4..00a3551e09a1f9256e5615bc935bc0de945dfb64 100644 (file)
--- a/src/boot/efi/linux.c
+++ b/src/boot/efi/linux.c
@@ -6,24 +6,24 @@
  #include "linux.h"
  #include "util.h"
  
-#ifdef __x86_64__
-typedef VOID(*handover_f)(VOID *image, EFI_SYSTEM_TABLE *table, struct boot_params *params);
-static VOID linux_efi_handover(EFI_HANDLE image, struct boot_params *params) {
-        handover_f handover;
-
-        asm volatile ("cli");
-        handover = (handover_f)((UINTN)params->hdr.code32_start + 512 + params->hdr.handover_offset);
-        handover(image, ST, params);
-}
+#ifdef __i386__
+#define __regparm0__ __attribute__((regparm(0)))
  #else
-typedef VOID(*handover_f)(VOID *image, EFI_SYSTEM_TABLE *table, struct boot_params *params) __attribute__((regparm(0)));
+#define __regparm0__
+#endif
+
+typedef VOID(*handover_f)(VOID *image, EFI_SYSTEM_TABLE *table, struct boot_params *params) __regparm0__;
  static VOID linux_efi_handover(EFI_HANDLE image, struct boot_params *params) {
          handover_f handover;
+        UINTN start = (UINTN)params->hdr.code32_start;
  
-        handover = (handover_f)((UINTN)params->hdr.code32_start + params->hdr.handover_offset);
+#ifdef __x86_64__
+        asm volatile ("cli");
+        start += 512;
+#endif
+        handover = (handover_f)(start + params->hdr.handover_offset);
          handover(image, ST, params);
  }
-#endif
  
  EFI_STATUS linux_exec(EFI_HANDLE *image,
                        CHAR8 *cmdline, UINTN cmdline_len,
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build

index dfec97028b452487277ba5dbc49488cc2ab71168..b8fd5105d0437571b3391f718f8efbae6023bf4d 100644 (file)
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -135,6 +135,9 @@ if have_gnu_efi
                  compile_args += ['-mno-sse',
                                   '-mno-mmx']
          endif
+        if get_option('werror') == true
+                compile_args += ['-Werror']
+        endif
  
          efi_ldflags = ['-T',
                         join_paths(efi_ldsdir, arch_lds),
diff --git a/src/boot/efi/shim.c b/src/boot/efi/shim.c

index 9e072d294f9764dfa2e5bc7b03fb8fae0099b417..8db27547cca3f24ee88291d95a0fd689b4aae8b3 100644 (file)
--- a/src/boot/efi/shim.c
+++ b/src/boot/efi/shim.c
@@ -14,14 +14,20 @@
  #include "util.h"
  #include "shim.h"
  
+#if defined(__x86_64__) || defined(__i386__)
+#define __sysv_abi__ __attribute__((sysv_abi))
+#else
+#define __sysv_abi__
+#endif
+
  struct ShimLock {
-        EFI_STATUS __attribute__((sysv_abi)) (*shim_verify) (VOID *buffer, UINT32 size);
+        EFI_STATUS __sysv_abi__ (*shim_verify) (VOID *buffer, UINT32 size);
  
          /* context is actually a struct for the PE header, but it isn't needed so void is sufficient just do define the interface
           * see shim.c/shim.h and PeHeader.h in the github shim repo */
-        EFI_STATUS __attribute__((sysv_abi)) (*generate_hash) (VOID *data, UINT32 datasize, VOID *context, UINT8 *sha256hash, UINT8 *sha1hash);
+        EFI_STATUS __sysv_abi__ (*generate_hash) (VOID *data, UINT32 datasize, VOID *context, UINT8 *sha256hash, UINT8 *sha1hash);
  
-        EFI_STATUS __attribute__((sysv_abi)) (*read_header) (VOID *data, UINT32 datasize, VOID *context);
+        EFI_STATUS __sysv_abi__ (*read_header) (VOID *data, UINT32 datasize, VOID *context);
  };
  
  static const EFI_GUID simple_fs_guid = SIMPLE_FILE_SYSTEM_PROTOCOL;
diff --git a/src/core/cgroup.c b/src/core/cgroup.c

index 6e0afa4bca3806ffd50133f0b39c12bdfd266650..60a77993616ee05cc32069cc8d8b5a888c44b2be 100644 (file)
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1063,6 +1063,11 @@ static void cgroup_context_apply(
                  xsprintf(buf, "default %" PRIu64 "\n", weight);
                  (void) set_attribute_and_warn(u, "io", "io.weight", buf);
  
+                /* FIXME: drop this when distro kernels properly support BFQ through "io.weight"
+                 * See also: https://github.com/systemd/systemd/pull/13335 */
+                xsprintf(buf, "%" PRIu64 "\n", weight);
+                (void) set_attribute_and_warn(u, "io", "io.bfq.weight", buf);
+
                  if (has_io) {
                          CGroupIODeviceLatency *latency;
                          CGroupIODeviceLimit *limit;
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c

index 85c310cd33d0585fb5f77fa16bac779913632bdd..2be3db26a683569b4ff5cd81216935f1f102e27e 100644 (file)
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -815,6 +815,7 @@ const sd_bus_vtable bus_exec_vtable[] = {
          SD_BUS_PROPERTY("LogsDirectory", "as", NULL, offsetof(ExecContext, directories[EXEC_DIRECTORY_LOGS].paths), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("ConfigurationDirectoryMode", "u", bus_property_get_mode, offsetof(ExecContext, directories[EXEC_DIRECTORY_CONFIGURATION].mode), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("ConfigurationDirectory", "as", NULL, offsetof(ExecContext, directories[EXEC_DIRECTORY_CONFIGURATION].paths), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("TimeoutCleanUSec", "t", bus_property_get_usec, offsetof(ExecContext, timeout_clean_usec), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("MemoryDenyWriteExecute", "b", bus_property_get_bool, offsetof(ExecContext, memory_deny_write_execute), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("RestrictRealtime", "b", bus_property_get_bool, offsetof(ExecContext, restrict_realtime), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("RestrictSUIDSGID", "b", bus_property_get_bool, offsetof(ExecContext, restrict_suid_sgid), SD_BUS_VTABLE_PROPERTY_CONST),
@@ -1182,10 +1183,10 @@ int bus_exec_context_set_transient_property(
          flags |= UNIT_PRIVATE;
  
          if (streq(name, "User"))
-                return bus_set_transient_user(u, name, &c->user, message, flags, error);
+                return bus_set_transient_user_compat(u, name, &c->user, message, flags, error);
  
          if (streq(name, "Group"))
-                return bus_set_transient_user(u, name, &c->group, message, flags, error);
+                return bus_set_transient_user_compat(u, name, &c->group, message, flags, error);
  
          if (streq(name, "TTYPath"))
                  return bus_set_transient_path(u, name, &c->tty_path, message, flags, error);
@@ -1363,10 +1364,10 @@ int bus_exec_context_set_transient_property(
                  if (r < 0)
                          return r;
  
-                STRV_FOREACH(p, l) {
-                        if (!isempty(*p) && !valid_user_group_name_or_id(*p))
-                                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid supplementary group names");
-                }
+                STRV_FOREACH(p, l)
+                        if (!isempty(*p) && !valid_user_group_name_or_id_compat(*p))
+                                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
+                                                         "Invalid supplementary group names");
  
                  if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
                          if (strv_isempty(l)) {
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c

index fbda8d8a4c6d0a149acfeb1e601fc0c26083a7a1..ad7471c72922844ff0d1648bfd22de486d867ccc 100644 (file)
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -101,7 +101,6 @@ const sd_bus_vtable bus_service_vtable[] = {
          SD_BUS_PROPERTY("TimeoutStartUSec", "t", bus_property_get_usec, offsetof(Service, timeout_start_usec), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("TimeoutStopUSec", "t", bus_property_get_usec, offsetof(Service, timeout_stop_usec), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("TimeoutAbortUSec", "t", property_get_timeout_abort_usec, 0, 0),
-        SD_BUS_PROPERTY("TimeoutCleanUSec", "t", bus_property_get_usec, offsetof(Service, timeout_clean_usec), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("RuntimeMaxUSec", "t", bus_property_get_usec, offsetof(Service, runtime_max_usec), SD_BUS_VTABLE_PROPERTY_CONST),
          SD_BUS_PROPERTY("WatchdogUSec", "t", bus_property_get_usec, offsetof(Service, watchdog_usec), SD_BUS_VTABLE_PROPERTY_CONST),
          BUS_PROPERTY_DUAL_TIMESTAMP("WatchdogTimestamp", offsetof(Service, watchdog_timestamp), 0),
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c

index e895c94e12a7f9e30d29ce1539c3f581875b6321..25d3d71391b863419e40a5a69ec0eaf9a0853dd0 100644 (file)
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -277,10 +277,10 @@ static int bus_socket_set_transient_property(
                  return bus_set_transient_fdname(u, name, &s->fdname, message, flags, error);
  
          if (streq(name, "SocketUser"))
-                return bus_set_transient_user(u, name, &s->user, message, flags, error);
+                return bus_set_transient_user_compat(u, name, &s->user, message, flags, error);
  
          if (streq(name, "SocketGroup"))
-                return bus_set_transient_user(u, name, &s->group, message, flags, error);
+                return bus_set_transient_user_compat(u, name, &s->group, message, flags, error);
  
          if (streq(name, "BindIPv6Only"))
                  return bus_set_transient_bind_ipv6_only(u, name, &s->bind_ipv6_only, message, flags, error);
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c

index 2f61a5842dfb7bae42cf641d8904440cd62104f8..439c276fac90a31bb0132ff5a51330579e3abdf7 100644 (file)
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -196,7 +196,7 @@ static int timer_add_one_calendar_spec(
  
                  *v = (TimerValue) {
                          .base = base,
-                        .calendar_spec = c,
+                        .calendar_spec = TAKE_PTR(c),
                  };
  
                  LIST_PREPEND(value, t->values, v);
diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c

index f4fbb72cb99c52246d62f2b3d6bcb930104ba39d..7862beaacb6d164e76b2f3464406d12112307239 100644 (file)
--- a/src/core/dbus-util.c
+++ b/src/core/dbus-util.c
@@ -30,7 +30,7 @@ int bus_property_get_triggered_unit(
  
  BUS_DEFINE_SET_TRANSIENT(mode_t, "u", uint32_t, mode_t, "%040o");
  BUS_DEFINE_SET_TRANSIENT(unsigned, "u", uint32_t, unsigned, "%" PRIu32);
-BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(user, valid_user_group_name_or_id);
+BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(user_compat, valid_user_group_name_or_id_compat);
  BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(path, path_is_absolute);
  
  int bus_set_transient_string(
diff --git a/src/core/dbus-util.h b/src/core/dbus-util.h

index 12b055e4ac9c4f49aab058f70089638942a6b654..a3316c6701831c9ca72a161de8549d690af37b8b 100644 (file)
--- a/src/core/dbus-util.h
+++ b/src/core/dbus-util.h
@@ -235,7 +235,7 @@ int bus_property_get_triggered_unit(sd_bus *bus, const char *path, const char *i
  
  int bus_set_transient_mode_t(Unit *u, const char *name, mode_t *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
  int bus_set_transient_unsigned(Unit *u, const char *name, unsigned *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
-int bus_set_transient_user(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
+int bus_set_transient_user_compat(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
  int bus_set_transient_path(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
  int bus_set_transient_string(Unit *u, const char *name, char **p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
  int bus_set_transient_bool(Unit *u, const char *name, bool *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
diff --git a/src/core/dbus.c b/src/core/dbus.c

index a8ce9ac44793c5720ddc1875f7842eb30048b299..bbfad1be745c7372f1ebd677227eb6fa3b9d8565 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -784,7 +784,7 @@ static int manager_dispatch_sync_bus_names(sd_event_source *es, void *userdata)
                           * changed, so synthesize a name owner changed signal. */
  
                          if (!streq_ptr(unique, s->bus_name_owner))
-                                UNIT_VTABLE(u)->bus_name_owner_change(u, name, s->bus_name_owner, unique);
+                                UNIT_VTABLE(u)->bus_name_owner_change(u, s->bus_name_owner, unique);
                  } else {
                          /* So, the name we're watching is not on the bus.
                           * This either means it simply hasn't appeared yet,
@@ -793,7 +793,7 @@ static int manager_dispatch_sync_bus_names(sd_event_source *es, void *userdata)
                           * and synthesize a name loss signal in this case. */
  
                          if (s->bus_name_owner)
-                                UNIT_VTABLE(u)->bus_name_owner_change(u, name, s->bus_name_owner, NULL);
+                                UNIT_VTABLE(u)->bus_name_owner_change(u, s->bus_name_owner, NULL);
                  }
          }
  
diff --git a/src/core/execute.c b/src/core/execute.c

index 21127d4f70262e692400f7734154f760e2f686dd..4c900077789744874e37ddef0c80ce546c6d1271 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2045,6 +2045,19 @@ static int setup_private_users(uid_t uid, gid_t gid) {
          return 0;
  }
  
+static bool exec_directory_is_private(const ExecContext *context, ExecDirectoryType type) {
+        if (!context->dynamic_user)
+                return false;
+
+        if (type == EXEC_DIRECTORY_CONFIGURATION)
+                return false;
+
+        if (type == EXEC_DIRECTORY_RUNTIME && context->runtime_directory_preserve_mode == EXEC_PRESERVE_NO)
+                return false;
+
+        return true;
+}
+
  static int setup_exec_directory(
                  const ExecContext *context,
                  const ExecParameters *params,
@@ -2091,9 +2104,7 @@ static int setup_exec_directory(
                  if (r < 0)
                          goto fail;
  
-                if (context->dynamic_user &&
-                    (!IN_SET(type, EXEC_DIRECTORY_RUNTIME, EXEC_DIRECTORY_CONFIGURATION) ||
-                     (type == EXEC_DIRECTORY_RUNTIME && context->runtime_directory_preserve_mode != EXEC_PRESERVE_NO))) {
+                if (exec_directory_is_private(context, type)) {
                          _cleanup_free_ char *private_root = NULL;
  
                          /* So, here's one extra complication when dealing with DynamicUser=1 units. In that
@@ -2369,8 +2380,7 @@ static int compile_bind_mounts(
                  if (strv_isempty(context->directories[t].paths))
                          continue;
  
-                if (context->dynamic_user &&
-                    !IN_SET(t, EXEC_DIRECTORY_RUNTIME, EXEC_DIRECTORY_CONFIGURATION) &&
+                if (exec_directory_is_private(context, t) &&
                      !(context->root_directory || context->root_image)) {
                          char *private_root;
  
@@ -2392,8 +2402,7 @@ static int compile_bind_mounts(
                  STRV_FOREACH(suffix, context->directories[t].paths) {
                          char *s, *d;
  
-                        if (context->dynamic_user &&
-                            !IN_SET(t, EXEC_DIRECTORY_RUNTIME, EXEC_DIRECTORY_CONFIGURATION))
+                        if (exec_directory_is_private(context, t))
                                  s = path_join(params->prefix[t], "private", *suffix);
                          else
                                  s = path_join(params->prefix[t], *suffix);
@@ -2402,8 +2411,7 @@ static int compile_bind_mounts(
                                  goto finish;
                          }
  
-                        if (context->dynamic_user &&
-                            !IN_SET(t, EXEC_DIRECTORY_RUNTIME, EXEC_DIRECTORY_CONFIGURATION) &&
+                        if (exec_directory_is_private(context, t) &&
                              (context->root_directory || context->root_image))
                                  /* When RootDirectory= or RootImage= are set, then the symbolic link to the private
                                   * directory is not created on the root directory. So, let's bind-mount the directory
@@ -2854,10 +2862,10 @@ static int compile_suggested_paths(const ExecContext *c, const ExecParameters *p
                  STRV_FOREACH(i, c->directories[t].paths) {
                          char *e;
  
-                        if (t == EXEC_DIRECTORY_RUNTIME)
-                                e = path_join(p->prefix[t], *i);
-                        else
+                        if (exec_directory_is_private(c, t))
                                  e = path_join(p->prefix[t], "private", *i);
+                        else
+                                e = path_join(p->prefix[t], *i);
                          if (!e)
                                  return -ENOMEM;
  
@@ -3924,6 +3932,7 @@ void exec_context_init(ExecContext *c) {
          c->personality = PERSONALITY_INVALID;
          for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++)
                  c->directories[i].mode = 0755;
+        c->timeout_clean_usec = USEC_INFINITY;
          c->capability_bounding_set = CAP_ALL;
          assert_cc(NAMESPACE_FLAGS_INITIAL != NAMESPACE_FLAGS_ALL);
          c->restrict_namespaces = NAMESPACE_FLAGS_INITIAL;
@@ -4011,7 +4020,10 @@ int exec_context_destroy_runtime_directory(const ExecContext *c, const char *run
          STRV_FOREACH(i, c->directories[EXEC_DIRECTORY_RUNTIME].paths) {
                  _cleanup_free_ char *p;
  
-                p = path_join(runtime_prefix, *i);
+                if (exec_directory_is_private(c, EXEC_DIRECTORY_RUNTIME))
+                        p = path_join(runtime_prefix, "private", *i);
+                else
+                        p = path_join(runtime_prefix, *i);
                  if (!p)
                          return -ENOMEM;
  
@@ -4292,8 +4304,8 @@ static void strv_fprintf(FILE *f, char **l) {
  }
  
  void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
+        char **e, **d, buf_clean[FORMAT_TIMESPAN_MAX];
          ExecDirectoryType dt;
-        char **e, **d;
          unsigned i;
          int r;
  
@@ -4368,6 +4380,10 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
                          fprintf(f, "%s%s: %s\n", prefix, exec_directory_type_to_string(dt), *d);
          }
  
+        fprintf(f,
+                "%sTimeoutCleanSec: %s\n",
+                prefix, format_timespan(buf_clean, sizeof(buf_clean), c->timeout_clean_usec, USEC_PER_SEC));
+
          if (c->nice_set)
                  fprintf(f,
                          "%sNice: %i\n",
@@ -4811,6 +4827,17 @@ int exec_context_get_clean_directories(
                          r = strv_consume(&l, j);
                          if (r < 0)
                                  return r;
+
+                        /* Also remove private directories unconditionally. */
+                        if (t != EXEC_DIRECTORY_CONFIGURATION) {
+                                j = path_join(prefix[t], "private", *i);
+                                if (!j)
+                                        return -ENOMEM;
+
+                                r = strv_consume(&l, j);
+                                if (r < 0)
+                                        return r;
+                        }
                  }
          }
  
diff --git a/src/core/execute.h b/src/core/execute.h

index 0d5398acfae473686251c6bc1b612e2dea6ee3cb..cddfafa0d630673bea3248fb04d3f84354631afc 100644 (file)
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -287,6 +287,7 @@ struct ExecContext {
  
          ExecDirectory directories[_EXEC_DIRECTORY_TYPE_MAX];
          ExecPreserveMode runtime_directory_preserve_mode;
+        usec_t timeout_clean_usec;
  };
  
  static inline bool exec_context_restrict_namespaces_set(const ExecContext *c) {
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4

index 10e4801cfe6b8402a95825d37ea3ef853f7cb991..5490ae32fbcdf949c2b75479856a693d71d0ca5f 100644 (file)
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -25,9 +25,9 @@ m4_define(`EXEC_CONTEXT_CONFIG_ITEMS',
  `$1.WorkingDirectory,            config_parse_working_directory,     0,                             offsetof($1, exec_context)
  $1.RootDirectory,                config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_directory)
  $1.RootImage,                    config_parse_unit_path_printf,      true,                          offsetof($1, exec_context.root_image)
-$1.User,                         config_parse_user_group,            0,                             offsetof($1, exec_context.user)
-$1.Group,                        config_parse_user_group,            0,                             offsetof($1, exec_context.group)
-$1.SupplementaryGroups,          config_parse_user_group_strv,       0,                             offsetof($1, exec_context.supplementary_groups)
+$1.User,                         config_parse_user_group_compat,     0,                             offsetof($1, exec_context.user)
+$1.Group,                        config_parse_user_group_compat,     0,                             offsetof($1, exec_context.group)
+$1.SupplementaryGroups,          config_parse_user_group_strv_compat, 0,                            offsetof($1, exec_context.supplementary_groups)
  $1.Nice,                         config_parse_exec_nice,             0,                             offsetof($1, exec_context)
  $1.OOMScoreAdjust,               config_parse_exec_oom_score_adjust, 0,                             offsetof($1, exec_context)
  $1.IOSchedulingClass,            config_parse_exec_io_class,         0,                             offsetof($1, exec_context)
@@ -138,6 +138,7 @@ $1.LogsDirectoryMode,            config_parse_mode,                  0,
  $1.LogsDirectory,                config_parse_exec_directories,      0,                             offsetof($1, exec_context.directories[EXEC_DIRECTORY_LOGS].paths)
  $1.ConfigurationDirectoryMode,   config_parse_mode,                  0,                             offsetof($1, exec_context.directories[EXEC_DIRECTORY_CONFIGURATION].mode)
  $1.ConfigurationDirectory,       config_parse_exec_directories,      0,                             offsetof($1, exec_context.directories[EXEC_DIRECTORY_CONFIGURATION].paths)
+$1.TimeoutCleanSec,              config_parse_sec,                   0,                             offsetof($1, exec_context.timeout_clean_usec)
  $1.ProtectHostname,              config_parse_bool,                  0,                             offsetof($1, exec_context.protect_hostname)
  m4_ifdef(`HAVE_PAM',
  `$1.PAMName,                     config_parse_unit_string_printf,    0,                             offsetof($1, exec_context.pam_name)',
@@ -316,7 +317,6 @@ Service.TimeoutSec,              config_parse_service_timeout,       0,
  Service.TimeoutStartSec,         config_parse_service_timeout,       0,                             0
  Service.TimeoutStopSec,          config_parse_sec_fix_0,             0,                             offsetof(Service, timeout_stop_usec)
  Service.TimeoutAbortSec,         config_parse_service_timeout_abort, 0,                             0
-Service.TimeoutCleanSec,         config_parse_sec,                   0,                             offsetof(Service, timeout_clean_usec)
  Service.RuntimeMaxSec,           config_parse_sec,                   0,                             offsetof(Service, runtime_max_usec)
  Service.WatchdogSec,             config_parse_sec,                   0,                             offsetof(Service, watchdog_usec)
  m4_dnl The following five only exist for compatibility, they moved into Unit, see above
@@ -365,8 +365,8 @@ Socket.ExecStartPost,            config_parse_exec,                  SOCKET_EXEC
  Socket.ExecStopPre,              config_parse_exec,                  SOCKET_EXEC_STOP_PRE,          offsetof(Socket, exec_command)
  Socket.ExecStopPost,             config_parse_exec,                  SOCKET_EXEC_STOP_POST,         offsetof(Socket, exec_command)
  Socket.TimeoutSec,               config_parse_sec_fix_0,             0,                             offsetof(Socket, timeout_usec)
-Socket.SocketUser,               config_parse_user_group,            0,                             offsetof(Socket, user)
-Socket.SocketGroup,              config_parse_user_group,            0,                             offsetof(Socket, group)
+Socket.SocketUser,               config_parse_user_group_compat,     0,                             offsetof(Socket, user)
+Socket.SocketGroup,              config_parse_user_group_compat,     0,                             offsetof(Socket, group)
  Socket.SocketMode,               config_parse_mode,                  0,                             offsetof(Socket, socket_mode)
  Socket.DirectoryMode,            config_parse_mode,                  0,                             offsetof(Socket, directory_mode)
  Socket.Accept,                   config_parse_bool,                  0,                             offsetof(Socket, accept)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c

index 20079e1fb1281caccdb823748be5d3c2622a4e6f..56cad2f7b8292b0f2e501abd1e90e3624374cc46 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -98,14 +98,12 @@ int parse_confirm_spawn(const char *value, char **console) {
          if (r == 0) {
                  *console = NULL;
                  return 0;
-        }
-
-        if (r > 0) /* on with default tty */
+        } else if (r > 0) /* on with default tty */
                  s = strdup("/dev/console");
          else if (is_path(value)) /* on with fully qualified path */
                  s = strdup(value);
          else /* on with only a tty file name, not a fully qualified path */
-                s = strjoin("/dev/", value);
+                s = path_join("/dev/", value);
          if (!s)
                  return -ENOMEM;
  
@@ -135,6 +133,7 @@ DEFINE_CONFIG_PARSE_PTR(config_parse_cg_weight, cg_weight_parse, uint64_t, "Inva
  DEFINE_CONFIG_PARSE_PTR(config_parse_cpu_shares, cg_cpu_shares_parse, uint64_t, "Invalid CPU shares");
  DEFINE_CONFIG_PARSE_PTR(config_parse_exec_mount_flags, mount_propagation_flags_from_string, unsigned long, "Failed to parse mount flag");
  DEFINE_CONFIG_PARSE_ENUM_WITH_DEFAULT(config_parse_numa_policy, mpol, int, -1, "Invalid NUMA policy type");
+DEFINE_CONFIG_PARSE_ENUM(config_parse_status_unit_format, status_unit_format, StatusUnitFormat, "Failed to parse status unit format");
  
  int config_parse_unit_deps(
                  const char *unit,
@@ -2004,7 +2003,7 @@ int config_parse_sec_fix_0(
          return 0;
  }
  
-int config_parse_user_group(
+int config_parse_user_group_compat(
                  const char *unit,
                  const char *filename,
                  unsigned line,
@@ -2037,7 +2036,7 @@ int config_parse_user_group(
                  return -ENOEXEC;
          }
  
-        if (!valid_user_group_name_or_id(k)) {
+        if (!valid_user_group_name_or_id_compat(k)) {
                  log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);
                  return -ENOEXEC;
          }
@@ -2045,7 +2044,7 @@ int config_parse_user_group(
          return free_and_replace(*user, k);
  }
  
-int config_parse_user_group_strv(
+int config_parse_user_group_strv_compat(
                  const char *unit,
                  const char *filename,
                  unsigned line,
@@ -2091,7 +2090,7 @@ int config_parse_user_group_strv(
                          return -ENOEXEC;
                  }
  
-                if (!valid_user_group_name_or_id(k)) {
+                if (!valid_user_group_name_or_id_compat(k)) {
                          log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid user/group name or numeric ID: %s", k);
                          return -ENOEXEC;
                  }
@@ -4596,6 +4595,7 @@ static int merge_by_names(Unit **u, Set *names, const char *id) {
  int unit_load_fragment(Unit *u) {
          const char *fragment;
          _cleanup_set_free_free_ Set *names = NULL;
+        struct stat st;
          int r;
  
          assert(u);
@@ -4627,7 +4627,6 @@ int unit_load_fragment(Unit *u) {
          if (fragment) {
                  /* Open the file, check if this is a mask, otherwise read. */
                  _cleanup_fclose_ FILE *f = NULL;
-                struct stat st;
  
                  /* Try to open the file name. A symlink is OK, for example for linked files or masks. We
                   * expect that all symlinks within the lookup paths have been already resolved, but we don't
@@ -4662,6 +4661,13 @@ int unit_load_fragment(Unit *u) {
                  }
          }
  
+        if (u->source_path) {
+                if (stat(u->source_path, &st) >= 0)
+                        u->source_mtime = timespec_load(&st.st_mtim);
+                else
+                        u->source_mtime = 0;
+        }
+
          /* We do the merge dance here because for some unit types, the unit might have aliases which are not
           * declared in the file system. In particular, this is true (and frequent) for device and swap units.
           */
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h

index 326e80893bdee3041e70abb71ab96e76bd3a0297..1183987d7d8f095f8d9c1a30bbe67553680c8400 100644 (file)
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -99,8 +99,8 @@ CONFIG_PARSER_PROTOTYPE(config_parse_exec_utmp_mode);
  CONFIG_PARSER_PROTOTYPE(config_parse_working_directory);
  CONFIG_PARSER_PROTOTYPE(config_parse_fdname);
  CONFIG_PARSER_PROTOTYPE(config_parse_sec_fix_0);
-CONFIG_PARSER_PROTOTYPE(config_parse_user_group);
-CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv);
+CONFIG_PARSER_PROTOTYPE(config_parse_user_group_compat);
+CONFIG_PARSER_PROTOTYPE(config_parse_user_group_strv_compat);
  CONFIG_PARSER_PROTOTYPE(config_parse_restrict_namespaces);
  CONFIG_PARSER_PROTOTYPE(config_parse_bind_paths);
  CONFIG_PARSER_PROTOTYPE(config_parse_exec_keyring_mode);
@@ -117,6 +117,7 @@ CONFIG_PARSER_PROTOTYPE(config_parse_numa_mask);
  CONFIG_PARSER_PROTOTYPE(config_parse_ip_filter_bpf_progs);
  CONFIG_PARSER_PROTOTYPE(config_parse_cpu_affinity2);
  CONFIG_PARSER_PROTOTYPE(config_parse_show_status);
+CONFIG_PARSER_PROTOTYPE(config_parse_status_unit_format);
  CONFIG_PARSER_PROTOTYPE(config_parse_output_restricted);
  CONFIG_PARSER_PROTOTYPE(config_parse_crash_chvt);
  CONFIG_PARSER_PROTOTYPE(config_parse_timeout_abort);
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c

index 9d3096e3ac98391bbf3208f3819dbea825175785..284b77c1fcce9d11b4ca0bbb03d13a4c156f96de 100644 (file)
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -68,6 +68,11 @@ static int generate_machine_id(const char *root, sd_id128_t *ret) {
                                  log_info("Initializing machine ID from KVM UUID.");
                                  return 0;
                          }
+                        /* on POWER, it's exported here instead */
+                        if (id128_read("/sys/firmware/devicetree/base/vm,uuid", ID128_UUID, ret) >= 0) {
+                                log_info("Initializing machine ID from KVM UUID.");
+                                return 0;
+                        }
                  }
          }
  
diff --git a/src/core/main.c b/src/core/main.c

index bcce7178a8ef4ea03794865493c5b53482d146c8..4633184b79ad8b75e7633e0f7ff7b5966b92ab8b 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -538,7 +538,6 @@ DEFINE_SETTER(config_parse_level2, log_set_max_level_from_string, "log level");
  DEFINE_SETTER(config_parse_target, log_set_target_from_string, "target");
  DEFINE_SETTER(config_parse_color, log_show_color_from_string, "color" );
  DEFINE_SETTER(config_parse_location, log_show_location_from_string, "location");
-DEFINE_SETTER(config_parse_status_unit_format, status_unit_format_from_string, "value");
  
  static int parse_config_file(void) {
  
diff --git a/src/core/manager.c b/src/core/manager.c

index dfe8997f9d12c1049c7a3f74baea8555a29489a3..d9114bb0c597a4ef9c72f41ed4cda23584ba2ce1 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -603,6 +603,8 @@ static char** sanitize_environment(char **l) {
  }
  
  int manager_default_environment(Manager *m) {
+        int r;
+
          assert(m);
  
          m->transient_environment = strv_free(m->transient_environment);
@@ -616,16 +618,29 @@ int manager_default_environment(Manager *m) {
                   * /proc/self/environ valid; it is used for tagging
                   * the init process inside containers. */
                  m->transient_environment = strv_new("PATH=" DEFAULT_PATH);
+                if (!m->transient_environment)
+                        return log_oom();
  
                  /* Import locale variables LC_*= from configuration */
                  (void) locale_setup(&m->transient_environment);
-        } else
+        } else {
+                _cleanup_free_ char *k = NULL;
+
                  /* The user manager passes its own environment
-                 * along to its children. */
+                 * along to its children, except for $PATH. */
                  m->transient_environment = strv_copy(environ);
+                if (!m->transient_environment)
+                        return log_oom();
  
-        if (!m->transient_environment)
-                return log_oom();
+                k = strdup("PATH=" DEFAULT_USER_PATH);
+                if (!k)
+                        return log_oom();
+
+                r = strv_env_replace(&m->transient_environment, k);
+                if (r < 0)
+                        return log_oom();
+                TAKE_PTR(k);
+        }
  
          sanitize_environment(m->transient_environment);
  
@@ -1629,9 +1644,7 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
  
          manager_preset_all(m);
  
-        r = lookup_paths_reduce(&m->lookup_paths);
-        if (r < 0)
-                log_warning_errno(r, "Failed to reduce unit file paths, ignoring: %m");
+        lookup_paths_log(&m->lookup_paths);
  
          {
                  /* This block is (optionally) done with the reloading counter bumped */
@@ -3520,9 +3533,7 @@ int manager_reload(Manager *m) {
          (void) manager_run_environment_generators(m);
          (void) manager_run_generators(m);
  
-        r = lookup_paths_reduce(&m->lookup_paths);
-        if (r < 0)
-                log_warning_errno(r, "Failed to reduce unit file paths, ignoring: %m");
+        lookup_paths_log(&m->lookup_paths);
  
          /* We flushed out generated files, for which we don't watch mtime, so we should flush the old map. */
          manager_free_unit_name_maps(m);
@@ -4072,10 +4083,11 @@ static bool manager_get_show_status(Manager *m, StatusType type) {
  
  const char *manager_get_confirm_spawn(Manager *m) {
          static int last_errno = 0;
-        const char *vc = m->confirm_spawn;
          struct stat st;
          int r;
  
+        assert(m);
+
          /* Here's the deal: we want to test the validity of the console but don't want
           * PID1 to go through the whole console process which might block. But we also
           * want to warn the user only once if something is wrong with the console so we
@@ -4091,25 +4103,26 @@ const char *manager_get_confirm_spawn(Manager *m) {
           * reason the configured console is not ready, we fallback to the default
           * console. */
  
-        if (!vc || path_equal(vc, "/dev/console"))
-                return vc;
+        if (!m->confirm_spawn || path_equal(m->confirm_spawn, "/dev/console"))
+                return m->confirm_spawn;
  
-        r = stat(vc, &st);
-        if (r < 0)
+        if (stat(m->confirm_spawn, &st) < 0) {
+                r = -errno;
                  goto fail;
+        }
  
          if (!S_ISCHR(st.st_mode)) {
-                errno = ENOTTY;
+                r = -ENOTTY;
                  goto fail;
          }
  
          last_errno = 0;
-        return vc;
+        return m->confirm_spawn;
+
  fail:
-        if (last_errno != errno) {
-                last_errno = errno;
-                log_warning_errno(errno, "Failed to open %s: %m, using default console", vc);
-        }
+        if (last_errno != r)
+                last_errno = log_warning_errno(r, "Failed to open %s, using default console: %m", m->confirm_spawn);
+
          return "/dev/console";
  }
  
diff --git a/src/core/meson.build b/src/core/meson.build

index fb6820e109a9e0c2faab21123a512f305ea6e09b..df3aa5c6c1659696ed16ef90c14f8a31071b08ca 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -197,8 +197,6 @@ endforeach
  
  install_data('org.freedesktop.systemd1.conf',
               install_dir : dbuspolicydir)
-install_data('org.freedesktop.systemd1.service',
-             install_dir : dbussystemservicedir)
  
  policy = configure_file(
          input : 'org.freedesktop.systemd1.policy.in',
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c

index ea7b0a80cbd379a081f229351ee04ca5fa544ccb..72cf5a2caae42e74fbc9bbe4a85df4b85572c588 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -10,8 +10,8 @@
  #include "alloc-util.h"
  #include "bus-util.h"
  #include "cgroup-util.h"
+#include "conf-files.h"
  #include "dev-setup.h"
-#include "dirent-util.h"
  #include "efivars.h"
  #include "fd-util.h"
  #include "fileio.h"
@@ -408,7 +408,8 @@ static int relabel_cgroup_filesystems(void) {
  }
  
  static int relabel_extra(void) {
-        _cleanup_closedir_ DIR *d = NULL;
+        _cleanup_strv_free_ char **files = NULL;
+        char **file;
          int r, c = 0;
  
          /* Support for relabelling additional files or directories after loading the policy. For this, code in the
@@ -419,55 +420,27 @@ static int relabel_extra(void) {
           * possible.
           */
  
-        d = opendir("/run/systemd/relabel-extra.d/");
-        if (!d) {
-                if (errno == ENOENT)
-                        return 0;
-
-                return log_warning_errno(errno, "Failed to open /run/systemd/relabel-extra.d/, ignoring: %m");
-        }
+        r = conf_files_list(&files, ".relabel", NULL,
+                            CONF_FILES_FILTER_MASKED | CONF_FILES_REGULAR,
+                            "/run/systemd/relabel-extra.d/");
+        if (r < 0)
+                return log_error_errno(r, "Failed to enumerate /run/systemd/relabel-extra.d/, ignoring: %m");
  
-        for (;;) {
+        STRV_FOREACH(file, files) {
                  _cleanup_fclose_ FILE *f = NULL;
-                _cleanup_close_ int fd = -1;
-                struct dirent *de;
-
-                errno = 0;
-                de = readdir_no_dot(d);
-                if (!de) {
-                        if (errno != 0)
-                                return log_error_errno(errno, "Failed read directory /run/systemd/relabel-extra.d/, ignoring: %m");
-                        break;
-                }
-
-                if (hidden_or_backup_file(de->d_name))
-                        continue;
-
-                if (!endswith(de->d_name, ".relabel"))
-                        continue;
-
-                if (!IN_SET(de->d_type, DT_REG, DT_UNKNOWN))
-                        continue;
-
-                fd = openat(dirfd(d), de->d_name, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
-                if (fd < 0) {
-                        log_warning_errno(errno, "Failed to open /run/systemd/relabel-extra.d/%s, ignoring: %m", de->d_name);
-                        continue;
-                }
  
-                f = fdopen(fd, "r");
+                f = fopen(*file, "re");
                  if (!f) {
-                        log_warning_errno(errno, "Failed to convert file descriptor into file object, ignoring: %m");
+                        log_warning_errno(errno, "Failed to open %s, ignoring: %m", *file);
                          continue;
                  }
-                TAKE_FD(fd);
  
                  for (;;) {
                          _cleanup_free_ char *line = NULL;
  
                          r = read_line(f, LONG_LINE_MAX, &line);
                          if (r < 0) {
-                                log_warning_errno(r, "Failed to read from /run/systemd/relabel-extra.d/%s, ignoring: %m", de->d_name);
+                                log_warning_errno(r, "Failed to read %s, ignoring: %m", *file);
                                  break;
                          }
                          if (r == 0) /* EOF */
@@ -486,15 +459,16 @@ static int relabel_extra(void) {
                          }
  
                          log_debug("Relabelling additional file/directory '%s'.", line);
+                        (void) label_fix(line, 0);
                          (void) nftw(line, nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
                          c++;
                  }
  
-                if (unlinkat(dirfd(d), de->d_name, 0) < 0)
-                        log_warning_errno(errno, "Failed to remove /run/systemd/relabel-extra.d/%s, ignoring: %m", de->d_name);
+                if (unlink(*file) < 0)
+                        log_warning_errno(errno, "Failed to remove %s, ignoring: %m", *file);
          }
  
-        /* Remove when we completing things. */
+        /* Remove when we complete things. */
          if (rmdir("/run/systemd/relabel-extra.d") < 0)
                  log_warning_errno(errno, "Failed to remove /run/systemd/relabel-extra.d/ directory: %m");
  
diff --git a/src/core/mount.c b/src/core/mount.c

index fb6a516318d6d03e2a1674aeae40d7352bb41a4f..fb3467c3503c42f264f28a5ca1ba0488d94a547a 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -45,7 +45,8 @@ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
          [MOUNT_REMOUNTING_SIGKILL] = UNIT_RELOADING,
          [MOUNT_UNMOUNTING_SIGTERM] = UNIT_DEACTIVATING,
          [MOUNT_UNMOUNTING_SIGKILL] = UNIT_DEACTIVATING,
-        [MOUNT_FAILED] = UNIT_FAILED
+        [MOUNT_FAILED] = UNIT_FAILED,
+        [MOUNT_CLEANING] = UNIT_MAINTENANCE,
  };
  
  static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *userdata);
@@ -61,7 +62,8 @@ static bool MOUNT_STATE_WITH_PROCESS(MountState state) {
                        MOUNT_REMOUNTING_SIGKILL,
                        MOUNT_UNMOUNTING,
                        MOUNT_UNMOUNTING_SIGTERM,
-                      MOUNT_UNMOUNTING_SIGKILL);
+                      MOUNT_UNMOUNTING_SIGKILL,
+                      MOUNT_CLEANING);
  }
  
  static bool mount_is_network(const MountParameters *p) {
@@ -731,6 +733,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
          fprintf(f,
                  "%sMount State: %s\n"
                  "%sResult: %s\n"
+                "%sClean Result: %s\n"
                  "%sWhere: %s\n"
                  "%sWhat: %s\n"
                  "%sFile System Type: %s\n"
@@ -745,6 +748,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
                  "%sTimeoutSec: %s\n",
                  prefix, mount_state_to_string(m->state),
                  prefix, mount_result_to_string(m->result),
+                prefix, mount_result_to_string(m->clean_result),
                  prefix, m->where,
                  prefix, p ? strna(p->what) : "n/a",
                  prefix, p ? strna(p->fstype) : "n/a",
@@ -826,7 +830,7 @@ static void mount_enter_dead(Mount *m, MountResult f) {
  
          m->exec_runtime = exec_runtime_unref(m->exec_runtime, true);
  
-        exec_context_destroy_runtime_directory(&m->exec_context, UNIT(m)->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+        unit_destroy_runtime_directory(UNIT(m), &m->exec_context);
  
          unit_unref_uid_gid(UNIT(m), true);
  
@@ -1090,7 +1094,8 @@ static int mount_start(Unit *u) {
          if (IN_SET(m->state,
                     MOUNT_UNMOUNTING,
                     MOUNT_UNMOUNTING_SIGTERM,
-                   MOUNT_UNMOUNTING_SIGKILL))
+                   MOUNT_UNMOUNTING_SIGKILL,
+                   MOUNT_CLEANING))
                  return -EAGAIN;
  
          /* Already on it! */
@@ -1149,6 +1154,11 @@ static int mount_stop(Unit *u) {
                  mount_enter_unmounting(m);
                  return 1;
  
+        case MOUNT_CLEANING:
+                /* If we are currently cleaning, then abort it, brutally. */
+                mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, MOUNT_SUCCESS);
+                return 0;
+
          default:
                  assert_not_reached("Unexpected state.");
          }
@@ -1323,9 +1333,10 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
          }
  
          unit_log_process_exit(
-                        u, f == MOUNT_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+                        u,
                          "Mount process",
                          mount_exec_command_to_string(m->control_command_id),
+                        f == MOUNT_SUCCESS,
                          code, status);
  
          /* Note that due to the io event priority logic, we can be sure the new mountinfo is loaded
@@ -1381,6 +1392,13 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                  mount_enter_dead_or_mounted(m, f);
                  break;
  
+        case MOUNT_CLEANING:
+                if (m->clean_result == MOUNT_SUCCESS)
+                        m->clean_result = f;
+
+                mount_enter_dead(m, MOUNT_SUCCESS);
+                break;
+
          default:
                  assert_not_reached("Uh, control process died at wrong time.");
          }
@@ -1448,6 +1466,15 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user
                  mount_enter_dead_or_mounted(m, MOUNT_FAILURE_TIMEOUT);
                  break;
  
+        case MOUNT_CLEANING:
+                log_unit_warning(UNIT(m), "Cleaning timed out. killing.");
+
+                if (m->clean_result == MOUNT_SUCCESS)
+                        m->clean_result = MOUNT_FAILURE_TIMEOUT;
+
+                mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, 0);
+                break;
+
          default:
                  assert_not_reached("Timeout at wrong time.");
          }
@@ -1922,6 +1949,7 @@ static void mount_reset_failed(Unit *u) {
  
          m->result = MOUNT_SUCCESS;
          m->reload_result = MOUNT_SUCCESS;
+        m->clean_result = MOUNT_SUCCESS;
  }
  
  static int mount_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {
@@ -1940,6 +1968,56 @@ static int mount_control_pid(Unit *u) {
          return m->control_pid;
  }
  
+static int mount_clean(Unit *u, ExecCleanMask mask) {
+        _cleanup_strv_free_ char **l = NULL;
+        Mount *m = MOUNT(u);
+        int r;
+
+        assert(m);
+        assert(mask != 0);
+
+        if (m->state != MOUNT_DEAD)
+                return -EBUSY;
+
+        r = exec_context_get_clean_directories(&m->exec_context, u->manager->prefix, mask, &l);
+        if (r < 0)
+                return r;
+
+        if (strv_isempty(l))
+                return -EUNATCH;
+
+        mount_unwatch_control_pid(m);
+        m->clean_result = MOUNT_SUCCESS;
+        m->control_command = NULL;
+        m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
+
+        r = mount_arm_timer(m, usec_add(now(CLOCK_MONOTONIC), m->exec_context.timeout_clean_usec));
+        if (r < 0)
+                goto fail;
+
+        r = unit_fork_and_watch_rm_rf(u, l, &m->control_pid);
+        if (r < 0)
+                goto fail;
+
+        mount_set_state(m, MOUNT_CLEANING);
+
+        return 0;
+
+fail:
+        log_unit_warning_errno(u, r, "Failed to initiate cleaning: %m");
+        m->clean_result = MOUNT_FAILURE_RESOURCES;
+        m->timer_event_source = sd_event_source_unref(m->timer_event_source);
+        return r;
+}
+
+static int mount_can_clean(Unit *u, ExecCleanMask *ret) {
+        Mount *m = MOUNT(u);
+
+        assert(m);
+
+        return exec_context_get_clean_mask(&m->exec_context, ret);
+}
+
  static const char* const mount_exec_command_table[_MOUNT_EXEC_COMMAND_MAX] = {
          [MOUNT_EXEC_MOUNT] = "ExecMount",
          [MOUNT_EXEC_UNMOUNT] = "ExecUnmount",
@@ -1988,6 +2066,8 @@ const UnitVTable mount_vtable = {
          .reload = mount_reload,
  
          .kill = mount_kill,
+        .clean = mount_clean,
+        .can_clean = mount_can_clean,
  
          .serialize = mount_serialize,
          .deserialize_item = mount_deserialize_item,
@@ -1995,6 +2075,8 @@ const UnitVTable mount_vtable = {
          .active_state = mount_active_state,
          .sub_state_to_string = mount_sub_state_to_string,
  
+        .will_restart = unit_will_restart_default,
+
          .may_gc = mount_may_gc,
  
          .sigchld_event = mount_sigchld_event,
diff --git a/src/core/mount.h b/src/core/mount.h

index 2e59f1fe04dd28f04c3146d7ba08de3b8db6f359..07fa05f3ca69635a82d4c4d5c323c58dc643a1de 100644 (file)
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -61,6 +61,7 @@ struct Mount {
  
          MountResult result;
          MountResult reload_result;
+        MountResult clean_result;
  
          mode_t directory_mode;
  
diff --git a/src/core/org.freedesktop.systemd1.service b/src/core/org.freedesktop.systemd1.service

deleted file mode 100644 (file)

index 8bd7302..0000000
--- a/src/core/org.freedesktop.systemd1.service
+++ /dev/null
@@ -1,13 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1+
-#
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[D-BUS Service]
-Name=org.freedesktop.systemd1
-Exec=/bin/false
-User=root
diff --git a/src/core/path.c b/src/core/path.c

index 562cd352a3e57b933501c3d8e13cf31975e09f51..ac1289a658c5242171d24485058b0e83b19a2c57 100644 (file)
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -480,11 +480,9 @@ static void path_enter_running(Path *p) {
  
          p->inotify_triggered = false;
  
-        r = path_watch(p);
-        if (r < 0)
-                goto fail;
-
          path_set_state(p, PATH_RUNNING);
+        path_unwatch(p);
+
          return;
  
  fail:
diff --git a/src/core/service.c b/src/core/service.c

index bfbfa4be655f57ca04a2afc63ee7fcdddf284590..894b8af6616feef0d4bd4bbfd83f044f928c448d 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -30,7 +30,6 @@
  #include "parse-util.h"
  #include "path-util.h"
  #include "process-util.h"
-#include "rm-rf.h"
  #include "serialize.h"
  #include "service.h"
  #include "signal-util.h"
@@ -108,7 +107,6 @@ static void service_init(Unit *u) {
          s->timeout_abort_set = u->manager->default_timeout_abort_set;
          s->restart_usec = u->manager->default_restart_usec;
          s->runtime_max_usec = USEC_INFINITY;
-        s->timeout_clean_usec = USEC_INFINITY;
          s->type = _SERVICE_TYPE_INVALID;
          s->socket_fd = -1;
          s->stdin_fd = s->stdout_fd = s->stderr_fd = -1;
@@ -794,8 +792,7 @@ static int service_load(Unit *u) {
  
  static void service_dump(Unit *u, FILE *f, const char *prefix) {
          char buf_restart[FORMAT_TIMESPAN_MAX], buf_start[FORMAT_TIMESPAN_MAX], buf_stop[FORMAT_TIMESPAN_MAX],
-                buf_runtime[FORMAT_TIMESPAN_MAX], buf_watchdog[FORMAT_TIMESPAN_MAX], buf_abort[FORMAT_TIMESPAN_MAX],
-                buf_clean[FORMAT_TIMESPAN_MAX];
+                buf_runtime[FORMAT_TIMESPAN_MAX], buf_watchdog[FORMAT_TIMESPAN_MAX], buf_abort[FORMAT_TIMESPAN_MAX];
          ServiceExecCommand c;
          Service *s = SERVICE(u);
          const char *prefix2;
@@ -878,10 +875,8 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                          prefix, format_timespan(buf_abort, sizeof(buf_abort), s->timeout_abort_usec, USEC_PER_SEC));
  
          fprintf(f,
-                "%sTimeoutCleanSec: %s\n"
                  "%sRuntimeMaxSec: %s\n"
                  "%sWatchdogSec: %s\n",
-                prefix, format_timespan(buf_clean, sizeof(buf_clean), s->timeout_clean_usec, USEC_PER_SEC),
                  prefix, format_timespan(buf_runtime, sizeof(buf_runtime), s->runtime_max_usec, USEC_PER_SEC),
                  prefix, format_timespan(buf_watchdog, sizeof(buf_watchdog), s->watchdog_usec, USEC_PER_SEC));
  
@@ -1167,7 +1162,7 @@ static usec_t service_coldplug_timeout(Service *s) {
                  return usec_add(UNIT(s)->inactive_enter_timestamp.monotonic, s->restart_usec);
  
          case SERVICE_CLEANING:
-                return usec_add(UNIT(s)->state_change_timestamp.monotonic, s->timeout_clean_usec);
+                return usec_add(UNIT(s)->state_change_timestamp.monotonic, s->exec_context.timeout_clean_usec);
  
          default:
                  return USEC_INFINITY;
@@ -1721,12 +1716,8 @@ static bool service_will_restart(Unit *u) {
                  return true;
          if (s->state == SERVICE_AUTO_RESTART)
                  return true;
-        if (!UNIT(s)->job)
-                return false;
-        if (UNIT(s)->job->type == JOB_START)
-                return true;
  
-        return false;
+        return unit_will_restart_default(u);
  }
  
  static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) {
@@ -1789,10 +1780,8 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
          /* We want fresh tmpdirs in case service is started again immediately */
          s->exec_runtime = exec_runtime_unref(s->exec_runtime, true);
  
-        if (s->exec_context.runtime_directory_preserve_mode == EXEC_PRESERVE_NO ||
-            (s->exec_context.runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART && !service_will_restart(UNIT(s))))
-                /* Also, remove the runtime directory */
-                exec_context_destroy_runtime_directory(&s->exec_context, UNIT(s)->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+        /* Also, remove the runtime directory */
+        unit_destroy_runtime_directory(UNIT(s), &s->exec_context);
  
          /* Get rid of the IPC bits of the user */
          unit_unref_uid_gid(UNIT(s), true);
@@ -3417,14 +3406,11 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                                  f = SERVICE_SUCCESS;
                  }
  
-                /* When this is a successful exit, let's log about the exit code on DEBUG level. If this is a failure
-                 * and the process exited on its own via exit(), then let's make this a NOTICE, under the assumption
-                 * that the service already logged the reason at a higher log level on its own. (Internally,
-                 * unit_log_process_exit() will possibly bump this to WARNING if the service died due to a signal.) */
                  unit_log_process_exit(
-                                u, f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+                                u,
                                  "Main process",
                                  service_exec_command_to_string(SERVICE_EXEC_START),
+                                f == SERVICE_SUCCESS,
                                  code, status);
  
                  if (s->result == SERVICE_SUCCESS)
@@ -3519,9 +3505,10 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                  }
  
                  unit_log_process_exit(
-                                u, f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+                                u,
                                  "Control process",
                                  service_exec_command_to_string(s->control_command_id),
+                                f == SERVICE_SUCCESS,
                                  code, status);
  
                  if (s->state != SERVICE_RELOAD && s->result == SERVICE_SUCCESS)
@@ -4067,7 +4054,6 @@ static int service_get_timeout(Unit *u, usec_t *timeout) {
  
  static void service_bus_name_owner_change(
                  Unit *u,
-                const char *name,
                  const char *old_owner,
                  const char *new_owner) {
  
@@ -4075,17 +4061,15 @@ static void service_bus_name_owner_change(
          int r;
  
          assert(s);
-        assert(name);
  
-        assert(streq(s->bus_name, name));
          assert(old_owner || new_owner);
  
          if (old_owner && new_owner)
-                log_unit_debug(u, "D-Bus name %s changed owner from %s to %s", name, old_owner, new_owner);
+                log_unit_debug(u, "D-Bus name %s changed owner from %s to %s", s->bus_name, old_owner, new_owner);
          else if (old_owner)
-                log_unit_debug(u, "D-Bus name %s no longer registered by %s", name, old_owner);
+                log_unit_debug(u, "D-Bus name %s no longer registered by %s", s->bus_name, old_owner);
          else
-                log_unit_debug(u, "D-Bus name %s now registered by %s", name, new_owner);
+                log_unit_debug(u, "D-Bus name %s now registered by %s", s->bus_name, new_owner);
  
          s->bus_name_good = !!new_owner;
  
@@ -4118,11 +4102,11 @@ static void service_bus_name_owner_change(
  
                  /* Try to acquire PID from bus service */
  
-                r = sd_bus_get_name_creds(u->manager->api_bus, name, SD_BUS_CREDS_PID, &creds);
+                r = sd_bus_get_name_creds(u->manager->api_bus, s->bus_name, SD_BUS_CREDS_PID, &creds);
                  if (r >= 0)
                          r = sd_bus_creds_get_pid(creds, &pid);
                  if (r >= 0) {
-                        log_unit_debug(u, "D-Bus name %s is now owned by process " PID_FMT, name, pid);
+                        log_unit_debug(u, "D-Bus name %s is now owned by process " PID_FMT, s->bus_name, pid);
  
                          service_set_main_pid(s, pid);
                          unit_watch_pid(UNIT(s), pid, false);
@@ -4261,7 +4245,6 @@ static int service_exit_status(Unit *u) {
  static int service_clean(Unit *u, ExecCleanMask mask) {
          _cleanup_strv_free_ char **l = NULL;
          Service *s = SERVICE(u);
-        pid_t pid;
          int r;
  
          assert(s);
@@ -4282,40 +4265,20 @@ static int service_clean(Unit *u, ExecCleanMask mask) {
          s->control_command = NULL;
          s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
  
-        r = service_arm_timer(s, usec_add(now(CLOCK_MONOTONIC), s->timeout_clean_usec));
+        r = service_arm_timer(s, usec_add(now(CLOCK_MONOTONIC), s->exec_context.timeout_clean_usec));
          if (r < 0)
                  goto fail;
  
-        r = unit_fork_helper_process(UNIT(s), "(sd-rmrf)", &pid);
+        r = unit_fork_and_watch_rm_rf(u, l, &s->control_pid);
          if (r < 0)
                  goto fail;
-        if (r == 0) {
-                int ret = EXIT_SUCCESS;
-                char **i;
-
-                STRV_FOREACH(i, l) {
-                        r = rm_rf(*i, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_MISSING_OK);
-                        if (r < 0) {
-                                log_error_errno(r, "Failed to remove '%s': %m", *i);
-                                ret = EXIT_FAILURE;
-                        }
-                }
-
-                _exit(ret);
-        }
-
-        r = unit_watch_pid(u, pid, true);
-        if (r < 0)
-                goto fail;
-
-        s->control_pid = pid;
  
          service_set_state(s, SERVICE_CLEANING);
  
          return 0;
  
  fail:
-        log_unit_warning_errno(UNIT(s), r, "Failed to initiate cleaning: %m");
+        log_unit_warning_errno(u, r, "Failed to initiate cleaning: %m");
          s->clean_result = SERVICE_FAILURE_RESOURCES;
          s->timer_event_source = sd_event_source_unref(s->timer_event_source);
          return r;
diff --git a/src/core/service.h b/src/core/service.h

index adc05d321841998284d03102e08b6915be5ee34d..11e861a3d4325bf92635662811a0cd648de4c10e 100644 (file)
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -101,7 +101,6 @@ struct Service {
          usec_t timeout_stop_usec;
          usec_t timeout_abort_usec;
          bool timeout_abort_set;
-        usec_t timeout_clean_usec;
          usec_t runtime_max_usec;
  
          dual_timestamp watchdog_timestamp;
diff --git a/src/core/socket.c b/src/core/socket.c

index cc3dc5973d7f9cc5025a7284c612520ebae15364..d7ff7d1501a68faa44f2bd37277534af870eb596 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -67,7 +67,8 @@ static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
          [SOCKET_STOP_POST] = UNIT_DEACTIVATING,
          [SOCKET_FINAL_SIGTERM] = UNIT_DEACTIVATING,
          [SOCKET_FINAL_SIGKILL] = UNIT_DEACTIVATING,
-        [SOCKET_FAILED] = UNIT_FAILED
+        [SOCKET_FAILED] = UNIT_FAILED,
+        [SOCKET_CLEANING] = UNIT_MAINTENANCE,
  };
  
  static int socket_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata);
@@ -624,6 +625,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
          fprintf(f,
                  "%sSocket State: %s\n"
                  "%sResult: %s\n"
+                "%sClean Result: %s\n"
                  "%sBindIPv6Only: %s\n"
                  "%sBacklog: %u\n"
                  "%sSocketMode: %04o\n"
@@ -642,6 +644,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                  "%sSELinuxContextFromNet: %s\n",
                  prefix, socket_state_to_string(s->state),
                  prefix, socket_result_to_string(s->result),
+                prefix, socket_result_to_string(s->clean_result),
                  prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only),
                  prefix, s->backlog,
                  prefix, s->socket_mode,
@@ -1802,7 +1805,8 @@ static void socket_set_state(Socket *s, SocketState state) {
                      SOCKET_STOP_PRE_SIGKILL,
                      SOCKET_STOP_POST,
                      SOCKET_FINAL_SIGTERM,
-                    SOCKET_FINAL_SIGKILL)) {
+                    SOCKET_FINAL_SIGKILL,
+                    SOCKET_CLEANING)) {
  
                  s->timer_event_source = sd_event_source_unref(s->timer_event_source);
                  socket_unwatch_control_pid(s);
@@ -1820,7 +1824,8 @@ static void socket_set_state(Socket *s, SocketState state) {
                      SOCKET_RUNNING,
                      SOCKET_STOP_PRE,
                      SOCKET_STOP_PRE_SIGTERM,
-                    SOCKET_STOP_PRE_SIGKILL))
+                    SOCKET_STOP_PRE_SIGKILL,
+                    SOCKET_CLEANING))
                  socket_close_fds(s);
  
          if (state != old_state)
@@ -1850,7 +1855,8 @@ static int socket_coldplug(Unit *u) {
                     SOCKET_STOP_PRE_SIGKILL,
                     SOCKET_STOP_POST,
                     SOCKET_FINAL_SIGTERM,
-                   SOCKET_FINAL_SIGKILL)) {
+                   SOCKET_FINAL_SIGKILL,
+                   SOCKET_CLEANING)) {
  
                  r = unit_watch_pid(UNIT(s), s->control_pid, false);
                  if (r < 0)
@@ -1891,7 +1897,7 @@ static int socket_coldplug(Unit *u) {
                          return r;
          }
  
-        if (!IN_SET(s->deserialized_state, SOCKET_DEAD, SOCKET_FAILED)) {
+        if (!IN_SET(s->deserialized_state, SOCKET_DEAD, SOCKET_FAILED, SOCKET_CLEANING)) {
                  (void) unit_setup_dynamic_creds(u);
                  (void) unit_setup_exec_runtime(u);
          }
@@ -2035,7 +2041,7 @@ static void socket_enter_dead(Socket *s, SocketResult f) {
  
          s->exec_runtime = exec_runtime_unref(s->exec_runtime, true);
  
-        exec_context_destroy_runtime_directory(&s->exec_context, UNIT(s)->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+        unit_destroy_runtime_directory(UNIT(s), &s->exec_context);
  
          unit_unref_uid_gid(UNIT(s), true);
  
@@ -2455,7 +2461,8 @@ static int socket_start(Unit *u) {
                     SOCKET_STOP_PRE_SIGTERM,
                     SOCKET_STOP_POST,
                     SOCKET_FINAL_SIGTERM,
-                   SOCKET_FINAL_SIGKILL))
+                   SOCKET_FINAL_SIGKILL,
+                   SOCKET_CLEANING))
                  return -EAGAIN;
  
          /* Already on it! */
@@ -2530,6 +2537,12 @@ static int socket_stop(Unit *u) {
                  return -EAGAIN;
          }
  
+        /* If we are currently cleaning, then abort it, brutally. */
+        if (s->state == SOCKET_CLEANING) {
+                socket_enter_signal(s, SOCKET_FINAL_SIGKILL, SOCKET_SUCCESS);
+                return 0;
+        }
+
          assert(IN_SET(s->state, SOCKET_LISTENING, SOCKET_RUNNING));
  
          socket_enter_stop_pre(s, SOCKET_SUCCESS);
@@ -3014,9 +3027,10 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
          }
  
          unit_log_process_exit(
-                        u, f == SOCKET_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+                        u,
                          "Control process",
                          socket_exec_command_to_string(s->control_command_id),
+                        f == SOCKET_SUCCESS,
                          code, status);
  
          if (s->result == SOCKET_SUCCESS)
@@ -3072,6 +3086,14 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                          socket_enter_dead(s, f);
                          break;
  
+                case SOCKET_CLEANING:
+
+                        if (s->clean_result == SOCKET_SUCCESS)
+                                s->clean_result = f;
+
+                        socket_enter_dead(s, SOCKET_SUCCESS);
+                        break;
+
                  default:
                          assert_not_reached("Uh, control process died at wrong time.");
                  }
@@ -3140,6 +3162,15 @@ static int socket_dispatch_timer(sd_event_source *source, usec_t usec, void *use
                  socket_enter_dead(s, SOCKET_FAILURE_TIMEOUT);
                  break;
  
+        case SOCKET_CLEANING:
+                log_unit_warning(UNIT(s), "Cleaning timed out. killing.");
+
+                if (s->clean_result == SOCKET_SUCCESS)
+                        s->clean_result = SOCKET_FAILURE_TIMEOUT;
+
+                socket_enter_signal(s, SOCKET_FINAL_SIGKILL, 0);
+                break;
+
          default:
                  assert_not_reached("Timeout at wrong time.");
          }
@@ -3196,6 +3227,7 @@ static void socket_reset_failed(Unit *u) {
                  socket_set_state(s, SOCKET_DEAD);
  
          s->result = SOCKET_SUCCESS;
+        s->clean_result = SOCKET_SUCCESS;
  }
  
  void socket_connection_unref(Socket *s) {
@@ -3290,6 +3322,56 @@ static int socket_control_pid(Unit *u) {
          return s->control_pid;
  }
  
+static int socket_clean(Unit *u, ExecCleanMask mask) {
+        _cleanup_strv_free_ char **l = NULL;
+        Socket *s = SOCKET(u);
+        int r;
+
+        assert(s);
+        assert(mask != 0);
+
+        if (s->state != SOCKET_DEAD)
+                return -EBUSY;
+
+        r = exec_context_get_clean_directories(&s->exec_context, u->manager->prefix, mask, &l);
+        if (r < 0)
+                return r;
+
+        if (strv_isempty(l))
+                return -EUNATCH;
+
+        socket_unwatch_control_pid(s);
+        s->clean_result = SOCKET_SUCCESS;
+        s->control_command = NULL;
+        s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
+
+        r = socket_arm_timer(s, usec_add(now(CLOCK_MONOTONIC), s->exec_context.timeout_clean_usec));
+        if (r < 0)
+                goto fail;
+
+        r = unit_fork_and_watch_rm_rf(u, l, &s->control_pid);
+        if (r < 0)
+                goto fail;
+
+        socket_set_state(s, SOCKET_CLEANING);
+
+        return 0;
+
+fail:
+        log_unit_warning_errno(u, r, "Failed to initiate cleaning: %m");
+        s->clean_result = SOCKET_FAILURE_RESOURCES;
+        s->timer_event_source = sd_event_source_unref(s->timer_event_source);
+        return r;
+}
+
+static int socket_can_clean(Unit *u, ExecCleanMask *ret) {
+        Socket *s = SOCKET(u);
+
+        assert(s);
+
+        return exec_context_get_clean_mask(&s->exec_context, ret);
+}
+
  static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = {
          [SOCKET_EXEC_START_PRE] = "ExecStartPre",
          [SOCKET_EXEC_START_CHOWN] = "ExecStartChown",
@@ -3342,6 +3424,8 @@ const UnitVTable socket_vtable = {
          .stop = socket_stop,
  
          .kill = socket_kill,
+        .clean = socket_clean,
+        .can_clean = socket_can_clean,
  
          .get_timeout = socket_get_timeout,
  
@@ -3352,6 +3436,8 @@ const UnitVTable socket_vtable = {
          .active_state = socket_active_state,
          .sub_state_to_string = socket_sub_state_to_string,
  
+        .will_restart = unit_will_restart_default,
+
          .may_gc = socket_may_gc,
  
          .sigchld_event = socket_sigchld_event,
diff --git a/src/core/socket.h b/src/core/socket.h

index c4e25db1fca7133cf96acda75a958e38d7a94b2a..9e0be15ba8d6e5226464ca9fd82b9905a5d75b6f 100644 (file)
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -103,6 +103,7 @@ struct Socket {
          mode_t socket_mode;
  
          SocketResult result;
+        SocketResult clean_result;
  
          char **symlinks;
  
diff --git a/src/core/swap.c b/src/core/swap.c

index 303afc9f35f6f3d0fd118b4b32d95dbf136e5d38..6d0cd517504f228cf0ad13579647971e5350ddf8 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -38,7 +38,8 @@ static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
          [SWAP_DEACTIVATING] = UNIT_DEACTIVATING,
          [SWAP_DEACTIVATING_SIGTERM] = UNIT_DEACTIVATING,
          [SWAP_DEACTIVATING_SIGKILL] = UNIT_DEACTIVATING,
-        [SWAP_FAILED] = UNIT_FAILED
+        [SWAP_FAILED] = UNIT_FAILED,
+        [SWAP_CLEANING] = UNIT_MAINTENANCE,
  };
  
  static int swap_dispatch_timer(sd_event_source *source, usec_t usec, void *userdata);
@@ -51,7 +52,8 @@ static bool SWAP_STATE_WITH_PROCESS(SwapState state) {
                        SWAP_ACTIVATING_DONE,
                        SWAP_DEACTIVATING,
                        SWAP_DEACTIVATING_SIGTERM,
-                      SWAP_DEACTIVATING_SIGKILL);
+                      SWAP_DEACTIVATING_SIGKILL,
+                      SWAP_CLEANING);
  }
  
  static void swap_unset_proc_swaps(Swap *s) {
@@ -587,11 +589,13 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
          fprintf(f,
                  "%sSwap State: %s\n"
                  "%sResult: %s\n"
+                "%sClean Result: %s\n"
                  "%sWhat: %s\n"
                  "%sFrom /proc/swaps: %s\n"
                  "%sFrom fragment: %s\n",
                  prefix, swap_state_to_string(s->state),
                  prefix, swap_result_to_string(s->result),
+                prefix, swap_result_to_string(s->clean_result),
                  prefix, s->what,
                  prefix, yes_no(s->from_proc_swaps),
                  prefix, yes_no(s->from_fragment));
@@ -683,7 +687,7 @@ static void swap_enter_dead(Swap *s, SwapResult f) {
  
          s->exec_runtime = exec_runtime_unref(s->exec_runtime, true);
  
-        exec_context_destroy_runtime_directory(&s->exec_context, UNIT(s)->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+        unit_destroy_runtime_directory(UNIT(s), &s->exec_context);
  
          unit_unref_uid_gid(UNIT(s), true);
  
@@ -852,7 +856,8 @@ static int swap_start(Unit *u) {
          if (IN_SET(s->state,
                     SWAP_DEACTIVATING,
                     SWAP_DEACTIVATING_SIGTERM,
-                   SWAP_DEACTIVATING_SIGKILL))
+                   SWAP_DEACTIVATING_SIGKILL,
+                   SWAP_CLEANING))
                  return -EAGAIN;
  
          /* Already on it! */
@@ -912,6 +917,12 @@ static int swap_stop(Unit *u) {
                  swap_enter_deactivating(s);
                  return 1;
  
+        case SWAP_CLEANING:
+                /* If we are currently cleaning, then abort it, brutally. */
+                swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS);
+                return 0;
+
+
          default:
                  assert_not_reached("Unexpected state.");
          }
@@ -1043,9 +1054,10 @@ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
          }
  
          unit_log_process_exit(
-                        u, f == SWAP_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
+                        u,
                          "Swap process",
                          swap_exec_command_to_string(s->control_command_id),
+                        f == SWAP_SUCCESS,
                          code, status);
  
          switch (s->state) {
@@ -1066,6 +1078,13 @@ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                  swap_enter_dead_or_active(s, f);
                  break;
  
+        case SWAP_CLEANING:
+                if (s->clean_result == SWAP_SUCCESS)
+                        s->clean_result = f;
+
+                swap_enter_dead(s, SWAP_SUCCESS);
+                break;
+
          default:
                  assert_not_reached("Uh, control process died at wrong time.");
          }
@@ -1108,6 +1127,15 @@ static int swap_dispatch_timer(sd_event_source *source, usec_t usec, void *userd
                  swap_enter_dead_or_active(s, SWAP_FAILURE_TIMEOUT);
                  break;
  
+        case SWAP_CLEANING:
+                log_unit_warning(UNIT(s), "Cleaning timed out. killing.");
+
+                if (s->clean_result == SWAP_SUCCESS)
+                        s->clean_result = SWAP_FAILURE_TIMEOUT;
+
+                swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, 0);
+                break;
+
          default:
                  assert_not_reached("Timeout at wrong time.");
          }
@@ -1427,6 +1455,7 @@ static void swap_reset_failed(Unit *u) {
                  swap_set_state(s, SWAP_DEAD);
  
          s->result = SWAP_SUCCESS;
+        s->clean_result = SWAP_SUCCESS;
  }
  
  static int swap_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {
@@ -1474,6 +1503,56 @@ static int swap_control_pid(Unit *u) {
          return s->control_pid;
  }
  
+static int swap_clean(Unit *u, ExecCleanMask mask) {
+        _cleanup_strv_free_ char **l = NULL;
+        Swap *s = SWAP(u);
+        int r;
+
+        assert(s);
+        assert(mask != 0);
+
+        if (s->state != SWAP_DEAD)
+                return -EBUSY;
+
+        r = exec_context_get_clean_directories(&s->exec_context, u->manager->prefix, mask, &l);
+        if (r < 0)
+                return r;
+
+        if (strv_isempty(l))
+                return -EUNATCH;
+
+        swap_unwatch_control_pid(s);
+        s->clean_result = SWAP_SUCCESS;
+        s->control_command = NULL;
+        s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
+
+        r = swap_arm_timer(s, usec_add(now(CLOCK_MONOTONIC), s->exec_context.timeout_clean_usec));
+        if (r < 0)
+                goto fail;
+
+        r = unit_fork_and_watch_rm_rf(u, l, &s->control_pid);
+        if (r < 0)
+                goto fail;
+
+        swap_set_state(s, SWAP_CLEANING);
+
+        return 0;
+
+fail:
+        log_unit_warning_errno(u, r, "Failed to initiate cleaning: %m");
+        s->clean_result = SWAP_FAILURE_RESOURCES;
+        s->timer_event_source = sd_event_source_unref(s->timer_event_source);
+        return r;
+}
+
+static int swap_can_clean(Unit *u, ExecCleanMask *ret) {
+        Swap *s = SWAP(u);
+
+        assert(s);
+
+        return exec_context_get_clean_mask(&s->exec_context, ret);
+}
+
  static const char* const swap_exec_command_table[_SWAP_EXEC_COMMAND_MAX] = {
          [SWAP_EXEC_ACTIVATE] = "ExecActivate",
          [SWAP_EXEC_DEACTIVATE] = "ExecDeactivate",
@@ -1519,6 +1598,8 @@ const UnitVTable swap_vtable = {
          .stop = swap_stop,
  
          .kill = swap_kill,
+        .clean = swap_clean,
+        .can_clean = swap_can_clean,
  
          .get_timeout = swap_get_timeout,
  
@@ -1528,6 +1609,8 @@ const UnitVTable swap_vtable = {
          .active_state = swap_active_state,
          .sub_state_to_string = swap_sub_state_to_string,
  
+        .will_restart = unit_will_restart_default,
+
          .may_gc = swap_may_gc,
  
          .sigchld_event = swap_sigchld_event,
diff --git a/src/core/swap.h b/src/core/swap.h

index 1a4b60b957e160ff8f4ef14cd8acfdd44149a4fb..389faf584d425cadc1a48e4695c23b08a5131065 100644 (file)
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -57,6 +57,7 @@ struct Swap {
          bool just_activated:1;
  
          SwapResult result;
+        SwapResult clean_result;
  
          usec_t timeout_usec;
  
diff --git a/src/core/unit.c b/src/core/unit.c

index 00181941fd9be13ffd49ecae1f62bfb483685ebb..52a1acafab41e4533a284e80aa8182b94b6d1d69 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -38,6 +38,7 @@
  #include "parse-util.h"
  #include "path-util.h"
  #include "process-util.h"
+#include "rm-rf.h"
  #include "serialize.h"
  #include "set.h"
  #include "signal-util.h"
@@ -1751,7 +1752,6 @@ static bool unit_verify_deps(Unit *u) {
  int unit_start(Unit *u) {
          UnitActiveState state;
          Unit *following;
-        int r;
  
          assert(u);
  
@@ -1776,25 +1776,8 @@ int unit_start(Unit *u) {
           * still be useful to speed up activation in case there is some hold-off time, but we don't want to
           * recheck the condition in that case. */
          if (state != UNIT_ACTIVATING &&
-            !unit_test_condition(u)) {
-
-                /* Let's also check the start limit here. Normally, the start limit is only checked by the
-                 * .start() method of the unit type after it did some additional checks verifying everything
-                 * is in order (so that those other checks can propagate errors properly). However, if a
-                 * condition check doesn't hold we don't get that far but we should still ensure we are not
-                 * called in a tight loop without a rate limit check enforced, hence do the check here. Note
-                 * that ECOMM is generally not a reason for a job to fail, unlike most other errors here,
-                 * hence the chance is big that any triggering unit for us will trigger us again. Note this
-                 * condition check is a bit different from the condition check inside the per-unit .start()
-                 * function, as this one will not change the unit's state in any way (and we shouldn't here,
-                 * after all the condition failed). */
-
-                r = unit_test_start_limit(u);
-                if (r < 0)
-                        return r;
-
+            !unit_test_condition(u))
                  return log_unit_debug_errno(u, SYNTHETIC_ERRNO(ECOMM), "Starting requested but condition failed. Not starting unit.");
-        }
  
          /* If the asserts failed, fail the entire job */
          if (state != UNIT_ACTIVATING &&
@@ -3242,7 +3225,46 @@ static int signal_name_owner_changed(sd_bus_message *message, void *userdata, sd
          new_owner = empty_to_null(new_owner);
  
          if (UNIT_VTABLE(u)->bus_name_owner_change)
-                UNIT_VTABLE(u)->bus_name_owner_change(u, name, old_owner, new_owner);
+                UNIT_VTABLE(u)->bus_name_owner_change(u, old_owner, new_owner);
+
+        return 0;
+}
+
+static int get_name_owner_handler(sd_bus_message *message, void *userdata, sd_bus_error *error) {
+        const sd_bus_error *e;
+        const char *new_owner;
+        Unit *u = userdata;
+        int r;
+
+        assert(message);
+        assert(u);
+
+        u->get_name_owner_slot = sd_bus_slot_unref(u->get_name_owner_slot);
+
+        if (sd_bus_error_is_set(error)) {
+                log_error("Failed to get name owner from bus: %s", error->message);
+                return 0;
+        }
+
+        e = sd_bus_message_get_error(message);
+        if (sd_bus_error_has_name(e, "org.freedesktop.DBus.Error.NameHasNoOwner"))
+                return 0;
+
+        if (e) {
+                log_error("Unexpected error response from GetNameOwner: %s", e->message);
+                return 0;
+        }
+
+        r = sd_bus_message_read(message, "s", &new_owner);
+        if (r < 0) {
+                bus_log_parse_error(r);
+                return 0;
+        }
+
+        new_owner = empty_to_null(new_owner);
+
+        if (UNIT_VTABLE(u)->bus_name_owner_change)
+                UNIT_VTABLE(u)->bus_name_owner_change(u, NULL, new_owner);
  
          return 0;
  }
@@ -3264,7 +3286,19 @@ int unit_install_bus_match(Unit *u, sd_bus *bus, const char *name) {
                           "member='NameOwnerChanged',"
                           "arg0='", name, "'");
  
-        return sd_bus_add_match_async(bus, &u->match_bus_slot, match, signal_name_owner_changed, NULL, u);
+        int r = sd_bus_add_match_async(bus, &u->match_bus_slot, match, signal_name_owner_changed, NULL, u);
+        if (r < 0)
+                return r;
+
+        return sd_bus_call_method_async(bus,
+                                        &u->get_name_owner_slot,
+                                        "org.freedesktop.DBus",
+                                        "/org/freedesktop/DBus",
+                                        "org.freedesktop.DBus",
+                                        "GetNameOwner",
+                                        get_name_owner_handler,
+                                        u,
+                                        "s", name);
  }
  
  int unit_watch_bus_name(Unit *u, const char *name) {
@@ -3299,6 +3333,7 @@ void unit_unwatch_bus_name(Unit *u, const char *name) {
  
          (void) hashmap_remove_value(u->manager->watch_bus, name, u);
          u->match_bus_slot = sd_bus_slot_unref(u->match_bus_slot);
+        u->get_name_owner_slot = sd_bus_slot_unref(u->get_name_owner_slot);
  }
  
  bool unit_can_serialize(Unit *u) {
@@ -4017,6 +4052,17 @@ bool unit_active_or_pending(Unit *u) {
          return false;
  }
  
+bool unit_will_restart_default(Unit *u) {
+        assert(u);
+
+        if (!u->job)
+                return false;
+        if (u->job->type == JOB_START)
+                return true;
+
+        return false;
+}
+
  bool unit_will_restart(Unit *u) {
          assert(u);
  
@@ -4531,6 +4577,15 @@ int unit_write_setting(Unit *u, UnitWriteFlags flags, const char *name, const ch
                  return r;
  
          (void) mkdir_p_label(p, 0755);
+
+        /* Make sure the drop-in dir is registered in our path cache. This way we don't need to stupidly
+         * recreate the cache after every drop-in we write. */
+        if (u->manager->unit_path_cache) {
+                r = set_put_strdup(u->manager->unit_path_cache, p);
+                if (r < 0)
+                        return r;
+        }
+
          r = write_string_file_atomic_label(q, wrapped);
          if (r < 0)
                  return r;
@@ -5242,6 +5297,39 @@ int unit_fork_helper_process(Unit *u, const char *name, pid_t *ret) {
          return 0;
  }
  
+int unit_fork_and_watch_rm_rf(Unit *u, char **paths, pid_t *ret_pid) {
+        pid_t pid;
+        int r;
+
+        assert(u);
+        assert(ret_pid);
+
+        r = unit_fork_helper_process(u, "(sd-rmrf)", &pid);
+        if (r < 0)
+                return r;
+        if (r == 0) {
+                int ret = EXIT_SUCCESS;
+                char **i;
+
+                STRV_FOREACH(i, paths) {
+                        r = rm_rf(*i, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_MISSING_OK);
+                        if (r < 0) {
+                                log_error_errno(r, "Failed to remove '%s': %m", *i);
+                                ret = EXIT_FAILURE;
+                        }
+                }
+
+                _exit(ret);
+        }
+
+        r = unit_watch_pid(u, pid, true);
+        if (r < 0)
+                return r;
+
+        *ret_pid = pid;
+        return 0;
+}
+
  static void unit_update_dependency_mask(Unit *u, UnitDependency d, Unit *other, UnitDependencyInfo di) {
          assert(u);
          assert(d >= 0);
@@ -5718,16 +5806,26 @@ void unit_log_skip(Unit *u, const char *result) {
  
  void unit_log_process_exit(
                  Unit *u,
-                int level,
                  const char *kind,
                  const char *command,
+                bool success,
                  int code,
                  int status) {
  
+        int level;
+
          assert(u);
          assert(kind);
  
-        if (code != CLD_EXITED)
+        /* If this is a successful exit, let's log about the exit code on DEBUG level. If this is a failure
+         * and the process exited on its own via exit(), then let's make this a NOTICE, under the assumption
+         * that the service already logged the reason at a higher log level on its own. Otherwise, make it a
+         * WARNING. */
+        if (success)
+                level = LOG_DEBUG;
+        else if (code == CLD_EXITED)
+                level = LOG_NOTICE;
+        else
                  level = LOG_WARNING;
  
          log_struct(level,
@@ -5809,6 +5907,12 @@ int unit_test_trigger_loaded(Unit *u) {
          return 0;
  }
  
+void unit_destroy_runtime_directory(Unit *u, const ExecContext *context) {
+        if (context->runtime_directory_preserve_mode == EXEC_PRESERVE_NO ||
+            (context->runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART && !unit_will_restart(u)))
+                exec_context_destroy_runtime_directory(context, u->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+}
+
  int unit_clean(Unit *u, ExecCleanMask mask) {
          UnitActiveState state;
  
diff --git a/src/core/unit.h b/src/core/unit.h

index 47ec9877a67ad042555017abfee252332b33d8f2..2ff4b1316034163c8b9991d6706310414ad1b944 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -146,6 +146,7 @@ typedef struct Unit {
  
          /* The slot used for watching NameOwnerChanged signals */
          sd_bus_slot *match_bus_slot;
+        sd_bus_slot *get_name_owner_slot;
  
          /* References to this unit from clients */
          sd_bus_track *bus_track;
@@ -528,7 +529,7 @@ typedef struct UnitVTable {
          void (*notify_message)(Unit *u, const struct ucred *ucred, char **tags, FDSet *fds);
  
          /* Called whenever a name this Unit registered for comes or goes away. */
-        void (*bus_name_owner_change)(Unit *u, const char *name, const char *old_owner, const char *new_owner);
+        void (*bus_name_owner_change)(Unit *u, const char *old_owner, const char *new_owner);
  
          /* Called for each property that is being set */
          int (*bus_set_property)(Unit *u, const char *name, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
@@ -751,6 +752,7 @@ const char *unit_slice_name(Unit *u);
  bool unit_stop_pending(Unit *u) _pure_;
  bool unit_inactive_or_pending(Unit *u) _pure_;
  bool unit_active_or_pending(Unit *u);
+bool unit_will_restart_default(Unit *u);
  bool unit_will_restart(Unit *u);
  
  int unit_add_default_target_dependency(Unit *u, Unit *target);
@@ -823,6 +825,7 @@ bool unit_shall_confirm_spawn(Unit *u);
  int unit_set_exec_params(Unit *s, ExecParameters *p);
  
  int unit_fork_helper_process(Unit *u, const char *name, pid_t *ret);
+int unit_fork_and_watch_rm_rf(Unit *u, char **paths, pid_t *ret_pid);
  
  void unit_remove_dependencies(Unit *u, UnitDependencyMask mask);
  
@@ -851,7 +854,7 @@ static inline void unit_log_result(Unit *u, bool success, const char *result) {
                  unit_log_failure(u, result);
  }
  
-void unit_log_process_exit(Unit *u, int level, const char *kind, const char *command, int code, int status);
+void unit_log_process_exit(Unit *u, const char *kind, const char *command, bool success, int code, int status);
  
  int unit_exit_status(Unit *u);
  int unit_success_action_exit_status(Unit *u);
@@ -859,6 +862,7 @@ int unit_failure_action_exit_status(Unit *u);
  
  int unit_test_trigger_loaded(Unit *u);
  
+void unit_destroy_runtime_directory(Unit *u, const ExecContext *context);
  int unit_clean(Unit *u, ExecCleanMask mask);
  int unit_can_clean(Unit *u, ExecCleanMask *ret_mask);
  
diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c

index d1293eff168118da48d0f6029c785b544fb0d50d..5fe51359f60d50a79ed7ae5ae24522640e011dbf 100644 (file)
--- a/src/environment-d-generator/environment-d-generator.c
+++ b/src/environment-d-generator/environment-d-generator.c
@@ -28,6 +28,13 @@ static int environment_dirs(char ***ret) {
          if (r < 0)
                  return r;
  
+        if (DEBUG_LOGGING) {
+                _cleanup_free_ char *t;
+
+                t = strv_join(dirs, "\n\t");
+                log_debug("Looking for environment.d files in (higher priority first):\n\t%s", strna(t));
+        }
+
          *ret = TAKE_PTR(dirs);
          return 0;
  }
@@ -49,6 +56,8 @@ static int load_and_print(void) {
           * that in case of failure, a partial update is better than none. */
  
          STRV_FOREACH(i, files) {
+                log_debug("Reading %s…", *i);
+
                  r = merge_env_file(&env, NULL, *i);
                  if (r == -ENOMEM)
                          return r;
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c

index 1de5d122231735f699fd80661c9a441a525f3432..528e6452cf41eac5d3e769e3497b61d3c87c47c7 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -553,8 +553,8 @@ static int prompt_root_password(void) {
          print_welcome();
          putchar('\n');
  
-        msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip): ");
-        msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter new root password again: ");
+        msg1 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter a new root password (empty to skip):");
+        msg2 = strjoina(special_glyph(SPECIAL_GLYPH_TRIANGULAR_BULLET), " Please enter new root password again:");
  
          for (;;) {
                  _cleanup_strv_free_erase_ char **a = NULL, **b = NULL;
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c

index 0a5863667c024e991cdfe6e1f2ba6b435c374ea2..935dce9d218b86c8427bfa2aadf4d9d68175f987 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -169,12 +169,12 @@ static int process_progress(int fd) {
          f = fdopen(fd, "r");
          if (!f) {
                  safe_close(fd);
-                return -errno;
+                return log_debug_errno(errno, "Failed to use pipe: %m");
          }
  
          console = fopen("/dev/console", "we");
          if (!console)
-                return -ENOMEM;
+                return log_debug_errno(errno, "Failed to open /dev/console, can't print progress output: %m");
  
          for (;;) {
                  int pass, m;
@@ -189,10 +189,9 @@ static int process_progress(int fd) {
                                  r = log_warning_errno(errno, "Failed to read from progress pipe: %m");
                          else if (feof(f))
                                  r = 0;
-                        else {
-                                log_warning("Failed to parse progress pipe data");
-                                r = -EBADMSG;
-                        }
+                        else
+                                r = log_warning_errno(SYNTHETIC_ERRNO(errno), "Failed to parse progress pipe data");
+
                          break;
                  }
  
diff --git a/src/fuzz/fuzz-catalog.c b/src/fuzz/fuzz-catalog.c

index 7ee97501418a3c5d749c004380359ff5051ca817..ecf25b18d7f9b214f8ba16f6b7dc5bcdc36845f7 100644 (file)
--- a/src/fuzz/fuzz-catalog.c
+++ b/src/fuzz/fuzz-catalog.c
@@ -9,12 +9,12 @@
  int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
          _cleanup_(unlink_tempfilep) char name[] = "/tmp/fuzz-catalog.XXXXXX";
          _cleanup_close_ int fd = -1;
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
  
          if (!getenv("SYSTEMD_LOG_LEVEL"))
                  log_set_max_level(LOG_CRIT);
  
-        assert_se(h = hashmap_new(&catalog_hash_ops));
+        assert_se(h = ordered_hashmap_new(&catalog_hash_ops));
  
          fd = mkostemp_safe(name);
          assert_se(fd >= 0);
diff --git a/src/fuzz/fuzz-fido-id-desc.c b/src/fuzz/fuzz-fido-id-desc.c

new file mode 100644 (file)

index 0000000..cf98dee
--- /dev/null
+++ b/src/fuzz/fuzz-fido-id-desc.c
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include <linux/hid.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "fido_id/fido_id_desc.h"
+#include "fuzz.h"
+#include "log.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+        /* We don't want to fill the logs with messages about parse errors.
+         * Disable most logging if not running standalone */
+        if (!getenv("SYSTEMD_LOG_LEVEL"))
+                log_set_max_level(LOG_CRIT);
+
+        if (size > HID_MAX_DESCRIPTOR_SIZE)
+                return 0;
+        (void) is_fido_security_token_desc(data, size);
+
+        return 0;
+}
diff --git a/src/fuzz/fuzz-fido-id-desc.dict b/src/fuzz/fuzz-fido-id-desc.dict

new file mode 100644 (file)

index 0000000..d2d2679
--- /dev/null
+++ b/src/fuzz/fuzz-fido-id-desc.dict
@@ -0,0 +1,6 @@
+"\xfe"
+"\x00"
+"\x01"
+"\xf1"
+"\xd0"
+"\xf1\xd0\x00\x01"
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build

index c88812d1de9f7d83a26f7e9c52d19ac875179007..96496ff4ed92faacc95597d1c9416ad6bd109cd8 100644 (file)
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -146,4 +146,9 @@ fuzzers += [
          [['src/fuzz/fuzz-time-util.c'],
           [libshared],
           []],
+
+        [['src/fuzz/fuzz-fido-id-desc.c',
+          'src/udev/fido_id/fido_id_desc.c'],
+         [],
+         []]
  ]
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c

index 75cba5827ce0db38df76ce9be4018f9a5d93ea3d..9e4f4fb59e71be38280f98964e9872d43f5c015f 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -116,6 +116,8 @@ static int context_read_data(Context *c) {
                  return r;
  
          r = id128_read("/sys/class/dmi/id/product_uuid", ID128_UUID, &c->uuid);
+        if (r == -ENOENT)
+                r = id128_read("/sys/firmware/devicetree/base/vm,uuid", ID128_UUID, &c->uuid);
          if (r < 0)
                  log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,
                                 "Failed to read product UUID, ignoring: %m");
diff --git a/src/id128/id128.c b/src/id128/id128.c

index 4b370d700d51b7cb400bf23cc7db02294519a0bf..d3874dbb002429aa78530658078e045408b3359d 100644 (file)
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -101,6 +101,7 @@ static int parse_argv(int argc, char *argv[]) {
          static const struct option options[] = {
                  { "help",         no_argument,       NULL, 'h'              },
                  { "version",      no_argument,       NULL, ARG_VERSION      },
+                { "pretty",       no_argument,       NULL, 'p'              },
                  { "app-specific", required_argument, NULL, 'a'              },
                  {},
          };
diff --git a/src/journal/catalog.c b/src/journal/catalog.c

index 7beffc1e1a30d22b5756f997affaf7284556ac5a..060193d2acab3890fd818156b17c671d3b3c6546 100644 (file)
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -143,7 +143,7 @@ static char *combine_entries(const char *one, const char *two) {
  }
  
  static int finish_item(
-                Hashmap *h,
+                OrderedHashmap *h,
                  sd_id128_t id,
                  const char *language,
                  char *payload, size_t payload_size) {
@@ -165,14 +165,14 @@ static int finish_item(
                  strcpy(i->language, language);
          }
  
-        prev = hashmap_get(h, i);
+        prev = ordered_hashmap_get(h, i);
          if (prev) {
                  /* Already have such an item, combine them */
                  combined = combine_entries(payload, prev);
                  if (!combined)
                          return log_oom();
  
-                if (hashmap_update(h, i, combined) < 0)
+                if (ordered_hashmap_update(h, i, combined) < 0)
                          return log_oom();
                  combined = NULL;
          } else {
@@ -181,7 +181,7 @@ static int finish_item(
                  if (!combined)
                          return log_oom();
  
-                if (hashmap_put(h, i, combined) < 0)
+                if (ordered_hashmap_put(h, i, combined) < 0)
                          return log_oom();
                  i = NULL;
                  combined = NULL;
@@ -247,7 +247,7 @@ static int catalog_entry_lang(
          return 0;
  }
  
-int catalog_import_file(Hashmap *h, const char *path) {
+int catalog_import_file(OrderedHashmap *h, const char *path) {
          _cleanup_fclose_ FILE *f = NULL;
          _cleanup_free_ char *payload = NULL;
          size_t payload_size = 0, payload_allocated = 0;
@@ -446,7 +446,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
          _cleanup_strv_free_ char **files = NULL;
          char **f;
          _cleanup_(strbuf_cleanupp) struct strbuf *sb = NULL;
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
          _cleanup_free_ CatalogItem *items = NULL;
          ssize_t offset;
          char *payload;
@@ -456,7 +456,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
          int r;
          int64_t sz;
  
-        h = hashmap_new(&catalog_hash_ops);
+        h = ordered_hashmap_new(&catalog_hash_ops);
          sb = strbuf_new();
          if (!h || !sb)
                  return log_oom();
@@ -472,18 +472,18 @@ int catalog_update(const char* database, const char* root, const char* const* di
                          return log_error_errno(r, "Failed to import file '%s': %m", *f);
          }
  
-        if (hashmap_size(h) <= 0) {
+        if (ordered_hashmap_size(h) <= 0) {
                  log_info("No items in catalog.");
                  return 0;
          } else
-                log_debug("Found %u items in catalog.", hashmap_size(h));
+                log_debug("Found %u items in catalog.", ordered_hashmap_size(h));
  
-        items = new(CatalogItem, hashmap_size(h));
+        items = new(CatalogItem, ordered_hashmap_size(h));
          if (!items)
                  return log_oom();
  
          n = 0;
-        HASHMAP_FOREACH_KEY(payload, i, h, j) {
+        ORDERED_HASHMAP_FOREACH_KEY(payload, i, h, j) {
                  log_debug("Found " SD_ID128_FORMAT_STR ", language %s",
                            SD_ID128_FORMAT_VAL(i->id),
                            isempty(i->language) ? "C" : i->language);
@@ -496,7 +496,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
                  items[n++] = *i;
          }
  
-        assert(n == hashmap_size(h));
+        assert(n == ordered_hashmap_size(h));
          typesafe_qsort(items, n, catalog_compare_func);
  
          strbuf_complete(sb);
diff --git a/src/journal/catalog.h b/src/journal/catalog.h

index 20497d118ff3d17704b925b631be9eb3451f3969..092a014651a5c64e1a5c817edf899b4bf67c4e85 100644 (file)
--- a/src/journal/catalog.h
+++ b/src/journal/catalog.h
@@ -9,7 +9,7 @@
  #include "hashmap.h"
  #include "strbuf.h"
  
-int catalog_import_file(Hashmap *h, const char *path);
+int catalog_import_file(OrderedHashmap *h, const char *path);
  int catalog_update(const char* database, const char* root, const char* const* dirs);
  int catalog_get(const char* database, sd_id128_t id, char **data);
  int catalog_list(FILE *f, const char* database, bool oneline);
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c

index 764b3c217e3227f8802692b321538b85ae4d52e7..6d6bb1cf63c32bd47117373ad24c602c564d73f5 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1539,7 +1539,8 @@ static int get_possible_units(
          "_SYSTEMD_USER_UNIT\0"       \
          "USER_UNIT\0"                \
          "COREDUMP_USER_UNIT\0"       \
-        "OBJECT_SYSTEMD_USER_UNIT\0"
+        "OBJECT_SYSTEMD_USER_UNIT\0" \
+        "_SYSTEMD_USER_SLICE\0"
  
  static int add_units(sd_journal *j) {
          _cleanup_strv_free_ char **patterns = NULL;
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c

index 192bb0cb07e0bac67847069f21870ebd0dd87659..ba14d922e26493e1f9506a1fc76fc7b80ef78298 100644 (file)
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -26,15 +26,15 @@ static const char *no_catalog_dirs[] = {
          NULL
  };
  
-static Hashmap* test_import(const char* contents, ssize_t size, int code) {
+static OrderedHashmap* test_import(const char* contents, ssize_t size, int code) {
          _cleanup_(unlink_tempfilep) char name[] = "/tmp/test-catalog.XXXXXX";
          _cleanup_close_ int fd;
-        Hashmap *h;
+        OrderedHashmap *h;
  
          if (size < 0)
                  size = strlen(contents);
  
-        assert_se(h = hashmap_new(&catalog_hash_ops));
+        assert_se(h = ordered_hashmap_new(&catalog_hash_ops));
  
          fd = mkostemp_safe(name);
          assert_se(fd >= 0);
@@ -46,14 +46,14 @@ static Hashmap* test_import(const char* contents, ssize_t size, int code) {
  }
  
  static void test_catalog_import_invalid(void) {
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
  
          h = test_import("xxx", -1, -EINVAL);
-        assert_se(hashmap_isempty(h));
+        assert_se(ordered_hashmap_isempty(h));
  }
  
  static void test_catalog_import_badid(void) {
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
          const char *input =
  "-- 0027229ca0644181a76c4e92458afaff dededededededededededededededede\n" \
  "Subject: message\n" \
@@ -63,7 +63,7 @@ static void test_catalog_import_badid(void) {
  }
  
  static void test_catalog_import_one(void) {
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
          char *payload;
          Iterator j;
  
@@ -78,9 +78,9 @@ static void test_catalog_import_one(void) {
  "payload\n";
  
          h = test_import(input, -1, 0);
-        assert_se(hashmap_size(h) == 1);
+        assert_se(ordered_hashmap_size(h) == 1);
  
-        HASHMAP_FOREACH(payload, h, j) {
+        ORDERED_HASHMAP_FOREACH(payload, h, j) {
                  printf("expect: %s\n", expect);
                  printf("actual: %s\n", payload);
                  assert_se(streq(expect, payload));
@@ -88,7 +88,7 @@ static void test_catalog_import_one(void) {
  }
  
  static void test_catalog_import_merge(void) {
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
          char *payload;
          Iterator j;
  
@@ -114,15 +114,15 @@ static void test_catalog_import_merge(void) {
  "override payload\n";
  
          h = test_import(input, -1, 0);
-        assert_se(hashmap_size(h) == 1);
+        assert_se(ordered_hashmap_size(h) == 1);
  
-        HASHMAP_FOREACH(payload, h, j) {
+        ORDERED_HASHMAP_FOREACH(payload, h, j) {
                  assert_se(streq(combined, payload));
          }
  }
  
  static void test_catalog_import_merge_no_body(void) {
-        _cleanup_hashmap_free_free_free_ Hashmap *h = NULL;
+        _cleanup_ordered_hashmap_free_free_free_ OrderedHashmap *h = NULL;
          char *payload;
          Iterator j;
  
@@ -147,9 +147,9 @@ static void test_catalog_import_merge_no_body(void) {
  "payload\n";
  
          h = test_import(input, -1, 0);
-        assert_se(hashmap_size(h) == 1);
+        assert_se(ordered_hashmap_size(h) == 1);
  
-        HASHMAP_FOREACH(payload, h, j) {
+        ORDERED_HASHMAP_FOREACH(payload, h, j) {
                  assert_se(streq(combined, payload));
          }
  }
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c

index 50500222ad9bd50ccc37c516d580106ef91b6c5e..5fedd3ed20464ad70e23261f85c7123c12346dc8 100644 (file)
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -42,13 +42,16 @@ int main(int argc, char *argv[]) {
                  assert_se(f && f->current_offset > 0);
  
                  r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
+                if (r < 0)
+                        log_error_errno(r, "journal_file_move_to_object failed: %m");
                  assert_se(r >= 0);
  
                  r = journal_file_copy_entry(f, new_journal, o, f->current_offset);
+                if (r < 0)
+                        log_error_errno(r, "journal_file_copy_entry failed: %m");
                  assert_se(r >= 0);
  
-                n++;
-                if (n > 10000)
+                if (++n >= 10000)
                          break;
          }
  
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install

index 2fb0f5207b3339e1ee13d62f52582c50a531b08d..47a0cd224ae8518ba56732305604eec3c521d462 100644 (file)
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -45,13 +45,13 @@ if ! [[ $PRETTY_NAME ]]; then
      PRETTY_NAME="Linux $KERNEL_VERSION"
  fi
  
-declare -a BOOT_OPTIONS
-
  if [[ -f /etc/kernel/cmdline ]]; then
      read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
-fi
+elif [[ -f /usr/lib/kernel/cmdline ]]; then
+    read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
+else
+    declare -a BOOT_OPTIONS
  
-if ! [[ ${BOOT_OPTIONS[*]} ]]; then
      read -r -d '' -a line < /proc/cmdline
      for i in "${line[@]}"; do
          [[ "${i#initrd=*}" != "$i" ]] && continue
@@ -59,12 +59,6 @@ if ! [[ ${BOOT_OPTIONS[*]} ]]; then
      done
  fi
  
-if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-    echo "Could not determine the kernel command line parameters." >&2
-    echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-    exit 1
-fi
-
  if [[ -f /etc/kernel/tries ]]; then
      read -r TRIES </etc/kernel/tries
      if ! [[ "$TRIES" =~ ^[0-9]+$ ]] ; then
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c

index f18ec88300bdea423238e09a3c19493db24ae05e..1f2e5c7e65eb5c5318c41c1c7ddb1079e747494a 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -254,7 +254,7 @@ int config_parse_match_strv(
          for (;;) {
                  _cleanup_free_ char *word = NULL, *k = NULL;
  
-                r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
+                r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE);
                  if (r == 0)
                          return 0;
                  if (r == -ENOMEM)
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c

index d7a5349c70126559e3286fa4b6934841b0aea9a5..7dab776b7295d2dc63faf0ed192fbd3e90980782 100644 (file)
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -29,6 +29,9 @@
  
  #define MAX_MAC_ADDR_LEN INFINIBAND_ALEN
  
+#define IRT_DEFAULT 1 * USEC_PER_DAY
+#define IRT_MINIMUM 600 * USEC_PER_SEC
+
  /* what to request from the server, addresses (IA_NA) and/or prefixes (IA_PD) */
  enum {
          DHCP6_REQUEST_IA_NA                     = 1,
@@ -71,6 +74,8 @@ struct sd_dhcp6_client {
          void *userdata;
          struct duid duid;
          size_t duid_len;
+        usec_t information_request_time_usec;
+        usec_t information_refresh_time_usec;
  };
  
  static const uint16_t default_req_opts[] = {
@@ -820,6 +825,7 @@ static int client_parse_message(
          uint32_t lt_t1 = ~0, lt_t2 = ~0;
          bool clientid = false;
          size_t pos = 0;
+        usec_t irt = IRT_DEFAULT;
          int r;
  
          assert(client);
@@ -994,6 +1000,10 @@ static int client_parse_message(
                                  return r;
  
                          break;
+
+                case SD_DHCP6_OPTION_INFORMATION_REFRESH_TIME:
+                        irt = be32toh(*(be32_t *) optval) * USEC_PER_SEC;
+                        break;
                  }
  
                  pos += offsetof(DHCP6Option, data) + optlen;
@@ -1025,6 +1035,8 @@ static int client_parse_message(
                  }
          }
  
+        client->information_refresh_time_usec = MAX(irt, IRT_MINIMUM);
+
          return 0;
  }
  
@@ -1425,8 +1437,15 @@ int sd_dhcp6_client_start(sd_dhcp6_client *client) {
                  client->fd = r;
          }
  
-        if (client->information_request)
+        if (client->information_request) {
+                usec_t t = now(CLOCK_MONOTONIC);
+
+                if (t < usec_add(client->information_request_time_usec, client->information_refresh_time_usec))
+                        return 0;
+
+                client->information_request_time_usec = t;
                  state = DHCP6_STATE_INFORMATION_REQUEST;
+        }
  
          log_dhcp6_client(client, "Started in %s mode",
                           client->information_request? "Information request":
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c

index 5e711713d9d5596f6421d9a550e35429b3996f29..9922203ac4be88002c91d7e2ca06eb344b925634 100644 (file)
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -365,7 +365,7 @@ _public_ int sd_ndisc_start(sd_ndisc *nd) {
  
          r = event_reset_time(nd->event, &nd->timeout_event_source,
                               clock_boottime_or_monotonic(),
-                             0, 0,
+                             time_now + USEC_PER_SEC / 2, 1 * USEC_PER_SEC, /* See RFC 8415 sec. 18.2.1 */
                               ndisc_timeout, nd,
                               nd->event_priority, "ndisc-timeout", true);
          if (r < 0)
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c

index 303dcea106ff2f3a63950d75f3b9d074ebcf1328..026ac8cb946946c4b6d4596899f31b4f8d0754f2 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -1354,8 +1354,7 @@ _public_ int sd_bus_open_user_with_description(sd_bus **ret, const char *descrip
          b->bus_client = true;
          b->is_user = true;
  
-        /* We don't do any per-method access control on the user
-         * bus. */
+        /* We don't do any per-method access control on the user bus. */
          b->trusted = true;
          b->is_local = true;
  
diff --git a/src/libsystemd/sd-bus/test-bus-vtable.c b/src/libsystemd/sd-bus/test-bus-vtable.c

index d69ca6ac9742179b450c4a755f3dfe203c15f15e..b6350027dd3ede31d867e049b627353d717ac385 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-vtable.c
+++ b/src/libsystemd/sd-bus/test-bus-vtable.c
@@ -19,9 +19,24 @@
  
  #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
  
+static struct context c = {};
+static int happy_finder_object = 0;
+
+static int happy_finder(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {
+        assert(userdata);
+        assert(userdata == &c);
+
+#ifndef __cplusplus
+        log_info("%s called", __func__);
+#endif
+
+        happy_finder_object++;
+        *found = &happy_finder_object;
+        return 1; /* found */
+}
+
  static void test_vtable(void) {
          sd_bus *bus = NULL;
-        struct context c = {};
          int r;
  
          assert(sd_bus_new(&bus) >= 0);
@@ -32,16 +47,23 @@ static void test_vtable(void) {
          assert(sd_bus_add_object_vtable(bus, NULL, "/foo", "org.freedesktop.systemd.testVtable221",
                                          (const sd_bus_vtable *)vtable_format_221, &c) >= 0);
  
+        assert(sd_bus_add_fallback_vtable(bus, NULL, "/fallback", "org.freedesktop.systemd.testVtable2", test_vtable_2, happy_finder, &c) >= 0);
+
          assert(sd_bus_set_address(bus, DEFAULT_BUS_PATH) >= 0);
          r = sd_bus_start(bus);
          assert(r == 0 ||     /* success */
                 r == -ENOENT  /* dbus is inactive */ );
  
  #ifndef __cplusplus
-        _cleanup_free_ char *s = NULL;
+        _cleanup_free_ char *s, *s2;
  
          assert_se(introspect_path(bus, "/foo", NULL, false, true, NULL, &s, NULL) == 1);
          fputs(s, stdout);
+
+        assert_se(introspect_path(bus, "/fallback", NULL, false, true, NULL, &s2, NULL) == 1);
+        fputs(s2, stdout);
+
+        assert_se(happy_finder_object == 1);
  #endif
  
          sd_bus_unref(bus);
diff --git a/src/libsystemd/sd-bus/test-vtable-data.h b/src/libsystemd/sd-bus/test-vtable-data.h

index 333dbd5b12f1ad8784fac71df1fed1a95046f405..bc89893814b050209ede42845b8b4164429c2ace 100644 (file)
--- a/src/libsystemd/sd-bus/test-vtable-data.h
+++ b/src/libsystemd/sd-bus/test-vtable-data.h
@@ -42,7 +42,7 @@ static const sd_bus_vtable test_vtable_1[] = {
  
  static const sd_bus_vtable test_vtable_2[] = {
          SD_BUS_VTABLE_START(0),
-        SD_BUS_METHOD("AlterSomething", "s", "s", handler, 0),
+        SD_BUS_METHOD("AlterSomething", "s", "s", handler, SD_BUS_VTABLE_UNPRIVILEGED),
          SD_BUS_METHOD("Exit", "", "", handler, 0),
          SD_BUS_METHOD_WITH_OFFSET("AlterSomething2", "s", "s", handler, 200, 0),
          SD_BUS_METHOD_WITH_OFFSET("Exit2", "", "", handler, 200, 0),
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c

index 224ea93a77447d544ccdf12750a10a5f0dad9263..954b93ada0cf8b314a6ebe021184cc1bd0892cfc 100644 (file)
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -395,7 +395,7 @@ static int inotify_handler(sd_event_source *s, const struct inotify_event *ev, v
          } else if (ev->mask & IN_CREATE) {
                  unsigned i;
  
-                log_info("inotify-handler <%s>: create on %s", description, ev->name);
+                log_debug("inotify-handler <%s>: create on %s", description, ev->name);
  
                  if (!streq(ev->name, "sub")) {
                          assert_se(safe_atou(ev->name, &i) >= 0);
@@ -483,7 +483,7 @@ static void test_inotify(unsigned n_create_events) {
  }
  
  int main(int argc, char *argv[]) {
-        test_setup_logging(LOG_DEBUG);
+        test_setup_logging(LOG_INFO);
  
          test_basic();
          test_sd_event_now();
diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c

index ccc497de09b78efcee69fbfbf3b9716d6099c35c..751bf53d64e9e49a3e1779c1087ad111726db598 100644 (file)
--- a/src/libsystemd/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/sd-netlink/rtnl-message.c
@@ -372,7 +372,7 @@ int sd_rtnl_message_new_neigh(sd_netlink *rtnl, sd_netlink_message **ret, uint16
          int r;
  
          assert_return(rtnl_message_type_is_neigh(nlmsg_type), -EINVAL);
-        assert_return(IN_SET(ndm_family, AF_INET, AF_INET6, PF_BRIDGE), -EINVAL);
+        assert_return(IN_SET(ndm_family, AF_UNSPEC, AF_INET, AF_INET6, PF_BRIDGE), -EINVAL);
          assert_return(ret, -EINVAL);
  
          r = message_new(rtnl, ret, nlmsg_type);
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c

index f3e267f00767e03f82befa5619ba1cdfb751f30e..02e9e9a26b9481f72c18300cf5b8ec12c4258b8c 100644 (file)
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -868,6 +868,13 @@ int sd_netlink_add_match(
                          if (r < 0)
                                  return r;
  
+                        break;
+                case RTM_NEWNEIGH:
+                case RTM_DELNEIGH:
+                        r = socket_broadcast_group_ref(rtnl, RTNLGRP_NEIGH);
+                        if (r < 0)
+                                return r;
+
                          break;
                  case RTM_NEWROUTE:
                  case RTM_DELROUTE:
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c

index a3c0542d7a03ec6889209b713ea7fdfe51a9df8b..8ff9382d901c63259cbe29e8217099826f02cf98 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -229,6 +229,10 @@ _public_ int sd_network_link_get_timezone(int ifindex, char **ret) {
          return network_link_get_string(ifindex, "TIMEZONE", ret);
  }
  
+_public_ int sd_network_link_get_dhcp4_address(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "DHCP4_ADDRESS", ret);
+}
+
  _public_ int sd_network_link_get_dns(int ifindex, char ***ret) {
          return network_link_get_strv(ifindex, "DNS", ret);
  }
diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c

index 8dfa97d7aed600644237efb7bb0eee1f99424e5a..3f4b65e1fdf16ab9333c1454d27b056e0a96cd92 100644 (file)
--- a/src/login/logind-brightness.c
+++ b/src/login/logind-brightness.c
@@ -213,7 +213,7 @@ int manager_write_brightness(
                  if (r < 0)
                          return log_error_errno(r, "Failed to add message to set: %m");
  
-                /* We overide any previously requested brightness here: we coalesce writes, and the newest
+                /* We override any previously requested brightness here: we coalesce writes, and the newest
                   * requested brightness is the one we'll put into effect. */
                  existing->brightness = brightness;
                  existing->again = true; /* request another iteration of the writer when the current one is
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c

index b36616e55a03bb8966ef5b63eeb1079543aa0262..30b9a66334fa7914e4f6984da46c49dd678e12aa 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -115,7 +115,6 @@ int manager_get_session_from_creds(
          Session *session;
  
          assert(m);
-        assert(message);
          assert(ret);
  
          if (SEAT_IS_SELF(name)) /* the caller's own session */
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c

index 1883c97e4db21cc46175b1ad76e9782afa76543d..67fe9921d4019385f844d9a4da092f53b3388511 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -72,13 +72,13 @@ Inhibitor* inhibitor_free(Inhibitor *i) {
          sd_event_source_unref(i->event_source);
          safe_close(i->fifo_fd);
  
+        hashmap_remove(i->manager->inhibitors, i->id);
+
          /* Note that we don't remove neither the state file nor the fifo path here, since we want both to
           * survive daemon restarts */
          free(i->state_file);
          free(i->fifo_path);
  
-        hashmap_remove(i->manager->inhibitors, i->id);
-
          return mfree(i);
  }
  
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c

index a37bbf56b75ad2b5d18ff0f229938eb1f45364f2..872b9a86d98074e655bb160e4a3e295e512c3570 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -610,8 +610,6 @@ int session_object_find(sd_bus *bus, const char *path, const char *interface, vo
                  return -ENOMEM;
  
          message = sd_bus_get_current_message(bus);
-        if (!message)
-                return 0;
  
          r = manager_get_session_from_creds(m, message, e, error, &session);
          if (r == -ENXIO) {
diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c

index cf281e75a6d456ff512c896be5cd4d507b85a6ab..d1d65a69bfa010136ac7756d452759931672336f 100644 (file)
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -981,6 +981,8 @@ static int macsec_read_key_file(NetDev *netdev, SecurityAssociation *sa) {
          if (!sa->key_file)
                  return 0;
  
+        (void) warn_file_is_world_accessible(sa->key_file, NULL, NULL, 0);
+
          r = read_full_file_full(sa->key_file, READ_FULL_FILE_SECURE | READ_FULL_FILE_UNHEX, (char **) &key, &key_len);
          if (r < 0)
                  return log_netdev_error_errno(netdev, r,
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c

index 7735b455b79d57e1462a22535aae51e2308bb865..7853e197f1355a2c42118dcba8f206d358001384 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -844,7 +844,7 @@ int netdev_load(Manager *manager) {
          STRV_FOREACH(f, files) {
                  r = netdev_load_one(manager, *f);
                  if (r < 0)
-                        return r;
+                        log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
          }
  
          return 0;
diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c

index 913ee2a0589772e1b0260a6009dceffb7741cf92..a40b32d148ef10446d70f7f996f01fd34e30e5e5 100644 (file)
--- a/src/network/netdev/wireguard.c
+++ b/src/network/netdev/wireguard.c
@@ -901,6 +901,8 @@ static int wireguard_read_key_file(const char *filename, uint8_t dest[static WG_
  
          assert(dest);
  
+        (void) warn_file_is_world_accessible(filename, NULL, NULL, 0);
+
          r = read_full_file_full(filename, READ_FULL_FILE_SECURE | READ_FULL_FILE_UNBASE64, &key, &key_len);
          if (r < 0)
                  return r;
diff --git a/src/network/networkctl.c b/src/network/networkctl.c

index 654955ba087f72020db3c6df9d1e85b8a86f5afa..a7cccbc690c0cebd925959e1d48ecf9bac25263a 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -678,6 +678,7 @@ static int dump_addresses(
                  int ifindex) {
  
          _cleanup_free_ struct local_address *local = NULL;
+        _cleanup_free_ char *dhcp4_address = NULL;
          int r, n, i;
  
          assert(rtnl);
@@ -687,6 +688,8 @@ static int dump_addresses(
          if (n < 0)
                  return n;
  
+        (void) sd_network_link_get_dhcp4_address(ifindex, &dhcp4_address);
+
          for (i = 0; i < n; i++) {
                  _cleanup_free_ char *pretty = NULL;
  
@@ -700,6 +703,15 @@ static int dump_addresses(
                  if (r < 0)
                          return r;
  
+                if (dhcp4_address && streq(pretty, dhcp4_address)) {
+                        _cleanup_free_ char *p = NULL;
+
+                        p = pretty;
+                        pretty = strjoin(pretty , " (DHCP4)");
+                        if (!pretty)
+                                return log_oom();
+                }
+
                  if (ifindex <= 0) {
                          char name[IF_NAMESIZE+1];
  
@@ -893,7 +905,7 @@ static int dump_lldp_neighbors(Table *table, const char *prefix, int ifindex) {
                                             "%s on port %s%s%s%s",
                                             strna(system_name), strna(port_id),
                                             isempty(port_description) ? "" : " (",
-                                           port_description,
+                                           strempty(port_description),
                                             isempty(port_description) ? "" : ")");
                  if (r < 0)
                          return r;
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c

index a207bb07901df5dc01be861690ac35efcbd8baaf..4fe55710391b10c741f40759dad9dd1fcbb9d907 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -260,6 +260,8 @@ static int address_add_internal(Link *link, Set **addresses,
          r = set_put(*addresses, address);
          if (r < 0)
                  return r;
+        if (r == 0)
+                return -EEXIST;
  
          address->link = link;
  
@@ -566,11 +568,6 @@ int address_configure(
          assert(link->manager->rtnl);
          assert(callback);
  
-        if (address->family == AF_INET6 && link_sysctl_ipv6_enabled(link) == 0) {
-                log_link_warning(link, "An IPv6 address is requested, but IPv6 is disabled by sysctl, ignoring.");
-                return 0;
-        }
-
          /* If this is a new address, then refuse adding more than the limit */
          if (address_get(link, address->family, &address->in_addr, address->prefixlen, NULL) <= 0 &&
              set_size(link->addresses) >= ADDRESSES_PER_LINK_MAX)
@@ -976,10 +973,7 @@ int config_parse_address_scope(const char *unit,
  bool address_is_ready(const Address *a) {
          assert(a);
  
-        if (a->family == AF_INET6)
-                return !(a->flags & IFA_F_TENTATIVE);
-        else
-                return !(a->flags & (IFA_F_TENTATIVE | IFA_F_DEPRECATED));
+        return !(a->flags & IFA_F_TENTATIVE);
  }
  
  int address_section_verify(Address *address) {
diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c

index d958d11d01e439ad9ea3009bb30eb4e746fe5df2..626b975839242b19ee877842acd592ccfc639369 100644 (file)
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -18,7 +18,7 @@ int config_parse_dhcp(
                  void *data,
                  void *userdata) {
  
-        AddressFamilyBoolean *dhcp = data, s;
+        AddressFamily *dhcp = data, s;
  
          assert(filename);
          assert(lvalue);
@@ -26,10 +26,10 @@ int config_parse_dhcp(
          assert(data);
  
          /* Note that this is mostly like
-         * config_parse_address_family_boolean(), except that it
+         * config_parse_address_family(), except that it
           * understands some old names for the enum values */
  
-        s = address_family_boolean_from_string(rvalue);
+        s = address_family_from_string(rvalue);
          if (s < 0) {
  
                  /* Previously, we had a slightly different enum here,
@@ -51,7 +51,7 @@ int config_parse_dhcp(
  
                  log_syntax(unit, LOG_WARNING, filename, line, 0,
                             "DHCP=%s is deprecated, please use DHCP=%s instead.",
-                           rvalue, address_family_boolean_to_string(s));
+                           rvalue, address_family_to_string(s));
          }
  
          *dhcp = s;
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c

index 164e46675ccb378825d913fe6f180c8334213cf7..c5644f844b805e585c7ab386286beb80a36e63fe 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -198,7 +198,7 @@ static int link_set_dhcp_routes(Link *link) {
          if (n == -ENODATA)
                  log_link_debug_errno(link, n, "DHCP: No routes received from DHCP server: %m");
          else if (n < 0)
-                log_link_debug_errno(link, n, "DHCP error: could not get routes: %m");
+                log_link_debug_errno(link, n, "DHCP: could not get routes: %m");
  
          for (i = 0; i < n; i++) {
                  switch (sd_dhcp_route_get_option(static_routes[i])) {
@@ -529,7 +529,7 @@ static int dhcp_lease_lost(Link *link) {
          assert(link);
          assert(link->dhcp_lease);
  
-        log_link_warning(link, "DHCP lease lost");
+        log_link_info(link, "DHCP lease lost");
  
          link->dhcp4_configured = false;
  
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c

index 8ad736a82b3c4539a2777192b1eb84a7323770e9..5e9535a1e7793df82241090d6ca8a15a7e478c50 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -548,8 +548,7 @@ int dhcp6_request_address(Link *link, int ir) {
          r = sd_dhcp6_client_is_running(link->dhcp6_client);
          if (r < 0)
                  return r;
-        else
-                running = r;
+        running = r;
  
          r = sd_dhcp6_client_get_prefix_delegation(link->dhcp6_client, &pd);
          if (r < 0)
diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c

index 7ffbd0a66e343fd9ab4fb8c3a77f5405876b5c62..1f688d6716f51511e42fe6d0cd625bfde661acf9 100644 (file)
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -123,11 +123,6 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
          assert(link->manager);
          assert(fdb_entry);
  
-        if (fdb_entry->family == AF_INET6 && link_sysctl_ipv6_enabled(link) == 0) {
-                log_link_warning(link, "An IPv6 fdb entry is requested, but IPv6 is disabled by sysctl, ignoring.");
-                return 0;
-        }
-
          /* create new RTM message */
          r = sd_rtnl_message_new_neigh(link->manager->rtnl, &req, RTM_NEWNEIGH, link->ifindex, PF_BRIDGE);
          if (r < 0)
diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c

index 71f6af6af2af6625dc4485a7c68c06a7596af7fd..6216a06d20c31088c9db32ba22e272ca675bccd5 100644 (file)
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -12,13 +12,11 @@
  
  static int ipv4ll_address_lost(Link *link) {
          _cleanup_(address_freep) Address *address = NULL;
-        _cleanup_(route_freep) Route *route = NULL;
          struct in_addr addr;
          int r;
  
          assert(link);
  
-        link->ipv4ll_route = false;
          link->ipv4ll_address = false;
  
          r = sd_ipv4ll_get_address(link->ipv4ll, &addr);
@@ -40,60 +38,11 @@ static int ipv4ll_address_lost(Link *link) {
          if (r < 0)
                  return r;
  
-        r = route_new(&route);
-        if (r < 0)
-                return log_link_error_errno(link, r, "Could not allocate route: %m");
-
-        route->family = AF_INET;
-        route->scope = RT_SCOPE_LINK;
-        route->priority = IPV4LL_ROUTE_METRIC;
-
-        r = route_remove(route, link, NULL);
-        if (r < 0)
-                return r;
-
          link_check_ready(link);
  
          return 0;
  }
  
-static int ipv4ll_route_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
-        int r;
-
-        assert(link);
-        assert(!link->ipv4ll_route);
-
-        r = sd_netlink_message_get_errno(m);
-        if (r < 0 && r != -EEXIST) {
-                log_link_error_errno(link, r, "could not set ipv4ll route: %m");
-                link_enter_failed(link);
-                return 1;
-        }
-
-        link->ipv4ll_route = true;
-
-        link_check_ready(link);
-
-        return 1;
-}
-
-static int ipv4ll_route_configure(Link *link) {
-        _cleanup_(route_freep) Route *route = NULL;
-        int r;
-
-        r = route_new(&route);
-        if (r < 0)
-                return r;
-
-        route->family = AF_INET;
-        route->scope = RT_SCOPE_LINK;
-        route->protocol = RTPROT_STATIC;
-        route->priority = IPV4LL_ROUTE_METRIC;
-        route->table = link_get_vrf_table(link);
-
-        return route_configure(route, link, ipv4ll_route_handler);
-}
-
  static int ipv4ll_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
          int r;
  
@@ -109,12 +58,7 @@ static int ipv4ll_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link
                  (void) manager_rtnl_process_address(rtnl, m, link->manager);
  
          link->ipv4ll_address = true;
-
-        r = ipv4ll_route_configure(link);
-        if (r < 0) {
-                log_link_error_errno(link, r, "Failed to configure ipv4ll route: %m");
-                link_enter_failed(link);
-        }
+        link_check_ready(link);
  
          return 1;
  }
@@ -128,7 +72,6 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) {
          assert(link);
  
          link->ipv4ll_address = false;
-        link->ipv4ll_route = false;
  
          r = sd_ipv4ll_get_address(ll, &address);
          if (r == -ENOENT)
@@ -251,7 +194,7 @@ int config_parse_ipv4ll(
                  void *data,
                  void *userdata) {
  
-        AddressFamilyBoolean *link_local = data;
+        AddressFamily *link_local = data;
          int r;
  
          assert(filename);
@@ -260,7 +203,7 @@ int config_parse_ipv4ll(
          assert(data);
  
          /* Note that this is mostly like
-         * config_parse_address_family_boolean(), except that it
+         * config_parse_address_family(), except that it
           * applies only to IPv4 */
  
          r = parse_boolean(rvalue);
@@ -276,7 +219,7 @@ int config_parse_ipv4ll(
  
          log_syntax(unit, LOG_WARNING, filename, line, 0,
                     "%s=%s is deprecated, please use LinkLocalAddressing=%s instead.",
-                   lvalue, rvalue, address_family_boolean_to_string(*link_local));
+                   lvalue, rvalue, address_family_to_string(*link_local));
  
          return 0;
  }
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c

index 5c0149492f0867e7805f3d43e52046ac6b704e4a..f1aeb7287e347d5920af628a1c49169b74336972 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -69,27 +69,6 @@ DUID* link_get_duid(Link *link) {
                  return &link->manager->duid;
  }
  
-int link_sysctl_ipv6_enabled(Link *link) {
-        _cleanup_free_ char *value = NULL;
-        int r;
-
-        assert(link);
-        assert(link->ifname);
-
-        if (link->sysctl_ipv6_enabled >= 0)
-                return link->sysctl_ipv6_enabled;
-
-        const char *ifname = link->ifname; /* work around bogus gcc warning */
-        r = sysctl_read_ip_property(AF_INET6, ifname, "disable_ipv6", &value);
-        if (r < 0)
-                return log_link_warning_errno(link, r,
-                                              "Failed to read net.ipv6.conf.%s.disable_ipv6 sysctl property: %m",
-                                              ifname);
-
-        link->sysctl_ipv6_enabled = value[0] == '0';
-        return link->sysctl_ipv6_enabled;
-}
-
  static bool link_dhcp6_enabled(Link *link) {
          assert(link);
  
@@ -108,9 +87,6 @@ static bool link_dhcp6_enabled(Link *link) {
          if (link->iftype == ARPHRD_CAN)
                  return false;
  
-        if (link_sysctl_ipv6_enabled(link) == 0)
-                return false;
-
          return link->network->dhcp & ADDRESS_FAMILY_IPV6;
  }
  
@@ -150,7 +126,7 @@ static bool link_dhcp4_server_enabled(Link *link) {
          return link->network->dhcp_server;
  }
  
-bool link_ipv4ll_enabled(Link *link, AddressFamilyBoolean mask) {
+bool link_ipv4ll_enabled(Link *link, AddressFamily mask) {
          assert(link);
          assert((mask & ~(ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_FALLBACK_IPV4)) == 0);
  
@@ -199,9 +175,6 @@ static bool link_ipv6ll_enabled(Link *link) {
          if (link->network->bond)
                  return false;
  
-        if (link_sysctl_ipv6_enabled(link) == 0)
-                return false;
-
          return link->network->link_local & ADDRESS_FAMILY_IPV6;
  }
  
@@ -214,14 +187,17 @@ static bool link_ipv6_enabled(Link *link) {
          if (link->network->bond)
                  return false;
  
-        if (link_sysctl_ipv6_enabled(link) == 0)
-                return false;
-
          if (link->iftype == ARPHRD_CAN)
                  return false;
  
          /* DHCPv6 client will not be started if no IPv6 link-local address is configured. */
-        return link_ipv6ll_enabled(link) || network_has_static_ipv6_addresses(link->network);
+        if (link_ipv6ll_enabled(link))
+                return true;
+
+        if (network_has_static_ipv6_configurations(link->network))
+                return true;
+
+        return false;
  }
  
  static bool link_radv_enabled(Link *link) {
@@ -242,7 +218,7 @@ static bool link_ipv4_forward_enabled(Link *link) {
          if (!link->network)
                  return false;
  
-        if (link->network->ip_forward == _ADDRESS_FAMILY_BOOLEAN_INVALID)
+        if (link->network->ip_forward == _ADDRESS_FAMILY_INVALID)
                  return false;
  
          return link->network->ip_forward & ADDRESS_FAMILY_IPV4;
@@ -260,10 +236,7 @@ static bool link_ipv6_forward_enabled(Link *link) {
          if (!link->network)
                  return false;
  
-        if (link->network->ip_forward == _ADDRESS_FAMILY_BOOLEAN_INVALID)
-                return false;
-
-        if (link_sysctl_ipv6_enabled(link) == 0)
+        if (link->network->ip_forward == _ADDRESS_FAMILY_INVALID)
                  return false;
  
          return link->network->ip_forward & ADDRESS_FAMILY_IPV6;
@@ -329,20 +302,21 @@ static IPv6PrivacyExtensions link_ipv6_privacy_extensions(Link *link) {
          return link->network->ipv6_privacy_extensions;
  }
  
-static int link_enable_ipv6(Link *link) {
-        bool disabled;
+static int link_update_ipv6_sysctl(Link *link) {
+        bool enabled;
          int r;
  
          if (link->flags & IFF_LOOPBACK)
                  return 0;
  
-        disabled = !link_ipv6_enabled(link);
+        enabled = link_ipv6_enabled(link);
+        if (enabled) {
+                r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", false);
+                if (r < 0)
+                        return log_link_warning_errno(link, r, "Cannot enable IPv6: %m");
  
-        r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
-        if (r < 0)
-                log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
-        else
-                log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
+                log_link_info(link, "IPv6 successfully enabled");
+        }
  
          return 0;
  }
@@ -614,7 +588,6 @@ static int link_new(Manager *manager, sd_netlink_message *message, Link **ret) {
                  .state = LINK_STATE_PENDING,
                  .ifindex = ifindex,
                  .iftype = iftype,
-                .sysctl_ipv6_enabled = -1,
  
                  .n_dns = (unsigned) -1,
                  .dns_default_route = -1,
@@ -699,6 +672,9 @@ static Link *link_free(Link *link) {
          link->routes = set_free_with_destructor(link->routes, route_free);
          link->routes_foreign = set_free_with_destructor(link->routes_foreign, route_free);
  
+        link->neighbors = set_free_with_destructor(link->neighbors, neighbor_free);
+        link->neighbors_foreign = set_free_with_destructor(link->neighbors_foreign, neighbor_free);
+
          link->addresses = set_free_with_destructor(link->addresses, address_free);
          link->addresses_foreign = set_free_with_destructor(link->addresses_foreign, address_free);
  
@@ -1044,7 +1020,7 @@ void link_check_ready(Link *link) {
  
          if (link_has_carrier(link) || !link->network->configure_without_carrier) {
  
-                if (link_ipv4ll_enabled(link, ADDRESS_FAMILY_IPV4) && !(link->ipv4ll_address && link->ipv4ll_route))
+                if (link_ipv4ll_enabled(link, ADDRESS_FAMILY_IPV4) && !link->ipv4ll_address)
                          return;
  
                  if (link_ipv6ll_enabled(link) &&
@@ -1054,7 +1030,7 @@ void link_check_ready(Link *link) {
                  if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) &&
                      !link->dhcp4_configured &&
                      !link->dhcp6_configured &&
-                    !(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address && link->ipv4ll_route))
+                    !(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address))
                          /* When DHCP is enabled, at least one protocol must provide an address, or
                           * an IPv4ll fallback address must be configured. */
                          return;
@@ -1278,10 +1254,6 @@ int link_set_mtu(Link *link, uint32_t mtu) {
          if (r < 0)
                  return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
  
-        /* If IPv6 not configured (no static IPv6 address and IPv6LL autoconfiguration is disabled)
-         * for this interface, then disable IPv6 else enable it. */
-        (void) link_enable_ipv6(link);
-
          /* IPv6 protocol requires a minimum MTU of IPV6_MTU_MIN(1280) bytes
           * on the interface. Bump up MTU bytes to IPV6_MTU_MIN. */
          if (link_ipv6_enabled(link) && mtu < IPV6_MIN_MTU) {
@@ -1945,6 +1917,8 @@ static int link_append_to_master(Link *link, NetDev *netdev) {
          r = set_put(master->slaves, link);
          if (r < 0)
                  return r;
+        if (r == 0)
+                return 0;
  
          link_ref(link);
          return 0;
@@ -2347,6 +2321,22 @@ static bool link_is_static_address_configured(Link *link, Address *address) {
          return false;
  }
  
+static bool link_is_neighbor_configured(Link *link, Neighbor *neighbor) {
+        Neighbor *net_neighbor;
+
+        assert(link);
+        assert(neighbor);
+
+        if (!link->network)
+                return false;
+
+        LIST_FOREACH(neighbors, net_neighbor, link->network->neighbors)
+                if (neighbor_equal(net_neighbor, neighbor))
+                        return true;
+
+        return false;
+}
+
  static bool link_is_static_route_configured(Link *link, Route *route) {
          Route *net_route;
  
@@ -2392,13 +2382,14 @@ static bool link_address_is_dynamic(Link *link, Address *address) {
  
  static int link_drop_foreign_config(Link *link) {
          Address *address;
+        Neighbor *neighbor;
          Route *route;
          Iterator i;
          int r;
  
          SET_FOREACH(address, link->addresses_foreign, i) {
                  /* we consider IPv6LL addresses to be managed by the kernel */
-                if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1)
+                if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link))
                          continue;
  
                  if (link_address_is_dynamic(link, address)) {
@@ -2418,6 +2409,18 @@ static int link_drop_foreign_config(Link *link) {
                  }
          }
  
+        SET_FOREACH(neighbor, link->neighbors_foreign, i) {
+                if (link_is_neighbor_configured(link, neighbor)) {
+                        r = neighbor_add(link, neighbor->family, &neighbor->in_addr, &neighbor->lladdr, neighbor->lladdr_size, NULL);
+                        if (r < 0)
+                                return r;
+                } else {
+                        r = neighbor_remove(neighbor, link, NULL);
+                        if (r < 0)
+                                return r;
+                }
+        }
+
          SET_FOREACH(route, link->routes_foreign, i) {
                  /* do not touch routes managed by the kernel */
                  if (route->protocol == RTPROT_KERNEL)
@@ -2456,13 +2459,14 @@ static int link_drop_foreign_config(Link *link) {
  
  static int link_drop_config(Link *link) {
          Address *address, *pool_address;
+        Neighbor *neighbor;
          Route *route;
          Iterator i;
          int r;
  
          SET_FOREACH(address, link->addresses, i) {
                  /* we consider IPv6LL addresses to be managed by the kernel */
-                if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1)
+                if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) == 1 && link_ipv6ll_enabled(link))
                          continue;
  
                  r = address_remove(address, link, NULL);
@@ -2479,6 +2483,12 @@ static int link_drop_config(Link *link) {
                  }
          }
  
+        SET_FOREACH(neighbor, link->neighbors, i) {
+                r = neighbor_remove(neighbor, link, NULL);
+                if (r < 0)
+                        return r;
+        }
+
          SET_FOREACH(route, link->routes, i) {
                  /* do not touch routes managed by the kernel */
                  if (route->protocol == RTPROT_KERNEL)
@@ -2513,6 +2523,10 @@ static int link_configure(Link *link) {
                          return r;
          }
  
+        /* If IPv6 configured that is static IPv6 address and IPv6LL autoconfiguration is enabled
+         * for this interface, then enable IPv6 */
+        (void) link_update_ipv6_sysctl(link);
+
          r = link_set_proxy_arp(link);
          if (r < 0)
                 return r;
@@ -2686,6 +2700,8 @@ int get_product_uuid_handler(sd_bus_message *m, void *userdata, sd_bus_error *re
  
  configure:
          while ((link = set_steal_first(manager->links_requesting_uuid))) {
+                link_unref(link);
+
                  r = link_configure(link);
                  if (r < 0)
                          link_enter_failed(link);
@@ -2758,6 +2774,8 @@ static int link_configure_duid(Link *link) {
                  r = set_put(m->duids_requesting_uuid, duid);
                  if (r < 0)
                          return log_oom();
+
+                link_ref(link);
          }
  
          return 0;
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h

index cd88388015b2220d9d82938ec8c28a9ffd48a81d..d364692c864d1100ad04ab8307f223934cfbb60b 100644 (file)
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -75,6 +75,8 @@ typedef struct Link {
  
          Set *addresses;
          Set *addresses_foreign;
+        Set *neighbors;
+        Set *neighbors_foreign;
          Set *routes;
          Set *routes_foreign;
  
@@ -95,7 +97,6 @@ typedef struct Link {
  
          sd_ipv4ll *ipv4ll;
          bool ipv4ll_address:1;
-        bool ipv4ll_route:1;
  
          bool neighbors_configured;
  
@@ -131,7 +132,6 @@ typedef struct Link {
          struct rtnl_link_stats64 stats_old, stats_new;
          bool stats_updated;
  
-        int sysctl_ipv6_enabled;
  
          /* All kinds of DNS configuration */
          struct in_addr_data *dns;
@@ -186,7 +186,7 @@ int link_ipv6ll_gained(Link *link, const struct in6_addr *address);
  
  int link_set_mtu(Link *link, uint32_t mtu);
  
-bool link_ipv4ll_enabled(Link *link, AddressFamilyBoolean mask);
+bool link_ipv4ll_enabled(Link *link, AddressFamily mask);
  
  int link_stop_clients(Link *link, bool may_keep_dhcp);
  
@@ -198,8 +198,6 @@ uint32_t link_get_dhcp_route_table(Link *link);
  uint32_t link_get_ipv6_accept_ra_route_table(Link *link);
  int link_request_set_routes(Link *link);
  
-int link_sysctl_ipv6_enabled(Link *link);
-
  #define ADDRESS_FMT_VAL(address)                   \
          be32toh((address).s_addr) >> 24,           \
          (be32toh((address).s_addr) >> 16) & 0xFFu, \
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c

index 74266ff12ae002f68f98999b0466f19033ee4d3a..a164d6163e7d4cc42e83cbb11baf77b07a38c072 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -488,6 +488,184 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, vo
          return 1;
  }
  
+static int manager_rtnl_process_neighbor_lladdr(sd_netlink_message *message, union lladdr_union *lladdr, size_t *size, char **str) {
+        int r;
+
+        assert(message);
+        assert(lladdr);
+        assert(size);
+        assert(str);
+
+        *str = NULL;
+
+        r = sd_netlink_message_read(message, NDA_LLADDR, sizeof(lladdr->ip.in6), &lladdr->ip.in6);
+        if (r >= 0) {
+                *size = sizeof(lladdr->ip.in6);
+                if (in_addr_to_string(AF_INET6, &lladdr->ip, str) < 0)
+                        log_warning_errno(r, "Could not print lower address: %m");
+                return r;
+        }
+
+        r = sd_netlink_message_read(message, NDA_LLADDR, sizeof(lladdr->mac), &lladdr->mac);
+        if (r >= 0) {
+                *size = sizeof(lladdr->mac);
+                *str = new(char, ETHER_ADDR_TO_STRING_MAX);
+                if (!*str) {
+                        log_oom();
+                        return r;
+                }
+                ether_addr_to_string(&lladdr->mac, *str);
+                return r;
+        }
+
+        r = sd_netlink_message_read(message, NDA_LLADDR, sizeof(lladdr->ip.in), &lladdr->ip.in);
+        if (r >= 0) {
+                *size = sizeof(lladdr->ip.in);
+                if (in_addr_to_string(AF_INET, &lladdr->ip, str) < 0)
+                        log_warning_errno(r, "Could not print lower address: %m");
+                return r;
+        }
+
+        return r;
+}
+
+int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message, void *userdata) {
+        Manager *m = userdata;
+        Link *link = NULL;
+        Neighbor *neighbor = NULL;
+        int ifindex, family, r;
+        uint16_t type, state;
+        union in_addr_union in_addr = IN_ADDR_NULL;
+        _cleanup_free_ char *addr_str = NULL;
+        union lladdr_union lladdr;
+        size_t lladdr_size = 0;
+        _cleanup_free_ char *lladdr_str = NULL;
+
+        assert(rtnl);
+        assert(message);
+        assert(m);
+
+        if (sd_netlink_message_is_error(message)) {
+                r = sd_netlink_message_get_errno(message);
+                if (r < 0)
+                        log_warning_errno(r, "rtnl: failed to receive neighbor message, ignoring: %m");
+
+                return 0;
+        }
+
+        r = sd_netlink_message_get_type(message, &type);
+        if (r < 0) {
+                log_warning_errno(r, "rtnl: could not get message type, ignoring: %m");
+                return 0;
+        } else if (!IN_SET(type, RTM_NEWNEIGH, RTM_DELNEIGH)) {
+                log_warning("rtnl: received unexpected message type %u when processing neighbor, ignoring.", type);
+                return 0;
+        }
+
+        r = sd_rtnl_message_neigh_get_state(message, &state);
+        if (r < 0) {
+                log_link_warning_errno(link, r, "rtnl: received neighbor message with invalid state, ignoring: %m");
+                return 0;
+        } else if (!FLAGS_SET(state, NUD_PERMANENT)) {
+                log_debug("rtnl: received non-static neighbor, ignoring.");
+                return 0;
+        }
+
+        r = sd_rtnl_message_neigh_get_ifindex(message, &ifindex);
+        if (r < 0) {
+                log_warning_errno(r, "rtnl: could not get ifindex from message, ignoring: %m");
+                return 0;
+        } else if (ifindex <= 0) {
+                log_warning("rtnl: received neighbor message with invalid ifindex %d, ignoring.", ifindex);
+                return 0;
+        }
+
+        r = link_get(m, ifindex, &link);
+        if (r < 0 || !link) {
+                /* when enumerating we might be out of sync, but we will get the neighbor again, so just
+                 * ignore it */
+                if (!m->enumerating)
+                        log_warning("rtnl: received neighbor for link '%d' we don't know about, ignoring.", ifindex);
+                return 0;
+        }
+
+        r = sd_rtnl_message_neigh_get_family(message, &family);
+        if (r < 0 || !IN_SET(family, AF_INET, AF_INET6)) {
+                log_link_warning(link, "rtnl: received neighbor message with invalid family, ignoring.");
+                return 0;
+        }
+
+        switch (family) {
+        case AF_INET:
+                r = sd_netlink_message_read_in_addr(message, NDA_DST, &in_addr.in);
+                if (r < 0) {
+                        log_link_warning_errno(link, r, "rtnl: received neighbor message without valid address, ignoring: %m");
+                        return 0;
+                }
+
+                break;
+
+        case AF_INET6:
+                r = sd_netlink_message_read_in6_addr(message, NDA_DST, &in_addr.in6);
+                if (r < 0) {
+                        log_link_warning_errno(link, r, "rtnl: received neighbor message without valid address, ignoring: %m");
+                        return 0;
+                }
+
+                break;
+
+        default:
+                assert_not_reached("Received unsupported address family");
+        }
+
+        if (in_addr_to_string(family, &in_addr, &addr_str) < 0)
+                log_link_warning_errno(link, r, "Could not print address: %m");
+
+        r = manager_rtnl_process_neighbor_lladdr(message, &lladdr, &lladdr_size, &lladdr_str);
+        if (r < 0) {
+                log_link_warning_errno(link, r, "rtnl: received neighbor message with invalid lladdr, ignoring: %m");
+                return 0;
+        }
+
+        (void) neighbor_get(link, family, &in_addr, &lladdr, lladdr_size, &neighbor);
+
+        switch (type) {
+        case RTM_NEWNEIGH:
+                if (neighbor)
+                        log_link_debug(link, "Remembering neighbor: %s->%s",
+                                       strnull(addr_str), strnull(lladdr_str));
+                else {
+                        /* A neighbor appeared that we did not request */
+                        r = neighbor_add_foreign(link, family, &in_addr, &lladdr, lladdr_size, &neighbor);
+                        if (r < 0) {
+                                log_link_warning_errno(link, r, "Failed to remember foreign neighbor %s->%s, ignoring: %m",
+                                                       strnull(addr_str), strnull(lladdr_str));
+                                return 0;
+                        } else
+                                log_link_debug(link, "Remembering foreign neighbor: %s->%s",
+                                               strnull(addr_str), strnull(lladdr_str));
+                }
+
+                break;
+
+        case RTM_DELNEIGH:
+                if (neighbor) {
+                        log_link_debug(link, "Forgetting neighbor: %s->%s",
+                                       strnull(addr_str), strnull(lladdr_str));
+                        (void) neighbor_free(neighbor);
+                } else
+                        log_link_info(link, "Kernel removed a neighbor we don't remember: %s->%s, ignoring.",
+                                      strnull(addr_str), strnull(lladdr_str));
+
+                break;
+
+        default:
+                assert_not_reached("Received invalid RTNL message type");
+        }
+
+        return 1;
+}
+
  int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message, void *userdata) {
          _cleanup_free_ char *buf = NULL;
          Manager *m = userdata;
@@ -736,6 +914,7 @@ static int manager_rtnl_process_link(sd_netlink *rtnl, sd_netlink_message *messa
  
  int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, void *userdata) {
          _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *tmp = NULL;
+        _cleanup_free_ char *from = NULL, *to = NULL;
          RoutingPolicyRule *rule = NULL;
          const char *iif = NULL, *oif = NULL;
          Manager *m = userdata;
@@ -916,9 +1095,16 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi
  
          (void) routing_policy_rule_get(m, tmp, &rule);
  
+        if (DEBUG_LOGGING) {
+                (void) in_addr_to_string(tmp->family, &tmp->from, &from);
+                (void) in_addr_to_string(tmp->family, &tmp->to, &to);
+        }
+
          switch (type) {
          case RTM_NEWRULE:
                  if (!rule) {
+                        log_debug("Remembering foreign routing policy rule: %s/%u -> %s/%u, iif: %s, oif: %s, table: %u",
+                                  from, tmp->from_prefixlen, to, tmp->to_prefixlen, strna(tmp->iif), strna(tmp->oif), tmp->table);
                          r = routing_policy_rule_add_foreign(m, tmp, &rule);
                          if (r < 0) {
                                  log_warning_errno(r, "Could not remember foreign rule, ignoring: %m");
@@ -927,6 +1113,8 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, voi
                  }
                  break;
          case RTM_DELRULE:
+                log_debug("Forgetting routing policy rule: %s/%u -> %s/%u, iif: %s, oif: %s, table: %u",
+                          from, tmp->from_prefixlen, to, tmp->to_prefixlen, strna(tmp->iif), strna(tmp->oif), tmp->table);
                  routing_policy_rule_free(rule);
  
                  break;
@@ -1014,6 +1202,14 @@ static int manager_connect_rtnl(Manager *m) {
          if (r < 0)
                  return r;
  
+        r = sd_netlink_add_match(m->rtnl, NULL, RTM_NEWNEIGH, &manager_rtnl_process_neighbor, NULL, m, "network-rtnl_process_neighbor");
+        if (r < 0)
+                return r;
+
+        r = sd_netlink_add_match(m->rtnl, NULL, RTM_DELNEIGH, &manager_rtnl_process_neighbor, NULL, m, "network-rtnl_process_neighbor");
+        if (r < 0)
+                return r;
+
          r = sd_netlink_add_match(m->rtnl, NULL, RTM_NEWROUTE, &manager_rtnl_process_route, NULL, m, "network-rtnl_process_route");
          if (r < 0)
                  return r;
@@ -1555,6 +1751,41 @@ int manager_rtnl_enumerate_addresses(Manager *m) {
          return r;
  }
  
+int manager_rtnl_enumerate_neighbors(Manager *m) {
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
+        sd_netlink_message *neigh;
+        int r;
+
+        assert(m);
+        assert(m->rtnl);
+
+        r = sd_rtnl_message_new_neigh(m->rtnl, &req, RTM_GETNEIGH, 0, AF_UNSPEC);
+        if (r < 0)
+                return r;
+
+        r = sd_netlink_message_request_dump(req, true);
+        if (r < 0)
+                return r;
+
+        r = sd_netlink_call(m->rtnl, req, 0, &reply);
+        if (r < 0)
+                return r;
+
+        for (neigh = reply; neigh; neigh = sd_netlink_message_next(neigh)) {
+                int k;
+
+                m->enumerating = true;
+
+                k = manager_rtnl_process_neighbor(m->rtnl, neigh, m);
+                if (k < 0)
+                        r = k;
+
+                m->enumerating = false;
+        }
+
+        return r;
+}
+
  int manager_rtnl_enumerate_routes(Manager *m) {
          _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
          sd_netlink_message *route;
@@ -1818,6 +2049,8 @@ int manager_request_product_uuid(Manager *m, Link *link) {
                  r = set_put(m->duids_requesting_uuid, duid);
                  if (r < 0)
                          return log_oom();
+
+                link_ref(link);
          }
  
          if (!m->bus || sd_bus_is_ready(m->bus) <= 0) {
diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h

index 5422b56dc265892c095c782941a6891b7e2f9248..f5166dad126cc342dc2dd206e0f1e2bd2b78b0d4 100644 (file)
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.h
@@ -77,10 +77,12 @@ bool manager_should_reload(Manager *m);
  
  int manager_rtnl_enumerate_links(Manager *m);
  int manager_rtnl_enumerate_addresses(Manager *m);
+int manager_rtnl_enumerate_neighbors(Manager *m);
  int manager_rtnl_enumerate_routes(Manager *m);
  int manager_rtnl_enumerate_rules(Manager *m);
  
  int manager_rtnl_process_address(sd_netlink *nl, sd_netlink_message *message, void *userdata);
+int manager_rtnl_process_neighbor(sd_netlink *nl, sd_netlink_message *message, void *userdata);
  int manager_rtnl_process_route(sd_netlink *nl, sd_netlink_message *message, void *userdata);
  int manager_rtnl_process_rule(sd_netlink *nl, sd_netlink_message *message, void *userdata);
  
diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c

index 191f6e33206d779b7950bdb5b4a0722ca5301ce0..537f6be9e16c7b9cd4bea5083e5b4b3830a5bb1a 100644 (file)
--- a/src/network/networkd-neighbor.c
+++ b/src/network/networkd-neighbor.c
@@ -11,6 +11,7 @@
  #include "networkd-link.h"
  #include "networkd-manager.h"
  #include "networkd-neighbor.h"
+#include "set.h"
  
  void neighbor_free(Neighbor *neighbor) {
          if (!neighbor)
@@ -21,10 +22,15 @@ void neighbor_free(Neighbor *neighbor) {
                  assert(neighbor->network->n_neighbors > 0);
                  neighbor->network->n_neighbors--;
  
-                if (neighbor->section) {
+                if (neighbor->section)
                          hashmap_remove(neighbor->network->neighbors_by_section, neighbor->section);
-                        network_config_section_free(neighbor->section);
-                }
+        }
+
+        network_config_section_free(neighbor->section);
+
+        if (neighbor->link) {
+                set_remove(neighbor->link->neighbors, neighbor);
+                set_remove(neighbor->link->neighbors_foreign, neighbor);
          }
  
          free(neighbor);
@@ -81,9 +87,10 @@ static int neighbor_new_static(Network *network, const char *filename, unsigned
          return 0;
  }
  
-static int neighbor_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
+static int neighbor_configure_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
          int r;
  
+        assert(m);
          assert(link);
          assert(link->neighbor_messages > 0);
  
@@ -137,7 +144,7 @@ int neighbor_configure(Neighbor *neighbor, Link *link, link_netlink_message_hand
          if (r < 0)
                  return log_error_errno(r, "Could not append NDA_DST attribute: %m");
  
-        r = netlink_call_async(link->manager->rtnl, NULL, req, callback ?: neighbor_handler,
+        r = netlink_call_async(link->manager->rtnl, NULL, req, callback ?: neighbor_configure_handler,
                                 link_netlink_destroy_callback, link);
          if (r < 0)
                  return log_error_errno(r, "Could not send rtnetlink message: %m");
@@ -145,9 +152,217 @@ int neighbor_configure(Neighbor *neighbor, Link *link, link_netlink_message_hand
          link->neighbor_messages++;
          link_ref(link);
  
+        r = neighbor_add(link, neighbor->family, &neighbor->in_addr, &neighbor->lladdr, neighbor->lladdr_size, NULL);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not add neighbor: %m");
+
          return 0;
  }
  
+static int neighbor_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
+        int r;
+
+        assert(m);
+        assert(link);
+
+        if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
+                return 1;
+
+        r = sd_netlink_message_get_errno(m);
+        if (r < 0 && r != -ESRCH)
+                /* Neighbor may not exist because it already got deleted, ignore that. */
+                log_link_warning_errno(link, r, "Could not remove neighbor: %m");
+
+        return 1;
+}
+
+int neighbor_remove(Neighbor *neighbor, Link *link, link_netlink_message_handler_t callback) {
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
+        int r;
+
+        assert(neighbor);
+        assert(link);
+        assert(link->ifindex > 0);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        r = sd_rtnl_message_new_neigh(link->manager->rtnl, &req, RTM_DELNEIGH,
+                                          link->ifindex, neighbor->family);
+        if (r < 0)
+                return log_error_errno(r, "Could not allocate RTM_DELNEIGH message: %m");
+
+        r = netlink_message_append_in_addr_union(req, NDA_DST, neighbor->family, &neighbor->in_addr);
+        if (r < 0)
+                return log_error_errno(r, "Could not append NDA_DST attribute: %m");
+
+        r = netlink_call_async(link->manager->rtnl, NULL, req, callback ?: neighbor_remove_handler,
+                               link_netlink_destroy_callback, link);
+        if (r < 0)
+                return log_error_errno(r, "Could not send rtnetlink message: %m");
+
+        link_ref(link);
+
+        return 0;
+}
+
+static void neighbor_hash_func(const Neighbor *neighbor, struct siphash *state) {
+        assert(neighbor);
+
+        siphash24_compress(&neighbor->family, sizeof(neighbor->family), state);
+
+        switch (neighbor->family) {
+        case AF_INET:
+        case AF_INET6:
+                /* Equality of neighbors are given by the pair (addr,lladdr) */
+                siphash24_compress(&neighbor->in_addr, FAMILY_ADDRESS_SIZE(neighbor->family), state);
+                siphash24_compress(&neighbor->lladdr, neighbor->lladdr_size, state);
+                break;
+        default:
+                /* treat any other address family as AF_UNSPEC */
+                break;
+        }
+}
+
+static int neighbor_compare_func(const Neighbor *a, const Neighbor *b) {
+        int r;
+
+        r = CMP(a->family, b->family);
+        if (r != 0)
+                return r;
+
+        r = CMP(a->lladdr_size, b->lladdr_size);
+        if (r != 0)
+                return r;
+
+        switch (a->family) {
+        case AF_INET:
+        case AF_INET6:
+                r = memcmp(&a->in_addr, &b->in_addr, FAMILY_ADDRESS_SIZE(a->family));
+                if (r != 0)
+                        return r;
+        }
+
+        return memcmp(&a->lladdr, &b->lladdr, a->lladdr_size);
+}
+
+DEFINE_PRIVATE_HASH_OPS(neighbor_hash_ops, Neighbor, neighbor_hash_func, neighbor_compare_func);
+
+int neighbor_get(Link *link, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret) {
+        Neighbor neighbor, *existing;
+
+        assert(link);
+        assert(addr);
+        assert(lladdr);
+
+        neighbor = (Neighbor) {
+                .family = family,
+                .in_addr = *addr,
+                .lladdr = *lladdr,
+                .lladdr_size = lladdr_size,
+        };
+
+        existing = set_get(link->neighbors, &neighbor);
+        if (existing) {
+                if (ret)
+                        *ret = existing;
+                return 1;
+        }
+
+        existing = set_get(link->neighbors_foreign, &neighbor);
+        if (existing) {
+                if (ret)
+                        *ret = existing;
+                return 0;
+        }
+
+        return -ENOENT;
+}
+
+static int neighbor_add_internal(Link *link, Set **neighbors, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret) {
+        _cleanup_(neighbor_freep) Neighbor *neighbor = NULL;
+        int r;
+
+        assert(link);
+        assert(neighbors);
+        assert(addr);
+        assert(lladdr);
+
+        neighbor = new(Neighbor, 1);
+        if (!neighbor)
+                return -ENOMEM;
+
+        *neighbor = (Neighbor) {
+                .family = family,
+                .in_addr = *addr,
+                .lladdr = *lladdr,
+                .lladdr_size = lladdr_size,
+        };
+
+        r = set_ensure_allocated(neighbors, &neighbor_hash_ops);
+        if (r < 0)
+                return r;
+
+        r = set_put(*neighbors, neighbor);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return -EEXIST;
+
+        neighbor->link = link;
+
+        if (ret)
+                *ret = neighbor;
+
+        neighbor = NULL;
+
+        return 0;
+}
+
+int neighbor_add(Link *link, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret) {
+        Neighbor *neighbor;
+        int r;
+
+        r = neighbor_get(link, family, addr, lladdr, lladdr_size, &neighbor);
+        if (r == -ENOENT) {
+                /* Neighbor doesn't exist, make a new one */
+                r = neighbor_add_internal(link, &link->neighbors, family, addr, lladdr, lladdr_size, &neighbor);
+                if (r < 0)
+                        return r;
+        } else if (r == 0) {
+                /* Neighbor is foreign, claim it as recognized */
+                r = set_ensure_allocated(&link->neighbors, &neighbor_hash_ops);
+                if (r < 0)
+                        return r;
+
+                r = set_put(link->neighbors, neighbor);
+                if (r < 0)
+                        return r;
+
+                set_remove(link->neighbors_foreign, neighbor);
+        } else if (r == 1) {
+                /* Neighbor already exists */
+        } else
+                return r;
+
+        if (ret)
+                *ret = neighbor;
+        return 0;
+}
+
+int neighbor_add_foreign(Link *link, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret) {
+        return neighbor_add_internal(link, &link->neighbors_foreign, family, addr, lladdr, lladdr_size, ret);
+}
+
+bool neighbor_equal(const Neighbor *n1, const Neighbor *n2) {
+        if (n1 == n2)
+                return true;
+
+        if (!n1 || !n2)
+                return false;
+
+        return neighbor_compare_func(n1, n2) == 0;
+}
+
  int neighbor_section_verify(Neighbor *neighbor) {
          if (section_is_invalid(neighbor->section))
                  return -EINVAL;
diff --git a/src/network/networkd-neighbor.h b/src/network/networkd-neighbor.h

index 09ccb55274ea3a592210e2c4c3baf267c7fa0249..97ee1f6d73ea4931815dc7e7d431fdbbb6ddf475 100644 (file)
--- a/src/network/networkd-neighbor.h
+++ b/src/network/networkd-neighbor.h
@@ -15,6 +15,11 @@ typedef struct Neighbor Neighbor;
  #include "networkd-network.h"
  #include "networkd-util.h"
  
+union lladdr_union {
+        struct ether_addr mac;
+        union in_addr_union ip;
+};
+
  struct Neighbor {
          Network *network;
          Link *link;
@@ -22,10 +27,7 @@ struct Neighbor {
  
          int family;
          union in_addr_union in_addr;
-        union {
-                struct ether_addr mac;
-                union in_addr_union ip;
-        } lladdr;
+        union lladdr_union lladdr;
          size_t lladdr_size;
  
          LIST_FIELDS(Neighbor, neighbors);
@@ -36,6 +38,12 @@ void neighbor_free(Neighbor *neighbor);
  DEFINE_NETWORK_SECTION_FUNCTIONS(Neighbor, neighbor_free);
  
  int neighbor_configure(Neighbor *neighbor, Link *link, link_netlink_message_handler_t callback);
+int neighbor_remove(Neighbor *neighbor, Link *link, link_netlink_message_handler_t callback);
+
+int neighbor_get(Link *link, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret);
+int neighbor_add(Link *link, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret);
+int neighbor_add_foreign(Link *link, int family, const union in_addr_union *addr, const union lladdr_union *lladdr, size_t lladdr_size, Neighbor **ret);
+bool neighbor_equal(const Neighbor *n1, const Neighbor *n2);
  
  int neighbor_section_verify(Neighbor *neighbor);
  
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf

index e55228af38d50ee5ff774e40a2a54964d7643183..d4d108ad25dbeaecc0855ef9d3d00f5271c5d9f0 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -59,7 +59,7 @@ Network.Xfrm,                           config_parse_stacked_netdev,
  Network.VRF,                            config_parse_ifname,                             0,                             offsetof(Network, vrf_name)
  Network.DHCP,                           config_parse_dhcp,                               0,                             offsetof(Network, dhcp)
  Network.DHCPServer,                     config_parse_bool,                               0,                             offsetof(Network, dhcp_server)
-Network.LinkLocalAddressing,            config_parse_link_local_address_family_boolean,  0,                             offsetof(Network, link_local)
+Network.LinkLocalAddressing,            config_parse_link_local_address_family,          0,                             offsetof(Network, link_local)
  Network.IPv4LLRoute,                    config_parse_bool,                               0,                             offsetof(Network, ipv4ll_route)
  Network.DefaultRouteOnDevice,           config_parse_bool,                               0,                             offsetof(Network, default_route_on_device)
  Network.IPv6Token,                      config_parse_ipv6token,                          0,                             offsetof(Network, ipv6_token)
@@ -76,7 +76,7 @@ Network.DNSOverTLS,                     config_parse_dns_over_tls_mode,
  Network.DNSSEC,                         config_parse_dnssec_mode,                        0,                             offsetof(Network, dnssec_mode)
  Network.DNSSECNegativeTrustAnchors,     config_parse_dnssec_negative_trust_anchors,      0,                             0
  Network.NTP,                            config_parse_ntp,                                0,                             offsetof(Network, ntp)
-Network.IPForward,                      config_parse_address_family_boolean_with_kernel, 0,                             offsetof(Network, ip_forward)
+Network.IPForward,                      config_parse_address_family_with_kernel,         0,                             offsetof(Network, ip_forward)
  Network.IPMasquerade,                   config_parse_bool,                               0,                             offsetof(Network, ip_masquerade)
  Network.IPv6PrivacyExtensions,          config_parse_ipv6_privacy_extensions,            0,                             offsetof(Network, ipv6_privacy_extensions)
  Network.IPv6AcceptRA,                   config_parse_tristate,                           0,                             offsetof(Network, ipv6_accept_ra)
@@ -122,6 +122,7 @@ RoutingPolicyRule.IPProtocol,           config_parse_routing_policy_rule_ip_prot
  RoutingPolicyRule.SourcePort,           config_parse_routing_policy_rule_port_range,     0,                             0
  RoutingPolicyRule.DestinationPort,      config_parse_routing_policy_rule_port_range,     0,                             0
  RoutingPolicyRule.InvertRule,           config_parse_routing_policy_rule_invert,         0,                             0
+RoutingPolicyRule.Family,               config_parse_routing_policy_rule_family,         0,                             0
  Route.Gateway,                          config_parse_gateway,                            0,                             0
  Route.Destination,                      config_parse_destination,                        0,                             0
  Route.Source,                           config_parse_destination,                        0,                             0
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c

index 9d3c383378e6d59494c6770cedc3a3e6c8b3fe58..70dbd31f50cbde9d663731801356dad7d8b2b63c 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -220,6 +220,26 @@ int network_verify(Network *network) {
          if (network->link_local < 0)
                  network->link_local = network->bridge ? ADDRESS_FAMILY_NO : ADDRESS_FAMILY_IPV6;
  
+        if (!FLAGS_SET(network->link_local, ADDRESS_FAMILY_IPV6)) {
+                if (network->ipv6_accept_ra > 0) {
+                        log_warning("%s: IPv6AcceptRA= is enabled by the .network file but IPv6 link local addressing is disabled. "
+                                    "Disabling IPv6AcceptRA=.", network->filename);
+                        network->ipv6_accept_ra = false;
+                }
+
+                if (FLAGS_SET(network->dhcp, ADDRESS_FAMILY_IPV6)) {
+                        log_warning("%s: DHCPv6 client is enabled by the .network file but IPv6 link local addressing is disabled. "
+                                    "Disabling DHCPv6 client.", network->filename);
+                        SET_FLAG(network->dhcp, ADDRESS_FAMILY_IPV6, false);
+                }
+
+                if (network->router_prefix_delegation != RADV_PREFIX_DELEGATION_NONE) {
+                        log_warning("%s: IPv6PrefixDelegation= is enabled but IPv6 link local addressing is disabled. "
+                                    "Disabling IPv6PrefixDelegation=.", network->filename);
+                        network->router_prefix_delegation = RADV_PREFIX_DELEGATION_NONE;
+                }
+        }
+
          if (FLAGS_SET(network->link_local, ADDRESS_FAMILY_FALLBACK_IPV4) &&
              !FLAGS_SET(network->dhcp, ADDRESS_FAMILY_IPV4)) {
                  log_warning("%s: fallback assignment of IPv4 link local address is enabled but DHCPv4 is disabled. "
@@ -281,7 +301,7 @@ int network_verify(Network *network) {
                          prefix_free(prefix);
  
          LIST_FOREACH_SAFE(rules, rule, rule_next, network->rules)
-                if (section_is_invalid(rule->section))
+                if (routing_policy_rule_section_verify(rule) < 0)
                          routing_policy_rule_free(rule);
  
          return 0;
@@ -395,7 +415,7 @@ int network_load_one(Manager *manager, const char *filename) {
                  .dns_over_tls_mode = _DNS_OVER_TLS_MODE_INVALID,
  
                  /* If LinkLocalAddressing= is not set, then set to ADDRESS_FAMILY_IPV6 later. */
-                .link_local = _ADDRESS_FAMILY_BOOLEAN_INVALID,
+                .link_local = _ADDRESS_FAMILY_INVALID,
  
                  .ipv6_privacy_extensions = IPV6_PRIVACY_EXTENSIONS_NO,
                  .ipv6_accept_ra = -1,
@@ -486,7 +506,7 @@ int network_load(Manager *manager) {
          STRV_FOREACH(f, files) {
                  r = network_load_one(manager, *f);
                  if (r < 0)
-                        return r;
+                        log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
          }
  
          return 0;
@@ -662,15 +682,35 @@ int network_apply(Network *network, Link *link) {
          return 0;
  }
  
-bool network_has_static_ipv6_addresses(Network *network) {
+bool network_has_static_ipv6_configurations(Network *network) {
          Address *address;
+        Route *route;
+        FdbEntry *fdb;
+        Neighbor *neighbor;
  
          assert(network);
  
-        LIST_FOREACH(addresses, address, network->static_addresses) {
+        LIST_FOREACH(addresses, address, network->static_addresses)
                  if (address->family == AF_INET6)
                          return true;
-        }
+
+        LIST_FOREACH(routes, route, network->static_routes)
+                if (route->family == AF_INET6)
+                        return true;
+
+        LIST_FOREACH(static_fdb_entries, fdb, network->static_fdb_entries)
+                if (fdb->family == AF_INET6)
+                        return true;
+
+        LIST_FOREACH(neighbors, neighbor, network->neighbors)
+                if (neighbor->family == AF_INET6)
+                        return true;
+
+        if (!LIST_IS_EMPTY(network->address_labels))
+                return true;
+
+        if (!LIST_IS_EMPTY(network->static_prefixes))
+                return true;
  
          return false;
  }
@@ -859,7 +899,8 @@ static const char* const ipv6_privacy_extensions_table[_IPV6_PRIVACY_EXTENSIONS_
          [IPV6_PRIVACY_EXTENSIONS_YES] = "yes",
  };
  
-DEFINE_STRING_TABLE_LOOKUP(ipv6_privacy_extensions, IPv6PrivacyExtensions);
+DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(ipv6_privacy_extensions, IPv6PrivacyExtensions,
+                                        IPV6_PRIVACY_EXTENSIONS_YES);
  
  int config_parse_ipv6_privacy_extensions(
                  const char* unit,
@@ -873,40 +914,26 @@ int config_parse_ipv6_privacy_extensions(
                  void *data,
                  void *userdata) {
  
-        IPv6PrivacyExtensions *ipv6_privacy_extensions = data;
-        int k;
+        IPv6PrivacyExtensions s, *ipv6_privacy_extensions = data;
  
          assert(filename);
          assert(lvalue);
          assert(rvalue);
          assert(ipv6_privacy_extensions);
  
-        /* Our enum shall be a superset of booleans, hence first try
-         * to parse as boolean, and then as enum */
-
-        k = parse_boolean(rvalue);
-        if (k > 0)
-                *ipv6_privacy_extensions = IPV6_PRIVACY_EXTENSIONS_YES;
-        else if (k == 0)
-                *ipv6_privacy_extensions = IPV6_PRIVACY_EXTENSIONS_NO;
-        else {
-                IPv6PrivacyExtensions s;
-
-                s = ipv6_privacy_extensions_from_string(rvalue);
-                if (s < 0) {
-
-                        if (streq(rvalue, "kernel"))
-                                s = _IPV6_PRIVACY_EXTENSIONS_INVALID;
-                        else {
-                                log_syntax(unit, LOG_ERR, filename, line, 0,
-                                           "Failed to parse IPv6 privacy extensions option, ignoring: %s", rvalue);
-                                return 0;
-                        }
+        s = ipv6_privacy_extensions_from_string(rvalue);
+        if (s < 0) {
+                if (streq(rvalue, "kernel"))
+                        s = _IPV6_PRIVACY_EXTENSIONS_INVALID;
+                else {
+                        log_syntax(unit, LOG_ERR, filename, line, 0,
+                                   "Failed to parse IPv6 privacy extensions option, ignoring: %s", rvalue);
+                        return 0;
                  }
-
-                *ipv6_privacy_extensions = s;
          }
  
+        *ipv6_privacy_extensions = s;
+
          return 0;
  }
  
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h

index 0fa800841cdbb4622e1f9497710443176b911cc1..bc760744e5f5647badc3584c69f5a79bf03fc9b3 100644 (file)
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -77,7 +77,7 @@ struct Network {
          Hashmap *stacked_netdev_names;
  
          /* DHCP Client Support */
-        AddressFamilyBoolean dhcp;
+        AddressFamily dhcp;
          DHCPClientIdentifier dhcp_client_identifier;
          char *dhcp_vendor_class_identifier;
          char **dhcp_user_class;
@@ -123,7 +123,7 @@ struct Network {
          uint32_t dhcp_server_pool_size;
  
          /* IPV4LL Support */
-        AddressFamilyBoolean link_local;
+        AddressFamily link_local;
          bool ipv4ll_route;
  
          bool default_route_on_device;
@@ -171,7 +171,7 @@ struct Network {
          usec_t can_restart_us;
          int can_triple_sampling;
  
-        AddressFamilyBoolean ip_forward;
+        AddressFamily ip_forward;
          bool ip_masquerade;
  
          int ipv6_accept_ra;
@@ -269,7 +269,7 @@ int network_get(Manager *manager, sd_device *device, const char *ifname, const s
  int network_apply(Network *network, Link *link);
  void network_apply_anonymize_if_set(Network *network);
  
-bool network_has_static_ipv6_addresses(Network *network);
+bool network_has_static_ipv6_configurations(Network *network);
  
  CONFIG_PARSER_PROTOTYPE(config_parse_stacked_netdev);
  CONFIG_PARSER_PROTOTYPE(config_parse_tunnel);
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c

index 8cc8080b46521f884a72da8d9f3b6922e9237c60..dd1469d0df7c8760f569f63af02b4846b6f62191 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -399,6 +399,8 @@ static int route_add_internal(
          r = set_put(*routes, route);
          if (r < 0)
                  return r;
+        if (r == 0)
+                return -EEXIST;
  
          route->link = link;
  
@@ -634,11 +636,6 @@ int route_configure(
          assert(IN_SET(route->family, AF_INET, AF_INET6));
          assert(callback);
  
-        if (route->family == AF_INET6 && link_sysctl_ipv6_enabled(link) == 0) {
-                log_link_warning(link, "An IPv6 route is requested, but IPv6 is disabled by sysctl, ignoring.");
-                return 0;
-        }
-
          if (route_get(link, route->family, &route->dst, route->dst_prefixlen, &route->gw, route->tos, route->priority, route->table, NULL) <= 0 &&
              set_size(link->routes) >= routes_max())
                  return log_link_error_errno(link, SYNTHETIC_ERRNO(E2BIG),
@@ -683,7 +680,7 @@ int route_configure(
                          return log_link_error_errno(link, r, "Could not set route family: %m");
          }
  
-        if (route->dst_prefixlen) {
+        if (route->dst_prefixlen > 0) {
                  r = netlink_message_append_in_addr_union(req, RTA_DST, route->family, &route->dst);
                  if (r < 0)
                          return log_link_error_errno(link, r, "Could not append RTA_DST attribute: %m");
@@ -693,7 +690,7 @@ int route_configure(
                          return log_link_error_errno(link, r, "Could not set destination prefix length: %m");
          }
  
-        if (route->src_prefixlen) {
+        if (route->src_prefixlen > 0) {
                  r = netlink_message_append_in_addr_union(req, RTA_SRC, route->family, &route->src);
                  if (r < 0)
                          return log_link_error_errno(link, r, "Could not append RTA_SRC attribute: %m");
@@ -879,11 +876,10 @@ int network_add_default_route_on_device(Network *network) {
          if (r < 0)
                  return r;
  
-        r = in_addr_from_string(AF_INET, "169.254.0.0", &n->dst);
-        if (r < 0)
-                return r;
-
          n->family = AF_INET;
+        n->scope = RT_SCOPE_LINK;
+        n->scope_set = true;
+        n->protocol = RTPROT_STATIC;
  
          TAKE_PTR(n);
          return 0;
diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c

index 31a49ed905f2bee6e99fc980fd8d49ab87320f27..9443db02fd6c2a9fce1a892270a7eef574fd045c 100644 (file)
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -3,6 +3,7 @@
  #include <net/if.h>
  #include <linux/fib_rules.h>
  
+#include "af-list.h"
  #include "alloc-util.h"
  #include "conf-parser.h"
  #include "fileio.h"
@@ -10,6 +11,7 @@
  #include "networkd-routing-policy-rule.h"
  #include "netlink-util.h"
  #include "networkd-manager.h"
+#include "networkd-util.h"
  #include "parse-util.h"
  #include "socket-util.h"
  #include "string-util.h"
@@ -23,7 +25,6 @@ int routing_policy_rule_new(RoutingPolicyRule **ret) {
                  return -ENOMEM;
  
          *rule = (RoutingPolicyRule) {
-                .family = AF_INET,
                  .table = RT_TABLE_MAIN,
          };
  
@@ -58,6 +59,44 @@ void routing_policy_rule_free(RoutingPolicyRule *rule) {
          free(rule);
  }
  
+static int routing_policy_rule_copy(RoutingPolicyRule *dest, RoutingPolicyRule *src) {
+        _cleanup_free_ char *iif = NULL, *oif = NULL;
+
+        assert(dest);
+        assert(src);
+
+        if (src->iif) {
+                iif = strdup(src->iif);
+                if (!iif)
+                        return -ENOMEM;
+        }
+
+        if (src->oif) {
+                oif = strdup(src->oif);
+                if (!oif)
+                        return -ENOMEM;
+        }
+
+        dest->family = src->family;
+        dest->from = src->from;
+        dest->from_prefixlen = src->from_prefixlen;
+        dest->to = src->to;
+        dest->to_prefixlen = src->to_prefixlen;
+        dest->invert_rule = src->invert_rule;
+        dest->tos = src->tos;
+        dest->fwmark = src->fwmark;
+        dest->fwmask = src->fwmask;
+        dest->priority = src->priority;
+        dest->table = src->table;
+        dest->iif = TAKE_PTR(iif);
+        dest->oif = TAKE_PTR(oif);
+        dest->protocol = src->protocol;
+        dest->sport = src->sport;
+        dest->dport = src->dport;
+
+        return 0;
+}
+
  static void routing_policy_rule_hash_func(const RoutingPolicyRule *rule, struct siphash *state) {
          assert(rule);
  
@@ -209,7 +248,11 @@ int routing_policy_rule_make_local(Manager *m, RoutingPolicyRule *rule) {
                  if (r < 0)
                          return r;
  
-                return set_put(m->rules, rule);
+                r = set_put(m->rules, rule);
+                if (r < 0)
+                        return r;
+                if (r == 0)
+                        routing_policy_rule_free(rule);
          }
  
          return -ENOENT;
@@ -217,46 +260,21 @@ int routing_policy_rule_make_local(Manager *m, RoutingPolicyRule *rule) {
  
  static int routing_policy_rule_add_internal(Manager *m, Set **rules, RoutingPolicyRule *in, RoutingPolicyRule **ret) {
          _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *rule = NULL;
-        _cleanup_free_ char *iif = NULL, *oif = NULL;
          int r;
  
          assert(m);
          assert(rules);
          assert(in);
  
-        if (in->iif) {
-                iif = strdup(in->iif);
-                if (!iif)
-                        return -ENOMEM;
-        }
-
-        if (in->oif) {
-                oif = strdup(in->oif);
-                if (!oif)
-                        return -ENOMEM;
-        }
-
          r = routing_policy_rule_new(&rule);
          if (r < 0)
                  return r;
  
          rule->manager = m;
-        rule->family = in->family;
-        rule->from = in->from;
-        rule->from_prefixlen = in->from_prefixlen;
-        rule->to = in->to;
-        rule->to_prefixlen = in->to_prefixlen;
-        rule->invert_rule = in->invert_rule;
-        rule->tos = in->tos;
-        rule->fwmark = in->fwmark;
-        rule->fwmask = in->fwmask;
-        rule->priority = in->priority;
-        rule->table = in->table;
-        rule->iif = TAKE_PTR(iif);
-        rule->oif = TAKE_PTR(oif);
-        rule->protocol = in->protocol;
-        rule->sport = in->sport;
-        rule->dport = in->dport;
+
+        r = routing_policy_rule_copy(rule, in);
+        if (r < 0)
+                return r;
  
          r = set_ensure_allocated(rules, &routing_policy_rule_hash_ops);
          if (r < 0)
@@ -265,6 +283,8 @@ static int routing_policy_rule_add_internal(Manager *m, Set **rules, RoutingPoli
          r = set_put(*rules, rule);
          if (r < 0)
                  return r;
+        if (r == 0)
+                return -EEXIST;
  
          if (ret)
                  *ret = rule;
@@ -433,9 +453,14 @@ int routing_policy_rule_configure(RoutingPolicyRule *rule, Link *link, link_netl
          assert(link->manager);
          assert(link->manager->rtnl);
  
-        if (rule->family == AF_INET6 && link_sysctl_ipv6_enabled(link) == 0) {
-                log_link_warning(link, "An IPv6 routing policy rule is requested, but IPv6 is disabled by sysctl, ignoring.");
-                return 0;
+        if (DEBUG_LOGGING) {
+                _cleanup_free_ char *from = NULL, *to = NULL;
+
+                (void) in_addr_to_string(rule->family, &rule->from, &from);
+                (void) in_addr_to_string(rule->family, &rule->to, &to);
+
+                log_debug("Configuring routing policy rule: %s/%u -> %s/%u, iif: %s, oif: %s, table: %u",
+                          from, rule->from_prefixlen, to, rule->to_prefixlen, strna(rule->iif), strna(rule->oif), rule->table);
          }
  
          r = sd_rtnl_message_new_routing_policy_rule(link->manager->rtnl, &m, RTM_NEWRULE, rule->family);
@@ -549,6 +574,50 @@ int routing_policy_rule_configure(RoutingPolicyRule *rule, Link *link, link_netl
          return 1;
  }
  
+int routing_policy_rule_section_verify(RoutingPolicyRule *rule) {
+        int r;
+
+        if (section_is_invalid(rule->section))
+                return -EINVAL;
+
+        if ((rule->family == AF_INET && FLAGS_SET(rule->address_family, ADDRESS_FAMILY_IPV6)) ||
+            (rule->family == AF_INET6 && FLAGS_SET(rule->address_family, ADDRESS_FAMILY_IPV4)))
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                "%s: address family specified by Family= conflicts with the address "
+                                "specified by To= or From=. Ignoring [RoutingPolicyRule] section from line %u.",
+                                rule->section->filename, rule->section->line);
+
+        if (FLAGS_SET(rule->address_family, ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6)) {
+                _cleanup_(routing_policy_rule_freep) RoutingPolicyRule *rule6 = NULL;
+
+                assert(rule->family == AF_UNSPEC);
+
+                /* When Family=both, we need to copy the section, AF_INET and AF_INET6. */
+
+                r = routing_policy_rule_new_static(rule->network, NULL, 0, &rule6);
+                if (r < 0)
+                        return r;
+
+                r = routing_policy_rule_copy(rule6, rule);
+                if (r < 0)
+                        return r;
+
+                rule->family = AF_INET;
+                rule6->family = AF_INET6;
+
+                TAKE_PTR(rule6);
+        }
+
+        if (rule->family == AF_UNSPEC) {
+                if (FLAGS_SET(rule->address_family, ADDRESS_FAMILY_IPV6))
+                        rule->family = AF_INET6;
+                else
+                        rule->family = AF_INET;
+        }
+
+        return 0;
+}
+
  static int parse_fwmark_fwmask(const char *s, uint32_t *fwmark, uint32_t *fwmask) {
          _cleanup_free_ char *f = NULL;
          char *p;
@@ -761,7 +830,10 @@ int config_parse_routing_policy_rule_prefix(
                  prefixlen = &n->from_prefixlen;
          }
  
-        r = in_addr_prefix_from_string_auto(rvalue, &n->family, buffer, prefixlen);
+        if (n->family == AF_UNSPEC)
+                r = in_addr_prefix_from_string_auto(rvalue, &n->family, buffer, prefixlen);
+        else
+                r = in_addr_prefix_from_string(rvalue, n->family, buffer, prefixlen);
          if (r < 0) {
                  log_syntax(unit, LOG_ERR, filename, line, r, "RPDB rule prefix is invalid, ignoring assignment: %s", rvalue);
                  return 0;
@@ -941,6 +1013,46 @@ int config_parse_routing_policy_rule_invert(
          return 0;
  }
  
+int config_parse_routing_policy_rule_family(
+                const char *unit,
+                const char *filename,
+                unsigned line,
+                const char *section,
+                unsigned section_line,
+                const char *lvalue,
+                int ltype,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        _cleanup_(routing_policy_rule_free_or_set_invalidp) RoutingPolicyRule *n = NULL;
+        Network *network = userdata;
+        AddressFamily a;
+        int r;
+
+        assert(filename);
+        assert(section);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        r = routing_policy_rule_new_static(network, filename, section_line, &n);
+        if (r < 0)
+                return r;
+
+        a = routing_policy_rule_address_family_from_string(rvalue);
+        if (a < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, 0,
+                           "Invalid address family '%s', ignoring.", rvalue);
+                return 0;
+        }
+
+        n->address_family = a;
+        n = NULL;
+
+        return 0;
+}
+
  static int routing_policy_rule_read_full_file(const char *state_file, char **ret) {
          _cleanup_free_ char *s = NULL;
          size_t size;
@@ -971,6 +1083,7 @@ int routing_policy_serialize_rules(Set *rules, FILE *f) {
          SET_FOREACH(rule, rules, i) {
                  _cleanup_free_ char *from_str = NULL, *to_str = NULL;
                  bool space = false;
+                const char *family_str;
  
                  fputs("RULE=", f);
  
@@ -995,6 +1108,12 @@ int routing_policy_serialize_rules(Set *rules, FILE *f) {
                          space = true;
                  }
  
+                family_str = af_to_name(rule->family);
+                if (family_str)
+                fprintf(f, "%sfamily=%s",
+                        space ? " " : "",
+                        family_str);
+
                  if (rule->tos != 0) {
                          fprintf(f, "%stos=%hhu",
                                  space ? " " : "",
@@ -1002,6 +1121,10 @@ int routing_policy_serialize_rules(Set *rules, FILE *f) {
                          space = true;
                  }
  
+                fprintf(f, "%spriority=%"PRIu32,
+                        space ? " " : "",
+                        rule->priority);
+
                  if (rule->fwmark != 0) {
                          fprintf(f, "%sfwmark=%"PRIu32"/%"PRIu32,
                                  space ? " " : "",
@@ -1117,6 +1240,13 @@ int routing_policy_load_rules(const char *state_file, Set **rules) {
                                          continue;
                                  }
  
+                        } else if (streq(a, "family")) {
+                                r = af_from_name(b);
+                                if (r < 0) {
+                                        log_error_errno(r, "Failed to parse RPDB rule family, ignoring: %s", b);
+                                        continue;
+                                }
+                                rule->family = r;
                          } else if (streq(a, "tos")) {
                                  r = safe_atou8(b, &rule->tos);
                                  if (r < 0) {
@@ -1129,6 +1259,12 @@ int routing_policy_load_rules(const char *state_file, Set **rules) {
                                          log_error_errno(r, "Failed to parse RPDB rule table, ignoring: %s", b);
                                          continue;
                                  }
+                        } else if (streq(a, "priority")) {
+                                r = safe_atou32(b, &rule->priority);
+                                if (r < 0) {
+                                        log_error_errno(r, "Failed to parse RPDB rule priority, ignoring: %s", b);
+                                        continue;
+                                }
                          } else if (streq(a, "fwmark")) {
  
                                  r = parse_fwmark_fwmask(b, &rule->fwmark, &rule->fwmask);
@@ -1180,8 +1316,8 @@ int routing_policy_load_rules(const char *state_file, Set **rules) {
                          log_warning_errno(r, "Failed to add RPDB rule to saved DB, ignoring: %s", p);
                          continue;
                  }
-
-                rule = NULL;
+                if (r > 0)
+                        rule = NULL;
          }
  
          return 0;
diff --git a/src/network/networkd-routing-policy-rule.h b/src/network/networkd-routing-policy-rule.h

index 512af3dfdd41059537cdccd8b19093c9f13f9dc6..6b8e3102275e48611f154224a66a872cf977e2c8 100644 (file)
--- a/src/network/networkd-routing-policy-rule.h
+++ b/src/network/networkd-routing-policy-rule.h
@@ -36,7 +36,8 @@ struct RoutingPolicyRule {
          uint32_t fwmask;
          uint32_t priority;
  
-        int family;
+        AddressFamily address_family; /* Specified by Family= */
+        int family; /* Automatically determined by From= or To= */
          unsigned char to_prefixlen;
          unsigned char from_prefixlen;
  
@@ -56,6 +57,7 @@ int routing_policy_rule_new(RoutingPolicyRule **ret);
  void routing_policy_rule_free(RoutingPolicyRule *rule);
  
  DEFINE_NETWORK_SECTION_FUNCTIONS(RoutingPolicyRule, routing_policy_rule_free);
+int routing_policy_rule_section_verify(RoutingPolicyRule *rule);
  
  int routing_policy_rule_configure(RoutingPolicyRule *address, Link *link, link_netlink_message_handler_t callback);
  int routing_policy_rule_remove(RoutingPolicyRule *routing_policy_rule, Link *link, link_netlink_message_handler_t callback);
@@ -76,3 +78,4 @@ CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_device);
  CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_port_range);
  CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_ip_protocol);
  CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_invert);
+CONFIG_PARSER_PROTOTYPE(config_parse_routing_policy_rule_family);
diff --git a/src/network/networkd-util.c b/src/network/networkd-util.c

index d01de53f7be70a16407732818b9dd2161577b593..3fd26836c6ac9841ef3078410a995a78620d8976 100644 (file)
--- a/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@ -8,14 +8,14 @@
  #include "string-util.h"
  #include "util.h"
  
-static const char * const address_family_boolean_table[_ADDRESS_FAMILY_BOOLEAN_MAX] = {
+static const char * const address_family_table[_ADDRESS_FAMILY_MAX] = {
          [ADDRESS_FAMILY_NO]            = "no",
          [ADDRESS_FAMILY_YES]           = "yes",
          [ADDRESS_FAMILY_IPV4]          = "ipv4",
          [ADDRESS_FAMILY_IPV6]          = "ipv6",
  };
  
-static const char * const link_local_address_family_boolean_table[_ADDRESS_FAMILY_BOOLEAN_MAX] = {
+static const char * const link_local_address_family_table[_ADDRESS_FAMILY_MAX] = {
          [ADDRESS_FAMILY_NO]            = "no",
          [ADDRESS_FAMILY_YES]           = "yes",
          [ADDRESS_FAMILY_IPV4]          = "ipv4",
@@ -24,12 +24,19 @@ static const char * const link_local_address_family_boolean_table[_ADDRESS_FAMIL
          [ADDRESS_FAMILY_FALLBACK_IPV4] = "ipv4-fallback",
  };
  
-DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(address_family_boolean, AddressFamilyBoolean, ADDRESS_FAMILY_YES);
-DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(link_local_address_family_boolean, AddressFamilyBoolean, ADDRESS_FAMILY_YES);
-DEFINE_CONFIG_PARSE_ENUM(config_parse_link_local_address_family_boolean, link_local_address_family_boolean,
-                         AddressFamilyBoolean, "Failed to parse option");
+static const char * const routing_policy_rule_address_family_table[_ADDRESS_FAMILY_MAX] = {
+        [ADDRESS_FAMILY_YES]           = "both",
+        [ADDRESS_FAMILY_IPV4]          = "ipv4",
+        [ADDRESS_FAMILY_IPV6]          = "ipv6",
+};
+
+DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(address_family, AddressFamily, ADDRESS_FAMILY_YES);
+DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(link_local_address_family, AddressFamily, ADDRESS_FAMILY_YES);
+DEFINE_STRING_TABLE_LOOKUP(routing_policy_rule_address_family, AddressFamily);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_link_local_address_family, link_local_address_family,
+                         AddressFamily, "Failed to parse option");
  
-int config_parse_address_family_boolean_with_kernel(
+int config_parse_address_family_with_kernel(
                  const char* unit,
                  const char *filename,
                  unsigned line,
@@ -41,7 +48,7 @@ int config_parse_address_family_boolean_with_kernel(
                  void *data,
                  void *userdata) {
  
-        AddressFamilyBoolean *fwd = data, s;
+        AddressFamily *fwd = data, s;
  
          assert(filename);
          assert(lvalue);
@@ -56,7 +63,7 @@ int config_parse_address_family_boolean_with_kernel(
           * is gone, hence silently accept the old setting, but turn it
           * to "no". */
  
-        s = address_family_boolean_from_string(rvalue);
+        s = address_family_from_string(rvalue);
          if (s < 0) {
                  if (streq(rvalue, "kernel"))
                          s = ADDRESS_FAMILY_NO;
diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h

index aafbac7df63eb24b76f6b821be329cdd31dd3427..3a57819f398bb86d6f2f68485a389700cba445ed 100644 (file)
--- a/src/network/networkd-util.h
+++ b/src/network/networkd-util.h
@@ -5,7 +5,7 @@
  #include "hash-funcs.h"
  #include "macro.h"
  
-typedef enum AddressFamilyBoolean {
+typedef enum AddressFamily {
          /* This is a bitmask, though it usually doesn't feel that way! */
          ADDRESS_FAMILY_NO             = 0,
          ADDRESS_FAMILY_IPV4           = 1 << 0,
@@ -13,9 +13,9 @@ typedef enum AddressFamilyBoolean {
          ADDRESS_FAMILY_YES            = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6,
          ADDRESS_FAMILY_FALLBACK_IPV4  = 1 << 2,
          ADDRESS_FAMILY_FALLBACK       = ADDRESS_FAMILY_FALLBACK_IPV4 | ADDRESS_FAMILY_IPV6,
-        _ADDRESS_FAMILY_BOOLEAN_MAX,
-        _ADDRESS_FAMILY_BOOLEAN_INVALID = -1,
-} AddressFamilyBoolean;
+        _ADDRESS_FAMILY_MAX,
+        _ADDRESS_FAMILY_INVALID = -1,
+} AddressFamily;
  
  typedef struct NetworkConfigSection {
          unsigned line;
@@ -23,14 +23,17 @@ typedef struct NetworkConfigSection {
          char filename[];
  } NetworkConfigSection;
  
-CONFIG_PARSER_PROTOTYPE(config_parse_link_local_address_family_boolean);
-CONFIG_PARSER_PROTOTYPE(config_parse_address_family_boolean_with_kernel);
+CONFIG_PARSER_PROTOTYPE(config_parse_link_local_address_family);
+CONFIG_PARSER_PROTOTYPE(config_parse_address_family_with_kernel);
  
-const char *address_family_boolean_to_string(AddressFamilyBoolean b) _const_;
-AddressFamilyBoolean address_family_boolean_from_string(const char *s) _pure_;
+const char *address_family_to_string(AddressFamily b) _const_;
+AddressFamily address_family_from_string(const char *s) _pure_;
  
-const char *link_local_address_family_boolean_to_string(AddressFamilyBoolean b) _const_;
-AddressFamilyBoolean link_local_address_family_boolean_from_string(const char *s) _pure_;
+const char *link_local_address_family_to_string(AddressFamily b) _const_;
+AddressFamily link_local_address_family_from_string(const char *s) _pure_;
+
+const char *routing_policy_rule_address_family_to_string(AddressFamily b) _const_;
+AddressFamily routing_policy_rule_address_family_from_string(const char *s) _pure_;
  
  int kernel_route_expiration_supported(void);
  
diff --git a/src/network/networkd.c b/src/network/networkd.c

index 090f3777a5ae2de7304c05f25c0e8119b018bf3d..38bd9ff1ffe0b2ce95f5a7120cd1fdbbe28c0590 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -95,6 +95,10 @@ static int run(int argc, char *argv[]) {
          if (r < 0)
                  return log_error_errno(r, "Could not enumerate addresses: %m");
  
+        r = manager_rtnl_enumerate_neighbors(m);
+        if (r < 0)
+                return log_error_errno(r, "Could not enumerate neighbors: %m");
+
          r = manager_rtnl_enumerate_routes(m);
          if (r < 0)
                  return log_error_errno(r, "Could not enumerate routes: %m");
diff --git a/src/network/org.freedesktop.network1.policy b/src/network/org.freedesktop.network1.policy

index 07091bffe5d33ea7e40b75772136cda26cf2b50c..9babae89a5f9e0d865166950e484bd6f37d785f5 100644 (file)
--- a/src/network/org.freedesktop.network1.policy
+++ b/src/network/org.freedesktop.network1.policy
@@ -119,7 +119,7 @@
  
          <action id="org.freedesktop.network1.revert-ntp">
                  <description gettext-domain="systemd">Revert NTP settings</description>
-                <message gettext-domain="systemd">Authentication is required to revert NTP settings.</message>
+                <message gettext-domain="systemd">Authentication is required to reset NTP settings.</message>
                  <defaults>
                          <allow_any>auth_admin</allow_any>
                          <allow_inactive>auth_admin</allow_inactive>
@@ -130,7 +130,7 @@
  
          <action id="org.freedesktop.network1.revert-dns">
                  <description gettext-domain="systemd">Revert DNS settings</description>
-                <message gettext-domain="systemd">Authentication is required to revert DNS settings.</message>
+                <message gettext-domain="systemd">Authentication is required to reset DNS settings.</message>
                  <defaults>
                          <allow_any>auth_admin</allow_any>
                          <allow_inactive>auth_admin</allow_inactive>
diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c

index 711954e4a2cedb22e7c51bd0d5c0f6489a7a7cb9..56932ba15c4a331cc24b837f0f9fc3ed42c15424 100644 (file)
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
  
          test_table_sparse(ipvlan_mode, NETDEV_IPVLAN_MODE);
          test_table_sparse(macvlan_mode, NETDEV_MACVLAN_MODE);
-        test_table_sparse(address_family_boolean, ADDRESS_FAMILY_BOOLEAN);
+        test_table_sparse(address_family, ADDRESS_FAMILY);
  
          return EXIT_SUCCESS;
  }
diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c

index 6883cbe1ec3bf1f7e759fd1b2b65db2c8de814f8..2007acb7812e5c2854ea9fc9b058958d0d67d822 100644 (file)
--- a/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@ -240,7 +240,7 @@ static void test_config_parse_match_strv(void) {
                                         "!baz",
                                         "KEY=val",
                                         "KEY2=val with space",
-                                       "KEY3=val with \"quotation\"")));
+                                       "KEY3=val with \\quotation\\")));
  }
  
  int main(int argc, char **argv) {
diff --git a/src/network/test-routing-policy-rule.c b/src/network/test-routing-policy-rule.c

index 57bfb6af6802f5d98212eb3624f23295837cece0..d441099b5a5c07262820d5ea5846d996027d00f2 100644 (file)
--- a/src/network/test-routing-policy-rule.c
+++ b/src/network/test-routing-policy-rule.c
@@ -62,31 +62,31 @@ int main(int argc, char **argv) {
          test_setup_logging(LOG_DEBUG);
  
          test_rule_serialization("basic parsing",
-                                "RULE=from=1.2.3.4/32 to=2.3.4.5/32 tos=5 fwmark=1/2 table=10", NULL);
+                                "RULE=from=1.2.3.4/32 to=2.3.4.5/32 family=AF_INET tos=5 priority=0 fwmark=1/2 table=10", NULL);
  
          test_rule_serialization("ignored values",
                                  "RULE=something=to=ignore from=1.2.3.4/32 from=1.2.3.4/32"
                                  "   \t  to=2.3.4.5/24 to=2.3.4.5/32 tos=5 fwmark=2 fwmark=1 table=10 table=20",
                                  "RULE=from=1.2.3.4/32"
-                                " to=2.3.4.5/32 tos=5 fwmark=1/0 table=20");
+                                " to=2.3.4.5/32 family=AF_INET tos=5 priority=0 fwmark=1/0 table=20");
  
          test_rule_serialization("ipv6",
-                                "RULE=from=1::2/64 to=2::3/64 table=6", NULL);
+                                "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 table=6", NULL);
  
-        assert_se(asprintf(&p, "RULE=from=1::2/64 to=2::3/64 table=%d", RT_TABLE_MAIN) >= 0);
+        assert_se(asprintf(&p, "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 table=%d", RT_TABLE_MAIN) >= 0);
          test_rule_serialization("default table",
                                  "RULE=from=1::2/64 to=2::3/64", p);
  
          test_rule_serialization("incoming interface",
                                  "RULE=from=1::2/64 to=2::3/64 table=1 iif=lo",
-                                "RULE=from=1::2/64 to=2::3/64 iif=lo table=1");
+                                "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 iif=lo table=1");
  
          test_rule_serialization("outgoing interface",
-                                "RULE=from=1::2/64 to=2::3/64 oif=eth0 table=1", NULL);
+                                "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 oif=eth0 table=1", NULL);
  
          test_rule_serialization("freeing interface names",
-                                "RULE=from=1::2/64 to=2::3/64 iif=e0 iif=e1 oif=e0 oif=e1 table=1",
-                                "RULE=from=1::2/64 to=2::3/64 iif=e1 oif=e1 table=1");
+                                "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 iif=e0 iif=e1 oif=e0 oif=e1 table=1",
+                                "RULE=from=1::2/64 to=2::3/64 family=AF_INET6 priority=0 iif=e1 oif=e1 table=1");
  
          return 0;
  }
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c

index df3efb3c8d1d1f2b113a4f16dede86055f5be0eb..8ffe523830f302c523f2481a32d0f3f39e95918b 100644 (file)
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -117,6 +117,7 @@ static int compare_pstore_entries(const void *_a, const void *_b) {
  
  static int move_file(PStoreEntry *pe, const char *subdir) {
          _cleanup_free_ char *ifd_path = NULL, *ofd_path = NULL;
+        _cleanup_free_ void *field = NULL;
          const char *suffix, *message;
          struct iovec iovec[2];
          int n_iovec = 0, r;
@@ -138,7 +139,6 @@ static int move_file(PStoreEntry *pe, const char *subdir) {
          iovec[n_iovec++] = IOVEC_MAKE_STRING(message);
  
          if (pe->content_size > 0) {
-                _cleanup_free_ void *field = NULL;
                  size_t field_size;
  
                  field_size = strlen("FILE=") + pe->content_size;
@@ -157,7 +157,7 @@ static int move_file(PStoreEntry *pe, const char *subdir) {
                  /* Move file from pstore to external storage */
                  r = mkdir_parents(ofd_path, 0755);
                  if (r < 0)
-                        return log_error_errno(r, "Failed to create directoy %s: %m", ofd_path);
+                        return log_error_errno(r, "Failed to create directory %s: %m", ofd_path);
                  r = copy_file_atomic(ifd_path, ofd_path, 0600, 0, 0, COPY_REPLACE);
                  if (r < 0)
                          return log_error_errno(r, "Failed to copy_file_atomic: %s to %s", ifd_path, ofd_path);
diff --git a/src/resolve/org.freedesktop.resolve1.policy b/src/resolve/org.freedesktop.resolve1.policy

index b65ba3e56a3e1f5b944d7ffb47617c54163760f2..dc46987adfac7ee729fcc723bf8d1b06eccfcfdf 100644 (file)
--- a/src/resolve/org.freedesktop.resolve1.policy
+++ b/src/resolve/org.freedesktop.resolve1.policy
@@ -40,4 +40,103 @@
                  <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
          </action>
  
+        <action id="org.freedesktop.resolve1.set-dns-servers">
+                <description gettext-domain="systemd">Set DNS servers</description>
+                <message gettext-domain="systemd">Authentication is required to set DNS servers.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-domains">
+                <description gettext-domain="systemd">Set domains</description>
+                <message gettext-domain="systemd">Authentication is required to set domains.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-default-route">
+                <description gettext-domain="systemd">Set default route</description>
+                <message gettext-domain="systemd">Authentication is required to set default route.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-llmnr">
+                <description gettext-domain="systemd">Enable/disable LLMNR</description>
+                <message gettext-domain="systemd">Authentication is required to enable or disable LLMNR.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-mdns">
+                <description gettext-domain="systemd">Enable/disable multicast DNS</description>
+                <message gettext-domain="systemd">Authentication is required to enable or disable multicast DNS.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-dns-over-tls">
+                <description gettext-domain="systemd">Enable/disable DNS over TLS</description>
+                <message gettext-domain="systemd">Authentication is required to enable or disable DNS over TLS.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-dnssec">
+                <description gettext-domain="systemd">Enable/disable DNSSEC</description>
+                <message gettext-domain="systemd">Authentication is required to enable or disable DNSSEC.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.set-dnssec-negative-trust-anchors">
+                <description gettext-domain="systemd">Set DNSSEC Negative Trust Anchors</description>
+                <message gettext-domain="systemd">Authentication is required to set DNSSEC Negative Trust Anchros.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
+        <action id="org.freedesktop.resolve1.revert">
+                <description gettext-domain="systemd">Revert name resolution settings</description>
+                <message gettext-domain="systemd">Authentication is required to reset name resolution settings.</message>
+                <defaults>
+                        <allow_any>auth_admin</allow_any>
+                        <allow_inactive>auth_admin</allow_inactive>
+                        <allow_active>auth_admin_keep</allow_active>
+                </defaults>
+                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+        </action>
+
  </policyconfig>
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c

index 4fc281e80abbeaef8e2b036b519280dfd3dd3e6d..db0f8381ef077776bf20bc3efa109e6117bd0aaf 100644 (file)
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -1638,15 +1638,6 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
          if (m->mdns_support != RESOLVE_SUPPORT_YES)
                  return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Support for MulticastDNS is disabled");
  
-        r = bus_verify_polkit_async(message, CAP_SYS_ADMIN,
-                                    "org.freedesktop.resolve1.register-service",
-                                    NULL, false, UID_INVALID,
-                                    &m->polkit_registry, error);
-        if (r < 0)
-                return r;
-        if (r == 0)
-                return 1; /* Polkit will call us back */
-
          service = new0(DnssdService, 1);
          if (!service)
                  return log_oom();
@@ -1771,6 +1762,15 @@ static int bus_method_register_service(sd_bus_message *message, void *userdata,
          if (r < 0)
                  return r;
  
+        r = bus_verify_polkit_async(message, CAP_SYS_ADMIN,
+                                    "org.freedesktop.resolve1.register-service",
+                                    NULL, false, UID_INVALID,
+                                    &m->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          r = hashmap_ensure_allocated(&m->dnssd_services, &string_hash_ops);
          if (r < 0)
                  return r;
@@ -1854,19 +1854,19 @@ static const sd_bus_vtable resolve_vtable[] = {
          SD_BUS_METHOD("ResolveAddress", "iiayt", "a(is)t", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED),
          SD_BUS_METHOD("ResolveRecord", "isqqt", "a(iqqay)t", bus_method_resolve_record, SD_BUS_VTABLE_UNPRIVILEGED),
          SD_BUS_METHOD("ResolveService", "isssit", "a(qqqsa(iiay)s)aayssst", bus_method_resolve_service, SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD("ResetStatistics", NULL, NULL, bus_method_reset_statistics, 0),
-        SD_BUS_METHOD("FlushCaches", NULL, NULL, bus_method_flush_caches, 0),
-        SD_BUS_METHOD("ResetServerFeatures", NULL, NULL, bus_method_reset_server_features, 0),
+        SD_BUS_METHOD("ResetStatistics", NULL, NULL, bus_method_reset_statistics, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("FlushCaches", NULL, NULL, bus_method_flush_caches, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("ResetServerFeatures", NULL, NULL, bus_method_reset_server_features, SD_BUS_VTABLE_UNPRIVILEGED),
          SD_BUS_METHOD("GetLink", "i", "o", bus_method_get_link, SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD("SetLinkDNS", "ia(iay)", NULL, bus_method_set_link_dns_servers, 0),
-        SD_BUS_METHOD("SetLinkDomains", "ia(sb)", NULL, bus_method_set_link_domains, 0),
-        SD_BUS_METHOD("SetLinkDefaultRoute", "ib", NULL, bus_method_set_link_default_route, 0),
-        SD_BUS_METHOD("SetLinkLLMNR", "is", NULL, bus_method_set_link_llmnr, 0),
-        SD_BUS_METHOD("SetLinkMulticastDNS", "is", NULL, bus_method_set_link_mdns, 0),
-        SD_BUS_METHOD("SetLinkDNSOverTLS", "is", NULL, bus_method_set_link_dns_over_tls, 0),
-        SD_BUS_METHOD("SetLinkDNSSEC", "is", NULL, bus_method_set_link_dnssec, 0),
-        SD_BUS_METHOD("SetLinkDNSSECNegativeTrustAnchors", "ias", NULL, bus_method_set_link_dnssec_negative_trust_anchors, 0),
-        SD_BUS_METHOD("RevertLink", "i", NULL, bus_method_revert_link, 0),
+        SD_BUS_METHOD("SetLinkDNS", "ia(iay)", NULL, bus_method_set_link_dns_servers, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkDomains", "ia(sb)", NULL, bus_method_set_link_domains, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkDefaultRoute", "ib", NULL, bus_method_set_link_default_route, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkLLMNR", "is", NULL, bus_method_set_link_llmnr, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkMulticastDNS", "is", NULL, bus_method_set_link_mdns, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkDNSOverTLS", "is", NULL, bus_method_set_link_dns_over_tls, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkDNSSEC", "is", NULL, bus_method_set_link_dnssec, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLinkDNSSECNegativeTrustAnchors", "ias", NULL, bus_method_set_link_dnssec_negative_trust_anchors, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("RevertLink", "i", NULL, bus_method_revert_link, SD_BUS_VTABLE_UNPRIVILEGED),
  
          SD_BUS_METHOD("RegisterService", "sssqqqaa{say}", "o", bus_method_register_service, SD_BUS_VTABLE_UNPRIVILEGED),
          SD_BUS_METHOD("UnregisterService", "o", NULL, bus_method_unregister_service, SD_BUS_VTABLE_UNPRIVILEGED),
diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c

index 262f63cae3c9587189959c484dd8b61e809cc3c6..fb54d160da4fa754f751b0b25a2d5e4ecbe7412b 100644 (file)
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -1183,8 +1183,8 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use
          if (ERRNO_IS_DISCONNECT(-r)) {
                  usec_t usec;
  
-                /* UDP connection failure get reported via ICMP and then are possible delivered to us on the next
-                 * recvmsg(). Treat this like a lost packet. */
+                /* UDP connection failures get reported via ICMP and then are possibly delivered to us on the
+                 * next recvmsg(). Treat this like a lost packet. */
  
                  log_debug_errno(r, "Connection failure for DNS UDP packet: %m");
                  assert_se(sd_event_now(t->scope->manager->event, clock_boottime_or_monotonic(), &usec) >= 0);
@@ -1198,6 +1198,9 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use
                  t->answer_errno = -r;
                  return 0;
          }
+        if (r == 0)
+                /* Spurious wakeup without any data */
+                return 0;
  
          r = dns_packet_validate_reply(p);
          if (r < 0) {
diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c

index 81ef5ffaa4fa99957db2958b56b3626dc31aca35..b6c1476f5cbe7e4fd52ab2ea72160daefc3cc645 100644 (file)
--- a/src/resolve/resolved-link-bus.c
+++ b/src/resolve/resolved-link-bus.c
@@ -1,6 +1,8 @@
  /* SPDX-License-Identifier: LGPL-2.1+ */
  
  #include <net/if.h>
+#include <netinet/in.h>
+#include <sys/capability.h>
  
  #include "alloc-util.h"
  #include "bus-common-errors.h"
@@ -11,6 +13,7 @@
  #include "resolved-link-bus.h"
  #include "resolved-resolv-conf.h"
  #include "strv.h"
+#include "user-util.h"
  
  static BUS_DEFINE_PROPERTY_GET(property_get_dnssec_supported, "b", Link, link_dnssec_supported);
  static BUS_DEFINE_PROPERTY_GET2(property_get_dnssec_mode, "s", Link, link_get_dnssec_mode, dnssec_mode_to_string);
@@ -262,6 +265,15 @@ int bus_link_method_set_dns_servers(sd_bus_message *message, void *userdata, sd_
          if (r < 0)
                  return r;
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-dns-servers",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          dns_server_mark_all(l->dns_servers);
  
          for (i = 0; i < n; i++) {
@@ -325,12 +337,21 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
                          return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Root domain is not suitable as search domain");
          }
  
-        dns_search_domain_mark_all(l->search_domains);
-
          r = sd_bus_message_rewind(message, false);
          if (r < 0)
                  return r;
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-domains",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
+        dns_search_domain_mark_all(l->search_domains);
+
          for (;;) {
                  DnsSearchDomain *d;
                  const char *name;
@@ -388,6 +409,15 @@ int bus_link_method_set_default_route(sd_bus_message *message, void *userdata, s
          if (r < 0)
                  return r;
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-default-route",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          if (l->default_route != b) {
                  l->default_route = b;
  
@@ -423,6 +453,15 @@ int bus_link_method_set_llmnr(sd_bus_message *message, void *userdata, sd_bus_er
                          return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid LLMNR setting: %s", llmnr);
          }
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-llmnr",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          l->llmnr_support = mode;
          link_allocate_scopes(l);
          link_add_rrs(l, false);
@@ -457,6 +496,15 @@ int bus_link_method_set_mdns(sd_bus_message *message, void *userdata, sd_bus_err
                          return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid MulticastDNS setting: %s", mdns);
          }
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-mdns",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          l->mdns_support = mode;
          link_allocate_scopes(l);
          link_add_rrs(l, false);
@@ -491,6 +539,15 @@ int bus_link_method_set_dns_over_tls(sd_bus_message *message, void *userdata, sd
                          return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNSOverTLS setting: %s", dns_over_tls);
          }
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-dns-over-tls",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          link_set_dns_over_tls_mode(l, mode);
  
          (void) link_save_user(l);
@@ -523,6 +580,15 @@ int bus_link_method_set_dnssec(sd_bus_message *message, void *userdata, sd_bus_e
                          return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid DNSSEC setting: %s", dnssec);
          }
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-dnssec",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          link_set_dnssec_mode(l, mode);
  
          (void) link_save_user(l);
@@ -544,6 +610,10 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v
          if (r < 0)
                  return r;
  
+        ns = set_new(&dns_name_hash_ops);
+        if (!ns)
+                return -ENOMEM;
+
          r = sd_bus_message_read_strv(message, &ntas);
          if (r < 0)
                  return r;
@@ -553,19 +623,23 @@ int bus_link_method_set_dnssec_negative_trust_anchors(sd_bus_message *message, v
                  if (r < 0)
                          return r;
                  if (r == 0)
-                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid negative trust anchor domain: %s", *i);
-        }
-
-        ns = set_new(&dns_name_hash_ops);
-        if (!ns)
-                return -ENOMEM;
+                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
+                                                 "Invalid negative trust anchor domain: %s", *i);
  
-        STRV_FOREACH(i, ntas) {
                  r = set_put_strdup(ns, *i);
                  if (r < 0)
                          return r;
          }
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.set-dnssec-negative-trust-anchors",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          set_free_free(l->dnssec_negative_trust_anchors);
          l->dnssec_negative_trust_anchors = TAKE_PTR(ns);
  
@@ -585,6 +659,15 @@ int bus_link_method_revert(sd_bus_message *message, void *userdata, sd_bus_error
          if (r < 0)
                  return r;
  
+        r = bus_verify_polkit_async(message, CAP_NET_ADMIN,
+                                    "org.freedesktop.resolve1.revert",
+                                    NULL, true, UID_INVALID,
+                                    &l->manager->polkit_registry, error);
+        if (r < 0)
+                return r;
+        if (r == 0)
+                return 1; /* Polkit will call us back */
+
          link_flush_settings(l);
          link_allocate_scopes(l);
          link_add_rrs(l, false);
@@ -610,15 +693,15 @@ const sd_bus_vtable link_vtable[] = {
          SD_BUS_PROPERTY("DNSSECNegativeTrustAnchors", "as", property_get_ntas, 0, 0),
          SD_BUS_PROPERTY("DNSSECSupported", "b", property_get_dnssec_supported, 0, 0),
  
-        SD_BUS_METHOD("SetDNS", "a(iay)", NULL, bus_link_method_set_dns_servers, 0),
-        SD_BUS_METHOD("SetDomains", "a(sb)", NULL, bus_link_method_set_domains, 0),
-        SD_BUS_METHOD("SetDefaultRoute", "b", NULL, bus_link_method_set_default_route, 0),
-        SD_BUS_METHOD("SetLLMNR", "s", NULL, bus_link_method_set_llmnr, 0),
-        SD_BUS_METHOD("SetMulticastDNS", "s", NULL, bus_link_method_set_mdns, 0),
-        SD_BUS_METHOD("SetDNSOverTLS", "s", NULL, bus_link_method_set_dns_over_tls, 0),
-        SD_BUS_METHOD("SetDNSSEC", "s", NULL, bus_link_method_set_dnssec, 0),
-        SD_BUS_METHOD("SetDNSSECNegativeTrustAnchors", "as", NULL, bus_link_method_set_dnssec_negative_trust_anchors, 0),
-        SD_BUS_METHOD("Revert", NULL, NULL, bus_link_method_revert, 0),
+        SD_BUS_METHOD("SetDNS", "a(iay)", NULL, bus_link_method_set_dns_servers, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetDomains", "a(sb)", NULL, bus_link_method_set_domains, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetDefaultRoute", "b", NULL, bus_link_method_set_default_route, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetLLMNR", "s", NULL, bus_link_method_set_llmnr, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetMulticastDNS", "s", NULL, bus_link_method_set_mdns, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetDNSOverTLS", "s", NULL, bus_link_method_set_dns_over_tls, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetDNSSEC", "s", NULL, bus_link_method_set_dnssec, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetDNSSECNegativeTrustAnchors", "as", NULL, bus_link_method_set_dnssec_negative_trust_anchors, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("Revert", NULL, NULL, bus_link_method_revert, SD_BUS_VTABLE_UNPRIVILEGED),
  
          SD_BUS_VTABLE_END
  };
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c

index b0c6e4885fa07b1473c013ed749cf2048ae22bf9..3b4c99e9ee9881ca5b04e02c06b3c4dc3794c088 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -257,7 +257,7 @@ static int boot_entries_find(
          assert(entries);
          assert(n_entries);
  
-        r = conf_files_list(&files, ".conf", NULL, 0, dir, NULL);
+        r = conf_files_list(&files, ".conf", NULL, 0, dir);
          if (r < 0)
                  return log_error_errno(r, "Failed to list files in \"%s\": %m", dir);
  
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c

index 6af115e7aad8d463430676a2880b332a6dbe973d..e9b0b8a99d9dca6028e14afc74a722968a4641db 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1681,7 +1681,8 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
  
          assert(ret);
  
-        /* Match like sd_bus_open_system(), but with the "watch_bind" feature and the Connected() signal turned on. */
+        /* Match like sd_bus_open_system(), but with the "watch_bind" feature and the Connected() signal
+         * turned on. */
  
          r = sd_bus_new(&bus);
          if (r < 0)
@@ -1705,10 +1706,6 @@ int bus_open_system_watch_bind_with_description(sd_bus **ret, const char *descri
          if (r < 0)
                  return r;
  
-        r = sd_bus_set_trusted(bus, true);
-        if (r < 0)
-                return r;
-
          r = sd_bus_negotiate_creds(bus, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_EUID|SD_BUS_CREDS_EFFECTIVE_CAPS);
          if (r < 0)
                  return r;
@@ -1737,8 +1734,8 @@ int bus_reply_pair_array(sd_bus_message *m, char **l) {
  
          assert(m);
  
-        /* Reply to the specified message with a message containing a dictionary put together from the specified
-         * strv */
+        /* Reply to the specified message with a message containing a dictionary put together from the
+         * specified strv */
  
          r = sd_bus_message_new_method_return(m, &reply);
          if (r < 0)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c

index a495c2538ba9c3543bbd2b707bfdc478e91de0fd..40792086da13c1b5b13dc627fd6535d6edb35600 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -760,7 +760,7 @@ int config_parse_strv(
          for (;;) {
                  char *word = NULL;
  
-                r = extract_first_word(&rvalue, &word, NULL, EXTRACT_UNQUOTE);
+                r = extract_first_word(&rvalue, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE);
                  if (r == 0)
                          break;
                  if (r == -ENOMEM)
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c

index f1caddb477d3cb29fd2510afc441a315f727a24b..6bf0ff0316a98d4f7b92c4418ecdd195b263b8c0 100644 (file)
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -704,7 +704,7 @@ int lookup_paths_init(
                  return -ENOMEM;
  
          *p = (LookupPaths) {
-                .search_path = strv_uniq(paths),
+                .search_path = strv_uniq(TAKE_PTR(paths)),
  
                  .persistent_config = TAKE_PTR(persistent_config),
                  .runtime_config = TAKE_PTR(runtime_config),
@@ -725,7 +725,6 @@ int lookup_paths_init(
                  .temporary_dir = TAKE_PTR(tempdir),
          };
  
-        paths = NULL;
          return 0;
  }
  
@@ -754,64 +753,9 @@ void lookup_paths_free(LookupPaths *p) {
          p->temporary_dir = mfree(p->temporary_dir);
  }
  
-int lookup_paths_reduce(LookupPaths *p) {
-        _cleanup_free_ struct stat *stats = NULL;
-        size_t n_stats = 0, allocated = 0;
-        size_t c = 0;
-        int r;
-
+void lookup_paths_log(LookupPaths *p) {
          assert(p);
  
-        /* Drop duplicates and non-existing directories from the search path. We figure out whether two directories are
-         * the same by comparing their device and inode numbers. */
-
-        if (!p->search_path)
-                return 0;
-
-        while (p->search_path[c]) {
-                struct stat st;
-                size_t k;
-
-                /* Never strip the transient and control directories from the path */
-                if (path_equal_ptr(p->search_path[c], p->transient) ||
-                    path_equal_ptr(p->search_path[c], p->persistent_control) ||
-                    path_equal_ptr(p->search_path[c], p->runtime_control)) {
-                        c++;
-                        continue;
-                }
-
-                r = chase_symlinks_and_stat(p->search_path[c], p->root_dir, 0, NULL, &st);
-                if (r == -ENOENT)
-                        goto remove_item;
-                if (r < 0) {
-                        /* If something we don't grok happened, let's better leave it in. */
-                        log_debug_errno(r, "Failed to chase and stat %s: %m", p->search_path[c]);
-                        c++;
-                        continue;
-                }
-
-                for (k = 0; k < n_stats; k++)
-                        if (stats[k].st_dev == st.st_dev &&
-                            stats[k].st_ino == st.st_ino)
-                                break;
-
-                if (k < n_stats) /* Is there already an entry with the same device/inode? */
-                        goto remove_item;
-
-                if (!GREEDY_REALLOC(stats, allocated, n_stats+1))
-                        return -ENOMEM;
-
-                stats[n_stats++] = st;
-                c++;
-                continue;
-
-        remove_item:
-                free(p->search_path[c]);
-                memmove(p->search_path + c,
-                        p->search_path + c + 1,
-                        (strv_length(p->search_path + c + 1) + 1) * sizeof(char*));
-        }
-
          if (strv_isempty(p->search_path)) {
                  log_debug("Ignoring unit files.");
                  p->search_path = strv_free(p->search_path);
@@ -819,13 +763,8 @@ int lookup_paths_reduce(LookupPaths *p) {
                  _cleanup_free_ char *t;
  
                  t = strv_join(p->search_path, "\n\t");
-                if (!t)
-                        return -ENOMEM;
-
-                log_debug("Looking for unit files in (higher priority first):\n\t%s", t);
+                log_debug("Looking for unit files in (higher priority first):\n\t%s", strna(t));
          }
-
-        return 0;
  }
  
  int lookup_paths_mkdir_generator(LookupPaths *p) {
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h

index 7070b9424983d3b4bc29b126c68c94354e122195..f0762d248a0c65578ea31826939a61bea27de3af 100644 (file)
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -63,7 +63,7 @@ int xdg_user_data_dir(char **ret, const char *suffix);
  bool path_is_user_data_dir(const char *path);
  bool path_is_user_config_dir(const char *path);
  
-int lookup_paths_reduce(LookupPaths *p);
+void lookup_paths_log(LookupPaths *p);
  
  int lookup_paths_mkdir_generator(LookupPaths *p);
  void lookup_paths_trim_generator(LookupPaths *p);
diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c

index 96e74a758f09229301e42d807a9c896a25138432..5772918c374b21ae825d69d03910006b74d51d45 100644 (file)
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -213,13 +213,17 @@ void print_separator(void) {
                  fputs("\n\n", stdout);
  }
  
-static int guess_type(const char **name, bool *is_usr, bool *is_collection, const char **extension) {
+static int guess_type(const char **name, char ***prefixes, bool *is_collection, const char **extension) {
          /* Try to figure out if name is like tmpfiles.d/ or systemd/system-presets/,
           * i.e. a collection of directories without a main config file. */
  
          _cleanup_free_ char *n = NULL;
-        bool usr = false, coll = false;
+        bool usr = false, run = false, coll = false;
          const char *ext = ".conf";
+        /* This is static so that the array doesn't get deallocated when we exit the function */
+        static const char* const std_prefixes[] = { CONF_PATHS(""), NULL };
+        static const char* const usr_prefixes[] = { CONF_PATHS_USR(""), NULL };
+        static const char* const run_prefixes[] = { "/run/", NULL };
  
          if (path_equal(*name, "environment.d"))
                  /* Special case: we need to include /etc/environment in the search path, even
@@ -252,6 +256,11 @@ static int guess_type(const char **name, bool *is_usr, bool *is_collection, cons
                  ext = ".list";
          }
  
+        if (path_equal(n, "systemd/relabel-extra.d")) {
+                coll = run = true;
+                ext = ".relabel";
+        }
+
          if (PATH_IN_SET(n, "systemd/system-preset", "systemd/user-preset")) {
                  coll = true;
                  ext = ".preset";
@@ -260,7 +269,7 @@ static int guess_type(const char **name, bool *is_usr, bool *is_collection, cons
          if (path_equal(n, "systemd/user-preset"))
                  usr = true;
  
-        *is_usr = usr;
+        *prefixes = (char**) (usr ? usr_prefixes : run ? run_prefixes : std_prefixes);
          *is_collection = coll;
          *extension = ext;
          return 0;
@@ -269,19 +278,19 @@ static int guess_type(const char **name, bool *is_usr, bool *is_collection, cons
  int conf_files_cat(const char *root, const char *name) {
          _cleanup_strv_free_ char **dirs = NULL, **files = NULL;
          _cleanup_free_ char *path = NULL;
-        char **dir;
-        bool is_usr, is_collection;
+        char **prefixes, **prefix;
+        bool is_collection;
          const char *extension;
          char **t;
          int r;
  
-        r = guess_type(&name, &is_usr, &is_collection, &extension);
+        r = guess_type(&name, &prefixes, &is_collection, &extension);
          if (r < 0)
                  return r;
  
-        STRV_FOREACH(dir, is_usr ? CONF_PATHS_USR_STRV("") : CONF_PATHS_STRV("")) {
-                assert(endswith(*dir, "/"));
-                r = strv_extendf(&dirs, "%s%s%s", *dir, name,
+        STRV_FOREACH(prefix, prefixes) {
+                assert(endswith(*prefix, "/"));
+                r = strv_extendf(&dirs, "%s%s%s", *prefix, name,
                                   is_collection ? "" : ".d");
                  if (r < 0)
                          return log_error_errno(r, "Failed to build directory list: %m");
diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c

index 498e8ee84a64203f1e5bd38c5675ea8ccb11cb10..acfe4352839799140718fd74d5df863e53779856 100644 (file)
--- a/src/shared/seccomp-util.c
+++ b/src/shared/seccomp-util.c
@@ -760,6 +760,7 @@ const SyscallFilterSet syscall_filter_sets[_SYSCALL_FILTER_SET_MAX] = {
                  "msync\0"
                  "sync\0"
                  "sync_file_range\0"
+                "sync_file_range2\0"
                  "syncfs\0"
          },
          [SYSCALL_FILTER_SET_SYSTEM_SERVICE] = {
@@ -1521,6 +1522,7 @@ int seccomp_memory_deny_write_execute(void) {
                  switch (arch) {
  
                  case SCMP_ARCH_X86:
+                case SCMP_ARCH_S390:
                          filter_syscall = SCMP_SYS(mmap2);
                          block_syscall = SCMP_SYS(mmap);
                          shmat_syscall = SCMP_SYS(shmat);
@@ -1545,13 +1547,14 @@ int seccomp_memory_deny_write_execute(void) {
                  case SCMP_ARCH_X86_64:
                  case SCMP_ARCH_X32:
                  case SCMP_ARCH_AARCH64:
-                        filter_syscall = SCMP_SYS(mmap); /* amd64, x32, and arm64 have only mmap */
+                case SCMP_ARCH_S390X:
+                        filter_syscall = SCMP_SYS(mmap); /* amd64, x32, s390x, and arm64 have only mmap */
                          shmat_syscall = SCMP_SYS(shmat);
                          break;
  
                  /* Please add more definitions here, if you port systemd to other architectures! */
  
-#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__powerpc64__) && !defined(__arm__) && !defined(__aarch64__)
+#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__powerpc64__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__s390__) && !defined(__s390x__)
  #warning "Consider adding the right mmap() syscall definitions here!"
  #endif
                  }
diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c

index db73c9bd4b684501d5c59a02e4c268f95d22fd86..4a5f23e6c1bcbb0e76ffe9a508d661022fc98189 100644 (file)
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -242,10 +242,19 @@ int unit_file_build_name_map(
                  if (!lookup_paths_mtime_exclude(lp, *dir))
                          mtime = MAX(mtime, timespec_load(&st.st_mtim));
  
-                FOREACH_DIRENT(de, d, log_warning_errno(errno, "Failed to read \"%s\", ignoring: %m", *dir)) {
+                FOREACH_DIRENT_ALL(de, d, log_warning_errno(errno, "Failed to read \"%s\", ignoring: %m", *dir)) {
                          char *filename;
                          _cleanup_free_ char *_filename_free = NULL, *simplified = NULL;
                          const char *suffix, *dst = NULL;
+                        bool valid_unit_name;
+
+                        valid_unit_name = unit_name_is_valid(de->d_name, UNIT_NAME_ANY);
+
+                        /* We only care about valid units and dirs with certain suffixes, let's ignore the
+                         * rest. */
+                        if (!valid_unit_name &&
+                            !ENDSWITH_SET(de->d_name, ".wants", ".requires", ".d"))
+                                continue;
  
                          filename = path_join(*dir, de->d_name);
                          if (!filename)
@@ -260,7 +269,7 @@ int unit_file_build_name_map(
                          } else
                                  _filename_free = filename; /* Make sure we free the filename. */
  
-                        if (!unit_name_is_valid(de->d_name, UNIT_NAME_ANY))
+                        if (!valid_unit_name)
                                  continue;
                          assert_se(suffix = strrchr(de->d_name, '.'));
  
@@ -415,7 +424,7 @@ int unit_file_find_fragment(
                  return -ENOMEM;
  
          /* The unit always has its own name if it's not a template. */
-        if (unit_name_is_valid(unit_name, UNIT_NAME_PLAIN | UNIT_NAME_INSTANCE)) {
+        if (IN_SET(name_type, UNIT_NAME_PLAIN, UNIT_NAME_INSTANCE)) {
                  r = set_put_strdup(names, unit_name);
                  if (r < 0)
                          return r;
@@ -430,12 +439,12 @@ int unit_file_find_fragment(
                  /* Add any aliases of the original name to the set of names */
                  nnn = hashmap_get(unit_name_map, basename(fragment));
                  STRV_FOREACH(t, nnn) {
-                        if (instance && unit_name_is_valid(*t, UNIT_NAME_TEMPLATE)) {
+                        if (name_type == UNIT_NAME_INSTANCE && unit_name_is_valid(*t, UNIT_NAME_TEMPLATE)) {
                                  char *inst;
  
                                  r = unit_name_replace_instance(*t, instance, &inst);
                                  if (r < 0)
-                                    return log_debug_errno(r, "Cannot build instance name %s+%s: %m", *t, instance);
+                                        return log_debug_errno(r, "Cannot build instance name %s+%s: %m", *t, instance);
  
                                  if (!streq(unit_name, inst))
                                          log_debug("%s: %s has alias %s", __func__, unit_name, inst);
@@ -488,7 +497,7 @@ int unit_file_find_fragment(
                                  }
  
                                  if (!streq(unit_name, inst))
-                                        log_info("%s: %s has alias %s", __func__, unit_name, inst);
+                                        log_debug("%s: %s has alias %s", __func__, unit_name, inst);
                                  r = set_consume(names, TAKE_PTR(inst));
                                  if (r < 0)
                                          return r;
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c

index c423af6917a534e164d303d6e442237d394b3330..98fefb39569b51fc2e750bb62d128a1fba0a43c8 100644 (file)
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -82,7 +82,16 @@ static int open_watchdog(void) {
  }
  
  int watchdog_set_device(char *path) {
-        return free_and_strdup(&watchdog_device, path);
+        int r;
+
+        r = free_and_strdup(&watchdog_device, path);
+        if (r < 0)
+                return r;
+
+        if (r > 0) /* watchdog_device changed */
+                watchdog_fd = safe_close(watchdog_fd);
+
+        return r;
  }
  
  int watchdog_set_timeout(usec_t *usec) {
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c

index a574a0704190bb845836feb144695b6e1666a25f..0eb17989d0a54948eef3664bb9eb3bea9fcd24ab 100644 (file)
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -508,7 +508,6 @@ int main(int argc, char *argv[]) {
                          log_error_errno(errno, "Failed to execute shutdown binary: %m");
                  } else
                          log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
-
          }
  
          if (need_umount || need_swapoff || need_loop_detach || need_dm_detach)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c

index d3c643bfad42f1daffab3a83f936c50ca2bc7114..dcf76bed7c0ea7cee7af1abd4f15410355a56409 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5874,7 +5874,7 @@ static int cat(int argc, char *argv[], void *userdata) {
          bool first = true;
          int r;
  
-        /* Include all units by default - i.e. continue as if the --all
+        /* Include all units by default — i.e. continue as if the --all
           * option was used */
          if (strv_isempty(arg_states))
                  arg_all = true;
diff --git a/src/systemd/sd-dhcp6-client.h b/src/systemd/sd-dhcp6-client.h

index 43d38f5c7da66bb618699cf28b294be921d5f2de..3aac3f14fe30f1a6e5007d1a15e3bf1b0cafd758 100644 (file)
--- a/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/sd-dhcp6-client.h
@@ -66,6 +66,7 @@ enum {
          SD_DHCP6_OPTION_IA_PD_PREFIX               = 26,  /* RFC 3633, prefix delegation */
  
          SD_DHCP6_OPTION_SNTP_SERVERS               = 31,  /* RFC 4075, deprecated */
+        SD_DHCP6_OPTION_INFORMATION_REFRESH_TIME   = 32,  /* RFC 8415, sec. 21.23 */
  
          /* option code 35 is unassigned */
  
diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h

index c78f7c86bb49617b53d21a41f13c59688c6f6917..1cf4c2ec9d8d040bd82536f25f8b6bb68dbf8090 100644 (file)
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -110,6 +110,10 @@ int sd_network_link_get_network_file(int ifindex, char **filename);
   * IP addresses */
  int sd_network_link_get_dns(int ifindex, char ***ret);
  
+/* Get DHCP4 address for a given link. This is string representations of
+ * IPv4 address */
+int sd_network_link_get_dhcp4_address(int ifindex, char **ret);
+
  /* Get NTP entries for a given link. These are domain names or string
   * representations of IP addresses */
  int sd_network_link_get_ntp(int ifindex, char ***ret);
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c

index d4d3f3b4a5bb253030ef479e2177ec2f8a48ab66..1fc1b0ae96162b3af5c1181cf9cdb02cab18a738 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -428,7 +428,7 @@ static int write_temporary_passwd(const char *passwd_path, FILE **tmpfile, char
                          .pw_passwd = (char*) "x",
  
                          /* We default to the root directory as home */
-                        .pw_dir = i->home ? i->home : (char*) "/",
+                        .pw_dir = i->home ?: (char*) "/",
  
                          /* Initialize the shell to nologin, with one exception:
                           * for root we patch in something special */
@@ -522,13 +522,13 @@ static int write_temporary_shadow(const char *shadow_path, FILE **tmpfile, char
          ORDERED_HASHMAP_FOREACH(i, todo_uids, iterator) {
                  struct spwd n = {
                          .sp_namp = i->name,
-                        .sp_pwdp = (char*) "!!",
+                        .sp_pwdp = (char*) "!!", /* lock this password, and make it invalid */
                          .sp_lstchg = lstchg,
                          .sp_min = -1,
                          .sp_max = -1,
                          .sp_warn = -1,
                          .sp_inact = -1,
-                        .sp_expire = -1,
+                        .sp_expire = i->uid == 0 ? -1 : 1, /* lock account as a whole, unless this is root */
                          .sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
                  };
  
diff --git a/src/test/meson.build b/src/test/meson.build

index de31e977bc2c1ad9832d2315920674ae915ee177..a8c3e59098e1c048cd7fd6129055dd36415f9fe8 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -771,6 +771,11 @@ tests += [
          [['src/test/test-local-addresses.c'],
           [],
           []],
+
+        [['src/test/test-fido-id-desc.c',
+          'src/udev/fido_id/fido_id_desc.c'],
+         [],
+         []],
  ]
  
  ############################################################
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c

index a3239d73f5ec034654254d75593a92433a72e2f8..b54b5e76c67a92a23895fe1cde26b906571df16d 100644 (file)
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -341,7 +341,7 @@ static void test_is_wanted_print(bool header) {
          log_info("cmdline: %s", cmdline);
          if (header) {
  
-                log_info(_CGROUP_HIEARCHY_);
+                log_info(_CGROUP_HIERARCHY_);
                  (void) system("findmnt -n /sys/fs/cgroup");
          }
  
diff --git a/src/test/test-conf-files.c b/src/test/test-conf-files.c

index 61811311f4903c62e8f0f403be1fbde6c7644303..f37f32f1b5288f29cbfd23805cb8166ff036588f 100644 (file)
--- a/src/test/test-conf-files.c
+++ b/src/test/test-conf-files.c
@@ -42,38 +42,34 @@ static void setup_test_dir(char *tmp_dir, const char *files, ...) {
  static void test_conf_files_list(bool use_root) {
          char tmp_dir[] = "/tmp/test-conf-files-XXXXXX";
          _cleanup_strv_free_ char **found_files = NULL, **found_files2 = NULL;
-        const char *root_dir, *search_1, *search_2, *expect_a, *expect_b, *expect_c, *mask;
+        const char *root_dir, *search, *expect_a, *expect_b, *expect_c, *mask;
  
-        log_debug("/* %s(%s) */", __func__, yes_no(use_root));
+        log_info("/* %s(%s) */", __func__, yes_no(use_root));
  
          setup_test_dir(tmp_dir,
-                       "/dir1/a.conf",
-                       "/dir2/a.conf",
-                       "/dir2/b.conf",
-                       "/dir2/c.foo",
-                       "/dir2/d.conf",
+                       "/dir/a.conf",
+                       "/dir/b.conf",
+                       "/dir/c.foo",
                         NULL);
  
-        mask = strjoina(tmp_dir, "/dir1/d.conf");
+        mask = strjoina(tmp_dir, "/dir/d.conf");
          assert_se(symlink("/dev/null", mask) >= 0);
  
          if (use_root) {
                  root_dir = tmp_dir;
-                search_1 = "/dir1";
-                search_2 = "/dir2";
+                search = "/dir";
          } else {
                  root_dir = NULL;
-                search_1 = strjoina(tmp_dir, "/dir1");
-                search_2 = strjoina(tmp_dir, "/dir2");
+                search = strjoina(tmp_dir, "/dir");
          }
  
-        expect_a = strjoina(tmp_dir, "/dir1/a.conf");
-        expect_b = strjoina(tmp_dir, "/dir2/b.conf");
-        expect_c = strjoina(tmp_dir, "/dir2/c.foo");
+        expect_a = strjoina(tmp_dir, "/dir/a.conf");
+        expect_b = strjoina(tmp_dir, "/dir/b.conf");
+        expect_c = strjoina(tmp_dir, "/dir/c.foo");
  
          log_debug("/* Check when filtered by suffix */");
  
-        assert_se(conf_files_list(&found_files, ".conf", root_dir, CONF_FILES_FILTER_MASKED, search_1, search_2, NULL) == 0);
+        assert_se(conf_files_list(&found_files, ".conf", root_dir, CONF_FILES_FILTER_MASKED, search) == 0);
          strv_print(found_files);
  
          assert_se(found_files);
@@ -82,7 +78,7 @@ static void test_conf_files_list(bool use_root) {
          assert_se(!found_files[2]);
  
          log_debug("/* Check when unfiltered */");
-        assert_se(conf_files_list(&found_files2, NULL, root_dir, CONF_FILES_FILTER_MASKED, search_1, search_2, NULL) == 0);
+        assert_se(conf_files_list(&found_files2, NULL, root_dir, CONF_FILES_FILTER_MASKED, search) == 0);
          strv_print(found_files2);
  
          assert_se(found_files2);
diff --git a/src/test/test-fido-id-desc.c b/src/test/test-fido-id-desc.c

new file mode 100644 (file)

index 0000000..cf55dd3
--- /dev/null
+++ b/src/test/test-fido-id-desc.c
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "fido_id/fido_id_desc.h"
+#include "macro.h"
+
+static void test_is_fido_security_token_desc__fido(void) {
+        static const uint8_t FIDO_HID_DESC_1[] = {
+                0x06, 0xd0, 0xf1, 0x09, 0x01, 0xa1, 0x01, 0x09, 0x20, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75,
+                0x08, 0x95, 0x40, 0x81, 0x02, 0x09, 0x21, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95,
+                0x40, 0x91, 0x02, 0xc0,
+        };
+        assert_se(is_fido_security_token_desc(FIDO_HID_DESC_1, sizeof(FIDO_HID_DESC_1)) > 0);
+
+        static const uint8_t FIDO_HID_DESC_2[] = {
+                0x05, 0x01, 0x09, 0x06, 0xa1, 0x01, 0x05, 0x07, 0x19, 0xe0, 0x29, 0xe7, 0x15, 0x00, 0x25,
+                0x01, 0x75, 0x01, 0x95, 0x08, 0x81, 0x02, 0x95, 0x01, 0x75, 0x08, 0x81, 0x01, 0x95, 0x05,
+                0x75, 0x01, 0x05, 0x08, 0x19, 0x01, 0x29, 0x05, 0x91, 0x02, 0x95, 0x01, 0x75, 0x03, 0x91,
+                0x01, 0x95, 0x06, 0x75, 0x08, 0x15, 0x00, 0x25, 0x65, 0x05, 0x07, 0x19, 0x00, 0x29, 0x65,
+                0x81, 0x00, 0x09, 0x03, 0x75, 0x08, 0x95, 0x08, 0xb1, 0x02, 0xc0,
+                0x06, 0xd0, 0xf1, 0x09, 0x01, 0xa1, 0x01, 0x09, 0x20, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75,
+                0x08, 0x95, 0x40, 0x81, 0x02, 0x09, 0x21, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95,
+                0x40, 0x91, 0x02, 0xc0,
+        };
+        assert_se(is_fido_security_token_desc(FIDO_HID_DESC_2, sizeof(FIDO_HID_DESC_2)) > 0);
+}
+
+static void test_is_fido_security_token_desc__non_fido(void) {
+        /* Wrong usage page */
+        static const uint8_t NON_FIDO_HID_DESC_1[] = {
+                0x06, 0xd0, 0xf0, 0x09, 0x01, 0xa1, 0x01, 0x09, 0x20, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75,
+                0x08, 0x95, 0x40, 0x81, 0x02, 0x09, 0x21, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95,
+                0x40, 0x91, 0x02, 0xc0,
+        };
+        assert_se(is_fido_security_token_desc(NON_FIDO_HID_DESC_1, sizeof(NON_FIDO_HID_DESC_1)) == 0);
+
+        /* Wrong usage */
+        static const uint8_t NON_FIDO_HID_DESC_2[] = {
+                0x06, 0xd0, 0xf1, 0x09, 0x02, 0xa1, 0x01, 0x09, 0x20, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75,
+                0x08, 0x95, 0x40, 0x81, 0x02, 0x09, 0x21, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95,
+                0x40, 0x91, 0x02, 0xc0,
+        };
+        assert_se(is_fido_security_token_desc(NON_FIDO_HID_DESC_2, sizeof(NON_FIDO_HID_DESC_2)) == 0);
+
+        static const uint8_t NON_FIDO_HID_DESC_3[] = {
+                0x05, 0x01, 0x09, 0x06, 0xa1, 0x01, 0x05, 0x07, 0x19, 0xe0, 0x29, 0xe7, 0x15, 0x00, 0x25,
+                0x01, 0x75, 0x01, 0x95, 0x08, 0x81, 0x02, 0x95, 0x01, 0x75, 0x08, 0x81, 0x01, 0x95, 0x05,
+                0x75, 0x01, 0x05, 0x08, 0x19, 0x01, 0x29, 0x05, 0x91, 0x02, 0x95, 0x01, 0x75, 0x03, 0x91,
+                0x01, 0x95, 0x06, 0x75, 0x08, 0x15, 0x00, 0x25, 0x65, 0x05, 0x07, 0x19, 0x00, 0x29, 0x65,
+                0x81, 0x00, 0x09, 0x03, 0x75, 0x08, 0x95, 0x08, 0xb1, 0x02, 0xc0,
+        };
+        assert_se(is_fido_security_token_desc(NON_FIDO_HID_DESC_3, sizeof(NON_FIDO_HID_DESC_3)) == 0);
+}
+
+static void test_is_fido_security_token_desc__invalid(void) {
+        /* Size coded on 1 byte, but no byte given */
+        static const uint8_t INVALID_HID_DESC_1[] = { 0x01 };
+        assert_se(is_fido_security_token_desc(INVALID_HID_DESC_1, sizeof(INVALID_HID_DESC_1)) < 0);
+
+        /* Size coded on 2 bytes, but only 1 byte given */
+        static const uint8_t INVALID_HID_DESC_2[] = { 0x02, 0x01 };
+        assert_se(is_fido_security_token_desc(INVALID_HID_DESC_2, sizeof(INVALID_HID_DESC_2)) < 0);
+
+        /* Size coded on 4 bytes, but only 3 bytes given */
+        static const uint8_t INVALID_HID_DESC_3[] = { 0x03, 0x01, 0x02, 0x03 };
+        assert_se(is_fido_security_token_desc(INVALID_HID_DESC_3, sizeof(INVALID_HID_DESC_3)) < 0);
+
+        /* Long item without a size byte */
+        static const uint8_t INVALID_HID_DESC_4[] = { 0xfe };
+        assert_se(is_fido_security_token_desc(INVALID_HID_DESC_4, sizeof(INVALID_HID_DESC_4)) < 0);
+
+        /* Usage pages are coded on at most 2 bytes */
+        static const uint8_t INVALID_HID_DESC_5[] = { 0x07, 0x01, 0x02, 0x03, 0x04 };
+        assert_se(is_fido_security_token_desc(INVALID_HID_DESC_5, sizeof(INVALID_HID_DESC_5)) < 0);
+}
+
+int main(int argc, char *argv[]) {
+        test_is_fido_security_token_desc__fido();
+        test_is_fido_security_token_desc__non_fido();
+        test_is_fido_security_token_desc__invalid();
+
+        return EXIT_SUCCESS;
+}
diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c

index f20855935866a94118023e2985135f14f1a5e41f..62ebc9c92385aca6b7779fef7629ad99c13a21d1 100644 (file)
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -22,15 +22,15 @@ static void test_paths(UnitFileScope scope) {
          assert_se(unsetenv("SYSTEMD_UNIT_PATH") == 0);
          assert_se(lookup_paths_init(&lp_without_env, scope, 0, NULL) >= 0);
          assert_se(!strv_isempty(lp_without_env.search_path));
-        assert_se(lookup_paths_reduce(&lp_without_env) >= 0);
+        lookup_paths_log(&lp_without_env);
  
          systemd_unit_path = strjoina(template, "/systemd-unit-path");
          assert_se(setenv("SYSTEMD_UNIT_PATH", systemd_unit_path, 1) == 0);
          assert_se(lookup_paths_init(&lp_with_env, scope, 0, NULL) == 0);
          assert_se(strv_length(lp_with_env.search_path) == 1);
          assert_se(streq(lp_with_env.search_path[0], systemd_unit_path));
-        assert_se(lookup_paths_reduce(&lp_with_env) >= 0);
-        assert_se(strv_isempty(lp_with_env.search_path));
+        lookup_paths_log(&lp_with_env);
+        assert_se(strv_equal(lp_with_env.search_path, STRV_MAKE(systemd_unit_path)));
  
          assert_se(rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0);
  }
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c

index 7fe732cf2ffe9b32bfd3960f81f2cbde51a4c22e..25c649828ef1634800e95cee7fcfee947d3c570e 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -50,6 +50,9 @@ static void test_unit_name_is_valid(void) {
          assert_se(!unit_name_is_valid("foo@.service", UNIT_NAME_INSTANCE));
          assert_se( unit_name_is_valid("foo@.service", UNIT_NAME_TEMPLATE));
          assert_se( unit_name_is_valid("foo@.service", UNIT_NAME_INSTANCE|UNIT_NAME_TEMPLATE));
+        assert_se( unit_name_is_valid(".test.service", UNIT_NAME_PLAIN));
+        assert_se( unit_name_is_valid(".test@.service", UNIT_NAME_TEMPLATE));
+        assert_se( unit_name_is_valid("_strange::::.service", UNIT_NAME_ANY));
  
          assert_se(!unit_name_is_valid(".service", UNIT_NAME_ANY));
          assert_se(!unit_name_is_valid("", UNIT_NAME_ANY));
diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c

index e6d7262e789346132396f03ace1399573ca0528b..9475b99c2803e37fa0297b8e6d6b40b00c842f6f 100644 (file)
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -61,6 +61,43 @@ static void test_uid_ptr(void) {
          assert_se(PTR_TO_UID(UID_TO_PTR(1000)) == 1000);
  }
  
+static void test_valid_user_group_name_compat(void) {
+        log_info("/* %s */", __func__);
+
+        assert_se(!valid_user_group_name_compat(NULL));
+        assert_se(!valid_user_group_name_compat(""));
+        assert_se(!valid_user_group_name_compat("1"));
+        assert_se(!valid_user_group_name_compat("65535"));
+        assert_se(!valid_user_group_name_compat("-1"));
+        assert_se(!valid_user_group_name_compat("-kkk"));
+        assert_se(!valid_user_group_name_compat("rööt"));
+        assert_se(!valid_user_group_name_compat("."));
+        assert_se(!valid_user_group_name_compat(".eff"));
+        assert_se(!valid_user_group_name_compat("foo\nbar"));
+        assert_se(!valid_user_group_name_compat("0123456789012345678901234567890123456789"));
+        assert_se(!valid_user_group_name_or_id_compat("aaa:bbb"));
+        assert_se(!valid_user_group_name_compat("."));
+        assert_se(!valid_user_group_name_compat(".1"));
+        assert_se(!valid_user_group_name_compat(".65535"));
+        assert_se(!valid_user_group_name_compat(".-1"));
+        assert_se(!valid_user_group_name_compat(".-kkk"));
+        assert_se(!valid_user_group_name_compat(".rööt"));
+        assert_se(!valid_user_group_name_or_id_compat(".aaa:bbb"));
+
+        assert_se(valid_user_group_name_compat("root"));
+        assert_se(valid_user_group_name_compat("lennart"));
+        assert_se(valid_user_group_name_compat("LENNART"));
+        assert_se(valid_user_group_name_compat("_kkk"));
+        assert_se(valid_user_group_name_compat("kkk-"));
+        assert_se(valid_user_group_name_compat("kk-k"));
+        assert_se(valid_user_group_name_compat("eff.eff"));
+        assert_se(valid_user_group_name_compat("eff."));
+
+        assert_se(valid_user_group_name_compat("some5"));
+        assert_se(!valid_user_group_name_compat("5some"));
+        assert_se(valid_user_group_name_compat("INNER5NUMBER"));
+}
+
  static void test_valid_user_group_name(void) {
          log_info("/* %s */", __func__);
  
@@ -72,10 +109,17 @@ static void test_valid_user_group_name(void) {
          assert_se(!valid_user_group_name("-kkk"));
          assert_se(!valid_user_group_name("rööt"));
          assert_se(!valid_user_group_name("."));
-        assert_se(!valid_user_group_name("eff.eff"));
+        assert_se(!valid_user_group_name(".eff"));
          assert_se(!valid_user_group_name("foo\nbar"));
          assert_se(!valid_user_group_name("0123456789012345678901234567890123456789"));
          assert_se(!valid_user_group_name_or_id("aaa:bbb"));
+        assert_se(!valid_user_group_name("."));
+        assert_se(!valid_user_group_name(".1"));
+        assert_se(!valid_user_group_name(".65535"));
+        assert_se(!valid_user_group_name(".-1"));
+        assert_se(!valid_user_group_name(".-kkk"));
+        assert_se(!valid_user_group_name(".rööt"));
+        assert_se(!valid_user_group_name_or_id(".aaa:bbb"));
  
          assert_se(valid_user_group_name("root"));
          assert_se(valid_user_group_name("lennart"));
@@ -83,12 +127,47 @@ static void test_valid_user_group_name(void) {
          assert_se(valid_user_group_name("_kkk"));
          assert_se(valid_user_group_name("kkk-"));
          assert_se(valid_user_group_name("kk-k"));
+        assert_se(!valid_user_group_name("eff.eff"));
+        assert_se(!valid_user_group_name("eff."));
  
          assert_se(valid_user_group_name("some5"));
          assert_se(!valid_user_group_name("5some"));
          assert_se(valid_user_group_name("INNER5NUMBER"));
  }
  
+static void test_valid_user_group_name_or_id_compat(void) {
+        log_info("/* %s */", __func__);
+
+        assert_se(!valid_user_group_name_or_id_compat(NULL));
+        assert_se(!valid_user_group_name_or_id_compat(""));
+        assert_se(valid_user_group_name_or_id_compat("0"));
+        assert_se(valid_user_group_name_or_id_compat("1"));
+        assert_se(valid_user_group_name_or_id_compat("65534"));
+        assert_se(!valid_user_group_name_or_id_compat("65535"));
+        assert_se(valid_user_group_name_or_id_compat("65536"));
+        assert_se(!valid_user_group_name_or_id_compat("-1"));
+        assert_se(!valid_user_group_name_or_id_compat("-kkk"));
+        assert_se(!valid_user_group_name_or_id_compat("rööt"));
+        assert_se(!valid_user_group_name_or_id_compat("."));
+        assert_se(!valid_user_group_name_or_id_compat(".eff"));
+        assert_se(valid_user_group_name_or_id_compat("eff.eff"));
+        assert_se(valid_user_group_name_or_id_compat("eff."));
+        assert_se(!valid_user_group_name_or_id_compat("foo\nbar"));
+        assert_se(!valid_user_group_name_or_id_compat("0123456789012345678901234567890123456789"));
+        assert_se(!valid_user_group_name_or_id_compat("aaa:bbb"));
+
+        assert_se(valid_user_group_name_or_id_compat("root"));
+        assert_se(valid_user_group_name_or_id_compat("lennart"));
+        assert_se(valid_user_group_name_or_id_compat("LENNART"));
+        assert_se(valid_user_group_name_or_id_compat("_kkk"));
+        assert_se(valid_user_group_name_or_id_compat("kkk-"));
+        assert_se(valid_user_group_name_or_id_compat("kk-k"));
+
+        assert_se(valid_user_group_name_or_id_compat("some5"));
+        assert_se(!valid_user_group_name_or_id_compat("5some"));
+        assert_se(valid_user_group_name_or_id_compat("INNER5NUMBER"));
+}
+
  static void test_valid_user_group_name_or_id(void) {
          log_info("/* %s */", __func__);
  
@@ -103,7 +182,9 @@ static void test_valid_user_group_name_or_id(void) {
          assert_se(!valid_user_group_name_or_id("-kkk"));
          assert_se(!valid_user_group_name_or_id("rööt"));
          assert_se(!valid_user_group_name_or_id("."));
+        assert_se(!valid_user_group_name_or_id(".eff"));
          assert_se(!valid_user_group_name_or_id("eff.eff"));
+        assert_se(!valid_user_group_name_or_id("eff."));
          assert_se(!valid_user_group_name_or_id("foo\nbar"));
          assert_se(!valid_user_group_name_or_id("0123456789012345678901234567890123456789"));
          assert_se(!valid_user_group_name_or_id("aaa:bbb"));
@@ -230,7 +311,9 @@ int main(int argc, char *argv[]) {
          test_parse_uid();
          test_uid_ptr();
  
+        test_valid_user_group_name_compat();
          test_valid_user_group_name();
+        test_valid_user_group_name_or_id_compat();
          test_valid_user_group_name_or_id();
          test_valid_gecos();
          test_valid_home();
diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c

new file mode 100644 (file)

index 0000000..5afd5dd
--- /dev/null
+++ b/src/udev/fido_id/fido_id.c
@@ -0,0 +1,96 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+/*
+ * Identifies FIDO CTAP1 ("U2F")/CTAP2 security tokens based on the usage declared in their report
+ * descriptor and outputs suitable environment variables.
+ *
+ * Inspired by Andrew Lutomirski's 'u2f-hidraw-policy.c'
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/hid.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "device-internal.h"
+#include "device-private.h"
+#include "device-util.h"
+#include "fd-util.h"
+#include "fido_id_desc.h"
+#include "log.h"
+#include "macro.h"
+#include "main-func.h"
+#include "path-util.h"
+#include "string-util.h"
+#include "udev-util.h"
+
+static int run(int argc, char **argv) {
+        _cleanup_(sd_device_unrefp) struct sd_device *device = NULL;
+        _cleanup_free_ char *desc_path = NULL;
+        _cleanup_close_ int fd = -1;
+
+        struct sd_device *hid_device;
+        const char *sys_path;
+        uint8_t desc[HID_MAX_DESCRIPTOR_SIZE];
+        ssize_t desc_len;
+
+        int r;
+
+        log_set_target(LOG_TARGET_AUTO);
+        udev_parse_config();
+        log_parse_environment();
+        log_open();
+
+        if (argc > 2)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Usage: hidraw_id [SYSFS_PATH]");
+
+        if (argc == 1) {
+                r = device_new_from_strv(&device, environ);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to get current device from environment: %m");
+        } else {
+                r = sd_device_new_from_syspath(&device, argv[1]);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to get device from syspath: %m");
+        }
+
+        r = sd_device_get_parent(device, &hid_device);
+        if (r < 0)
+                return log_device_error_errno(device, r, "Failed to get parent HID device: %m");
+
+        r = sd_device_get_syspath(hid_device, &sys_path);
+        if (r < 0)
+                return log_device_error_errno(hid_device, r, "Failed to get syspath for HID device: %m");
+
+        desc_path = path_join(sys_path, "report_descriptor");
+        if (!desc_path)
+                return log_oom();
+
+        fd = open(desc_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
+        if (fd < 0)
+                return log_device_error_errno(hid_device, errno,
+                                              "Failed to open report descriptor at '%s': %m", desc_path);
+
+        desc_len = read(fd, desc, sizeof(desc));
+        if (desc_len < 0)
+                return log_device_error_errno(hid_device, errno,
+                                              "Failed to read report descriptor at '%s': %m", desc_path);
+        if (desc_len == 0)
+                return log_device_debug_errno(hid_device, SYNTHETIC_ERRNO(EINVAL),
+                                              "Empty report descriptor at '%s'.", desc_path);
+
+        r = is_fido_security_token_desc(desc, desc_len);
+        if (r < 0)
+                return log_device_debug_errno(hid_device, r,
+                                              "Failed to parse report descriptor at '%s'.", desc_path);
+        if (r > 0) {
+                printf("ID_FIDO_TOKEN=1\n");
+                printf("ID_SECURITY_TOKEN=1\n");
+        }
+
+        return 0;
+}
+
+DEFINE_MAIN_FUNCTION(run);
diff --git a/src/udev/fido_id/fido_id_desc.c b/src/udev/fido_id/fido_id_desc.c

new file mode 100644 (file)

index 0000000..bbfcf93
--- /dev/null
+++ b/src/udev/fido_id/fido_id_desc.c
@@ -0,0 +1,92 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+/* Inspired by Andrew Lutomirski's 'u2f-hidraw-policy.c' */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "fido_id_desc.h"
+
+#define HID_RPTDESC_FIRST_BYTE_LONG_ITEM 0xfeu
+#define HID_RPTDESC_TYPE_GLOBAL 0x1u
+#define HID_RPTDESC_TYPE_LOCAL 0x2u
+#define HID_RPTDESC_TAG_USAGE_PAGE 0x0u
+#define HID_RPTDESC_TAG_USAGE 0x0u
+
+/*
+ * HID usage for FIDO CTAP1 ("U2F") and CTAP2 security tokens.
+ * https://fidoalliance.org/specs/fido-u2f-v1.0-ps-20141009/fido-u2f-u2f_hid.h-v1.0-ps-20141009.txt
+ * https://fidoalliance.org/specs/fido-v2.0-ps-20190130/fido-client-to-authenticator-protocol-v2.0-ps-20190130.html#usb-discovery
+ * https://www.usb.org/sites/default/files/hutrr48.pdf
+ */
+#define FIDO_FULL_USAGE_CTAPHID 0xf1d00001u
+
+/*
+ * Parses a HID report descriptor and identifies FIDO CTAP1 ("U2F")/CTAP2 security tokens based on their
+ * declared usage.
+ * A positive return value indicates that the report descriptor belongs to a FIDO security token.
+ * https://www.usb.org/sites/default/files/documents/hid1_11.pdf (Section 6.2.2)
+ */
+int is_fido_security_token_desc(const uint8_t *desc, size_t desc_len) {
+        uint32_t usage = 0;
+
+        for (size_t pos = 0; pos < desc_len; ) {
+                uint8_t tag, type, size_code;
+                size_t size;
+                uint32_t value;
+
+                /* Report descriptors consists of short items (1-5 bytes) and long items (3-258 bytes). */
+                if (desc[pos] == HID_RPTDESC_FIRST_BYTE_LONG_ITEM) {
+                        /* No long items are defined in the spec; skip them.
+                         * The length of the data in a long item is contained in the byte after the long
+                         * item tag. The header consists of three bytes: special long item tag, length,
+                         * actual tag. */
+                        if (pos + 1 >= desc_len)
+                                return -EINVAL;
+                        pos += desc[pos + 1] + 3;
+                        continue;
+                }
+
+                /* The first byte of a short item encodes tag, type and size. */
+                tag = desc[pos] >> 4;          /* Bits 7 to 4 */
+                type = (desc[pos] >> 2) & 0x3; /* Bits 3 and 2 */
+                size_code = desc[pos] & 0x3;   /* Bits 1 and 0 */
+                /* Size is coded as follows:
+                 * 0 -> 0 bytes, 1 -> 1 byte, 2 -> 2 bytes, 3 -> 4 bytes
+                 */
+                size = size_code < 3 ? size_code : 4;
+                /* Consume header byte. */
+                pos++;
+
+                /* Extract the item value coded on size bytes. */
+                if (pos + size > desc_len)
+                        return -EINVAL;
+                value = 0;
+                for (size_t i = 0; i < size; i++)
+                        value |= (uint32_t) desc[pos + i] << (8 * i);
+                /* Consume value bytes. */
+                pos += size;
+
+                if (type == HID_RPTDESC_TYPE_GLOBAL && tag == HID_RPTDESC_TAG_USAGE_PAGE) {
+                        /* A usage page is a 16 bit value coded on at most 16 bits. */
+                        if (size > 2)
+                                return -EINVAL;
+                        /* A usage page sets the upper 16 bits of a following usage. */
+                        usage = (value & 0x0000ffffu) << 16;
+                }
+
+                if (type == HID_RPTDESC_TYPE_LOCAL && tag == HID_RPTDESC_TAG_USAGE) {
+                        /* A usage is a 32 bit value, but is prepended with the current usage page if
+                         * coded on less than 4 bytes (that is, at most 2 bytes). */
+                        if (size == 4)
+                                usage = value;
+                        else
+                                usage = (usage & 0xffff0000u) | (value & 0x0000ffffu);
+                        if (usage == FIDO_FULL_USAGE_CTAPHID)
+                                return 1;
+                }
+        }
+
+        return 0;
+}
diff --git a/src/udev/fido_id/fido_id_desc.h b/src/udev/fido_id/fido_id_desc.h

new file mode 100644 (file)

index 0000000..c813a3a
--- /dev/null
+++ b/src/udev/fido_id/fido_id_desc.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+int is_fido_security_token_desc(const uint8_t *desc, size_t desc_len);
diff --git a/src/udev/meson.build b/src/udev/meson.build

index 511fe428b9f65a932ad72082fc920a2ba79e9627..48573cdb6043f4ef9621eb58cd1087f31a0b9eb2 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -165,6 +165,9 @@ libudev_core = static_library(
  
  foreach prog : [['ata_id/ata_id.c'],
                  ['cdrom_id/cdrom_id.c'],
+                ['fido_id/fido_id.c',
+                 'fido_id/fido_id_desc.c',
+                 'fido_id/fido_id_desc.h'],
                  ['scsi_id/scsi_id.c',
                   'scsi_id/scsi_id.h',
                   'scsi_id/scsi_serial.c',
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c

index 1642f105354674746b899f9072332d2ddbb49391..efea16e5c5acd4dddd68accb33298626b3cf26e6 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -43,10 +43,12 @@ typedef enum {
  } UdevRuleOperatorType;
  
  typedef enum {
-        MATCH_TYPE_EMPTY,     /* empty string */
-        MATCH_TYPE_PLAIN,     /* no special characters */
-        MATCH_TYPE_GLOB,      /* shell globs ?,*,[] */
-        MATCH_TYPE_SUBSYSTEM, /* "subsystem", "bus", or "class" */
+        MATCH_TYPE_EMPTY,            /* empty string */
+        MATCH_TYPE_PLAIN,            /* no special characters */
+        MATCH_TYPE_PLAIN_WITH_EMPTY, /* no special characters with empty string, e.g., "|foo" */
+        MATCH_TYPE_GLOB,             /* shell globs ?,*,[] */
+        MATCH_TYPE_GLOB_WITH_EMPTY,  /* shell globs ?,*,[] with empty string, e.g., "|foo*" */
+        MATCH_TYPE_SUBSYSTEM,        /* "subsystem", "bus", or "class" */
          _MATCH_TYPE_MAX,
          _MATCH_TYPE_INVALID = -1
  } UdevRuleMatchType;
@@ -431,35 +433,30 @@ static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type,
  
                  if (type < TK_M_TEST || type == TK_M_RESULT) {
                          /* Convert value string to nulstr. */
-                        len = strlen(value);
-                        if (len > 1 && (value[len - 1] == '|' || strstr(value, "||"))) {
-                                /* In this case, just replacing '|' -> '\0' does not work... */
-                                _cleanup_free_ char *tmp = NULL;
-                                char *i, *j;
-                                bool v = true;
-
-                                tmp = strdup(value);
-                                if (!tmp)
-                                        return log_oom();
-
-                                for (i = tmp, j = value; *i != '\0'; i++)
-                                        if (*i == '|')
-                                                v = true;
-                                        else {
-                                                if (v) {
-                                                        *j++ = '\0';
-                                                        v = false;
-                                                }
-                                                *j++ = *i;
-                                        }
-                                j[0] = j[1] = '\0';
-                        } else {
-                                /* Simple conversion. */
-                                char *i;
-
-                                for (i = value; *i != '\0'; i++)
-                                        if (*i == '|')
-                                                *i = '\0';
+                        bool bar = true, empty = false;
+                        char *a, *b;
+
+                        for (a = b = value; *a != '\0'; a++) {
+                                if (*a != '|') {
+                                        *b++ = *a;
+                                        bar = false;
+                                } else {
+                                        if (bar)
+                                                empty = true;
+                                        else
+                                                *b++ = '\0';
+                                        bar = true;
+                                }
+                        }
+                        *b = '\0';
+                        if (bar)
+                                empty = true;
+
+                        if (empty) {
+                                if (match_type == MATCH_TYPE_GLOB)
+                                        match_type = MATCH_TYPE_GLOB_WITH_EMPTY;
+                                if (match_type == MATCH_TYPE_PLAIN)
+                                        match_type = MATCH_TYPE_PLAIN_WITH_EMPTY;
                          }
                  }
          }
@@ -499,6 +496,9 @@ static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type,
                          TK_A_OWNER_ID, TK_A_GROUP_ID, TK_A_MODE_ID))
                  SET_FLAG(rule_line->type, LINE_HAS_DEVLINK, true);
  
+        else if (token->type == TK_A_OPTIONS_STATIC_NODE)
+                SET_FLAG(rule_line->type, LINE_HAS_STATIC_NODE, true);
+
          else if (token->type >= _TK_A_MIN ||
                   IN_SET(token->type, TK_M_PROGRAM,
                          TK_M_IMPORT_FILE, TK_M_IMPORT_PROGRAM, TK_M_IMPORT_BUILTIN,
@@ -1325,7 +1325,17 @@ static bool token_match_string(UdevRuleToken *token, const char *str) {
                  match = isempty(str);
                  break;
          case MATCH_TYPE_SUBSYSTEM:
-                value = "subsystem\0class\0bus\0";
+                NULSTR_FOREACH(i, "subsystem\0class\0bus\0")
+                        if (streq(i, str)) {
+                                match = true;
+                                break;
+                        }
+                break;
+        case MATCH_TYPE_PLAIN_WITH_EMPTY:
+                if (isempty(str)) {
+                        match = true;
+                        break;
+                }
                  _fallthrough_;
          case MATCH_TYPE_PLAIN:
                  NULSTR_FOREACH(i, value)
@@ -1334,6 +1344,12 @@ static bool token_match_string(UdevRuleToken *token, const char *str) {
                                  break;
                          }
                  break;
+        case MATCH_TYPE_GLOB_WITH_EMPTY:
+                if (isempty(str)) {
+                        match = true;
+                        break;
+                }
+                _fallthrough_;
          case MATCH_TYPE_GLOB:
                  NULSTR_FOREACH(i, value)
                          if ((fnmatch(i, str, 0) == 0)) {
@@ -2301,7 +2317,7 @@ static int apply_static_dev_perms(const char *devnode, uid_t uid, gid_t gid, mod
                  return log_error_errno(errno, "Failed to chown '%s' %u %u: %m",
                                                 device_node, uid, gid);
          else
-                log_debug("chown '%s' %u:%u", device_node, uid, gid);
+                log_debug("chown '%s' %u:%u with mode %#o", device_node, uid, gid, mode);
  
          (void) utimensat(AT_FDCWD, device_node, NULL, 0);
          return 0;
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c

index bfc78b9739abf4aefd9d25c7bd436ba0d5da2f7b..f0fc181b570d632a040fd93417264f3beb07faef 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -18,6 +18,7 @@
  #include "format-util.h"
  #include "log.h"
  #include "macro.h"
+#include "main-func.h"
  #include "process-util.h"
  #include "special.h"
  #include "strv.h"
@@ -191,6 +192,9 @@ static int on_runlevel(Context *c) {
          if (runlevel < 0)
                  return runlevel;
  
+        if (runlevel == 0)
+                return log_warning("Failed to get new runlevel, utmp update skipped.");
+
          if (previous == runlevel)
                  return 0;
  
@@ -217,7 +221,7 @@ static int on_runlevel(Context *c) {
          return r;
  }
  
-int main(int argc, char *argv[]) {
+static int run(int argc, char *argv[]) {
          _cleanup_(context_clear) Context c = {
  #if HAVE_AUDIT
                  .audit_fd = -1
@@ -225,47 +229,35 @@ int main(int argc, char *argv[]) {
          };
          int r;
  
-        if (getppid() != 1) {
-                log_error("This program should be invoked by init only.");
-                return EXIT_FAILURE;
-        }
-
-        if (argc != 2) {
-                log_error("This program requires one argument.");
-                return EXIT_FAILURE;
-        }
+        if (getppid() != 1)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "This program should be invoked by init only.");
+        if (argc != 2)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "This program requires one argument.");
  
          log_setup_service();
  
          umask(0022);
  
  #if HAVE_AUDIT
-        /* If the kernel lacks netlink or audit support,
-         * don't worry about it. */
+        /* If the kernel lacks netlink or audit support, don't worry about it. */
          c.audit_fd = audit_open();
-        if (c.audit_fd < 0 && !IN_SET(errno, EAFNOSUPPORT, EPROTONOSUPPORT))
-                log_error_errno(errno, "Failed to connect to audit log: %m");
+        if (c.audit_fd < 0)
+                log_full_errno(IN_SET(errno, EAFNOSUPPORT, EPROTONOSUPPORT) ? LOG_DEBUG : LOG_ERR,
+                               errno, "Failed to connect to audit log: %m");
  #endif
          r = bus_connect_system_systemd(&c.bus);
-        if (r < 0) {
-                log_error_errno(r, "Failed to get D-Bus connection: %m");
-                return EXIT_FAILURE;
-        }
-
-        log_debug("systemd-update-utmp running as pid "PID_FMT, getpid_cached());
+        if (r < 0)
+                return log_error_errno(r, "Failed to get D-Bus connection: %m");
  
          if (streq(argv[1], "reboot"))
-                r = on_reboot(&c);
-        else if (streq(argv[1], "shutdown"))
-                r = on_shutdown(&c);
-        else if (streq(argv[1], "runlevel"))
-                r = on_runlevel(&c);
-        else {
-                log_error("Unknown command %s", argv[1]);
-                return EXIT_FAILURE;
-        }
-
-        log_debug("systemd-update-utmp stopped as pid "PID_FMT, getpid_cached());
-
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+                return on_reboot(&c);
+        if (streq(argv[1], "shutdown"))
+                return on_shutdown(&c);
+        if (streq(argv[1], "runlevel"))
+                return on_runlevel(&c);
+        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown command %s", argv[1]);
  }
+
+DEFINE_MAIN_FUNCTION(run);
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh

index 16fda42754ad6419fe61ccf39065d8f4a419c24b..801dc715691f8826451c30bd094bd1909459fe62 100755 (executable)
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -7,15 +7,15 @@ TEST_NO_NSPAWN=1
  
  check_result_qemu() {
      ret=1
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
-    [[ -e $TESTDIR/root/testok ]] && ret=0
-    [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
+    mkdir -p $initdir
+    mount ${LOOPDEV}p1 $initdir
+    [[ -e $initdir/testok ]] && ret=0
+    [[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
      cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
-    mount /dev/mapper/varcrypt $TESTDIR/root/var
-    cp -a $TESTDIR/root/var/log/journal $TESTDIR
-    umount $TESTDIR/root/var
-    umount $TESTDIR/root
+    mount /dev/mapper/varcrypt $initdir/var
+    cp -a $initdir/var/log/journal $TESTDIR
+    umount $initdir/var
+    umount $initdir
      cryptsetup luksClose /dev/mapper/varcrypt
      [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
      ls -l $TESTDIR/journal/*/*.journal
@@ -30,8 +30,8 @@ test_setup() {
      cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 ${LOOPDEV}p2 $TESTDIR/keyfile
      cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
      mkfs.ext4 -L var /dev/mapper/varcrypt
-    mkdir -p $TESTDIR/root/var
-    mount /dev/mapper/varcrypt $TESTDIR/root/var
+    mkdir -p $initdir/var
+    mount /dev/mapper/varcrypt $initdir/var
  
      # Create what will eventually be our root filesystem onto an overlay
      (
@@ -77,8 +77,8 @@ EOF
  }
  
  cleanup_root_var() {
-    ddebug "umount $TESTDIR/root/var"
-    mountpoint $TESTDIR/root/var && umount $TESTDIR/root/var
+    ddebug "umount $initdir/var"
+    mountpoint $initdir/var && umount $initdir/var
      [[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt
  }
  
diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh

index 2c29514ef92288f69efae761f623635e2c550057..e0e78b11003e7e0b0a237f361d3f5eba2be1e96e 100755 (executable)
--- a/test/TEST-10-ISSUE-2467/test.sh
+++ b/test/TEST-10-ISSUE-2467/test.sh
@@ -25,7 +25,6 @@ Type=oneshot
  StandardOutput=tty
  StandardError=tty
  ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; printf x > test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'
-TimeoutStartSec=10s
  EOF
  
         cat  >$initdir/etc/systemd/system/test.socket <<'EOF'
diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh

index 5c9ca9e4270441585690fd4b1980ce49c673635b..503c5ca551df497b793f6a4b03e253a48cfa3560 100755 (executable)
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@@ -3,7 +3,7 @@ set -e
  TEST_DESCRIPTION="FailureAction= operation"
  
  . $TEST_BASE_DIR/test-functions
-QEMU_TIMEOUT=180
+QEMU_TIMEOUT=600
  
  test_setup() {
      create_empty_image_rootdir
diff --git a/test/TEST-18-FAILUREACTION/testsuite.sh b/test/TEST-18-FAILUREACTION/testsuite.sh

index bf9c0257667a1e2f19e7471fc0fa3d91abc00bfb..6ab2638d8ce3be0c6d239d8cf5e3759aa3442fd2 100755 (executable)
--- a/test/TEST-18-FAILUREACTION/testsuite.sh
+++ b/test/TEST-18-FAILUREACTION/testsuite.sh
@@ -5,7 +5,7 @@ set -o pipefail
  systemd-run --wait -p FailureAction=poweroff true
  ! systemd-run --wait -p SuccessAction=poweroff false
  
-if test -f /firstphase ; then
+if ! test -f /firstphase ; then
      echo OK > /firstphase
      systemd-run --wait -p SuccessAction=reboot true
  else
diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh

index abfb6a77a27038a72700091ed4e04b5308d2f09f..348c697f633ff6733abfcc1e784d9af1de198f87 100755 (executable)
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@@ -4,7 +4,7 @@ TEST_DESCRIPTION="test cgroup delegation in the unified hierarchy"
  TEST_NO_NSPAWN=1
  
  . $TEST_BASE_DIR/test-functions
-QEMU_TIMEOUT=180
+QEMU_TIMEOUT=600
  UNIFIED_CGROUP_HIERARCHY=yes
  
  test_setup() {
diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-24-UNIT-TESTS/test.sh

index 2b622676ef486c3a7de50a84079413f4211d1c70..3c993e67f714db782b5eed31f5157cb073515e9b 100755 (executable)
--- a/test/TEST-24-UNIT-TESTS/test.sh
+++ b/test/TEST-24-UNIT-TESTS/test.sh
@@ -29,25 +29,25 @@ check_result_nspawn() {
  
  check_result_qemu() {
      local _ret=1
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
-    [[ -e $TESTDIR/root/testok ]] && _ret=0
-    if [[ -s $TESTDIR/root/failed ]]; then
+    mkdir -p $initdir
+    mount ${LOOPDEV}p1 $initdir
+    [[ -e $initdir/testok ]] && _ret=0
+    if [[ -s $initdir/failed ]]; then
          _ret=$(($_ret+1))
          echo "=== Failed test log ==="
-        cat $TESTDIR/root/failed
+        cat $initdir/failed
      else
-        if [[ -s $TESTDIR/root/skipped ]]; then
+        if [[ -s $initdir/skipped ]]; then
              echo "=== Skipped test log =="
-            cat $TESTDIR/root/skipped
+            cat $initdir/skipped
          fi
-        if [[ -s $TESTDIR/root/testok ]]; then
+        if [[ -s $initdir/testok ]]; then
              echo "=== Passed tests ==="
-            cat $TESTDIR/root/testok
+            cat $initdir/testok
          fi
      fi
-    cp -a $TESTDIR/root/var/log/journal $TESTDIR
-    umount $TESTDIR/root
+    cp -a $initdir/var/log/journal $TESTDIR
+    umount $initdir
      [[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
      return $_ret
  }
diff --git a/test/TEST-33-CLEAN-UNIT/test.sh b/test/TEST-33-CLEAN-UNIT/test.sh

index 44082af4d4b2ee368ac1e8bc9c59ea210ccd2147..aeda69baae4f682e189e3b4b188ed253eba2f868 100755 (executable)
--- a/test/TEST-33-CLEAN-UNIT/test.sh
+++ b/test/TEST-33-CLEAN-UNIT/test.sh
@@ -7,9 +7,7 @@ TEST_DESCRIPTION="test CleanUnit"
  . $TEST_BASE_DIR/test-functions
  
  test_setup() {
-    create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
+    create_empty_image_rootdir
  
      (
          LOG_LEVEL=5
@@ -41,9 +39,6 @@ EOF
          setup_testsuite
      ) || return 1
      setup_nspawn_root
-
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
  }
  
  do_test "$@"
diff --git a/test/TEST-33-CLEAN-UNIT/testsuite.sh b/test/TEST-33-CLEAN-UNIT/testsuite.sh

index 15aa6872388de048cf7bafb97bdee0e5b63b10b8..0272a2305b592c34dab808415280428543c4a001 100755 (executable)
--- a/test/TEST-33-CLEAN-UNIT/testsuite.sh
+++ b/test/TEST-33-CLEAN-UNIT/testsuite.sh
@@ -74,6 +74,246 @@ systemctl clean testservice --what=all
  ! test -e /var/cache/testservice
  ! test -e /var/log/testservice
  
+cat > /etc/systemd/system/testservice.service <<EOF
+[Service]
+DynamicUser=yes
+ConfigurationDirectory=testservice
+RuntimeDirectory=testservice
+StateDirectory=testservice
+CacheDirectory=testservice
+LogsDirectory=testservice
+RuntimeDirectoryPreserve=yes
+ExecStart=/bin/sleep infinity
+Type=exec
+EOF
+
+systemctl daemon-reload
+
+! test -e /etc/testservice
+! test -e /run/testservice
+! test -e /var/lib/testservice
+! test -e /var/cache/testservice
+! test -e /var/log/testservice
+
+systemctl restart testservice
+
+test -d /etc/testservice
+test -d /run/private/testservice
+test -d /var/lib/private/testservice
+test -d /var/cache/private/testservice
+test -d /var/log/private/testservice
+test -L /run/testservice
+test -L /var/lib/testservice
+test -L /var/cache/testservice
+test -L /var/log/testservice
+
+! systemctl clean testservice
+
+systemctl stop testservice
+
+test -d /etc/testservice
+test -d /run/private/testservice
+test -d /var/lib/private/testservice
+test -d /var/cache/private/testservice
+test -d /var/log/private/testservice
+test -L /run/testservice
+test -L /var/lib/testservice
+test -L /var/cache/testservice
+test -L /var/log/testservice
+
+systemctl clean testservice --what=configuration
+
+! test -d /etc/testservice
+test -d /run/private/testservice
+test -d /var/lib/private/testservice
+test -d /var/cache/private/testservice
+test -d /var/log/private/testservice
+test -L /run/testservice
+test -L /var/lib/testservice
+test -L /var/cache/testservice
+test -L /var/log/testservice
+
+systemctl clean testservice
+
+! test -d /etc/testservice
+! test -d /run/private/testservice
+test -d /var/lib/private/testservice
+! test -d /var/cache/private/testservice
+test -d /var/log/private/testservice
+! test -L /run/testservice
+test -L /var/lib/testservice
+! test -L /var/cache/testservice
+test -L /var/log/testservice
+
+systemctl clean testservice --what=logs
+
+! test -d /etc/testservice
+! test -d /run/private/testservice
+test -d /var/lib/private/testservice
+! test -d /var/cache/private/testservice
+! test -d /var/log/private/testservice
+! test -L /run/testservice
+test -L /var/lib/testservice
+! test -L /var/cache/testservice
+! test -L /var/log/testservice
+
+systemctl clean testservice --what=all
+
+! test -d /etc/testservice
+! test -d /run/private/testservice
+! test -d /var/lib/private/testservice
+! test -d /var/cache/private/testservice
+! test -d /var/log/private/testservice
+! test -L /run/testservice
+! test -L /var/lib/testservice
+! test -L /var/cache/testservice
+! test -L /var/log/testservice
+
+cat > /etc/systemd/system/tmp-hoge.mount <<EOF
+[Mount]
+What=tmpfs
+Type=tmpfs
+ConfigurationDirectory=hoge
+RuntimeDirectory=hoge
+StateDirectory=hoge
+CacheDirectory=hoge
+LogsDirectory=hoge
+EOF
+
+systemctl daemon-reload
+
+! test -e /etc/hoge
+! test -e /run/hoge
+! test -e /var/lib/hoge
+! test -e /var/cache/hoge
+! test -e /var/log/hoge
+
+systemctl start tmp-hoge.mount
+
+test -d /etc/hoge
+test -d /run/hoge
+test -d /var/lib/hoge
+test -d /var/cache/hoge
+test -d /var/log/hoge
+
+! systemctl clean tmp-hoge.mount
+
+test -d /etc/hoge
+test -d /run/hoge
+test -d /var/lib/hoge
+test -d /var/cache/hoge
+test -d /var/log/hoge
+
+systemctl stop tmp-hoge.mount
+
+test -d /etc/hoge
+! test -d /run/hoge
+test -d /var/lib/hoge
+test -d /var/cache/hoge
+test -d /var/log/hoge
+
+systemctl clean tmp-hoge.mount --what=configuration
+
+! test -d /etc/hoge
+! test -d /run/hoge
+test -d /var/lib/hoge
+test -d /var/cache/hoge
+test -d /var/log/hoge
+
+systemctl clean tmp-hoge.mount
+
+! test -d /etc/hoge
+! test -d /run/hoge
+test -d /var/lib/hoge
+! test -d /var/cache/hoge
+test -d /var/log/hoge
+
+systemctl clean tmp-hoge.mount --what=logs
+
+! test -d /etc/hoge
+! test -d /run/hoge
+test -d /var/lib/hoge
+! test -d /var/cache/hoge
+! test -d /var/log/hoge
+
+systemctl clean tmp-hoge.mount --what=all
+
+! test -d /etc/hoge
+! test -d /run/hoge
+! test -d /var/lib/hoge
+! test -d /var/cache/hoge
+! test -d /var/log/hoge
+
+cat > /etc/systemd/system/testservice.socket <<EOF
+[Socket]
+ListenSequentialPacket=/run/testservice.socket
+RemoveOnStop=yes
+ExecStartPre=true
+ConfigurationDirectory=testsocket
+RuntimeDirectory=testsocket
+StateDirectory=testsocket
+CacheDirectory=testsocket
+LogsDirectory=testsocket
+EOF
+
+systemctl daemon-reload
+
+! test -e /etc/testsocket
+! test -e /run/testsocket
+! test -e /var/lib/testsocket
+! test -e /var/cache/testsocket
+! test -e /var/log/testsocket
+
+systemctl start testservice.socket
+
+test -d /etc/testsocket
+! test -d /run/testsocket
+test -d /var/lib/testsocket
+test -d /var/cache/testsocket
+test -d /var/log/testsocket
+
+! systemctl clean testservice.socket
+
+systemctl stop testservice.socket
+
+test -d /etc/testsocket
+! test -d /run/testsocket
+test -d /var/lib/testsocket
+test -d /var/cache/testsocket
+test -d /var/log/testsocket
+
+systemctl clean testservice.socket --what=configuration
+
+! test -e /etc/testsocket
+! test -d /run/testsocket
+test -d /var/lib/testsocket
+test -d /var/cache/testsocket
+test -d /var/log/testsocket
+
+systemctl clean testservice.socket
+
+! test -e /etc/testsocket
+! test -e /run/testsocket
+test -d /var/lib/testsocket
+! test -e /var/cache/testsocket
+test -d /var/log/testsocket
+
+systemctl clean testservice.socket --what=logs
+
+! test -e /etc/testsocket
+! test -e /run/testsocket
+test -d /var/lib/testsocket
+! test -e /var/cache/testsocket
+! test -e /var/log/testsocket
+
+systemctl clean testservice.socket --what=all
+
+! test -e /etc/testsocket
+! test -e /run/testsocket
+! test -e /var/lib/testsocket
+! test -e /var/cache/testsocket
+! test -e /var/log/testsocket
+
  echo OK > /testok
  
  exit 0
diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh

index 3b3b120423b5c65d9c11265d941e7064ac7831eb..a586f9dc9047ff66f64d9e7e2d5d64cf3aa5edad 100755 (executable)
--- a/test/TEST-36-NUMAPOLICY/test.sh
+++ b/test/TEST-36-NUMAPOLICY/test.sh
@@ -8,9 +8,7 @@ QEMU_OPTIONS="-numa node,nodeid=0"
  . $TEST_BASE_DIR/test-functions
  
  test_setup() {
-    create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
+    create_empty_image_rootdir
  
      (
          LOG_LEVEL=5
@@ -44,9 +42,6 @@ EOF
          setup_testsuite
      )
      setup_nspawn_root
-
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
  }
  
  do_test "$@"
diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile

new file mode 120000 (symlink)

index 0000000..e9f93b1
--- /dev/null
+++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile
@@ -0,0 +1 @@
+../TEST-01-BASIC/Makefile
+\ No newline at end of file
diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh

new file mode 100755 (executable)

index 0000000..9e87e61
--- /dev/null
+++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+set -e
+TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes"
+
+. $TEST_BASE_DIR/test-functions
+
+test_setup() {
+    create_empty_image_rootdir
+
+    (
+        LOG_LEVEL=5
+        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
+
+        setup_basic_environment
+
+        # mask some services that we do not want to run in these tests
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service
+        ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service
+
+        # setup the testsuite service
+        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+[Unit]
+Description=Testsuite service
+
+[Service]
+ExecStart=/bin/bash -x /testsuite.sh
+Type=oneshot
+StandardOutput=tty
+StandardError=tty
+EOF
+        cp testsuite.sh $initdir/
+
+        setup_testsuite
+    ) || return 1
+    setup_nspawn_root
+}
+
+do_test "$@"
diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh

new file mode 100755 (executable)

index 0000000..4e63a07
--- /dev/null
+++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+set -ex
+set -o pipefail
+
+systemd-mount -p RuntimeDirectory=hoge -p RuntimeDirectoryPreserve=yes -t tmpfs tmpfs /tmp/aaa
+
+touch /run/hoge/foo
+touch /tmp/aaa/bbb
+
+systemctl restart tmp-aaa.mount
+
+test -e /run/hoge/foo
+! test -e /tmp/aaa/bbb
+
+echo OK > /testok
+
+exit 0
diff --git a/test/fuzz/fuzz-fido-id-desc/crash0 b/test/fuzz/fuzz-fido-id-desc/crash0

new file mode 100644 (file)

index 0000000..e066656
--- /dev/null
+++ b/test/fuzz/fuzz-fido-id-desc/crash0
@@ -0,0 +1 @@
+\ f\ f\ f\ fÌ\ f
+\ No newline at end of file
diff --git a/test/fuzz/fuzz-fido-id-desc/crash1 b/test/fuzz/fuzz-fido-id-desc/crash1

new file mode 100644 (file)

index 0000000..aef3e18
--- /dev/null
+++ b/test/fuzz/fuzz-fido-id-desc/crash1
@@ -0,0 +1 @@
+øûøûûÜ
+\ No newline at end of file
diff --git a/test/fuzz/fuzz-fido-id-desc/report0 b/test/fuzz/fuzz-fido-id-desc/report0

new file mode 100644 (file)

index 0000000..48757cb

Binary files /dev/null and b/test/fuzz/fuzz-fido-id-desc/report0 differ
diff --git a/test/fuzz/fuzz-fido-id-desc/report1 b/test/fuzz/fuzz-fido-id-desc/report1

new file mode 100644 (file)

index 0000000..b70b7fb

Binary files /dev/null and b/test/fuzz/fuzz-fido-id-desc/report1 differ
diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network

index 7be38b0f34bb1925e6b12ac642385040e23a8d2e..848d4bd187c9a8e1d0da9f3a32e45ce77414de9d 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -208,6 +208,7 @@ SourcePort=
  DestinationPort=
  IPProtocol=
  InvertRule=
+Family=
  [IPv6PrefixDelegation]
  RouterPreference=
  DNSLifetimeSec=
diff --git a/test/test-functions b/test/test-functions

index 6523db01b96e98f019c878e20f9fe22fbe03b53e..a8b527b5a6257eaeac6535b400f43f2744ffeecd 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -23,6 +23,10 @@ if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then
  fi
  
  PATH_TO_INIT=$ROOTLIBDIR/systemd
+[ "$SYSTEMD_JOURNALD" ] || SYSTEMD_JOURNALD=$(which -a $BUILD_DIR/systemd-journald $ROOTLIBDIR/systemd-journald 2>/dev/null | grep '^/' -m1)
+[ "$SYSTEMD" ] || SYSTEMD=$(which -a $BUILD_DIR/systemd $ROOTLIBDIR/systemd 2>/dev/null | grep '^/' -m1)
+[ "$SYSTEMD_NSPAWN" ] || SYSTEMD_NSPAWN=$(which -a $BUILD_DIR/systemd-nspawn systemd-nspawn 2>/dev/null | grep '^/' -m1)
+[ "$JOURNALCTL" ] || JOURNALCTL=$(which -a $BUILD_DIR/journalctl journalctl 2>/dev/null | grep '^/' -m1)
  
  BASICTOOLS="test sh bash setsid loadkeys setfont login sulogin gzip sleep echo head tail cat mount umount cryptsetup date dmsetup modprobe sed cmp tee rm true false chmod chown ln xargs"
  DEBUGTOOLS="df free ls stty ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname find vi mv"
@@ -38,7 +42,7 @@ is_built_with_asan() {
      fi
  
      # Borrowed from https://github.com/google/oss-fuzz/blob/cd9acd02f9d3f6e80011cc1e9549be526ce5f270/infra/base-images/base-runner/bad_build_check#L182
-    local _asan_calls=$(objdump -dC $BUILD_DIR/systemd-journald | egrep "callq\s+[0-9a-f]+\s+<__asan" -c)
+    local _asan_calls=$(objdump -dC $SYSTEMD_JOURNALD | egrep "callq\s+[0-9a-f]+\s+<__asan" -c)
      if (( $_asan_calls < 1000 )); then
          return 1
      else
@@ -56,9 +60,9 @@ if [[ "$IS_BUILT_WITH_ASAN" = "yes" ]]; then
      QEMU_SMP=4
  
      # We need to correctly distinguish between gcc's and clang's ASan DSOs.
-    if ldd $BUILD_DIR/systemd | grep -q libasan.so; then
+    if ldd $SYSTEMD | grep -q libasan.so; then
          ASAN_COMPILER=gcc
-    elif ldd $BUILD_DIR/systemd | grep -q libclang_rt.asan; then
+    elif ldd $SYSTEMD | grep -q libclang_rt.asan; then
          ASAN_COMPILER=clang
  
          # As clang's ASan DSO is usually in a non-standard path, let's check if
@@ -66,8 +70,8 @@ if [[ "$IS_BUILT_WITH_ASAN" = "yes" ]]; then
          # We're not setting the LD_LIBRARY_PATH automagically here, because
          # user should encounter (and fix) the same issue when running the unit
          # tests (meson test)
-        if ldd "$BUILD_DIR/systemd" | grep -q "libclang_rt.asan.*not found"; then
-            _asan_rt_name="$(ldd $BUILD_DIR/systemd | awk '/libclang_rt.asan/ {print $1; exit}')"
+        if ldd "$SYSTEMD" | grep -q "libclang_rt.asan.*not found"; then
+            _asan_rt_name="$(ldd $SYSTEMD | awk '/libclang_rt.asan/ {print $1; exit}')"
              _asan_rt_path="$(find /usr/lib* /usr/local/lib* -type f -name "$_asan_rt_name" 2>/dev/null | sed 1q)"
              echo >&2 "clang's ASan DSO ($_asan_rt_name) is not present in the runtime library path"
              echo >&2 "Consider setting LD_LIBRARY_PATH=${_asan_rt_path%/*}"
@@ -102,7 +106,7 @@ function find_qemu_bin() {
          [ "$QEMU_BIN" ] || QEMU_BIN=$(which -a qemu 2>/dev/null | grep '^/' -m1)
          ;;
      ppc64*)
-        [ "$QEMU_BIN" ] || QEMU_BIN=$(which -a qemu-system-$ARCH 2>/dev/null | grep '^/' -m1)
+        [ "$QEMU_BIN" ] || QEMU_BIN=$(which -a qemu-system-ppc64 2>/dev/null | grep '^/' -m1)
          ;;
      esac
  
@@ -240,7 +244,7 @@ $QEMU_OPTIONS \
  run_nspawn() {
      [[ -d /run/systemd/system ]] || return 1
  
-    local _nspawn_cmd="$BUILD_DIR/systemd-nspawn $NSPAWN_ARGUMENTS --register=no --kill-signal=SIGKILL --directory=$TESTDIR/$1 $PATH_TO_INIT $KERNEL_APPEND"
+    local _nspawn_cmd="$SYSTEMD_NSPAWN $NSPAWN_ARGUMENTS --register=no --kill-signal=SIGKILL --directory=$TESTDIR/$1 $PATH_TO_INIT $KERNEL_APPEND"
      if [[ "$NSPAWN_TIMEOUT" != "infinity" ]]; then
          _nspawn_cmd="timeout --foreground $NSPAWN_TIMEOUT $_nspawn_cmd"
      fi
@@ -516,6 +520,8 @@ install_systemd() {
  
      # enable debug logging in PID1
      echo LogLevel=debug >> $initdir/etc/systemd/system.conf
+    # store coredumps in journal
+    echo Storage=journal >> $initdir/etc/systemd/coredump.conf
  }
  
  get_ldpath() {
@@ -537,7 +543,7 @@ create_empty_image() {
      fi
      rm -f "$TESTDIR/rootdisk.img"
      # Create the blank file to use as a root filesystem
-    dd if=/dev/null of="$TESTDIR/rootdisk.img" bs=1M seek="$_size"
+    truncate -s "${_size}M" "$TESTDIR/rootdisk.img"
      LOOPDEV=$(losetup --show -P -f $TESTDIR/rootdisk.img)
      [ -b "$LOOPDEV" ] || return 1
      echo "LOOPDEV=$LOOPDEV" >> $STATEFILE
@@ -559,8 +565,8 @@ EOF
  
  create_empty_image_rootdir() {
      create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
+    mkdir -p $initdir
+    mount ${LOOPDEV}p1 $initdir
      TEST_SETUP_CLEANUP_ROOTDIR=1
  }
  
@@ -583,7 +589,7 @@ check_asan_reports() {
          fi
  
          pids=$(
-            "$BUILD_DIR/journalctl" -D "$root/var/log/journal" | perl -alne '
+            "$JOURNALCTL" -D "$root/var/log/journal" | perl -alne '
                   BEGIN {
                       %services_to_ignore = (
                           "dbus-daemon" => undef,
@@ -594,7 +600,7 @@ check_asan_reports() {
          if [[ ! -z "$pids" ]]; then
              ret=$(($ret+1))
              for pid in $pids; do
-                "$BUILD_DIR/journalctl" -D "$root/var/log/journal" _PID=$pid --no-pager
+                "$JOURNALCTL" -D "$root/var/log/journal" _PID=$pid --no-pager
              done
          fi
      fi
@@ -620,13 +626,13 @@ check_result_nspawn() {
  # can be overridden in specific test
  check_result_qemu() {
      local ret=1
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
-    [[ -e $TESTDIR/root/testok ]] && ret=0
-    [[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
-    cp -a $TESTDIR/root/var/log/journal $TESTDIR
-    check_asan_reports "$TESTDIR/root" || ret=$(($ret+1))
-    umount $TESTDIR/root
+    mkdir -p $initdir
+    mount ${LOOPDEV}p1 $initdir
+    [[ -e $initdir/testok ]] && ret=0
+    [[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
+    cp -a $initdir/var/log/journal $TESTDIR
+    check_asan_reports "$initdir" || ret=$(($ret+1))
+    umount $initdir
      [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
      ls -l $TESTDIR/journal/*/*.journal
      test -s $TESTDIR/failed && ret=$(($ret+1))
@@ -939,6 +945,7 @@ import_testdir() {
  
  import_initdir() {
      initdir=$TESTDIR/root
+    mkdir -p $initdir
      export initdir
  }
  
@@ -1666,12 +1673,16 @@ setup_suse() {
      inst_simple "/usr/lib/systemd/system/haveged.service"
  }
  
+_umount_dir() {
+    if mountpoint -q $1; then
+        ddebug "umount $1"
+        umount $1
+    fi
+}
+
  _test_setup_cleanup() {
      # only umount if create_empty_image_rootdir() was called to mount it
-    if [[ $TEST_SETUP_CLEANUP_ROOTDIR ]]; then
-        ddebug "umount $TESTDIR/root"
-        umount $TESTDIR/root
-    fi
+    [[ -z $TEST_SETUP_CLEANUP_ROOTDIR ]] || _umount_dir $initdir
  }
  
  # can be overridden in specific test
@@ -1683,10 +1694,7 @@ _test_cleanup() {
      # (post-test) cleanup should always ignore failure and cleanup as much as possible
      (
          set +e
-        if mountpoint $TESTDIR/root; then
-            ddebug "umount $TESTDIR/root"
-            umount $TESTDIR/root
-        fi
+        _umount_dir $initdir
          if [[ $LOOPDEV && -b $LOOPDEV ]]; then
              ddebug "losetup -d $LOOPDEV"
              losetup -d $LOOPDEV
diff --git a/test/test-network/conf/25-address-preferred-lifetime-zero-ipv6.network b/test/test-network/conf/25-address-preferred-lifetime-zero.network

similarity index 85%

rename from test/test-network/conf/25-address-preferred-lifetime-zero-ipv6.network

rename to test/test-network/conf/25-address-preferred-lifetime-zero.network

index bfb278f31f280b009efe1978dcbcc72318c6de71..a1e760510319727aaca821089c286d4fd0f8c8a5 100644 (file)
--- a/test/test-network/conf/25-address-preferred-lifetime-zero-ipv6.network
+++ b/test/test-network/conf/25-address-preferred-lifetime-zero.network
@@ -6,6 +6,9 @@ Name=dummy98
  Address=hogehoge
  Address=foofoo
  
+[Route]
+Gateway=20.20.20.1
+
  [Address]
  Address=10.2.3.4/16
  PreferredLifetime=0
@@ -14,6 +17,9 @@ Scope=link
  [Address]
  Address=2001:0db8:0:f101::1/64
  
+[Address]
+Address=20.20.20.100/24
+
  [Address]
  # this section must be ignored
  Peer=hoge
diff --git a/test/test-network/conf/25-neighbor-next.network b/test/test-network/conf/25-neighbor-next.network

new file mode 100644 (file)

index 0000000..d0591d5
--- /dev/null
+++ b/test/test-network/conf/25-neighbor-next.network
@@ -0,0 +1,9 @@
+[Match]
+Name=dummy98
+
+[Network]
+IPv6AcceptRA=no
+
+[Neighbor]
+Address=192.168.10.1
+LinkLayerAddress=00:00:5e:00:02:66
diff --git a/test/test-network/conf/26-link-local-addressing-ipv6.network b/test/test-network/conf/26-link-local-addressing-ipv6.network

new file mode 100644 (file)

index 0000000..b4b5362
--- /dev/null
+++ b/test/test-network/conf/26-link-local-addressing-ipv6.network
@@ -0,0 +1,6 @@
+[Match]
+Name=dummy98
+
+[Network]
+LinkLocalAddressing=ipv6
+IPv6AcceptRA=no
diff --git a/test/test-network/conf/routing-policy-rule-test1.network b/test/test-network/conf/routing-policy-rule-test1.network

index 46b87c5a9ad86fcac45a7feeb636cec892972f36..ffcedc99a2b71e774036d132f5ed55e73c70bb0d 100644 (file)
--- a/test/test-network/conf/routing-policy-rule-test1.network
+++ b/test/test-network/conf/routing-policy-rule-test1.network
@@ -8,3 +8,15 @@ From= 192.168.100.18
  Priority=111
  IncomingInterface=test1
  OutgoingInterface=test1
+
+[RoutingPolicyRule]
+IncomingInterface=test1
+Table=8
+Priority=100
+Family=ipv6
+
+[RoutingPolicyRule]
+IncomingInterface=test1
+Table=9
+Priority=101
+Family=both
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py

index f133bf4462fc94886d817c9fe881f11fd7ab4839..f1a58158e1ee66ebee8c3def2f0b3b8d917e4cb6 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1412,7 +1412,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          '24-keep-configuration-static.network',
          '24-search-domain.network',
          '25-address-link-section.network',
-        '25-address-preferred-lifetime-zero-ipv6.network',
+        '25-address-preferred-lifetime-zero.network',
          '25-address-static.network',
          '25-bind-carrier.network',
          '25-bond-active-backup-slave.netdev',
@@ -1422,6 +1422,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          '25-ip6gre-tunnel-remote-any.netdev',
          '25-ipv6-address-label-section.network',
          '25-neighbor-section.network',
+        '25-neighbor-next.network',
          '25-neighbor-ipv6.network',
          '25-neighbor-ip-dummy.network',
          '25-neighbor-ip.network',
@@ -1434,11 +1435,12 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          '25-gateway-next-static.network',
          '25-sysctl-disable-ipv6.network',
          '25-sysctl.network',
+        '26-link-local-addressing-ipv6.network',
          'configure-without-carrier.network',
          'routing-policy-rule-dummy98.network',
          'routing-policy-rule-test1.network']
  
-    routing_policy_rule_tables = ['7', '8']
+    routing_policy_rule_tables = ['7', '8', '9']
      routes = [['blackhole', '202.54.1.2'], ['unreachable', '202.54.1.3'], ['prohibit', '202.54.1.4']]
  
      def setUp(self):
@@ -1492,17 +1494,20 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          self.assertRegex(output, 'inet6 fd[0-9a-f:]*1/64 scope global')
  
      def test_address_preferred_lifetime_zero_ipv6(self):
-        copy_unit_to_networkd_unit_path('25-address-preferred-lifetime-zero-ipv6.network', '12-dummy.netdev')
+        copy_unit_to_networkd_unit_path('25-address-preferred-lifetime-zero.network', '12-dummy.netdev')
          start_networkd(5)
  
-        self.check_link_exists('dummy98')
-        self.check_operstate('dummy98', 'routable', setup_state='configuring')
+        self.wait_online(['dummy98:routable'])
  
          output = check_output('ip address show dummy98')
          print(output)
          self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope link deprecated dummy98')
          self.assertRegex(output, 'inet6 2001:db8:0:f101::1/64 scope global')
  
+        output = check_output('ip route show dev dummy98')
+        print(output)
+        self.assertRegex(output, 'default via 20.20.20.1 proto static')
+
      def test_configure_without_carrier(self):
          copy_unit_to_networkd_unit_path('configure-without-carrier.network', '11-dummy.netdev')
          start_networkd()
@@ -1519,15 +1524,36 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          start_networkd()
          self.wait_online(['test1:degraded'])
  
-        output = check_output('ip rule')
+        output = check_output('ip rule list iif test1 priority 111')
          print(output)
-        self.assertRegex(output, '111')
+        self.assertRegex(output, '111:')
          self.assertRegex(output, 'from 192.168.100.18')
          self.assertRegex(output, r'tos (?:0x08|throughput)\s')
          self.assertRegex(output, 'iif test1')
          self.assertRegex(output, 'oif test1')
          self.assertRegex(output, 'lookup 7')
  
+        output = check_output('ip rule list iif test1 priority 101')
+        print(output)
+        self.assertRegex(output, '101:')
+        self.assertRegex(output, 'from all')
+        self.assertRegex(output, 'iif test1')
+        self.assertRegex(output, 'lookup 9')
+
+        output = check_output('ip -6 rule list iif test1 priority 100')
+        print(output)
+        self.assertRegex(output, '100:')
+        self.assertRegex(output, 'from all')
+        self.assertRegex(output, 'iif test1')
+        self.assertRegex(output, 'lookup 8')
+
+        output = check_output('ip -6 rule list iif test1 priority 101')
+        print(output)
+        self.assertRegex(output, '101:')
+        self.assertRegex(output, 'from all')
+        self.assertRegex(output, 'iif test1')
+        self.assertRegex(output, 'lookup 9')
+
      def test_routing_policy_rule_issue_11280(self):
          copy_unit_to_networkd_unit_path('routing-policy-rule-test1.network', '11-dummy.netdev',
                                          'routing-policy-rule-dummy98.network', '12-dummy.netdev')
@@ -1699,11 +1725,34 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          start_networkd()
          self.wait_online(['dummy98:degraded'], timeout='40s')
  
+        print('### ip neigh list dev dummy98')
          output = check_output('ip neigh list dev dummy98')
          print(output)
          self.assertRegex(output, '192.168.10.1.*00:00:5e:00:02:65.*PERMANENT')
          self.assertRegex(output, '2004:da8:1::1.*00:00:5e:00:02:66.*PERMANENT')
  
+    def test_neighbor_reconfigure(self):
+        copy_unit_to_networkd_unit_path('25-neighbor-section.network', '12-dummy.netdev')
+        start_networkd()
+        self.wait_online(['dummy98:degraded'], timeout='40s')
+
+        print('### ip neigh list dev dummy98')
+        output = check_output('ip neigh list dev dummy98')
+        print(output)
+        self.assertRegex(output, '192.168.10.1.*00:00:5e:00:02:65.*PERMANENT')
+        self.assertRegex(output, '2004:da8:1::1.*00:00:5e:00:02:66.*PERMANENT')
+
+        remove_unit_from_networkd_path(['25-neighbor-section.network'])
+        copy_unit_to_networkd_unit_path('25-neighbor-next.network')
+        restart_networkd(3)
+        self.wait_online(['dummy98:degraded'], timeout='40s')
+        print('### ip neigh list dev dummy98')
+        output = check_output('ip neigh list dev dummy98')
+        print(output)
+        self.assertNotRegex(output, '192.168.10.1.*00:00:5e:00:02:65.*PERMANENT')
+        self.assertRegex(output, '192.168.10.1.*00:00:5e:00:02:66.*PERMANENT')
+        self.assertNotRegex(output, '2004:da8:1::1.*PERMANENT')
+
      def test_neighbor_gre(self):
          copy_unit_to_networkd_unit_path('25-neighbor-ip.network', '25-neighbor-ipv6.network', '25-neighbor-ip-dummy.network',
                                          '12-dummy.netdev', '25-gre-tunnel-remote-any.netdev', '25-ip6gre-tunnel-remote-any.netdev')
@@ -1766,6 +1815,23 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          if os.path.exists(os.path.join(os.path.join(network_sysctl_ipv6_path, 'dummy98'), 'addr_gen_mode')):
              self.assertEqual(read_ipv6_sysctl_attr('dummy98', 'addr_gen_mode'), '1')
  
+    def test_link_local_addressing_remove_ipv6ll(self):
+        copy_unit_to_networkd_unit_path('26-link-local-addressing-ipv6.network', '12-dummy.netdev')
+        start_networkd()
+        self.wait_online(['dummy98:degraded'])
+
+        output = check_output('ip address show dev dummy98')
+        print(output)
+        self.assertRegex(output, 'inet6 .* scope link')
+
+        copy_unit_to_networkd_unit_path('25-link-local-addressing-no.network')
+        restart_networkd(1)
+        self.wait_online(['dummy98:carrier'])
+
+        output = check_output('ip address show dev dummy98')
+        print(output)
+        self.assertNotRegex(output, 'inet6* .* scope link')
+
      def test_sysctl(self):
          copy_unit_to_networkd_unit_path('25-sysctl.network', '12-dummy.netdev')
          start_networkd()
@@ -1794,13 +1860,14 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
          self.assertRegex(output, 'inet 10.2.3.4/16 brd 10.2.255.255 scope global dummy98')
          output = check_output('ip -6 address show dummy98')
          print(output)
-        self.assertEqual(output, '')
+        self.assertRegex(output, 'inet6 2607:5300:203:3906::/64 scope global')
+        self.assertRegex(output, 'inet6 .* scope link')
          output = check_output('ip -4 route show dev dummy98')
          print(output)
          self.assertEqual(output, '10.2.0.0/16 proto kernel scope link src 10.2.3.4')
          output = check_output('ip -6 route show dev dummy98')
          print(output)
-        self.assertEqual(output, '')
+        self.assertRegex(output, 'default via 2607:5300:203:39ff:ff:ff:ff:ff proto static')
  
          check_output('ip link del dummy98')
  
@@ -2843,7 +2910,6 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
          output = check_output('ip route show vrf vrf99')
          print(output)
          self.assertRegex(output, 'default via 192.168.5.1 dev veth99 proto dhcp src 192.168.5.')
-        self.assertRegex(output, 'default dev veth99 proto static scope link')
          self.assertRegex(output, '169.254.0.0/16 dev veth99 proto kernel scope link src 169.254')
          self.assertRegex(output, '192.168.5.0/24 dev veth99 proto kernel scope link src 192.168.5')
          self.assertRegex(output, '192.168.5.0/24 via 192.168.5.5 dev veth99 proto dhcp')
diff --git a/test/udev-test.pl b/test/udev-test.pl

index 85ec41b64135d3c5e09365aa3e567b056403b590..95013279b8e1aa090cf93688fa6aa0a7fe687af0 100755 (executable)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1256,6 +1256,72 @@ KERNEL=="dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong1"
  KERNEL=="X|attyACM0|dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong2"
  KERNEL=="all|dontknow|ttyACM0", SYMLINK+="right"
  KERNEL=="ttyACM0a|nothing", SYMLINK+="wrong3"
+EOF
+        },
+        {
+                desc            => "test multi matches 5",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG="foo"
+TAGS=="|foo", SYMLINK+="found"
+TAGS=="|aaa", SYMLINK+="bad"
+EOF
+        },
+        {
+                desc            => "test multi matches 6",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG=""
+TAGS=="|foo", SYMLINK+="found"
+TAGS=="aaa|bbb", SYMLINK+="bad"
+EOF
+        },
+        {
+                desc            => "test multi matches 7",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG="foo"
+TAGS=="foo||bar", SYMLINK+="found"
+TAGS=="aaa||bbb", SYMLINK+="bad"
+EOF
+        },
+        {
+                desc            => "test multi matches 8",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG=""
+TAGS=="foo||bar", SYMLINK+="found"
+TAGS=="aaa|bbb", SYMLINK+="bad"
+EOF
+        },
+        {
+                desc            => "test multi matches 9",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG="foo"
+TAGS=="foo|", SYMLINK+="found"
+TAGS=="aaa|", SYMLINK+="bad"
+EOF
+        },
+        {
+                desc            => "test multi matches 10",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG=""
+TAGS=="foo|", SYMLINK+="found"
+TAGS=="aaa|bbb", SYMLINK+="bad"
  EOF
          },
          {
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build

index f14b4fc6dffc6e2291a8b5b42709304eef50055a..e77f46d06b77fbe3fbe2514db07d60849c6e9f0a 100644 (file)
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -24,26 +24,33 @@ foreach pair : tmpfiles
          endif
  endforeach
  
-m4_files = [['etc.conf',             ''],
-            ['systemd.conf',         ''],
-            ['var.conf',             ''],
-           ]
+in_files = ['static-nodes-permissions.conf']
  
-foreach pair : m4_files
-        if not enable_tmpfiles
-                # do nothing
-        elif pair[1] == '' or conf.get(pair[1]) == 1
+foreach file : in_files
+        gen = configure_file(
+                input : file + '.in',
+                output : file,
+                configuration : substs)
+        if enable_tmpfiles
+                install_data(gen,
+                             install_dir : tmpfilesdir)
+        endif
+endforeach
+
+m4_files = ['etc.conf',
+            'systemd.conf',
+            'var.conf']
+
+foreach file : m4_files
+        if enable_tmpfiles
                  custom_target(
-                        'tmpfiles.d_' + pair[0],
-                         input : pair[0] + '.m4',
-                         output: pair[0],
+                        'tmpfiles.d_' + file,
+                         input : file + '.m4',
+                         output: file,
                           command : [meson_apply_m4, config_h, '@INPUT@'],
                           capture : true,
                           install : true,
                           install_dir : tmpfilesdir)
-        else
-                message('Not installing tmpfiles.d/@0@.m4 because @1@ is @2@'
-                        .format(pair[0], pair[1], conf.get(pair[1], 0)))
          endif
  endforeach
  
diff --git a/tmpfiles.d/static-nodes-permissions.conf.in b/tmpfiles.d/static-nodes-permissions.conf.in

new file mode 100644 (file)

index 0000000..50cffe2
--- /dev/null
+++ b/tmpfiles.d/static-nodes-permissions.conf.in
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# This file adds permissions on top of static-nodes.conf generated by
+# kmod-static-nodes.service. Rules specified here should match the
+# permissions specified for udev in 50-udev-default.rules.
+
+z /dev/snd/seq      0660 - audio -
+z /dev/snd/timer    0660 - audio -
+z /dev/loop-control 0660 - disk  -
+z /dev/net/tun      0666 - -     -
+z /dev/fuse         0666 - -     -
+z /dev/kvm          @DEV_KVM_MODE@ - kvm -
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4

index d39c9cbbcf4aab47d379b674bcd14f523176a606..9c57d3b21c1ef6f3dea998ce5c01c20d7867a398 100644 (file)
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -8,7 +8,9 @@
  # See tmpfiles.d(5) for details
  
  d /run/user 0755 root root -
+m4_ifdef(`ENABLE_UTMP',
  F! /run/utmp 0664 root utmp -
+)m4_dnl
  
  d /run/systemd/ask-password 0755 root root -
  d /run/systemd/seats 0755 root root -
diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh

index 6d9010ce16070d6935d5b2fbc513a24ec8d9e101..5e48a7e0c69b03ef566b9742401d7c54c31dd83f 100755 (executable)
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -48,7 +48,6 @@ zip -jqr $OUT/fuzz-dns-packet_seed_corpus.zip $df/packet
  
  install -Dt $OUT/src/shared/ $build/src/shared/libsystemd-shared-*.so
  
-wget -O $OUT/fuzz-json_seed_corpus.zip https://storage.googleapis.com/skia-fuzzer/oss-fuzz/skjson_seed_corpus.zip
  wget -O $OUT/fuzz-json.dict https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/json.dict
  
  find $build -maxdepth 1 -type f -executable -name "fuzz-*" -exec mv {} $OUT \;
diff --git a/travis-ci/managers/fuzzit.sh b/travis-ci/managers/fuzzit.sh

index db2657b9c339999db7cb6a9532d67be25bc2b397..45fd784a39f2c521a48a1156108ccd54fd8369c8 100755 (executable)
--- a/travis-ci/managers/fuzzit.sh
+++ b/travis-ci/managers/fuzzit.sh
@@ -4,6 +4,10 @@ set -e
  set -x
  set -u
  
+# This should help to protect the systemd organization on Fuzzit from forks
+# that are activated on Travis CI.
+[[ "$TRAVIS_REPO_SLUG" = "systemd/systemd" ]] || exit 0
+
  REPO_ROOT=${REPO_ROOT:-$(pwd)}
  
  sudo bash -c "echo 'deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse' >>/etc/apt/sources.list"
@@ -23,7 +27,7 @@ export PATH="$HOME/.local/bin/:$PATH"
  export SANITIZER="address -fsanitize=alignment,array-bounds,bool,bounds,builtin,enum,float-divide-by-zero,function,integer-divide-by-zero,nonnull-attribute,null,object-size,return,returns-nonnull-attribute,shift,signed-integer-overflow,unreachable,unsigned-integer-overflow,vla-bound,vptr -fno-sanitize-recover=alignment,array-bounds,bool,bounds,builtin,enum,float-divide-by-zero,function,integer-divide-by-zero,nonnull-attribute,null,object-size,return,returns-nonnull-attribute,shift,signed-integer-overflow,unreachable,vla-bound,vptr"
  tools/oss-fuzz.sh
  
-FUZZING_TYPE=${1:-sanity}
+FUZZING_TYPE=${1:-regression}
  if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
      FUZZIT_BRANCH="${TRAVIS_BRANCH}"
  else
@@ -32,22 +36,20 @@ fi
  
  # Because we want Fuzzit to run on every pull-request and Travis/Azure doesnt support encrypted keys
  # on pull-request we use a write-only key which is ok for now. maybe there will be a better solution in the future
-FUZZIT_API_KEY=6a8445a23c4a8ef6743ddecf8ab368300976dae9313bbe54f1cbf30801773b2a3095d4c34daab8d308b6f2e8b254c90e
+export FUZZIT_API_KEY=af6992074353998676713818cc6435ef4a750439932dab58b51e9354d6742c54d740a3cd9fc1fc001db82f51734a24bc
  FUZZIT_ADDITIONAL_FILES="./out/src/shared/libsystemd-shared-*.so"
  
  # ASan options are borrowed almost verbatim from OSS-Fuzz
  ASAN_OPTIONS=redzone=32:print_summary=1:handle_sigill=1:allocator_release_to_os_interval_ms=500:print_suppressions=0:strict_memcmp=1:allow_user_segv_handler=0:allocator_may_return_null=1:use_sigaltstack=1:handle_sigfpe=1:handle_sigbus=1:detect_stack_use_after_return=1:alloc_dealloc_mismatch=0:detect_leaks=1:print_scariness=1:max_uar_stack_size_log=16:handle_abort=1:check_malloc_usable_size=0:quarantine_size_mb=64:detect_odr_violation=0:handle_segv=1:fast_unwind_on_fatal=0
  UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1:silence_unsigned_overflow=1
-FUZZIT_ARGS="--type ${FUZZING_TYPE} --branch ${FUZZIT_BRANCH} --revision ${TRAVIS_COMMIT} --asan_options ${ASAN_OPTIONS} --ubsan_options ${UBSAN_OPTIONS}"
-wget -O fuzzit https://bin.fuzzit.dev/fuzzit-1.1
+FUZZIT_ARGS="--type ${FUZZING_TYPE} --branch ${FUZZIT_BRANCH} --revision ${TRAVIS_COMMIT} -e ASAN_OPTIONS=${ASAN_OPTIONS} -e UBSAN_OPTIONS=${UBSAN_OPTIONS}"
+wget -O fuzzit https://github.com/fuzzitdev/fuzzit/releases/latest/download/fuzzit_Linux_x86_64
  chmod +x fuzzit
  
-./fuzzit auth ${FUZZIT_API_KEY}
-
-find out/ -maxdepth 1 -name 'fuzz-*' -executable -type f -exec basename '{}' \; | xargs --verbose -n1 -I%FUZZER% ./fuzzit c job ${FUZZIT_ARGS} %FUZZER%-asan-ubsan out/%FUZZER% ${FUZZIT_ADDITIONAL_FILES}
+find out/ -maxdepth 1 -name 'fuzz-*' -executable -type f -exec basename '{}' \; | xargs --verbose -n1 -I%FUZZER% ./fuzzit create job ${FUZZIT_ARGS} %FUZZER%-asan-ubsan out/%FUZZER% ${FUZZIT_ADDITIONAL_FILES}
  
  export SANITIZER="memory -fsanitize-memory-track-origins"
  FUZZIT_ARGS="--type ${FUZZING_TYPE} --branch ${FUZZIT_BRANCH} --revision ${TRAVIS_COMMIT}"
  tools/oss-fuzz.sh
  
-find out/ -maxdepth 1 -name 'fuzz-*' -executable -type f -exec basename '{}' \; | xargs --verbose -n1 -I%FUZZER% ./fuzzit c job ${FUZZIT_ARGS} %FUZZER%-msan out/%FUZZER% ${FUZZIT_ADDITIONAL_FILES}
+find out/ -maxdepth 1 -name 'fuzz-*' -executable -type f -exec basename '{}' \; | xargs --verbose -n1 -I%FUZZER% ./fuzzit create job ${FUZZIT_ARGS} %FUZZER%-msan out/%FUZZER% ${FUZZIT_ADDITIONAL_FILES}
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in

index a6c5eb228f4424a0933d4e593bc72762d53e448a..0971edf9ec4263cc0bf4d7b29d6b1645085d2a73 100644 (file)
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -8,7 +8,7 @@
  #  (at your option) any later version.
  
  [Unit]
-Description=Create list of required static device nodes for the current kernel
+Description=Create list of static device nodes for the current kernel
  DefaultDependencies=no
  Before=sysinit.target systemd-tmpfiles-setup-dev.service
  ConditionCapability=CAP_SYS_MODULE
@@ -17,4 +17,4 @@ ConditionFileNotEmpty=/lib/modules/%v/modules.devname
  [Service]
  Type=oneshot
  RemainAfterExit=yes
-ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/static-nodes.conf
diff --git a/units/meson.build b/units/meson.build

index cf4fe2e7bfb809e90798ed914ba887109a130407..e1ee9f86c389cdded3972fe3a0bebba86f817b72 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -309,9 +309,6 @@ install_data('user-.slice.d/10-defaults.conf',
  meson.add_install_script(meson_make_symlink,
                           join_paths(pkgsysconfdir, 'user'),
                           join_paths(sysconfdir, 'xdg/systemd/user'))
-meson.add_install_script(meson_make_symlink,
-                         join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),
-                         join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))
  if conf.get('HAVE_SYSV_COMPAT') == 1
          foreach i : [1, 2, 3, 4, 5]
                  meson.add_install_script(
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in

index 323334f6a3987431d706467991fb8d5f35007edc..089bc38f5971260c3564f254a96fd3ca8007eda9 100644 (file)
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -16,6 +16,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a
  Before=sysinit.target
  
  [Service]
+OOMScoreAdjust=-250
  CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
  DeviceAllow=char-* rw
  ExecStart=@rootlibexecdir@/systemd-journald
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in

index e8a76cc0184258a04a70a4ee30b6f4cf3a288079..dbb678ae692664b073fb0c1a4c955006b5feeda8 100644 (file)
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -17,6 +17,7 @@ ConditionPathIsReadWrite=/sys
  
  [Service]
  Type=notify
+# Note that udev also adjusts the OOM score internally and will reset the value internally for its workers
  OOMScoreAdjust=-1000
  Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
  Restart=always
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 17 Sep 2019 08:54:18 +0000 (10:54 +0200)
committer	GitHub <noreply@github.com>
	Tue, 17 Sep 2019 08:54:18 +0000 (10:54 +0200)
.travis.yml		patch \| blob \| blame \| history
NEWS		patch \| blob \| blame \| history
README		patch \| blob \| blame \| history
README.md		patch \| blob \| blame \| history
TODO		patch \| blob \| blame \| history
docs/BOOT_LOADER_INTERFACE.md		patch \| blob \| blame \| history
docs/CONTRIBUTING.md		patch \| blob \| blame \| history
docs/RANDOM_SEEDS.md		patch \| blob \| blame \| history
docs/RELEASE.md		patch \| blob \| blame \| history
docs/SECURITY.md	[new file with mode: 0644]	patch \| blob
hwdb/20-OUI.hwdb		patch \| blob \| blame \| history
hwdb/20-acpi-vendor.hwdb.patch		patch \| blob \| blame \| history
hwdb/20-pci-classes.hwdb		patch \| blob \| blame \| history
hwdb/20-pci-vendor-model.hwdb		patch \| blob \| blame \| history
hwdb/20-usb-vendor-model.hwdb		patch \| blob \| blame \| history
hwdb/60-evdev.hwdb		patch \| blob \| blame \| history
hwdb/60-keyboard.hwdb		patch \| blob \| blame \| history
hwdb/60-sensor.hwdb		patch \| blob \| blame \| history
hwdb/70-touchpad.hwdb		patch \| blob \| blame \| history
hwdb/ma-large.txt		patch \| blob \| blame \| history
hwdb/ma-medium.txt		patch \| blob \| blame \| history
hwdb/ma-small.txt		patch \| blob \| blame \| history
hwdb/pci.ids		patch \| blob \| blame \| history
hwdb/usb.ids		patch \| blob \| blame \| history
man/journalctl.xml		patch \| blob \| blame \| history
man/machine-id.xml		patch \| blob \| blame \| history
man/runlevel.xml		patch \| blob \| blame \| history
man/sd_event_set_watchdog.xml		patch \| blob \| blame \| history
man/systemctl.xml		patch \| blob \| blame \| history
man/systemd-nspawn.xml		patch \| blob \| blame \| history
man/systemd-vconsole-setup.service.xml		patch \| blob \| blame \| history
man/systemd.exec.xml		patch \| blob \| blame \| history
man/systemd.journal-fields.xml		patch \| blob \| blame \| history
man/systemd.netdev.xml		patch \| blob \| blame \| history
man/systemd.network.xml		patch \| blob \| blame \| history
man/systemd.service.xml		patch \| blob \| blame \| history
man/systemd.unit.xml		patch \| blob \| blame \| history
man/udevadm.xml		patch \| blob \| blame \| history
meson_options.txt		patch \| blob \| blame \| history
po/ja.po		patch \| blob \| blame \| history
po/pl.po		patch \| blob \| blame \| history
po/pt_BR.po		patch \| blob \| blame \| history
po/uk.po		patch \| blob \| blame \| history
rules/50-udev-default.rules.in		patch \| blob \| blame \| history
rules/60-block.rules		patch \| blob \| blame \| history
rules/60-fido-id.rules	[new file with mode: 0644]	patch \| blob
rules/60-persistent-storage.rules		patch \| blob \| blame \| history
rules/meson.build		patch \| blob \| blame \| history
semaphoreci/semaphore-runner.sh		patch \| blob \| blame \| history
shell-completion/bash/busctl		patch \| blob \| blame \| history
shell-completion/zsh/_bootctl		patch \| blob \| blame \| history
shell-completion/zsh/_busctl		patch \| blob \| blame \| history
shell-completion/zsh/_journalctl		patch \| blob \| blame \| history
shell-completion/zsh/_resolvectl	[moved from shell-completion/zsh/_systemd-resolve with 50% similarity]	patch \| blob \| blame \| history
shell-completion/zsh/meson.build		patch \| blob \| blame \| history
src/analyze/analyze-security.c		patch \| blob \| blame \| history
src/basic/build.h		patch \| blob \| blame \| history
src/basic/cgroup-util.c		patch \| blob \| blame \| history
src/basic/conf-files.c		patch \| blob \| blame \| history
src/basic/conf-files.h		patch \| blob \| blame \| history
src/basic/env-file.c		patch \| blob \| blame \| history
src/basic/extract-word.c		patch \| blob \| blame \| history
src/basic/fileio.c		patch \| blob \| blame \| history
src/basic/log.c		patch \| blob \| blame \| history
src/basic/missing_syscall.h		patch \| blob \| blame \| history
src/basic/path-util.h		patch \| blob \| blame \| history
src/basic/strv.h		patch \| blob \| blame \| history
src/basic/terminal-util.c		patch \| blob \| blame \| history
src/basic/unit-def.c		patch \| blob \| blame \| history
src/basic/unit-def.h		patch \| blob \| blame \| history
src/basic/user-util.c		patch \| blob \| blame \| history
src/basic/user-util.h		patch \| blob \| blame \| history
src/basic/virt.c		patch \| blob \| blame \| history
src/boot/bootctl.c		patch \| blob \| blame \| history
src/boot/efi/linux.c		patch \| blob \| blame \| history
src/boot/efi/meson.build		patch \| blob \| blame \| history
src/boot/efi/shim.c		patch \| blob \| blame \| history
src/core/cgroup.c		patch \| blob \| blame \| history
src/core/dbus-execute.c		patch \| blob \| blame \| history
src/core/dbus-service.c		patch \| blob \| blame \| history
src/core/dbus-socket.c		patch \| blob \| blame \| history
src/core/dbus-timer.c		patch \| blob \| blame \| history
src/core/dbus-util.c		patch \| blob \| blame \| history
src/core/dbus-util.h		patch \| blob \| blame \| history
src/core/dbus.c		patch \| blob \| blame \| history
src/core/execute.c		patch \| blob \| blame \| history
src/core/execute.h		patch \| blob \| blame \| history
src/core/load-fragment-gperf.gperf.m4		patch \| blob \| blame \| history
src/core/load-fragment.c		patch \| blob \| blame \| history
src/core/load-fragment.h		patch \| blob \| blame \| history
src/core/machine-id-setup.c		patch \| blob \| blame \| history
src/core/main.c		patch \| blob \| blame \| history
src/core/manager.c		patch \| blob \| blame \| history
src/core/meson.build		patch \| blob \| blame \| history
src/core/mount-setup.c		patch \| blob \| blame \| history
src/core/mount.c		patch \| blob \| blame \| history
src/core/mount.h		patch \| blob \| blame \| history
src/core/org.freedesktop.systemd1.service	[deleted file]	patch \| blob \| blame \| history
src/core/path.c		patch \| blob \| blame \| history
src/core/service.c		patch \| blob \| blame \| history
src/core/service.h		patch \| blob \| blame \| history
src/core/socket.c		patch \| blob \| blame \| history
src/core/socket.h		patch \| blob \| blame \| history
src/core/swap.c		patch \| blob \| blame \| history
src/core/swap.h		patch \| blob \| blame \| history
src/core/unit.c		patch \| blob \| blame \| history
src/core/unit.h		patch \| blob \| blame \| history
src/environment-d-generator/environment-d-generator.c		patch \| blob \| blame \| history
src/firstboot/firstboot.c		patch \| blob \| blame \| history
src/fsck/fsck.c		patch \| blob \| blame \| history
src/fuzz/fuzz-catalog.c		patch \| blob \| blame \| history
src/fuzz/fuzz-fido-id-desc.c	[new file with mode: 0644]	patch \| blob
src/fuzz/fuzz-fido-id-desc.dict	[new file with mode: 0644]	patch \| blob
src/fuzz/meson.build		patch \| blob \| blame \| history
src/hostname/hostnamed.c		patch \| blob \| blame \| history
src/id128/id128.c		patch \| blob \| blame \| history
src/journal/catalog.c		patch \| blob \| blame \| history
src/journal/catalog.h		patch \| blob \| blame \| history
src/journal/journalctl.c		patch \| blob \| blame \| history
src/journal/test-catalog.c		patch \| blob \| blame \| history
src/journal/test-journal-flush.c		patch \| blob \| blame \| history
src/kernel-install/90-loaderentry.install		patch \| blob \| blame \| history
src/libsystemd-network/network-internal.c		patch \| blob \| blame \| history
src/libsystemd-network/sd-dhcp6-client.c		patch \| blob \| blame \| history
src/libsystemd-network/sd-ndisc.c		patch \| blob \| blame \| history
src/libsystemd/sd-bus/sd-bus.c		patch \| blob \| blame \| history
src/libsystemd/sd-bus/test-bus-vtable.c		patch \| blob \| blame \| history
src/libsystemd/sd-bus/test-vtable-data.h		patch \| blob \| blame \| history
src/libsystemd/sd-event/test-event.c		patch \| blob \| blame \| history
src/libsystemd/sd-netlink/rtnl-message.c		patch \| blob \| blame \| history
src/libsystemd/sd-netlink/sd-netlink.c		patch \| blob \| blame \| history
src/libsystemd/sd-network/sd-network.c		patch \| blob \| blame \| history
src/login/logind-brightness.c		patch \| blob \| blame \| history
src/login/logind-dbus.c		patch \| blob \| blame \| history
src/login/logind-inhibit.c		patch \| blob \| blame \| history
src/login/logind-session-dbus.c		patch \| blob \| blame \| history
src/network/netdev/macsec.c		patch \| blob \| blame \| history
src/network/netdev/netdev.c		patch \| blob \| blame \| history
src/network/netdev/wireguard.c		patch \| blob \| blame \| history
src/network/networkctl.c		patch \| blob \| blame \| history
src/network/networkd-address.c		patch \| blob \| blame \| history
src/network/networkd-dhcp-common.c		patch \| blob \| blame \| history
src/network/networkd-dhcp4.c		patch \| blob \| blame \| history
src/network/networkd-dhcp6.c		patch \| blob \| blame \| history
src/network/networkd-fdb.c		patch \| blob \| blame \| history
src/network/networkd-ipv4ll.c		patch \| blob \| blame \| history
src/network/networkd-link.c		patch \| blob \| blame \| history
src/network/networkd-link.h		patch \| blob \| blame \| history
src/network/networkd-manager.c		patch \| blob \| blame \| history
src/network/networkd-manager.h		patch \| blob \| blame \| history
src/network/networkd-neighbor.c		patch \| blob \| blame \| history
src/network/networkd-neighbor.h		patch \| blob \| blame \| history
src/network/networkd-network-gperf.gperf		patch \| blob \| blame \| history
src/network/networkd-network.c		patch \| blob \| blame \| history
src/network/networkd-network.h		patch \| blob \| blame \| history
src/network/networkd-route.c		patch \| blob \| blame \| history
src/network/networkd-routing-policy-rule.c		patch \| blob \| blame \| history
src/network/networkd-routing-policy-rule.h		patch \| blob \| blame \| history
src/network/networkd-util.c		patch \| blob \| blame \| history
src/network/networkd-util.h		patch \| blob \| blame \| history
src/network/networkd.c		patch \| blob \| blame \| history
src/network/org.freedesktop.network1.policy		patch \| blob \| blame \| history
src/network/test-network-tables.c		patch \| blob \| blame \| history
src/network/test-networkd-conf.c		patch \| blob \| blame \| history
src/network/test-routing-policy-rule.c		patch \| blob \| blame \| history
src/pstore/pstore.c		patch \| blob \| blame \| history
src/resolve/org.freedesktop.resolve1.policy		patch \| blob \| blame \| history
src/resolve/resolved-bus.c		patch \| blob \| blame \| history
src/resolve/resolved-dns-transaction.c		patch \| blob \| blame \| history
src/resolve/resolved-link-bus.c		patch \| blob \| blame \| history
src/shared/bootspec.c		patch \| blob \| blame \| history
src/shared/bus-util.c		patch \| blob \| blame \| history
src/shared/conf-parser.c		patch \| blob \| blame \| history
src/shared/path-lookup.c		patch \| blob \| blame \| history
src/shared/path-lookup.h		patch \| blob \| blame \| history
src/shared/pretty-print.c		patch \| blob \| blame \| history
src/shared/seccomp-util.c		patch \| blob \| blame \| history
src/shared/unit-file.c		patch \| blob \| blame \| history
src/shared/watchdog.c		patch \| blob \| blame \| history
src/shutdown/shutdown.c		patch \| blob \| blame \| history
src/systemctl/systemctl.c		patch \| blob \| blame \| history
src/systemd/sd-dhcp6-client.h		patch \| blob \| blame \| history
src/systemd/sd-network.h		patch \| blob \| blame \| history
src/sysusers/sysusers.c		patch \| blob \| blame \| history
src/test/meson.build		patch \| blob \| blame \| history
src/test/test-cgroup-util.c		patch \| blob \| blame \| history
src/test/test-conf-files.c		patch \| blob \| blame \| history
src/test/test-fido-id-desc.c	[new file with mode: 0644]	patch \| blob
src/test/test-path-lookup.c		patch \| blob \| blame \| history
src/test/test-unit-name.c		patch \| blob \| blame \| history
src/test/test-user-util.c		patch \| blob \| blame \| history
src/udev/fido_id/fido_id.c	[new file with mode: 0644]	patch \| blob
src/udev/fido_id/fido_id_desc.c	[new file with mode: 0644]	patch \| blob
src/udev/fido_id/fido_id_desc.h	[new file with mode: 0644]	patch \| blob
src/udev/meson.build		patch \| blob \| blame \| history
src/udev/udev-rules.c		patch \| blob \| blame \| history
src/update-utmp/update-utmp.c		patch \| blob \| blame \| history
test/TEST-02-CRYPTSETUP/test.sh		patch \| blob \| blame \| history
test/TEST-10-ISSUE-2467/test.sh		patch \| blob \| blame \| history
test/TEST-18-FAILUREACTION/test.sh		patch \| blob \| blame \| history
test/TEST-18-FAILUREACTION/testsuite.sh		patch \| blob \| blame \| history
test/TEST-19-DELEGATE/test.sh		patch \| blob \| blame \| history
test/TEST-24-UNIT-TESTS/test.sh		patch \| blob \| blame \| history
test/TEST-33-CLEAN-UNIT/test.sh		patch \| blob \| blame \| history
test/TEST-33-CLEAN-UNIT/testsuite.sh		patch \| blob \| blame \| history
test/TEST-36-NUMAPOLICY/test.sh		patch \| blob \| blame \| history
test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile	[new symlink]	patch \| blob
test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh	[new file with mode: 0755]	patch \| blob
test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh	[new file with mode: 0755]	patch \| blob
test/fuzz/fuzz-fido-id-desc/crash0	[new file with mode: 0644]	patch \| blob
test/fuzz/fuzz-fido-id-desc/crash1	[new file with mode: 0644]	patch \| blob
test/fuzz/fuzz-fido-id-desc/report0	[new file with mode: 0644]	patch \| blob
test/fuzz/fuzz-fido-id-desc/report1	[new file with mode: 0644]	patch \| blob
test/fuzz/fuzz-network-parser/directives.network		patch \| blob \| blame \| history
test/test-functions		patch \| blob \| blame \| history
test/test-network/conf/25-address-preferred-lifetime-zero.network	[moved from test/test-network/conf/25-address-preferred-lifetime-zero-ipv6.network with 85% similarity]	patch \| blob \| blame \| history
test/test-network/conf/25-neighbor-next.network	[new file with mode: 0644]	patch \| blob
test/test-network/conf/26-link-local-addressing-ipv6.network	[new file with mode: 0644]	patch \| blob
test/test-network/conf/routing-policy-rule-test1.network		patch \| blob \| blame \| history
test/test-network/systemd-networkd-tests.py		patch \| blob \| blame \| history
test/udev-test.pl		patch \| blob \| blame \| history
tmpfiles.d/meson.build		patch \| blob \| blame \| history
tmpfiles.d/static-nodes-permissions.conf.in	[new file with mode: 0644]	patch \| blob
tmpfiles.d/systemd.conf.m4		patch \| blob \| blame \| history
tools/oss-fuzz.sh		patch \| blob \| blame \| history
travis-ci/managers/fuzzit.sh		patch \| blob \| blame \| history
units/kmod-static-nodes.service.in		patch \| blob \| blame \| history
units/meson.build		patch \| blob \| blame \| history
units/systemd-journald.service.in		patch \| blob \| blame \| history
units/systemd-udevd.service.in		patch \| blob \| blame \| history