Merge pull request #14778 from cgzones/split_selinux_logging

Improve SELinux logging in permissive mode

NEWS

@@ -125,10 +125,10 @@ CHANGES WITH 245 in spe:
           marking a process so that it is killed implicitly whenever the event
           source watching it is freed).
 
-        * systemd-networkd gained support for configuring Token Buffer Filter
+        * systemd-networkd gained support for configuring Token Bucket Filter
           (TBF) parameters in its qdisc configuration support. Similar, support
           for Stochastic Fairness Queuing (SFQ), Controlled-Delay Active
-          Queue Management (CoDel), Fair Queue (FQ) has been added.
+          Queue Management (CoDel), Fair Queueing (FQ) has been added.
 
         * systemd-networkd gained support for Intermediate Functional Block
           (IFB) network devices.
@@ -148,8 +148,8 @@ CHANGES WITH 245 in spe:
           with it's sense inverted.
 
         * The Gateway= setting of [Route] sections of .network files gained
-          support for a special new value "dhcp". If set the configured static
+          support for a special new value "_dhcp". If set, the configured
-          route uses the gateway host configured via DHCP.
+          static route uses the gateway host configured via DHCP.
 
         * A new User= setting has been implemented for the [RoutingPolicyRule]
           section of .network files for configuring source routing based on UID

hwdb.d/20-acpi-vendor.hwdb.patch

@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base	2019-11-29 14:29:51.816965218 +0100
+--- 20-acpi-vendor.hwdb.base	2020-02-04 18:26:50.552863816 +0100
-+++ 20-acpi-vendor.hwdb	2019-11-29 14:29:51.821964280 +0100
++++ 20-acpi-vendor.hwdb	2020-02-04 18:26:50.569863967 +0100
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     https://uefi.org/uefi-pnp-export

hwdb.d/20-usb-vendor-model.hwdb

@@ -57233,6 +57233,30 @@ usb:v2237*
 usb:v2237p4161*
  ID_MODEL_FROM_DATABASE=eReader White
 
+usb:v224F*
+ ID_VENDOR_FROM_DATABASE=APDM
+
+usb:v224Fp0001*
+ ID_MODEL_FROM_DATABASE=Access Point
+
+usb:v224Fp0002*
+ ID_MODEL_FROM_DATABASE=Docking Station
+
+usb:v224Fp0004*
+ ID_MODEL_FROM_DATABASE=V2 Opal ACM
+
+usb:v224Fp0005*
+ ID_MODEL_FROM_DATABASE=V2 Opal
+
+usb:v224Fp0006*
+ ID_MODEL_FROM_DATABASE=V2 Docking Station
+
+usb:v224Fp0007*
+ ID_MODEL_FROM_DATABASE=V2 Access Point ACM
+
+usb:v224Fp0008*
+ ID_MODEL_FROM_DATABASE=V2 Access Point
+
 usb:v225D*
  ID_VENDOR_FROM_DATABASE=Morpho
 

hwdb.d/ma-medium.txt

@@ -3560,12 +3560,6 @@ E00000-EFFFFF     (base 16)		Nanjing Yining Intelligent Technology Co., Ltd.
 				Nanjing  Jiangsu  210019
 				CN
 
-B0-B3-53   (hex)		Blake UK
-000000-0FFFFF     (base 16)		Blake UK
-				177-187, Rutland Road
-				Sheffield  --select--  S3 9PT
-				GB
-
 B0-B3-53   (hex)		Beijing Geekplus Technology Co.,Ltd.
 C00000-CFFFFF     (base 16)		Beijing Geekplus Technology Co.,Ltd.
 				1st Floor, Building 1, Chaolai High-Tech industrial Part, Chaoyang District
@@ -3578,12 +3572,150 @@ D00000-DFFFFF     (base 16)		IPvideo Corporation
 				Bay Shore  NY  11706
 				US
 
+B0-B3-53   (hex)		Blake UK
+000000-0FFFFF     (base 16)		Blake UK
+				177-187, Rutland Road
+				Sheffield  --select--  S3 9PT
+				GB
+
 B0-B3-53   (hex)		Zoox
 B00000-BFFFFF     (base 16)		Zoox
 				1149 Chess Drive
 				Foster City  CA  94404
 				US
 
+14-AE-85   (hex)		Qingdao iTechene Technologies Co., Ltd.
+200000-2FFFFF     (base 16)		Qingdao iTechene Technologies Co., Ltd.
+				UnitA3-A4,Level8,Block A ,International Innovation Park,No.1Keyuanwei Rd.,Laoshan District
+				Qingdao    266100
+				CN
+
+14-AE-85   (hex)		Henfred Technology Co., Ltd.
+100000-1FFFFF     (base 16)		Henfred Technology Co., Ltd.
+				3F.-7, No.77, Sec. 1, Xintai 5th Rd
+				New Taipei City  Xizhi Dist  221
+				TW
+
+14-AE-85   (hex)		MTA Systems
+A00000-AFFFFF     (base 16)		MTA Systems
+				Pemstraße 2
+				Mauthausen    4310
+				AT
+
+64-62-66   (hex)		MiiVii Dynamics Technology CO.,LTD
+000000-0FFFFF     (base 16)		MiiVii Dynamics Technology CO.,LTD
+				1408-1415 Tower A BUGG Building,No.18 N. Taipingzhuang Rd,haidian District
+				Beijing  Beijing  100000
+				CN
+
+64-62-66   (hex)		Annapurna labs
+100000-1FFFFF     (base 16)		Annapurna labs
+				Matam Scientific Industries Center,   Building 8.2
+				Mail box 15123  Haifa  3508409
+				IL
+
+64-62-66   (hex)		Bühler AG
+500000-5FFFFF     (base 16)		Bühler AG
+				Gupfenstrasse 5
+				Uzwil    9240
+				CH
+
+64-62-66   (hex)		Shenzhen Jie Shi Lian Industrial Co., LTD
+E00000-EFFFFF     (base 16)		Shenzhen Jie Shi Lian Industrial Co., LTD
+				6F,C Building,Jinao Industrial Park,Juling Rd,Guanlan Town,Longhua
+				Shenzhen  Guangdong  518000
+				CN
+
+64-62-66   (hex)		Leontech Limited
+800000-8FFFFF     (base 16)		Leontech Limited
+				1208 WorkingBerg Commercial Buildung, 41-47 Marble Road
+				Hong Kong  Hong Kong  00000
+				HK
+
+94-CC-04   (hex)		Sam Nazarko Trading Ltd
+600000-6FFFFF     (base 16)		Sam Nazarko Trading Ltd
+				18 Watermill Way
+				London  Surrey  SW19 2RD
+				GB
+
+94-CC-04   (hex)		Hanzhuo Information Technology(Shanghai) Ltd.
+D00000-DFFFFF     (base 16)		Hanzhuo Information Technology(Shanghai) Ltd.
+				Room 2085, building 2, 622 Yingyuan middle Road, Jiading Strict
+				Shanghai    201200
+				CN
+
+94-CC-04   (hex)		hyBee Inc.
+A00000-AFFFFF     (base 16)		hyBee Inc.
+				#1003, Innovalley B, 253, Pangyo-ro, Bundang-gu
+				Seongnam-si  Gyeonggi-do  13486
+				KR
+
+94-05-BB   (hex)		iungo
+800000-8FFFFF     (base 16)		iungo
+				Vrouwenlaan 62
+				Zwolle  Overijssel  8017 HS
+				NL
+
+94-CC-04   (hex)		Nanjing Yacer Communication Technology Co. Ltd.
+200000-2FFFFF     (base 16)		Nanjing Yacer Communication Technology Co. Ltd.
+				333 Taiping South Road Jinling Yujingyuan 19nd  floor Unit K Qin Huai District
+				nanjing  jiangsu  210000
+				CN
+
+90-E2-FC   (hex)		Pars Ertebat Afzar Co.
+000000-0FFFFF     (base 16)		Pars Ertebat Afzar Co.
+				1116 – Burlington Tower Business Bay
+				Dubai    90072
+				AE
+
+94-05-BB   (hex)		Dongguan CXWE Technology Co.,Ltd.
+200000-2FFFFF     (base 16)		Dongguan CXWE Technology Co.,Ltd.
+				Room 805, building 1, No. 16, Keji 4th Road, Songshanhu
+				Dongguan  Guangdong  523000
+				CN
+
+94-05-BB   (hex)		Zimmer GmbH
+900000-9FFFFF     (base 16)		Zimmer GmbH
+				Im Salmenkopf 5
+				Rheinau  Baden-Württemberg  77866
+				DE
+
+94-05-BB   (hex)		Qingdao Maotran Electronics co., ltd
+000000-0FFFFF     (base 16)		Qingdao Maotran Electronics co., ltd
+				Room2907, Building 2 of Minghui International, No.39 of Shiling Road, Laoshan District
+				Qingdao  Shandong  266000
+				CN
+
+94-05-BB   (hex)		LTE-X, Inc
+700000-7FFFFF     (base 16)		LTE-X, Inc
+				2-2-20 Higashi-Shinagawa
+				Shinagawa  Tokyo  1400002
+				JP
+
+94-05-BB   (hex)		BAE Systems
+E00000-EFFFFF     (base 16)		BAE Systems
+				21 continental boulevard
+				Merrimack  NH  03054
+				US
+
+F4-90-CB   (hex)		Cheetah Medical
+C00000-CFFFFF     (base 16)		Cheetah Medical
+				2A Hashlosha st.
+				Tel Aviv    6706055
+				IL
+
+F4-90-CB   (hex)		A-dec Inc.
+B00000-BFFFFF     (base 16)		A-dec Inc.
+				2601 Crestview Drive
+				Newberg  OR  97132
+				US
+
+F4-90-CB   (hex)		TEQ SA
+700000-7FFFFF     (base 16)		TEQ SA
+				Via al Municipio 16
+				Barbengo  Ticino  6917
+				CH
+
 4C-4B-F9   (hex)		Shenzhen dingsheng technology co., LTD
 400000-4FFFFF     (base 16)		Shenzhen dingsheng technology co., LTD
 				Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district
@@ -3866,12 +3998,6 @@ D0-C8-57   (hex)		Mobicon
 				Suwon-si  Gyeonggi-do  16521
 				KR
 
-D0-C8-57   (hex)		IFLYTEK CO.,LTD.
-D00000-DFFFFF     (base 16)		IFLYTEK CO.,LTD.
-				National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,
-				Heifei  An hui  230088
-				CN
-
 60-95-CE   (hex)		Synamedia
 C00000-CFFFFF     (base 16)		Synamedia
 				Luipaardstraat 12
@@ -6971,6 +7097,84 @@ C00000-CFFFFF     (base 16)		Shenzhen zhong ju  Fiber optical Co.Ltd
 				Zhuhai  Guangdong  519080
 				CN
 
+90-E2-FC   (hex)		Huddly AS
+900000-9FFFFF     (base 16)		Huddly AS
+				Karenslyst Allé 51
+				Oslo    0279
+				NO
+
+90-E2-FC   (hex)		Shenzhen Dingsheng Intelligent Technology Co., Ltd
+B00000-BFFFFF     (base 16)		Shenzhen Dingsheng Intelligent Technology Co., Ltd
+				10/F Block C, Skyworth Building, Gaoxin South 1st Rd., Hi-Tech Park, Nanshan District
+				Shenzhen  Guangdong  518000
+				CN
+
+14-AE-85   (hex)		Veo Technologies
+900000-9FFFFF     (base 16)		Veo Technologies
+				Aldersrogade 6c, 4. sal
+				København  Denmark  2100
+				DK
+
+14-AE-85   (hex)		SHENZHEN HONOR ELECTRONIC CO.,LTD
+700000-7FFFFF     (base 16)		SHENZHEN HONOR ELECTRONIC CO.,LTD
+				No. A Building, Xinghui Industrial Park, Gushu No. 2Rd,
+				SHEN ZHEN  GUANG  DONG  518000
+				CN
+
+94-CC-04   (hex)		Shenzhen Link technology Co.,Ltd
+300000-3FFFFF     (base 16)		Shenzhen Link technology Co.,Ltd
+				901,9/F,Dahong High TechIndusryPark?NO.6-18,Xinhe Road,Xinqiao Community,Baoan District
+				Shenzhen  Guangdong  518000
+				CN
+
+94-CC-04   (hex)		SHENZHEN SANRAY TECHNOLOGY CO.,LTD
+500000-5FFFFF     (base 16)		SHENZHEN SANRAY TECHNOLOGY CO.,LTD
+				1B08 2/F Folk Culture Industrial Park,Qunli Second Road, Baoan District
+				Shenzhen  GuangDong  518101
+				CN
+
+94-CC-04   (hex)		GOCOAX, INC
+100000-1FFFFF     (base 16)		GOCOAX, INC
+				15902A Halliburton Rd #662 
+				Hacienda Heights  CA  91745
+				US
+
+94-05-BB   (hex)		Chengdu Zhongheng Network Co.,Ltd.
+500000-5FFFFF     (base 16)		Chengdu Zhongheng Network Co.,Ltd.
+				No.898 Baicao Road, Chengdu High-tech Zone (Western District)
+				Chengdu  Sichuan  611731
+				CN
+
+D0-C8-57   (hex)		IFLYTEK CO.,LTD.
+D00000-DFFFFF     (base 16)		IFLYTEK CO.,LTD.
+				National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,
+				Hefei  An hui  230088
+				CN
+
+94-CC-04   (hex)		Shanxi Baixin Information Technology Co., Ltd.
+C00000-CFFFFF     (base 16)		Shanxi Baixin Information Technology Co., Ltd.
+				Room 210-213, Room 215-217, Room 219-220, No.2, Yari Street, Taiyuan University Park, Shanxi Comprehensive Reform Demonstration Zone
+				Taiyuan  Shanxi  030032
+				CN
+
+94-05-BB   (hex)		ZIGPOS GmbH
+600000-6FFFFF     (base 16)		ZIGPOS GmbH
+				Räcknitzhöhe 35a
+				Dresden  Saxony  01217
+				DE
+
+94-05-BB   (hex)		SolarEdge Technologies
+A00000-AFFFFF     (base 16)		SolarEdge Technologies
+				1 Abba Eban St.
+				Herzelia    46725
+				IL
+
+F4-90-CB   (hex)		Airbeam Wireless Technologies Inc.
+600000-6FFFFF     (base 16)		Airbeam Wireless Technologies Inc.
+				#125, 21320 Gordon Way
+				Richmond  British Columbia  V6W 1J8
+				CA
+
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
 				No.112 Yongfu Rd.,BaoanDistrict,
@@ -10406,6 +10610,78 @@ A00000-AFFFFF     (base 16)		Ledger
 				Paris    75002
 				FR
 
+14-AE-85   (hex)		Trimble LEM
+800000-8FFFFF     (base 16)		Trimble LEM
+				10368 Westmoor Dr
+				Westminster  CO  80021
+				US
+
+14-AE-85   (hex)		Kayamatics Limited
+000000-0FFFFF     (base 16)		Kayamatics Limited
+				Room 1209, Trend Centre, 29 Cheung Lee Street
+				Chaiwan  NA  NA
+				HK
+
+64-62-66   (hex)		Shenzhen C & D Electronics Co., Ltd.
+700000-7FFFFF     (base 16)		Shenzhen C & D Electronics Co., Ltd.
+				9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District
+				ShenZhen  GuangDong  518000
+				CN
+
+64-62-66   (hex)		Signal Hound
+B00000-BFFFFF     (base 16)		Signal Hound
+				1502 SE Commerce Ave Suite 101
+				Battle Ground  WA  98604
+				US
+
+64-62-66   (hex)		Chunghwa System Integration Co., Ltd.
+900000-9FFFFF     (base 16)		Chunghwa System Integration Co., Ltd.
+				2F., No. 35, Aiguo E. Rd.,
+				Taipei    106
+				TW
+
+64-62-66   (hex)		Protectli
+200000-2FFFFF     (base 16)		Protectli
+				1315 Hot Springs Way
+				Vista  CA  92081
+				US
+
+64-62-66   (hex)		Redstone Systems, Inc.
+400000-4FFFFF     (base 16)		Redstone Systems, Inc.
+				24 School Street, 2nd floor
+				Boston    02108
+				US
+
+64-62-66   (hex)		Kobol Innovations Pte. Ltd.
+D00000-DFFFFF     (base 16)		Kobol Innovations Pte. Ltd.
+				101 Cecil Street, #26-01/07 Tong Eng Building
+				Singapore    069533
+				SG
+
+94-05-BB   (hex)		AUSTAR HEARING SCIENCE AND TECHNILIGY(XIAMEN)CO.,LTD
+B00000-BFFFFF     (base 16)		AUSTAR HEARING SCIENCE AND TECHNILIGY(XIAMEN)CO.,LTD
+				RM201,No.2Gaoqi South 12th Road,HuliDist
+				XIamen  Fujian  361006
+				CN
+
+94-05-BB   (hex)		LAO INDUSTRIA LTDA
+C00000-CFFFFF     (base 16)		LAO INDUSTRIA LTDA
+				AV DR MAURO LINDENBERG MONTEIRO, 1003
+				OSASCO  SÃO PAULO  06278010
+				BR
+
+F4-90-CB   (hex)		Avilution
+500000-5FFFFF     (base 16)		Avilution
+				103 Shoreline Dr
+				Madison  AL  35758
+				US
+
+F4-90-CB   (hex)		OmniNet
+400000-4FFFFF     (base 16)		OmniNet
+				6410 Del Rio Rd
+				Charlotte  NC  28277
+				US
+
 4C-4B-F9   (hex)		Shandong Linkotech Electronic Co., Ltd.
 600000-6FFFFF     (base 16)		Shandong Linkotech Electronic Co., Ltd.
 				22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone
@@ -11186,12 +11462,6 @@ E00000-EFFFFF     (base 16)		NC-LINK Technology Co., Ltd.
 				Shenzhen  Guangdong  518101
 				CN
 
-7C-BC-84   (hex)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
-D00000-DFFFFF     (base 16)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
-				B-11 SECTOR-VII
-				NOIDA  UTTAR PRADESH  201301
-				IN
-
 7C-BC-84   (hex)		Shanghai Yitu Technology Co. Ltd
 300000-3FFFFF     (base 16)		Shanghai Yitu Technology Co. Ltd
 				23/F, Tower 1, No.523 Loushanguan Road, Changning District
@@ -13874,6 +14144,90 @@ D00000-DFFFFF     (base 16)		Beijing Lanxum Computer Technology CO.,LTD.
 				Beijing  Beijing  100192
 				CN
 
+90-E2-FC   (hex)		ShenZhen Temwey Innovation Technology Co.,Ltd.
+200000-2FFFFF     (base 16)		ShenZhen Temwey Innovation Technology Co.,Ltd.
+				Room 1008, 10/F, Bld.B, Bantian International Centre, No. 5 South Huancheng Road, Bantian Street of Shenzhen Longgang District
+				SHENZHEN  GUANGDONG  518129
+				CN
+
+90-E2-FC   (hex)		Dongguan Kangyong electronics technology Co. Ltd
+400000-4FFFFF     (base 16)		Dongguan Kangyong electronics technology Co. Ltd
+				No 9,Yincheng 1st Road, Xiabian Village, Chang’an Town
+				Dongguan  GuangDong  523877
+				CN
+
+90-E2-FC   (hex)		bitsensing Inc.
+800000-8FFFFF     (base 16)		bitsensing Inc.
+				165, Yeoksam-ro,
+				Gangnam-gu, Seoul,  Republic of Korea  06247
+				KR
+
+90-E2-FC   (hex)		Stanley Security
+C00000-CFFFFF     (base 16)		Stanley Security
+				8350 Sunlight Drive
+				Fishers  IN  46037
+				US
+
+14-AE-85   (hex)		iSolution Technologies Co.,Ltd.
+D00000-DFFFFF     (base 16)		iSolution Technologies Co.,Ltd.
+				5F,Bldg #6, Zhongguan Honghualing Industrial South Park
+				Shenzhen  Guangdong  518055
+				CN
+
+7C-BC-84   (hex)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
+D00000-DFFFFF     (base 16)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
+				B3, Bredon House, 321, Tettenhall Road, Tettenhall
+				Wolverhampton  West Midlands  WV6 0JZ
+				GB
+
+64-62-66   (hex)		FaceHeart Inc.
+300000-3FFFFF     (base 16)		FaceHeart Inc.
+				Rm. 8, 19F., No.118, Ciyun Rd., East Dist.
+				Hsinchu  Taiwan  300
+				TW
+
+64-62-66   (hex)		Sensoro Co., Ltd.
+A00000-AFFFFF     (base 16)		Sensoro Co., Ltd.
+				7F D-Block, Lei Shing Hong Center, No. 8 Guangshun South Street, Chaoyang District,
+				Beijing  Beijing  100102
+				CN
+
+64-62-66   (hex)		Pass & Seymour, Inc d/b/a Legrand
+600000-6FFFFF     (base 16)		Pass & Seymour, Inc d/b/a Legrand
+				50 Boyd Ave
+				Syracuse  NY  13209
+				US
+
+94-CC-04   (hex)		Shandong free optical technology co., ltd.
+B00000-BFFFFF     (base 16)		Shandong free optical technology co., ltd.
+				195 East First Street, Industrial First Street, Economic Development Zone, Weifang, Weicheng District,
+				Weifeng  Shandong  216000
+				CN
+
+94-CC-04   (hex)		ENTEC Electric & Electronic Co., LTD.
+900000-9FFFFF     (base 16)		ENTEC Electric & Electronic Co., LTD.
+				78-2 Buncheon-ri, Bongdam-eup
+				Hwaseong-city  Gyungki-do  445-894
+				KR
+
+94-CC-04   (hex)		SynchronicIT BV
+E00000-EFFFFF     (base 16)		SynchronicIT BV
+				Spoorstraat 155, room 413
+				Gennep  Nederland  6591 GT
+				NL
+
+F4-90-CB   (hex)		Simavita (Aust) Pty Ltd
+D00000-DFFFFF     (base 16)		Simavita (Aust) Pty Ltd
+				Suite 2.02, L2, 54 Miller Street
+				North Sydney  NSW  2060
+				AU
+
+F4-90-CB   (hex)		Ricker Lyman Robotic
+300000-3FFFFF     (base 16)		Ricker Lyman Robotic
+				319 Main Street
+				Beacon  NY  12508
+				US
+
 20-85-93   (hex)		Great Lite International
 700000-7FFFFF     (base 16)		Great Lite International
 				11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,
