Client mask

- `client_subnet_index`: Fix setting v4/v6 mask, init function was called after and overwrote mask
DNS-OARC · Mar 15, 2024 · dedafdd · dedafdd
1 parent 1212328
commit dedafdd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/client_subnet_index.c b/src/client_subnet_index.c
@@ -45,6 +45,7 @@ static hashfunc ipnet_hashfunc;
 static hashkeycmp ipnet_cmpfunc;
 static inX_addr v4mask;
 static inX_addr v6mask;
+static int v4set = 0, v6set = 0;
 
 #define MAX_ARRAY_SZ 65536
 static hashtbl* theHash = NULL;
@@ -113,18 +114,24 @@ void client_subnet_reset()
 
 void client_subnet_init(void)
 {
- inXaddr_pton("255.255.255.0", &v4mask);
- inXaddr_pton("ffff:ffff:ffff:ffff:ffff:ffff:0000:0000", &v6mask);
+ if (!v4set) {
+ inXaddr_pton("255.255.255.0", &v4mask);
+ }
+ if (!v6set) {
+ inXaddr_pton("ffff:ffff:ffff:ffff:ffff:ffff:0000:0000", &v6mask);
+ }
 }
 
 int client_subnet_v4_mask_set(const char* mask)
 {
+ v4set = 1;
  dsyslogf(LOG_INFO, "change v4 mask to %s", mask);
  return inXaddr_pton(mask, &v4mask);
 }
 
 int client_subnet_v6_mask_set(const char* mask)
 {
+ v6set = 1;
  dsyslogf(LOG_INFO, "change v6 mask to %s", mask);
  return inXaddr_pton(mask, &v6mask);
 }

diff --git a/src/test/1458044657.conf b/src/test/1458044657.conf
@@ -48,3 +48,4 @@ dataset label_count dns All:null LabelCount:label_count any;
 output_format XML;
 output_format JSON;
 tld_list ./1458044657.tld_list.dist;
+client_v4_mask 255.255.255.255;
diff --git a/src/test/1458044657.json_gold b/src/test/1458044657.json_gold
@@ -364,13 +364,13 @@
  {
  "Class": "ok",
  "ClientSubnet": [
- { "val": "172.17.0.0", "count": 3 }
+ { "val": "172.17.0.16", "count": 3 }
  ]
  },
  {
  "Class": "non-auth-tld",
  "ClientSubnet": [
- { "val": "172.17.0.0", "count": 1 }
+ { "val": "172.17.0.16", "count": 1 }
  ]
  }
  ]
@@ -449,7 +449,7 @@
  {
  "All": "ALL",
  "ClientSubnet": [
- { "val": "172.17.0.0", "count": 4 }
+ { "val": "172.17.0.16", "count": 4 }
  ]
  }
  ]

diff --git a/src/test/1458044657.xml_gold b/src/test/1458044657.xml_gold
@@ -238,10 +238,10 @@
  <dimension number="2" type="ClientSubnet"/>
  <data>
  <Class val="ok">
- <ClientSubnet val="172.17.0.0" count="3"/>
+ <ClientSubnet val="172.17.0.16" count="3"/>
  </Class>
  <Class val="non-auth-tld">
- <ClientSubnet val="172.17.0.0" count="1"/>
+ <ClientSubnet val="172.17.0.16" count="1"/>
  </Class>
  </data>
 </array>
@@ -290,7 +290,7 @@
  <dimension number="2" type="ClientSubnet"/>
  <data>
  <All val="ALL">
- <ClientSubnet val="172.17.0.0" count="4"/>
+ <ClientSubnet val="172.17.0.16" count="4"/>
  </All>
  </data>
 </array>