From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 17 Sep 2018 16:33:35 +0000 (+0200)
Subject: remove kr_rand_bytes_nonstatic()
X-Git-Tag: v3.2.0~13^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a074e2f1a1cde35b5147c9ee7efa4a6003060938;p=thirdparty%2Fknot-resolver.git

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 03b76c5ac..a041ed603 100644
--- 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 94d67196d..661a001f1 100755
--- 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 4e74b0a29..8cb00461d 100644
--- 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 af43f2277..1d4be296f 100644
--- 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 67a552d6d..fb59236b6 100644
--- 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