@@ -16421,12 +16775,6 @@ B0-C5-CA   (hex)		LOWOTEC GmbH
 				Oldenburg  Niedersachsen  26129
 				DE
 
-DC-44-27   (hex)		Tesla Motors, Inc
-100000-1FFFFF     (base 16)		Tesla Motors, Inc
-				3500 Deer Creek Road
-				Palo Alto  CA  94304
-				US
-
 78-C2-C0   (hex)		ShenZhen TuLing Robot CO.,LTD
 500000-5FFFFF     (base 16)		ShenZhen TuLing Robot CO.,LTD
 				BLK 9, No 28, Langshan Road, Northern District of High Tech. Industry Park, Nanshan Dist., SZ., PRC.
@@ -17273,11 +17621,11 @@ B0-B3-53   (hex)		Sprocomm Technologies CO.,LTD.
 				shenzhen  guangdong  518000
 				CN
 
-3C-FA-D3   (hex)		Mirico
+B0-B3-53   (hex)		VOXISCOM
-E00000-EFFFFF     (base 16)		Mirico
+800000-8FFFFF     (base 16)		VOXISCOM
-				30 DongSan Rd 9th floor Mirico
+				Rue Jules Ferry
-				Ansan  Gyunggi  15434
+				PORNIC    44210
-				KR
+				FR
 
 B0-B3-53   (hex)		Innotas Elektronik GmbH
 400000-4FFFFF     (base 16)		Innotas Elektronik GmbH
@@ -17285,8 +17633,152 @@ B0-B3-53   (hex)		Innotas Elektronik GmbH
 				Zittau    D-02763
 				DE
 
-B0-B3-53   (hex)		VOXISCOM
+3C-FA-D3   (hex)		Mirico
-800000-8FFFFF     (base 16)		VOXISCOM
+E00000-EFFFFF     (base 16)		Mirico
-				Rue Jules Ferry
+				30 DongSan Rd 9th floor Mirico
-				PORNIC    44210
+				Ansan  Gyunggi  15434
-				FR
+				KR
+
+90-E2-FC   (hex)		Power Engineering & Manufacturing, Inc.
+A00000-AFFFFF     (base 16)		Power Engineering & Manufacturing, Inc.
+				1463 94th Lane NE
+				Blaine  MN  55449
+				US
+
+90-E2-FC   (hex)		Sindoh Techno Co., Ltd.
+600000-6FFFFF     (base 16)		Sindoh Techno Co., Ltd.
+				Sindoh Bldg., 6, Hyoryeong-ro 61-gil, Seocho-gu
+				Seoul    06643
+				KR
+
+90-E2-FC   (hex)		Shenzhen Hisource Technology Development CO.,Ltd.
+300000-3FFFFF     (base 16)		Shenzhen Hisource Technology Development CO.,Ltd.
+				Dalang
+				Shenzhen  Guangdong  518109
+				CN
+
+90-E2-FC   (hex)		TOTALONE TECHNOLOGY CO., LTD.
+500000-5FFFFF     (base 16)		TOTALONE TECHNOLOGY CO., LTD.
+				3F.-1, NO.18, LN. 48, XingShan RD.,
+				Taipei  Neihu dist  11469
+				TW
+
+90-E2-FC   (hex)		Yite technology
+100000-1FFFFF     (base 16)		Yite technology
+				No. 56, Xiaobei Rd., North Dist
+				tainan    70448 
+				TW
+
+90-E2-FC   (hex)		DevCom spol. s r.o.
+E00000-EFFFFF     (base 16)		DevCom spol. s r.o.
+				Božanovská 884
+				Praha  Select a State  19300
+				CZ
+
+14-AE-85   (hex)		IO Industries Inc.
+C00000-CFFFFF     (base 16)		IO Industries Inc.
+				15940 Robin's Hill Rd
+				London  Ontario  N5V 0A4
+				CA
+
+14-AE-85   (hex)		AZ-TECHNOLOGY SDN BHD
+500000-5FFFFF     (base 16)		AZ-TECHNOLOGY SDN BHD
+				A108 & A109 BLOCK A KELANA BUSINESS CENTRE NO: 97 JALAN SS7/2 KELANA JAYA
+				PETALING JAYA  SELANGOR  47301
+				MY
+
+14-AE-85   (hex)		CENTERVUE SPA
+400000-4FFFFF     (base 16)		CENTERVUE SPA
+				VIA SAN MARCO 9/H
+				PADOVA  PADOVA  35129
+				IT
+
+90-E2-FC   (hex)		Fair Winds Digital srl
+700000-7FFFFF     (base 16)		Fair Winds Digital srl
+				Via Italo Svevo 85
+				Rome  Italy  00137
+				IT
+
+14-AE-85   (hex)		TMG TE GmbH
+600000-6FFFFF     (base 16)		TMG TE GmbH
+				Zur Gießerei 10
+				Karlsruhe    776227
+				DE
+
+14-AE-85   (hex)		NTC SOFT
+B00000-BFFFFF     (base 16)		NTC SOFT
+				B-805, Gwangmyeong SK Techno park, 60, Haan-ro,
+				Gwangmyeong-si  Gyeonggi-do  14322
+				KR
+
+14-AE-85   (hex)		Sercomm Corporation.
+E00000-EFFFFF     (base 16)		Sercomm Corporation.
+				3F,No.81,Yu-Yih Rd.,Chu-Nan Chen
+				Miao-Lih Hsuan    115
+				TW
+
+64-62-66   (hex)		Jiangsu Aisida Electronic Co.,Ltd
+C00000-CFFFFF     (base 16)		Jiangsu Aisida Electronic Co.,Ltd
+				Aisida Industrial Park,Lanling Road,Danyang Development Zone
+				DanYang  JiangSu  212300
+				CN
+
+94-CC-04   (hex)		Hangzhou Yongkong Technology Co., Ltd.
+000000-0FFFFF     (base 16)		Hangzhou Yongkong Technology Co., Ltd.
+				Room 503, Building 12, Lefu Zhihui Garden, 28 Xiangyuan Road, Gongshu Distric
+				Hangzhou  Zhejiang  310000
+				CN
+
+94-CC-04   (hex)		Gowing Business And Contracting Wenzhou Co., LTD
+700000-7FFFFF     (base 16)		Gowing Business And Contracting Wenzhou Co., LTD
+				Room 101, No.4 Liming Industrial District, Lucheng, Wenzhou, China
+				Wenzhou    325000
+				CN
+
+94-CC-04   (hex)		CircuitWerkes, Inc.
+800000-8FFFFF     (base 16)		CircuitWerkes, Inc.
+				2805 NW 6th St
+				Gainesville  FL  32609
+				US
+
+14-AE-85   (hex)		IFLYTEK CO.,LTD.
+300000-3FFFFF     (base 16)		IFLYTEK CO.,LTD.
+				National Intelligent Speech High-tech Industrialization Base, No. 666, Wangjiang Road West,
+				Hefei  An hui  230088
+				CN
+
+94-05-BB   (hex)		Shenzhen Baolijie Technology Co., Ltd.
+400000-4FFFFF     (base 16)		Shenzhen Baolijie Technology Co., Ltd.
+				D2,No.47,Shasan Road,Sha jing Street,Baoan District
+				Shenzhen  Kowloon  518104
+				CN
+
+94-CC-04   (hex)		ProConnections, Inc.
+400000-4FFFFF     (base 16)		ProConnections, Inc.
+				30 Massachusetts, Ave, Suite 301
+				North Andover  MA  01845
+				US
+
+94-05-BB   (hex)		Neurik AG
+300000-3FFFFF     (base 16)		Neurik AG
+				Im alten Riet 143
+				Schaan  SCHAAN  9494
+				LI
+
+94-05-BB   (hex)		Dongguan Kingtron Electronics Tech Co., Ltd
+100000-1FFFFF     (base 16)		Dongguan Kingtron Electronics Tech Co., Ltd
+				No.3 Fumin North Rd,Shu'an Industrial Park, Humen Town
+				Dongguan  Guangdong China  523929
+				CN
+
+94-05-BB   (hex)		Sunthink S&T Development Co.,Ltd
+D00000-DFFFFF     (base 16)		Sunthink S&T Development Co.,Ltd
+				A3-f1, xinghezhong Technology Green Valley, No.14, luolei Industrial Avenue, Shiyan street, Bao'an District
+				Shenzhen    518100
+				CN
+
+DC-44-27   (hex)		Tesla,Inc.
+100000-1FFFFF     (base 16)		Tesla,Inc.
+				3500 Deer Creek Road
+				Palo Alto  CA  94304
+				US

hwdb.d/ma-small.txt

@@ -2927,12 +2927,6 @@ D3F000-D3FFFF     (base 16)		GLOBALCOM ENGINEERING SPA
 				MORNAGO  VA  21020
 				IT
 
-70-B3-D5   (hex)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
-6BE000-6BEFFF     (base 16)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
-				B-11 SECTOR-VII
-				NOIDA  UTTAR PRADESH  201301
-				IN
-
 70-B3-D5   (hex)		Precitec Optronik GmbH
 0C5000-0C5FFF     (base 16)		Precitec Optronik GmbH
 				Schleussnerstraße 54
@@ -4205,6 +4199,108 @@ EF1000-EF1FFF     (base 16)		Nanotok LLC
 				Hong Kong  Hong Kong  00000
 				HK
 
+70-B3-D5   (hex)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
+6BE000-6BEFFF     (base 16)		VANTAGE INTEGRATED SECURITY SOLUTIONS PVT LTD
+				B3, Bredon House, 321, Tettenhall Road, Tettenhall
+				Wolverhampton  West Midlands  WV6 0JZ
+				GB
+
+70-B3-D5   (hex)		Todd Digital Limited
+C9A000-C9AFFF     (base 16)		Todd Digital Limited
+				Level 15, 95 Customhouse Quay
+				Wellington    6011
+				NZ
+
+70-B3-D5   (hex)		JENG IoT BV
+5AF000-5AFFFF     (base 16)		JENG IoT BV
+				Steenbokstraat 33
+				APELDOORN  Gelderland  7324 AZ
+				NL
+
+70-B3-D5   (hex)		TXMission Ltd.
+F47000-F47FFF     (base 16)		TXMission Ltd.
+				CP House, Otterspool Way
+				Watford  Hertfordshire  WD25 8HU
+				GB
+
+70-B3-D5   (hex)		Technology Link Corporation
+B1B000-B1BFFF     (base 16)		Technology Link Corporation
+				Shin-Yokohama Kohoku-ku
+				yokohama  kanagawa  222-0033
+				JP
+
+70-B3-D5   (hex)		Tucsen Photonics Co., Ltd. 
+8A7000-8A7FFF     (base 16)		Tucsen Photonics Co., Ltd. 
+				6F NO.1 building Caimao Zone, 756# Qi an Road, Gaishan Town, Cangshan Area, Fuzhou, Fujian, PR, CHINA.
+				fuzhou    350000
+				CN
+
+70-B3-D5   (hex)		sensorway
+C52000-C52FFF     (base 16)		sensorway
+				A-339 samsong techno valley, 140 tongilro, deockyanggu
+				goyangsi  gyeonggido  10594
+				KR
+
+70-B3-D5   (hex)		KDT Corp.
+E72000-E72FFF     (base 16)		KDT Corp.
+				no1705-1, BLDG 3#, Lantian shixin plaza, keqiao zone
+				shaoxing  zhejiang  312030
+				CN
+
+70-B3-D5   (hex)		Beijing Yourong Runda Rechnology Development Co.Ltd.
+980000-980FFF     (base 16)		Beijing Yourong Runda Rechnology Development Co.Ltd.
+				Changping District Science and Technology Park Advanced Road 37
+				Beijing    6219650
+				CN
+
+70-B3-D5   (hex)		R.C. Systems Inc
+52F000-52FFFF     (base 16)		R.C. Systems Inc
+				8621 hwy. 6
+				hitchcock  TX  77563
+				US
+
+70-B3-D5   (hex)		Dalcnet srl
+1CF000-1CFFFF     (base 16)		Dalcnet srl
+				Via Meucci 35
+				Brendola  Vicenza  36040
+				IT
+
+70-B3-D5   (hex)		AUTOMATICA Y REGULACION S.A.
+EBF000-EBFFFF     (base 16)		AUTOMATICA Y REGULACION S.A.
+				Condell 1735, Nunoa
+				Santiago  RM  7770331
+				CL
+
+70-B3-D5   (hex)		Digital Solutions JSC
+D9F000-D9FFFF     (base 16)		Digital Solutions JSC
+				room 4, office 1, 3rd floor, building 7, house 9a, 2nd Sinichkina Str.
+				Moscow    111020
+				RU
+
+70-B3-D5   (hex)		Oculii
+B96000-B96FFF     (base 16)		Oculii
+				829 Space Dr
+				Beavercreek  OH  45434
+				US
+
+70-B3-D5   (hex)		XPS ELETRONICA LTDA
+4F3000-4F3FFF     (base 16)		XPS ELETRONICA LTDA
+				AVENIDA JAÇANÃ, 470/474 - VILA NELSON
+				SÃO PAULO  SÃO PAULO  02273-001
+				BR
+
+70-B3-D5   (hex)		Firecom, Inc.
+331000-331FFF     (base 16)		Firecom, Inc.
+				3927 59th Street
+				Woodside  NY  11377
+				US
+
+70-B3-D5   (hex)		DOGA
+62A000-62AFFF     (base 16)		DOGA
+				11 rue Lavoisier
+				MAUREPAS    78310
+				FR
+
 70-B3-D5   (hex)		EVCO SPA
 A80000-A80FFF     (base 16)		EVCO SPA
 				VIA FELTRE N. 81
@@ -8507,6 +8603,84 @@ F80000-F80FFF     (base 16)		Guan Show Technologe Co., Ltd.
 				BRUGES    33520
 				FR
 
+70-B3-D5   (hex)		Newtec A/S
+18F000-18FFFF     (base 16)		Newtec A/S
+				Stærmosegårdsvej  18
+				Odense SV  Region Syd  5230
+				DK
+
+70-B3-D5   (hex)		AUDIO VISUAL DIGITAL SYSTEMS
+A7F000-A7FFFF     (base 16)		AUDIO VISUAL DIGITAL SYSTEMS
+				PLOT NO.180 PHASE V SECTOR56, HSIIDC I.E KUNDLI SONEPAT
+				SONEPAT  HARYANA  131028
+				IN
+
+70-B3-D5   (hex)		DEUTA-WERKE GmbH
+1BF000-1BFFFF     (base 16)		DEUTA-WERKE GmbH
+				Paffrather Str. 140
+				Bergisch Gladbach  North Rhine-Westphalia  51465
+				DE
+
+70-B3-D5   (hex)		DONG IL VISION Co., Ltd.
+038000-038FFF     (base 16)		DONG IL VISION Co., Ltd.
+				#9 Ftrek tower, 11-25, Simindaero 327 beongil,Dongan-gu
+				Anyangi-Si  Gyeonggi-Do  14055
+				KR
+
+70-B3-D5   (hex)		Cetitec GmbH
+B36000-B36FFF     (base 16)		Cetitec GmbH
+				Mannheimer Strasse 17
+				Pforzheim    75179
+				DE
+
+70-B3-D5   (hex)		Kamacho Scale Co., Ltd.
+385000-385FFF     (base 16)		Kamacho Scale Co., Ltd.
+				2246 Mure
+				Takamatsu-shi  Kagawa-ken  761-0196
+				JP
+
+70-B3-D5   (hex)		Vessel Technology Ltd
+44D000-44DFFF     (base 16)		Vessel Technology Ltd
+				Banchory Business Centre, Burn O'Bennie Road
+				Banchory  Aberdeenshire  AB31 5ZU
+				GB
+
+70-B3-D5   (hex)		Munters
+FA8000-FA8FFF     (base 16)		Munters
+				Hasivim 18
+				Pethch Tikva  Israel  4959376
+				IL
+
+70-B3-D5   (hex)		Visual Robotics
+0F4000-0F4FFF     (base 16)		Visual Robotics
+				38 Irving Rd
+				Eugene  OR  97404
+				US
+
+70-B3-D5   (hex)		TangRen C&S CO., Ltd
+3FC000-3FCFFF     (base 16)		TangRen C&S CO., Ltd
+				3a-5d, Tingwei Daxia, Tingwei Industrial Park, No. 6, Liufang Road, Bao'an District
+				Shenzhen  Guangdong  518052
+				CN
+
+70-B3-D5   (hex)		TEX COMPUTER SRL 
+6C2000-6C2FFF     (base 16)		TEX COMPUTER SRL 
+				VIA MERCADANTE 35
+				CATTOLICA   RIMINI   47841
+				IT
+
+70-B3-D5   (hex)		LOTES TM OOO
+EA5000-EA5FFF     (base 16)		LOTES TM OOO
+				Barklaya 22, str.1
+				Moscow    121309
+				RU
+
+70-B3-D5   (hex)		Yi An Electronics Co., Ltd
+F28000-F28FFF     (base 16)		Yi An Electronics Co., Ltd
+				5F.-2, No. 81, Sec. 1, Xintai 5th Rd., Xizhi Dist
+				 New Taipei City    22101
+				TW
+
 70-B3-D5   (hex)		System West dba ICS Electronics
 E06000-E06FFF     (base 16)		System West dba ICS Electronics
 				7034 Commerce Circle Suite A
@@ -8939,12 +9113,6 @@ A7D000-A7DFFF     (base 16)		Prior Scientific Instruments Ltd
 				Cambridge  Cambridgeshire  CB21 5ET
 				GB
 
-70-B3-D5   (hex)		Taejin InforTech
-A75000-A75FFF     (base 16)		Taejin InforTech
-				40, Imi-ro, A-411
-				Uiwang-si  Gyeonggi-do  16006
-				KR
-
 70-B3-D5   (hex)		AUTOMATIZACION Y CONECTIVIDAD SA DE CV
 59B000-59BFFF     (base 16)		AUTOMATIZACION Y CONECTIVIDAD SA DE CV
 				LA GARITA ANDADOR 6 DUPLEX 1 CASA 2
@@ -9281,12 +9449,6 @@ C05000-C05FFF     (base 16)		KST technology
 				Songpa-gu  Seoul  05636
 				KR
 
-70-B3-D5   (hex)		Coheros Oy
-D2E000-D2EFFF     (base 16)		Coheros Oy
-				Korkeakoulunkatu 1
-				Tampere    33720
-				FI
-
 70-B3-D5   (hex)		EA Elektroautomatik GmbH & Co. KG
 26C000-26CFFF     (base 16)		EA Elektroautomatik GmbH & Co. KG
 				Helmholtzstraße 31-33
@@ -12722,6 +12884,12 @@ CFB000-CFBFFF     (base 16)		Screen Innovations
 				Bingen  WA  98605
 				US
 
+70-B3-D5   (hex)		German Power GmbH
+C31000-C31FFF     (base 16)		German Power GmbH
+				Freiburger Strasse 7
+				Pforzheim    75179
+				DE
+
 70-B3-D5   (hex)		Lyse AS
 F23000-F23FFF     (base 16)		Lyse AS
 				Breiflåtveien 18
@@ -12734,6 +12902,162 @@ F23000-F23FFF     (base 16)		Lyse AS
 				Paris    75006
 				FR
 
