osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/39038?usp=email )
Change subject: Make compatible with libosmocore >= 1.10.0
......................................................................
Make compatible with libosmocore >= 1.10.0
Work towards preparing a release tag for libosmo-gprs, as osmocom-bb
is now in osmocom:latest but cannot build due to the missing
libosmo-gprs dependency.
libosmo-gprs currently doesn't build against latest stable libosmocore,
because it uses new enum values introduced in libosmocore master. Add
defines for these temporarily, until a new libosmocore version is
released and libosmo-gprs can depend on it.
Related: osmocom-bb Ifbfaead7ae89d9ac747d1bb495f061c5cbe7a241
Related: fbdcd28 ("gmm: gprs_gmm_att_tlvdef: Add newer definitions…")
Change-Id: I7476f1c7915770d6529104a7a58cb8c16a371ddd
---
M TODO-RELEASE
M src/gmm/gmm_pdu.c
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/38/39038/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 9ce8fb2..60f6474 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -9,3 +9,4 @@
#library what description / commit summary line
libosmocore >1.8.0 gsm_fn2rfn(), gsm_rfn2fn()
libosmocore >1.10.0 enum gsm48_gprs_ie_mm: GSM48_IE_GMM_UE_NET_CAP,
GSM48_IE_GMM_VD_PREF_UE_USAGE
+libosmocore >1.10.0 remove "Remove after depending on libosmocore > 1.10.0"
code in gmm_pdu.c
diff --git a/src/gmm/gmm_pdu.c b/src/gmm/gmm_pdu.c
index 084f2a6..cc1f2f8 100644
--- a/src/gmm/gmm_pdu.c
+++ b/src/gmm/gmm_pdu.c
@@ -129,6 +129,20 @@
.non_drx_timer = 0,
};
+/* Remove after depending on libosmocore > 1.10.0 */
+#ifndef GSM48_IE_GMM_UE_NET_CAP
+#define GSM48_IE_GMM_UE_NET_CAP 0x58
+#endif
+#ifndef GSM48_IE_GMM_VD_PREF_UE_USAGE
+#define GSM48_IE_GMM_VD_PREF_UE_USAGE 0x5d
+#endif
+#ifndef GSM48_IE_GMM_ADD_IDENTITY
+#define GSM48_IE_GMM_ADD_IDENTITY 0x1a
+#endif
+#ifndef GSM48_IE_GMM_RAI2
+#define GSM48_IE_GMM_RAI2 0x1b
+#endif
+
const struct tlv_definition gprs_gmm_att_tlvdef = {
.def = {
[GSM48_IE_GMM_CIPH_CKSN] = { TLV_TYPE_SINGLE_TV, 1 },
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/39038?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I7476f1c7915770d6529104a7a58cb8c16a371ddd
Gerrit-Change-Number: 39038
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
