- gerrit-log - lists.osmocom.org

[XS] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_instance_get_primary_pc()
by pespin 08 Nov '24

08 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38653?usp=email ) Change subject: sigtran: Add API osmo_ss7_instance_get_primary_pc() ...................................................................... sigtran: Add API osmo_ss7_instance_get_primary_pc() This allows getting the primary PC of an osmo_ss7_instance without having to access its structs fields directly Change-Id: I617e58f5f3f5420accbfe8b81ee8b3eb553330bf --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 3 files changed, 8 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index df47c0f..0275805 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,4 +11,4 @@ libosmo-sigtran add API osmo_sccp_{release,return,reset,error,refusal}_cause_name(s), osmo_sua_sccp_cause_name libosmo-sigtran add API osmo_ss7_route_get_dest_as() libosmo-sigtran Make private osmo_ss7_route -libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt() +libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 5d5ba40..631ba8f 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -95,6 +95,8 @@ const struct osmo_ss7_pc_fmt * osmo_ss7_instance_get_pc_fmt(const struct osmo_ss7_instance *inst); +uint32_t osmo_ss7_instance_get_primary_pc(const struct osmo_ss7_instance *inst); + struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst); uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index cbe7b7e..964d280 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -401,6 +401,11 @@ return inst->cfg.name; } +uint32_t osmo_ss7_instance_get_primary_pc(const struct osmo_ss7_instance *inst) +{ + return inst->cfg.primary_pc; +} + /*! \brief Set the point code format used in given SS7 instance */ int osmo_ss7_instance_set_pc_fmt(struct osmo_ss7_instance *inst, uint8_t c0, uint8_t c1, uint8_t c2) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I617e58f5f3f5420accbfe8b81ee8b3eb553330bf Gerrit-Change-Number: 38653 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_instances_llist_entry
by pespin 08 Nov '24

08 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38660?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sigtran: Add API osmo_ss7_instances_llist_entry ...................................................................... sigtran: Add API osmo_ss7_instances_llist_entry This API allows iterating over the public global list of ss7 instances, without knowing the structure internal layout. Change-Id: I148438aecd64bdd66848d4b3404d379a380c5e9c --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 3 files changed, 16 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 366c680..f56b4e5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -12,3 +12,4 @@ libosmo-sigtran add API osmo_ss7_route_get_dest_as() libosmo-sigtran Make private osmo_ss7_route libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc(), osmo_ss7_get_sccp() +libosmo-sigtran add API osmo_ss7_instances_llist_entry() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index cd0ddfc..8f33115 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -11,9 +11,12 @@ #include <osmocom/core/socket.h> #include <osmocom/core/rate_ctr.h> -extern struct llist_head osmo_ss7_instances; - struct osmo_ss7_instance; + +extern struct llist_head osmo_ss7_instances; +/* Get an entry pointer from a list item in osmo_ss7_instances: */ +struct osmo_ss7_instance *osmo_ss7_instances_llist_entry(struct llist_head *list); + struct osmo_ss7_user; struct osmo_sccp_instance; struct osmo_mtp_prim; diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 1876b82..e89f7bd 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -62,6 +62,16 @@ bool ss7_initialized = false; LLIST_HEAD(osmo_ss7_instances); +/* This API allows iterating over the public global list of ss7 instances, + * without knowing the structure internal layout. + */ +struct osmo_ss7_instance *osmo_ss7_instances_llist_entry(struct llist_head *list) +{ + struct osmo_ss7_instance *pos; + pos = llist_entry(list, struct osmo_ss7_instance, list); + return pos; +} + static int32_t next_rctx = 1; static int32_t next_l_rk_id = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38660?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I148438aecd64bdd66848d4b3404d379a380c5e9c Gerrit-Change-Number: 38660 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: sigtran: Add API osmo_ss7_get_sccp()
by pespin 08 Nov '24