+70-B3-D5   (hex)		Hefei STAROT Technology Co.,Ltd
+4D3000-4D3FFF     (base 16)		Hefei STAROT Technology Co.,Ltd
+				406, 4th Floor, Quality Control Building, Saipu Science Park, No. 6 Yunfei Road, High-tech Zone
+				hefei  anhui  230000
+				CN
+
+70-B3-D5   (hex)		SysCom Automationstechnik GmbH
+117000-117FFF     (base 16)		SysCom Automationstechnik GmbH
+				An der Lehmkaute 13
+				Bad Marienberg  Rheinland-Pfalz  56470
+				DE
+
+70-B3-D5   (hex)		Walton Hi-Tech Industries Ltd.
+E5C000-E5CFFF     (base 16)		Walton Hi-Tech Industries Ltd.
+				HOLDING NO. I-65/2, WARD NO-07
+				CHANDRA, KALIAKOIR, GAZIPUR.    1750
+				BD
+
+70-B3-D5   (hex)		Flextronics International Kft
+699000-699FFF     (base 16)		Flextronics International Kft
+				38. Zrinyi Str.
+				Zalaegerszeg  Zala  8900
+				HU
+
+70-B3-D5   (hex)		JFA Electronics Industry and Commerce EIRELI
+5F7000-5F7FFF     (base 16)		JFA Electronics Industry and Commerce EIRELI
+				Rua Flor das Pedras, 175
+				Belo Horizonte  Minas Gerais  30810-000
+				BR
+
+70-B3-D5   (hex)		Hubbell Power Systems
+858000-858FFF     (base 16)		Hubbell Power Systems
+				353 Powerville Road
+				Boonton Township  NJ  07005
+				US
+
+70-B3-D5   (hex)		aquila biolabs GmbH
+7DB000-7DBFFF     (base 16)		aquila biolabs GmbH
+				Arnold-Sommerfeld-Ring 2
+				Baesweiler  NRW  52499
+				DE
+
+70-B3-D5   (hex)		Sicon srl
+C82000-C82FFF     (base 16)		Sicon srl
+				Via Sila 1/3
+				Isola Vicentina  Vicenza  36033
+				IT
+
+70-B3-D5   (hex)		LGE
+DAE000-DAEFFF     (base 16)		LGE
+				10, Magokjungang 10-ro, Gangseo-gu
+				Seoul    07796
+				KR
+
+70-B3-D5   (hex)		Jonsa Australia Pty Ltd
+335000-335FFF     (base 16)		Jonsa Australia Pty Ltd
+				Unit D2 3-29 Birnie Ave
+				Lidcombe  NSW  2141
+				AU
+
+70-B3-D5   (hex)		GreenWake Technologies
+467000-467FFF     (base 16)		GreenWake Technologies
+				56 boulevard Niels Bohr, CEI2
+				Villeurbanne    69100
+				FR
+
+70-B3-D5   (hex)		shenzhen suofeixiang technology Co.,Ltd
+EEB000-EEBFFF     (base 16)		shenzhen suofeixiang technology Co.,Ltd
+				sales09@sfxhd.com
+				shenzhen    518000
+				CN
+
+70-B3-D5   (hex)		RCH Vietnam Limited Liability Company
+97D000-97DFFF     (base 16)		RCH Vietnam Limited Liability Company
+				Workshop F.01B-2, Lot No. F.01B Long Hau
+				Ho Chi Minh City  Ho Chi Minh  70000
+				VN
+
+70-B3-D5   (hex)		SNK, Inc.
+E12000-E12FFF     (base 16)		SNK, Inc.
+				Rm 302 Inobiz park, 1646, Yuseong-daero, Yuseong-gu
+				Daejeon    34054
+				KR
+
+70-B3-D5   (hex)		SYLink Technologie
+466000-466FFF     (base 16)		SYLink Technologie
+				18 rue de la conche
+				Mirefleurs  Auvergne  63730
+				FR
+
+70-B3-D5   (hex)		silicom
+F64000-F64FFF     (base 16)		silicom
+				14 Atir-Yeda St/
+				Kfar-Sava  Israel  44000
+				IL
+
+70-B3-D5   (hex)		NSP Europe Ltd
+18A000-18AFFF     (base 16)		NSP Europe Ltd
+				Unit 5, Devonshire Business Park
+				Borehamwood  Hert  WD6 1NA
+				GB
+
+70-B3-D5   (hex)		Kospel S.A.
+249000-249FFF     (base 16)		Kospel S.A.
+				Olchowa 1
+				Koszalin    75-136
+				PL
+
+70-B3-D5   (hex)		Microchip Technology Germany II GmbH&Co.KG
+77F000-77FFFF     (base 16)		Microchip Technology Germany II GmbH&Co.KG
+				Emmy-Noether-Straße 14
+				Karlsruhe    76131
+				DE
+
+70-B3-D5   (hex)		Trust Automation
+C98000-C98FFF     (base 16)		Trust Automation
+				125 Venture Dr
+				San Luis Obispo  CA  93401
+				US
+
+70-B3-D5   (hex)		ARCLAN'SYSTEM
+25C000-25CFFF     (base 16)		ARCLAN'SYSTEM
+				1140 rue Ampère - Actimart II - Lot 9
+				AIX EN PROVENCE    13290
+				FR
+
+70-B3-D5   (hex)		Taejin InfoTech
+A75000-A75FFF     (base 16)		Taejin InfoTech
+				40, Imi-ro, A-411
+				Uiwang-si  Gyeonggi-do  16006
+				KR
+
+70-B3-D5   (hex)		Coheros Oy
+D2E000-D2EFFF     (base 16)		Coheros Oy
+				Tammukkakatu 6
+				Nokia    37130
+				FI
+
+70-B3-D5   (hex)		Gogo Business Aviation
+E24000-E24FFF     (base 16)		Gogo Business Aviation
+				105 Edgeview Dr., Suite 300
+				Broomfield  CO  80021
+				US
+
+70-B3-D5   (hex)		Smart Embedded Systems
+A09000-A09FFF     (base 16)		Smart Embedded Systems
+				6701  Koll Center Parkway #250
+				Pleasonton  CA  94566
+				US
+
+70-B3-D5   (hex)		Guan Show Technologe Co., Ltd.
+F6A000-F6AFFF     (base 16)		Guan Show Technologe Co., Ltd.
+				No.127, Jianguo 1st Rd., Lingya Dist.
+				 Kaohsiung City     802
+				TW
+
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 BBB000-BBBFFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@@ -16859,12 +17183,6 @@ BB2000-BB2FFF     (base 16)		Mettler Toledo
 				Lutz  FL  33558
 				US
 
-70-B3-D5   (hex)		SFR
-B12000-B12FFF     (base 16)		SFR
-				12 rue jean-philippe Rameau CS 80001
-				La plaine saint denis   FRANCE  93634
-				FR
-
 70-B3-D5   (hex)		S.E.I. CO.,LTD.
 12D000-12DFFF     (base 16)		S.E.I. CO.,LTD.
 				59 Nirayama Tada
@@ -16985,17 +17303,167 @@ BE0000-BE0FFF     (base 16)		Cognosos, Inc.
 				Taoyuan      330
 				TW
 
+70-B3-D5   (hex)		PolyTech A/S
+F4C000-F4CFFF     (base 16)		PolyTech A/S
+				HI Park 445
+				Herning  Herning  7400
+				DK
+
 70-B3-D5   (hex)		Zhuhai Lonl electric Co.,Ltd.
 EA9000-EA9FFF     (base 16)		Zhuhai Lonl electric Co.,Ltd.
 				2nd floor, building B3, nanfang software park, xiangzhou district
 				Zhuhai  Guangdong   519000
 				CN
 
-70-B3-D5   (hex)		PolyTech A/S
+70-B3-D5   (hex)		Shanghai Tiancheng Communication Technology Corporation
-F4C000-F4CFFF     (base 16)		PolyTech A/S
+1C3000-1C3FFF     (base 16)		Shanghai Tiancheng Communication Technology Corporation
-				HI Park 445
+				No.618,Guangxing Rd.,Songjiang 
-				Herning  Herning  7400
+				shanghai    200090
-				DK
+				CN
+
+70-B3-D5   (hex)		SAMBO HITECH
+282000-282FFF     (base 16)		SAMBO HITECH
+				469,Seokjung-ro,Namdong-Gu
+				Incheon    21501
+				KR
+
+70-B3-D5   (hex)		M.A.C. Solutions (UK) Ltd
+F9F000-F9FFFF     (base 16)		M.A.C. Solutions (UK) Ltd
+				Units 6-7 Kingfisher Business Park, Arthur Street
+				Redditch  Worcestershire  B98 8LG
+				GB
+
+70-B3-D5   (hex)		ERA TOYS LIMITED
+193000-193FFF     (base 16)		ERA TOYS LIMITED
+				Room 505, 5th Floor, Beverley Commercial Centre, 87-105 Chatham Road South
+				Tsim Sha Tsui  Kowloon  0000
+				HK
+
+70-B3-D5   (hex)		T&M Media Pty Ltd
+B41000-B41FFF     (base 16)		T&M Media Pty Ltd
+				6, 476 Gardeners Road
+				Alexandria  NSW  2015
+				AU
+
+70-B3-D5   (hex)		A&T Corporation
+32E000-32EFFF     (base 16)		A&T Corporation
+				2023-1
+				Endo, Fujisawa, Kanagawa    252-0816
+				JP
+
+70-B3-D5   (hex)		Scorpion Precision Industry (HK)CO. Ltd.
+02B000-02BFFF     (base 16)		Scorpion Precision Industry (HK)CO. Ltd.
+				16th Floor, Excelsior Industrial Building,68-76 Sha Tsui Road,
+				Tsuen Wan  New Territories  999077
+				HK
+
+70-B3-D5   (hex)		Shenzhen CAMERAY ELECTRONIC CO., LTD
+1E2000-1E2FFF     (base 16)		Shenzhen CAMERAY ELECTRONIC CO., LTD
+				4-5FL, Building 1, Guanghui Science, and Technology Park; Minqing Road, Longhua Town
+				shenzhen  GD  518109
+				CN
+
+70-B3-D5   (hex)		Vulcan Wireless Inc.
+E4D000-E4DFFF     (base 16)		Vulcan Wireless Inc.
+				2218 Faraday Ave Suite 110
+				Carlsbad  CA  92008
+				US
+
+70-B3-D5   (hex)		MIVO Technology AB
+1D5000-1D5FFF     (base 16)		MIVO Technology AB
+				Hornsbergsvägen 28
+				Stockholm    11215
+				SE
+
+70-B3-D5   (hex)		Cryptotronix LLC
+0DB000-0DBFFF     (base 16)		Cryptotronix LLC
+				P.O. Box 273029
+				Fort Collins  CO  80525
+				US
+
+70-B3-D5   (hex)		TOMEI TSUSHIN KOGYO CO,.LTD
+FB1000-FB1FFF     (base 16)		TOMEI TSUSHIN KOGYO CO,.LTD
+				100-3, Amaike Kodacho
+				Inazawa Shi  Aichi ken  4928274
+				JP
+
+70-B3-D5   (hex)		RCH Vietnam Limited Liability Company
+C09000-C09FFF     (base 16)		RCH Vietnam Limited Liability Company
+				Workshop F.01B-2, Lot No. F.01B Long Hau
+				Ho Chi Minh City  Ho Chi Minh  70000
+				VN
+
+70-B3-D5   (hex)		Copper Labs, Inc.
+F69000-F69FFF     (base 16)		Copper Labs, Inc.
+				3015 Sterling Circle #200
+				Boulder  CO  80301
+				US
+
+70-B3-D5   (hex)		DogWatch Inc
+1E7000-1E7FFF     (base 16)		DogWatch Inc
+				10 Michigan Drive
+				Natick    01760
+				US
+
+70-B3-D5   (hex)		Grossenbacher Systeme AG
+B75000-B75FFF     (base 16)		Grossenbacher Systeme AG
+				Spinnereistrasse 10
+				St. Gallen    9008
+				CH
+
+70-B3-D5   (hex)		ITsynergy Ltd
+D2A000-D2AFFF     (base 16)		ITsynergy Ltd
+				9 Bonhill Street
+				London    EC2A 4DJ
+				GB
+
+70-B3-D5   (hex)		SHENZHEN HUINENGYUAN Technology Co., Ltd
+A83000-A83FFF     (base 16)		SHENZHEN HUINENGYUAN Technology Co., Ltd
+				Room 206, 3 Building, Hongwanchuangke Center, Gushu, Xixiang, Baoan District
+				Shenzhen  Guangdong  518126
+				CN
+
+70-B3-D5   (hex)		Vars Technology 
+C94000-C94FFF     (base 16)		Vars Technology 
+				Squires gate industrial estate Unit 14
+				Blackpool  lancashire   FY4 3RN
+				GB
+
+70-B3-D5   (hex)		Burk Technology
+641000-641FFF     (base 16)		Burk Technology
+				7 Beaver Brook road
+				Littleton  MA  01460
+				US
+
+70-B3-D5   (hex)		Inventeq B.V.
+529000-529FFF     (base 16)		Inventeq B.V.
+				Ravenlaan 27
+				Blaricum    1261WT
+				NL
+
+70-B3-D5   (hex)		Vaunix Technology Corporation
+EE6000-EE6FFF     (base 16)		Vaunix Technology Corporation
+				7 New Pasture Rd
+				Newburyport  MA  01950
+				US
+
+70-B3-D5   (hex)		Portrait Displays, Inc.
+D77000-D77FFF     (base 16)		Portrait Displays, Inc.
+				6663 OWENS DR
+				PLEASANTON  CA  94588
+				US
+
+70-B3-D5   (hex)		chargeBIG
+869000-869FFF     (base 16)		chargeBIG
+				Pragstraße 26-46
+				Stuttgart    70376
+				DE
+
+70-B3-D5   (hex)		Tricom Research Inc.
+601000-601FFF     (base 16)		Tricom Research Inc.
+				17791 Sky Park Circle Suite GHJ
+				Irvine  CA  92614
+				US
 
 70-B3-D5   (hex)		DISMUNTEL SAL
 92C000-92CFFF     (base 16)		DISMUNTEL SAL
@@ -21292,3 +21760,111 @@ F5D000-F5DFFF     (base 16)		Potter Electric Signal Co. LLC
 				via Cupa Vicinale S.Aniello, 88
 				Naples    80146
 				IT
+
+70-B3-D5   (hex)		ITK Dr. Kassen GmbH
+58A000-58AFFF     (base 16)		ITK Dr. Kassen GmbH
+				Beim Eberacker 3
+				D-35633 Lahnau    
+				DE
+
+70-B3-D5   (hex)		RCH Vietnam Limited Liability Company
+88E000-88EFFF     (base 16)		RCH Vietnam Limited Liability Company
+				Workshop F.01B-2, Lot No. F.01B Long Hau
+				Ho Chi Minh City  Ho Chi Minh  70000
+				VN
+
+70-B3-D5   (hex)		Privafy, Inc
+A6A000-A6AFFF     (base 16)		Privafy, Inc
+				2 Burlington Woods Dr. Suite 200
+				Burlington  MA  01803
+				US
+
+70-B3-D5   (hex)		Contec Americas Inc.
+5D2000-5D2FFF     (base 16)		Contec Americas Inc.
+				3991 Sarno Rd
+				Melbourne  FL  32934
+				US
+
+70-B3-D5   (hex)		elements
+62D000-62DFFF     (base 16)		elements
+				Townsgate Road Suite 200 
+				Westlake Village  CA  91361
+				US
+
+70-B3-D5   (hex)		DAT Informatics Pvt Ltd
+244000-244FFF     (base 16)		DAT Informatics Pvt Ltd
+				Plot No 109 HPSIDC Industria Estate Davni, Baddi
+				Baddi  HIMACHAL PRADESH  173205
+				IN
+
+70-B3-D5   (hex)		Abbott Diagnostics Technologies AS
+6C6000-6C6FFF     (base 16)		Abbott Diagnostics Technologies AS
+				P. O.  Box 6863 Rodeløkka
+				Oslo  Oslo  0504
+				NO
+
+70-B3-D5   (hex)		RCH Vietnam Limited Liability Company
+6BD000-6BDFFF     (base 16)		RCH Vietnam Limited Liability Company
+				Workshop F.01B-2, Lot No. F.01B Long Hau
+				Ho Chi Minh City  Ho Chi Minh  70000
+				VN
+
+70-B3-D5   (hex)		Gamber Johnson-LLC
+E34000-E34FFF     (base 16)		Gamber Johnson-LLC
+				3001 Borham Ave
+				Stevens Point  WI  54481
+				US
+
+70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
+C2B000-C2BFFF     (base 16)		YUYAMA MFG Co.,Ltd
+				3-3-1
+				TOYONAKASHI  OSAKA  561-0841
+				JP
+
+70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
+1F2000-1F2FFF     (base 16)		YUYAMA MFG Co.,Ltd
+				3-3-1
+				TOYONAKASHI  OSAKA  561-0841
+				JP
+
+70-B3-D5   (hex)		QUALITTEQ LLC
+614000-614FFF     (base 16)		QUALITTEQ LLC
+				16th Parkovaya 26/1
+				Moscow    105484
+				RU
+
+70-B3-D5   (hex)		Adcole Maryland Aerospace
+922000-922FFF     (base 16)		Adcole Maryland Aerospace
+				669 Forest St
+				Marlborough  MA  01752
+				US
+
+70-B3-D5   (hex)		eSMART Technologies SA
+979000-979FFF     (base 16)		eSMART Technologies SA
+				Chemin de la Rueyre, 118
+				Renens VD    1020
+				CH
+
+70-B3-D5   (hex)		Axnes AS
+65F000-65FFFF     (base 16)		Axnes AS
+				Terje Løvåsvei 1
+				Grimstad    4879
+				NO
+
+70-B3-D5   (hex)		Duplomatic MS spa
+DE1000-DE1FFF     (base 16)		Duplomatic MS spa
+				Via Re Depaolini 24
+				Parabiago  Milan  20015
+				IT
+
+70-B3-D5   (hex)		Nanjing Pingguang Electronic Technology Co., Ltd
+541000-541FFF     (base 16)		Nanjing Pingguang Electronic Technology Co., Ltd
+				B30/B31 4th Floor, Building#11, Shengtai Road, JiangNing District
+				NanJing    211100
+				CN
+
+70-B3-D5   (hex)		thingdust AG
+3C1000-3C1FFF     (base 16)		thingdust AG
+				Moosstrasse 7
+				Lucerne  Lucerne  6003
+				CH

hwdb.d/usb.ids

@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2019.11.05
+# Version: 2020.01.09
-# Date:    2019-11-05 20:34:06
+# Date:    2020-01-09 20:34:06
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -19098,6 +19098,14 @@
 	6323  USB Electronic Scale
 2237  Kobo Inc.
 	4161  eReader White
+224f  APDM
+	0001  Access Point
+	0002  Docking Station
+	0004  V2 Opal ACM
+	0005  V2 Opal
+	0006  V2 Docking Station
+	0007  V2 Access Point ACM
+	0008  V2 Access Point
 225d  Morpho
 	0001  FINGER VP Multimodal Biometric Sensor
 	0008  CBM-E3 Fingerprint Sensor

man/systemd.network.xml

@@ -1135,8 +1135,8 @@
         <varlistentry>
           <term><varname>Gateway=</varname></term>
           <listitem>
