From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 24 Aug 2023 07:38:01 +0000 (+0200)
Subject: datamodel: /local-data: refactor ttl
X-Git-Tag: v6.0.3~7^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84cb31dac0e381be333ec07af5d3dbdae2116466;p=thirdparty%2Fknot-resolver.git

datamodel: /local-data: refactor ttl
---

diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
index 5fce85fa5..215b175bb 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
@@ -17,6 +17,13 @@ hints.root_file('{{ file }}')
 {% endfor %}
 {%- endmacro %}
 
+{%- macro local_data_ttl(ttl) -%}
+{%- if ttl -%}
+{{ ttl.seconds() }}
+{%- else -%}
+{{ 'C.KR_RULE_TTL_DEFAULT' }}
+{%- endif -%}
+{%- endmacro -%}
 
 {% macro local_data_addresses(pairs) -%}
 {%- for name, addresses in pairs.items() -%}
@@ -36,9 +43,7 @@ assert(hints.add_hosts('{{ file }}').result == true)
 
 {% macro local_data_records(input_str, is_rpz, ttl, nodata, tags=none, id='rrs') -%}
 {{ id }} = ffi.new('struct kr_rule_zonefile_config')
-{% if ttl %}
-{{ id }}.ttl = {{ ttl.seconds() }}
-{% endif %}
+{{ id }}.ttl = {{ local_data_ttl(ttl) }}
 {% if tags %}
 {{ id }}.tags = {{ policy_get_tagset(tags) }}
 {% endif %}
@@ -55,16 +60,11 @@ assert(C.kr_rule_zonefile({{ id }})==0)
 {%- endmacro %}
 
 {% macro local_data_subtree_root(root, type, ttl, tags) -%}
-{% if ttl %}
-{%- set get_ttl = ttl.seconds() -%}
-{%- else -%}
-{%- set get_ttl = 'C.KR_RULE_TTL_DEFAULT' -%}
-{% endif %}
 {%- if tags -%}
 {%- set get_tags = policy_get_tagset(tags) -%}
 {%- else -%}
 {%- set get_tags = '0' -%}
 {%- endif -%}
 assert(C.kr_rule_local_subtree(todname('{{ root }}'),
-	C.KR_RULE_SUB_{{ type.upper() }}, {{ get_ttl }}, {{ get_tags }}) == 0)
+	C.KR_RULE_SUB_{{ type.upper() }}, {{ local_data_ttl(ttl) }}, {{ get_tags }}) == 0)
 {%- endmacro %}