From: Thomas Haller <thaller@redhat.com>
Date: Tue, 18 Jul 2023 10:33:09 +0000 (+0200)
Subject: py: return boolean value from Nftables.__[gs]et_output_flag()
X-Git-Tag: v1.0.9~229
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae1f506b5b0925dfe07215876f010dd087785ca9;p=thirdparty%2Fnftables.git

py: return boolean value from Nftables.__[gs]et_output_flag()

The callers of __get_output_flag() and __set_output_flag(), for example
get_reversedns_output(), are all documented to return a "boolean" value.

Instead, they returned the underlying, non-zero flags value. That number
is not obviously useful to the caller, because there is no API so that
the caller could do anything with it (except evaluating it in a boolean
context). Adjust that, to match the documentation.

The alternative would be to update the documentation, to indicate that
the functions return a non-zero integer when the flag is set. That would
preserve the previous behavior and maybe the number could be useful
somehow(?).

Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/py/nftables.py b/py/nftables.py
index 6daeafc23..68fcd7dd1 100644
--- a/py/nftables.py
+++ b/py/nftables.py
@@ -154,7 +154,7 @@ class Nftables:
 
     def __get_output_flag(self, name):
         flag = self.output_flags[name]
-        return self.nft_ctx_output_get_flags(self.__ctx) & flag
+        return (self.nft_ctx_output_get_flags(self.__ctx) & flag) != 0
 
     def __set_output_flag(self, name, val):
         flag = self.output_flags[name]
@@ -164,7 +164,7 @@ class Nftables:
         else:
             new_flags = flags & ~flag
         self.nft_ctx_output_set_flags(self.__ctx, new_flags)
-        return flags & flag
+        return (flags & flag) != 0
 
     def get_reversedns_output(self):
         """Get the current state of reverse DNS output.