-            <para>Takes the gateway address or special value <literal>dhcp</literal>. If
+            <para>Takes the gateway address or special value <literal>_dhcp</literal>. If
-            <literal>dhcp</literal>, then the gateway address provided by DHCP (or in the IPv6 case,
+            <literal>_dhcp</literal>, then the gateway address provided by DHCP (or in the IPv6 case,
             provided by IPv6 RA) is used.</para>
           </listitem>
         </varlistentry>
@@ -2262,10 +2262,11 @@
   </refsect1>
 
   <refsect1>
-    <title>[TrafficControlQueueingDiscipline] Section Options</title>
+    <title>[NetworkEmulator] Section Options</title>
-    <para>The <literal>[TrafficControlQueueingDiscipline]</literal> section manages the Traffic control. It can be used
+    <para>The <literal>[NetworkEmulator]</literal> section manages the queueing discipline (qdisc) of
-    to configure the kernel packet scheduler and simulate packet delay and loss for UDP or TCP applications,
+    the network emulator. It can be used to configure the kernel packet scheduler and simulate packet
-    or limit the bandwidth usage of a particular service to simulate internet connections.</para>
+    delay and loss for UDP or TCP applications, or limit the bandwidth usage of a particular service to
+    simulate internet connections.</para>
 
     <variablelist class='network-directives'>
       <varlistentry>
@@ -2277,7 +2278,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>NetworkEmulatorDelaySec=</varname></term>
+        <term><varname>DelaySec=</varname></term>
         <listitem>
           <para>Specifies the fixed amount of delay to be added to all packets going out of the
           interface. Defaults to unset.</para>
@@ -2285,7 +2286,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>NetworkEmulatorDelayJitterSec=</varname></term>
+        <term><varname>DelayJitterSec=</varname></term>
         <listitem>
           <para>Specifies the chosen delay to be added to the packets outgoing to the network
           interface. Defaults to unset.</para>
@@ -2293,7 +2294,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>NetworkEmulatorPacketLimit=</varname></term>
+        <term><varname>PacketLimit=</varname></term>
         <listitem>
           <para>Specifies the maximum number of packets the qdisc may hold queued at a time.
           An unsigned integer ranges 0 to 4294967294. Defaults to 1000.</para>
@@ -2301,7 +2302,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>NetworkEmulatorLossRate=</varname></term>
+        <term><varname>LossRate=</varname></term>
         <listitem>
           <para>Specifies an independent loss probability to be added to the packets outgoing from the
           network interface. Takes a percentage value, suffixed with "%". Defaults to unset.</para>
@@ -2309,23 +2310,39 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>NetworkEmulatorDuplicateRate=</varname></term>
+        <term><varname>DuplicateRate=</varname></term>
         <listitem>
           <para>Specifies that the chosen percent of packets is duplicated before queuing them.
           Takes a percentage value, suffixed with "%". Defaults to unset.</para>
         </listitem>
       </varlistentry>
+    </variablelist>
+  </refsect1>
 
+  <refsect1>
+    <title>[TokenBucketFilter] Section Options</title>
+    <para>The <literal>[TokenBucketFilter]</literal> section manages the queueing discipline (qdisc) of
+    token bucket filter (tbf).</para>
+
+    <variablelist class='network-directives'>
       <varlistentry>
-        <term><varname>TokenBufferFilterLatencySec=</varname></term>
+        <term><varname>Parent=</varname></term>
         <listitem>
-          <para>Specifies the latency parameter, which specifies the maximum amount of time a
+          <para>Specifies the parent Queueing Discipline (qdisc). Takes one of <literal>root</literal>,
-          packet can sit in the Token Buffer Filter (TBF). Defaults to unset.</para>
+          <literal>clsact</literal> or <literal>ingress</literal>. Defaults to <literal>root</literal>.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>TokenBufferFilterLimitSize=</varname></term>
+        <term><varname>LatencySec=</varname></term>
+        <listitem>
+          <para>Specifies the latency parameter, which specifies the maximum amount of time a
+          packet can sit in the Token Bucket Filter (TBF). Defaults to unset.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>LimitSize=</varname></term>
         <listitem>
           <para>Takes the number of bytes that can be queued waiting for tokens to become available.
           When the size is suffixed with K, M, or G, it is parsed as Kilobytes, Megabytes, or Gigabytes,
@@ -2334,7 +2351,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>TokenBufferFilterBurst=</varname></term>
+        <term><varname>Burst=</varname></term>
         <listitem>
           <para>Specifies the size of the bucket. This is the maximum amount of bytes that tokens
           can be available for instantaneous transfer. When the size is suffixed with K, M, or G, it is
@@ -2344,7 +2361,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>TokenBufferFilterRate=</varname></term>
+        <term><varname>Rate=</varname></term>
         <listitem>
           <para>Specifies the device specific bandwidth. When suffixed with K, M, or G, the specified
           bandwidth is parsed as Kilobits, Megabits, or Gigabits, respectively, to the base of 1000.
@@ -2353,7 +2370,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>TokenBufferFilterMPUBytes=</varname></term>
+        <term><varname>MPUBytes=</varname></term>
         <listitem>
           <para>The Minimum Packet Unit (MPU) determines the minimal token usage (specified in bytes)
           for a packet. When suffixed with K, M, or G, the specified size is parsed as Kilobytes,
@@ -2362,7 +2379,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>TokenBufferFilterPeakRate=</varname></term>
+        <term><varname>PeakRate=</varname></term>
         <listitem>
           <para>Takes the maximum depletion rate of the bucket. When suffixed with K, M, or G, the
           specified size is parsed as Kilobits, Megabits, or Gigabits, respectively, to the base of
@@ -2371,23 +2388,55 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>TokenBufferFilterMTUBytes=</varname></term>
+        <term><varname>MTUBytes=</varname></term>
         <listitem>
           <para>Specifies the size of the peakrate bucket. When suffixed with K, M, or G, the specified
           size is parsed as Kilobytes, Megabytes, or Gigabytes, respectively, to the base of 1000.
           Defaults to unset.</para>
         </listitem>
       </varlistentry>
+    </variablelist>
+  </refsect1>
 
+  <refsect1>
+    <title>[StochasticFairnessQueueing] Section Options</title>
+    <para>The <literal>[StochasticFairnessQueueing]</literal> section manages the queueing discipline
+    (qdisc) of stochastic fairness queueing (sfq).</para>
+
+    <variablelist class='network-directives'>
       <varlistentry>
-        <term><varname>StochasticFairnessQueueingPerturbPeriodSec=</varname></term>
+        <term><varname>Parent=</varname></term>
         <listitem>
-          <para>Specifies the interval in seconds for queue algorithm perturbation. Defaults to unset.</para>
+          <para>Specifies the parent Queueing Discipline (qdisc). Takes one of <literal>root</literal>,
+          <literal>clsact</literal> or <literal>ingress</literal>. Defaults to <literal>root</literal>.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>ControlledDelayPacketLimit=</varname></term>
+        <term><varname>PerturbPeriodSec=</varname></term>
+        <listitem>
+          <para>Specifies the interval in seconds for queue algorithm perturbation. Defaults to unset.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>[ControlledDelay] Section Options</title>
+    <para>The <literal>[ControlledDelay]</literal> section manages the queueing discipline (qdisc) of
+    controlled delay (CoDel).</para>
+
+    <variablelist class='network-directives'>
+      <varlistentry>
+        <term><varname>Parent=</varname></term>
+        <listitem>
+          <para>Specifies the parent Queueing Discipline (qdisc). Takes one of <literal>root</literal>,
+          <literal>clsact</literal> or <literal>ingress</literal>. Defaults to <literal>root</literal>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>PacketLimit=</varname></term>
         <listitem>
           <para>Specifies the hard lmit on the queue size in number of packets. When this limit is reached, incoming packets are
           dropped. An unsigned integer ranges 0 to 4294967294. Defaults to unset and kernel's default is used.</para>
@@ -2395,7 +2444,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>ControlledDelayTargetSec=</varname></term>
+        <term><varname>TargetSec=</varname></term>
         <listitem>
           <para>Takes a timespan. Specifies the acceptable minimum standing/persistent queue delay.
           Defaults to unset and kernel's default is used.</para>
@@ -2403,7 +2452,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>ControlledDelayIntervalSec=</varname></term>
+        <term><varname>IntervalSec=</varname></term>
         <listitem>
           <para>Takes a timespan. This is used to ensure that the measured minimum delay does not
           become too stale. Defaults to unset and kernel's default is used.</para>
@@ -2411,7 +2460,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>ControlledDelayECN=</varname></term>
+        <term><varname>ECN=</varname></term>
         <listitem>
           <para>Takes a boolean. This can be used to mark packets instead of dropping them. Defaults to
           unset and kernel's default is used.</para>
@@ -2419,15 +2468,31 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>ControlledDelayCEThresholdSec=</varname></term>
+        <term><varname>CEThresholdSec=</varname></term>
         <listitem>
           <para>Takes a timespan. This sets a threshold above which all packets are marked with ECN
           Congestion Experienced (CE). Defaults to unset and kernel's default is used.</para>
         </listitem>
       </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>[FairQueueingControlledDelay] Section Options</title>
+    <para>The <literal>[FairQueueingControlledDelay]</literal> section manages the queueing discipline
+    (qdisc) of fair queuing controlled delay (FQ-CoDel).</para>
+
+    <variablelist class='network-directives'>
+      <varlistentry>
+        <term><varname>Parent=</varname></term>
+        <listitem>
+          <para>Specifies the parent Queueing Discipline (qdisc). Takes one of <literal>root</literal>,
+          <literal>clsact</literal> or <literal>ingress</literal>. Defaults to <literal>root</literal>.</para>
+        </listitem>
+      </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayPacketLimit=</varname></term>
+        <term><varname>PacketLimit=</varname></term>
         <listitem>
           <para>Specifies the hard limit on the real queue size. When this limit is reached, incoming packets are
           dropped. Defaults to unset and kernel's default is used.</para>
@@ -2435,7 +2500,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayMemoryLimit=</varname></term>
+        <term><varname>MemoryLimit=</varname></term>
         <listitem>
           <para>Specifies the limit on the total number of bytes that can be queued in this FQ-CoDel instance.
           When suffixed with K, M, or G, the specified size is parsed as Kilobytes, Megabytes, or Gigabytes,
@@ -2444,7 +2509,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayFlows=</varname></term>
+        <term><varname>Flows=</varname></term>
         <listitem>
           <para>Specifies the number of flows into which the incoming packets are classified.
           Defaults to unset and kernel's default is used.</para>
@@ -2452,7 +2517,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayTargetSec=</varname></term>
+        <term><varname>TargetSec=</varname></term>
         <listitem>
           <para>Takes a timespan. Specifies the acceptable minimum standing/persistent queue delay.
           Defaults to unset and kernel's default is used.</para>
@@ -2460,7 +2525,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayIntervalSec=</varname></term>
+        <term><varname>IntervalSec=</varname></term>
         <listitem>
           <para>Takes a timespan. This is used to ensure that the measured minimum delay does not
           become too stale. Defaults to unset and kernel's default is used.</para>
@@ -2468,7 +2533,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayQuantum=</varname></term>
+        <term><varname>Quantum=</varname></term>
         <listitem>
           <para>Specifies the number of bytes used as 'deficit' in the fair queuing algorithmtimespan.
           When suffixed with K, M, or G, the specified size is parsed as Kilobytes, Megabytes, or Gigabytes,
@@ -2477,7 +2542,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayECN=</varname></term>
+        <term><varname>ECN=</varname></term>
         <listitem>
           <para>Takes a boolean. This can be used to mark packets instead of dropping them. Defaults to
           unset and kernel's default is used.</para>
@@ -2485,15 +2550,31 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueuingControlledDelayCEThresholdSec=</varname></term>
+        <term><varname>CEThresholdSec=</varname></term>
         <listitem>
           <para>Takes a timespan. This sets a threshold above which all packets are marked with ECN
           Congestion Experienced (CE). Defaults to unset and kernel's default is used.</para>
         </listitem>
       </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
+    <title>[FairQueueing] Section Options</title>
+    <para>The <literal>[FairQueueing]</literal> section manages the queueing discipline
+    (qdisc) of fair queue traffic policing (FQ).</para>
+
+    <variablelist class='network-directives'>
+      <varlistentry>
+        <term><varname>Parent=</varname></term>
+        <listitem>
+          <para>Specifies the parent Queueing Discipline (qdisc). Takes one of <literal>root</literal>,
+          <literal>clsact</literal> or <literal>ingress</literal>. Defaults to <literal>root</literal>.</para>
+        </listitem>
+      </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingPacketLimit=</varname></term>
+        <term><varname>PacketLimit=</varname></term>
         <listitem>
           <para>Specifies the hard limit on the real queue size. When this limit is reached, incoming packets are
           dropped. Defaults to unset and kernel's default is used.</para>
@@ -2501,7 +2582,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingFlowLimit=</varname></term>
+        <term><varname>FlowLimit=</varname></term>
         <listitem>
           <para>Specifies the hard limit on the maximum number of packets queued per flow. Defaults to
           unset and kernel's default is used.</para>
@@ -2509,7 +2590,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingQuantum=</varname></term>
+        <term><varname>Quantum=</varname></term>
         <listitem>
           <para>Specifies the credit per dequeue RR round, i.e. the amount of bytes a flow is allowed
           to dequeue at once. When suffixed with K, M, or G, the specified size is parsed as Kilobytes,
@@ -2519,7 +2600,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingInitialQuantum=</varname></term>
+        <term><varname>InitialQuantum=</varname></term>
         <listitem>
           <para>Specifies the initial sending rate credit, i.e. the amount of bytes a new flow is
           allowed to dequeue initially. When suffixed with K, M, or G, the specified size is parsed as
@@ -2529,7 +2610,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingMaximumRate=</varname></term>
+        <term><varname>MaximumRate=</varname></term>
         <listitem>
           <para>Specifies the maximum sending rate of a flow. When suffixed with K, M, or G, the
           specified size is parsed as Kilobits, Megabits, or Gigabits, respectively, to the base of
@@ -2538,7 +2619,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingBuckets=</varname></term>
+        <term><varname>Buckets=</varname></term>
         <listitem>
           <para>Specifies the size of the hash table used for flow lookups. Defaults to unset and
           kernel's default is used.</para>
@@ -2546,7 +2627,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingOrphanMask=</varname></term>
+        <term><varname>OrphanMask=</varname></term>
         <listitem>
           <para>Takes an unsigned integer. For packets not owned by a socket, fq is able to mask a part
           of hash and reduce number of buckets associated with the traffic. Defaults to unset and
@@ -2555,7 +2636,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingPacing=</varname></term>
+        <term><varname>Pacing=</varname></term>
         <listitem>
           <para>Takes a boolean, and enables or disables flow pacing. Defaults to unset and kernel's
           default is used.</para>
@@ -2563,13 +2644,12 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>FairQueueTrafficPolicingCEThresholdSec=</varname></term>
+        <term><varname>CEThresholdSec=</varname></term>
         <listitem>
           <para>Takes a timespan. This sets a threshold above which all packets are marked with ECN
           Congestion Experienced (CE). Defaults to unset and kernel's default is used.</para>
         </listitem>
       </varlistentry>
-
     </variablelist>
   </refsect1>
 

src/basic/selinux-util.c

@@ -37,8 +37,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
 static int cached_use = -1;
 static struct selabel_handle *label_hnd = NULL;
 
-#define log_enforcing(...) log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG, __VA_ARGS__)
+#define log_enforcing(...) log_full(security_getenforce() == 1 ? LOG_ERR : LOG_WARNING, __VA_ARGS__)
-#define log_enforcing_errno(r, ...) log_full_errno(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG, r, __VA_ARGS__)
+#define log_enforcing_errno(r, ...) log_full_errno(security_getenforce() == 1 ? LOG_ERR : LOG_WARNING, r, __VA_ARGS__)
 #endif
 
 bool mac_selinux_use(void) {

src/core/selinux-access.c

@@ -223,6 +223,7 @@ int mac_selinux_generic_access_check(
 
                 r = getfilecon_raw(path, &fcon);
                 if (r < 0) {
+                        log_warning_errno(errno, "SELinux getfilecon_raw on '%s' failed: %m (tclass=%s perm=%s)", path, tclass, permission);
                         r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get file context on %s.", path);
                         goto finish;
                 }
@@ -231,6 +232,7 @@ int mac_selinux_generic_access_check(
         } else {
                 r = getcon_raw(&fcon);
                 if (r < 0) {
+                        log_warning_errno(errno, "SELinux getcon_raw failed: %m (tclass=%s perm=%s)", tclass, permission);
                         r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get current context.");
                         goto finish;
                 }

src/network/networkd-network-gperf.gperf

@@ -27,291 +27,302 @@ struct ConfigPerfItem;
 %struct-type
 %includes
 %%
-Match.MACAddress,                       config_parse_hwaddrs,                                0,                             offsetof(Network, match_mac)
+Match.MACAddress,                            config_parse_hwaddrs,                                     0,                             offsetof(Network, match_mac)
-Match.PermanentMACAddress,              config_parse_hwaddrs,                                0,                             offsetof(Network, match_permanent_mac)
+Match.PermanentMACAddress,                   config_parse_hwaddrs,                                     0,                             offsetof(Network, match_permanent_mac)
-Match.Path,                             config_parse_match_strv,                             0,                             offsetof(Network, match_path)
+Match.Path,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match_path)
-Match.Driver,                           config_parse_match_strv,                             0,                             offsetof(Network, match_driver)
+Match.Driver,                                config_parse_match_strv,                                  0,                             offsetof(Network, match_driver)
-Match.Type,                             config_parse_match_strv,                             0,                             offsetof(Network, match_type)
+Match.Type,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match_type)
-Match.WLANInterfaceType,                config_parse_match_strv,                             0,                             offsetof(Network, match_wlan_iftype)
+Match.WLANInterfaceType,                     config_parse_match_strv,                                  0,                             offsetof(Network, match_wlan_iftype)
-Match.SSID,                             config_parse_match_strv,                             0,                             offsetof(Network, match_ssid)
+Match.SSID,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match_ssid)
-Match.BSSID,                            config_parse_hwaddrs,                                0,                             offsetof(Network, match_bssid)
+Match.BSSID,                                 config_parse_hwaddrs,                                     0,                             offsetof(Network, match_bssid)
-Match.Name,                             config_parse_match_ifnames,                          1,                             offsetof(Network, match_name)
+Match.Name,                                  config_parse_match_ifnames,                               1,                             offsetof(Network, match_name)
-Match.Property,                         config_parse_match_property,                         0,                             offsetof(Network, match_property)
+Match.Property,                              config_parse_match_property,                              0,                             offsetof(Network, match_property)
-Match.Host,                             config_parse_net_condition,                          CONDITION_HOST,                offsetof(Network, conditions)
+Match.Host,                                  config_parse_net_condition,                               CONDITION_HOST,                offsetof(Network, conditions)
-Match.Virtualization,                   config_parse_net_condition,                          CONDITION_VIRTUALIZATION,      offsetof(Network, conditions)
+Match.Virtualization,                        config_parse_net_condition,                               CONDITION_VIRTUALIZATION,      offsetof(Network, conditions)
-Match.KernelCommandLine,                config_parse_net_condition,                          CONDITION_KERNEL_COMMAND_LINE, offsetof(Network, conditions)
+Match.KernelCommandLine,                     config_parse_net_condition,                               CONDITION_KERNEL_COMMAND_LINE, offsetof(Network, conditions)
-Match.KernelVersion,                    config_parse_net_condition,                          CONDITION_KERNEL_VERSION,      offsetof(Network, conditions)
+Match.KernelVersion,                         config_parse_net_condition,                               CONDITION_KERNEL_VERSION,      offsetof(Network, conditions)
-Match.Architecture,                     config_parse_net_condition,                          CONDITION_ARCHITECTURE,        offsetof(Network, conditions)
+Match.Architecture,                          config_parse_net_condition,                               CONDITION_ARCHITECTURE,        offsetof(Network, conditions)
-Link.MACAddress,                        config_parse_hwaddr,                                 0,                             offsetof(Network, mac)
+Link.MACAddress,                             config_parse_hwaddr,                                      0,                             offsetof(Network, mac)
-Link.MTUBytes,                          config_parse_mtu,                                    AF_UNSPEC,                     offsetof(Network, mtu)
+Link.MTUBytes,                               config_parse_mtu,                                         AF_UNSPEC,                     offsetof(Network, mtu)
-Link.ARP,                               config_parse_tristate,                               0,                             offsetof(Network, arp)
+Link.ARP,                                    config_parse_tristate,                                    0,                             offsetof(Network, arp)
-Link.Multicast,                         config_parse_tristate,                               0,                             offsetof(Network, multicast)
+Link.Multicast,                              config_parse_tristate,                                    0,                             offsetof(Network, multicast)
-Link.AllMulticast,                      config_parse_tristate,                               0,                             offsetof(Network, allmulticast)
+Link.AllMulticast,                           config_parse_tristate,                                    0,                             offsetof(Network, allmulticast)
-Link.Unmanaged,                         config_parse_bool,                                   0,                             offsetof(Network, unmanaged)
+Link.Unmanaged,                              config_parse_bool,                                        0,                             offsetof(Network, unmanaged)
-Link.RequiredForOnline,                 config_parse_required_for_online,                    0,                             0
+Link.RequiredForOnline,                      config_parse_required_for_online,                         0,                             0
-Network.Description,                    config_parse_string,                                 0,                             offsetof(Network, description)
+Network.Description,                         config_parse_string,                                      0,                             offsetof(Network, description)
-Network.Bridge,                         config_parse_ifname,                                 0,                             offsetof(Network, bridge_name)
+Network.Bridge,                              config_parse_ifname,                                      0,                             offsetof(Network, bridge_name)
-Network.Bond,                           config_parse_ifname,                                 0,                             offsetof(Network, bond_name)
+Network.Bond,                                config_parse_ifname,                                      0,                             offsetof(Network, bond_name)
-Network.VLAN,                           config_parse_stacked_netdev,                         NETDEV_KIND_VLAN,              offsetof(Network, stacked_netdev_names)
+Network.VLAN,                                config_parse_stacked_netdev,                              NETDEV_KIND_VLAN,              offsetof(Network, stacked_netdev_names)
-Network.MACVLAN,                        config_parse_stacked_netdev,                         NETDEV_KIND_MACVLAN,           offsetof(Network, stacked_netdev_names)
+Network.MACVLAN,                             config_parse_stacked_netdev,                              NETDEV_KIND_MACVLAN,           offsetof(Network, stacked_netdev_names)
-Network.MACVTAP,                        config_parse_stacked_netdev,                         NETDEV_KIND_MACVTAP,           offsetof(Network, stacked_netdev_names)
+Network.MACVTAP,                             config_parse_stacked_netdev,                              NETDEV_KIND_MACVTAP,           offsetof(Network, stacked_netdev_names)
-Network.IPVLAN,                         config_parse_stacked_netdev,                         NETDEV_KIND_IPVLAN,            offsetof(Network, stacked_netdev_names)
+Network.IPVLAN,                              config_parse_stacked_netdev,                              NETDEV_KIND_IPVLAN,            offsetof(Network, stacked_netdev_names)
-Network.IPVTAP,                         config_parse_stacked_netdev,                         NETDEV_KIND_IPVTAP,            offsetof(Network, stacked_netdev_names)
+Network.IPVTAP,                              config_parse_stacked_netdev,                              NETDEV_KIND_IPVTAP,            offsetof(Network, stacked_netdev_names)
-Network.VXLAN,                          config_parse_stacked_netdev,                         NETDEV_KIND_VXLAN,             offsetof(Network, stacked_netdev_names)
+Network.VXLAN,                               config_parse_stacked_netdev,                              NETDEV_KIND_VXLAN,             offsetof(Network, stacked_netdev_names)
-Network.L2TP,                           config_parse_stacked_netdev,                         NETDEV_KIND_L2TP,              offsetof(Network, stacked_netdev_names)
+Network.L2TP,                                config_parse_stacked_netdev,                              NETDEV_KIND_L2TP,              offsetof(Network, stacked_netdev_names)
-Network.MACsec,                         config_parse_stacked_netdev,                         NETDEV_KIND_MACSEC,            offsetof(Network, stacked_netdev_names)
+Network.MACsec,                              config_parse_stacked_netdev,                              NETDEV_KIND_MACSEC,            offsetof(Network, stacked_netdev_names)
-Network.Tunnel,                         config_parse_stacked_netdev,                         _NETDEV_KIND_TUNNEL,           offsetof(Network, stacked_netdev_names)
+Network.Tunnel,                              config_parse_stacked_netdev,                              _NETDEV_KIND_TUNNEL,           offsetof(Network, stacked_netdev_names)
-Network.Xfrm,                           config_parse_stacked_netdev,                         NETDEV_KIND_XFRM,              offsetof(Network, stacked_netdev_names)
+Network.Xfrm,                                config_parse_stacked_netdev,                              NETDEV_KIND_XFRM,              offsetof(Network, stacked_netdev_names)
-Network.VRF,                            config_parse_ifname,                                 0,                             offsetof(Network, vrf_name)
+Network.VRF,                                 config_parse_ifname,                                      0,                             offsetof(Network, vrf_name)
-Network.DHCP,                           config_parse_dhcp,                                   0,                             offsetof(Network, dhcp)
+Network.DHCP,                                config_parse_dhcp,                                        0,                             offsetof(Network, dhcp)
-Network.DHCPServer,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_server)
+Network.DHCPServer,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_server)
-Network.LinkLocalAddressing,            config_parse_link_local_address_family,              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.IPv4LLRoute,                         config_parse_bool,                                        0,                             offsetof(Network, ipv4ll_route)
-Network.DefaultRouteOnDevice,           config_parse_bool,                                   0,                             offsetof(Network, default_route_on_device)
+Network.DefaultRouteOnDevice,                config_parse_bool,                                        0,                             offsetof(Network, default_route_on_device)
-Network.IPv6Token,                      config_parse_ipv6token,                              0,                             offsetof(Network, ipv6_token)
+Network.IPv6Token,                           config_parse_ipv6token,                                   0,                             offsetof(Network, ipv6_token)
-Network.LLDP,                           config_parse_lldp_mode,                              0,                             offsetof(Network, lldp_mode)
+Network.LLDP,                                config_parse_lldp_mode,                                   0,                             offsetof(Network, lldp_mode)
-Network.EmitLLDP,                       config_parse_lldp_emit,                              0,                             offsetof(Network, lldp_emit)
+Network.EmitLLDP,                            config_parse_lldp_emit,                                   0,                             offsetof(Network, lldp_emit)
-Network.Address,                        config_parse_address,                                0,                             0
+Network.Address,                             config_parse_address,                                     0,                             0
-Network.Gateway,                        config_parse_gateway,                                0,                             0
+Network.Gateway,                             config_parse_gateway,                                     0,                             0
-Network.Domains,                        config_parse_domains,                                0,                             0
+Network.Domains,                             config_parse_domains,                                     0,                             0
-Network.DNS,                            config_parse_dns,                                    0,                             0
+Network.DNS,                                 config_parse_dns,                                         0,                             0
-Network.DNSDefaultRoute,                config_parse_tristate,                               0,                             offsetof(Network, dns_default_route)
+Network.DNSDefaultRoute,                     config_parse_tristate,                                    0,                             offsetof(Network, dns_default_route)
-Network.LLMNR,                          config_parse_resolve_support,                        0,                             offsetof(Network, llmnr)
+Network.LLMNR,                               config_parse_resolve_support,                             0,                             offsetof(Network, llmnr)
-Network.MulticastDNS,                   config_parse_resolve_support,                        0,                             offsetof(Network, mdns)
+Network.MulticastDNS,                        config_parse_resolve_support,                             0,                             offsetof(Network, mdns)
-Network.DNSOverTLS,                     config_parse_dns_over_tls_mode,                      0,                             offsetof(Network, dns_over_tls_mode)
+Network.DNSOverTLS,                          config_parse_dns_over_tls_mode,                           0,                             offsetof(Network, dns_over_tls_mode)
-Network.DNSSEC,                         config_parse_dnssec_mode,                            0,                             offsetof(Network, dnssec_mode)
+Network.DNSSEC,                              config_parse_dnssec_mode,                                 0,                             offsetof(Network, dnssec_mode)
-Network.DNSSECNegativeTrustAnchors,     config_parse_dnssec_negative_trust_anchors,          0,                             0
+Network.DNSSECNegativeTrustAnchors,          config_parse_dnssec_negative_trust_anchors,               0,                             0
-Network.NTP,                            config_parse_ntp,                                    0,                             offsetof(Network, ntp)
+Network.NTP,                                 config_parse_ntp,                                         0,                             offsetof(Network, ntp)
-Network.IPForward,                      config_parse_address_family_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.IPMasquerade,                        config_parse_bool,                                        0,                             offsetof(Network, ip_masquerade)
-Network.IPv6PrivacyExtensions,          config_parse_ipv6_privacy_extensions,                0,                             offsetof(Network, ipv6_privacy_extensions)
+Network.IPv6PrivacyExtensions,               config_parse_ipv6_privacy_extensions,                     0,                             offsetof(Network, ipv6_privacy_extensions)
-Network.IPv6AcceptRA,                   config_parse_tristate,                               0,                             offsetof(Network, ipv6_accept_ra)
+Network.IPv6AcceptRA,                        config_parse_tristate,                                    0,                             offsetof(Network, ipv6_accept_ra)
-Network.IPv6AcceptRouterAdvertisements, config_parse_tristate,                               0,                             offsetof(Network, ipv6_accept_ra)
+Network.IPv6AcceptRouterAdvertisements,      config_parse_tristate,                                    0,                             offsetof(Network, ipv6_accept_ra)
-Network.IPv6DuplicateAddressDetection,  config_parse_int,                                    0,                             offsetof(Network, ipv6_dad_transmits)
+Network.IPv6DuplicateAddressDetection,       config_parse_int,                                         0,                             offsetof(Network, ipv6_dad_transmits)
-Network.IPv6HopLimit,                   config_parse_int,                                    0,                             offsetof(Network, ipv6_hop_limit)
+Network.IPv6HopLimit,                        config_parse_int,                                         0,                             offsetof(Network, ipv6_hop_limit)
-Network.IPv6ProxyNDP,                   config_parse_tristate,                               0,                             offsetof(Network, ipv6_proxy_ndp)
+Network.IPv6ProxyNDP,                        config_parse_tristate,                                    0,                             offsetof(Network, ipv6_proxy_ndp)
-Network.IPv6MTUBytes,                   config_parse_mtu,                                    AF_INET6,                      offsetof(Network, ipv6_mtu)
+Network.IPv6MTUBytes,                        config_parse_mtu,                                         AF_INET6,                      offsetof(Network, ipv6_mtu)
-Network.ActiveSlave,                    config_parse_bool,                                   0,                             offsetof(Network, active_slave)
+Network.ActiveSlave,                         config_parse_bool,                                        0,                             offsetof(Network, active_slave)
-Network.PrimarySlave,                   config_parse_bool,                                   0,                             offsetof(Network, primary_slave)
+Network.PrimarySlave,                        config_parse_bool,                                        0,                             offsetof(Network, primary_slave)
-Network.IPv4ProxyARP,                   config_parse_tristate,                               0,                             offsetof(Network, proxy_arp)
+Network.IPv4ProxyARP,                        config_parse_tristate,                                    0,                             offsetof(Network, proxy_arp)
-Network.ProxyARP,                       config_parse_tristate,                               0,                             offsetof(Network, proxy_arp)
+Network.ProxyARP,                            config_parse_tristate,                                    0,                             offsetof(Network, proxy_arp)
-Network.IPv6ProxyNDPAddress,            config_parse_ipv6_proxy_ndp_address,                 0,                             0
+Network.IPv6ProxyNDPAddress,                 config_parse_ipv6_proxy_ndp_address,                      0,                             0
-Network.BindCarrier,                    config_parse_strv,                                   0,                             offsetof(Network, bind_carrier)
+Network.BindCarrier,                         config_parse_strv,                                        0,                             offsetof(Network, bind_carrier)
-Network.ConfigureWithoutCarrier,        config_parse_bool,                                   0,                             offsetof(Network, configure_without_carrier)
+Network.ConfigureWithoutCarrier,             config_parse_bool,                                        0,                             offsetof(Network, configure_without_carrier)
-Network.IgnoreCarrierLoss,              config_parse_bool,                                   0,                             offsetof(Network, ignore_carrier_loss)
+Network.IgnoreCarrierLoss,                   config_parse_bool,                                        0,                             offsetof(Network, ignore_carrier_loss)
-Network.KeepConfiguration,              config_parse_keep_configuration,                     0,                             offsetof(Network, keep_configuration)
+Network.KeepConfiguration,                   config_parse_keep_configuration,                          0,                             offsetof(Network, keep_configuration)
-Address.Address,                        config_parse_address,                                0,                             0
+Address.Address,                             config_parse_address,                                     0,                             0
-Address.Peer,                           config_parse_address,                                0,                             0
+Address.Peer,                                config_parse_address,                                     0,                             0
-Address.Broadcast,                      config_parse_broadcast,                              0,                             0
+Address.Broadcast,                           config_parse_broadcast,                                   0,                             0
-Address.Label,                          config_parse_label,                                  0,                             0
+Address.Label,                               config_parse_label,                                       0,                             0
-Address.PreferredLifetime,              config_parse_lifetime,                               0,                             0
+Address.PreferredLifetime,                   config_parse_lifetime,                                    0,                             0
-Address.HomeAddress,                    config_parse_address_flags,                          0,                             0
+Address.HomeAddress,                         config_parse_address_flags,                               0,                             0
-Address.ManageTemporaryAddress,         config_parse_address_flags,                          0,                             0
+Address.ManageTemporaryAddress,              config_parse_address_flags,                               0,                             0
-Address.PrefixRoute,                    config_parse_address_flags,                          0,                             0 /* deprecated */
+Address.PrefixRoute,                         config_parse_address_flags,                               0,                             0 /* deprecated */
-Address.AddPrefixRoute,                 config_parse_address_flags,                          0,                             0
+Address.AddPrefixRoute,                      config_parse_address_flags,                               0,                             0
-Address.AutoJoin,                       config_parse_address_flags,                          0,                             0
+Address.AutoJoin,                            config_parse_address_flags,                               0,                             0
-Address.DuplicateAddressDetection,      config_parse_duplicate_address_detection,            0,                             0
+Address.DuplicateAddressDetection,           config_parse_duplicate_address_detection,                 0,                             0
-Address.Scope,                          config_parse_address_scope,                          0,                             0
+Address.Scope,                               config_parse_address_scope,                               0,                             0
-IPv6AddressLabel.Prefix,                config_parse_address_label_prefix,                   0,                             0
+IPv6AddressLabel.Prefix,                     config_parse_address_label_prefix,                        0,                             0
-IPv6AddressLabel.Label,                 config_parse_address_label,                          0,                             0
+IPv6AddressLabel.Label,                      config_parse_address_label,                               0,                             0
-Neighbor.Address,                       config_parse_neighbor_address,                       0,                             0
+Neighbor.Address,                            config_parse_neighbor_address,                            0,                             0
-Neighbor.LinkLayerAddress,              config_parse_neighbor_lladdr,                        0,                             0
+Neighbor.LinkLayerAddress,                   config_parse_neighbor_lladdr,                             0,                             0
-Neighbor.MACAddress,                    config_parse_neighbor_hwaddr,                        0,                             0 /* deprecated */
+Neighbor.MACAddress,                         config_parse_neighbor_hwaddr,                             0,                             0 /* deprecated */
-RoutingPolicyRule.TypeOfService,        config_parse_routing_policy_rule_tos,                0,                             0
+RoutingPolicyRule.TypeOfService,             config_parse_routing_policy_rule_tos,                     0,                             0
-RoutingPolicyRule.Priority,             config_parse_routing_policy_rule_priority,           0,                             0
+RoutingPolicyRule.Priority,                  config_parse_routing_policy_rule_priority,                0,                             0
-RoutingPolicyRule.Table,                config_parse_routing_policy_rule_table,              0,                             0
+RoutingPolicyRule.Table,                     config_parse_routing_policy_rule_table,                   0,                             0
-RoutingPolicyRule.FirewallMark,         config_parse_routing_policy_rule_fwmark_mask,        0,                             0
+RoutingPolicyRule.FirewallMark,              config_parse_routing_policy_rule_fwmark_mask,             0,                             0
-RoutingPolicyRule.From,                 config_parse_routing_policy_rule_prefix,             0,                             0
+RoutingPolicyRule.From,                      config_parse_routing_policy_rule_prefix,                  0,                             0
-RoutingPolicyRule.To,                   config_parse_routing_policy_rule_prefix,             0,                             0
+RoutingPolicyRule.To,                        config_parse_routing_policy_rule_prefix,                  0,                             0
-RoutingPolicyRule.IncomingInterface,    config_parse_routing_policy_rule_device,             0,                             0
+RoutingPolicyRule.IncomingInterface,         config_parse_routing_policy_rule_device,                  0,                             0
-RoutingPolicyRule.OutgoingInterface,    config_parse_routing_policy_rule_device,             0,                             0
+RoutingPolicyRule.OutgoingInterface,         config_parse_routing_policy_rule_device,                  0,                             0
-RoutingPolicyRule.IPProtocol,           config_parse_routing_policy_rule_ip_protocol,        0,                             0
+RoutingPolicyRule.IPProtocol,                config_parse_routing_policy_rule_ip_protocol,             0,                             0
-RoutingPolicyRule.SourcePort,           config_parse_routing_policy_rule_port_range,         0,                             0
+RoutingPolicyRule.SourcePort,                config_parse_routing_policy_rule_port_range,              0,                             0
-RoutingPolicyRule.DestinationPort,      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.InvertRule,                config_parse_routing_policy_rule_invert,                  0,                             0
-RoutingPolicyRule.Family,               config_parse_routing_policy_rule_family,             0,                             0
+RoutingPolicyRule.Family,                    config_parse_routing_policy_rule_family,                  0,                             0
-RoutingPolicyRule.User,                 config_parse_routing_policy_rule_uid_range,          0,                             0
+RoutingPolicyRule.User,                      config_parse_routing_policy_rule_uid_range,               0,                             0
-RoutingPolicyRule.SuppressPrefixLength, config_parse_routing_policy_rule_suppress_prefixlen, 0,                             0
+RoutingPolicyRule.SuppressPrefixLength,      config_parse_routing_policy_rule_suppress_prefixlen,      0,                             0
-Route.Gateway,                          config_parse_gateway,                                0,                             0
+Route.Gateway,                               config_parse_gateway,                                     0,                             0
-Route.Destination,                      config_parse_destination,                            0,                             0
+Route.Destination,                           config_parse_destination,                                 0,                             0
-Route.Source,                           config_parse_destination,                            0,                             0
+Route.Source,                                config_parse_destination,                                 0,                             0
-Route.Metric,                           config_parse_route_priority,                         0,                             0
+Route.Metric,                                config_parse_route_priority,                              0,                             0
-Route.Scope,                            config_parse_route_scope,                            0,                             0
+Route.Scope,                                 config_parse_route_scope,                                 0,                             0
-Route.PreferredSource,                  config_parse_preferred_src,                          0,                             0
+Route.PreferredSource,                       config_parse_preferred_src,                               0,                             0
-Route.Table,                            config_parse_route_table,                            0,                             0
+Route.Table,                                 config_parse_route_table,                                 0,                             0
-Route.MTUBytes,                         config_parse_route_mtu,                              AF_UNSPEC,                     0
+Route.MTUBytes,                              config_parse_route_mtu,                                   AF_UNSPEC,                     0
-Route.GatewayOnLink,                    config_parse_gateway_onlink,                         0,                             0
+Route.GatewayOnLink,                         config_parse_gateway_onlink,                              0,                             0
-Route.GatewayOnlink,                    config_parse_gateway_onlink,                         0,                             0
+Route.GatewayOnlink,                         config_parse_gateway_onlink,                              0,                             0
-Route.IPv6Preference,                   config_parse_ipv6_route_preference,                  0,                             0
+Route.IPv6Preference,                        config_parse_ipv6_route_preference,                       0,                             0
-Route.Protocol,                         config_parse_route_protocol,                         0,                             0
+Route.Protocol,                              config_parse_route_protocol,                              0,                             0
-Route.Type,                             config_parse_route_type,                             0,                             0
+Route.Type,                                  config_parse_route_type,                                  0,                             0
-Route.InitialCongestionWindow,          config_parse_tcp_window,                             0,                             0
+Route.InitialCongestionWindow,               config_parse_tcp_window,                                  0,                             0
-Route.InitialAdvertisedReceiveWindow,   config_parse_tcp_window,                             0,                             0
+Route.InitialAdvertisedReceiveWindow,        config_parse_tcp_window,                                  0,                             0
-Route.QuickAck,                         config_parse_quickack,                               0,                             0
+Route.QuickAck,                              config_parse_quickack,                                    0,                             0
-Route.FastOpenNoCookie,                 config_parse_fast_open_no_cookie,                    0,                             0
+Route.FastOpenNoCookie,                      config_parse_fast_open_no_cookie,                         0,                             0
-Route.TTLPropagate,                     config_parse_route_ttl_propagate,                    0,                             0
+Route.TTLPropagate,                          config_parse_route_ttl_propagate,                         0,                             0
-Route.MultiPathRoute,                   config_parse_multipath_route,                        0,                             0
+Route.MultiPathRoute,                        config_parse_multipath_route,                             0,                             0
-NextHop.Id,                             config_parse_nexthop_id,                             0,                             0
+NextHop.Id,                                  config_parse_nexthop_id,                                  0,                             0
-NextHop.Gateway,                        config_parse_nexthop_gateway,                        0,                             0
+NextHop.Gateway,                             config_parse_nexthop_gateway,                             0,                             0
-DHCPv4.ClientIdentifier,                config_parse_dhcp_client_identifier,                 0,                             offsetof(Network, dhcp_client_identifier)
+DHCPv4.ClientIdentifier,                     config_parse_dhcp_client_identifier,                      0,                             offsetof(Network, dhcp_client_identifier)
-DHCPv4.UseDNS,                          config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_dns)
+DHCPv4.UseDNS,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_dns)
-DHCPv4.RoutesToDNS,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_routes_to_dns)
+DHCPv4.RoutesToDNS,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_routes_to_dns)
-DHCPv4.UseNTP,                          config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_ntp)
+DHCPv4.UseNTP,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_ntp)
-DHCPv4.UseSIP,                          config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_sip)
+DHCPv4.UseSIP,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_sip)
-DHCPv4.UseMTU,                          config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_mtu)
+DHCPv4.UseMTU,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_mtu)
-DHCPv4.UseHostname,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_hostname)
+DHCPv4.UseHostname,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_hostname)
-DHCPv4.UseDomains,                      config_parse_dhcp_use_domains,                       0,                             offsetof(Network, dhcp_use_domains)
+DHCPv4.UseDomains,                           config_parse_dhcp_use_domains,                            0,                             offsetof(Network, dhcp_use_domains)
-DHCPv4.UseRoutes,                       config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_routes)
+DHCPv4.UseRoutes,                            config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_routes)
-DHCPv4.RequestOptions,                  config_parse_dhcp_request_options,                   0,                             0
+DHCPv4.RequestOptions,                       config_parse_dhcp_request_options,                        0,                             0
-DHCPv4.Anonymize,                       config_parse_bool,                                   0,                             offsetof(Network, dhcp_anonymize)
+DHCPv4.Anonymize,                            config_parse_bool,                                        0,                             offsetof(Network, dhcp_anonymize)
-DHCPv4.SendHostname,                    config_parse_bool,                                   0,                             offsetof(Network, dhcp_send_hostname)
+DHCPv4.SendHostname,                         config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_hostname)
-DHCPv4.Hostname,                        config_parse_hostname,                               0,                             offsetof(Network, dhcp_hostname)
+DHCPv4.Hostname,                             config_parse_hostname,                                    0,                             offsetof(Network, dhcp_hostname)
-DHCPv4.RequestBroadcast,                config_parse_bool,                                   0,                             offsetof(Network, dhcp_broadcast)
+DHCPv4.RequestBroadcast,                     config_parse_bool,                                        0,                             offsetof(Network, dhcp_broadcast)
-DHCPv4.VendorClassIdentifier,           config_parse_string,                                 0,                             offsetof(Network, dhcp_vendor_class_identifier)
+DHCPv4.VendorClassIdentifier,                config_parse_string,                                      0,                             offsetof(Network, dhcp_vendor_class_identifier)
-DHCPv4.MaxAttempts,                     config_parse_dhcp_max_attempts,                      0,                             0
+DHCPv4.MaxAttempts,                          config_parse_dhcp_max_attempts,                           0,                             0
-DHCPv4.UserClass,                       config_parse_dhcp_user_class,                        0,                             offsetof(Network, dhcp_user_class)
+DHCPv4.UserClass,                            config_parse_dhcp_user_class,                             0,                             offsetof(Network, dhcp_user_class)
-DHCPv4.DUIDType,                        config_parse_duid_type,                              0,                             offsetof(Network, duid)
+DHCPv4.DUIDType,                             config_parse_duid_type,                                   0,                             offsetof(Network, duid)
-DHCPv4.DUIDRawData,                     config_parse_duid_rawdata,                           0,                             offsetof(Network, duid)
+DHCPv4.DUIDRawData,                          config_parse_duid_rawdata,                                0,                             offsetof(Network, duid)
-DHCPv4.RouteMetric,                     config_parse_unsigned,                               0,                             offsetof(Network, dhcp_route_metric)
+DHCPv4.RouteMetric,                          config_parse_unsigned,                                    0,                             offsetof(Network, dhcp_route_metric)
-DHCPv4.RouteTable,                      config_parse_section_route_table,                    0,                             0
+DHCPv4.RouteTable,                           config_parse_section_route_table,                         0,                             0
-DHCPv4.UseTimezone,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_use_timezone)
+DHCPv4.UseTimezone,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_timezone)
-DHCPv4.IAID,                            config_parse_iaid,                                   0,                             0
+DHCPv4.IAID,                                 config_parse_iaid,                                        0,                             0
-DHCPv4.ListenPort,                      config_parse_uint16,                                 0,                             offsetof(Network, dhcp_client_port)
+DHCPv4.ListenPort,                           config_parse_uint16,                                      0,                             offsetof(Network, dhcp_client_port)
-DHCPv4.SendRelease,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_send_release)
+DHCPv4.SendRelease,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_release)
-DHCPv4.SendDecline,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_send_decline)
+DHCPv4.SendDecline,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_decline)
-DHCPv4.BlackList,                       config_parse_dhcp_black_listed_ip_address,           0,                             0
+DHCPv4.BlackList,                            config_parse_dhcp_black_listed_ip_address,                0,                             0
-DHCPv4.IPServiceType,                   config_parse_ip_service_type,                        0,                             offsetof(Network, ip_service_type)
+DHCPv4.IPServiceType,                        config_parse_ip_service_type,                             0,                             offsetof(Network, ip_service_type)
-DHCPv4.SendOption,                      config_parse_dhcp_send_option,                       0,                             offsetof(Network, dhcp_client_send_options)
+DHCPv4.SendOption,                           config_parse_dhcp_send_option,                            0,                             offsetof(Network, dhcp_client_send_options)
-DHCPv4.RouteMTUBytes,                   config_parse_mtu,                                    AF_INET,                       offsetof(Network, dhcp_route_mtu)
+DHCPv4.RouteMTUBytes,                        config_parse_mtu,                                         AF_INET,                       offsetof(Network, dhcp_route_mtu)
-DHCPv6.UseDNS,                          config_parse_bool,                                   0,                             offsetof(Network, dhcp6_use_dns)
+DHCPv6.UseDNS,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp6_use_dns)
-DHCPv6.UseNTP,                          config_parse_bool,                                   0,                             offsetof(Network, dhcp6_use_ntp)
+DHCPv6.UseNTP,                               config_parse_bool,                                        0,                             offsetof(Network, dhcp6_use_ntp)
-DHCPv6.RapidCommit,                     config_parse_bool,                                   0,                             offsetof(Network, rapid_commit)
+DHCPv6.RapidCommit,                          config_parse_bool,                                        0,                             offsetof(Network, rapid_commit)
-DHCPv6.ForceDHCPv6PDOtherInformation,   config_parse_bool,                                   0,                             offsetof(Network, dhcp6_force_pd_other_information)
+DHCPv6.ForceDHCPv6PDOtherInformation,        config_parse_bool,                                        0,                             offsetof(Network, dhcp6_force_pd_other_information)
-DHCPv6.PrefixDelegationHint,            config_parse_dhcp6_pd_hint,                          0,                             0
+DHCPv6.PrefixDelegationHint,                 config_parse_dhcp6_pd_hint,                               0,                             0
-IPv6AcceptRA.UseAutonomousPrefix,       config_parse_bool,                                   0,                             offsetof(Network, ipv6_accept_ra_use_autonomous_prefix)
+IPv6AcceptRA.UseAutonomousPrefix,            config_parse_bool,                                        0,                             offsetof(Network, ipv6_accept_ra_use_autonomous_prefix)
-IPv6AcceptRA.UseOnLinkPrefix,           config_parse_bool,                                   0,                             offsetof(Network, ipv6_accept_ra_use_onlink_prefix)
+IPv6AcceptRA.UseOnLinkPrefix,                config_parse_bool,                                        0,                             offsetof(Network, ipv6_accept_ra_use_onlink_prefix)
-IPv6AcceptRA.UseDNS,                    config_parse_bool,                                   0,                             offsetof(Network, ipv6_accept_ra_use_dns)
+IPv6AcceptRA.UseDNS,                         config_parse_bool,                                        0,                             offsetof(Network, ipv6_accept_ra_use_dns)
-IPv6AcceptRA.UseDomains,                config_parse_dhcp_use_domains,                       0,                             offsetof(Network, ipv6_accept_ra_use_domains)
+IPv6AcceptRA.UseDomains,                     config_parse_dhcp_use_domains,                            0,                             offsetof(Network, ipv6_accept_ra_use_domains)
-IPv6AcceptRA.RouteTable,                config_parse_section_route_table,                    0,                             0
+IPv6AcceptRA.RouteTable,                     config_parse_section_route_table,                         0,                             0
-IPv6AcceptRA.BlackList,                 config_parse_ndisc_black_listed_prefix,              0,                             0
+IPv6AcceptRA.BlackList,                      config_parse_ndisc_black_listed_prefix,                   0,                             0
-DHCPServer.MaxLeaseTimeSec,             config_parse_sec,                                    0,                             offsetof(Network, dhcp_server_max_lease_time_usec)
+DHCPServer.MaxLeaseTimeSec,                  config_parse_sec,                                         0,                             offsetof(Network, dhcp_server_max_lease_time_usec)
-DHCPServer.DefaultLeaseTimeSec,         config_parse_sec,                                    0,                             offsetof(Network, dhcp_server_default_lease_time_usec)
+DHCPServer.DefaultLeaseTimeSec,              config_parse_sec,                                         0,                             offsetof(Network, dhcp_server_default_lease_time_usec)
-DHCPServer.EmitDNS,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_server_emit_dns)
+DHCPServer.EmitDNS,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_server_emit_dns)
-DHCPServer.DNS,                         config_parse_dhcp_server_dns,                        0,                             0
+DHCPServer.DNS,                              config_parse_dhcp_server_dns,                             0,                             0
-DHCPServer.EmitNTP,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_server_emit_ntp)
+DHCPServer.EmitNTP,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_server_emit_ntp)
-DHCPServer.NTP,                         config_parse_dhcp_server_ntp,                        0,                             0
+DHCPServer.NTP,                              config_parse_dhcp_server_ntp,                             0,                             0
-DHCPServer.EmitSIP,                     config_parse_bool,                                   0,                             offsetof(Network, dhcp_server_emit_sip)
+DHCPServer.EmitSIP,                          config_parse_bool,                                        0,                             offsetof(Network, dhcp_server_emit_sip)
-DHCPServer.SIP,                         config_parse_dhcp_server_sip,                        0,                             0
+DHCPServer.SIP,                              config_parse_dhcp_server_sip,                             0,                             0
-DHCPServer.EmitRouter,                  config_parse_bool,                                   0,                             offsetof(Network, dhcp_server_emit_router)
+DHCPServer.EmitRouter,                       config_parse_bool,                                        0,                             offsetof(Network, dhcp_server_emit_router)
-DHCPServer.EmitTimezone,                config_parse_bool,                                   0,                             offsetof(Network, dhcp_server_emit_timezone)
+DHCPServer.EmitTimezone,                     config_parse_bool,                                        0,                             offsetof(Network, dhcp_server_emit_timezone)
-DHCPServer.Timezone,                    config_parse_timezone,                               0,                             offsetof(Network, dhcp_server_timezone)
+DHCPServer.Timezone,                         config_parse_timezone,                                    0,                             offsetof(Network, dhcp_server_timezone)
-DHCPServer.PoolOffset,                  config_parse_uint32,                                 0,                             offsetof(Network, dhcp_server_pool_offset)
+DHCPServer.PoolOffset,                       config_parse_uint32,                                      0,                             offsetof(Network, dhcp_server_pool_offset)
-DHCPServer.PoolSize,                    config_parse_uint32,                                 0,                             offsetof(Network, dhcp_server_pool_size)
+DHCPServer.PoolSize,                         config_parse_uint32,                                      0,                             offsetof(Network, dhcp_server_pool_size)
-DHCPServer.SendOption,                  config_parse_dhcp_send_option,                       0,                             offsetof(Network, dhcp_server_send_options)
+DHCPServer.SendOption,                       config_parse_dhcp_send_option,                            0,                             offsetof(Network, dhcp_server_send_options)
-Bridge.Cost,                            config_parse_uint32,                                 0,                             offsetof(Network, cost)
+Bridge.Cost,                                 config_parse_uint32,                                      0,                             offsetof(Network, cost)
-Bridge.UseBPDU,                         config_parse_tristate,                               0,                             offsetof(Network, use_bpdu)
+Bridge.UseBPDU,                              config_parse_tristate,                                    0,                             offsetof(Network, use_bpdu)
-Bridge.HairPin,                         config_parse_tristate,                               0,                             offsetof(Network, hairpin)
+Bridge.HairPin,                              config_parse_tristate,                                    0,                             offsetof(Network, hairpin)
-Bridge.FastLeave,                       config_parse_tristate,                               0,                             offsetof(Network, fast_leave)
+Bridge.FastLeave,                            config_parse_tristate,                                    0,                             offsetof(Network, fast_leave)
-Bridge.AllowPortToBeRoot,               config_parse_tristate,                               0,                             offsetof(Network, allow_port_to_be_root)
+Bridge.AllowPortToBeRoot,                    config_parse_tristate,                                    0,                             offsetof(Network, allow_port_to_be_root)
-Bridge.UnicastFlood,                    config_parse_tristate,                               0,                             offsetof(Network, unicast_flood)
+Bridge.UnicastFlood,                         config_parse_tristate,                                    0,                             offsetof(Network, unicast_flood)
-Bridge.MulticastFlood,                  config_parse_tristate,                               0,                             offsetof(Network, multicast_flood)
+Bridge.MulticastFlood,                       config_parse_tristate,                                    0,                             offsetof(Network, multicast_flood)
-Bridge.MulticastToUnicast,              config_parse_tristate,                               0,                             offsetof(Network, multicast_to_unicast)
+Bridge.MulticastToUnicast,                   config_parse_tristate,                                    0,                             offsetof(Network, multicast_to_unicast)
-Bridge.NeighborSuppression,             config_parse_tristate,                               0,                             offsetof(Network, neighbor_suppression)
+Bridge.NeighborSuppression,                  config_parse_tristate,                                    0,                             offsetof(Network, neighbor_suppression)
-Bridge.Learning,                        config_parse_tristate,                               0,                             offsetof(Network, learning)
+Bridge.Learning,                             config_parse_tristate,                                    0,                             offsetof(Network, learning)
-Bridge.ProxyARP,                        config_parse_tristate,                               0,                             offsetof(Network, bridge_proxy_arp)
+Bridge.ProxyARP,                             config_parse_tristate,                                    0,                             offsetof(Network, bridge_proxy_arp)
-Bridge.ProxyARPWiFi,                    config_parse_tristate,                               0,                             offsetof(Network, bridge_proxy_arp_wifi)
+Bridge.ProxyARPWiFi,                         config_parse_tristate,                                    0,                             offsetof(Network, bridge_proxy_arp_wifi)
-Bridge.Priority,                        config_parse_bridge_port_priority,                   0,                             offsetof(Network, priority)
+Bridge.Priority,                             config_parse_bridge_port_priority,                        0,                             offsetof(Network, priority)
-Bridge.MulticastRouter,                 config_parse_multicast_router,                       0,                             offsetof(Network, multicast_router)
+Bridge.MulticastRouter,                      config_parse_multicast_router,                            0,                             offsetof(Network, multicast_router)
-BridgeFDB.MACAddress,                   config_parse_fdb_hwaddr,                             0,                             0
+BridgeFDB.MACAddress,                        config_parse_fdb_hwaddr,                                  0,                             0
-BridgeFDB.VLANId,                       config_parse_fdb_vlan_id,                            0,                             0
+BridgeFDB.VLANId,                            config_parse_fdb_vlan_id,                                 0,                             0
-BridgeFDB.Destination,                  config_parse_fdb_destination,                        0,                             0
+BridgeFDB.Destination,                       config_parse_fdb_destination,                             0,                             0
-BridgeFDB.VNI,                          config_parse_fdb_vxlan_vni,                          0,                             0
+BridgeFDB.VNI,                               config_parse_fdb_vxlan_vni,                               0,                             0
-BridgeFDB.AssociatedWith,               config_parse_fdb_ntf_flags,                          0,                             0
+BridgeFDB.AssociatedWith,                    config_parse_fdb_ntf_flags,                               0,                             0
-BridgeVLAN.PVID,                        config_parse_brvlan_pvid,                            0,                             0
+BridgeVLAN.PVID,                             config_parse_brvlan_pvid,                                 0,                             0
-BridgeVLAN.VLAN,                        config_parse_brvlan_vlan,                            0,                             0
+BridgeVLAN.VLAN,                             config_parse_brvlan_vlan,                                 0,                             0
-BridgeVLAN.EgressUntagged,              config_parse_brvlan_untagged,                        0,                             0
+BridgeVLAN.EgressUntagged,                   config_parse_brvlan_untagged,                             0,                             0
-Network.IPv6PrefixDelegation,           config_parse_router_prefix_delegation,               0,                             0
+Network.IPv6PrefixDelegation,                config_parse_router_prefix_delegation,                    0,                             0
-IPv6PrefixDelegation.RouterLifetimeSec, config_parse_sec,                                    0,                             offsetof(Network, router_lifetime_usec)
+IPv6PrefixDelegation.RouterLifetimeSec,      config_parse_sec,                                         0,                             offsetof(Network, router_lifetime_usec)
-IPv6PrefixDelegation.Managed,           config_parse_bool,                                   0,                             offsetof(Network, router_managed)
+IPv6PrefixDelegation.Managed,                config_parse_bool,                                        0,                             offsetof(Network, router_managed)
-IPv6PrefixDelegation.OtherInformation,  config_parse_bool,                                   0,                             offsetof(Network, router_other_information)
+IPv6PrefixDelegation.OtherInformation,       config_parse_bool,                                        0,                             offsetof(Network, router_other_information)
-IPv6PrefixDelegation.RouterPreference,  config_parse_router_preference,                      0,                             0
+IPv6PrefixDelegation.RouterPreference,       config_parse_router_preference,                           0,                             0
-IPv6PrefixDelegation.EmitDNS,           config_parse_bool,                                   0,                             offsetof(Network, router_emit_dns)
+IPv6PrefixDelegation.EmitDNS,                config_parse_bool,                                        0,                             offsetof(Network, router_emit_dns)
-IPv6PrefixDelegation.DNS,               config_parse_radv_dns,                               0,                             0
+IPv6PrefixDelegation.DNS,                    config_parse_radv_dns,                                    0,                             0
-IPv6PrefixDelegation.EmitDomains,       config_parse_bool,                                   0,                             offsetof(Network, router_emit_domains)
+IPv6PrefixDelegation.EmitDomains,            config_parse_bool,                                        0,                             offsetof(Network, router_emit_domains)
-IPv6PrefixDelegation.Domains,           config_parse_radv_search_domains,                    0,                             0
+IPv6PrefixDelegation.Domains,                config_parse_radv_search_domains,                         0,                             0
-IPv6PrefixDelegation.DNSLifetimeSec,    config_parse_sec,                                    0,                             offsetof(Network, router_dns_lifetime_usec)
+IPv6PrefixDelegation.DNSLifetimeSec,         config_parse_sec,                                         0,                             offsetof(Network, router_dns_lifetime_usec)
-IPv6Prefix.Prefix,                      config_parse_prefix,                                 0,                             0
+IPv6Prefix.Prefix,                           config_parse_prefix,                                      0,                             0
-IPv6Prefix.OnLink,                      config_parse_prefix_flags,                           0,                             0
+IPv6Prefix.OnLink,                           config_parse_prefix_flags,                                0,                             0
-IPv6Prefix.AddressAutoconfiguration,    config_parse_prefix_flags,                           0,                             0
+IPv6Prefix.AddressAutoconfiguration,         config_parse_prefix_flags,                                0,                             0
-IPv6Prefix.ValidLifetimeSec,            config_parse_prefix_lifetime,                        0,                             0
+IPv6Prefix.ValidLifetimeSec,                 config_parse_prefix_lifetime,                             0,                             0
-IPv6Prefix.PreferredLifetimeSec,        config_parse_prefix_lifetime,                        0,                             0
+IPv6Prefix.PreferredLifetimeSec,             config_parse_prefix_lifetime,                             0,                             0
-IPv6RoutePrefix.Route,                  config_parse_route_prefix,                           0,                             0
+IPv6RoutePrefix.Route,                       config_parse_route_prefix,                                0,                             0
-IPv6RoutePrefix.LifetimeSec,            config_parse_route_prefix_lifetime,                  0,                             0
+IPv6RoutePrefix.LifetimeSec,                 config_parse_route_prefix_lifetime,                       0,                             0
-CAN.BitRate,                            config_parse_si_uint64,                              0,                             offsetof(Network, can_bitrate)
+CAN.BitRate,                                 config_parse_si_uint64,                                   0,                             offsetof(Network, can_bitrate)
-CAN.SamplePoint,                        config_parse_permille,                               0,                             offsetof(Network, can_sample_point)
+CAN.SamplePoint,                             config_parse_permille,                                    0,                             offsetof(Network, can_sample_point)
-CAN.RestartSec,                         config_parse_sec,                                    0,                             offsetof(Network, can_restart_us)
+CAN.RestartSec,                              config_parse_sec,                                         0,                             offsetof(Network, can_restart_us)
-CAN.TripleSampling,                     config_parse_tristate,                               0,                             offsetof(Network, can_triple_sampling)
+CAN.TripleSampling,                          config_parse_tristate,                                    0,                             offsetof(Network, can_triple_sampling)
-TrafficControlQueueingDiscipline.Parent,                                     config_parse_tc_qdiscs_parent,                               0, 0
+ControlledDelay.Parent,                      config_parse_qdisc_parent,                                QDISC_KIND_CODEL,              0
-TrafficControlQueueingDiscipline.NetworkEmulatorDelaySec,                    config_parse_tc_network_emulator_delay,                      0, 0
+ControlledDelay.PacketLimit,                 config_parse_controlled_delay_u32,                        QDISC_KIND_CODEL,              0
-TrafficControlQueueingDiscipline.NetworkEmulatorDelayJitterSec,              config_parse_tc_network_emulator_delay,                      0, 0
+ControlledDelay.TargetSec,                   config_parse_controlled_delay_usec,                       QDISC_KIND_CODEL,              0
-TrafficControlQueueingDiscipline.NetworkEmulatorLossRate,                    config_parse_tc_network_emulator_rate,                       0, 0
+ControlledDelay.IntervalSec,                 config_parse_controlled_delay_usec,                       QDISC_KIND_CODEL,              0
-TrafficControlQueueingDiscipline.NetworkEmulatorDuplicateRate,               config_parse_tc_network_emulator_rate,                       0, 0
+ControlledDelay.CEThresholdSec,              config_parse_controlled_delay_usec,                       QDISC_KIND_CODEL,              0
-TrafficControlQueueingDiscipline.NetworkEmulatorPacketLimit,                 config_parse_tc_network_emulator_packet_limit,               0, 0
+ControlledDelay.ECN,                         config_parse_controlled_delay_bool,                       QDISC_KIND_CODEL,              0
-TrafficControlQueueingDiscipline.TokenBufferFilterRate,                      config_parse_tc_token_buffer_filter_size,                    0, 0
+FairQueueing.Parent,                         config_parse_qdisc_parent,                                QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.TokenBufferFilterBurst,                     config_parse_tc_token_buffer_filter_size,                    0, 0
+FairQueueing.PacketLimit,                    config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.TokenBufferFilterLimitSize,                 config_parse_tc_token_buffer_filter_size,                    0, 0
+FairQueueing.FlowLimit,                      config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.TokenBufferFilterMTUBytes,                  config_parse_tc_token_buffer_filter_size,                    0, 0
+FairQueueing.Quantum,                        config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.TokenBufferFilterMPUBytes,                  config_parse_tc_token_buffer_filter_size,                    0, 0
+FairQueueing.InitialQuantum,                 config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.TokenBufferFilterPeakRate,                  config_parse_tc_token_buffer_filter_size,                    0, 0
+FairQueueing.MaximumRate,                    config_parse_fair_queue_traffic_policing_max_rate,        QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.TokenBufferFilterLatencySec,                config_parse_tc_token_buffer_filter_latency,                 0, 0
+FairQueueing.Buckets,                        config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.StochasticFairnessQueueingPerturbPeriodSec, config_parse_tc_stochastic_fairness_queueing_perturb_period, 0, 0
+FairQueueing.OrphanMask,                     config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayPacketLimit,      config_parse_tc_fair_queuing_controlled_delay_u32,           0, 0
+FairQueueing.Pacing,                         config_parse_fair_queue_traffic_policing_bool,            QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayMemoryLimit,      config_parse_tc_fair_queuing_controlled_delay_size,          0, 0
+FairQueueing.CEThresholdSec,                 config_parse_fair_queue_traffic_policing_usec,            QDISC_KIND_FQ,                 0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayFlows,            config_parse_tc_fair_queuing_controlled_delay_u32,           0, 0
+FairQueueingControlledDelay.Parent,          config_parse_qdisc_parent,                                QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayQuantum,          config_parse_tc_fair_queuing_controlled_delay_size,          0, 0
+FairQueueingControlledDelay.PacketLimit,     config_parse_fair_queueing_controlled_delay_u32,          QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayTargetSec,        config_parse_tc_fair_queuing_controlled_delay_usec,          0, 0
+FairQueueingControlledDelay.MemoryLimit,     config_parse_fair_queueing_controlled_delay_size,         QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayIntervalSec,      config_parse_tc_fair_queuing_controlled_delay_usec,          0, 0
+FairQueueingControlledDelay.Flows,           config_parse_fair_queueing_controlled_delay_u32,          QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayCEThresholdSec,   config_parse_tc_fair_queuing_controlled_delay_usec,          0, 0
+FairQueueingControlledDelay.Quantum,         config_parse_fair_queueing_controlled_delay_size,         QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueuingControlledDelayECN,              config_parse_tc_fair_queuing_controlled_delay_bool,          0, 0
+FairQueueingControlledDelay.TargetSec,       config_parse_fair_queueing_controlled_delay_usec,         QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingPacketLimit,        config_parse_tc_fair_queue_traffic_policing_u32,             0, 0
+FairQueueingControlledDelay.IntervalSec,     config_parse_fair_queueing_controlled_delay_usec,         QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingFlowLimit,          config_parse_tc_fair_queue_traffic_policing_u32,             0, 0
+FairQueueingControlledDelay.CEThresholdSec,  config_parse_fair_queueing_controlled_delay_usec,         QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingQuantum,            config_parse_tc_fair_queue_traffic_policing_size,            0, 0
+FairQueueingControlledDelay.ECN,             config_parse_fair_queueing_controlled_delay_bool,         QDISC_KIND_FQ_CODEL,           0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingInitialQuantum,     config_parse_tc_fair_queue_traffic_policing_size,            0, 0
+NetworkEmulator.Parent,                      config_parse_qdisc_parent,                                QDISC_KIND_NETEM,              0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingMaximumRate,        config_parse_tc_fair_queue_traffic_policing_max_rate,        0, 0
+NetworkEmulator.DelaySec,                    config_parse_network_emulator_delay,                      QDISC_KIND_NETEM,              0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingBuckets,            config_parse_tc_fair_queue_traffic_policing_u32,             0, 0
+NetworkEmulator.DelayJitterSec,              config_parse_network_emulator_delay,                      QDISC_KIND_NETEM,              0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingOrphanMask,         config_parse_tc_fair_queue_traffic_policing_u32,             0, 0
+NetworkEmulator.LossRate,                    config_parse_network_emulator_rate,                       QDISC_KIND_NETEM,              0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingPacing,             config_parse_tc_fair_queue_traffic_policing_bool,            0, 0
+NetworkEmulator.DuplicateRate,               config_parse_network_emulator_rate,                       QDISC_KIND_NETEM,              0
-TrafficControlQueueingDiscipline.FairQueueTrafficPolicingCEThresholdSec,     config_parse_tc_fair_queue_traffic_policing_usec,            0, 0
+NetworkEmulator.PacketLimit,                 config_parse_network_emulator_packet_limit,               QDISC_KIND_NETEM,              0
-TrafficControlQueueingDiscipline.ControlledDelayPacketLimit,                 config_parse_tc_controlled_delay_u32,                        0, 0
+StochasticFairnessQueueing.Parent,           config_parse_qdisc_parent,                                QDISC_KIND_SFQ,                0
-TrafficControlQueueingDiscipline.ControlledDelayTargetSec,                   config_parse_tc_controlled_delay_usec,                       0, 0
+StochasticFairnessQueueing.PerturbPeriodSec, config_parse_stochastic_fairness_queueing_perturb_period, QDISC_KIND_SFQ,                0
-TrafficControlQueueingDiscipline.ControlledDelayIntervalSec,                 config_parse_tc_controlled_delay_usec,                       0, 0
+TokenBucketFilter.Parent,                    config_parse_qdisc_parent,                                QDISC_KIND_TBF,                0
-TrafficControlQueueingDiscipline.ControlledDelayCEThresholdSec,              config_parse_tc_controlled_delay_usec,                       0, 0
+TokenBucketFilter.Rate,                      config_parse_token_bucket_filter_size,                    QDISC_KIND_TBF,                0
-TrafficControlQueueingDiscipline.ControlledDelayECN,                         config_parse_tc_controlled_delay_bool,                       0, 0
+TokenBucketFilter.Burst,                     config_parse_token_bucket_filter_size,                    QDISC_KIND_TBF,                0
+TokenBucketFilter.LimitSize,                 config_parse_token_bucket_filter_size,                    QDISC_KIND_TBF,                0
+TokenBucketFilter.MTUBytes,                  config_parse_token_bucket_filter_size,                    QDISC_KIND_TBF,                0
+TokenBucketFilter.MPUBytes,                  config_parse_token_bucket_filter_size,                    QDISC_KIND_TBF,                0
+TokenBucketFilter.PeakRate,                  config_parse_token_bucket_filter_size,                    QDISC_KIND_TBF,                0
+TokenBucketFilter.LatencySec,                config_parse_token_bucket_filter_latency,                 QDISC_KIND_TBF,                0
 /* backwards compatibility: do not add new entries to this section */
