November 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ggsn[master]: gtp_new(): use talloc instead of calloc/free

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38930?usp=email ) Change subject: gtp_new(): use talloc instead of calloc/free ...................................................................... gtp_new(): use talloc instead of calloc/free Required for SGSN Context Req fsm which is using talloc. Change-Id: I7c4a29c4bb1ef3c7bf506e59e99b3a804cabe34b --- M gtp/gsn.c M gtp/gsn_internal.h 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/30/38930/1 diff --git a/gtp/gsn.c b/gtp/gsn.c index 612baf2..b620279 100644 --- a/gtp/gsn.c +++ b/gtp/gsn.c @@ -116,6 +116,8 @@ {} }; +void *tall_gsn_ctx; + /* API Functions */ @@ -466,7 +468,7 @@ { LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", inet_ntoa(*listen)); - *gsn = calloc(sizeof(struct gsn_t), 1); /* TODO */ + *gsn = talloc_zero(tall_gsn_ctx, struct gsn_t); (*gsn)->statedir = statedir; log_restart(*gsn); @@ -551,7 +553,7 @@ rate_ctr_group_free(gsn->ctrg); - free(gsn); + talloc_free(gsn); return 0; } @@ -584,3 +586,8 @@ /* dummy API, deprecated. Return a huge timer to do nothing */ return 0; } + +static __attribute__((constructor)) void gtp_talloc_init(void) +{ + tall_gsn_ctx = talloc_named_const(NULL, 0, "libgtp"); +} diff --git a/gtp/gsn_internal.h b/gtp/gsn_internal.h index deb60c3..860d37b 100644 --- a/gtp/gsn_internal.h +++ b/gtp/gsn_internal.h @@ -1,3 +1,5 @@ #pragma once +extern void *tall_gsn_ctx; + void gtp_queue_timer_start(struct gsn_t *gsn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38930?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7c4a29c4bb1ef3c7bf506e59e99b3a804cabe34b Gerrit-Change-Number: 38930 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

7 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gtp.h: add more GTP cause code from 29.060 v15.3.30

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38929?usp=email ) Change subject: gtp.h: add more GTP cause code from 29.060 v15.3.30 ...................................................................... gtp.h: add more GTP cause code from 29.060 v15.3.30 Change-Id: I1571286f01a24adf10243c9551ca81bacc12f8f9 --- M include/osmocom/gtp/gtp.h 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/29/38929/1 diff --git a/include/osmocom/gtp/gtp.h b/include/osmocom/gtp/gtp.h index 001a696..5c03eaf 100644 --- a/include/osmocom/gtp/gtp.h +++ b/include/osmocom/gtp/gtp.h @@ -91,7 +91,7 @@ static inline const char *gtp_type_name(uint8_t val) { return get_value_string(gtp_type_names, val); } -/* GTP information element cause codes from 29.060 v3.9.0 7.7 */ +/* GTP information element cause codes from 29.060 v15.3.0 7.7.1 */ /* */ #define GTPCAUSE_REQ_IMSI 0 /* Request IMSI */ #define GTPCAUSE_REQ_IMEI 1 /* Request IMEI */ @@ -99,21 +99,26 @@ #define GTPCAUSE_NO_ID_NEEDED 3 /* No identity needed */ #define GTPCAUSE_MS_REFUSES_X 4 /* MS refuses */ #define GTPCAUSE_MS_NOT_RESP_X 5 /* MS is not GPRS responding */ -/* 6-48 For future use */ -/* 49-63 Cause values reserved for GPRS charging protocol use (See GTP' in GSM 12.15) */ +#define GTPCAUSE_REACTIVATION_REQ 6 /* Reactivation Requested */ +#define GTPCAUSE_PDP_ADDR_INACT 7 /* PDP address inactivity timer expires */ +#define GTPCAUSE_NET_FAILURE 8 /* Network failure */ +#define GTPCAUSE_QOS_MISMATCH 9 /* QoS parameter mismatch */ + +/* 10-48 For future use */ +/* 49-63 Cause values reserved for GPRS charging protocol use (See GTP' 3GPP TS 32.295) */ /* 64-127 For future use */ #define GTPCAUSE_ACC_REQ 128 /* Request accepted */ #define GTPCAUSE_NEW_PDP_NET_PREF 129 /* New PDP type due to network preference */ #define GTPCAUSE_NEW_PDP_ADDR_BEAR 130 /* New PDP type due to single address bearer only */ /* 131-176 For future use */ -/* 177-191 Cause values reserved for GPRS charging protocol use (See GTP' In GSM 12.15) */ +/* 177-191 Cause values reserved for GPRS charging protocol use (See GTP' 3GPP TS 32.295) */ #define GTPCAUSE_NON_EXIST 192 /* Non-existent */ #define GTPCAUSE_INVALID_MESSAGE 193 /* Invalid message format */ #define GTPCAUSE_IMSI_NOT_KNOWN 194 /* IMSI not known */ #define GTPCAUSE_MS_DETACHED 195 /* MS is GPRS detached */ #define GTPCAUSE_MS_NOT_RESP 196 /* MS is not GPRS responding */ #define GTPCAUSE_MS_REFUSES 197 /* MS refuses */ -/* 198 For future use */ +#define GTPCAUSE_VERSION_NOT_SUPPORTED 198 /* Version not supported */ #define GTPCAUSE_NO_RESOURCES 199 /* No resources available */ #define GTPCAUSE_NOT_SUPPORTED 200 /* Service not supported */ #define GTPCAUSE_MAN_IE_INCORRECT 201 /* Mandatory IE incorrect */ @@ -136,8 +141,8 @@ #define GTPCAUSE_SYN_ERR_FILTER 218 /* Syntactic errors in packet filter(s) */ #define GTPCAUSE_MISSING_APN 219 /* Missing or unknown APN */ #define GTPCAUSE_UNKNOWN_PDP 220 /* Unknown PDP address or PDP type */ -/* 221-240 For future use */ -/* 241-255 Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) */ +/* 234-240 For future use */ +/* 241-255 Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' 3GPP TS 32.295) */ static inline bool gtp_cause_successful(uint8_t cause) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38929?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I1571286f01a24adf10243c9551ca81bacc12f8f9 Gerrit-Change-Number: 38929 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

