April 2025 - gerrit-log - lists.osmocom.org

[M] Change in osmo-hnbgw[master]: Improve paging to support Paging Area ID

by pespin

Attention is currently required from: lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email ) Change subject: Improve paging to support Paging Area ID ...................................................................... Patch Set 1: (2 comments) File src/osmo-hnbgw/cnlink_paging.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/0be15c8e_2f89a392?u… : PS1, Line 167: const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, RANAP_CN_DomainIndicator_t domain, const RANAP_PagingIEs_t *paging_ies) > Acknowledged, I can remove the param. Done File src/osmo-hnbgw/hnbgw_ranap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/17b292a7_9fd40eda?u… : PS1, Line 409: "Rx Paging from CN: decoding RANAP IE Paging Area ID failed\n"); > Acknowledged Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I915254a39ee04898aa740674b4632a328f281955 Gerrit-Change-Number: 39995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Apr 2025 12:31:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in osmo-hnbgw[master]: Improve paging to support Paging Area ID

by pespin

Attention is currently required from: lynxis lazus, osmith. Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Improve paging to support Paging Area ID ...................................................................... Improve paging to support Paging Area ID Avoid broadcasting to all HNBs if CN requests paging on a specific LAI/RAI. The overall logic is also improved, eg. avoid adding a record if we didn't forward any paging request at all... Change-Id: I915254a39ee04898aa740674b4632a328f281955 --- M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink_paging.c M src/osmo-hnbgw/hnbgw_ranap.c 3 files changed, 120 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/95/39995/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I915254a39ee04898aa740674b4632a328f281955 Gerrit-Change-Number: 39995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

4 months, 1 week

1
0
0 0