08 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38656?usp=email ) Change subject: sigtran: Add API osmo_ss7_get_sccp() ...................................................................... sigtran: Add API osmo_ss7_get_sccp() This allows getting the SCCP instance of an osmo_ss7_instance without having to access its structs fields directly Change-Id: I8f09aff41666822f759f99fa91c13e3b9d89d530 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c 3 files changed, 11 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 0275805..366c680 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,4 +11,4 @@ libosmo-sigtran add API osmo_sccp_{release,return,reset,error,refusal}_cause_name(s), osmo_sua_sccp_cause_name libosmo-sigtran add API osmo_ss7_route_get_dest_as() libosmo-sigtran Make private osmo_ss7_route -libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc() +libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc(), osmo_ss7_get_sccp() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 631ba8f..cd0ddfc 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -98,6 +98,7 @@ uint32_t osmo_ss7_instance_get_primary_pc(const struct osmo_ss7_instance *inst); struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst); +struct osmo_sccp_instance *osmo_ss7_get_sccp(const struct osmo_ss7_instance *inst); uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt); uint32_t osmo_ss7_pc_normalize(const struct osmo_ss7_pc_fmt *pc_fmt, uint32_t pc); diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 964d280..1876b82 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -442,6 +442,15 @@ return inst->sccp; } +/*! Get the SCCP instance, if present. + * \param[in] inst SS7 Instance on which we operate + * \returns inst->sccp, may be NULL if no SCCP instance was created yet (see osmo_ss7_ensure_sccp()). + */ +struct osmo_sccp_instance *osmo_ss7_get_sccp(const struct osmo_ss7_instance *inst) +{ + return inst->sccp; +} + /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38656?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8f09aff41666822f759f99fa91c13e3b9d89d530 Gerrit-Change-Number: 38656 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_xua_server APIs private
by pespin 08 Nov '24

08 Nov '24

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38642?usp=email ) Change subject: sigtran: Make osmo_ss7_xua_server APIs private ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38642?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie03697fdb2c9f95de011b21771261e52befb6018 Gerrit-Change-Number: 38642 Gerrit-PatchSet: 4 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 08 Nov 2024 12:48:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-bsc[master]: lb: Avoid using osmo_ss7_instance private field
by pespin 08 Nov '24

08 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38649?usp=email ) Change subject: lb: Avoid using osmo_ss7_instance private field ...................................................................... lb: Avoid using osmo_ss7_instance private field We know the id because we just found/created it base don that id, so simply use it instead of accessing the library object field. Change-Id: Ib6d1f4898eb0a804ebda527fdd876d2ca4ec1e67 --- M src/osmo-bsc/lb.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lb.c b/src/osmo-bsc/lb.c index 511a545..6743dba 100644 --- a/src/osmo-bsc/lb.c +++ b/src/osmo-bsc/lb.c @@ -450,13 +450,13 @@ OSMO_SCCP_SSN_SMLC_BSSAP_LE); /* Set up SCCP user and one ASP+AS */ - snprintf(inst_name, sizeof(inst_name), "Lb-%u-%s", cs7_inst->cfg.id, osmo_ss7_asp_protocol_name(used_proto)); + snprintf(inst_name, sizeof(inst_name), "Lb-%u-%s", bsc_gsmnet->smlc->cs7_instance, osmo_ss7_asp_protocol_name(used_proto)); LOGP(DLCS, LOGL_NOTICE, "Initializing SCCP connection for Lb/%s on cs7 instance %u\n", - osmo_ss7_asp_protocol_name(used_proto), cs7_inst->cfg.id); + osmo_ss7_asp_protocol_name(used_proto), bsc_gsmnet->smlc->cs7_instance); /* SS7 Protocol stack */ default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC); - sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, cs7_inst->cfg.id, inst_name, + sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, bsc_gsmnet->smlc->cs7_instance, inst_name, default_pc, used_proto, 0, DEFAULT_ASP_LOCAL_IP, 0, DEFAULT_ASP_REMOTE_IP); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib6d1f4898eb0a804ebda527fdd876d2ca4ec1e67 Gerrit-Change-Number: 38649 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> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...pyosmocom[master]: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plm...
by fixeria 08 Nov '24

08 Nov '24

Attention is currently required from: JPM, dexter, laforge. fixeria has posted comments on this change by JPM. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email ) Change subject: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter. ...................................................................... Patch Set 1: (3 comments) Commit Message: https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/78600974_5506… : PS1, Line 8: Adding test_plmn_adapter. Commit summary should be one line followed by an empty line. I would remove this one. https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/f9f6255f_c988… : PS1, Line 10: Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 Add `Related: pysim.git Ib2b586cb570dbe74a617c45c0fca276b08bb075e` File src/osmocom/construct.py: https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/2844c233_cb5a… : PS1, Line 265: """convert a bytes(3) type to BCD string like 262-02 or 262-002.""" Let's add spec. reference here? 3GPP TS 24.008 which section? -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376 Gerrit-Change-Number: 38687 Gerrit-PatchSet: 1 Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Nov 2024 11:50:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in pysim[master]: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for E...
by fixeria 08 Nov '24

08 Nov '24

