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

[S] Change in osmo-mgw[master]: mgcp-cli: Fix filling in wrong local IP address of SDP Origin o=

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39180?usp=email ) Change subject: mgcp-cli: Fix filling in wrong local IP address of SDP Origin o= ...................................................................... mgcp-cli: Fix filling in wrong local IP address of SDP Origin o= If user (VTY) configured the local IP address to use for MGCP, and that IP address was not the one selected by kernel routing table lookup, the IP address filled in the MGCP message would be wrong, not matching the one sending the MGCP message. Change-Id: I35624db853dc1f0fee85503105960613f70473c6 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 34 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 1c89e69..8a7c1f6 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1320,6 +1320,36 @@ #undef MSGB_PRINTF_OR_RET } +/* Helper function to obtain local IP address used in MGCP towards MGW, + * in string format, to fill the SDP "Origin" ("o=") field. + * return 0 on success, negative on error. + */ +static int get_mgcp_local_addr(const struct mgcp_client *mgcp, char *local_ip, size_t local_ip_len) +{ + int fd; + + /* Try to get the socket local IP address if available: */ + if (mgcp->iofd && ((fd = osmo_iofd_get_fd(mgcp->iofd)) >= 0)) { + if (osmo_sock_get_local_ip(fd, local_ip, local_ip_len) == 0) + return 0; + /* else: continue below */ + } + + /* If MGCP local address was explicitly specified in config, use it: */ + if (mgcp->actual.local_addr) { + osmo_strlcpy(local_ip, mgcp->actual.local_addr, local_ip_len); + return 0; + } + + /* Guess our local address based on system routing towards MGW: */ + OSMO_ASSERT(local_ip_len >= INET6_ADDRSTRLEN); + if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) == 0) + return 0; + + LOGPMGW(mgcp, LOGL_ERROR, "Could not determine local IP-Address!\n"); + return -EINVAL; +} + /* Helper function for mgcp_msg_gen(): Add SDP information to MGCP message */ static int add_sdp(struct msgb *msg, struct mgcp_msg *mgcp_msg, struct mgcp_client *mgcp) { @@ -1329,6 +1359,7 @@ const char *codec; unsigned int pt; uint16_t audio_port; + int rc; #define MSGB_PRINTF_OR_RET(FMT, ARGS...) do { \ if (msgb_printf(msg, FMT, ##ARGS) != 0) { \ @@ -1344,13 +1375,9 @@ MSGB_PRINTF_OR_RET("v=0\r\n"); /* Determine local IP-Address */ - if (mgcp->actual.local_addr) { - OSMO_STRLCPY_ARRAY(local_ip, mgcp->actual.local_addr); - } else if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { - LOGPMGW(mgcp, LOGL_ERROR, - "Could not determine local IP-Address!\n"); - return -EINVAL; - } + rc = get_mgcp_local_addr(mgcp, local_ip, sizeof(local_ip)); + if (rc < 0) + return rc; local_ip_family = osmo_ip_str_type(local_ip); if (local_ip_family == AF_UNSPEC) return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39180?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I35624db853dc1f0fee85503105960613f70473c6 Gerrit-Change-Number: 39180 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: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp-cli: Improve error handling around mgcp_msg_gen() return

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39179?usp=email ) Change subject: mgcp-cli: Improve error handling around mgcp_msg_gen() return ...................................................................... mgcp-cli: Improve error handling around mgcp_msg_gen() return Change-Id: Ib9b02b7e6b37472c8e38b3380bc990a2bbac0657 --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 09b1953..1c89e69 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -864,6 +864,10 @@ }; osmo_strlcpy(mgcp_msg_dlcx.endpoint, epname, sizeof(mgcp_msg_dlcx.endpoint)); msgb_dlcx = mgcp_msg_gen(mgcp, &mgcp_msg_dlcx); + if (msgb_dlcx) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed generating MGCP DLCX %s\n", epname); + return; + } mgcp_client_tx(mgcp, msgb_dlcx, &_ignore_mgcp_response, NULL); } @@ -877,6 +881,10 @@ }; OSMO_STRLCPY_ARRAY(mgcp_msg_auep.endpoint, epname); msgb_auep = mgcp_msg_gen(mgcp, &mgcp_msg_auep); + if (msgb_auep) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed generating MGCP AUEP %s\n", epname); + return; + } mgcp_client_tx(mgcp, msgb_auep, &_ignore_mgcp_response, NULL); } @@ -1336,7 +1344,9 @@ MSGB_PRINTF_OR_RET("v=0\r\n"); /* Determine local IP-Address */ - if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { + if (mgcp->actual.local_addr) { + OSMO_STRLCPY_ARRAY(local_ip, mgcp->actual.local_addr); + } else if (osmo_sock_local_ip(local_ip, mgcp->actual.remote_addr) < 0) { LOGPMGW(mgcp, LOGL_ERROR, "Could not determine local IP-Address!\n"); return -EINVAL; diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index e638d1e..7a6fed8 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -157,6 +157,7 @@ mgcp_msg->conn_mode = conn_mode; } +/* returns message buffer containing MGXP MDCX on success, NULL on error. */ static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx) { struct mgcp_msg mgcp_msg; @@ -192,6 +193,7 @@ return mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); } +/* returns message buffer containing MGXP DLCX on success, NULL on error. */ struct msgb *make_dlcx_msg(struct mgcp_ctx *mgcp_ctx) { struct mgcp_msg mgcp_msg; @@ -231,8 +233,10 @@ set_conn_mode(&mgcp_msg, &mgcp_ctx->conn_peer_local); msg = mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg); - OSMO_ASSERT(msg); - + if (!msg) { + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return; + } mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg); mgcp_ctx->mgw_trans_pending = true; rc = mgcp_client_tx(mgcp, msg, mgw_crcx_resp_cb, fi); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39179?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib9b02b7e6b37472c8e38b3380bc990a2bbac0657 Gerrit-Change-Number: 39179 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: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Drop own MGCP extension 'noanswer'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39181?usp=email ) Change subject: mgw: Drop own MGCP extension 'noanswer' ...................................................................... mgw: Drop own MGCP extension 'noanswer' This was added in e3d16bb77530f2b3f08fdaf9640dd98bd9e730fa 14 years ago: """ [mgcp] Protocol extension to not generate answers. For the NAT we want to send requests in a send and forget way and we are not interested in seeing the answers, so tell the gateway to not answer them. """ So this code is most probably related to osmo-bsc_mgcp time, and we don't really need this feature in osmo-mgw, it really makes no sense. Drop it. Change-Id: Ica2d3d54cda41e0c6416913ab056843a0cd80c17 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 0 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 16dee03..2f16794 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1142,7 +1142,6 @@ struct rate_ctr_group *rate_ctrs; char new_local_addr[INET6_ADDRSTRLEN]; int error_code = 500; - int silent = 0; int have_sdp = 0; char *line; const char *local_options = NULL; @@ -1207,9 +1206,6 @@ case 'M': mode = (const char *)line + 3; break; - case 'Z': - silent = strcasecmp("noanswer", line + 3) == 0; - break; case 'X': if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { /* If osmux is disabled, just skip setting it up */ @@ -1345,8 +1341,6 @@ send_dummy(endp, conn); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_SUCCESS)); - if (silent) - goto out_silent; LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE, "MDCX: connection successfully modified\n"); @@ -1354,10 +1348,6 @@ return create_response_with_sdp(endp, conn, "MDCX", pdata->trans, false, false); error3: return create_err_response(endp, endp, error_code, "MDCX", pdata->trans); - -out_silent: - LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "MDCX: silent exit\n"); - return NULL; } /* DLCX command handler, processes the received command */ @@ -1368,7 +1358,6 @@ struct mgcp_endpoint *endp = rq->endp; struct rate_ctr_group *rate_ctrs; int error_code = 400; - int silent = 0; char *line; char stats[1048]; const char *conn_id = NULL; @@ -1452,9 +1441,6 @@ goto error3; } break; - case 'Z': - silent = strcasecmp("noanswer", line + 3) == 0; - break; default: LOGPEPTR(endp, trunk, DLMGCP, LOGL_NOTICE, "DLCX: Unhandled MGCP option: '%c'/%d\n", line[0], line[0]); @@ -1513,16 +1499,10 @@ } rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_SUCCESS)); - if (silent) - goto out_silent; return create_ok_resp_with_param(endp, endp, 250, "DLCX", pdata->trans, stats); error3: return create_err_response(endp, endp, error_code, "DLCX", pdata->trans); - -out_silent: - LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "DLCX: silent exit\n"); - return NULL; } /* RSIP command handler, processes the received command */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39181?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ica2d3d54cda41e0c6416913ab056843a0cd80c17 Gerrit-Change-Number: 39181 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: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: fix EGPRS BEP Link Quality Measurements Type 2

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/39187?usp=email ) Change subject: rlcmac: fix EGPRS BEP Link Quality Measurements Type 2 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/39187?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iac4de18ef25386f774bb409201b7a7996d1c8824 Gerrit-Change-Number: 39187 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 19:40:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[M] Change in osmo-pcap[master]: pcap-server: Introduce VTY cmd '[no] completed-path'

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email ) Change subject: pcap-server: Introduce VTY cmd '[no] completed-path' ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I5166d1c5d9eb45358c87c2e1c5fbf7969d1d5294 Gerrit-Change-Number: 39201 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 19:38:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[XS] Change in osmo-mgw[master]: cosmetic: mgw: Fix indentation whitespace

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39182?usp=email ) Change subject: cosmetic: mgw: Fix indentation whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39182?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: Ic5b267108b5c5cba064ddddbe688705f9dc29ac8 Gerrit-Change-Number: 39182 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 19:37:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: Drop own MGCP extension 'noanswer'

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39181?usp=email ) Change subject: mgw: Drop own MGCP extension 'noanswer' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39181?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: Ica2d3d54cda41e0c6416913ab056843a0cd80c17 Gerrit-Change-Number: 39181 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 19:37:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp-cli: Fix filling in wrong local IP address of SDP Origin o=

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39180?usp=email ) Change subject: mgcp-cli: Fix filling in wrong local IP address of SDP Origin o= ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39180?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: I35624db853dc1f0fee85503105960613f70473c6 Gerrit-Change-Number: 39180 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 19:36:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp-cli: Improve error handling around mgcp_msg_gen() return

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39179?usp=email ) Change subject: mgcp-cli: Improve error handling around mgcp_msg_gen() return ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39179?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: Ib9b02b7e6b37472c8e38b3380bc990a2bbac0657 Gerrit-Change-Number: 39179 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 19:34:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: fix EGPRS BEP Link Quality Measurements Type 2

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/39187?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: rlcmac: fix EGPRS BEP Link Quality Measurements Type 2 ...................................................................... rlcmac: fix EGPRS BEP Link Quality Measurements Type 2 This IE is defined in 3GPP TS 44.060 Table 12.5a.2.1. Each presence bit indicates presence of the next two entries, not one. This patch does affect the output of csn1_ts_44_060_test, though it does not fix decoding because it's caused by an unrelated problem. Related: osmo-pcu.git I061ac16df5e6413266de08884f791f0264791192 Change-Id: Iac4de18ef25386f774bb409201b7a7996d1c8824 --- M src/rlcmac/csn1_ts_44_060.c M tests/rlcmac/csn1_ts_44_060_test.err 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/87/39187/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/39187?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iac4de18ef25386f774bb409201b7a7996d1c8824 Gerrit-Change-Number: 39187 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024