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

[M] Change in osmo-mgw[master]: drop (now) unused code

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35247?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: drop (now) unused code ...................................................................... drop (now) unused code Removing the duality of codecs[] and ptmap[] in structs mgcp_msg, mgcp_response and mgcp_conn_peer has removed the need to "map" from codec type enum to payload type number. They are stored together now. Remove functions that are no longer used. None of our osmocom users of libosmo-mgcp-client call these functions. Change-Id: I84e5285831397c992af59deee12dea8458d16cc6 --- M TODO-RELEASE M include/osmocom/mgcp_client/mgcp_client.h M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.err M tests/mgcp_client/mgcp_client_test.ok 6 files changed, 21 insertions(+), 177 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/47/35247/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35247?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I84e5285831397c992af59deee12dea8458d16cc6 Gerrit-Change-Number: 35247 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better

by neels

Attention is currently required from: dexter. neels has uploaded a new patch set (#14) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better ...................................................................... mgcp_client_fsm: explain member param in struct mgcp_conn_peer better The struct member param specifies additional codec parameters. Let's improve its explaination. Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Related: OS#6171 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/34350/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 14 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw, client: add fmtp string to ptmap: allow all possible fmtp

by neels

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: mgw, client: add fmtp string to ptmap: allow all possible fmtp ...................................................................... mgw, client: add fmtp string to ptmap: allow all possible fmtp Remove the limit of having only one AMR octet-aligned fmtp parameter per MGCP message. Instead allow any arbitrary fmtp options, one per every codec. Deprecate all use of struct mgcp_codec_param. Instead, store and pass plain fmtp strings. Provide legacy shims that still act correctly for any callers that may pass the old struct mgcp_codec_param. (I'm not sure if we need to keep this, but we can always drop it in another patch.) Adjust one mgcp_test.c: instead of returning only the octet-aligned parameter, now osmo-mgw keeps and returns all the fmtp parameters that the user provided. So add the missing "mode-change-capability". Related: OS#6171 Related: osmo-msc Ief9225c9bcf7525a9a0a07c282ffb8cc0d092186 Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b --- M include/osmocom/mgcp/mgcp_codec.h M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M tests/mgcp/mgcp_test.c 11 files changed, 143 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/00/34900/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 11 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_codec_decide: remove redundant lookup

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35301?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: mgcp_codec_decide: remove redundant lookup ...................................................................... mgcp_codec_decide: remove redundant lookup We already did a lookup from conn_src[i] and found a matching codec_conn_dst, no need to do another reverse lookup to end up at the same conn_src[i] codec. Change-Id: Iecc7f22c551fd17b23db434fdb177266407d2621 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/01/35301/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iecc7f22c551fd17b23db434fdb177266407d2621 Gerrit-Change-Number: 35301 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: do not fail MGCP on codec mismatch

by neels

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?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: mgw: do not fail MGCP on codec mismatch ...................................................................... mgw: do not fail MGCP on codec mismatch Before this patch, when an CRCX+MDCX wants to set a codec list that has no match with the codecs for the other conn of that same endpoint, osmo-mgw returns an MGCP "FAIL" response. When a client wants to change the codec, it has to do that one RTP port at a time. So osmo-mgw *must* allow to configure an MGCP conn with a codec choice that mismatches the other conn. This is crucial to allow codec negotiation in osmo-msc: if MO has already assigned a specific codec, and later wants to re-assign to the codec that MT has chosen, the codec needs to be changed at osmo-mgw. This patch is the minimal fix required to get re-assignment to a different codec to work (via osmo-msc). There is more work to be done about this bit of code in osmo-mgw, but keep that to a separate patch. In detail, before this patch, we fail both - when a side has no codecs, - or when there is no single match between codecs of the two sides of the endpoint. Remove only the second condition; after this patch, still fail when a side has no codecs -- this allows mgcp_test.c to still pass. Related: OS#6293 Related: osmo-msc I8760feaa8598047369ef8c3ab2673013bac8ac8a Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 46 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/02/35302/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 Gerrit-Change-Number: 35302 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: tweak DEBUG log

by neels

Attention is currently required from: neels. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35304?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: tweak DEBUG log ...................................................................... tweak DEBUG log Printing the debug log line a little later will include the MGCP verb information. Change-Id: Icb230cf4d623cdbc4ab52bd52d2a72525c0168c7 --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/04/35304/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35304?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icb230cf4d623cdbc4ab52bd52d2a72525c0168c7 Gerrit-Change-Number: 35304 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: tests/mgcp: add update_exp target

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35435?usp=email ) Change subject: tests/mgcp: add update_exp target ...................................................................... tests/mgcp: add update_exp target Change-Id: I1ea7e881fe13429762bf31507d8d23fe58e241b3 --- M tests/mgcp/Makefile.am 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/35435/1 diff --git a/tests/mgcp/Makefile.am b/tests/mgcp/Makefile.am index 73ad1cf..78d9f6a 100644 --- a/tests/mgcp/Makefile.am +++ b/tests/mgcp/Makefile.am @@ -45,3 +45,6 @@ $(LIBOSMONETIF_LIBS) \ -lm \ $(NULL) + +update_exp: + $(builddir)/mgcp_test >$(srcdir)/mgcp_test.ok -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I1ea7e881fe13429762bf31507d8d23fe58e241b3 Gerrit-Change-Number: 35435 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-mgw[master]: add fmtp.h

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35434?usp=email ) Change subject: add fmtp.h ...................................................................... add fmtp.h Upcoming patches will add handling of arbitrary ftmp strings to osmo-mgw as well as libosmo-mgcp-client (If58590bda8627519ff07e0b6f43aa47a274f052b). Add generic API for handling ftmp strings. The primary intended user is osmo-mgw, but this is also generally useful to libosmo-mgcp-client callers for parsing the received fmtp. We discussed that fmtp.[hc] should be published in libosmo-mgcp-client, but also built within osmo-mgw. Hence: - put fmtp.h and .c in libosmo-mgcp-client/ - in osmo-mgw code, use #include <mgcp_client/fmtp.h> and build the src/libosmo-mgcp-client/fmtp.c also into libosmo-mgcp.a. (This is currently the quickest solution and without side effects since fmtp.c is fully self-contained; an alternative would be adding a not-installed libmgcp-common.a within the build tree) Change-Id: I3eaea353dbd98c19212199b564342d0ac16cbc07 --- M include/Makefile.am A include/osmocom/mgcp_client/fmtp.h M src/libosmo-mgcp-client/Makefile.am A src/libosmo-mgcp-client/fmtp.c M src/libosmo-mgcp/Makefile.am 5 files changed, 179 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/35434/1 diff --git a/include/Makefile.am b/include/Makefile.am index c72cba8..031e7e6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -8,6 +8,7 @@ osmocom/mgcp_client/mgcp_client_endpoint_fsm.h \ osmocom/mgcp_client/mgcp_client_fsm.h \ osmocom/mgcp_client/mgcp_client_pool.h \ + osmocom/mgcp_client/fmtp.h \ $(NULL) noinst_HEADERS = \ diff --git a/include/osmocom/mgcp_client/fmtp.h b/include/osmocom/mgcp_client/fmtp.h new file mode 100644 index 0000000..863fc01 --- /dev/null +++ b/include/osmocom/mgcp_client/fmtp.h @@ -0,0 +1,29 @@ +#pragma once + +#include <stddef.h> +#include <stdbool.h> + +#define OSMO_SDP_NAME_A "a" +#define OSMO_SDP_NAME_FMTP "fmtp" +#define OSMO_SDP_NAME_AMR_OCTET_ALIGN "octet-align" + +#define OSMO_SDP_VAL_AMR_OCTET_ALIGN_0 OSMO_SDP_NAME_AMR_OCTET_ALIGN "=0" +#define OSMO_SDP_VAL_AMR_OCTET_ALIGN_1 OSMO_SDP_NAME_AMR_OCTET_ALIGN "=1" + +/* "fmtp:" */ +#define OSMO_SDP_PREFIX_FMTP OSMO_SDP_NAME_FMTP ":" +/* "a=fmtp:" */ +#define OSMO_SDP_PREFIX_A_FMTP OSMO_SDP_NAME_A "=" OSMO_SDP_PREFIX_FMTP + +bool osmo_sdp_fmtp_get_val(char *val, size_t val_size, const char *fmtp, const char *option_name); +int osmo_sdp_fmtp_get_int(const char *fmtp, const char *option_name, int default_value); + +/* Some AMR related fmtp parameters as in https://www.rfc-editor.org/rfc/rfc4867#section-8.1 that osmo-mgw needs.*/ +bool osmo_sdp_fmtp_amr_is_octet_aligned(const char *fmtp); + +/*! To compose AMR related fmtp indicating octet-align. + * Usage: + * printf("%s", OSMO_SDP_AMR_SET_OCTET_ALIGN(oa_flag)); + */ +#define OSMO_SDP_AMR_SET_OCTET_ALIGN(VAL) \ + ((VAL) ? OSMO_SDP_VAL_AMR_OCTET_ALIGN_1 : OSMO_SDP_VAL_AMR_OCTET_ALIGN_0 ) diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index b2bed9a..e120289 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -31,6 +31,7 @@ mgcp_client_fsm.c \ mgcp_client_endpoint_fsm.c \ mgcp_client_pool.c \ + fmtp.c \ $(NULL) libosmo_mgcp_client_la_LDFLAGS = \ diff --git a/src/libosmo-mgcp-client/fmtp.c b/src/libosmo-mgcp-client/fmtp.c new file mode 100644 index 0000000..b7a8bd9 --- /dev/null +++ b/src/libosmo-mgcp-client/fmtp.c @@ -0,0 +1,120 @@ +/* + * (C) 2023-2015 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +#include <string.h> +#include <ctype.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/mgcp_client/fmtp.h> + +static const char *fmtp_next_option(const char *fmtp) +{ + for (; fmtp && *fmtp && *fmtp != ';'; fmtp++); + for (; fmtp && isspace(*fmtp); fmtp++); + return fmtp; +} + +/*! Parse a given SDP fmtp value string, returning the value of a specific option, if present. + * + * Example: + * + * const char *fmtp_vals = "octet-align=1;mode-set=0,2,4,7"; + * + * char res[23]; + * if (osmo_sdp_fmtp_get_val(res, sizeof(res), fmtp_vals, "mode-set")) + * use_modeset(res); + * else + * use_modeset(MY_DEFAULT_MODESET); + * + * \param[out] val Buffer to write the option's value to. + * \param[in] val_size Space available in val. + * \param[in] fmtp fmtp value string to parse -- must not contain the "a=fmtp:N " prefix, only the value part. + * \param[in] option_name Which fmtp option to get the value for. + * \return true when the option was found, false when it was not present. + */ +bool osmo_sdp_fmtp_get_val(char *val, size_t val_size, const char *fmtp, const char *option_name) +{ + const char *pos = fmtp; + const char *end; + int option_name_len = strlen(option_name); + for (; pos && *pos; pos = fmtp_next_option(pos)) { + if (!osmo_str_startswith(pos, option_name)) + continue; + pos += option_name_len; + if (*pos != '=') + continue; + pos++; + break; + } + + if (!pos || !*pos) + return false; + + end = fmtp_next_option(pos); + OSMO_ASSERT(end); + if (val && val_size) + osmo_strlcpy(val, pos, OSMO_MIN(val_size, end - pos + 1)); + return true; +} + +/*! Parse a given SDP fmtp value string, returning the value of a specific integer option, if present. + * + * Example: + * + * const char *fmtp_vals = "octet-align=1;mode-set=0,2,4,7"; + * bool oa = osmo_sdp_fmtp_get_int(fmtp_vals, OSMO_SDP_AMR_OCTET_ALIGN_NAME, 1); + * + * \param[in] fmtp fmtp value string to parse -- must not contain the "a=fmtp:N " prefix, only the value part. + * \param[in] option_name Which fmtp option to get the value for. + * \param[in] default_value If option_name is not present or cannot be parsed as integer, return this instead. + * \return the integer value when the option was found and actually an integer, default_value otherwise. + */ +int osmo_sdp_fmtp_get_int(const char *fmtp, const char *option_name, int default_value) +{ + char val[128]; + if (!osmo_sdp_fmtp_get_val(val, sizeof(val), fmtp, option_name)) + return default_value; + if (!val[0]) + return default_value; + int i; + if (osmo_str_to_int(&i, val, 10, 0, 1)) { + /* error parsing number */ + LOGP(DLMGCP, LOGL_ERROR, "Invalid number in fmtp parameter '%s': '%s'\n", option_name, val); + return default_value; + } + return i; +} + +/*! Return true if octet-align is present and set to 1 in the given AMR related fmtp value. + * Default to octet-align=0, i.e. bandwidth-efficient mode. + * + * See RFC4867 "RTP Payload Format for AMR and AMR-WB" sections "8.1. AMR Media Type Registration" and "8.2. AMR-WB + * Media Type Registration": + * + * octet-align: Permissible values are 0 and 1. If 1, octet-align + * operation SHALL be used. If 0 or if not present, + * bandwidth-efficient operation is employed. + * + * https://tools.ietf.org/html/rfc4867 + */ +bool osmo_sdp_fmtp_amr_is_octet_aligned(const char *fmtp) +{ + return osmo_sdp_fmtp_get_int(fmtp, OSMO_SDP_NAME_AMR_OCTET_ALIGN, 0) == 1; +} diff --git a/src/libosmo-mgcp/Makefile.am b/src/libosmo-mgcp/Makefile.am index fa9a8eb..23c6b52 100644 --- a/src/libosmo-mgcp/Makefile.am +++ b/src/libosmo-mgcp/Makefile.am @@ -42,4 +42,5 @@ mgcp_ratectr.c \ mgcp_e1.c \ mgcp_iuup.c \ + $(top_srcdir)/src/libosmo-mgcp-client/fmtp.c \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3eaea353dbd98c19212199b564342d0ac16cbc07 Gerrit-Change-Number: 35434 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: build: move mgcp/*.h to noinst_HEADERS, drop RPM libosmo-mgcp-devel

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35433?usp=email ) Change subject: build: move mgcp/*.h to noinst_HEADERS, drop RPM libosmo-mgcp-devel ...................................................................... build: move mgcp/*.h to noinst_HEADERS, drop RPM libosmo-mgcp-devel We only install the mgcp_client/ headers. Related: OS#6300 Change-Id: Ie0f79222bd1702097c12193dcf7a0462805cfc4a --- M contrib/osmo-mgw.spec.in M include/Makefile.am 2 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/35433/1 diff --git a/contrib/osmo-mgw.spec.in b/contrib/osmo-mgw.spec.in index e52431c..fa08acd 100644 --- a/contrib/osmo-mgw.spec.in +++ b/contrib/osmo-mgw.spec.in @@ -60,16 +60,6 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmo-mgcp-client. -%package -n libosmo-mgcp-devel -Summary: Development files for Osmocom's Media Gateway server library -Group: Development/Libraries/C and C++ - -%description -n libosmo-mgcp-devel -Osmocom's Media Gateway Control Protocol server library. - -This subpackage contains libraries and header files for developing -applications that want to make use of libosmo-mgcp. - %prep %setup -q @@ -129,9 +119,4 @@ %dir %{_includedir}/osmocom/mgcp_client %{_includedir}/osmocom/mgcp_client/*.h -%files -n libosmo-mgcp-devel -%dir %{_includedir}/osmocom -%dir %{_includedir}/osmocom/mgcp -%{_includedir}/osmocom/mgcp/*.h - %changelog diff --git a/include/Makefile.am b/include/Makefile.am index 0b66cb3..c72cba8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -8,6 +8,9 @@ osmocom/mgcp_client/mgcp_client_endpoint_fsm.h \ osmocom/mgcp_client/mgcp_client_fsm.h \ osmocom/mgcp_client/mgcp_client_pool.h \ + $(NULL) + +noinst_HEADERS = \ osmocom/mgcp/mgcp.h \ osmocom/mgcp/mgcp_common.h \ osmocom/mgcp/osmux.h \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35433?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ie0f79222bd1702097c12193dcf7a0462805cfc4a Gerrit-Change-Number: 35433 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: drop get_net_downlink_format_cb

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35436?usp=email ) Change subject: drop get_net_downlink_format_cb ...................................................................... drop get_net_downlink_format_cb It seems to be a remnant from early openbsc_mgcp. There is only the default implementation for this callback and it simply returns two pointers. Simplify that. Change-Id: I18dfd44c931540caf4ac360c08ed10e5f65b2165 --- M include/osmocom/mgcp/mgcp.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c 4 files changed, 15 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/35436/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 224d756..42d67cf 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -138,8 +138,6 @@ mgcp_processing rtp_processing_cb; mgcp_processing_setup setup_rtp_processing_cb; - mgcp_get_format get_net_downlink_format_cb; - struct osmo_wqueue gw_fd; struct mgcp_port_range net_ports; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 346d017..5c890aa 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -429,18 +429,6 @@ return 0; } -void mgcp_get_net_downlink_format_default(struct mgcp_endpoint *endp, - const struct mgcp_rtp_codec **codec, - const char **fmtp_extra, - struct mgcp_conn_rtp *conn) -{ - LOGPENDP(endp, DRTP, LOGL_DEBUG, "conn:%s using format defaults\n", - mgcp_conn_dump(conn->conn)); - - *codec = conn->end.codec; - *fmtp_extra = conn->end.fmtp_extra; -} - void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp, struct mgcp_rtp_state *state, const uint16_t seq, const int32_t transit, const uint32_t ssrc, diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index d106730..0146815 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1713,8 +1713,6 @@ cfg->rtp_processing_cb = &mgcp_rtp_processing_default; cfg->setup_rtp_processing_cb = &mgcp_setup_rtp_processing_default; - cfg->get_net_downlink_format_cb = &mgcp_get_net_downlink_format_default; - INIT_LLIST_HEAD(&cfg->trunks); /* Allocate virtual trunk */ diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 351c6db..a6536f2 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -544,10 +544,8 @@ OSMO_ASSERT(sdp); OSMO_ASSERT(addr); - /* FIXME: constify endp and conn args in get_net_donwlink_format_cb() */ - endp->trunk->cfg->get_net_downlink_format_cb((struct mgcp_endpoint *)endp, - &codec, &fmtp_extra, - (struct mgcp_conn_rtp *)conn); + codec = conn->end.codec; + fmtp_extra = conn->end.fmtp_extra; audio_name = codec->audio_name; payload_type = codec->payload_type; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18dfd44c931540caf4ac360c08ed10e5f65b2165 Gerrit-Change-Number: 35436 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023