-Network.IPv4LL,                         config_parse_ipv4ll,                             0,                             offsetof(Network, link_local)
+Network.IPv4LL,                              config_parse_ipv4ll,                                      0,                             offsetof(Network, link_local)
-DHCP.ClientIdentifier,                  config_parse_dhcp_client_identifier,             0,                             offsetof(Network, dhcp_client_identifier)
+DHCP.ClientIdentifier,                       config_parse_dhcp_client_identifier,                      0,                             offsetof(Network, dhcp_client_identifier)
-DHCP.UseDNS,                            config_parse_dhcp_use_dns,                       0,                             0
+DHCP.UseDNS,                                 config_parse_dhcp_use_dns,                                0,                             0
-DHCP.UseNTP,                            config_parse_dhcp_use_ntp,                       0,                             0
+DHCP.UseNTP,                                 config_parse_dhcp_use_ntp,                                0,                             0
-DHCP.UseMTU,                            config_parse_bool,                               0,                             offsetof(Network, dhcp_use_mtu)
+DHCP.UseMTU,                                 config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_mtu)
-DHCP.UseHostname,                       config_parse_bool,                               0,                             offsetof(Network, dhcp_use_hostname)
+DHCP.UseHostname,                            config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_hostname)
-DHCP.UseDomains,                        config_parse_dhcp_use_domains,                   0,                             offsetof(Network, dhcp_use_domains)
+DHCP.UseDomains,                             config_parse_dhcp_use_domains,                            0,                             offsetof(Network, dhcp_use_domains)
-DHCP.UseDomainName,                     config_parse_dhcp_use_domains,                   0,                             offsetof(Network, dhcp_use_domains)
+DHCP.UseDomainName,                          config_parse_dhcp_use_domains,                            0,                             offsetof(Network, dhcp_use_domains)
-DHCP.UseRoutes,                         config_parse_bool,                               0,                             offsetof(Network, dhcp_use_routes)
+DHCP.UseRoutes,                              config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_routes)
-DHCP.Anonymize,                         config_parse_bool,                               0,                             offsetof(Network, dhcp_anonymize)
+DHCP.Anonymize,                              config_parse_bool,                                        0,                             offsetof(Network, dhcp_anonymize)
-DHCP.SendHostname,                      config_parse_bool,                               0,                             offsetof(Network, dhcp_send_hostname)
+DHCP.SendHostname,                           config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_hostname)
-DHCP.Hostname,                          config_parse_hostname,                           0,                             offsetof(Network, dhcp_hostname)
+DHCP.Hostname,                               config_parse_hostname,                                    0,                             offsetof(Network, dhcp_hostname)
-DHCP.RequestBroadcast,                  config_parse_bool,                               0,                             offsetof(Network, dhcp_broadcast)
+DHCP.RequestBroadcast,                       config_parse_bool,                                        0,                             offsetof(Network, dhcp_broadcast)
-DHCP.CriticalConnection,                config_parse_tristate,                           0,                             offsetof(Network, dhcp_critical)
+DHCP.CriticalConnection,                     config_parse_tristate,                                    0,                             offsetof(Network, dhcp_critical)
-DHCP.VendorClassIdentifier,             config_parse_string,                             0,                             offsetof(Network, dhcp_vendor_class_identifier)
+DHCP.VendorClassIdentifier,                  config_parse_string,                                      0,                             offsetof(Network, dhcp_vendor_class_identifier)
-DHCP.UserClass,                         config_parse_dhcp_user_class,                    0,                             offsetof(Network, dhcp_user_class)
+DHCP.UserClass,                              config_parse_dhcp_user_class,                             0,                             offsetof(Network, dhcp_user_class)
-DHCP.DUIDType,                          config_parse_duid_type,                          0,                             offsetof(Network, duid)
+DHCP.DUIDType,                               config_parse_duid_type,                                   0,                             offsetof(Network, duid)
-DHCP.DUIDRawData,                       config_parse_duid_rawdata,                       0,                             offsetof(Network, duid)
+DHCP.DUIDRawData,                            config_parse_duid_rawdata,                                0,                             offsetof(Network, duid)
-DHCP.RouteMetric,                       config_parse_unsigned,                           0,                             offsetof(Network, dhcp_route_metric)
+DHCP.RouteMetric,                            config_parse_unsigned,                                    0,                             offsetof(Network, dhcp_route_metric)
-DHCP.RouteTable,                        config_parse_section_route_table,                0,                             0
+DHCP.RouteTable,                             config_parse_section_route_table,                         0,                             0
-DHCP.UseTimezone,                       config_parse_bool,                               0,                             offsetof(Network, dhcp_use_timezone)
+DHCP.UseTimezone,                            config_parse_bool,                                        0,                             offsetof(Network, dhcp_use_timezone)
-DHCP.IAID,                              config_parse_iaid,                               0,                             0
+DHCP.IAID,                                   config_parse_iaid,                                        0,                             0
-DHCP.ListenPort,                        config_parse_uint16,                             0,                             offsetof(Network, dhcp_client_port)
+DHCP.ListenPort,                             config_parse_uint16,                                      0,                             offsetof(Network, dhcp_client_port)
-DHCP.RapidCommit,                       config_parse_bool,                               0,                             offsetof(Network, rapid_commit)
+DHCP.RapidCommit,                            config_parse_bool,                                        0,                             offsetof(Network, rapid_commit)
-DHCP.ForceDHCPv6PDOtherInformation,     config_parse_bool,                               0,                             offsetof(Network, dhcp6_force_pd_other_information)
+DHCP.ForceDHCPv6PDOtherInformation,          config_parse_bool,                                        0,                             offsetof(Network, dhcp6_force_pd_other_information)
-DHCPv4.UseDomainName,                   config_parse_dhcp_use_domains,                   0,                             offsetof(Network, dhcp_use_domains)
+DHCPv4.UseDomainName,                        config_parse_dhcp_use_domains,                            0,                             offsetof(Network, dhcp_use_domains)
-DHCPv4.CriticalConnection,              config_parse_tristate,                           0,                             offsetof(Network, dhcp_critical)
+DHCPv4.CriticalConnection,                   config_parse_tristate,                                    0,                             offsetof(Network, dhcp_critical)
+TrafficControlQueueingDiscipline.Parent,                        config_parse_qdisc_parent,             QDISC_KIND_NETEM,              0
+TrafficControlQueueingDiscipline.NetworkEmulatorDelaySec,       config_parse_network_emulator_delay,   0,                             0
+TrafficControlQueueingDiscipline.NetworkEmulatorDelayJitterSec, config_parse_network_emulator_delay,   0,                             0
+TrafficControlQueueingDiscipline.NetworkEmulatorLossRate,       config_parse_network_emulator_rate,    0,                             0
+TrafficControlQueueingDiscipline.NetworkEmulatorDuplicateRate,  config_parse_network_emulator_rate,    0,                             0
+TrafficControlQueueingDiscipline.NetworkEmulatorPacketLimit,    config_parse_network_emulator_packet_limit, 0,                        0

