remove kr_rand_bytes_nonstatic()

It seems simpler, now that we have kr_rnd_buffered().

diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
index 03b76c5acd231e6a5b1c5d1a27523ffc07d27fe2..a041ed603eb6acbbcb49d2348c9c03686ac36e17 100644 (file)
--- a/daemon/lua/kres-gen.lua
+++ b/daemon/lua/kres-gen.lua
@@ -293,7 +293,7 @@ int kr_pkt_recycle(knot_pkt_t *);
 int kr_pkt_clear_payload(knot_pkt_t *);
 uint16_t kr_pkt_qclass(const knot_pkt_t *);
 uint16_t kr_pkt_qtype(const knot_pkt_t *);
-uint64_t kr_rand_bytes_nonstatic(int);
+void kr_rnd_buffered(void *, unsigned int);
 uint32_t kr_rrsig_sig_inception(const knot_rdata_t *);
 uint32_t kr_rrsig_sig_expiration(const knot_rdata_t *);
 uint16_t kr_rrsig_type_covered(const knot_rdata_t *);

diff --git a/daemon/lua/kres-gen.sh b/daemon/lua/kres-gen.sh
index 94d67196d0c83e5e7a70b0a505c597465c394364..661a001f1262543c257fed00324e25802c086bad 100755 (executable)
--- a/daemon/lua/kres-gen.sh
+++ b/daemon/lua/kres-gen.sh
@@ -147,7 +147,7 @@ EOF
        kr_pkt_clear_payload
        kr_pkt_qclass
        kr_pkt_qtype
-       kr_rand_bytes_nonstatic
+       kr_rnd_buffered
        kr_rrsig_sig_inception
        kr_rrsig_sig_expiration
        kr_rrsig_type_covered

diff --git a/daemon/lua/kres.lua b/daemon/lua/kres.lua
index 4e74b0a29f8bf17890895bd8e1ef6ef335a4c021..8cb00461daa953a0eeab0a430768e238d798cee0 100644 (file)
--- a/daemon/lua/kres.lua
+++ b/daemon/lua/kres.lua
@@ -549,7 +549,7 @@ ffi.metatype( knot_pkt_t, {
                        error(string.format('failed to allocate a packet of size %d', size))
                end
                if wire == nil then
-                       pkt:id(tonumber(C.kr_rand_bytes_nonstatic(2)))
+                       C.kr_rnd_buffered(pkt.wire, 2) -- randomize the query ID
                else
                        assert(size <= #wire)
                        ffi.copy(pkt.wire, wire, size)

diff --git a/lib/utils.c b/lib/utils.c
index af43f2277ccd758c846a10d11a6e2e271d05a851..1d4be296ff33b134efeb56f9d61ab8958670513f 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1049,8 +1049,4 @@ uint16_t kr_rrsig_type_covered(const knot_rdata_t *rdata)
 {
        return knot_rrsig_type_covered(rdata);
 }
-uint64_t kr_rand_bytes_nonstatic(int size)
-{
-       return kr_rand_bytes(size);
-}
 

diff --git a/lib/utils.h b/lib/utils.h
index 67a552d6d3529e165ebf14354f4a852a67a6acb3..fb59236b62e2dfc0cbbb40b287e5ff5c88117121 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -209,8 +209,6 @@ static inline uint64_t kr_rand_bytes(int size)
        }
        return result;
 }
-/** non-static variant of kr_rand_bytes() */
-KR_EXPORT uint64_t kr_rand_bytes_nonstatic(int size);
 
 /** Throw a pseudo-random coin, succeeding approximately with probability nomin/denomin.
  * - low precision, only one byte of randomness