[#893] fixed unittests

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index efb91465ce65fe704d2f074e28ef6e241c9b7114..babf221fa312f03c9b82ed30119be1f42266e1da 100644 (file)
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -2198,11 +2198,12 @@ const char* EXTRACTED_CONFIGS[] = {
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"statistic-default-sample-age\": 5,\n"
-"        \"statistic-default-sample-count\": 10,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 0,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"subnet4\": [ ]\n"
 "    }\n"
 };
 
@@ -2257,6 +2258,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2269,8 +2275,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -2326,6 +2330,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2337,8 +2346,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2419,6 +2426,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2430,8 +2442,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2514,6 +2524,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"match-client-id\": true,\n"
 "        \"max-valid-lifetime\": 5000,\n"
 "        \"min-valid-lifetime\": 3000,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2526,8 +2541,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2611,6 +2624,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2623,8 +2641,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2781,6 +2797,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2793,8 +2814,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -2951,6 +2970,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"1.2.3.4\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -2963,8 +2987,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"foo\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3046,6 +3068,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3058,8 +3085,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3144,6 +3169,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"192.0.0.1\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3156,8 +3186,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"nohost\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3242,6 +3270,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3254,8 +3287,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3337,6 +3368,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3349,8 +3385,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3432,6 +3466,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3444,8 +3483,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3554,6 +3591,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3566,8 +3608,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3675,6 +3715,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3687,8 +3732,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3797,6 +3840,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3809,8 +3857,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -3920,6 +3966,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"match-client-id\": true,\n"
 "        \"max-valid-lifetime\": 5000,\n"
 "        \"min-valid-lifetime\": 3000,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -3932,8 +3983,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4017,6 +4066,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -4029,8 +4083,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4145,6 +4197,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -4157,8 +4214,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4240,6 +4295,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4260,8 +4320,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4317,6 +4375,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4337,8 +4400,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4394,6 +4455,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4423,8 +4489,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4480,6 +4544,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4500,8 +4569,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4557,6 +4624,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4577,8 +4649,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4634,6 +4704,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4654,8 +4729,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4711,6 +4784,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -4731,8 +4809,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4788,6 +4864,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -4817,8 +4898,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -4900,6 +4979,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -4912,8 +4996,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5012,6 +5094,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -5051,8 +5138,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5134,6 +5219,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -5182,8 +5272,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -5239,6 +5327,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -5304,8 +5397,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5387,6 +5478,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -5408,8 +5504,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5508,6 +5602,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -5520,8 +5619,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5646,6 +5743,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -5658,8 +5760,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5758,6 +5858,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -5770,8 +5875,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5875,6 +5978,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -5904,8 +6012,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -5987,6 +6093,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -6035,8 +6146,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -6092,6 +6201,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -6148,8 +6262,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6231,6 +6343,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -6258,8 +6375,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6341,6 +6456,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -6372,8 +6492,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6455,6 +6573,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6467,8 +6590,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -6524,6 +6645,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6536,8 +6662,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -6593,6 +6717,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6605,8 +6734,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6688,6 +6815,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6700,8 +6832,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6783,6 +6913,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6795,8 +6930,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6878,6 +7011,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6890,8 +7028,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -6973,6 +7109,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -6985,8 +7126,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7068,6 +7207,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -7080,8 +7224,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7241,6 +7383,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -7253,8 +7400,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7351,6 +7496,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -7363,8 +7513,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7599,6 +7747,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
@@ -7621,8 +7774,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7724,6 +7875,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -7736,8 +7892,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -7897,6 +8051,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -7909,8 +8068,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8018,6 +8175,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8028,8 +8190,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -8085,6 +8245,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8095,8 +8260,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -8152,6 +8315,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8162,8 +8330,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -8219,6 +8385,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8229,8 +8400,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -8286,6 +8455,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8298,8 +8472,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8381,6 +8553,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8393,8 +8570,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8476,6 +8651,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8488,8 +8668,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8571,6 +8749,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8583,8 +8766,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8666,6 +8847,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8678,8 +8864,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8787,6 +8971,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8799,8 +8988,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8882,6 +9069,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8894,8 +9086,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -8977,6 +9167,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -8989,8 +9184,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -9073,6 +9266,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -9085,8 +9283,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -9173,6 +9369,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -9185,8 +9386,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -9287,6 +9486,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -9299,8 +9503,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -9396,6 +9598,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [\n"
 "            {\n"
@@ -9489,8 +9696,6 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -9546,6 +9751,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -9613,8 +9823,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -9721,6 +9929,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -9792,8 +10005,6 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 4000\n"
 "            }\n"
 "        ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -9873,6 +10084,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -9885,8 +10101,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -9993,6 +10207,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
@@ -10005,8 +10224,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": true,\n"
 "        \"subnet4\": [\n"
 "            {\n"
@@ -10113,11 +10330,14 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"match-client-id\": true,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 0,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"next-server\": \"0.0.0.0\",\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
@@ -10125,13 +10345,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"server-hostname\": \"\",\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 5,\n"
-"        \"statistic-default-sample-count\": 10,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet4\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
 "        \"t2-percent\": 0.875,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n"
 };
 

diff --git a/src/bin/dhcp6/tests/get_config_unittest.cc b/src/bin/dhcp6/tests/get_config_unittest.cc
index 844bd9f4a1ac011ddacfd00217914b750ca420b9..efff94a14d71ecd087d5e73c6b386f38d771093d 100644 (file)
--- a/src/bin/dhcp6/tests/get_config_unittest.cc
+++ b/src/bin/dhcp6/tests/get_config_unittest.cc
@@ -1925,12 +1925,12 @@ const char* EXTRACTED_CONFIGS[] = {
 "            \"interfaces\": [ \"*\" ],\n"
 "            \"re-detect\": false\n"
 "        },\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
-"        \"renew-timer\": 1000,\n"
-"        \"statistic-default-sample-age\": 5,\n"
-"        \"statistic-default-sample-count\": 10,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 0,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
+"        \"subnet6\": [ ]\n"
 "    }\n"
 };
 
@@ -1982,6 +1982,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2002,8 +2007,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -2060,6 +2063,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"max-valid-lifetime\": 5000,\n"
 "        \"min-preferred-lifetime\": 2000,\n"
 "        \"min-valid-lifetime\": 3000,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2080,8 +2088,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2164,6 +2170,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2184,8 +2195,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2339,6 +2348,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2359,8 +2373,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2514,6 +2526,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2534,8 +2551,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2693,6 +2708,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        \"max-valid-lifetime\": 5000,\n"
 "        \"min-preferred-lifetime\": 2000,\n"
 "        \"min-valid-lifetime\": 3000,\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2713,8 +2733,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2797,6 +2815,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2817,8 +2840,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2898,6 +2919,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -2918,8 +2944,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -2999,6 +3023,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -3019,8 +3048,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3132,6 +3159,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -3152,8 +3184,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3232,6 +3262,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -3252,8 +3287,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3334,6 +3367,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -3354,8 +3392,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3438,6 +3474,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -3458,8 +3499,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3557,6 +3596,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -3577,8 +3621,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -3659,6 +3701,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -3687,8 +3734,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -3741,6 +3786,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -3769,8 +3819,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -3823,6 +3871,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -3860,8 +3913,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -3914,6 +3965,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -3942,8 +3998,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -3996,6 +4050,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -4024,8 +4083,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4078,6 +4135,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4115,8 +4177,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4195,6 +4255,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -4215,8 +4280,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4312,6 +4375,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4359,8 +4427,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4439,6 +4505,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4495,8 +4566,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -4549,6 +4618,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -4622,8 +4696,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4702,6 +4774,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -4722,8 +4799,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4845,6 +4920,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -4865,8 +4945,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -4998,6 +5076,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5033,8 +5116,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5113,6 +5194,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"always-send\": false,\n"
@@ -5152,8 +5238,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5232,6 +5316,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5252,8 +5341,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -5306,6 +5393,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5326,8 +5418,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -5380,6 +5470,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5400,8 +5495,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5480,6 +5573,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5500,8 +5598,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5580,6 +5676,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5600,8 +5701,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5758,6 +5857,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5778,8 +5882,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5873,6 +5975,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -5893,8 +6000,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -5996,6 +6101,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6016,8 +6126,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6096,6 +6204,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6116,8 +6229,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6196,6 +6307,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6216,8 +6332,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6296,6 +6410,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6316,8 +6435,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6521,6 +6638,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [\n"
 "            {\n"
@@ -6551,8 +6673,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6644,6 +6764,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"client-link-addr-option\", \"remote-id\", \"subscriber-id\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6664,8 +6789,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -6718,6 +6841,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"client-link-addr-option\", \"remote-id\", \"subscriber-id\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6738,8 +6866,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -6792,6 +6918,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -6812,8 +6943,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -6996,6 +7125,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7016,8 +7150,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7122,6 +7254,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7142,8 +7279,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -7196,6 +7331,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3600,\n"
@@ -7214,8 +7354,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -7268,6 +7406,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3600,\n"
@@ -7286,8 +7429,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -7340,6 +7481,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3600,\n"
@@ -7358,8 +7504,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -7412,6 +7556,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3600,\n"
@@ -7430,8 +7579,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -7498,6 +7645,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7518,8 +7670,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7598,6 +7748,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7618,8 +7773,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7698,6 +7851,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7718,8 +7876,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7799,6 +7955,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7819,8 +7980,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -7905,6 +8064,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -7925,8 +8089,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -8011,6 +8173,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -8031,8 +8198,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -8113,6 +8278,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -8133,8 +8303,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -8216,6 +8384,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -8236,8 +8409,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -8338,6 +8509,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -8358,8 +8534,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -8440,6 +8614,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [\n"
 "            {\n"
 "                \"comment\": \"Set option value\",\n"
@@ -8550,8 +8729,6 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"valid-lifetime\": 7200\n"
 "            }\n"
 "        ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
@@ -8604,6 +8781,11 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 4,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
 "        \"preferred-lifetime\": 3000,\n"
@@ -8676,8 +8858,6 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 0,\n"
-"        \"statistic-default-sample-count\": 20,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [\n"
 "            {\n"
@@ -8796,12 +8976,15 @@ const char* UNPARSED_CONFIGS[] = {
 "            \"type\": \"memfile\"\n"
 "        },\n"
 "        \"mac-sources\": [ \"any\" ],\n"
+"        \"multi-threading\": {\n"
+"            \"enable-multi-threading\": false,\n"
+"            \"packet-queue-size\": 0,\n"
+"            \"thread-pool-size\": 0\n"
+"        },\n"
 "        \"option-data\": [ ],\n"
 "        \"option-def\": [ ],\n"
-"        \"preferred-lifetime\": 3000,\n"
-"        \"rebind-timer\": 2000,\n"
+"        \"preferred-lifetime\": 3600,\n"
 "        \"relay-supplied-options\": [ \"65\" ],\n"
-"        \"renew-timer\": 1000,\n"
 "        \"reservation-mode\": \"all\",\n"
 "        \"sanity-checks\": {\n"
 "            \"lease-checks\": \"warn\"\n"
@@ -8816,13 +8999,11 @@ const char* UNPARSED_CONFIGS[] = {
 "        },\n"
 "        \"server-tag\": \"\",\n"
 "        \"shared-networks\": [ ],\n"
-"        \"statistic-default-sample-age\": 5,\n"
-"        \"statistic-default-sample-count\": 10,\n"
 "        \"store-extended-info\": false,\n"
 "        \"subnet6\": [ ],\n"
 "        \"t1-percent\": 0.5,\n"
 "        \"t2-percent\": 0.8,\n"
-"        \"valid-lifetime\": 4000\n"
+"        \"valid-lifetime\": 7200\n"
 "    }\n"
 };
 

diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc
index 873a8ca546ba5f78a58c66bb0ab6c67a8f842b36..0539265b4126002bc2a7352c41ebd923fafae0f6 100644 (file)
--- a/src/lib/dhcpsrv/parsers/simple_parser4.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc
@@ -85,7 +85,8 @@ const SimpleKeywords SimpleParser4::GLOBAL4_PARAMETERS = {
     { "ddns-qualifying-suffix",         Element::string },
     { "store-extended-info",            Element::boolean },
     { "statistic-default-sample-count", Element::integer },
-    { "statistic-default-sample-age",   Element::integer }
+    { "statistic-default-sample-age",   Element::integer },
+    { "multi-threading",                Element::map }
 };
 
 /// @brief This table defines default global values for DHCPv4

diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc
index dc03f322b5bccea564ec3fbfb43073e1622eb30b..669a492462b9026aa83d1fcd916b8275f7a7f7f5 100644 (file)
--- a/src/lib/dhcpsrv/parsers/simple_parser6.cc
+++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc
@@ -86,7 +86,8 @@ const SimpleKeywords SimpleParser6::GLOBAL6_PARAMETERS = {
     { "ddns-qualifying-suffix",         Element::string },
     { "store-extended-info",            Element::boolean },
     { "statistic-default-sample-count", Element::integer },
-    { "statistic-default-sample-age",   Element::integer }
+    { "statistic-default-sample-age",   Element::integer },
+    { "multi-threading",                Element::map }
 };
 
 /// @brief This table defines default global values for DHCPv6