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

[S] Change in pysim[master]: filesystem: do not decode short TransRecEF records

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/39670?usp=email ) Change subject: filesystem: do not decode short TransRecEF records ...................................................................... Patch Set 3: Code-Review+2 (1 comment) File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/39670/comment/2f843a43_beccc0bd?usp=em… : PS3, Line 1231: if len(raw_hex_data) // 2 < self.__get_rec_len(): > I think I don't get what you mean by that. The too-short trailer is output as raw data (e.g. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39670?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: Ib1dc4d7ce306f1f0b080bb4b6abc36e72431d3fa Gerrit-Change-Number: 39670 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Mar 2025 18:59:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

4 months

1
0
0 0

[XS] Change in pysim[master]: pylint: ota.py: fix E0606 possibly-used-before-assignment

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/39749?usp=email ) Change subject: pylint: ota.py: fix E0606 possibly-used-before-assignment ...................................................................... pylint: ota.py: fix E0606 possibly-used-before-assignment ************* Module pySim.ota pySim/ota.py:430:24: E0606: Possibly using variable 'cpl' before assignment (possibly-used-before-assignment) Change-Id: Ibbae851e458bbe7426a788b0784d553753c1056f --- M pySim/ota.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/pySim/ota.py b/pySim/ota.py index 8d7e0fd..2d1c8d1 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -410,6 +410,7 @@ ciph = encoded[2+8:] envelope_data = otak.crypt.decrypt(ciph) else: + cpl = None # FIXME this line was just added to silence pylint possibly-used-before-assignment part_head = encoded[:8] envelope_data = encoded[8:] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39749?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibbae851e458bbe7426a788b0784d553753c1056f Gerrit-Change-Number: 39749 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

4 months

1
0
0 0

[XS] Change in pysim[master]: pylint: personalization.py: fix E1135: permitted_len unsupported-memb...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/39748?usp=email ) Change subject: pylint: personalization.py: fix E1135: permitted_len unsupported-membership-test ...................................................................... pylint: personalization.py: fix E1135: permitted_len unsupported-membership-test pre-empt this from coming up in patch I60ea8fd11fb438ec90ddb08b17b658cbb789c051: E1135: Value 'self.permitted_len' doesn't support membership test (unsupported-membership-test) pickermitted_len Change-Id: I0343f8dbbffefb4237a1cb4dd40b576f16111073 --- M pySim/esim/saip/personalization.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py index 61973e7..cd23944 100644 --- a/pySim/esim/saip/personalization.py +++ b/pySim/esim/saip/personalization.py @@ -112,7 +112,7 @@ key_id = None kvn = None key_usage_qual = None - permitted_len = None + permitted_len = [] def validate(self): if not isinstance(self.input_value, (io.BytesIO, bytes, bytearray)): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39748?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0343f8dbbffefb4237a1cb4dd40b576f16111073 Gerrit-Change-Number: 39748 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

4 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initi...

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email to look at the new patch set (#2). Change subject: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized ...................................................................... mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized Prior to this patch, osmo-mgw would wait until first IuUP Data frame would be received on RAN-side (from HNB) to trigger active initialization (Tx IuUP-Init) on CN-side conn towards CN. With this patch, this happens ASAP, whenever the CN-side conn is created by HNBGW when it receives the RAB-ASS-RESP from HNB. Related: OS#6685 Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 --- M include/osmocom/mgcp/mgcp_iuup.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_iuup.c 3 files changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/62/39762/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 Gerrit-Change-Number: 39762 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months

1
0
0 0

[XS] Change in libosmocore[master]: iuup: Explicitly discard Iu-UP-DATA.req in Initialization state

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39753?usp=email ) Change subject: iuup: Explicitly discard Iu-UP-DATA.req in Initialization state ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/39753/comment/e67de832_95f2818e?… : PS1, Line 9: asyncrhonous > spelling Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I424be5718cdd12cfd0ce80108a002ce68d3e17aa Gerrit-Change-Number: 39753 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 10 Mar 2025 18:21:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

4 months

1
0
0 0