[M] Change in osmo-ci[master]: jobs/ttcn3: move ttcn3-ns-test to testenv

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39999?usp=email ) Change subject: jobs/ttcn3: move ttcn3-ns-test to testenv ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39999?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I50c56484754255830ae93a3e2afa884d50d86742 Gerrit-Change-Number: 39999 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 12:26:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: ansible/setup-jenkins-slave: add python3-packaging

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39998?usp=email ) Change subject: ansible/setup-jenkins-slave: add python3-packaging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39998?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic6d3f3e75b4a31870195f9f6ac46c90119b92ee3 Gerrit-Change-Number: 39998 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 10 Apr 2025 12:25:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: Drop unused struct ue_context

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39982?usp=email ) Change subject: Drop unused struct ue_context ...................................................................... Drop unused struct ue_context Commit submitted 2 years ago dropping list of HNBAP UE Context actually forgot to drop the struct declaration too. Fixes: 15e552f2321979ecedb438792d507c55669e4b14 Change-Id: I0c887ab6e9674d7f123668ab38dee8cc6e66469d --- M include/osmocom/hnbgw/hnbgw.h 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 04e6e4e..23857d5 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -416,17 +416,6 @@ struct osmo_timer_list disconnected_timeout; }; -struct ue_context { - /*! Entry in the HNB-global list of UE */ - struct llist_head list; - /*! Unique Context ID for this UE */ - uint32_t context_id; - char imsi[16+1]; - uint32_t tmsi; - /*! UE is serviced via this HNB */ - struct hnb_context *hnb; -}; - struct hnbgw { struct { const char *iuh_local_ip; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0c887ab6e9674d7f123668ab38dee8cc6e66469d Gerrit-Change-Number: 39982 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[M] Change in osmo-hnbgw[master]: Improve paging to support Paging Area ID

by pespin

Attention is currently required from: lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email ) Change subject: Improve paging to support Paging Area ID ...................................................................... Patch Set 1: (3 comments) File src/osmo-hnbgw/cnlink_paging.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/5f0f40a8_d0c716ca?u… : PS1, Line 167: const char *cnlink_paging_add_ranap(struct hnbgw_cnlink *cnlink, RANAP_CN_DomainIndicator_t domain, const RANAP_PagingIEs_t *paging_ies) > what is the purpose of passing the `RANAP_CN_DomainIndicator_t domain` parameter given that below it […] Acknowledged, I can remove the param. File src/osmo-hnbgw/hnbgw_ranap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/b56b56d3_d84cd733?u… : PS1, Line 328: { RANAP_PagingAreaID_PR_rAI, "RAI" }, > why lowercase l and r in lAI and rAI? that's how asn1c generates the enums. https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995/comment/b6382c13_594a0f16?u… : PS1, Line 409: "Rx Paging from CN: decoding RANAP IE Paging Area ID failed\n"); > maybe mention in the error msg that it is broadcasting instead? not sure if that would be obvious fr […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39995?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I915254a39ee04898aa740674b4632a328f281955 Gerrit-Change-Number: 39995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 10 Apr 2025 12:25:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: Fix RAC size in struct umts_cell_id

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39994?usp=email ) Change subject: Fix RAC size in struct umts_cell_id ...................................................................... Fix RAC size in struct umts_cell_id RANAP_IEs.asn: """ RAC ::= OCTET STRING (SIZE (1)) """ Change-Id: Ide7dfd5d0ae87826cb7759d283be6da81dae90f4 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c M tests/umts_cell_id/umts_cell_id_test.c M tests/umts_cell_id/umts_cell_id_test.ok 4 files changed, 10 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index fc110c0..04e6e4e 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -174,7 +174,7 @@ struct umts_cell_id { struct osmo_plmn_id plmn; /*!< Mobile Country Code and Mobile Network Code (000-00 to 999-999) */ uint16_t lac; /*!< Locaton Area Code (1-65534) */ - uint16_t rac; /*!< Routing Area Code (0-255) */ + uint8_t rac; /*!< Routing Area Code (0-255) */ uint16_t sac; /*!< Service Area Code */ uint32_t cid; /*!< Cell ID */ }; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index d4515a8..0a2f670 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -19,6 +19,8 @@ * */ +#include <inttypes.h> + #include <netinet/in.h> #include <netinet/sctp.h> @@ -207,7 +209,8 @@ pos = end + 1; /* parse the rest, where leading zeros do not matter */ - rc = sscanf(pos, "L%hu-R%hu-S%hu-C%u", &ucid->lac, &ucid->rac, &ucid->sac, &ucid->cid); + rc = sscanf(pos, "L%" SCNu16 "-R%" SCNu8 "-S%" SCNu16 "-C%" SCNu32 "", + &ucid->lac, &ucid->rac, &ucid->sac, &ucid->cid); if (rc < 0) return -errno; diff --git a/tests/umts_cell_id/umts_cell_id_test.c b/tests/umts_cell_id/umts_cell_id_test.c index a25b3d1..18c176a 100644 --- a/tests/umts_cell_id/umts_cell_id_test.c +++ b/tests/umts_cell_id/umts_cell_id_test.c @@ -68,7 +68,7 @@ }, { - .id_str = "999-999-L65534-R65535-S65535-C268435455", + .id_str = "999-999-L65534-R255-S65535-C268435455", .id = { .plmn = { .mcc = 999, @@ -76,7 +76,7 @@ .mnc_3_digits = true, }, .lac = 65534, - .rac = 65535, + .rac = 255, .sac = 65535, .cid = (1 << 28) - 1, }, @@ -92,7 +92,7 @@ }, /* TODO? There is no bounds checking on RAC and SAC. { - .id_str = "001-001-L1-R65536-S1-C1", + .id_str = "001-001-L1-R256-S1-C1", .expect_rc = -EINVAL, }, { diff --git a/tests/umts_cell_id/umts_cell_id_test.ok b/tests/umts_cell_id/umts_cell_id_test.ok index 2c1992f..7232ca1 100644 --- a/tests/umts_cell_id/umts_cell_id_test.ok +++ b/tests/umts_cell_id/umts_cell_id_test.ok @@ -18,10 +18,10 @@ -> umts_cell_id_to_str_buf(): ok -> "001-99-L1-R1-S1-C1" umts_cell_id_equal(expected, parsed): ok -"999-999-L65534-R65535-S65535-C268435455" +"999-999-L65534-R255-S65535-C268435455" -> umts_cell_id_from_str(): ok -> umts_cell_id_to_str_buf(): ok - -> "999-999-L65534-R65535-S65535-C268435455" + -> "999-999-L65534-R255-S65535-C268435455" umts_cell_id_equal(expected, parsed): ok "1000-001-L1-R1-S1-C1" expected rc != 0: ok -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ide7dfd5d0ae87826cb7759d283be6da81dae90f4 Gerrit-Change-Number: 39994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-hnbgw[master]: Log paging response not matching any request by MI

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/39993?usp=email ) Change subject: Log paging response not matching any request by MI ...................................................................... Log paging response not matching any request by MI Change-Id: I9c775901b5042b33382e56ac4e2c301524b734a1 --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 692196f..3659b36 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -629,11 +629,12 @@ if (map->l3.gsm48_msg_type == GSM48_MT_RR_PAG_RESP) { cnlink = cnlink_find_by_paging_mi(cnpool, &map->l3.mi); if (cnlink) { - LOG_MAP(map, DCN, LOGL_INFO, "CN link paging record selects %s %d\n", cnpool->peer_name, + LOG_MAP(map, DCN, LOGL_INFO, "CN link paging response record selects %s %d\n", cnpool->peer_name, cnlink->nr); CNLINK_CTR_INC(cnlink, CNLINK_CTR_CNPOOL_SUBSCR_PAGED); return cnlink; } + LOG_MAP(map, DCN, LOGL_INFO, "CN link paging response didn't match any record on %s\n", cnpool->peer_name); /* If there is no match, go on with other ways */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/39993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9c775901b5042b33382e56ac4e2c301524b734a1 Gerrit-Change-Number: 39993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-iuh[master]: ranap_common_ran: rename ctx -> priv

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/39981?usp=email ) Change subject: ranap_common_ran: rename ctx -> priv ...................................................................... ranap_common_ran: rename ctx -> priv This is basically commit 05bb6ad563c178de70645e815557fe225cd078b9 applied to ranap_common_ran instead of ranap_common_cn. Rename the "ctx" argument of ranap_ran_rx_co to "priv" as it is private user data passed to the callback. Change-Id: I23f7f16cd7c487931226035e2616c85b75d79d08 --- M include/osmocom/ranap/ranap_common_ran.h M src/ranap_common_ran.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/ranap/ranap_common_ran.h b/include/osmocom/ranap/ranap_common_ran.h index 7118c7e..d632c46 100644 --- a/include/osmocom/ranap/ranap_common_ran.h +++ b/include/osmocom/ranap/ranap_common_ran.h @@ -14,4 +14,4 @@ OSMO_DEPRECATED("Use ranap_ran_rx_co_decode2() instead, the first arg is not used"); /* receive a connection-oriented RANAP message */ -int ranap_ran_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); +int ranap_ran_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len); diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c index fe11610..4028611 100644 --- a/src/ranap_common_ran.c +++ b/src/ranap_common_ran.c @@ -321,7 +321,7 @@ /* receive a connection-oriented RANAP message and call * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_ran_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +int ranap_ran_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len) { ranap_message message; int rc; @@ -329,7 +329,7 @@ rc = ranap_ran_rx_co_decode2(&message, data, len); if (rc == 0) - (*cb) (ctx, &message); + (*cb) (priv, &message); else LOGP(DRANAP, LOGL_ERROR, "Not calling ran_ranap_handle_co() due to rc=%d\n", rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/39981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I23f7f16cd7c487931226035e2616c85b75d79d08 Gerrit-Change-Number: 39981 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-iuh[master]: ranap_common_ran: remove unused ctx args

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/39980?usp=email ) Change subject: ranap_common_ran: remove unused ctx args ...................................................................... ranap_common_ran: remove unused ctx args This commit is basically 8b6dad3331eab339a7ffea7c22ed1830fe9ced60 applied to ranap_common_ran instead of ranap_common_cn. ranap_ran_rx_co has a void *ctx argument, that gets passed to: * a callback function and * to various decode functions in the same file. As it is named "ctx", it looks like a talloc context. But the decode functions don't use ctx at all and so in reality it is private userdata for the callback. It is used as such by test/hnb-test-rua and in osmo-msc. Change-Id: I57b320c2fdd72d11b87507d0cd9c2e7b479e7fe4 --- M TODO-RELEASE M include/osmocom/ranap/ranap_common_ran.h M src/ranap_common_ran.c 3 files changed, 16 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..34f3506 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-ranap add API ranap_ran_rx_co_decode2() +libosmo-ranap deprecate API ranap_ran_rx_co_decode() diff --git a/include/osmocom/ranap/ranap_common_ran.h b/include/osmocom/ranap/ranap_common_ran.h index 5eef272..7118c7e 100644 --- a/include/osmocom/ranap/ranap_common_ran.h +++ b/include/osmocom/ranap/ranap_common_ran.h @@ -9,7 +9,9 @@ void ranap_ran_rx_co_free(ranap_message *message); /* decode a connection-oriented RANAP message */ -int ranap_ran_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); +int ranap_ran_rx_co_decode2(ranap_message *message, uint8_t *data, size_t len); +int ranap_ran_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len) + OSMO_DEPRECATED("Use ranap_ran_rx_co_decode2() instead, the first arg is not used"); /* receive a connection-oriented RANAP message */ int ranap_ran_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c index 828587e..fe11610 100644 --- a/src/ranap_common_ran.c +++ b/src/ranap_common_ran.c @@ -33,7 +33,7 @@ #define DRANAP _ranap_DRANAP -static int ran_ranap_rx_initiating_msg_co(void *ctx, RANAP_InitiatingMessage_t *imsg, ranap_message *message) +static int ran_ranap_rx_initiating_msg_co(RANAP_InitiatingMessage_t *imsg, ranap_message *message) { int rc = 0; @@ -232,13 +232,13 @@ } } -static int _ran_ranap_rx_co(void *ctx, RANAP_RANAP_PDU_t *pdu, ranap_message *message) +static int _ran_ranap_rx_co(RANAP_RANAP_PDU_t *pdu, ranap_message *message) { int rc = 0; switch (pdu->present) { case RANAP_RANAP_PDU_PR_initiatingMessage: - rc = ran_ranap_rx_initiating_msg_co(ctx, &pdu->choice.initiatingMessage, message); + rc = ran_ranap_rx_initiating_msg_co(&pdu->choice.initiatingMessage, message); break; case RANAP_RANAP_PDU_PR_successfulOutcome: rc = ran_ranap_rx_successful_msg_co(&pdu->choice.successfulOutcome, message); @@ -289,7 +289,7 @@ } /* decode a connection-oriented RANAP message */ -int ranap_ran_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) +int ranap_ran_rx_co_decode2(ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; asn_dec_rval_t dec_ret; @@ -306,7 +306,7 @@ message->direction = pdu->present; - rc = _ran_ranap_rx_co(ctx, pdu, message); + rc = _ran_ranap_rx_co(pdu, message); error_free: ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); @@ -314,6 +314,11 @@ return rc; } +int ranap_ran_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len) +{ + return ranap_ran_rx_co_decode2(message, data, len); +} + /* receive a connection-oriented RANAP message and call * cn_ranap_handle_co() with the resulting ranap_message struct */ int ranap_ran_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) @@ -321,7 +326,7 @@ ranap_message message; int rc; - rc = ranap_ran_rx_co_decode(ctx, &message, data, len); + rc = ranap_ran_rx_co_decode2(&message, data, len); if (rc == 0) (*cb) (ctx, &message); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/39980?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I57b320c2fdd72d11b87507d0cd9c2e7b479e7fe4 Gerrit-Change-Number: 39980 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025