7 months

1
0
0 0

[XS] Change in osmo-ggsn[master]: gtp: Make peer addr const in gtp_req/gtp_resp

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38928?usp=email ) Change subject: gtp: Make peer addr const in gtp_req/gtp_resp ...................................................................... gtp: Make peer addr const in gtp_req/gtp_resp Change-Id: I955b82ba8022754c3d23979d5c55bb61233047b1 --- M gtp/gtp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/28/38928/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 02cf8a3..3b32229 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -341,7 +341,7 @@ static int gtp_req(struct gsn_t *gsn, uint8_t version, struct pdp_t *pdp, union gtp_packet *packet, int len, - struct in_addr *inetaddr, void *cbp) + const struct in_addr *inetaddr, void *cbp) { uint8_t ver = GTPHDR_F_GET_VER(packet->flags); struct sockaddr_in addr; @@ -488,7 +488,7 @@ } if (sendto(fd, packet, len, 0, - (struct sockaddr *)peer, sizeof(struct sockaddr_in)) < 0) { + (const struct sockaddr *)peer, sizeof(struct sockaddr_in)) < 0) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SENDTO); LOGP(DLGTP, LOGL_ERROR, "Sendto(fd=%d, msg=%lx, len=%d) failed: Error = %s\n", fd, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38928?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I955b82ba8022754c3d23979d5c55bb61233047b1 Gerrit-Change-Number: 38928 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: daniel <dwillmann(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Context Req In: use correct TEID-C

by daniel

Attention is currently required from: lynxis lazus, pespin. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38920?usp=email ) Change subject: SGSN_Tests: Context Req In: use correct TEID-C ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38920?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I84dc7dda8ee1227edd68d1482a4c5bf267c16418 Gerrit-Change-Number: 38920 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:10:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGSN: BSSGP_ConnHdlr: f_gmm_attach(): allow the SGSN to request the IMEI

by daniel

Attention is currently required from: fixeria, lynxis lazus, pespin. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398?usp=email ) Change subject: SGSN: BSSGP_ConnHdlr: f_gmm_attach(): allow the SGSN to request the IMEI ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id49c9e6ef7517a6a831315ac1f9915c50b88beb6 Gerrit-Change-Number: 38398 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:08:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[M] Change in osmo-msc[master]: vlr: Add support for CS and PS timers