src/network/networkd-network.c

@@ -481,7 +481,13 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
                               "IPv6Prefix\0"
                               "IPv6RoutePrefix\0"
                               "TrafficControlQueueingDiscipline\0"
-                              "CAN\0",
+                              "CAN\0"
+                              "ControlledDelay\0"
+                              "FairQueueing\0"
+                              "FairQueueingControlledDelay\0"
+                              "NetworkEmulator\0"
+                              "StochasticFairnessQueueing\0"
+                              "TokenBucketFilter\0",
                               config_item_perf_lookup, network_network_gperf_lookup,
                               CONFIG_PARSE_WARN, network);
         if (r < 0)

src/network/networkd-route.c

@@ -1006,7 +1006,7 @@ int config_parse_gateway(
                 if (r < 0)
                         return r;
 
-                if (streq(rvalue, "dhcp")) {
+                if (streq(rvalue, "_dhcp")) {
                         n->gateway_from_dhcp = true;
                         TAKE_PTR(n);
                         return 0;

src/network/tc/codel.c

@@ -74,7 +74,7 @@ static int controlled_delay_fill_message(Link *link, QDisc *qdisc, sd_netlink_me
         return 0;
 }
 
-int config_parse_tc_controlled_delay_u32(
+int config_parse_controlled_delay_u32(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -125,7 +125,7 @@ int config_parse_tc_controlled_delay_u32(
         return 0;
 }
 
-int config_parse_tc_controlled_delay_usec(
+int config_parse_controlled_delay_usec(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -157,17 +157,17 @@ int config_parse_tc_controlled_delay_usec(
 
         cd = CODEL(qdisc);
 
-        if (streq(lvalue, "ControlledDelayTargetSec"))
+        if (streq(lvalue, "TargetSec"))
                 p = &cd->target_usec;
-        else if (streq(lvalue, "ControlledDelayIntervalSec"))
+        else if (streq(lvalue, "IntervalSec"))
                 p = &cd->interval_usec;
-        else if (streq(lvalue, "ControlledDelayCEThresholdSec"))
+        else if (streq(lvalue, "CEThresholdSec"))
                 p = &cd->ce_threshold_usec;
         else
                 assert_not_reached("Invalid lvalue");
 
         if (isempty(rvalue)) {
-                if (streq(lvalue, "ControlledDelayCEThresholdSec"))
+                if (streq(lvalue, "CEThresholdSec"))
                         *p = USEC_INFINITY;
                 else
                         *p = 0;
@@ -189,7 +189,7 @@ int config_parse_tc_controlled_delay_usec(
         return 0;
 }
 
-int config_parse_tc_controlled_delay_bool(
+int config_parse_controlled_delay_bool(
                 const char *unit,
                 const char *filename,
                 unsigned line,

src/network/tc/codel.h

@@ -19,6 +19,6 @@ typedef struct ControlledDelay {
 DEFINE_QDISC_CAST(CODEL, ControlledDelay);
 extern const QDiscVTable codel_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_u32);
+CONFIG_PARSER_PROTOTYPE(config_parse_controlled_delay_u32);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_usec);
+CONFIG_PARSER_PROTOTYPE(config_parse_controlled_delay_usec);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_bool);
+CONFIG_PARSER_PROTOTYPE(config_parse_controlled_delay_bool);

src/network/tc/fq-codel.c

@@ -10,8 +10,8 @@
 #include "qdisc.h"
 #include "string-util.h"
 
-static int fair_queuing_controlled_delay_init(QDisc *qdisc) {
+static int fair_queueing_controlled_delay_init(QDisc *qdisc) {
-        FairQueuingControlledDelay *fqcd;
+        FairQueueingControlledDelay *fqcd;
 
         assert(qdisc);
 
@@ -24,8 +24,8 @@ static int fair_queuing_controlled_delay_init(QDisc *qdisc) {
         return 0;
 }
 
-static int fair_queuing_controlled_delay_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
+static int fair_queueing_controlled_delay_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
-        FairQueuingControlledDelay *fqcd;
+        FairQueueingControlledDelay *fqcd;
         int r;
 
         assert(link);
@@ -93,7 +93,7 @@ static int fair_queuing_controlled_delay_fill_message(Link *link, QDisc *qdisc,
         return 0;
 }
 
-int config_parse_tc_fair_queuing_controlled_delay_u32(
+int config_parse_fair_queueing_controlled_delay_u32(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -106,7 +106,7 @@ int config_parse_tc_fair_queuing_controlled_delay_u32(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueuingControlledDelay *fqcd;
+        FairQueueingControlledDelay *fqcd;
         Network *network = data;
         uint32_t *p;
         int r;
@@ -125,9 +125,9 @@ int config_parse_tc_fair_queuing_controlled_delay_u32(
 
         fqcd = FQ_CODEL(qdisc);
 
-        if (streq(lvalue, "FairQueuingControlledDelayPacketLimit"))
+        if (streq(lvalue, "PacketLimit"))
                 p = &fqcd->packet_limit;
-        else if (streq(lvalue, "FairQueuingControlledDelayFlows"))
+        else if (streq(lvalue, "Flows"))
                 p = &fqcd->flows;
         else
                 assert_not_reached("Invalid lvalue.");
@@ -152,7 +152,7 @@ int config_parse_tc_fair_queuing_controlled_delay_u32(
         return 0;
 }
 
-int config_parse_tc_fair_queuing_controlled_delay_usec(
+int config_parse_fair_queueing_controlled_delay_usec(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -165,7 +165,7 @@ int config_parse_tc_fair_queuing_controlled_delay_usec(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueuingControlledDelay *fqcd;
+        FairQueueingControlledDelay *fqcd;
         Network *network = data;
         usec_t *p;
         int r;
@@ -184,17 +184,17 @@ int config_parse_tc_fair_queuing_controlled_delay_usec(
 
         fqcd = FQ_CODEL(qdisc);
 
-        if (streq(lvalue, "FairQueuingControlledDelayTargetSec"))
+        if (streq(lvalue, "TargetSec"))
                 p = &fqcd->target_usec;
-        else if (streq(lvalue, "FairQueuingControlledDelayIntervalSec"))
+        else if (streq(lvalue, "IntervalSec"))
                 p = &fqcd->interval_usec;
-        else if (streq(lvalue, "FairQueuingControlledDelayCEThresholdSec"))
+        else if (streq(lvalue, "CEThresholdSec"))
                 p = &fqcd->ce_threshold_usec;
         else
                 assert_not_reached("Invalid lvalue.");
 
         if (isempty(rvalue)) {
-                if (streq(lvalue, "FairQueuingControlledDelayCEThresholdSec"))
+                if (streq(lvalue, "CEThresholdSec"))
                         *p = USEC_INFINITY;
                 else
                         *p = 0;
@@ -216,7 +216,7 @@ int config_parse_tc_fair_queuing_controlled_delay_usec(
         return 0;
 }
 
-int config_parse_tc_fair_queuing_controlled_delay_bool(
+int config_parse_fair_queueing_controlled_delay_bool(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -229,7 +229,7 @@ int config_parse_tc_fair_queuing_controlled_delay_bool(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueuingControlledDelay *fqcd;
+        FairQueueingControlledDelay *fqcd;
         Network *network = data;
         int r;
 
@@ -268,7 +268,7 @@ int config_parse_tc_fair_queuing_controlled_delay_bool(
         return 0;
 }
 
-int config_parse_tc_fair_queuing_controlled_delay_size(
+int config_parse_fair_queueing_controlled_delay_size(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -281,7 +281,7 @@ int config_parse_tc_fair_queuing_controlled_delay_size(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueuingControlledDelay *fqcd;
+        FairQueueingControlledDelay *fqcd;
         Network *network = data;
         uint64_t sz;
         uint32_t *p;
@@ -301,15 +301,15 @@ int config_parse_tc_fair_queuing_controlled_delay_size(
 
         fqcd = FQ_CODEL(qdisc);
 
-        if (streq(lvalue, "FairQueuingControlledDelayMemoryLimit"))
+        if (streq(lvalue, "MemoryLimit"))
                 p = &fqcd->memory_limit;
-        else if (streq(lvalue, "FairQueuingControlledDelayQuantum"))
+        else if (streq(lvalue, "Quantum"))
                 p = &fqcd->quantum;
         else
                 assert_not_reached("Invalid lvalue.");
 
         if (isempty(rvalue)) {
-                if (streq(lvalue, "FairQueuingControlledMemoryLimit"))
+                if (streq(lvalue, "MemoryLimit"))
                         *p = UINT32_MAX;
                 else
                         *p = 0;
@@ -339,8 +339,8 @@ int config_parse_tc_fair_queuing_controlled_delay_size(
 }
 
 const QDiscVTable fq_codel_vtable = {
-        .object_size = sizeof(FairQueuingControlledDelay),
+        .object_size = sizeof(FairQueueingControlledDelay),
         .tca_kind = "fq_codel",
-        .init = fair_queuing_controlled_delay_init,
+        .init = fair_queueing_controlled_delay_init,
-        .fill_message = fair_queuing_controlled_delay_fill_message,
+        .fill_message = fair_queueing_controlled_delay_fill_message,
 };

src/network/tc/fq-codel.h

@@ -6,7 +6,7 @@
 #include "qdisc.h"
 #include "time-util.h"
 
-typedef struct FairQueuingControlledDelay {
+typedef struct FairQueueingControlledDelay {
         QDisc meta;
 
         uint32_t packet_limit;
@@ -17,12 +17,12 @@ typedef struct FairQueuingControlledDelay {
         usec_t interval_usec;
         usec_t ce_threshold_usec;
         int ecn;
-} FairQueuingControlledDelay;
+} FairQueueingControlledDelay;
 
-DEFINE_QDISC_CAST(FQ_CODEL, FairQueuingControlledDelay);
+DEFINE_QDISC_CAST(FQ_CODEL, FairQueueingControlledDelay);
 extern const QDiscVTable fq_codel_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queuing_controlled_delay_u32);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_controlled_delay_u32);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queuing_controlled_delay_usec);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_controlled_delay_usec);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queuing_controlled_delay_bool);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_controlled_delay_bool);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queuing_controlled_delay_size);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queueing_controlled_delay_size);

src/network/tc/fq.c

@@ -12,7 +12,7 @@
 #include "util.h"
 
 static int fair_queue_traffic_policing_init(QDisc *qdisc) {
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
 
         assert(qdisc);
 
@@ -25,7 +25,7 @@ static int fair_queue_traffic_policing_init(QDisc *qdisc) {
 }
 
 static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         int r;
 
         assert(link);
@@ -102,7 +102,7 @@ static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_u32(
+int config_parse_fair_queue_traffic_policing_u32(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -115,7 +115,7 @@ int config_parse_tc_fair_queue_traffic_policing_u32(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint32_t *p;
         int r;
@@ -134,13 +134,13 @@ int config_parse_tc_fair_queue_traffic_policing_u32(
 
         fq = FQ(qdisc);
 
-        if (streq(lvalue, "FairQueueTrafficPolicingPacketLimit"))
+        if (streq(lvalue, "PacketLimit"))
                 p = &fq->packet_limit;
-        else if (streq(lvalue, "FairQueueTrafficPolicingFlowLimit"))
+        else if (streq(lvalue, "FlowLimit"))
                 p = &fq->flow_limit;
-        else if (streq(lvalue, "FairQueueTrafficPolicingBuckets"))
+        else if (streq(lvalue, "Buckets"))
                 p = &fq->buckets;
-        else if (streq(lvalue, "FairQueueTrafficPolicingOrphanMask"))
+        else if (streq(lvalue, "OrphanMask"))
                 p = &fq->orphan_mask;
         else
                 assert_not_reached("Invalid lvalue");
@@ -165,7 +165,7 @@ int config_parse_tc_fair_queue_traffic_policing_u32(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_size(
+int config_parse_fair_queue_traffic_policing_size(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -178,7 +178,7 @@ int config_parse_tc_fair_queue_traffic_policing_size(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint64_t sz;
         uint32_t *p;
@@ -198,9 +198,9 @@ int config_parse_tc_fair_queue_traffic_policing_size(
 
         fq = FQ(qdisc);
 
-        if (streq(lvalue, "FairQueueTrafficPolicingQuantum"))
+        if (streq(lvalue, "Quantum"))
                 p = &fq->quantum;
-        else if (streq(lvalue, "FairQueueTrafficPolicingInitialQuantum"))
+        else if (streq(lvalue, "InitialQuantum"))
                 p = &fq->initial_quantum;
         else
                 assert_not_reached("Invalid lvalue");
@@ -232,7 +232,7 @@ int config_parse_tc_fair_queue_traffic_policing_size(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_bool(
+int config_parse_fair_queue_traffic_policing_bool(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -245,7 +245,7 @@ int config_parse_tc_fair_queue_traffic_policing_bool(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         int r;
 
@@ -284,7 +284,7 @@ int config_parse_tc_fair_queue_traffic_policing_bool(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_usec(
+int config_parse_fair_queue_traffic_policing_usec(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -297,7 +297,7 @@ int config_parse_tc_fair_queue_traffic_policing_usec(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         usec_t sec;
         int r;
@@ -343,7 +343,7 @@ int config_parse_tc_fair_queue_traffic_policing_usec(
         return 0;
 }
 
-int config_parse_tc_fair_queue_traffic_policing_max_rate(
+int config_parse_fair_queue_traffic_policing_max_rate(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -356,7 +356,7 @@ int config_parse_tc_fair_queue_traffic_policing_max_rate(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint64_t sz;
         int r;
@@ -404,7 +404,7 @@ int config_parse_tc_fair_queue_traffic_policing_max_rate(
 
 const QDiscVTable fq_vtable = {
         .init = fair_queue_traffic_policing_init,
-        .object_size = sizeof(FairQueueTrafficPolicing),
+        .object_size = sizeof(FairQueueing),
         .tca_kind = "fq",
         .fill_message = fair_queue_traffic_policing_fill_message,
 };

src/network/tc/fq.h

@@ -5,7 +5,7 @@
 #include "conf-parser.h"
 #include "qdisc.h"
 
-typedef struct FairQueueTrafficPolicing {
+typedef struct FairQueueing {
         QDisc meta;
 
         uint32_t packet_limit;
@@ -17,13 +17,13 @@ typedef struct FairQueueTrafficPolicing {
         uint32_t orphan_mask;
         int pacing;
         usec_t ce_threshold_usec;
-} FairQueueTrafficPolicing;
+} FairQueueing;
 
-DEFINE_QDISC_CAST(FQ, FairQueueTrafficPolicing);
+DEFINE_QDISC_CAST(FQ, FairQueueing);
 extern const QDiscVTable fq_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queue_traffic_policing_u32);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_u32);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queue_traffic_policing_size);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_size);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queue_traffic_policing_bool);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_bool);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queue_traffic_policing_usec);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_usec);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queue_traffic_policing_max_rate);
+CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_max_rate);

src/network/tc/netem.c

@@ -10,7 +10,7 @@
 #include "networkd-manager.h"
 #include "parse-util.h"
 #include "qdisc.h"
-#include "string-util.h"
+#include "strv.h"
 #include "tc-util.h"
 
 static int network_emulator_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
@@ -54,7 +54,7 @@ static int network_emulator_fill_message(Link *link, QDisc *qdisc, sd_netlink_me
         return 0;
 }
 
-int config_parse_tc_network_emulator_delay(
+int config_parse_network_emulator_delay(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -87,9 +87,9 @@ int config_parse_tc_network_emulator_delay(
         ne = NETEM(qdisc);
 
         if (isempty(rvalue)) {
-                if (streq(lvalue, "NetworkEmulatorDelaySec"))
+                if (STR_IN_SET(lvalue, "DelaySec", "NetworkEmulatorDelaySec"))
                         ne->delay = USEC_INFINITY;
-                else if (streq(lvalue, "NetworkEmulatorDelayJitterSec"))
+                else if (STR_IN_SET(lvalue, "DelayJitterSec", "NetworkEmulatorDelayJitterSec"))
                         ne->jitter = USEC_INFINITY;
 
                 qdisc = NULL;
@@ -104,9 +104,9 @@ int config_parse_tc_network_emulator_delay(
                 return 0;
         }
 
-        if (streq(lvalue, "NetworkEmulatorDelaySec"))
+        if (STR_IN_SET(lvalue, "DelaySec", "NetworkEmulatorDelaySec"))
                 ne->delay = u;
-        else if (streq(lvalue, "NetworkEmulatorDelayJitterSec"))
+        else if (STR_IN_SET(lvalue, "DelayJitterSec", "NetworkEmulatorDelayJitterSec"))
                 ne->jitter = u;
 
         qdisc = NULL;
@@ -114,7 +114,7 @@ int config_parse_tc_network_emulator_delay(
         return 0;
 }
 
-int config_parse_tc_network_emulator_rate(
+int config_parse_network_emulator_rate(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -147,9 +147,9 @@ int config_parse_tc_network_emulator_rate(
         ne = NETEM(qdisc);
 
         if (isempty(rvalue)) {
-                if (streq(lvalue, "NetworkEmulatorLossRate"))
+                if (STR_IN_SET(lvalue, "LossRate", "NetworkEmulatorLossRate"))
                         ne->loss = 0;
-                else if (streq(lvalue, "NetworkEmulatorDuplicateRate"))
+                else if (STR_IN_SET(lvalue, "DuplicateRate", "NetworkEmulatorDuplicateRate"))
                         ne->duplicate = 0;
 
                 qdisc = NULL;
@@ -164,16 +164,16 @@ int config_parse_tc_network_emulator_rate(
                 return 0;
         }
 
-        if (streq(lvalue, "NetworkEmulatorLossRate"))
+        if (STR_IN_SET(lvalue, "LossRate", "NetworkEmulatorLossRate"))
                 ne->loss = rate;
-        else if (streq(lvalue, "NetworkEmulatorDuplicateRate"))
+        else if (STR_IN_SET(lvalue, "DuplicateRate", "NetworkEmulatorDuplicateRate"))
                 ne->duplicate = rate;
 
         qdisc = NULL;
         return 0;
 }
 
-int config_parse_tc_network_emulator_packet_limit(
+int config_parse_network_emulator_packet_limit(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -214,8 +214,8 @@ int config_parse_tc_network_emulator_packet_limit(
         r = safe_atou(rvalue, &ne->limit);
         if (r < 0) {
                 log_syntax(unit, LOG_ERR, filename, line, r,
-                           "Failed to parse 'NetworkEmulatorPacketLimit=', ignoring assignment: %s",
+                           "Failed to parse '%s=', ignoring assignment: %s",
-                           rvalue);
+                           lvalue, rvalue);
                 return 0;
         }
 

src/network/tc/netem.h

@@ -20,6 +20,6 @@ typedef struct NetworkEmulator {
 DEFINE_QDISC_CAST(NETEM, NetworkEmulator);
 extern const QDiscVTable netem_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_delay);
+CONFIG_PARSER_PROTOTYPE(config_parse_network_emulator_delay);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_rate);
+CONFIG_PARSER_PROTOTYPE(config_parse_network_emulator_rate);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_network_emulator_packet_limit);
+CONFIG_PARSER_PROTOTYPE(config_parse_network_emulator_packet_limit);

src/network/tc/qdisc.c

@@ -234,7 +234,7 @@ int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact) {
         return 0;
 }
 
-int config_parse_tc_qdiscs_parent(
+int config_parse_qdisc_parent(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -254,8 +254,9 @@ int config_parse_tc_qdiscs_parent(
         assert(lvalue);
         assert(rvalue);
         assert(data);
+        assert(ltype >= 0 && ltype < _QDISC_KIND_MAX);
 
-        r = qdisc_new_static(_QDISC_KIND_INVALID, network, filename, section_line, &qdisc);
+        r = qdisc_new_static(ltype, network, filename, section_line, &qdisc);
         if (r < 0)
                 return r;
 

src/network/tc/qdisc.h

@@ -63,7 +63,7 @@ int qdisc_section_verify(QDisc *qdisc, bool *has_root, bool *has_clsact);
 
 DEFINE_NETWORK_SECTION_FUNCTIONS(QDisc, qdisc_free);
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_qdiscs_parent);
+CONFIG_PARSER_PROTOTYPE(config_parse_qdisc_parent);
 
 #include "codel.h"
 #include "fq-codel.h"

src/network/tc/sfq.c

@@ -31,7 +31,7 @@ static int stochastic_fairness_queueing_fill_message(Link *link, QDisc *qdisc, s
         return 0;
 }
 
-int config_parse_tc_stochastic_fairness_queueing_perturb_period(
+int config_parse_stochastic_fairness_queueing_perturb_period(
                 const char *unit,
                 const char *filename,
                 unsigned line,

src/network/tc/sfq.h

@@ -15,4 +15,4 @@ typedef struct StochasticFairnessQueueing {
 DEFINE_QDISC_CAST(SFQ, StochasticFairnessQueueing);
 extern const QDiscVTable sfq_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_stochastic_fairness_queueing_perturb_period);
+CONFIG_PARSER_PROTOTYPE(config_parse_stochastic_fairness_queueing_perturb_period);

src/network/tc/tbf.c

@@ -15,10 +15,10 @@
 #include "tc-util.h"
 #include "util.h"
 
-static int token_buffer_filter_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
+static int token_bucket_filter_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
         uint32_t rtab[256], ptab[256];
         struct tc_tbf_qopt opt = {};
-        TokenBufferFilter *tbf;
+        TokenBucketFilter *tbf;
         int r;
 
         assert(link);
@@ -110,7 +110,7 @@ static int token_buffer_filter_fill_message(Link *link, QDisc *qdisc, sd_netlink
         return 0;
 }
 
-int config_parse_tc_token_buffer_filter_size(
+int config_parse_token_bucket_filter_size(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -124,7 +124,7 @@ int config_parse_tc_token_buffer_filter_size(
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
-        TokenBufferFilter *tbf;
+        TokenBucketFilter *tbf;
         uint64_t k;
         int r;
 
@@ -143,17 +143,17 @@ int config_parse_tc_token_buffer_filter_size(
         tbf = TBF(qdisc);
 
         if (isempty(rvalue)) {
-                if (streq(lvalue, "TokenBufferFilterRate"))
+                if (streq(lvalue, "Rate"))
                         tbf->rate = 0;
-                else if (streq(lvalue, "TokenBufferFilterBurst"))
+                else if (streq(lvalue, "Burst"))
                         tbf->burst = 0;
-                else if (streq(lvalue, "TokenBufferFilterLimitSize"))
+                else if (streq(lvalue, "LimitSize"))
                         tbf->limit = 0;
-                else if (streq(lvalue, "TokenBufferFilterMTUBytes"))
+                else if (streq(lvalue, "MTUBytes"))
                         tbf->mtu = 0;
-                else if (streq(lvalue, "TokenBufferFilterMPUBytes"))
+                else if (streq(lvalue, "MPUBytes"))
                         tbf->mpu = 0;
-                else if (streq(lvalue, "TokenBufferFilterPeakRate"))
+                else if (streq(lvalue, "PeakRate"))
                         tbf->peak_rate = 0;
 
                 qdisc = NULL;
@@ -168,17 +168,17 @@ int config_parse_tc_token_buffer_filter_size(
                 return 0;
         }
 
-        if (streq(lvalue, "TokenBufferFilterRate"))
+        if (streq(lvalue, "Rate"))
                 tbf->rate = k / 8;
-        else if (streq(lvalue, "TokenBufferFilterBurst"))
+        else if (streq(lvalue, "Burst"))
                 tbf->burst = k;
-        else if (streq(lvalue, "TokenBufferFilterLimitSize"))
+        else if (streq(lvalue, "LimitSize"))
                 tbf->limit = k;
-        else if (streq(lvalue, "TokenBufferFilterMPUBytes"))
+        else if (streq(lvalue, "MPUBytes"))
                 tbf->mpu = k;
-        else if (streq(lvalue, "TokenBufferFilterMTUBytes"))
+        else if (streq(lvalue, "MTUBytes"))
                 tbf->mtu = k;
-        else if (streq(lvalue, "TokenBufferFilterPeakRate"))
+        else if (streq(lvalue, "PeakRate"))
                 tbf->peak_rate = k / 8;
 
         qdisc = NULL;
@@ -186,7 +186,7 @@ int config_parse_tc_token_buffer_filter_size(
         return 0;
 }
 
-int config_parse_tc_token_buffer_filter_latency(
+int config_parse_token_bucket_filter_latency(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -200,7 +200,7 @@ int config_parse_tc_token_buffer_filter_latency(
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
         Network *network = data;
-        TokenBufferFilter *tbf;
+        TokenBucketFilter *tbf;
         usec_t u;
         int r;
 
@@ -240,45 +240,45 @@ int config_parse_tc_token_buffer_filter_latency(
         return 0;
 }
 
-static int token_buffer_filter_verify(QDisc *qdisc) {
+static int token_bucket_filter_verify(QDisc *qdisc) {
-        TokenBufferFilter *tbf = TBF(qdisc);
+        TokenBucketFilter *tbf = TBF(qdisc);
 
         if (tbf->limit > 0 && tbf->latency > 0)
                 return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                         "%s: Specifying both TokenBufferFilterLimitSize= and TokenBufferFilterLatencySec= is not allowed. "
+                                         "%s: Specifying both LimitSize= and LatencySec= is not allowed. "
-                                         "Ignoring [TrafficControlQueueingDiscipline] section from line %u.",
+                                         "Ignoring [TokenBucketFilter] section from line %u.",
                                          qdisc->section->filename, qdisc->section->line);
 
         if (tbf->limit == 0 && tbf->latency == 0)
                 return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                         "%s: Either TokenBufferFilterLimitSize= or TokenBufferFilterLatencySec= is required. "
+                                         "%s: Either LimitSize= or LatencySec= is required. "
-                                         "Ignoring [TrafficControlQueueingDiscipline] section from line %u.",
+                                         "Ignoring [TokenBucketFilter] section from line %u.",
                                          qdisc->section->filename, qdisc->section->line);
 
         if (tbf->rate == 0)
                 return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                         "%s: TokenBufferFilterRate= is mandatory. "
+                                         "%s: Rate= is mandatory. "
-                                         "Ignoring [TrafficControlQueueingDiscipline] section from line %u.",
+                                         "Ignoring [TokenBucketFilter] section from line %u.",
                                          qdisc->section->filename, qdisc->section->line);
 
         if (tbf->burst == 0)
                 return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                         "%s: TokenBufferFilterBurst= is mandatory. "
+                                         "%s: Burst= is mandatory. "
-                                         "Ignoring [TrafficControlQueueingDiscipline] section from line %u.",
+                                         "Ignoring [TokenBucketFilter] section from line %u.",
                                          qdisc->section->filename, qdisc->section->line);
 
         if (tbf->peak_rate > 0 && tbf->mtu == 0)
                 return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
-                                         "%s: TokenBufferFilterMTUBytes= is mandatory when TokenBufferFilterPeakRate= is specified. "
+                                         "%s: MTUBytes= is mandatory when PeakRate= is specified. "
-                                         "Ignoring [TrafficControlQueueingDiscipline] section from line %u.",
+                                         "Ignoring [TokenBucketFilter] section from line %u.",
                                          qdisc->section->filename, qdisc->section->line);
 
         return 0;
 }
 
 const QDiscVTable tbf_vtable = {
-        .object_size = sizeof(TokenBufferFilter),
+        .object_size = sizeof(TokenBucketFilter),
         .tca_kind = "tbf",
-        .fill_message = token_buffer_filter_fill_message,
+        .fill_message = token_bucket_filter_fill_message,
-        .verify = token_buffer_filter_verify
+        .verify = token_bucket_filter_verify
 };

src/network/tc/tbf.h

@@ -6,7 +6,7 @@
 #include "qdisc.h"
 #include "time-util.h"
 
-typedef struct TokenBufferFilter {
+typedef struct TokenBucketFilter {
         QDisc meta;
 
         uint64_t rate;
@@ -16,10 +16,10 @@ typedef struct TokenBufferFilter {
         usec_t latency;
         size_t limit;
         size_t mpu;
-} TokenBufferFilter;
+} TokenBucketFilter;
 
-DEFINE_QDISC_CAST(TBF, TokenBufferFilter);
+DEFINE_QDISC_CAST(TBF, TokenBucketFilter);
 extern const QDiscVTable tbf_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_token_buffer_filter_latency);
+CONFIG_PARSER_PROTOTYPE(config_parse_token_bucket_filter_latency);
-CONFIG_PARSER_PROTOTYPE(config_parse_tc_token_buffer_filter_size);
+CONFIG_PARSER_PROTOTYPE(config_parse_token_bucket_filter_size);

test/fuzz/fuzz-network-parser/directives.network

@@ -270,6 +270,53 @@ SendOption=
 [NextHop]
 Id=
 Gateway=
+[NetworkEmulator]
+Parent=
+DelaySec=
+DelayJitterSec=
+LossRate=
+DuplicateRate=
+PacketLimit=
+[TokenBucketFilter]
+Parent=
+Rate=
+Burst=
+LimitSize=
+MTUBytes=
+MPUBytes=
+PeakRate=
+LatencySec=
+[StochasticFairnessQueueing]
+Parent=
+PerturbPeriodSec=
+[FairQueueingControlledDelay]
+Parent=
+PacketLimit=
+MemoryLimit=
+Flows=
+Quantum=
+TargetSec=
+IntervalSec=
+CEThresholdSec=
+ECN=
+[FairQueueing]
+Parent=
+PacketLimit=
+FlowLimit=
+Quantum=
+InitialQuantum=
+MaximumRate=
+Buckets=
+OrphanMask=
+Pacing=
+CEThresholdSec=
+[ControlledDelay]
+Parent=
+PacketLimit=
+TargetSec=
+IntervalSec=
+CEThresholdSec=
+ECN=
 [TrafficControlQueueingDiscipline]
 Parent=
 NetworkEmulatorDelaySec=
@@ -277,33 +324,3 @@ NetworkEmulatorDelayJitterSec=
 NetworkEmulatorLossRate=
 NetworkEmulatorDuplicateRate=
 NetworkEmulatorPacketLimit=
-TokenBufferFilterRate=
-TokenBufferFilterBurst=
-TokenBufferFilterLimitSize=
-TokenBufferFilterMTUBytes=
-TokenBufferFilterMPUBytes=
-TokenBufferFilterPeakRate=
-TokenBufferFilterLatencySec=
-StochasticFairnessQueueingPerturbPeriodSec=
-FairQueuingControlledDelayPacketLimit=
-FairQueuingControlledDelayMemoryLimit=
-FairQueuingControlledDelayFlows=
-FairQueuingControlledDelayQuantum=
-FairQueuingControlledDelayTargetSec=
-FairQueuingControlledDelayIntervalSec=
-FairQueuingControlledDelayCEThresholdSec=
-FairQueuingControlledDelayECN=
-FairQueueTrafficPolicingPacketLimit=
-FairQueueTrafficPolicingFlowLimit=
-FairQueueTrafficPolicingQuantum=
-FairQueueTrafficPolicingInitialQuantum=
-FairQueueTrafficPolicingMaximumRate=
-FairQueueTrafficPolicingBuckets=
-FairQueueTrafficPolicingOrphanMask=
-FairQueueTrafficPolicingPacing=
-FairQueueTrafficPolicingCEThresholdSec=
-ControlledDelayPacketLimit=
-ControlledDelayTargetSec=
-ControlledDelayIntervalSec=
-ControlledDelayCEThresholdSec=
-ControlledDelayECN=

test/test-network/conf/25-qdisc-fq-codel.network

@@ -5,22 +5,22 @@ Name=dummy98
 IPv6AcceptRA=no
 Address=10.1.2.3/16
 
-[TrafficControlQueueingDiscipline]
+[FairQueueing]
 Parent=root
-FairQueueTrafficPolicingPacketLimit=1000
+PacketLimit=1000
-FairQueueTrafficPolicingFlowLimit=200
+FlowLimit=200
-FairQueueTrafficPolicingQuantum=1500
+Quantum=1500
-FairQueueTrafficPolicingInitialQuantum=13000
+InitialQuantum=13000
-FairQueueTrafficPolicingMaximumRate=1M
+MaximumRate=1M
-FairQueueTrafficPolicingBuckets=512
+Buckets=512
-FairQueueTrafficPolicingOrphanMask=511
+OrphanMask=511
-FairQueueTrafficPolicingPacing=yes
+Pacing=yes
-FairQueueTrafficPolicingCEThresholdSec=100ms
+CEThresholdSec=100ms
 
-[TrafficControlQueueingDiscipline]
+[ControlledDelay]
 Parent=clsact
-ControlledDelayPacketLimit=2000
+PacketLimit=2000
-ControlledDelayTargetSec=10ms
+TargetSec=10ms
-ControlledDelayIntervalSec=50ms
+IntervalSec=50ms
-ControlledDelayECN=yes
+ECN=yes
-ControlledDelayCEThresholdSec=100ms
+CEThresholdSec=100ms

test/test-network/conf/25-qdisc-netem-and-fqcodel.network

@@ -5,20 +5,20 @@ Name=dummy98
 IPv6AcceptRA=no
 Address=10.1.2.3/16
 
-[TrafficControlQueueingDiscipline]
+[NetworkEmulator]
 Parent=root
-NetworkEmulatorDelaySec=50ms
+DelaySec=50ms
-NetworkEmulatorDelayJitterSec=10ms
+DelayJitterSec=10ms
-NetworkEmulatorLossRate=20%
+LossRate=20%
-NetworkEmulatorPacketLimit=100
+PacketLimit=100
 
-[TrafficControlQueueingDiscipline]
+[FairQueueingControlledDelay]
 Parent=ingress
-FairQueuingControlledDelayPacketLimit=20480
+PacketLimit=20480
-FairQueuingControlledDelayMemoryLimit=64M
+MemoryLimit=64M
-FairQueuingControlledDelayFlows=2048
+Flows=2048
-FairQueuingControlledDelayTargetSec=10ms
+TargetSec=10ms
-FairQueuingControlledDelayIntervalSec=200ms
+IntervalSec=200ms
-FairQueuingControlledDelayQuantum=1400
+Quantum=1400
-FairQueuingControlledDelayECN=yes
+ECN=yes
-FairQueuingControlledDelayCEThresholdSec=100ms
+CEThresholdSec=100ms

test/test-network/conf/25-qdisc-tbf-and-sfq.network

@@ -5,14 +5,14 @@ Name=test1
 IPv6AcceptRA=no
 Address=10.1.2.4/16
 
-[TrafficControlQueueingDiscipline]
+[TokenBucketFilter]
 Parent=root
-TokenBufferFilterRate=1G
+Rate=1G
-TokenBufferFilterBurst=5K
+Burst=5K
-TokenBufferFilterLatencySec=70msec
+LatencySec=70msec
-TokenBufferFilterPeakRate=100G
+PeakRate=100G
-TokenBufferFilterMTUBytes=1M
+MTUBytes=1M
 
-[TrafficControlQueueingDiscipline]
+[StochasticFairnessQueueing]
 Parent=clsact
-StochasticFairnessQueueingPerturbPeriodSec=5sec
+PerturbPeriodSec=5sec

test/test-network/conf/dhcp-client-gateway-ipv4.network

@@ -6,5 +6,5 @@ DHCP=ipv4
 IPv6AcceptRA=no
 
 [Route]
-Gateway=dhcp
+Gateway=_dhcp
 Destination=10.0.0.0/8

test/test-network/conf/dhcp-client-gateway-ipv6.network

@@ -5,5 +5,5 @@ Name=veth99
 DHCP=ipv6
 
 [Route]
-Gateway=dhcp
+Gateway=_dhcp
 Destination=2001:1234:5:9fff:ff:ff:ff:ff/128