From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 2/2] config: remove old hashes Date: Wed, 05 Jul 2017 16:02:36 +0200 Message-ID: <1499263356-10418-2-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1499263356-10418-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8643519980247173264==" List-Id: --===============8643519980247173264== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable With the new id feature the old hashes are not necessary anymore. The ipv6_hash function is dropped because we need this function no more. Signed-off-by: Jonatan Schlag --- src/functions/functions.ipv6 | 8 -------- src/hooks/configs/ipv4-static | 3 +-- src/hooks/configs/ipv6-static | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/functions/functions.ipv6 b/src/functions/functions.ipv6 index 3e81d3a..e160fb3 100644 --- a/src/functions/functions.ipv6 +++ b/src/functions/functions.ipv6 @@ -446,14 +446,6 @@ ipv6_addr_le() { ipv6_addr_eq $@ || ! ipv6_addr_gt $@ } =20 -ipv6_hash() { - local address=3D"${1}" - assert isset address - - address=3D"$(ipv6_format "${address}")" - echo "${address//:/}" -} - ipv6_get_network() { ip_get_network $@ } diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static index cb00252..c395200 100644 --- a/src/hooks/configs/ipv4-static +++ b/src/hooks/configs/ipv4-static @@ -106,8 +106,7 @@ hook_new() { warning "You did not configure a gateway for a non-local zone" fi =20 - # XXX maybe we can add some hashing to identify a configuration again - zone_config_settings_write "${zone}" "${HOOK}.$(uuid)" + zone_config_settings_write "${zone}" "${HOOK}" =20 exit ${EXIT_OK} } diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static index 2a5e8e2..f43ef7e 100644 --- a/src/hooks/configs/ipv6-static +++ b/src/hooks/configs/ipv6-static @@ -59,7 +59,7 @@ hook_new() { GATEWAY=3D$(ipv6_format "${GATEWAY}") fi =20 - zone_config_settings_write "${zone}" "${HOOK}.$(ipv6_hash ${ADDRESS}).${PRE= FIX}" + zone_config_settings_write "${zone}" "${HOOK}" =20 exit ${EXIT_OK} } --=20 2.6.3 --===============8643519980247173264==--