Commit 894aeb04 authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[master] Added subnet manipulation support

    Merge branch 'trac5314'
parents fde84942 ac93de29
...@@ -1640,7 +1640,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1640,7 +1640,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1708,7 +1707,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1708,7 +1707,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1776,7 +1774,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1776,7 +1774,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1844,7 +1841,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1844,7 +1841,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1869,7 +1865,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1869,7 +1865,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 2,\n" " \"id\": 2,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1894,7 +1889,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1894,7 +1889,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 3,\n" " \"id\": 3,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1919,7 +1913,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1919,7 +1913,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 4,\n" " \"id\": 4,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -1987,7 +1980,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -1987,7 +1980,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1024,\n" " \"id\": 1024,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2012,7 +2004,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2012,7 +2004,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 100,\n" " \"id\": 100,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2037,7 +2028,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2037,7 +2028,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2062,7 +2052,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2062,7 +2052,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 34,\n" " \"id\": 34,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2130,7 +2119,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2130,7 +2119,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"1.2.3.4\",\n" " \"next-server\": \"1.2.3.4\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2198,7 +2186,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2198,7 +2186,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"1.2.3.4\",\n" " \"next-server\": \"1.2.3.4\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2266,7 +2253,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2266,7 +2253,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"1.2.3.4\",\n" " \"next-server\": \"1.2.3.4\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2334,7 +2320,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2334,7 +2320,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2402,7 +2387,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2402,7 +2387,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2470,7 +2454,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2470,7 +2454,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2495,7 +2478,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2495,7 +2478,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 2,\n" " \"id\": 2,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": false,\n" " \"match-client-id\": false,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2563,7 +2545,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2563,7 +2545,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": false,\n" " \"match-client-id\": false,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2588,7 +2569,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2588,7 +2569,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 2,\n" " \"id\": 2,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2656,7 +2636,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2656,7 +2636,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2724,7 +2703,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2724,7 +2703,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2753,7 +2731,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2753,7 +2731,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 2,\n" " \"id\": 2,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -2825,7 +2802,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -2825,7 +2802,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -3283,7 +3259,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3283,7 +3259,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -3351,7 +3326,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3351,7 +3326,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [\n" " \"option-data\": [\n"
...@@ -3463,7 +3437,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3463,7 +3437,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -3662,7 +3635,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3662,7 +3635,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -3739,7 +3711,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3739,7 +3711,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [\n" " \"option-data\": [\n"
...@@ -3824,7 +3795,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3824,7 +3795,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [\n" " \"option-data\": [\n"
...@@ -3858,7 +3828,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3858,7 +3828,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 2,\n" " \"id\": 2,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [\n" " \"option-data\": [\n"
...@@ -3935,7 +3904,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3935,7 +3904,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4020,7 +3988,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4020,7 +3988,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4232,7 +4199,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4232,7 +4199,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4315,7 +4281,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4315,7 +4281,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4402,7 +4367,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4402,7 +4367,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4554,7 +4518,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4554,7 +4518,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4622,7 +4585,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4622,7 +4585,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4690,7 +4652,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4690,7 +4652,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 123,\n" " \"id\": 123,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4715,7 +4676,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4715,7 +4676,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 234,\n" " \"id\": 234,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4795,7 +4755,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4795,7 +4755,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 542,\n" " \"id\": 542,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -4921,7 +4880,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4921,7 +4880,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 234,\n" " \"id\": 234,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -5009,7 +4967,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -5009,7 +4967,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 1,\n" " \"id\": 1,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -5034,7 +4991,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -5034,7 +4991,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 2,\n" " \"id\": 2,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -5059,7 +5015,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -5059,7 +5015,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 3,\n" " \"id\": 3,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n" " \"next-server\": \"0.0.0.0\",\n"
" \"option-data\": [ ],\n" " \"option-data\": [ ],\n"
...@@ -5084,7 +5039,6 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -5084,7 +5039,6 @@ const char* UNPARSED_CONFIGS[] = {
" \"4o6-interface-id\": \"\",\n" " \"4o6-interface-id\": \"\",\n"
" \"4o6-subnet\": \"\",\n" " \"4o6-subnet\": \"\",\n"
" \"id\": 4,\n" " \"id\": 4,\n"
" \"interface\": \"\",\n"
" \"match-client-id\": true,\n" " \"match-client-id\": true,\n"
" \"next-server\": \"0.0.0.0\",\n"