by Jenkins Builder

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38486?usp=email ) Change subject: vlr: Add support for CS and PS timers ...................................................................... Patch Set 3: (15 comments) File src/libvlr/vlr_auth_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/5c65e163_4951742f?usp… : PS3, Line 46: [VLR_SUB_AS_WAIT_RESP] = { .T = 3260 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/4d5a04b7_8202b34f?usp… : PS3, Line 47: [VLR_SUB_AS_WAIT_RESP_RESYNC] = { .T = 3260 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/287ab4e2_35a2e8a2?usp… : PS3, Line 48: [VLR_SUB_AS_WAIT_ID_IMSI] = { .T = 3270 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/ed15b1e5_0460f145?usp… : PS3, Line 52: [VLR_SUB_AS_WAIT_RESP] = { .T = 3360 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/ccd151fa_c2d9db03?usp… : PS3, Line 53: [VLR_SUB_AS_WAIT_RESP_RESYNC] = { .T = 3360 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/4aa163f6_0e9678fd?usp… : PS3, Line 54: [VLR_SUB_AS_WAIT_ID_IMSI] = { .T = 3370 }, please, no spaces at the start of a line File src/libvlr/vlr_lu_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/0142f72d_57de3e84?usp… : PS3, Line 339: [LU_COMPL_VLR_S_WAIT_IMEI] = { .T = 3370 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/a860e2c4_f9a60e2f?usp… : PS3, Line 340: [LU_COMPL_VLR_S_WAIT_IMEI_TMSI] = { .T = 3370 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/89a24866_67baafe1?usp… : PS3, Line 341: [LU_COMPL_VLR_S_WAIT_TMSI_CNF] = { .T = 3350 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/39592802_698882eb?usp… : PS3, Line 683: [VLR_ULA_S_WAIT_IMEISV] = { .T = 3270 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/cde1fdfd_372109ef?usp… : PS3, Line 684: [VLR_ULA_S_WAIT_HLR_CHECK_IMEI_EARLY] = { .T = 3270 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/14ee57bb_68440f49?usp… : PS3, Line 685: [VLR_ULA_S_WAIT_IMSI] = { .T = 3270 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/0d6eceb7_2cf13e74?usp… : PS3, Line 689: [VLR_ULA_S_WAIT_IMEISV] = { .T = 3370 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/20ac0886_4e8243ee?usp… : PS3, Line 690: [VLR_ULA_S_WAIT_HLR_CHECK_IMEI_EARLY] = { .T = 3370 }, please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20185): https://gerrit.osmocom.org/c/osmo-msc/+/38486/comment/362f5b96_802bd868?usp… : PS3, Line 691: [VLR_ULA_S_WAIT_IMSI] = { .T = 3370 }, please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I364973b8d9e277ec5963343c0a83061e81a5baba Gerrit-Change-Number: 38486 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:02:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months

1
0
0 0

[M] Change in osmo-msc[master]: vlr: add PS support

by Jenkins Builder

Attention is currently required from: lynxis lazus. Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email ) Change subject: vlr: add PS support ...................................................................... Patch Set 3: (3 comments) File src/libvlr/vlr_lu_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20176): https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/45148626_969d393f?usp… : PS3, Line 575: static int lu_compl_vlr_timeout(struct osmo_fsm_inst *fi) { open brace '{' following function definitions go on the next line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20176): https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/297e3357_b395d21c?usp… : PS3, Line 588: LOGPFSML(fi, LOGL_ERROR, "LU Compl timeout %i / %i \n", fi->T, lcvp->N); unnecessary whitespace before a quoted newline Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20176): https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/2bf9098b_a898cd8a?usp… : PS3, Line 588: LOGPFSML(fi, LOGL_ERROR, "LU Compl timeout %i / %i \n", fi->T, lcvp->N); Use %d instead of %i -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie9ffeb140c9d354b3a0f4822e2619f623235add0 Gerrit-Change-Number: 38490 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 15:01:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SGSN_Tests: Remove mm context triplets

by daniel

Attention is currently required from: lynxis lazus. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38922?usp=email ) Change subject: SGSN_Tests: Remove mm context triplets ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38922?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I60a3331396cb9905ec9a4df9b1e65a3291a51058 Gerrit-Change-Number: 38922 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 14:59:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: SGSN: fix encoding of IMEISV in Auth and Ciphering Response

by daniel

Attention is currently required from: laforge, lynxis lazus. daniel has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38414?usp=email ) Change subject: SGSN: fix encoding of IMEISV in Auth and Ciphering Response ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38414?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79dd79840de58f450c1a05e704fd9bd831455716 Gerrit-Change-Number: 38414 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 14:56:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[S] Change in libosmocore[master]: gsm_utils: add gprs_tlli2tmsi()

by lynxis lazus

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/38764?usp=email ) Change subject: gsm_utils: add gprs_tlli2tmsi() ...................................................................... gsm_utils: add gprs_tlli2tmsi() A converter function which converts from a TLLI into a TMSI. Change-Id: I9d3464922c89383099a5f3cdd1458c0ecc28ee18 --- M include/osmocom/gsm/gsm_utils.h M src/gsm/gsm_utils.c M src/gsm/libosmogsm.map M tests/gprs/gprs_test.c 4 files changed, 35 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index b250c59..72bd131 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -211,6 +211,7 @@ int gprs_tlli_type(uint32_t tlli); uint32_t gprs_tmsi2tlli(uint32_t p_tmsi, enum gprs_tlli_type type); +uint32_t gprs_tlli2tmsi(uint32_t tlli); /* Osmocom internal, not part of any gsm spec */ enum gsm_phys_chan_config { diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index bb40339..64fbd63 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -1019,6 +1019,27 @@ return TLLI_RESERVED; } +/*! Determine P-TMSI from foreign and local TLLIs + * + * \param[in] tlli P-TMSI + * \param[in] type TLLI Type we want to derive from \a p_tmsi + * \returns P-TMSI or 0xffffffff on error. */ +uint32_t gprs_tlli2tmsi(uint32_t tlli) +{ + uint32_t ptmsi = 0xc0000000; + + switch (gprs_tlli_type(tlli)) { + case TLLI_LOCAL: + case TLLI_FOREIGN: + break; + default: + return 0xffffffff; + } + + ptmsi |= tlli; + return ptmsi; +} + /*! Determine TLLI from P-TMSI * \param[in] p_tmsi P-TMSI * \param[in] type TLLI Type we want to derive from \a p_tmsi diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 8d17ce3..7c78347 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -73,6 +73,7 @@ gprs_cipher_key_length; gprs_tlli_type; gprs_tmsi2tlli; +gprs_tlli2tmsi; gprs_ms_net_cap_gea_supported; gprs_msgt_gmm_names; diff --git a/tests/gprs/gprs_test.c b/tests/gprs/gprs_test.c index 70e3009..a98728c 100644 --- a/tests/gprs/gprs_test.c +++ b/tests/gprs/gprs_test.c @@ -7,6 +7,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/gsm/apn.h> +#include <osmocom/gsm/gsm_utils.h> static void apn_round_trip(const uint8_t *input, size_t len, const char *wanted_output) { @@ -110,6 +111,16 @@ } } +static void test_ptmsi_tlli(void) +{ + OSMO_ASSERT(gprs_tlli2tmsi(0xc0010203) == 0xc0010203); + OSMO_ASSERT(gprs_tlli2tmsi(0x80010203) == 0xc0010203); + OSMO_ASSERT(gprs_tlli2tmsi(0x00010203) == 0xffffffff); + + OSMO_ASSERT(gprs_tmsi2tlli(0xc0010203, TLLI_LOCAL) == 0xc0010203); + OSMO_ASSERT(gprs_tmsi2tlli(0xc0010203, TLLI_FOREIGN) == 0x80010203); +} + const struct log_info_cat default_categories[] = { }; @@ -124,6 +135,7 @@ osmo_init_logging2(ctx, &info); test_gsm_03_03_apn(); + test_ptmsi_tlli(); printf("Done.\n"); return EXIT_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9d3464922c89383099a5f3cdd1458c0ecc28ee18 Gerrit-Change-Number: 38764 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org>

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024