Attention is currently required from: JPM, dexter, laforge. fixeria has posted comments on this change by JPM. ( https://gerrit.osmocom.org/c/pysim/+/38688?usp=email ) Change subject: Fixing 3-digit MNC PLMN Encoding/Decoding tests expected values for EF_OPL and EF_ePDGSelection. ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/38688/comment/cd123772_c21f52f0?usp=em… : PS1, Line 9: Change-Id: Ib2b586cb570dbe74a617c45c0fca276b08bb075e Add `Related: pyosmocom.git I3811b227d629bd4e051a480c9622967e31f8a376` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib2b586cb570dbe74a617c45c0fca276b08bb075e Gerrit-Change-Number: 38688 Gerrit-PatchSet: 1 Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Nov 2024 11:48:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-bts[master]: l1sap: make send_ul_rtp_packet_hrdata() NULL-safe
by fixeria 08 Nov '24

08 Nov '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email to look at the new patch set (#2). Change subject: l1sap: make send_ul_rtp_packet_hrdata() NULL-safe ...................................................................... l1sap: make send_ul_rtp_packet_hrdata() NULL-safe lchan->abis_ip.rtp_socket is NULL before the BSC indicates the RTP parameters using the CRCX/MDCX procedures. send_ul_rtp_packet() does check lchan->abis_ip.rtp_socket against NULL before calling osmo_rtp_send_frame_ext(), so should send_ul_rtp_packet_hrdata(). Take a chance to make send_ul_rtp_packet_hrdata() more consistent with the send_ul_rtp_packet() by reordering code a bit. Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a Fixes: 59686cd27 ("CSD: implement half-rate modes correctly") Related: OS#6618 --- M src/common/l1sap.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/38697/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a Gerrit-Change-Number: 38697 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[M] Change in osmo-ttcn3-hacks[master]: bts: add TC_data_facch_*: test FACCH/[FH] on data channels
by fixeria 08 Nov '24

08 Nov '24

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: bts: add TC_data_facch_*: test FACCH/[FH] on data channels ...................................................................... bts: add TC_data_facch_*: test FACCH/[FH] on data channels So far we have been testing the actual traffic of TCH/[FH] in data mode (CSD), but not FACCH/[FH]. Add separate testcases for that. Half-rate variants of the new testcases crash osmo-bts-trx, so comment them out in the control section until the problem is fixed. Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Related: OS#6618 --- M bts/BTS_Tests.ttcn M bts/expected-results.xml 2 files changed, 129 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/38696/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148 Gerrit-Change-Number: 38696 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in osmo-bts[master]: l1sap: make send_ul_rtp_packet_hrdata() NULL-safe
by fixeria 08 Nov '24

08 Nov '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email ) Change subject: l1sap: make send_ul_rtp_packet_hrdata() NULL-safe ...................................................................... l1sap: make send_ul_rtp_packet_hrdata() NULL-safe lchan->abis_ip.rtp_socket is NULL before the BSC indicates the RTP parameters using the CRCX/MDCX procedures. send_ul_rtp_packet() does check lchan->abis_ip.rtp_socket against NULL before calling osmo_rtp_send_frame_ext(), so should send_ul_rtp_packet_hrdata(). Take a chance to make send_ul_rtp_packet_hrdata() more consistent with the send_ul_rtp_packet() by reordering code a bit. Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a Related: OS#6618 --- M src/common/l1sap.c 1 file changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/38697/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 06ab051..dc83e77 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -2097,7 +2097,7 @@ if (lchan->abis_ip.osmux.use) { lchan_osmux_send_frame(lchan, rtp_pl, rtp_pl_len, fn_ms_adj(fn, lchan), lchan->rtp_tx_marker); - } else if (lchan->abis_ip.rtp_socket) { + } else if (lchan->abis_ip.rtp_socket != NULL) { osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, rtp_pl, rtp_pl_len, fn_ms_adj(fn, lchan), lchan->rtp_tx_marker); rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL); @@ -2116,14 +2116,15 @@ { struct gsm_bts *bts = lchan->ts->trx->bts; - rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL); - if (lchan->rtp_tx_marker) - rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_MARKER); - - osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, - rtp_pl, rtp_pl_len, - GSM_RTP_DURATION, - lchan->rtp_tx_marker); + if (lchan->abis_ip.rtp_socket != NULL) { + osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, + rtp_pl, rtp_pl_len, + GSM_RTP_DURATION, + lchan->rtp_tx_marker); + rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL); + if (lchan->rtp_tx_marker) + rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_MARKER); + } /* Only clear the marker bit once we have sent a RTP packet with it */ lchan->rtp_tx_marker = false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a Gerrit-Change-Number: 38697 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log