Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/12410 )
Change subject: GSUP: add end marker to enum osmo_gsup_iei
......................................................................
GSUP: add end marker to enum osmo_gsup_iei
Simplify gsup_test.c by defining an end marker in gsup.h. No need to
manually update the last element every time anymore.
The C standard guarantees, that the end marker will have the last value
plus one: "Each subsequent enumerator with no = defines its enumeration
constant as the value of the constant expression obtained by adding 1 to
the value of the previous enumeration constant." (From C99: 6.7.2.2
Enumeration specifiers)
Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17
---
M include/osmocom/gsm/gsup.h
M tests/gsup/gsup_test.c
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Vadim Yanitskiy: Looks good to me, approved
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h
index 51871e4..37e474c 100644
--- a/include/osmocom/gsm/gsup.h
+++ b/include/osmocom/gsm/gsup.h
@@ -98,6 +98,8 @@
OSMO_GSUP_SM_RP_CAUSE_IE = 0x44,
OSMO_GSUP_SM_RP_MMS_IE = 0x45,
OSMO_GSUP_SM_ALERT_RSN_IE = 0x46,
+
+ _OSMO_GSUP_IEI_END_MARKER
};
/*! GSUP message type */
diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c
index b3a8c77..079a703 100644
--- a/tests/gsup/gsup_test.c
+++ b/tests/gsup/gsup_test.c
@@ -401,11 +401,7 @@
osmo_hexdump(t->data + j, ie_end - j));
OSMO_ASSERT(j <= ie_end - 2);
- /**
- * FIXME: share the maximal IE value somehow
- * in order to avoid manual updating of this
- */
- OSMO_ASSERT(t->data[j+0] <=
OSMO_GSUP_SM_ALERT_RSN_IE);
+ OSMO_ASSERT(t->data[j+0] <
_OSMO_GSUP_IEI_END_MARKER);
OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2);
ie_end = j;
--
To view, visit https://gerrit.osmocom.org/12410
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2aab7245e209f0ebd2f33a83d4d181dd3339cb17
Gerrit-Change-Number: 12410
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <[email protected]>
Gerrit-Reviewer: Vadim Yanitskiy <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
