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

[S] Change in osmo-pcu[master]: gsm_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/osmo-pcu/+/39188?usp=email ) Change subject: gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: You may want to submit a patch prior to this one disabling linter for the relevant files? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I061ac16df5e6413266de08884f791f0264791192 Gerrit-Change-Number: 39188 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 20 Dec 2024 12:38:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

6 months

1
0
0 0

[S] Change in osmo-pcu[master]: gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2

by Jenkins Builder

Jenkins Builder has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email ) Change subject: gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2 ...................................................................... Patch Set 1: (14 comments) File src/gsm_rlcmac.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/d4d6b190_d7dea70b?usp… : PS1, Line 1253: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/6b467de2_b7b0607e?usp… : PS1, Line 1253: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/1150fe38_23b1557c?usp… : PS1, Line 1257: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/b375e5ef_d3d2a573?usp… : PS1, Line 1257: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/174c45bd_b62a52f3?usp… : PS1, Line 1261: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/5b1bb6c5_2b87606b?usp… : PS1, Line 1261: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/213625c4_6a8bcc2b?usp… : PS1, Line 1265: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/b428eadf_bb911e03?usp… : PS1, Line 1265: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/2df8e38f_02e525fb?usp… : PS1, Line 1269: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/564e74b4_29b44304?usp… : PS1, Line 1269: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/53d265e0_a5a2f542?usp… : PS1, Line 1273: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/08b848a6_ce5c096c?usp… : PS1, Line 1273: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/7e6e41ec_b2ce6a29?usp… : PS1, Line 1277: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 2), please, no spaces at the start of a line Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20640): https://gerrit.osmocom.org/c/osmo-pcu/+/39188/comment/a71b5dd5_04d570ec?usp… : PS1, Line 1277: M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 2), space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I061ac16df5e6413266de08884f791f0264791192 Gerrit-Change-Number: 39188 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 20 Dec 2024 10:37:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

6 months

