From 0b3db5039d25fca3d15ec3375ede77161257db4a Mon Sep 17 00:00:00 2001
From: Max <msuraev@sysmocom.de>
Date: Wed, 18 Oct 2017 13:48:10 +0200
Subject: Replace bitvec_set_uint() with bitvec_set_u64()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Old bitvec_set_uint() uses "unsigned int" as input parameter which
length is not guaranteed. It does not allow to specify which bit_value
to set and does not check for incorrect length. Overall this makes it
harder to re-use and more error-prone.

Let's replace it with extended implementation which uses fixed type
length parameters and extra checks. The additional parameter allows
caller to explicitly indicate the need to use L/H instead of 0/1 for bit
vector elements. It's necessary to properly encode some of the messages
from 3GPP TS 44.018, for example §10.5.2.16 IA Rest Octets.

The old function is left for backward compatibility as a tiny wrapper
around new function and will be deprecated in follow-up patches.

Change-Id: I1b670dacb55fb3063271d045f9faa10fccba10a6
Related: OS#1526
---
 src/bitvec.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/bitvec.c b/src/bitvec.c
index f07b42c3..24049cda 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -215,24 +215,41 @@ int bitvec_set_bits(struct bitvec *bv, const enum bit_value *bits, unsigned int
 	return 0;
 }
 
-/*! set multiple bits (based on numeric value) at current pos
- *  \return 0 in case of success; negative in case of error */
-int bitvec_set_uint(struct bitvec *bv, unsigned int ui, unsigned int num_bits)
+/*! set multiple bits (based on numeric value) at current pos.
+ *  \param[in] bv bit vector.
+ *  \param[in] v mask representing which bits needs to be set.
+ *  \param[in] num_bits number of meaningful bits in the mask.
+ *  \param[in] use_lh whether to interpret the bits as L/H values or as 0/1.
+ *  \return 0 on success; negative in case of error. */
+int bitvec_set_u64(struct bitvec *bv, uint64_t v, uint8_t num_bits, bool use_lh)
 {
-	int rc;
-	unsigned i;
+	uint8_t i;
+
+	if (num_bits > 64)
+		return -E2BIG;
+
 	for (i = 0; i < num_bits; i++) {
-		int bit = 0;
-		if (ui & (1u << (num_bits - i - 1)))
-			bit = 1;
+		int rc;
+		enum bit_value bit = use_lh ? L : 0;
+
+		if (v & ((uint64_t)1 << (num_bits - i - 1)))
+			bit = use_lh ? H : 1;
+
 		rc = bitvec_set_bit(bv, bit);
-		if (rc)
+		if (rc != 0)
 			return rc;
 	}
 
 	return 0;
 }
 
+/*! set multiple bits (based on numeric value) at current pos.
+ *  \return 0 in case of success; negative in case of error. */
+int bitvec_set_uint(struct bitvec *bv, unsigned int ui, unsigned int num_bits)
+{
+	return bitvec_set_u64(bv, ui, num_bits, false);
+}
+
 /*! get multiple bits (num_bits) from beginning of vector (MSB side)
  *  \return 16bit signed integer retrieved from bit vector */
 int16_t bitvec_get_int16_msb(const struct bitvec *bv, unsigned int num_bits)
-- 
cgit v1.2.3