From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer <michael.tremer@ipfire.org> To: network@lists.ipfire.org Subject: Re: [PATCH 3/7] zone: add function to avoid multiple configs which are senseless Date: Tue, 04 Jul 2017 17:07:18 +0100 Message-ID: <1499184438.2362.6.camel@ipfire.org> In-Reply-To: <1499183171-24236-3-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8791662976999803249==" List-Id: <network.lists.ipfire.org> --===============8791662976999803249== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Perfect coding style here! :) On Tue, 2017-07-04 at 17:46 +0200, Jonatan Schlag wrote: > Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> > --- > src/functions/functions.zone | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/src/functions/functions.zone > b/src/functions/functions.zone > index 058110d..f2c5ddc 100644 > --- a/src/functions/functions.zone > +++ b/src/functions/functions.zone > @@ -1008,6 +1008,28 @@ zone_config_get_hook() { > print "${HOOK}" > } > > +zone_config_hook_is_configured() { > + # Checks if a zone has already at least one config with the > given hook. > + # Returns True when yes and False when no > + > + assert [ $# -eq 2 ] > + local zone=${1} > + local hook=${2} > + > + local config > + for config in $(zone_configs_list "${zone}"); do > + local config_hook="$(zone_config_get_hook "${zone}" > "${config}")" > + assert isset config_hook > + if [[ ${hook} == ${config_hook} ]]; then > + return ${EXIT_TRUE} > + fi > + > + done > + > + # If we get here the zone has no config with the given hook > + return ${EXIT_FALSE} > +} > + > zone_has_ip() { > device_has_ip $@ > } --===============8791662976999803249== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpXNzAyQUFvSkVJQjU4UDl2a0FrSHBnRVAvQTBvVXZNRmNGbW0vWlcxU2F2V00zeTYK VUs5cStmczFlSDQwVGpSUmUxM25FNWx6WEZTUytmY2ZJeXo3MWwySXBzMktJUFpSbWpIeVcrd1lt K2MxeEsraApud1pXLzVVdndQZDN2NlcrOEtrazFhMDNmMUVudC9tUWpJZXBCaSsxMWVFUkR6SkNt L2Z2ajU3Nk8yd3pFS2JDClBaRXVzWC95N0x3cFFOOWw3ZEgxNlFJamVObkpacjhybnRRYjh6WnFF WC9qZUlzZG5WeHZZS2szMS9aSHRTeEwKQzlQcGkxc2RPenFhVE1ra2hFT016NEpnVFRRaUNxaVFO NGI1U2tOOXpYbzc4VFRnR2tSQ21Lb29DOEZjUEtuMgpmTGVkbkdLUDFxVDVZR2lxUFZwSU1aN1VW dU9NQ1IvcXl1eWpCei9BK1d2aWV2VnhXNzdOU0d3Sm9udFU1alNUCmhoeU5Udlpjb05zQ2YzZHdE eEtEcnpiYVJyaG51azFRZDVQRlJmRFBiSkR2ejByMDU3OHVzbi85Tk9qK3hxLzIKam1mSWR1VkJh ek9DMUx1anY1WlRNRHJzaDhDWnZYUlFtZFJVdG9xM0FKZXozTXhYUmxxdHc1TmVITzYvcTUvUgpF WXV1WStCdWhkZ0JObnR6bkhyWnVMNERWUjV3ZFJFRUlSZVNCMW5ML1VhVmpCTzhkRjFuTk95R3Iz R1p3bytXCmQ2RExDTVNacTdPQ2R5S0xjZTZtdEQzVldhOUZocFJRZjRZdzBFS0JJckFZNURQZVVY aldiTHJTZDVjU2pFdWgKQ3UyalV6dE5sWUFyRXJXWlo0YTRUOWFvakduS0ZYRWVXVEVSbkZJSWN5 bnJCOGJ1cDZhbElvZ0JvbTNHVExGNwpYUDU0RFNTUzFPYUxINlhNMGUveAo9UzNYNAotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============8791662976999803249==--