1
0
0 0

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

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/39187?usp=email ) 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. Related: osmo-pcu.git I061ac16df5e6413266de08884f791f0264791192 Change-Id: Iac4de18ef25386f774bb409201b7a7996d1c8824 --- M src/rlcmac/csn1_ts_44_060.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/87/39187/1 diff --git a/src/rlcmac/csn1_ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c index 296c498..8326f73 100644 --- a/src/rlcmac/csn1_ts_44_060.c +++ b/src/rlcmac/csn1_ts_44_060.c @@ -522,31 +522,31 @@ static const CSN_DESCR_BEGIN(EGPRS_BEP_LinkQualityMeasurements_type2_t) - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_CV_BEP, 3), -- 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: newchange Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iac4de18ef25386f774bb409201b7a7996d1c8824 Gerrit-Change-Number: 39187 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-pcu[master]: gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email ) Change subject: gsm_rlcmac: fix EGPRS BEP Link Quality Measurements Type 2 ...................................................................... gsm_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. Related: libosmo-gprs.git Iac4de18ef25386f774bb409201b7a7996d1c8824 Change-Id: I061ac16df5e6413266de08884f791f0264791192 --- M src/gsm_rlcmac.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/39188/1 diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 570c97b..d5b0c7f 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -1250,31 +1250,31 @@ static const CSN_DESCR_BEGIN(EGPRS_BEP_LinkQualityMeasurements_type2_t) - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_CV_BEP, 3), - M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 1), + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 2), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_MEAN_BEP, 5), M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_CV_BEP, 3), -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I061ac16df5e6413266de08884f791f0264791192 Gerrit-Change-Number: 39188 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: mgcp_network.c: Simplify use of conn_rtp ptr

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39185?usp=email ) Change subject: mgw: mgcp_network.c: Simplify use of conn_rtp ptr ...................................................................... mgw: mgcp_network.c: Simplify use of conn_rtp ptr Change-Id: I5bab15fc793434173660769a8e60dae4ae4aa4c6 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/85/39185/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fd27e9a..f0111cd 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1343,13 +1343,13 @@ * packets back to their origin. We will use the originating * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ - if (osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa) == 0) { - memcpy(&conn->u.rtp.end.addr, from_addr, - sizeof(conn->u.rtp.end.addr)); + if (osmo_sockaddr_port(&conn_src->end.addr.u.sa) == 0) { + memcpy(&conn_src->end.addr, from_addr, + sizeof(conn_src->end.addr)); LOG_CONN_RTP(conn_src, LOGL_NOTICE, "loopback mode: implicitly using source address (%s:%u) as destination address\n", osmo_sockaddr_ntop(&from_addr->u.sa, ipbuf), - osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa)); + osmo_sockaddr_port(&conn_src->end.addr.u.sa)); } return mgcp_conn_rtp_dispatch_rtp(conn_src, msg); } @@ -1428,19 +1428,19 @@ * packets back to their origin. We will use the originating * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ - if (osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa) == 0) { - memcpy(&conn->u.rtp.end.addr, from_addr, - sizeof(conn->u.rtp.end.addr)); + if (osmo_sockaddr_port(&conn_src->end.addr.u.sa) == 0) { + memcpy(&conn_src->end.addr, from_addr, + sizeof(conn_src->end.addr)); LOG_CONN_RTP(conn_src, LOGL_NOTICE, "loopback mode: implicitly using source address (%s:%u) as destination address\n", osmo_sockaddr_ntop(&from_addr->u.sa, ipbuf), - osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa)); + osmo_sockaddr_port(&conn_src->end.addr.u.sa)); } return mgcp_conn_rtp_dispatch_rtp(conn_src, msg); } /* Forward to E1 */ - return mgcp_e1_send_rtp(conn->endp, conn->u.rtp.end.codec, msg); + return mgcp_e1_send_rtp(conn->endp, conn_src->end.codec, msg); } /*! cleanup an endpoint when a connection on an RTP bridge endpoint is removed. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39185?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: I5bab15fc793434173660769a8e60dae4ae4aa4c6 Gerrit-Change-Number: 39185 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Clean up access to conn_rtp from conn

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39186?usp=email ) Change subject: mgw: Clean up access to conn_rtp from conn ...................................................................... mgw: Clean up access to conn_rtp from conn Add a new mgcp_conn_get_conn_rtp() and use it everywhere instead of accessing deep structure fields. Change-Id: Iee2c19598e9570ea3b1ceba3cdfd2a5f5be2c954 --- M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_e1.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_stat.c M src/libosmo-mgcp/mgcp_vty.c 9 files changed, 39 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/39186/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index de9bae6..106544a 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -28,6 +28,7 @@ #include <osmocom/mgcp/osmux.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/utils.h> #include <osmocom/gsm/iuup.h> #include <inttypes.h> @@ -237,6 +238,12 @@ return conn->type == MGCP_RTP_IUUP; } +static inline struct mgcp_conn_rtp *mgcp_conn_get_conn_rtp(struct mgcp_conn *conn) +{ + OSMO_ASSERT(conn->type == MGCP_CONN_TYPE_RTP); + return &conn->u.rtp; +} + struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp, enum mgcp_conn_type type, char *name); void mgcp_conn_free(struct mgcp_conn *conn); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 9d03550..403cbda 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -239,13 +239,16 @@ */ void mgcp_conn_free(struct mgcp_conn *conn) { + struct mgcp_conn_rtp *conn_rtp; + if (!conn) return; switch (conn->type) { case MGCP_CONN_TYPE_RTP: - aggregate_rtp_conn_stats(conn->endp, &conn->u.rtp); - mgcp_rtp_conn_cleanup(&conn->u.rtp); + conn_rtp = mgcp_conn_get_conn_rtp(conn); + aggregate_rtp_conn_stats(conn->endp, conn_rtp); + mgcp_rtp_conn_cleanup(conn_rtp); break; default: /* NOTE: This should never be called with an @@ -268,24 +271,26 @@ static char str[sizeof(conn->name)+sizeof(conn->id)+256]; char ipbuf[INET6_ADDRSTRLEN]; struct osmo_strbuf sb = { .buf = str, .len = sizeof(str) }; + struct mgcp_conn_rtp *conn_rtp; if (!conn) return "NULL"; switch (conn->type) { case MGCP_CONN_TYPE_RTP: + conn_rtp = mgcp_conn_get_conn_rtp(conn); OSMO_STRBUF_PRINTF(sb, "(%s/%s C:%s r=%s:%u<->l=%s:%u", conn->name, mgcp_conn_rtp_type_name(conn->type), conn->id, - osmo_sockaddr_ntop(&conn->u.rtp.end.addr.u.sa, ipbuf) ? : "NULL", - osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa), - conn->u.rtp.end.local_addr ? : "NULL", - conn->u.rtp.end.local_port); + osmo_sockaddr_ntop(&conn_rtp->end.addr.u.sa, ipbuf) ? : "NULL", + osmo_sockaddr_port(&conn_rtp->end.addr.u.sa), + conn_rtp->end.local_addr ? : "NULL", + conn_rtp->end.local_port); - switch (conn->u.rtp.type) { + switch (conn_rtp->type) { case MGCP_RTP_OSMUX: - OSMO_STRBUF_PRINTF(sb, " CID=%u", conn->u.rtp.osmux.local_cid); + OSMO_STRBUF_PRINTF(sb, " CID=%u", conn_rtp->osmux.local_cid); break; default: break; diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index fac1ff6..428d652 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -650,6 +650,7 @@ void mgcp_e1_endp_update(struct mgcp_endpoint *endp) { struct mgcp_conn *conn; + struct mgcp_conn_rtp *conn_rtp; struct mgcp_rtp_codec *codec; enum osmo_tray_sync_pat_id sync_pat_id; @@ -658,7 +659,8 @@ * endpoint no more than one connection should exist. */ conn = mgcp_endp_get_conn_oldest(endp); OSMO_ASSERT(conn); - codec = conn->u.rtp.end.codec; + conn_rtp = mgcp_conn_get_conn_rtp(conn); + codec = conn_rtp->end.codec; OSMO_ASSERT(codec); /* Update codec information */ diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index b2ece20..c91a00d 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -741,7 +741,7 @@ return NULL; if (conn->type == MGCP_CONN_TYPE_RTP) - return &conn->u.rtp; + return mgcp_conn_get_conn_rtp(conn); return NULL; } diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index 5900a65..2360a0b 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -110,20 +110,16 @@ ret = -1; } - /* Special handling for RTP connections */ - if (conn->type == MGCP_CONN_TYPE_RTP) { - conn->u.rtp.end.output_enabled = !!(conn->mode & MGCP_CONN_SEND_ONLY); - } - LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "conn:%s\n", mgcp_conn_dump(conn)); - LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "connection mode '%s' %d\n", mode, conn->mode); - /* Special handling für RTP connections */ + /* Special handling for RTP connections */ if (conn->type == MGCP_CONN_TYPE_RTP) { + struct mgcp_conn_rtp *conn_rtp = mgcp_conn_get_conn_rtp(conn); + conn_rtp->end.output_enabled = !!(conn->mode & MGCP_CONN_SEND_ONLY); LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "output_enabled %u\n", - conn->u.rtp.end.output_enabled); + conn_rtp->end.output_enabled); } /* The VTY might change the connection mode at any time, so we have diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index f8383d6..0c285dd 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -265,7 +265,7 @@ if (conn->type != MGCP_CONN_TYPE_RTP) continue; - conn_rtp = &conn->u.rtp; + conn_rtp = mgcp_conn_get_conn_rtp(conn); if (!mgcp_conn_rtp_is_osmux(conn_rtp)) continue; diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index d166a4e..4e63e4d 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -172,7 +172,7 @@ /* Find the "sister" connection */ llist_for_each_entry(_conn, &endp->conns, entry) { if (_conn->id != conn->conn->id) { - conn_src = &_conn->u.rtp; + conn_src = mgcp_conn_get_conn_rtp(_conn); break; } } @@ -819,7 +819,7 @@ /* Try to find an destination RTP connection that we can include in the codec decision. */ conn_dst = mgcp_find_dst_conn(conn->conn); if (conn_dst && conn_dst->type == MGCP_CONN_TYPE_RTP) - conn_dst_rtp = &conn_dst->u.rtp; + conn_dst_rtp = mgcp_conn_get_conn_rtp(conn_dst); else conn_dst_rtp = NULL; @@ -1609,7 +1609,7 @@ llist_for_each_entry(conn, &endp->conns, entry) { if (conn->type == MGCP_CONN_TYPE_RTP && conn->mode == MGCP_CONN_RECV_ONLY) - send_dummy(endp, &conn->u.rtp); + send_dummy(endp, mgcp_conn_get_conn_rtp(conn)); } } diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c index c66ce6b..081a381 100644 --- a/src/libosmo-mgcp/mgcp_stat.c +++ b/src/libosmo-mgcp/mgcp_stat.c @@ -141,7 +141,7 @@ * keep this option open: */ switch (conn->type) { case MGCP_CONN_TYPE_RTP: - mgcp_format_stats_rtp(str, str_len, &conn->u.rtp); + mgcp_format_stats_rtp(str, str_len, mgcp_conn_get_conn_rtp(conn)); break; default: break; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 042841c..8e0360f 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -254,7 +254,8 @@ * connection types (E1) as soon as * the implementation is available */ if (conn->type == MGCP_CONN_TYPE_RTP) { - dump_rtp_end(vty, &conn->u.rtp); + struct mgcp_conn_rtp *conn_rtp = mgcp_conn_get_conn_rtp(conn); + dump_rtp_end(vty, conn_rtp); } } } @@ -1357,10 +1358,11 @@ endp = trunk->endpoints[endp_no]; int loop = atoi(argv[2]); llist_for_each_entry(conn, &endp->conns, entry) { - if (conn->type == MGCP_CONN_TYPE_RTP) + if (conn->type == MGCP_CONN_TYPE_RTP) { /* Handle it like a MDCX, switch on SSRC patching if enabled */ - mgcp_rtp_end_config(endp, 1, &conn->u.rtp.end); - else { + struct mgcp_conn_rtp *conn_rtp = mgcp_conn_get_conn_rtp(conn); + mgcp_rtp_end_config(endp, 1, &conn_rtp->end); + } else { /* FIXME: Introduce support for other connection (E1) * types when implementation is available */ vty_out(vty, "%%Can't enable SSRC patching," -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39186?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: Iee2c19598e9570ea3b1ceba3cdfd2a5f5be2c954 Gerrit-Change-Number: 39186 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Rename and move several get_conn funcs acting on endp object

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39184?usp=email ) Change subject: mgw: Rename and move several get_conn funcs acting on endp object ...................................................................... mgw: Rename and move several get_conn funcs acting on endp object These functions act on the endp object, hence prefix them with mgcp_endp_* and move them to mgcp_endp.{c,h}. Change-Id: Ifff01331db68998e9e23f99d8836d96022d550c2 --- M include/osmocom/mgcp/mgcp_conn.h M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_e1.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 9 files changed, 87 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/84/39184/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 6219579..de9bae6 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -240,10 +240,6 @@ struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp, enum mgcp_conn_type type, char *name); void mgcp_conn_free(struct mgcp_conn *conn); -struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id); -struct mgcp_conn_rtp *mgcp_conn_get_rtp(struct mgcp_endpoint *endp, - const char *id); char *mgcp_conn_dump(struct mgcp_conn *conn); struct mgcp_conn *mgcp_find_dst_conn(struct mgcp_conn *conn); -struct mgcp_conn *mgcp_conn_get_oldest(struct mgcp_endpoint *endp); void mgcp_conn_watchdog_kick(struct mgcp_conn *conn); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 8e5b4cc..4f41818 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -148,3 +148,8 @@ struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname, const struct mgcp_trunk *trunk); void mgcp_endp_release(struct mgcp_endpoint *endp); + +struct mgcp_conn *mgcp_endp_get_conn(struct mgcp_endpoint *endp, const char *id); +struct mgcp_conn *mgcp_endp_get_conn_oldest(struct mgcp_endpoint *endp); +struct mgcp_conn_rtp *mgcp_endp_get_conn_rtp(struct mgcp_endpoint *endp, + const char *id); diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 9c60dfa..9d03550 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -74,7 +74,7 @@ /* ensure that the generated conn_id is unique * for this endpoint */ - if (!mgcp_conn_get_rtp(endp, id_hex)) { + if (!mgcp_endp_get_conn_rtp(endp, id_hex)) { osmo_strlcpy(id, id_hex, MGCP_CONN_ID_MAXLEN); return 0; } @@ -212,58 +212,6 @@ return conn; } -/*! find a connection by its ID. - * \param[in] endp associated endpoint - * \param[in] id identification number of the connection - * \returns pointer to allocated connection, NULL if not found */ -struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id) -{ - struct mgcp_conn *conn; - const char *id_upper; - const char *conn_id; - - if (!id || !*id) - return NULL; - - /* Ignore leading zeros in needle */ - while (*id == '0') - id++; - - /* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of - * Connections" defines the id as a hex string, so clients may return lower case hex even though - * we sent upper case hex in the CRCX response. */ - id_upper = osmo_str_toupper(id); - - llist_for_each_entry(conn, &endp->conns, entry) { - /* Ignore leading zeros in haystack */ - for (conn_id=conn->id; *conn_id == '0'; conn_id++); - - if (strcmp(conn_id, id_upper) == 0) - return conn; - } - - return NULL; -} - -/*! find an RTP connection by its ID. - * \param[in] endp associated endpoint - * \param[in] id identification number of the connection - * \returns pointer to allocated connection, NULL if not found */ -struct mgcp_conn_rtp *mgcp_conn_get_rtp(struct mgcp_endpoint *endp, - const char *id) -{ - struct mgcp_conn *conn; - - conn = mgcp_conn_get(endp, id); - if (!conn) - return NULL; - - if (conn->type == MGCP_CONN_TYPE_RTP) - return &conn->u.rtp; - - return NULL; -} - static void aggregate_rtp_conn_stats(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn_rtp) { struct rate_ctr_group *all_stats = endp->trunk->ratectr.all_rtp_conn_stats; @@ -377,16 +325,6 @@ return NULL; } -/*! get oldest connection in the list. - * \param[in] endp associated endpoint */ -struct mgcp_conn *mgcp_conn_get_oldest(struct mgcp_endpoint *endp) -{ - if (llist_empty(&endp->conns)) - return NULL; - - return llist_last_entry(&endp->conns, struct mgcp_conn, entry); -} - const struct value_string mgcp_conn_rtp_type_names[] = { { MGCP_RTP_DEFAULT, "rtp" }, { MGCP_RTP_OSMUX, "osmux" }, diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c index 1428824..fac1ff6 100644 --- a/src/libosmo-mgcp/mgcp_e1.c +++ b/src/libosmo-mgcp/mgcp_e1.c @@ -656,7 +656,7 @@ /* In order to determine the codec, find the oldest connection on * the endpoint and use its codec information. Normally on an E1 * endpoint no more than one connection should exist. */ - conn = mgcp_conn_get_oldest(endp); + conn = mgcp_endp_get_conn_oldest(endp); OSMO_ASSERT(conn); codec = conn->u.rtp.end.codec; OSMO_ASSERT(codec); diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 6973b43..b2ece20 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -684,6 +684,68 @@ mgcp_conn_free(conn); } +/*! find a connection by its ID. + * \param[in] endp associated endpoint + * \param[in] id identification number of the connection + * \returns pointer to allocated connection, NULL if not found */ +struct mgcp_conn *mgcp_endp_get_conn(struct mgcp_endpoint *endp, const char *id) +{ + struct mgcp_conn *conn; + const char *id_upper; + const char *conn_id; + + if (!id || !*id) + return NULL; + + /* Ignore leading zeros in needle */ + while (*id == '0') + id++; + + /* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of + * Connections" defines the id as a hex string, so clients may return lower case hex even though + * we sent upper case hex in the CRCX response. */ + id_upper = osmo_str_toupper(id); + + llist_for_each_entry(conn, &endp->conns, entry) { + /* Ignore leading zeros in haystack */ + for (conn_id = conn->id; *conn_id == '0'; conn_id++); + + if (strcmp(conn_id, id_upper) == 0) + return conn; + } + + return NULL; +} + +/*! get oldest connection in the list. + * \param[in] endp associated endpoint */ +struct mgcp_conn *mgcp_endp_get_conn_oldest(struct mgcp_endpoint *endp) +{ + if (llist_empty(&endp->conns)) + return NULL; + + return llist_last_entry(&endp->conns, struct mgcp_conn, entry); +} + +/*! find an RTP connection by its ID. + * \param[in] endp associated endpoint + * \param[in] id identification number of the connection + * \returns pointer to allocated connection, NULL if not found */ +struct mgcp_conn_rtp *mgcp_endp_get_conn_rtp(struct mgcp_endpoint *endp, + const char *id) +{ + struct mgcp_conn *conn; + + conn = mgcp_endp_get_conn(endp, id); + if (!conn) + return NULL; + + if (conn->type == MGCP_CONN_TYPE_RTP) + return &conn->u.rtp; + + return NULL; +} + /*! release endpoint, all open connections are closed. * \param[in] endp endpoint to release */ void mgcp_endp_release(struct mgcp_endpoint *endp) diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index a46ffc2..5900a65 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -294,7 +294,7 @@ } /* Check if connection exists */ - if (mgcp_conn_get(endp, conn_id)) + if (mgcp_endp_get_conn(endp, conn_id)) return 0; LOGPENDP(endp, DLMGCP, LOGL_ERROR, diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index dbe6760..d166a4e 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1022,7 +1022,7 @@ goto error2; } - conn = mgcp_conn_get_rtp(endp, _conn->id); + conn = mgcp_endp_get_conn_rtp(endp, _conn->id); OSMO_ASSERT(conn); if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) { @@ -1237,7 +1237,7 @@ return create_err_response(endp, endp, 515, "MDCX", pdata->trans); } - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); if (!conn) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_CONN_NOT_FOUND)); return create_err_response(endp, endp, 400, "MDCX", pdata->trans); @@ -1475,7 +1475,7 @@ } /* Find the connection */ - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); if (!conn) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_INVALID_CONNID)); goto error3; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index b82f3df..042841c 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -1418,7 +1418,7 @@ endp = trunk->endpoints[endp_no]; conn_id = argv[2]; - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); if (!conn) { vty_out(vty, "Conn ID %s is invalid.%s", conn_id, VTY_NEWLINE); diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 44927e1..c257d6a 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -965,7 +965,7 @@ endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, "1"); + conn = mgcp_endp_get_conn_rtp(endp, "1"); if (conn) { OSMO_ASSERT(conn); @@ -1209,7 +1209,7 @@ mgcp_conn_alloc(NULL, &endp, MGCP_CONN_TYPE_RTP, "test-connection"); OSMO_ASSERT(_conn); - conn = mgcp_conn_get_rtp(&endp, _conn->id); + conn = mgcp_endp_get_conn_rtp(&endp, _conn->id); OSMO_ASSERT(conn); state = &conn->state; packets_rx = rate_ctr_group_get_ctr(conn->ctrg, RTP_PACKETS_RX_CTR); @@ -1461,7 +1461,7 @@ _conn = mgcp_conn_alloc(NULL, &endp, MGCP_CONN_TYPE_RTP, "test-connection"); OSMO_ASSERT(_conn); - conn = mgcp_conn_get_rtp(&endp, _conn->id); + conn = mgcp_endp_get_conn_rtp(&endp, _conn->id); OSMO_ASSERT(conn); rtp = &conn->end; @@ -1548,7 +1548,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/1@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); @@ -1564,7 +1564,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/2@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); @@ -1585,7 +1585,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/3@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); @@ -1601,7 +1601,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/4@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 18); @@ -1617,7 +1617,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); @@ -1629,7 +1629,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 3); OSMO_ASSERT(osmo_sockaddr_port(&conn->end.addr.u.sa) == 16434); @@ -1646,7 +1646,7 @@ talloc_free(endp->last_response); talloc_free(endp->last_trans); endp->last_response = endp->last_trans = NULL; - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(!conn); last_endpoint[0] = '\0'; @@ -1660,7 +1660,7 @@ OSMO_ASSERT(strcmp(last_endpoint,"rtpbridge/5@mgw") == 0); endp = mgcp_endp_by_name(NULL, last_endpoint, cfg); OSMO_ASSERT(endp); - conn = mgcp_conn_get_rtp(endp, conn_id); + conn = mgcp_endp_get_conn_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec->payload_type == 0); @@ -1689,7 +1689,7 @@ _conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP, "test-connection"); OSMO_ASSERT(_conn); - conn = mgcp_conn_get_rtp(endp, _conn->id); + conn = mgcp_endp_get_conn_rtp(endp, _conn->id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->state.stats.initialized == 0); @@ -2332,7 +2332,7 @@ for (i = 0; i < ARRAY_SIZE(conn_id_request); i++) { const char *needle = conn_id_request[i]; printf("needle='%s' ", needle); - conn_match = mgcp_conn_get(&endp, needle); + conn_match = mgcp_endp_get_conn(&endp, needle); OSMO_ASSERT(conn_match); printf("found '%s'\n", conn_match->id); OSMO_ASSERT(conn_match == conn); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39184?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: Ifff01331db68998e9e23f99d8836d96022d550c2 Gerrit-Change-Number: 39184 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Rename and move code freeing endp connection

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39183?usp=email ) Change subject: mgw: Rename and move code freeing endp connection ...................................................................... mgw: Rename and move code freeing endp connection All the code to free conns in an endpoint is really entanged, which also makes it inefficient in several places because the list of conns is iterated twice, or even ~N*2. * Move code freeing the conn object to its own mgcp_conn_free() function. * Rename functions acting on endp to be mgcp_endp_* prefix, and move them to mgcp_endp.{c,h}. * Remove old mgcp_conn_free(endp, id) since it's not really needed anymore. Change-Id: I9a87a07699dd8aa7856d5036e9b95a4ddf699a15 --- M include/osmocom/mgcp/mgcp_conn.h M include/osmocom/mgcp/mgcp_endp.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_protocol.c M tests/mgcp/mgcp_test.c 6 files changed, 44 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/39183/1 diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 4f7b705..6219579 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -239,12 +239,10 @@ struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp, enum mgcp_conn_type type, char *name); +void mgcp_conn_free(struct mgcp_conn *conn); struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id); struct mgcp_conn_rtp *mgcp_conn_get_rtp(struct mgcp_endpoint *endp, const char *id); -void mgcp_conn_free(struct mgcp_endpoint *endp, const char *id); -void mgcp_conn_free_oldest(struct mgcp_endpoint *endp); -void mgcp_conn_free_all(struct mgcp_endpoint *endp); char *mgcp_conn_dump(struct mgcp_conn *conn); struct mgcp_conn *mgcp_find_dst_conn(struct mgcp_conn *conn); struct mgcp_conn *mgcp_conn_get_oldest(struct mgcp_endpoint *endp); diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h index 7bf034b..8e5b4cc 100644 --- a/include/osmocom/mgcp/mgcp_endp.h +++ b/include/osmocom/mgcp/mgcp_endp.h @@ -141,6 +141,8 @@ bool mgcp_endp_avail(struct mgcp_endpoint *endp); void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn); void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn); +void mgcp_endp_free_conn_oldest(struct mgcp_endpoint *endp); +void mgcp_endp_free_conn_all(struct mgcp_endpoint *endp); void mgcp_endp_strip_name(char *epname_stripped, const char *epname, const struct mgcp_trunk *trunk); struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname, diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 5eb4897..9c60dfa 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -146,7 +146,7 @@ { struct mgcp_conn *conn = data; LOGPCONN(conn, DLMGCP, LOGL_ERROR, "connection timed out!\n"); - mgcp_conn_free(conn->endp, conn->id); + mgcp_conn_free(conn); } void mgcp_conn_watchdog_kick(struct mgcp_conn *conn) @@ -286,20 +286,17 @@ rate_ctr_inc(rate_ctr_group_get_ctr(all_stats, RTP_NUM_CONNECTIONS)); } -/*! free a connection by its ID. - * \param[in] endp associated endpoint - * \param[in] id identification number of the connection */ -void mgcp_conn_free(struct mgcp_endpoint *endp, const char *id) +/*! free a connection + * \param[in] conn the conn to free. May be NULL. +*/ +void mgcp_conn_free(struct mgcp_conn *conn) { - struct mgcp_conn *conn; - - conn = mgcp_conn_get(endp, id); if (!conn) return; switch (conn->type) { case MGCP_CONN_TYPE_RTP: - aggregate_rtp_conn_stats(endp, &conn->u.rtp); + aggregate_rtp_conn_stats(conn->endp, &conn->u.rtp); mgcp_rtp_conn_cleanup(&conn->u.rtp); break; default: @@ -310,45 +307,11 @@ } osmo_timer_del(&conn->watchdog); - mgcp_endp_remove_conn(endp, conn); + mgcp_endp_remove_conn(conn->endp, conn); /* WARN: endp may have be freed after call to mgcp_endp_remove_conn */ talloc_free(conn); } -/*! free oldest connection in the list. - * \param[in] endp associated endpoint */ -void mgcp_conn_free_oldest(struct mgcp_endpoint *endp) -{ - struct mgcp_conn *conn; - - if (llist_empty(&endp->conns)) - return; - - conn = llist_last_entry(&endp->conns, struct mgcp_conn, entry); - if (!conn) - return; - - mgcp_conn_free(endp, conn->id); -} - -/*! free all connections at once. - * \param[in] endp associated endpoint */ -#if defined(__has_attribute) -#if __has_attribute(no_sanitize) -__attribute__((no_sanitize("undefined"))) /* ubsan detects a misaligned load */ -#endif -#endif -void mgcp_conn_free_all(struct mgcp_endpoint *endp) -{ - struct mgcp_conn *conn; - - /* Drop all items in the list, might be consecutive! */ - while ((conn = llist_first_entry_or_null(&endp->conns, struct mgcp_conn, entry))) - mgcp_conn_free(endp, conn->id); - - return; -} - /*! dump basic connection information to human readable string. * \param[in] conn to dump * \returns human readable string */ diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c index 4c870ec..6973b43 100644 --- a/src/libosmo-mgcp/mgcp_endp.c +++ b/src/libosmo-mgcp/mgcp_endp.c @@ -655,6 +655,35 @@ mgcp_endp_release(endp); } +/*! free oldest connection in the list. + * \param[in] endp associated endpoint */ +void mgcp_endp_free_conn_oldest(struct mgcp_endpoint *endp) +{ + struct mgcp_conn *conn; + + if (llist_empty(&endp->conns)) + return; + + conn = llist_last_entry(&endp->conns, struct mgcp_conn, entry); + mgcp_conn_free(conn); +} + +/*! free all connections at once. + * \param[in] endp associated endpoint */ +#if defined(__has_attribute) +#if __has_attribute(no_sanitize) +__attribute__((no_sanitize("undefined"))) /* ubsan detects a misaligned load */ +#endif +#endif +void mgcp_endp_free_conn_all(struct mgcp_endpoint *endp) +{ + struct mgcp_conn *conn; + + /* Drop all items in the list, might be consecutive! */ + while ((conn = llist_first_entry_or_null(&endp->conns, struct mgcp_conn, entry))) + mgcp_conn_free(conn); +} + /*! release endpoint, all open connections are closed. * \param[in] endp endpoint to release */ void mgcp_endp_release(struct mgcp_endpoint *endp) @@ -665,7 +694,7 @@ * all connections have been removed already. In case * that there are still connections open (e.g. when * RSIP is executed), free them all at once. */ - mgcp_conn_free_all(endp); + mgcp_endp_free_conn_all(endp); /* We must only decrement the stat item when the endpoint as actually * claimed. An endpoint is claimed when a call-id is set */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 47fa30b..dbe6760 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -975,7 +975,7 @@ /* There is no more room for a connection, make some * room by blindly tossing the oldest of the two two * connections */ - mgcp_conn_free_oldest(endp); + mgcp_endp_free_conn_oldest(endp); } else { /* There is no more room for a connection, leave * everything as it is and return with an error */ @@ -1020,7 +1020,6 @@ "CRCX: unable to allocate RTP connection\n"); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_ALLOC_CONN)); goto error2; - } conn = mgcp_conn_get_rtp(endp, _conn->id); @@ -1487,7 +1486,7 @@ /* delete connection */ LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG, "DLCX: deleting conn:%s\n", mgcp_conn_dump(conn->conn)); - mgcp_conn_free(endp, conn_id); + mgcp_conn_free(conn->conn); LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "DLCX: connection successfully deleted\n"); diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index de359d5..44927e1 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1230,7 +1230,7 @@ pl_test_dat[i].expected); } - mgcp_conn_free_all(&endp); + mgcp_endp_free_conn_all(&endp); } talloc_free(trunk); @@ -1513,7 +1513,7 @@ } force_monotonic_time_us = -1; - mgcp_conn_free_all(&endp); + mgcp_endp_free_conn_all(&endp); talloc_free(trunk); talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39183?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: I9a87a07699dd8aa7856d5036e9b95a4ddf699a15 Gerrit-Change-Number: 39183 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39182?usp=email ) Change subject: cosmetic: mgw: Fix indentation whitespace ...................................................................... cosmetic: mgw: Fix indentation whitespace Change-Id: Ic5b267108b5c5cba064ddddbe688705f9dc29ac8 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/82/39182/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 2f16794..47fa30b 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1147,7 +1147,7 @@ const char *local_options = NULL; const char *mode = NULL; struct mgcp_conn_rtp *conn = NULL; - const char *conn_id = NULL; + const char *conn_id = NULL; int remote_osmux_cid = -2; int rc; -- 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: newchange 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>

6 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/81/39181/1 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: newchange 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>

6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024