<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/18540">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm23236: add NRI range utility functions<br><br>osmo-bsc (and potentially also osmo-msc) need to manage ranges of NRI values.<br>In osmo-bsc, the NRI value ranges per-MSC amount to one implementation. Then,<br>osmo-bsc also needs to list NULL-NRI, which amounts to another implementation.<br>If we add NRI capabilities to osmo-msc, that too needs NRI ranges managed by<br>VTY config.<br><br>Add utility functions to:<br>- add NRI value ranges to a list.<br>- remove them from a list.<br>- match NRI value (range) to a list.<br>- parse NRI values from string.<br>- common VTY functionality of adding/removing NRI values from argv.<br>- limit a random NRI in a TMSI to a given list of ranges.<br><br>Add C tests for the above.<br><br>Change-Id: I68e4156824032772f460042499bbc693380186dc<br>---<br>M include/osmocom/gsm/gsm23236.h<br>M src/gsm/gsm23236.c<br>M src/gsm/libosmogsm.map<br>M tests/gsm23236/gsm23236_test.c<br>M tests/gsm23236/gsm23236_test.ok<br>5 files changed, 1,342 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/18540/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm23236.h b/include/osmocom/gsm/gsm23236.h</span><br><span>index 53f3d3a..57156b1 100644</span><br><span>--- a/include/osmocom/gsm/gsm23236.h</span><br><span>+++ b/include/osmocom/gsm/gsm23236.h</span><br><span>@@ -5,6 +5,9 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span> </span><br><span> #define OSMO_NRI_BITLEN_MIN 1</span><br><span> #define OSMO_NRI_BITLEN_MAX 15</span><br><span>@@ -12,3 +15,28 @@</span><br><span> </span><br><span> int osmo_tmsi_nri_get(int16_t *nri_v, uint32_t tmsi, uint8_t nri_bitlen);</span><br><span> int osmo_tmsi_nri_set(uint32_t *tmsi, int16_t nri_v, uint8_t nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_nri_range {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t first;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t last;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_validate(int16_t nri, uint8_t nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_range_validate(const struct osmo_nri_range *range, uint8_t nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+bool osmo_nri_matches_list(struct llist_head *nri_ranges, int16_t nri);</span><br><span style="color: hsl(120, 100%, 40%);">+bool osmo_nri_range_overlaps_list(struct llist_head *nri_ranges, const struct osmo_nri_range *range);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_add(void *ctx, struct llist_head *nri_ranges, const struct osmo_nri_range *add);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_del(void *ctx, struct llist_head *nri_ranges, const struct osmo_nri_range *del);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_limit_by_ranges(int16_t *nri_v, struct llist_head *nri_ranges, uint32_t nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_tmsi_nri_limit_by_ranges(uint32_t *tmsi, struct llist_head *nri_ranges, uint8_t nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_vty_add(const char **message, struct osmo_nri_range *added_range,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ctx, struct llist_head *nri_ranges, int argc, const char **argv, uint8_t nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_vty_del(const char **message, struct osmo_nri_range *removed_range,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ctx, struct llist_head *nri_ranges, int argc, const char **argv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_ranges_to_str_buf(char *buf, size_t buflen, struct llist_head *nri_ranges);</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_nri_ranges_to_str_c(void *ctx, struct llist_head *nri_ranges);</span><br><span>diff --git a/src/gsm/gsm23236.c b/src/gsm/gsm23236.c</span><br><span>index ffeed55..2b071b7 100644</span><br><span>--- a/src/gsm/gsm23236.c</span><br><span>+++ b/src/gsm/gsm23236.c</span><br><span>@@ -23,6 +23,10 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdlib.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span> #include <osmocom/gsm/gsm23236.h></span><br><span> </span><br><span> /*! Retrieve the Network Resource Indicator bits from a TMSI or p-TMSI.</span><br><span>@@ -75,3 +79,444 @@</span><br><span> *tmsi = ((*tmsi) & ~v_mask) | ((((uint32_t)nri_v) << lowest_bit) & v_mask);</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Validate that the given NRI is valid for a given nri_bitlen range.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_v NRI value to validate.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_bitlen Valid NRI range in nr of bits used.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 if valid, <0 if the NRI is <0, >0 if the NRI surpasses the range.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_validate(int16_t nri_v, uint8_t nri_bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nri_v < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nri_bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nri_bitlen < 16 && (nri_v >> nri_bitlen))</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Validate that the given NRI range is valid for a given nri_bitlen range.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_range NRI value range to validate.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_bitlen Valid NRI range in nr of bits used.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 if valid, -1 or 1 if range->first is invalid, -2 or 2 if range->last is invalid, -3 if first > last.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_range_validate(const struct osmo_nri_range *range, uint8_t nri_bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_validate(range->first, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_validate(range->last, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 2 * rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (range->first > range->last)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -3;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Match NRI value against a list of struct osmo_nri_range. */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool nri_matches_range(const struct osmo_nri_range *range, int16_t nri_v)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return range && nri_v >= range->first && nri_v <= range->last;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return true if the ranges overlap, i.e. one or more NRI values appear in both ranges. */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool nri_overlap(const struct osmo_nri_range *a, const struct osmo_nri_range *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return nri_matches_range(b, a->first) || nri_matches_range(b, a->last)</span><br><span style="color: hsl(120, 100%, 40%);">+ || nri_matches_range(a, b->first) || nri_matches_range(a, b->last);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return true if the ranges overlap or are directly adjacent to each other. */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool nri_touch(const struct osmo_nri_range *a, const struct osmo_nri_range *b)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return nri_overlap(a, b)</span><br><span style="color: hsl(120, 100%, 40%);">+ || (a->first > b->last && a->first == b->last + 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ || (b->first > a->last && b->first == a->last + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Grow target range to also include add range. Only useful for touching ranges. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void nri_extend(struct osmo_nri_range *target, const struct osmo_nri_range *add)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ target->first = OSMO_MIN(target->first, add->first);</span><br><span style="color: hsl(120, 100%, 40%);">+ target->last = OSMO_MAX(target->last, add->last);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return true when the given NRI value appears in the list of NRI ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_v NRI value to look for.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns true iff nri_v appears anywhere in nri_ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+bool osmo_nri_matches_list(struct llist_head *nri_ranges, int16_t nri_v)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(range, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nri_matches_range(range, nri_v))</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Return true when the given NRI range has at least one NRI value that appears in a list of other NRI ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] range NRI range to look for.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns true iff any NRI value from 'range' appears anywhere in nri_ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+bool osmo_nri_range_overlaps_list(struct llist_head *nri_ranges, const struct osmo_nri_range *range)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *i;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(i, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nri_overlap(i, range))</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Insert a new struct osmo_nri_range in a list of nri_ranges, so that it remains sorted by 'first' values. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void nri_add_entry_sorted(struct llist_head *nri_ranges, struct osmo_nri_range *add)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *r;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head *at_pos = nri_ranges->prev;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(r, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (r->first <= add->first)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ at_pos = r->entry.prev;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&add->entry, at_pos);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Add a range of NRI values to a list of nri_range structs.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Intelligently add and/or combine the entries in a list of NRI ranges to also include the NRI range given in 'add'.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc context to allocate new list entries from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[inout] nri_ranges List of talloc allocated struct osmo_nri_range entries to add the new range to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] add NRI range to add to 'nri_ranges'.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error (if the range in 'add' is invalid).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_add(void *ctx, struct llist_head *nri_ranges, const struct osmo_nri_range *add)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range_next;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *target = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_range_validate(add, 255))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Is there an entry overlapping this range? */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(range, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nri_touch(range, add))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ target = range;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!target) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No overlaps with existing ranges, create a new one. */</span><br><span style="color: hsl(120, 100%, 40%);">+ target = talloc_zero(ctx, struct osmo_nri_range);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(target);</span><br><span style="color: hsl(120, 100%, 40%);">+ *target = *add;</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_add_entry_sorted(nri_ranges, target);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Overlap found, join into existing entry */</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_extend(target, add);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remove redundant entries */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(range, range_next, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (range == target)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nri_touch(target, range))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_extend(target, range);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&range->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(range);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Remove a range of NRI values from a list of nri_range structs.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Intelligently drop, cut and/or combine the entries in a list of NRI ranges to no longer include the NRI range given</span><br><span style="color: hsl(120, 100%, 40%);">+ * in 'del'.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc context to allocate new list entries from (if an existing entry is split in two).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[inout] nri_ranges List of talloc allocated struct osmo_nri_range entries to remove values from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] del NRI range to remove from 'nri_ranges'.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error (if the range in 'add' is invalid).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_del(void *ctx, struct llist_head *nri_ranges, const struct osmo_nri_range *del)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range_next;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_range_validate(del, 255))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(range, range_next, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool head;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool tail;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nri_overlap(range, del))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ head = nri_matches_range(range, del->first) && (del->first > range->first);</span><br><span style="color: hsl(120, 100%, 40%);">+ tail = nri_matches_range(range, del->last) && (del->last < range->last);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (head && tail) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Range cut in two */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *new_tail;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Add a new entry for the tail section */</span><br><span style="color: hsl(120, 100%, 40%);">+ new_tail = talloc_zero(ctx, struct osmo_nri_range);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(new_tail);</span><br><span style="color: hsl(120, 100%, 40%);">+ *new_tail = (struct osmo_nri_range){</span><br><span style="color: hsl(120, 100%, 40%);">+ .first = del->last + 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .last = range->last,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&new_tail->entry, &range->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Existing entry becomes the head section */</span><br><span style="color: hsl(120, 100%, 40%);">+ range->last = del->first - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (head) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Range reduced, a head remains */</span><br><span style="color: hsl(120, 100%, 40%);">+ range->last = del->first - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (tail) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Range reduced, a tail remains */</span><br><span style="color: hsl(120, 100%, 40%);">+ range->first = del->last + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* nothing remains */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&range->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(range);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Modulo and shift the given NRI value so that it becomes a value present in a list of NRI ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Only range values within nri_bitlen are used.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[inout] nri_v The NRI value to limit, e.g. random bits or an increment counter value.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range entries indicating valid NRI values, where no entries may</span><br><span style="color: hsl(120, 100%, 40%);">+ * overlap in range values, and all entries must be valid (first <= last).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_limit_by_ranges(int16_t *nri_v, struct llist_head *nri_ranges, uint32_t nri_bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t total_values = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t v = *nri_v;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t range_max = (((int16_t)1) << nri_bitlen) - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (v < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Sum up total amount of range values */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(range, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_range_validate(range, 255))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (range->first > range_max)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ total_values += OSMO_MIN(range_max, range->last) - range->first + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Modulo the given NRI value by that, and pick that nth value from the given ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ * (nri_ranges is pretty much guaranteed to be sorted and range_max checks thus would no longer be needed, but</span><br><span style="color: hsl(120, 100%, 40%);">+ * just check them anyway.) */</span><br><span style="color: hsl(120, 100%, 40%);">+ v %= total_values;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(range, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (range->first > range_max)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ len = OSMO_MIN(range_max, range->last) - range->first + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (v < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *nri_v = range->first + v;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ v -= len;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Nothing found -- there are no entires or my math is off. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Apply osmo_nri_limit_by_ranges() in-place on the NRI value included in a TMSI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Extract the NRI value from the TMSI, limit that to be part of the ranges given in 'nri_ranges', and place the</span><br><span style="color: hsl(120, 100%, 40%);">+ * resulting NRI value back in the TMSI.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[inout] tmsi TMSI value to modify the NRI value in, e.g. fresh randomized bits.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range entries indicating valid NRI values, where no entries may</span><br><span style="color: hsl(120, 100%, 40%);">+ * overlap in range values, and all entries must be valid (first <= last).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_bitlen Valid NRI range in nr of bits used.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_tmsi_nri_limit_by_ranges(uint32_t *tmsi, struct llist_head *nri_ranges, uint8_t nri_bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t nri_v;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_tmsi_nri_get(&nri_v, *tmsi, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_limit_by_ranges(&nri_v, nri_ranges, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tmsi_nri_set(tmsi, nri_v, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Compose a human readable representation of a list of NRI ranges in a buffer, like "23..42,123..142".</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] buf Target buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buflen sizeof(buf).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range entries indicating NRI values.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns strlen() of string that would be written if the buffer is large enough, like snprintf().</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_ranges_to_str_buf(char *buf, size_t buflen, struct llist_head *nri_ranges)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *range;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };</span><br><span style="color: hsl(120, 100%, 40%);">+ bool first = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!nri_ranges || llist_empty(nri_ranges)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "empty");</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(range, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "%s%d..%d", first ? "" : ",", range->first, range->last);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Compose a human readable representation of a list of NRI ranges in a talloc buffer, like "23..42,123..142".</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc context.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range entries indicating NRI values.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns a talloc allocated string.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_nri_ranges_to_str_c(void *ctx, struct llist_head *nri_ranges)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 16, "ERROR", osmo_nri_ranges_to_str_buf, nri_ranges);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Parse a string to an NRI value, allowing both decimal and hexadecimal formats; useful for VTY config</span><br><span style="color: hsl(120, 100%, 40%);">+ * implementations.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] dst Write the resulting NRI value to this location.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] str Decimal "511" or hex "0x1ff" string to parse.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_nri_parse(int16_t *dst, const char *str)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char *endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ int64_t val;</span><br><span style="color: hsl(120, 100%, 40%);">+ int base = 10;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_str_startswith(str, "0x")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ str += 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ base = 16;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!str || !str[0])</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ errno = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ val = strtoull(str, &endp, base);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (errno || *endp != '\0')</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (val < 0 || val > INT16_MAX)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = val;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Parse string arguments to a struct osmo_nri_range; useful for VTY config implementations.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Validate and parse 'first' and optional 'last' string arguments into struct osmo_nri_range values.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The strings may be in decimal format ("511") or hexadecimal with leading "0x" ("0x1ff").</span><br><span style="color: hsl(120, 100%, 40%);">+ * If only one of 'first'/'last' is provided, the resulting range will have only that value (first == last).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] nri_range Target for parsed values.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] first_str Decimal or hex string, representing the first value in the range, or NULL if omitted.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] last_str Decimal or hex string, representing the last value in the range, or NULL if omitted.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, negative on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static int osmo_nri_parse_range(struct osmo_nri_range *nri_range, const char *first_str, const char *last_str)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!first_str) {</span><br><span style="color: hsl(120, 100%, 40%);">+ first_str = last_str;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_str = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!first_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_parse(&nri_range->first, first_str))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_range->last = nri_range->first;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (last_str) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_parse(&nri_range->last, last_str))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! VTY implementation for adding an NRI range to a list of ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Parse one or, if present, two argv arguments, which must be numbers representing the first and last value to add to</span><br><span style="color: hsl(120, 100%, 40%);">+ * the list of nri_ranges, in decimal format ("511") or hexadecimal with leading "0x" ("0x1ff"). If the range values</span><br><span style="color: hsl(120, 100%, 40%);">+ * surpass the nri_bitlen, print a warning, but still add the values to the list.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] message String constant to alert the user with.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] added_range If not NULL, write the range parsing result to this location.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc context to allocate new list entries from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range, to add to.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] argc Argument count.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] argv Argument list.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_bitlen Valid NRI range in nr of bits used.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, -1 on error, 1 for a warning (if adding was successful but the added range surpasses</span><br><span style="color: hsl(120, 100%, 40%);">+ * nri_bitlen).</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_vty_add(const char **message, struct osmo_nri_range *added_range,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ctx, struct llist_head *nri_ranges, int argc, const char **argv, uint8_t nri_bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range add_range;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_parse_range(&add_range, argv[0], argc > 1 ? argv[1] : NULL)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = "Error: cannot parse NRI range";</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (added_range)</span><br><span style="color: hsl(120, 100%, 40%);">+ *added_range = add_range;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_add(ctx, nri_ranges, &add_range)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = "Error: failed to add NRI range";</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nri_bitlen <= OSMO_NRI_BITLEN_MAX && osmo_nri_range_validate(&add_range, nri_bitlen)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = "Warning: NRI range surpasses current NRI bitlen";</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! VTY implementation for removing an NRI range from a list of ranges.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Parse one or, if present, two argv arguments, which must be numbers representing the first and last value to add to</span><br><span style="color: hsl(120, 100%, 40%);">+ * the list of nri_ranges, in decimal format ("511") or hexadecimal with leading "0x" ("0x1ff").</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] message String constant to alert the user with.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[out] removed_range If not NULL, write the range parsing result to this location.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx Talloc context to allocate new list entries from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nri_ranges List of struct osmo_nri_range, to remove from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] argc Argument count.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] argv Argument list.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success, -1 on error, 1 for a warning.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_nri_vty_del(const char **message, struct osmo_nri_range *removed_range,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *ctx, struct llist_head *nri_ranges, int argc, const char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range del_range;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_parse_range(&del_range, argv[0], argc > 1 ? argv[1] : NULL)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = "Error: cannot parse NRI range";</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (removed_range)</span><br><span style="color: hsl(120, 100%, 40%);">+ *removed_range = del_range;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_del(ctx, nri_ranges, &del_range)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = "Error: failed to remove NRI range";</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *message = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index 98cdac5..6760991 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -669,6 +669,18 @@</span><br><span> </span><br><span> osmo_tmsi_nri_get;</span><br><span> osmo_tmsi_nri_set;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_ranges_to_str_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_ranges_to_str_c;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_vty_add;</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_vty_del;</span><br><span> </span><br><span> local: *;</span><br><span> };</span><br><span>diff --git a/tests/gsm23236/gsm23236_test.c b/tests/gsm23236/gsm23236_test.c</span><br><span>index b005a21..be986f9 100644</span><br><span>--- a/tests/gsm23236/gsm23236_test.c</span><br><span>+++ b/tests/gsm23236/gsm23236_test.c</span><br><span>@@ -29,6 +29,9 @@</span><br><span> #include <osmocom/gsm/gsm23236.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void *ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+bool ok = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void bitdump(uint8_t count, uint32_t val)</span><br><span> {</span><br><span> uint32_t bit;</span><br><span>@@ -137,10 +140,9 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool test_nri_get_set()</span><br><span style="color: hsl(120, 100%, 40%);">+void test_nri_get_set()</span><br><span> {</span><br><span> struct nri_get_set_test *t;</span><br><span style="color: hsl(0, 100%, 40%);">- bool ok = true;</span><br><span> </span><br><span> for (t = nri_get_set_tests; t < &nri_get_set_tests[ARRAY_SIZE(nri_get_set_tests)]; t++) {</span><br><span> int16_t nri_v = 0;</span><br><span>@@ -181,17 +183,436 @@</span><br><span> ok = false;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ok;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int main(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+struct nri_validate_tc {</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t nri;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t nri_bitlen;</span><br><span style="color: hsl(120, 100%, 40%);">+ int expect_rc;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct nri_validate_tc nri_validate_tests[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MIN, .nri_bitlen = 10, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -23, .nri_bitlen = 10, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -1, .nri_bitlen = 10, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 0, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = (1 << 10) - 1, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = (1 << 10), .nri_bitlen = 10, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MAX, .nri_bitlen = 10, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MIN, .nri_bitlen = 5, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -23, .nri_bitlen = 5, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -1, .nri_bitlen = 5, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 0, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = (1 << 5) - 1, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = (1 << 5), .nri_bitlen = 5, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MAX, .nri_bitlen = 5, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MIN, .nri_bitlen = 1, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -23, .nri_bitlen = 1, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -1, .nri_bitlen = 1, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 0, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 1, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 2, .nri_bitlen = 1, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MAX, .nri_bitlen = 1, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MIN, .nri_bitlen = 0, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -23, .nri_bitlen = 0, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = -1, .nri_bitlen = 0, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 0, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = 1, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .nri = INT16_MAX, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_nri_validate()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bool pass = true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- pass = pass && test_nri_get_set();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(pass);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return EXIT_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nri_validate_tc *t;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n%s()\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (t = nri_validate_tests; (t - nri_validate_tests) < ARRAY_SIZE(nri_validate_tests); t++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = osmo_nri_validate(t->nri, t->nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_validate(%d, %u) = %d ", t->nri, t->nri_bitlen, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == t->expect_rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ok\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ERROR, expected rc = %d\n", t->expect_rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct nri_range_validate_tc {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range range;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t nri_bitlen;</span><br><span style="color: hsl(120, 100%, 40%);">+ int expect_rc;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct nri_range_validate_tc nri_range_validate_tests[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MIN, .last = INT16_MIN }, .nri_bitlen = 10, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -23, .last = -23 }, .nri_bitlen = 10, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -1, .last = -1 }, .nri_bitlen = 10, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 10) - 1, .last = (1 << 10) - 1 }, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 10), .last = (1 << 10) }, .nri_bitlen = 10, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MAX, .last = INT16_MAX }, .nri_bitlen = 10, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MIN, .last = INT16_MIN }, .nri_bitlen = 5, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -23, .last = -23 }, .nri_bitlen = 5, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -1, .last = -1 }, .nri_bitlen = 5, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 5) - 1, .last = (1 << 5) - 1 }, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 5), .last = (1 << 5) }, .nri_bitlen = 5, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MAX, .last = INT16_MAX }, .nri_bitlen = 5, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MIN, .last = INT16_MIN }, .nri_bitlen = 1, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -23, .last = -23 }, .nri_bitlen = 1, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -1, .last = -1 }, .nri_bitlen = 1, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 1, .last = 1 }, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 2, .last = 2 }, .nri_bitlen = 1, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MAX, .last = INT16_MAX }, .nri_bitlen = 1, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MIN, .last = INT16_MIN }, .nri_bitlen = 0, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -23, .last = -23 }, .nri_bitlen = 0, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = -1, .last = -1 }, .nri_bitlen = 0, .expect_rc = -1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 1, .last = 1 }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = INT16_MAX, .last = INT16_MAX }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MIN }, .nri_bitlen = 10, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -23 }, .nri_bitlen = 10, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -1 }, .nri_bitlen = 10, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = (1 << 10) - 1 }, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = (1 << 10) }, .nri_bitlen = 10, .expect_rc = 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MAX }, .nri_bitlen = 10, .expect_rc = 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MIN }, .nri_bitlen = 5, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -23 }, .nri_bitlen = 5, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -1 }, .nri_bitlen = 5, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = (1 << 5) - 1 }, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = (1 << 5) }, .nri_bitlen = 5, .expect_rc = 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MAX }, .nri_bitlen = 5, .expect_rc = 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MIN }, .nri_bitlen = 1, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -23 }, .nri_bitlen = 1, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -1 }, .nri_bitlen = 1, .expect_rc = -2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 1 }, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 2 }, .nri_bitlen = 1, .expect_rc = 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MAX }, .nri_bitlen = 1, .expect_rc = 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MIN }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -23 }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = -1 }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 1 }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = INT16_MAX }, .nri_bitlen = 0, .expect_rc = 1 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 1, .last = 0 }, .nri_bitlen = 10, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 10) - 1, .last = (1 << 10) - 1 }, .nri_bitlen = 10, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 10) - 1, .last = (1 << 10) - 2 }, .nri_bitlen = 10, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 10) - 1, .last = 0 }, .nri_bitlen = 10, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 1, .last = 0 }, .nri_bitlen = 5, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 5) - 1, .last = (1 << 5) - 1 }, .nri_bitlen = 5, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 5) - 1, .last = (1 << 5) - 2 }, .nri_bitlen = 5, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = (1 << 5) - 1, .last = 0 }, .nri_bitlen = 5, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 0, .last = 0 }, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 1, .last = 1 }, .nri_bitlen = 1, .expect_rc = 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .range = { .first = 1, .last = 0 }, .nri_bitlen = 1, .expect_rc = -3 },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_nri_range_validate()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nri_range_validate_tc *t;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n%s()\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (t = nri_range_validate_tests; (t - nri_range_validate_tests) < ARRAY_SIZE(nri_range_validate_tests); t++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = osmo_nri_range_validate(&t->range, t->nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_range_validate({%d,%d}, %u) = %d ", t->range.first, t->range.last, t->nri_bitlen, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == t->expect_rc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ok\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ERROR, expected rc = %d\n", t->expect_rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void dump_list(struct llist_head *nri_ranges)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range *r;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("nri_ranges = {\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(r, nri_ranges, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" { %d, %d },\n", r->first, r->last);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (osmo_nri_range_validate(r, 255)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ^^^^^ ERROR: invalid range\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("};\n");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_nri_list()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ LLIST_HEAD(nri_ranges);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n%s()\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define ADD(FIRST, LAST) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range r = { .first = FIRST, .last = LAST }; \</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc; \</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_add(ctx, &nri_ranges, &r); \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_add(%d, %d) -> %d\n", r.first, r.last, rc); \</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_list(&nri_ranges); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEL(FIRST, LAST) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range r = { .first = FIRST, .last = LAST }; \</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc; \</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_del(ctx, &nri_ranges, &r); \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_del(%d, %d) -> %d\n", r.first, r.last, rc); \</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_list(&nri_ranges); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define MATCHES(NRI, EXPECT_MATCH) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ bool matches = osmo_nri_matches_list(&nri_ranges, NRI); \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_matches_list(%d) -> %s\n", NRI, matches ? "true" : "false"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (matches != EXPECT_MATCH) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false; \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ^ ERROR: expected " #EXPECT_MATCH "\n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define OVERLAPS(FIRST, LAST, EXPECT_OVERLAP) do { \</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_nri_range r = { .first = FIRST, .last = LAST }; \</span><br><span style="color: hsl(120, 100%, 40%);">+ bool overlaps = osmo_nri_range_overlaps_list(&nri_ranges, &r); \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_range_overlaps_list(%d, %d) -> %s\n", r.first, r.last, overlaps ? "true" : "false"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (overlaps != EXPECT_OVERLAP) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false; \</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ^ ERROR: expected " #EXPECT_OVERLAP "\n"); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_list(&nri_ranges);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MIN, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(-1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MAX, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(100, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(INT16_MIN, -1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(-100, 100, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(10, 20, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(100, 200);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MIN, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(-1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MAX, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(99, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(101, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(199, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(200, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(201, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(INT16_MIN, -1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(-100, 100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(10, 20, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(10, 99, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(10, 100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(10, 150, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(99, 99, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(100, 100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(150, 300, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(200, 300, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(201, 300, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\ndel from start:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(0, 110);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(111, 111);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(112, 199);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MIN, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(-1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MAX, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(199, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(200, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(201, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(INT16_MIN, -1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(-1000, 1000, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(0, 199, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(0, 200, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(0, 201, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(0, 1000, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(199, 199, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(200, 200, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(201, 201, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\ndel from end:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(100, 200);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(190, INT16_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(189, 189);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(101, 188);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MIN, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(-1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MAX, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(99, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(101, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\ndel from middle:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(100, 200);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(150, 160);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(110, 120);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(130, 130);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(180, 190);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MIN, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(-1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MAX, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(99, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(109, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(110, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(120, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(121, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(129, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(130, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(131, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(148, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(149, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(150, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(160, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(161, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(170, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(179, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(180, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(185, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(190, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(191, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(195, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(200, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(201, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(1000, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(110, 120, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(110, 130, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OVERLAPS(100, 200, true);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\ndel across whole chunks:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(115, 185);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(105, 195);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(0, 1000);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\nadd to join chunks:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(0, 100);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(11, 19);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(23, 23);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(30, 41);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(23, 23);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(11, 41);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(10, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(11, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(24, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(41, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(42, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(100, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(101, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\nborder cases:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(INT16_MAX, INT16_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(1, INT16_MAX - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MIN, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(-1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(0, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCHES(INT16_MAX, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(INT16_MAX, INT16_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(1, INT16_MAX - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\nrange errors:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(-1, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(-20, -10);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(100, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(0, INT16_MAX);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(-1, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(-20, -10);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEL(100, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void test_nri_limit_by_ranges()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t nri_bitlen = 8;</span><br><span style="color: hsl(120, 100%, 40%);">+ const int16_t expect_nri_vals[] = { 10, 20, 21, 30, 31, 32 };</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ LLIST_HEAD(nri_ranges);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n%s()\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(10, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(20, 21);</span><br><span style="color: hsl(120, 100%, 40%);">+ ADD(30, 32);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 19; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t nri_v;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t expect_nri_v = expect_nri_vals[i % ARRAY_SIZE(expect_nri_vals)];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ nri_v = i;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_nri_limit_by_ranges(&nri_v, &nri_ranges, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_nri_limit_by_ranges(%d) -> nri_v=%d rc=%d", i, nri_v, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rc && nri_v == expect_nri_v) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ok\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ERROR: expected nri_v=%d rc=0\n", expect_nri_v);</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 19; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t nri_v;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t tmsi, tmsi2;</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t expect_nri_v = expect_nri_vals[i % ARRAY_SIZE(expect_nri_vals)];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tmsi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tmsi_nri_set(&tmsi, i, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ tmsi2 = tmsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_tmsi_nri_limit_by_ranges(&tmsi2, &nri_ranges, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tmsi_nri_get(&nri_v, tmsi2, nri_bitlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo_tmsi_nri_limit_by_ranges(0x%08x, %u) -> tmsi=0x%08x nri_v=%d rc=%d",</span><br><span style="color: hsl(120, 100%, 40%);">+ tmsi, nri_bitlen, tmsi2, nri_v, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!rc && nri_v == expect_nri_v) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ok\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" ERROR: expected nri_v=%d rc=0\n", expect_nri_v);</span><br><span style="color: hsl(120, 100%, 40%);">+ ok = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int main()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx = talloc_named_const(NULL, 0, "nri_test");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nri_get_set();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nri_validate();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nri_range_validate();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nri_list();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nri_limit_by_ranges();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ok) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\nFAIL\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\npass\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/gsm23236/gsm23236_test.ok b/tests/gsm23236/gsm23236_test.ok</span><br><span>index 7de324c..5bdc3f3 100644</span><br><span>--- a/tests/gsm23236/gsm23236_test.ok</span><br><span>+++ b/tests/gsm23236/gsm23236_test.ok</span><br><span>@@ -88,3 +88,427 @@</span><br><span> ok</span><br><span> osmo_tmsi_nri_set(0x01234567, 0x7fff, 0) -> tmsi=0x01234567 rc=-1</span><br><span> ok</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test_nri_validate()</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-32768, 10) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-23, 10) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-1, 10) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(0, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(1023, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(1024, 10) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(32767, 10) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-32768, 5) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-23, 5) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-1, 5) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(0, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(31, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(32, 5) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(32767, 5) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-32768, 1) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-23, 1) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-1, 1) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(0, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(1, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(2, 1) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(32767, 1) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-32768, 0) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-23, 0) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(-1, 0) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(0, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(1, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_validate(32767, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test_nri_range_validate()</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-32768,-32768}, 10) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-23,-23}, 10) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-1,-1}, 10) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1023,1023}, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1024,1024}, 10) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({32767,32767}, 10) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-32768,-32768}, 5) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-23,-23}, 5) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-1,-1}, 5) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({31,31}, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({32,32}, 5) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({32767,32767}, 5) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-32768,-32768}, 1) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-23,-23}, 1) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-1,-1}, 1) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1,1}, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({2,2}, 1) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({32767,32767}, 1) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-32768,-32768}, 0) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-23,-23}, 0) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({-1,-1}, 0) = -1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1,1}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({32767,32767}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-32768}, 10) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-23}, 10) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-1}, 10) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,1023}, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,1024}, 10) = 2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,32767}, 10) = 2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-32768}, 5) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-23}, 5) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-1}, 5) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,31}, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,32}, 5) = 2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,32767}, 5) = 2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-32768}, 1) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-23}, 1) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-1}, 1) = -2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,1}, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,2}, 1) = 2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,32767}, 1) = 2 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-32768}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-23}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,-1}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,1}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,32767}, 0) = 1 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1,0}, 10) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1023,1023}, 10) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1023,1022}, 10) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1023,0}, 10) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1,0}, 5) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({31,31}, 5) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({31,30}, 5) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({31,0}, 5) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({0,0}, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1,1}, 1) = 0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_validate({1,0}, 1) = -3 ok</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test_nri_list()</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-32768) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(32767) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(100) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(-32768, -1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(-100, 100) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(10, 20) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(100, 200) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-32768) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(32767) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(99) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(101) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(199) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(200) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(201) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(-32768, -1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(-100, 100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(10, 20) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(10, 99) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(10, 100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(10, 150) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(99, 99) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(100, 100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(150, 300) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(200, 300) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(201, 300) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+del from start:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(0, 110) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 111, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(111, 111) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 112, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(112, 199) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 200, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-32768) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(32767) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(199) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(200) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(201) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(-32768, -1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(-1000, 1000) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(0, 199) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(0, 200) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(0, 201) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(0, 1000) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(199, 199) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(200, 200) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(201, 201) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+del from end:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(100, 200) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(190, 32767) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 189 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(189, 189) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 188 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(101, 188) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-32768) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(32767) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(99) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(101) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+del from middle:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(100, 200) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(150, 160) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 149 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 161, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(110, 120) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 109 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 121, 149 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 161, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(130, 130) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 109 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 121, 129 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 131, 149 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 161, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(180, 190) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 109 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 121, 129 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 131, 149 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 161, 179 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 191, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-32768) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(32767) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(99) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(109) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(110) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(120) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(121) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(129) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(130) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(131) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(148) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(149) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(150) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(160) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(161) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(170) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(179) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(180) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(185) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(190) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(191) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(195) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(200) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(201) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(1000) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(110, 120) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(110, 130) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_range_overlaps_list(100, 200) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+del across whole chunks:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(115, 185) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 109 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 191, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(105, 195) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 100, 104 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 196, 200 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(0, 1000) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+add to join chunks:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(0, 100) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(11, 19) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 20, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(23, 23) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 20, 22 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 24, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(30, 41) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 20, 22 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 24, 29 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 42, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(23, 23) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 20, 29 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 42, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(11, 41) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(10) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(11) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(24) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(41) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(42) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(100) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(101) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+border cases:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(0, 0) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(32767, 32767) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 100 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 32767, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(1, 32766) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-32768) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(-1) -> false</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(0) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_matches_list(32767) -> true</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(0, 0) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 1, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(32767, 32767) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 1, 32766 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(1, 32766) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+range errors:</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(-1, -1) -> -1</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(-20, -10) -> -1</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(100, 1) -> -1</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(0, 32767) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(-1, -1) -> -1</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(-20, -10) -> -1</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_del(100, 1) -> -1</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 32767 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+test_nri_limit_by_ranges()</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(10, 10) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 10, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(20, 21) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 10, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 20, 21 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_add(30, 32) -> 0</span><br><span style="color: hsl(120, 100%, 40%);">+nri_ranges = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 10, 10 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 20, 21 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 30, 32 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(0) -> nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(1) -> nri_v=20 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(2) -> nri_v=21 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(3) -> nri_v=30 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(4) -> nri_v=31 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(5) -> nri_v=32 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(6) -> nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(7) -> nri_v=20 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(8) -> nri_v=21 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(9) -> nri_v=30 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(10) -> nri_v=31 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(11) -> nri_v=32 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(12) -> nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(13) -> nri_v=20 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(14) -> nri_v=21 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(15) -> nri_v=30 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(16) -> nri_v=31 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(17) -> nri_v=32 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_nri_limit_by_ranges(18) -> nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00000000, 8) -> tmsi=0x000a0000 nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00010000, 8) -> tmsi=0x00140000 nri_v=20 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00020000, 8) -> tmsi=0x00150000 nri_v=21 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00030000, 8) -> tmsi=0x001e0000 nri_v=30 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00040000, 8) -> tmsi=0x001f0000 nri_v=31 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00050000, 8) -> tmsi=0x00200000 nri_v=32 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00060000, 8) -> tmsi=0x000a0000 nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00070000, 8) -> tmsi=0x00140000 nri_v=20 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00080000, 8) -> tmsi=0x00150000 nri_v=21 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00090000, 8) -> tmsi=0x001e0000 nri_v=30 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x000a0000, 8) -> tmsi=0x001f0000 nri_v=31 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x000b0000, 8) -> tmsi=0x00200000 nri_v=32 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x000c0000, 8) -> tmsi=0x000a0000 nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x000d0000, 8) -> tmsi=0x00140000 nri_v=20 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x000e0000, 8) -> tmsi=0x00150000 nri_v=21 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x000f0000, 8) -> tmsi=0x001e0000 nri_v=30 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00100000, 8) -> tmsi=0x001f0000 nri_v=31 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00110000, 8) -> tmsi=0x00200000 nri_v=32 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_tmsi_nri_limit_by_ranges(0x00120000, 8) -> tmsi=0x000a0000 nri_v=10 rc=0 ok</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+pass</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/18540">change 18540</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/18540"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I68e4156824032772f460042499bbc693380186dc </div>
<div style="display:none"> Gerrit-Change-Number: 18540 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>