[XS] Change in libosmocore[master]: iuup: Explicitly discard Iu-UP-DATA.req in Initialization state

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/39753?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge Change subject: iuup: Explicitly discard Iu-UP-DATA.req in Initialization state ...................................................................... iuup: Explicitly discard Iu-UP-DATA.req in Initialization state Since Initialization procedure is asynchronous (need to wait for IuUP ACK from peer), it may be that the user initializes the IuUP layer and starts sending/forarding IuUP data to it before the initialization finishes. Before this patch, an error would be logged for each such Data request. Let's instead explicitly expect this event and hence avoid logging a generic FSM error log "{Initialisation}: Event IuUP-DATA-req not permitted" and log in INFO level and discard the message. Change-Id: I424be5718cdd12cfd0ce80108a002ce68d3e17aa --- M src/gsm/iuup.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/39753/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I424be5718cdd12cfd0ce80108a002ce68d3e17aa Gerrit-Change-Number: 39753 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initi...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email ) Change subject: mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized ...................................................................... mgw: iuup: Trigger Init on CN-side CRCX if RAN-side was already initialized Prior to this patch, osmo-mgw would wait until first IuUP Data frame would be received on RAN-side (from HNB) to trigger active initialization (Tx IuUP-Init) on CN-side conn towards CN. With this patch, this happens ASAP, whenever the CN-side conn is created by HNBGW when it receives the RAB-ASS-RESP from HNB. Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 --- M include/osmocom/mgcp/mgcp_iuup.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_iuup.c 3 files changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/62/39762/1 diff --git a/include/osmocom/mgcp/mgcp_iuup.h b/include/osmocom/mgcp/mgcp_iuup.h index 4d2011f..f0af776 100644 --- a/include/osmocom/mgcp/mgcp_iuup.h +++ b/include/osmocom/mgcp/mgcp_iuup.h @@ -31,3 +31,4 @@ int mgcp_conn_iuup_dispatch_rtp(struct msgb *msg); int mgcp_conn_iuup_send_rtp(struct mgcp_conn_rtp *conn_src_rtp, struct mgcp_conn_rtp *conn_dest_rtp, struct msgb *msg); int mgcp_conn_iuup_send_dummy(struct mgcp_conn_rtp *conn_rtp); +int mgcp_conn_iuup_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn_rtp); diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 324f67d..28ccd2f 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -24,6 +24,7 @@ #include <osmocom/mgcp/mgcp.h> #include <osmocom/mgcp/mgcp_protocol.h> #include <osmocom/mgcp/mgcp_conn.h> +#include <osmocom/mgcp/mgcp_iuup.h> #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> @@ -677,7 +678,7 @@ } break; case MGCP_RTP_IUUP: - break; + return mgcp_conn_iuup_event_rx_crcx_mdcx(conn_rtp); default: return -523; } diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 468ea06..40ca100 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -753,3 +753,44 @@ return 0; } + +/* To be called every time an CRCX/MDCX is received. + * returns: 0 if conn can continue, MGCP negative code if an error ocurred during setup */ +int mgcp_conn_iuup_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn_rtp) +{ + struct mgcp_conn *peer_conn; + struct mgcp_conn_rtp *peer_conn_rtp; + OSMO_ASSERT(mgcp_conn_rtp_is_iuup(conn_rtp)); + + /* keep waiting to receive remote address through CRCX/MDCX */ + if (!mgcp_rtp_end_remote_addr_available(&conn_rtp->end)) + return 0; + + /* Conn already IuUP-configured/initialized, nothing to be done. */ + if (conn_rtp->iuup.configured) + return 0; + + /* Reached this point, conn_rtp is an IuUP conn which can be configured + * and was not yet configured. If its sister conn in the endpoint was + * already configured as IuUP "passive", then we know this one can be + * configured as IuUP "active" right now. In that case, do so. + * This usually happens on an HNBGW co-located MGW, where during + * RAB-ASS-REQ the RAN-side conn (sister conn here) was already + * configured and then upon rx of RAB-ASS-RESP it sets up (CRCX) the + * CN-side IuUP conn (rt_conn here). + */ + peer_conn = mgcp_find_dst_conn(conn_rtp->conn); + /* No peer conn yet, nothing to be done. */ + if (!peer_conn) + return 0; + peer_conn_rtp = mgcp_conn_get_conn_rtp(peer_conn); + + if (mgcp_conn_rtp_is_iuup(peer_conn_rtp) && + peer_conn_rtp->iuup.configured && + !conn_rtp->iuup.active_init) { + LOG_CONN_RTP(conn_rtp, LOGL_INFO, "Sister IuUP conn in endp configured as passive, init this one as active\n"); + OSMO_ASSERT(peer_conn_rtp->iuup.init_ind); + _conn_iuup_configure_as_active(conn_rtp, peer_conn_rtp->iuup.init_ind); + } + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39762?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iab0af88852994e73bfe6c3b27fe196fd655cce03 Gerrit-Change-Number: 39762 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Move endpoint/conn updating logic to helper function

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39761?usp=email ) Change subject: mgw: Move endpoint/conn updating logic to helper function ...................................................................... mgw: Move endpoint/conn updating logic to helper function Move code logic doing actions based on endpoint state (and its conns) out of the CRCX/MDCX MGCP handlers. Most of that logic present in CRCX and MDCX is actually the same and can be merged. This way we can also make the updating logic more complex without extending the CRCX/MDCX handlers for and more adding spaghetti code. Change-Id: I24dd15ec76bd6e949a178a3b998b76a44ddbab50 --- M include/osmocom/mgcp/mgcp_e1.h M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_e1.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c 5 files changed, 77 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/61/39761/1 diff --git a/include/osmocom/mgcp/mgcp_e1.h b/include/osmocom/mgcp/mgcp_e1.h index fbd594c..84615b5 100644 --- a/include/osmocom/mgcp/mgcp_e1.h +++ b/include/osmocom/mgcp/mgcp_e1.h @@ -22,6 +22,6 @@ static const uint8_t e1_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 }; int mgcp_e1_endp_equip(struct mgcp_endpoint *endp, uint8_t ts, uint8_t ss, uint8_t offs); -void mgcp_e1_endp_update(struct mgcp_endpoint *endp); +int mgcp_e1_endp_update(struct mgcp_endpoint *endp); void mgcp_e1_endp_release(struct mgcp_endpoint *endp, uint8_t ts); int mgcp_e1_send_rtp(struct mgcp_endpoint *endp, struct mgcp_rtp_codec *codec, struct msgb *msg); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 8a2c8a2..66fbf21 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -131,7 +131,7 @@ struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index); int mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid); -void mgcp_endp_update(struct mgcp_endpoint *endp); +int mgcp_endp_update(struct mgcp_endpoint *endp, struct mgcp_conn *conn, enum mgcp_verb verb); bool mgcp_endp_is_wildcarded(const char *epname); bool mgcp_endp_is_null(const char *epname); struct mgcp_endpoint *mgcp_endp_by_name_trunk(int *cause, const char *epname, diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 3a7a450..33fe98f 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -661,7 +661,7 @@ /*! Update E1 related parameters (codec and sync pattern). * \param[in] endp endpoint to update. */ -void mgcp_e1_endp_update(struct mgcp_endpoint *endp) +int mgcp_e1_endp_update(struct mgcp_endpoint *endp) { struct mgcp_conn *conn; struct mgcp_conn_rtp *conn_rtp; @@ -685,6 +685,7 @@ /* Update sync pattern */ sync_pat_id = determine_trau_sync_pat(codec->subtype_name, endp->e1.scd.rate, endp->e1.last_amr_ft, endp); osmo_trau_sync_set_pat(endp->e1.trau_sync_fi, sync_pat_id); + return 0; } /*! Remove E1 resources from endpoint diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index a4ab860..324f67d 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -640,17 +640,78 @@ /*! update endpoint, updates internal endpoint specific data, should be * after when MDCX or CRCX has been executed successuflly. - * \param[in] endp endpoint to update. */ -void mgcp_endp_update(struct mgcp_endpoint *endp) + * \param[in] endp endpoint to update. + * \returns zero on success, mgcp negative error on failure. */ +static int mgcp_endp_update_virtual(struct mgcp_endpoint *endp, struct mgcp_conn *conn, enum mgcp_verb verb) +{ + OSMO_ASSERT(conn); + OSMO_ASSERT(conn->type == MGCP_CONN_TYPE_RTP); + struct mgcp_trunk *trunk = endp->trunk; + struct mgcp_conn_rtp *conn_rtp = mgcp_conn_get_conn_rtp(conn); + char new_local_addr[INET6_ADDRSTRLEN]; + + /* CRCX: Find a local address for conn based on policy and initial SDP remote + * information, then find a free port for it. + * MDCX: msg may have provided a new remote address, which means we may need + * to update our announced IP addr and re-bind our local end. This can + * happen for instance if MGW initially provided an IPv4 during CRCX + * ACK, and now MDCX tells us the remote has an IPv6 address. + */ + if (mgcp_get_local_addr(new_local_addr, conn_rtp) < 0) + goto fail_bind_port_ret; + + if (strcmp(new_local_addr, conn_rtp->end.local_addr)) { + osmo_strlcpy(conn_rtp->end.local_addr, new_local_addr, sizeof(conn_rtp->end.local_addr)); + mgcp_rtp_end_free_port(&conn_rtp->end); + if (mgcp_trunk_allocate_conn_rtp_ports(trunk, conn_rtp) != 0) + goto fail_bind_port_ret; + } + + switch (conn_rtp->type) { + case MGCP_RTP_DEFAULT: + break; + case MGCP_RTP_OSMUX: + if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { + LOGPCONN(conn, DLMGCP, LOGL_ERROR, "CRCX: Osmux handling failed!\n"); + return -500; + } + break; + case MGCP_RTP_IUUP: + break; + default: + return -523; + } + + return 0; + +fail_bind_port_ret: + switch (verb) { + case MGCP_VERB_CRCX: + rate_ctr_inc(rate_ctr_group_get_ctr(trunk->ratectr.mgcp_crcx_ctr_group, + MGCP_CRCX_FAIL_BIND_PORT)); + break; + case MGCP_VERB_MDCX: + rate_ctr_inc(rate_ctr_group_get_ctr(trunk->ratectr.mgcp_mdcx_ctr_group, + MGCP_MDCX_FAIL_BIND_PORT)); + break; + default: + break; + } + return -500; +} + +/*! update endpoint, updates internal endpoint specific data, should be + * after when MDCX or CRCX has been executed successuflly. + * \param[in] endp endpoint to update. + * \returns zero on success, mgcp negative error on failure. */ +int mgcp_endp_update(struct mgcp_endpoint *endp, struct mgcp_conn *conn, enum mgcp_verb verb) { /* Allocate resources */ switch (endp->trunk->trunk_type) { case MGCP_TRUNK_VIRTUAL: - /* No updating initaliziation required for virtual endpoints. */ - break; + return mgcp_endp_update_virtual(endp, conn, verb); case MGCP_TRUNK_E1: - mgcp_e1_endp_update(endp); - break; + return mgcp_e1_endp_update(endp); default: OSMO_ASSERT(false); } diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index bd2120f..e33ce35 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -763,26 +763,11 @@ rc = mgcp_conn_iuup_init(conn_rtp); } - /* Find a local address for conn based on policy and initial SDP remote - information, then find a free port for it */ - if (mgcp_get_local_addr(conn_rtp->end.local_addr, conn_rtp) < 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); + rc = mgcp_endp_update(endp, conn, rq->verb); + if (rc < 0) { + error_code = -rc; goto error2; } - if (mgcp_trunk_allocate_conn_rtp_ports(trunk, conn_rtp) != 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); - goto error2; - } - - /* Notify Osmux conn that CRCX was received */ - if (mgcp_conn_rtp_is_osmux(conn_rtp)) { - if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, "CRCX: Osmux handling failed!\n"); - goto error2; - } - } - - mgcp_endp_update(endp); LOGPCONN(conn, DLMGCP, LOGL_NOTICE, "CRCX: connection successfully created: %s\n", mgcp_conn_dump(conn)); @@ -885,7 +870,6 @@ struct mgcp_endpoint *endp = rq->endp; struct mgcp_parse_hdr_pars *hpars = &pdata->hpars; struct rate_ctr_group *rate_ctrs; - char new_local_addr[INET6_ADDRSTRLEN]; int error_code = 500; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp *conn_rtp = NULL; @@ -981,30 +965,13 @@ if (mgcp_conn_rtp_is_osmux(conn_rtp)) { conn_rtp->osmux.remote_cid_present = true; conn_rtp->osmux.remote_cid = hpars->remote_osmux_cid; - if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: Osmux handling failed!\n"); - goto error3; - } } - /* MDCX may have provided a new remote address, which means we may need - to update our announced IP addr and re-bind our local end. This can - happen for instance if MGW initially provided an IPv4 during CRCX - ACK, and now MDCX tells us the remote has an IPv6 address. */ - if (mgcp_get_local_addr(new_local_addr, conn_rtp) < 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_BIND_PORT)); + rc = mgcp_endp_update(endp, conn, rq->verb); + if (rc < 0) { + error_code = -rc; goto error3; } - if (strcmp(new_local_addr, conn_rtp->end.local_addr)) { - osmo_strlcpy(conn_rtp->end.local_addr, new_local_addr, sizeof(conn_rtp->end.local_addr)); - mgcp_rtp_end_free_port(&conn_rtp->end); - if (mgcp_trunk_allocate_conn_rtp_ports(trunk, conn_rtp) != 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_BIND_PORT)); - goto error3; - } - } - - mgcp_endp_update(endp); LOGPCONN(conn, DLMGCP, LOGL_NOTICE, "MDCX: connection successfully modified: %s\n", mgcp_conn_dump(conn)); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I24dd15ec76bd6e949a178a3b998b76a44ddbab50 Gerrit-Change-Number: 39761 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[M] Change in osmo-mgw[master]: E1: change dummy fill frame generation method

by laforge

Attention is currently required from: falconia. laforge has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39750?usp=email ) Change subject: E1: change dummy fill frame generation method ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I123f77295c56d61ff9aac5f5d64b25eca01e0d63 Gerrit-Change-Number: 39750 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 10 Mar 2025 18:02:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[XS] Change in osmo-mgw[master]: E1: implement dummy fill for HRv1 codec

by laforge

Attention is currently required from: falconia. laforge has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39751?usp=email ) Change subject: E1: implement dummy fill for HRv1 codec ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I188bc0a0468b19126281016f45e36f1de617e9ee Gerrit-Change-Number: 39751 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 10 Mar 2025 18:02:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025