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

[M] Change in pysim[master]: global_platform: LOAD and INSTALL [for load] support

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/pysim/+/37454?usp=email ) Change subject: global_platform: LOAD and INSTALL [for load] support ...................................................................... Patch Set 8: Code-Review+1 (2 comments) Patchset: PS8: Looks good, except the missing `required` argument. File pySim/global_platform/__init__.py: https://gerrit.osmocom.org/c/pysim/+/37454/comment/b7dcc821_8288bca1?usp=em… : PS8, Line 824: add_mutually_exclusive_group You're missing to add `required=True` here. At least one argument must be supplied, right? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I924aaeecbb3a72bdb65eefbff6135e4e9570579e Gerrit-Change-Number: 37454 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Jan 2025 16:44:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

5 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: cosmetic: whitespace improvements

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39390?usp=email ) Change subject: cosmetic: whitespace improvements ...................................................................... cosmetic: whitespace improvements Add a missing space between 2 params. Clean up a bit positioning of params in logging lines. Change-Id: I366944230e698c7805ab977a5205d0978d03998f --- M src/osmo_ss7_hmrt.c 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/39390/1 diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index c256860..5fca2d8 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -246,13 +246,12 @@ case OSMO_SS7_ASP_PROT_M3UA: DEBUGP(DLSS7, "rt->dest.as proto is M3UA for dpc=%u=%s\n", dpc, osmo_ss7_pointcode_print(inst, dpc)); - return m3ua_tx_xua_as(as,xua); + return m3ua_tx_xua_as(as, xua); case OSMO_SS7_ASP_PROT_IPA: return ipa_tx_xua_as(as, xua); default: - LOGP(DLSS7, LOGL_ERROR, "MTP message " - "for ASP of unknown protocol %u\n", - as->cfg.proto); + LOGP(DLSS7, LOGL_ERROR, "MTP message for ASP of unknown protocol %u\n", + as->cfg.proto); break; } } else if (rt->dest.linkset) { @@ -262,15 +261,13 @@ * overwritten. */ const char *rt_name = osmo_ss7_route_name(rt, false); LOGP(DLSS7, LOGL_ERROR, - "Found route for dpc=%u=%s: %s," - " but MTP-TRANSFER.req unsupported for linkset.\n", + "Found route for dpc=%u=%s: %s, but MTP-TRANSFER.req unsupported for linkset.\n", dpc, osmo_ss7_pointcode_print(inst, dpc), rt_name); } } else OSMO_ASSERT(0); } else { - LOGP(DLSS7, LOGL_ERROR, "MTP-TRANSFER.req for DPC %u: " - "no route!\n", dpc); + LOGP(DLSS7, LOGL_ERROR, "MTP-TRANSFER.req for DPC %u: no route!\n", dpc); /* DPC unknown HMRT -> MGMT */ /* Message Received for inaccesible SP HMRT ->RTPC */ /* Discard Message */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I366944230e698c7805ab977a5205d0978d03998f Gerrit-Change-Number: 39390 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: DLCX: Split mgcp header pars parsing into a previous step

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39240?usp=email ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mgw: DLCX: Split mgcp header pars parsing into a previous step ...................................................................... mgw: DLCX: Split mgcp header pars parsing into a previous step Do most of the initial parsing and verification in a prior step, filling in a "parsed" struct which simplifies logic coming after for different message types. Change-Id: I557a3a257ddefedc479a4aff974a74c4e4e2c85d --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 38 insertions(+), 49 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 00e72f3..a33cf3d 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1224,13 +1224,12 @@ struct mgcp_parse_data *pdata = rq->pdata; struct mgcp_trunk *trunk = rq->trunk; struct mgcp_endpoint *endp = rq->endp; + struct mgcp_parse_hdr_pars *hpars = &pdata->hpars; struct rate_ctr_group *rate_ctrs; - int error_code = 400; - char *line; char stats[1048]; - const char *conn_id = NULL; struct mgcp_conn *conn = NULL; unsigned int i; + int rc; /* NOTE: In this handler we can not take it for granted that the endp * pointer will be populated, however a trunk is always guaranteed (except for 'null' endp). @@ -1272,49 +1271,42 @@ return create_ok_response(trunk, NULL, 200, "DLCX", pdata->trans); } - for_each_line(line, pdata->save) { - if (!mgcp_check_param(line)) - continue; + rc = mgcp_parse_hdr_pars(pdata); + switch (rc) { + case 0: + break; /* all good, continue below */ + case -539: + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_UNHANDLED_PARAM)); + return create_err_response(rq->trunk, NULL, -rc, "DLCX", pdata->trans); + default: + return create_err_response(rq->trunk, NULL, -rc, "DLCX", pdata->trans); + } - switch (toupper(line[0])) { - case 'C': - /* If we have no endpoint, but a call id in the request, - then this request cannot be handled */ - if (!endp) { - LOGPTRUNK(trunk, DLMGCP, LOGL_NOTICE, - "cannot handle requests with call-id (C) without endpoint -- abort!"); - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_UNHANDLED_PARAM)); - return create_err_response(rq->trunk, NULL, 539, "DLCX", pdata->trans); - } - - if (mgcp_verify_call_id(endp, line + 3) != 0) { - error_code = 516; - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_INVALID_CALLID)); - goto error3; - } - break; - case 'I': - /* If we have no endpoint, but a connection id in the request, - then this request cannot be handled */ - if (!endp) { - LOGPTRUNK(trunk, DLMGCP, LOGL_NOTICE, - "cannot handle requests with conn-id (I) without endpoint -- abort!"); - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_UNHANDLED_PARAM)); - return create_err_response(rq->trunk, NULL, 539, "DLCX", pdata->trans); - } - - conn_id = (const char *)line + 3; - if ((error_code = mgcp_verify_ci(endp, conn_id))) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_INVALID_CONNID)); - goto error3; - } - break; - default: - LOGPEPTR(endp, trunk, DLMGCP, LOGL_NOTICE, "DLCX: Unhandled MGCP option: '%c'/%d\n", - line[0], line[0]); + if (hpars->callid) { + /* If we have no endpoint, but a call id in the request, then this request cannot be handled */ + if (!endp) { + LOGPTRUNK(trunk, DLMGCP, LOGL_NOTICE, + "cannot handle requests with call-id (C) without endpoint -- abort!"); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_UNHANDLED_PARAM)); return create_err_response(rq->trunk, NULL, 539, "DLCX", pdata->trans); - break; + } + if (mgcp_verify_call_id(endp, hpars->callid) != 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_INVALID_CALLID)); + return create_err_response(endp, endp, 516, "DLCX", pdata->trans); + } + } + + if (hpars->connid) { + /* If we have no endpoint, but a connection id in the request, then this request cannot be handled */ + if (!endp) { + LOGPTRUNK(trunk, DLMGCP, LOGL_NOTICE, + "cannot handle requests with conn-id (I) without endpoint -- abort!"); + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_UNHANDLED_PARAM)); + return create_err_response(rq->trunk, NULL, 539, "DLCX", pdata->trans); + } + if ((rc = mgcp_verify_ci(endp, hpars->connid)) != 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_INVALID_CONNID)); + return create_err_response(endp, endp, rc, "DLCX", pdata->trans); } } @@ -1326,7 +1318,7 @@ * wildcarded DLCX that refers to the selected endpoint. This means * that we drop all connections on that specific endpoint at once. * (See also RFC3435 Section F.7) */ - if (!conn_id) { + if (!hpars->connid) { int num_conns = mgcp_endp_num_conns(endp); LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "DLCX: missing ci (connectionIdentifier), will remove all connections (%d total) at once\n", @@ -1344,10 +1336,10 @@ } /* Find the connection */ - conn = mgcp_endp_get_conn(endp, conn_id); + conn = mgcp_endp_get_conn(endp, hpars->connid); if (!conn) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_FAIL_INVALID_CONNID)); - goto error3; + return create_err_response(endp, endp, 400, "DLCX", pdata->trans); } /* save the statistics of the current connection */ mgcp_format_stats(stats, sizeof(stats), conn); @@ -1368,9 +1360,6 @@ rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_DLCX_SUCCESS)); 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); } /* RSIP command handler, processes the received command */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39240?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: I557a3a257ddefedc479a4aff974a74c4e4e2c85d Gerrit-Change-Number: 39240 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[L] Change in osmo-mgw[master]: mgw: CRCX: Split mgcp header pars parsing into a previous step

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email ) Change subject: mgw: CRCX: Split mgcp header pars parsing into a previous step ...................................................................... mgw: CRCX: Split mgcp header pars parsing into a previous step Do most of the initial parsing and verification in a prior step, filling in a "parsed" struct which simplifies logic coming after for different message types. This commit only modifies stuff enough to work for CRCX. Further work (commits) will follow for MDCX and DLCX. Change-Id: I3ee5158c254213203830fe9c38de11c15b4b19c1 --- M include/osmocom/mgcp/mgcp_msg.h M include/osmocom/mgcp/mgcp_protocol.h M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c 4 files changed, 171 insertions(+), 109 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_msg.h b/include/osmocom/mgcp/mgcp_msg.h index d11fb85..631a4ae 100644 --- a/include/osmocom/mgcp/mgcp_msg.h +++ b/include/osmocom/mgcp/mgcp_msg.h @@ -39,10 +39,11 @@ enum mgcp_connection_mode mgcp_parse_conn_mode(const char *msg); int mgcp_parse_header(struct mgcp_parse_data *pdata, char *data); +int mgcp_parse_hdr_pars(struct mgcp_parse_data *pdata); int mgcp_parse_osmux_cid(const char *line); -bool mgcp_check_param(const struct mgcp_endpoint *endp, struct mgcp_trunk *trunk, const char *line); +bool mgcp_check_param(const char *line); int mgcp_verify_call_id(struct mgcp_endpoint *endp, const char *callid); diff --git a/include/osmocom/mgcp/mgcp_protocol.h b/include/osmocom/mgcp/mgcp_protocol.h index 77f17d5..9cda8d6 100644 --- a/include/osmocom/mgcp/mgcp_protocol.h +++ b/include/osmocom/mgcp/mgcp_protocol.h @@ -3,12 +3,39 @@ #include <osmocom/core/utils.h> #include <osmocom/mgcp/mgcp_common.h> +#define MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET (-2) +#define MGCP_PARSE_HDR_PARS_OSMUX_CID_WILDCARD (-1) + +struct mgcp_parse_hdr_pars { + const char *local_options; + const char *callid; + enum mgcp_connection_mode mode; + int remote_osmux_cid; + bool have_sdp; + /*! MGCP_X_OSMO_IGN_* flags from 'X-Osmo-IGN:' header */ + uint32_t x_osmo_ign; +}; + +static inline void mgcp_parse_hdr_pars_init(struct mgcp_parse_hdr_pars *hpars) +{ + *hpars = (struct mgcp_parse_hdr_pars){ + .local_options = NULL, + .callid = NULL, + .mode = MGCP_CONN_NONE, + .remote_osmux_cid = MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET, + .have_sdp = false, + .x_osmo_ign = 0, + }; +} + /* Internal structure while parsing a request */ struct mgcp_parse_data { struct mgcp_config *cfg; + char *save; + /* MGCP Header: */ char *epname; char *trans; - char *save; + struct mgcp_parse_hdr_pars hpars; }; /* Local connection options */ diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index f8ef50b..bcbe258 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -23,6 +23,7 @@ */ #include <limits.h> +#include <ctype.h> #include <osmocom/mgcp/mgcp.h> #include <osmocom/mgcp/osmux.h> @@ -33,6 +34,10 @@ #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> +/* (same fmt as LOGPENDP()) */ +#define LOG_MGCP_PDATA(PDATA, LEVEL, FMT, ARGS...) \ + LOGP(DLMGCP, LEVEL, "endpoint:%s " FMT, (PDATA) ? ((PDATA)->epname ? : "null-epname") : "null-pdata", ##ARGS) + /*! Display an mgcp message on the log output. * \param[in] message mgcp message string * \param[in] len message mgcp message string length @@ -122,8 +127,7 @@ break; case 2: if (strcasecmp("MGCP", elem)) { - LOGP(DLMGCP, LOGL_ERROR, - "MGCP header parsing error\n"); + LOG_MGCP_PDATA(pdata, LOGL_ERROR, "MGCP header parsing error\n"); return -510; } break; @@ -136,13 +140,89 @@ } if (i != 4) { - LOGP(DLMGCP, LOGL_ERROR, "MGCP status line too short.\n"); + LOG_MGCP_PDATA(pdata, LOGL_ERROR, "MGCP status line too short.\n"); return -510; } return 0; } +static bool parse_x_osmo_ign(struct mgcp_parse_data *pdata, char *line) +{ + char *saveptr = NULL; + + if (strncasecmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) + return false; + line += strlen(MGCP_X_OSMO_IGN_HEADER); + + while (1) { + char *token = strtok_r(line, " ", &saveptr); + line = NULL; + if (!token) + break; + + if (!strcasecmp(token, "C")) + pdata->hpars.x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; + else + LOG_MGCP_PDATA(pdata, LOGL_ERROR, "received unknown X-Osmo-IGN item '%s'\n", token); + } + + return true; +} + +/*! Analyze and parse the the header of an MGCP message string. + * \param[inout] pdata caller provided memory to store the parsing results. + * \returns 0 when parsing was successful, negative (MGCP cause code) on error. */ +int mgcp_parse_hdr_pars(struct mgcp_parse_data *pdata) +{ + struct mgcp_parse_hdr_pars *hp = &pdata->hpars; + char *line; + + mgcp_parse_hdr_pars_init(hp); + + for_each_line(line, pdata->save) { + if (!mgcp_check_param(line)) { + LOG_MGCP_PDATA(pdata, LOGL_NOTICE, "wrong MGCP option format: '%s'\n", line); + continue; + } + + switch (toupper(line[0])) { + case 'L': + hp->local_options = (const char *)line + 3; + break; + case 'C': + hp->callid = (const char *)line + 3; + break; + case 'I': + /* It is illegal to send a connection identifier + * together with a CRCX, the MGW will assign the + * connection identifier by itself on CRCX */ + return -523; + case 'M': + hp->mode = mgcp_parse_conn_mode((const char *)line + 3); + break; + case 'X': + if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { + hp->remote_osmux_cid = mgcp_parse_osmux_cid(line); + break; + } + if (parse_x_osmo_ign(pdata, line)) + break; + /* Ignore unknown X-headers */ + break; + case '\0': + hp->have_sdp = true; + goto mgcp_header_done; + default: + LOG_MGCP_PDATA(pdata, LOGL_NOTICE, "CRCX: unhandled option: '%c'/%d\n", *line, *line); + return -539; + } + } + +mgcp_header_done: + return 0; +} + /*! Extract OSMUX CID from an MGCP parameter line (string). * \param[in] line single parameter line from the MGCP message * \returns OSMUX CID, -1 wildcard, -2 on error */ @@ -153,19 +233,19 @@ if (strcasecmp(line + 2, "Osmux: *") == 0) { LOGP(DLMGCP, LOGL_DEBUG, "Parsed wilcard Osmux CID\n"); - return -1; + return MGCP_PARSE_HDR_PARS_OSMUX_CID_WILDCARD; } if (sscanf(line + 2 + 7, "%u", &osmux_cid) != 1) { LOGP(DLMGCP, LOGL_ERROR, "Failed parsing Osmux in MGCP msg line: %s\n", line); - return -2; + return MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET; } if (osmux_cid > OSMUX_CID_MAX) { LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n", osmux_cid, OSMUX_CID_MAX); - return -2; + return MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET; } LOGP(DLMGCP, LOGL_DEBUG, "MGCP client offered Osmux CID %u\n", osmux_cid); @@ -173,20 +253,13 @@ } /*! Check MGCP parameter line (string) for plausibility. - * \param[in] endp pointer to endpoint (only used for log output, may be NULL) - * \param[in] trunk pointer to trunk (only used for log output, may be NULL if endp is not NULL) * \param[in] line single parameter line from the MGCP message * \returns true when line seems plausible, false on error */ -bool mgcp_check_param(const struct mgcp_endpoint *endp, struct mgcp_trunk *trunk, const char *line) +bool mgcp_check_param(const char *line) { const size_t line_len = strlen(line); - if (line[0] != '\0' && line_len < 2) { - if (endp) - LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "wrong MGCP option format: '%s'\n", line); - else - LOGPTRUNK(trunk, DLMGCP, LOGL_NOTICE, "wrong MGCP option format: '%s'\n", line); + if (line[0] != '\0' && line_len < 2) return false; - } /* FIXME: A couple more checks wouldn't hurt... */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 32fbd43..b185435 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -702,6 +702,20 @@ codec->frame_duration_den; } +static int mgcp_trunk_osmux_init_if_needed(struct mgcp_trunk *trunk) +{ + if (trunk->cfg->osmux.initialized) + return 0; + + if (osmux_init(trunk) < 0) { + LOGPTRUNK(trunk, DOSMUX, LOGL_ERROR, "Cannot init OSMUX\n"); + return -3; + } + LOGPTRUNK(trunk, DOSMUX, LOGL_NOTICE, "OSMUX socket has been set up\n"); + + return 0; +} + /*! Initializes osmux socket if not yet initialized. Parses Osmux CID from MGCP line. * \param[in] endp Endpoint willing to initialize osmux * \param[in] line Line X-Osmux from MGCP header msg to parse @@ -709,13 +723,8 @@ */ static int mgcp_osmux_setup(struct mgcp_endpoint *endp, const char *line) { - if (!endp->trunk->cfg->osmux.initialized) { - if (osmux_init(endp->trunk) < 0) { - LOGPENDP(endp, DOSMUX, LOGL_ERROR, "Cannot init OSMUX\n"); - return -3; - } - LOGPENDP(endp, DOSMUX, LOGL_NOTICE, "OSMUX socket has been set up\n"); - } + if (mgcp_trunk_osmux_init_if_needed(endp->trunk) < 0) + return -3; return mgcp_parse_osmux_cid(line); } @@ -791,42 +800,16 @@ return 534; } -static bool parse_x_osmo_ign(struct mgcp_endpoint *endp, char *line) -{ - char *saveptr = NULL; - - if (strncasecmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER))) - return false; - line += strlen(MGCP_X_OSMO_IGN_HEADER); - - while (1) { - char *token = strtok_r(line, " ", &saveptr); - line = NULL; - if (!token) - break; - - if (!strcasecmp(token, "C")) - endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID; - else - LOGPENDP(endp, DLMGCP, LOGL_ERROR, "received unknown X-Osmo-IGN item '%s'\n", token); - } - - return true; -} - /* CRCX command handler, processes the received command */ static struct msgb *handle_create_con(struct mgcp_request_data *rq) { struct mgcp_parse_data *pdata = rq->pdata; struct mgcp_trunk *trunk = rq->trunk; struct mgcp_endpoint *endp = rq->endp; + struct mgcp_parse_hdr_pars *hpars = &pdata->hpars; struct rate_ctr_group *rate_ctrs; int error_code = 400; - const char *local_options = NULL; - const char *callid = NULL; - enum mgcp_connection_mode mode = MGCP_CONN_NONE; - char *line; - int have_sdp = 0, remote_osmux_cid = -2; + int remote_osmux_cid; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp *conn_rtp = NULL; char conn_name[512]; @@ -857,69 +840,44 @@ } /* parse CallID C: and LocalParameters L: */ - for_each_line(line, pdata->save) { - if (!mgcp_check_param(endp, trunk, line)) - continue; - - switch (toupper(line[0])) { - case 'L': - local_options = (const char *)line + 3; - break; - case 'C': - callid = (const char *)line + 3; - break; - case 'I': - /* It is illegal to send a connection identifier - * together with a CRCX, the MGW will assign the - * connection identifier by itself on CRCX */ - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BAD_ACTION)); - return create_err_response(rq->trunk, NULL, 523, "CRCX", pdata->trans); - break; - case 'M': - mode = mgcp_parse_conn_mode((const char *)line + 3); - break; - case 'X': - if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { - /* If osmux is disabled, just skip setting it up */ - if (rq->endp->trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) - break; - remote_osmux_cid = mgcp_osmux_setup(endp, line); - break; - } - - if (parse_x_osmo_ign(endp, line)) - break; - - /* Ignore unknown X-headers */ - break; - case '\0': - have_sdp = 1; - goto mgcp_header_done; - default: - LOGPENDP(endp, DLMGCP, LOGL_NOTICE, - "CRCX: unhandled option: '%c'/%d\n", *line, *line); - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_UNHANDLED_PARAM)); - return create_err_response(rq->trunk, NULL, 539, "CRCX", pdata->trans); - break; - } + rc = mgcp_parse_hdr_pars(pdata); + switch (rc) { + case 0: + break; /* all good, continue below */ + case -523: + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BAD_ACTION)); + return create_err_response(rq->trunk, NULL, -rc, "CRCX", pdata->trans); + case -539: + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_UNHANDLED_PARAM)); + return create_err_response(rq->trunk, NULL, -rc, "CRCX", pdata->trans); + default: + return create_err_response(rq->trunk, NULL, -rc, "CRCX", pdata->trans); } -mgcp_header_done: /* Check parameters */ - if (!callid) { + if (!hpars->callid) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: insufficient parameters, missing callid\n"); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_MISSING_CALLID)); return create_err_response(endp, endp, 516, "CRCX", pdata->trans); } - if (mode == MGCP_CONN_NONE) { + if (hpars->mode == MGCP_CONN_NONE) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: insufficient parameters, invalid mode\n"); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_INVALID_MODE)); return create_err_response(endp, endp, 517, "CRCX", pdata->trans); } + remote_osmux_cid = hpars->remote_osmux_cid; + /* If osmux is disabled, just skip setting it up */ + if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) + remote_osmux_cid = MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET; + + /* Make sure osmux is setup: */ + if (remote_osmux_cid != MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET) + mgcp_trunk_osmux_init_if_needed(trunk); + /* Check if we are able to accept the creation of another connection */ if (mgcp_endp_is_full(endp)) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, @@ -939,9 +897,12 @@ } } + /* Update endp->x_osmo_ign: */ + endp->x_osmo_ign |= hpars->x_osmo_ign; + /* Check if this endpoint already serves a call, if so, check if the * callids match up so that we are sure that this is our call */ - if (endp->callid && mgcp_verify_call_id(endp, callid)) { + if (endp->callid && mgcp_verify_call_id(endp, hpars->callid)) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: already seized by other call (%s)\n", endp->callid); @@ -961,14 +922,14 @@ /* Claim endpoint resources. This will also set the callid, * creating additional connections will only be possible if * the callid matches up (see above). */ - rc = mgcp_endp_claim(endp, callid); + rc = mgcp_endp_claim(endp, hpars->callid); if (rc != 0) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_CLAIM)); return create_err_response(endp, endp, 502, "CRCX", pdata->trans); } } - snprintf(conn_name, sizeof(conn_name), "%s", callid); + snprintf(conn_name, sizeof(conn_name), "%s", hpars->callid); conn = mgcp_conn_alloc(trunk->endpoints, endp, MGCP_CONN_TYPE_RTP, conn_name); if (!conn) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, @@ -977,7 +938,7 @@ goto error2; } - if (mgcp_conn_set_mode(conn, mode) < 0) { + if (mgcp_conn_set_mode(conn, hpars->mode) < 0) { error_code = 517; rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_INVALID_MODE)); goto error2; @@ -1004,9 +965,9 @@ } /* Set local connection options, if present */ - if (local_options) { + if (hpars->local_options) { rc = set_local_cx_options(trunk->endpoints, - &endp->local_options, local_options); + &endp->local_options, hpars->local_options); if (rc != 0) { LOGPCONN(conn, DLMGCP, LOGL_ERROR, "CRCX: invalid local connection options!\n"); @@ -1017,7 +978,7 @@ } /* Handle codec information and decide for a suitable codec */ - rc = handle_codec_info(conn_rtp, rq, have_sdp, true); + rc = handle_codec_info(conn_rtp, rq, hpars->have_sdp, true); mgcp_codecset_summary(&conn_rtp->end.cset, mgcp_conn_dump(conn)); if (rc) { error_code = rc; @@ -1131,7 +1092,7 @@ } for_each_line(line, pdata->save) { - if (!mgcp_check_param(endp, trunk, line)) + if (!mgcp_check_param(line)) continue; switch (toupper(line[0])) { @@ -1357,7 +1318,7 @@ } for_each_line(line, pdata->save) { - if (!mgcp_check_param(endp, trunk, line)) + if (!mgcp_check_param(line)) continue; switch (toupper(line[0])) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39224?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: I3ee5158c254213203830fe9c38de11c15b4b19c1 Gerrit-Change-Number: 39224 Gerrit-PatchSet: 9 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: MDCX: Split mgcp header pars parsing into a previous step

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39239?usp=email ) ( 8 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mgw: MDCX: Split mgcp header pars parsing into a previous step ...................................................................... mgw: MDCX: Split mgcp header pars parsing into a previous step Do most of the initial parsing and verification in a prior step, filling in a "parsed" struct which simplifies logic coming after for different message types. This commit only modifies stuff enough to work for MDCX. Further work (commits) will follow for DLCX. Change-Id: I6ecb41fc2cc737c3a161b6bc98bd08ae01909655 --- M include/osmocom/mgcp/mgcp_protocol.h M src/libosmo-mgcp/mgcp_msg.c M src/libosmo-mgcp/mgcp_protocol.c 3 files changed, 45 insertions(+), 90 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_protocol.h b/include/osmocom/mgcp/mgcp_protocol.h index 9cda8d6..7e6311c 100644 --- a/include/osmocom/mgcp/mgcp_protocol.h +++ b/include/osmocom/mgcp/mgcp_protocol.h @@ -9,6 +9,7 @@ struct mgcp_parse_hdr_pars { const char *local_options; const char *callid; + const char *connid; enum mgcp_connection_mode mode; int remote_osmux_cid; bool have_sdp; @@ -21,6 +22,7 @@ *hpars = (struct mgcp_parse_hdr_pars){ .local_options = NULL, .callid = NULL, + .connid = NULL, .mode = MGCP_CONN_NONE, .remote_osmux_cid = MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET, .have_sdp = false, diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c index bcbe258..ebaa32a 100644 --- a/src/libosmo-mgcp/mgcp_msg.c +++ b/src/libosmo-mgcp/mgcp_msg.c @@ -194,10 +194,8 @@ hp->callid = (const char *)line + 3; break; case 'I': - /* It is illegal to send a connection identifier - * together with a CRCX, the MGW will assign the - * connection identifier by itself on CRCX */ - return -523; + hp->connid = (const char *)line + 3; + break; case 'M': hp->mode = mgcp_parse_conn_mode((const char *)line + 3); break; diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index b185435..00e72f3 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -716,19 +716,6 @@ return 0; } -/*! Initializes osmux socket if not yet initialized. Parses Osmux CID from MGCP line. - * \param[in] endp Endpoint willing to initialize osmux - * \param[in] line Line X-Osmux from MGCP header msg to parse - * \returns OSMUX CID, -1 for wildcard, -2 on parse error, -3 on osmux initalize error - */ -static int mgcp_osmux_setup(struct mgcp_endpoint *endp, const char *line) -{ - if (mgcp_trunk_osmux_init_if_needed(endp->trunk) < 0) - return -3; - - return mgcp_parse_osmux_cid(line); -} - /* Process codec information contained in CRCX/MDCX */ static int handle_codec_info(struct mgcp_conn_rtp *conn, struct mgcp_request_data *rq, int have_sdp, bool crcx) @@ -844,9 +831,6 @@ switch (rc) { case 0: break; /* all good, continue below */ - case -523: - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BAD_ACTION)); - return create_err_response(rq->trunk, NULL, -rc, "CRCX", pdata->trans); case -539: rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_UNHANDLED_PARAM)); return create_err_response(rq->trunk, NULL, -rc, "CRCX", pdata->trans); @@ -869,6 +853,15 @@ return create_err_response(endp, endp, 517, "CRCX", pdata->trans); } + /* It is illegal to send a connection identifier + * together with a CRCX, the MGW will assign the + * connection identifier by itself on CRCX */ + if (hpars->connid) { + LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: 'I: %s' not expected!\n", hpars->connid); + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BAD_ACTION)); + return create_err_response(endp, endp, 523, "CRCX", pdata->trans); + } + remote_osmux_cid = hpars->remote_osmux_cid; /* If osmux is disabled, just skip setting it up */ if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) @@ -1048,17 +1041,12 @@ struct mgcp_parse_data *pdata = rq->pdata; struct mgcp_trunk *trunk = rq->trunk; struct mgcp_endpoint *endp = rq->endp; + struct mgcp_parse_hdr_pars *hpars = &pdata->hpars; struct rate_ctr_group *rate_ctrs; char new_local_addr[INET6_ADDRSTRLEN]; int error_code = 500; - int have_sdp = 0; - char *line; - const char *local_options = NULL; - enum mgcp_connection_mode mode = MGCP_CONN_NONE; struct mgcp_conn *conn = NULL; struct mgcp_conn_rtp *conn_rtp = NULL; - const char *conn_id = NULL; - int remote_osmux_cid = -2; int rc; LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "MDCX: modifying existing connection ...\n"); @@ -1091,64 +1079,33 @@ return create_err_response(endp, endp, 400, "MDCX", pdata->trans); } - for_each_line(line, pdata->save) { - if (!mgcp_check_param(line)) - continue; - - switch (toupper(line[0])) { - case 'C': - if (mgcp_verify_call_id(endp, line + 3) != 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_INVALID_CALLID)); - error_code = 516; - goto error3; - } - break; - case 'I': - conn_id = (const char *)line + 3; - if ((error_code = mgcp_verify_ci(endp, conn_id))) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_INVALID_CONNID)); - goto error3; - } - break; - case 'L': - local_options = (const char *)line + 3; - break; - case 'M': - mode = mgcp_parse_conn_mode((const char *)line + 3); - break; - case 'X': - if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { - /* If osmux is disabled, just skip setting it up */ - if (endp->trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) - break; - remote_osmux_cid = mgcp_osmux_setup(endp, line); - break; - } - /* Ignore unknown X-headers */ - break; - case '\0': - have_sdp = 1; - goto mgcp_header_done; - break; - default: - LOGPENDP(endp, DLMGCP, LOGL_NOTICE, - "MDCX: Unhandled MGCP option: '%c'/%d\n", - line[0], line[0]); - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_UNHANDLED_PARAM)); - return create_err_response(rq->trunk, NULL, 539, "MDCX", pdata->trans); - break; - } + rc = mgcp_parse_hdr_pars(pdata); + switch (rc) { + case 0: + break; /* all good, continue below */ + case -539: + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_UNHANDLED_PARAM)); + return create_err_response(rq->trunk, NULL, -rc, "MDCX", pdata->trans); + default: + return create_err_response(rq->trunk, NULL, -rc, "MDCX", pdata->trans); } -mgcp_header_done: - if (!conn_id) { + if (hpars->callid && mgcp_verify_call_id(endp, hpars->callid) < 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_INVALID_CALLID)); + return create_err_response(endp, endp, 516, "MDCX", pdata->trans); + } + + if (!hpars->connid) { LOGPENDP(endp, DLMGCP, LOGL_ERROR, "MDCX: insufficient parameters, missing ci (connectionIdentifier)\n"); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_NO_CONNID)); return create_err_response(endp, endp, 515, "MDCX", pdata->trans); + } else if ((error_code = mgcp_verify_ci(endp, hpars->connid)) != 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_INVALID_CONNID)); + return create_err_response(endp, endp, error_code, "MDCX", pdata->trans); } - conn = mgcp_endp_get_conn(endp, conn_id); + conn = mgcp_endp_get_conn(endp, hpars->connid); 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); @@ -1156,20 +1113,18 @@ mgcp_conn_watchdog_kick(conn); - if (mode != MGCP_CONN_NONE) { - if (mgcp_conn_set_mode(conn, mode) < 0) { - rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_INVALID_MODE)); - error_code = 517; - goto error3; - } - } else { + if (hpars->mode == MGCP_CONN_NONE) { + /* Reset conn mode in case it was tweaked through VTY: */ conn->mode = conn->mode_orig; + } else if (mgcp_conn_set_mode(conn, hpars->mode) < 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_INVALID_MODE)); + return create_err_response(endp, endp, 517, "MDCX", pdata->trans); } /* Set local connection options, if present */ - if (local_options) { + if (hpars->local_options) { rc = set_local_cx_options(trunk->endpoints, - &endp->local_options, local_options); + &endp->local_options, hpars->local_options); if (rc != 0) { LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: invalid local connection options!\n"); @@ -1183,7 +1138,7 @@ OSMO_ASSERT(conn_rtp); /* Handle codec information and decide for a suitable codec */ - rc = handle_codec_info(conn_rtp, rq, have_sdp, false); + rc = handle_codec_info(conn_rtp, rq, hpars->have_sdp, false); mgcp_codecset_summary(&conn_rtp->end.cset, mgcp_conn_dump(conn)); if (rc) { error_code = rc; @@ -1197,22 +1152,22 @@ if (mgcp_conn_rtp_is_osmux(conn_rtp)) { OSMO_ASSERT(conn_rtp->osmux.local_cid_allocated); - if (remote_osmux_cid < -1) { + if (hpars->remote_osmux_cid < -1) { LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: Failed to parse Osmux CID!\n"); goto error3; - } else if (remote_osmux_cid == -1) { + } else if (hpars->remote_osmux_cid == -1) { LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: wilcard in MDCX is not supported!\n"); goto error3; } else if (conn_rtp->osmux.remote_cid_present && - remote_osmux_cid != conn_rtp->osmux.remote_cid) { + hpars->remote_osmux_cid != conn_rtp->osmux.remote_cid) { LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: changing already allocated CID is not supported!\n"); goto error3; } else { conn_rtp->osmux.remote_cid_present = true; - conn_rtp->osmux.remote_cid = remote_osmux_cid; + conn_rtp->osmux.remote_cid = hpars->remote_osmux_cid; if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: Osmux handling failed!\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39239?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: I6ecb41fc2cc737c3a161b6bc98bd08ae01909655 Gerrit-Change-Number: 39239 Gerrit-PatchSet: 9 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: MDCX: Simplify early return code paths

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39250?usp=email ) Change subject: mgw: MDCX: Simplify early return code paths ...................................................................... mgw: MDCX: Simplify early return code paths Change-Id: Icb03a95e34e0c7d9396fefc2e37ee33ab09daa89 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 14 insertions(+), 17 deletions(-) Approvals: pespin: Looks good to me, approved neels: 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 7095058..34b0111 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1192,26 +1192,23 @@ if (mgcp_conn_rtp_is_osmux(conn_rtp)) { OSMO_ASSERT(conn_rtp->osmux.local_cid_allocated); if (hpars->remote_osmux_cid < -1) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, - "MDCX: Failed to parse Osmux CID!\n"); + LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: Failed to parse Osmux CID!\n"); goto error3; - } else if (hpars->remote_osmux_cid == -1) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, - "MDCX: wilcard in MDCX is not supported!\n"); + } + if (hpars->remote_osmux_cid == -1) { + LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: wilcard in MDCX is not supported!\n"); goto error3; - } else if (conn_rtp->osmux.remote_cid_present && - hpars->remote_osmux_cid != conn_rtp->osmux.remote_cid) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, - "MDCX: changing already allocated CID is not supported!\n"); + } + if (conn_rtp->osmux.remote_cid_present && + hpars->remote_osmux_cid != conn_rtp->osmux.remote_cid) { + LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: changing already allocated CID is not supported!\n"); goto error3; - } else { - conn_rtp->osmux.remote_cid_present = true; - conn_rtp->osmux.remote_cid = hpars->remote_osmux_cid; - if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { - LOGPCONN(conn, DLMGCP, LOGL_ERROR, - "MDCX: Osmux handling failed!\n"); - goto error3; - } + } + conn_rtp->osmux.remote_cid_present = true; + conn_rtp->osmux.remote_cid = hpars->remote_osmux_cid; + if (conn_osmux_event_rx_crcx_mdcx(conn_rtp) < 0) { + LOGPCONN(conn, DLMGCP, LOGL_ERROR, "MDCX: Osmux handling failed!\n"); + goto error3; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39250?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: Icb03a95e34e0c7d9396fefc2e37ee33ab09daa89 Gerrit-Change-Number: 39250 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[XS] Change in osmo-mgw[master]: mgw: Remove wrong TODO comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39249?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mgw: Remove wrong TODO comment ...................................................................... mgw: Remove wrong TODO comment The TODO was written because the author had in mind the ptr where the codec was stored was a MGCP endpoint object, but it is actually an rtp_end which is an object under conn_rtp, so that's fine already with current code. Change-Id: I99d2211e81443883c45cc3fdda10e39a8c152063 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved neels: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 8dcb686..7095058 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1185,7 +1185,6 @@ goto error3; } /* Upgrade the conn type RTP_DEFAULT->RTP_IUUP if needed based on requested codec: */ - /* TODO: "codec" probably needs to be moved from endp to conn */ if (conn_rtp->type == MGCP_RTP_DEFAULT && strcmp(conn_rtp->end.cset.codec->subtype_name, "VND.3GPP.IUFP") == 0) rc = mgcp_conn_iuup_init(conn_rtp); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39249?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: I99d2211e81443883c45cc3fdda10e39a8c152063 Gerrit-Change-Number: 39249 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[M] Change in osmo-mgw[master]: mgw: Decouple SDP parsing step from conn obj update

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39248?usp=email ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mgw: Decouple SDP parsing step from conn obj update ...................................................................... mgw: Decouple SDP parsing step from conn obj update This allows delaying modification of the conn before full parsing succeeds. Change-Id: I4a2aecb542886672c1f586c6607714e0356abe35 --- M include/osmocom/mgcp/mgcp_protocol.h M include/osmocom/mgcp/mgcp_sdp.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c 4 files changed, 120 insertions(+), 69 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_protocol.h b/include/osmocom/mgcp/mgcp_protocol.h index 7e6311c..427fe5f 100644 --- a/include/osmocom/mgcp/mgcp_protocol.h +++ b/include/osmocom/mgcp/mgcp_protocol.h @@ -1,7 +1,35 @@ #pragma once +#include <stdint.h> +#include <sys/socket.h> + #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> #include <osmocom/mgcp/mgcp_common.h> +#include <osmocom/mgcp/mgcp_codec.h> + + +#define MGCP_PARSE_SDP_PTIME_UNSET (-1) +#define MGCP_PARSE_SDP_MAXPTIME_UNSET (-1) +#define MGCP_PARSE_SDP_RTP_PORT_UNSET (0) + +struct mgcp_parse_sdp { + int ptime; + int maxptime; + int rtp_port; + struct osmo_sockaddr rem_addr; /* Only IP address, port is in rtp_port above */ + struct mgcp_rtp_codecset cset; +}; + +static inline void mgcp_parse_sdp_init(struct mgcp_parse_sdp *sdp) +{ + sdp->ptime = MGCP_PARSE_SDP_PTIME_UNSET; + sdp->maxptime = MGCP_PARSE_SDP_MAXPTIME_UNSET; + sdp->rtp_port = MGCP_PARSE_SDP_RTP_PORT_UNSET; + sdp->rem_addr = (struct osmo_sockaddr){ .u.sa.sa_family = AF_UNSPEC }; + mgcp_codecset_reset(&sdp->cset); +} + #define MGCP_PARSE_HDR_PARS_OSMUX_CID_UNSET (-2) #define MGCP_PARSE_HDR_PARS_OSMUX_CID_WILDCARD (-1) @@ -38,6 +66,8 @@ char *epname; char *trans; struct mgcp_parse_hdr_pars hpars; + /* MGCP Body: */ + struct mgcp_parse_sdp sdp; }; /* Local connection options */ diff --git a/include/osmocom/mgcp/mgcp_sdp.h b/include/osmocom/mgcp/mgcp_sdp.h index 950092e..4a1313f 100644 --- a/include/osmocom/mgcp/mgcp_sdp.h +++ b/include/osmocom/mgcp/mgcp_sdp.h @@ -22,9 +22,9 @@ #pragma once -int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, - struct mgcp_conn_rtp *conn, - struct mgcp_parse_data *p); +struct mgcp_parse_data; + +int mgcp_parse_sdp_data(struct mgcp_parse_data *p); int mgcp_write_response_sdp(const struct mgcp_endpoint *endp, const struct mgcp_conn_rtp *conn, struct msgb *sdp, diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index a33cf3d..8dcb686 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -716,36 +716,59 @@ return 0; } +/* Apply parsed SDP information stored in struct mgcp_parse_sdp to conn_rtp: */ +static int handle_sdp(struct mgcp_conn_rtp *conn, struct mgcp_request_data *rq) +{ + OSMO_ASSERT(conn); + OSMO_ASSERT(rq); + struct mgcp_parse_data *p = rq->pdata; + OSMO_ASSERT(p); + OSMO_ASSERT(p->hpars.have_sdp); + struct mgcp_parse_sdp *sdp = &p->sdp; + struct mgcp_rtp_end *rtp; + + rtp = &conn->end; + + if (sdp->ptime != MGCP_PARSE_SDP_PTIME_UNSET) + mgcp_rtp_end_set_packet_duration_ms(rtp, sdp->ptime); + + if (sdp->maxptime != MGCP_PARSE_SDP_MAXPTIME_UNSET) + rtp->maximum_packet_time = sdp->maxptime; + + if (sdp->rem_addr.u.sa.sa_family != AF_UNSPEC) { + /* Keep port, only apply ip address: */ + uint16_t port = osmo_sockaddr_port(&rtp->addr.u.sa); + memcpy(&rtp->addr, &sdp->rem_addr, sizeof(rtp->addr)); + osmo_sockaddr_set_port(&rtp->addr.u.sa, port); + } + + if (sdp->rtp_port != MGCP_PARSE_SDP_RTP_PORT_UNSET) { + osmo_sockaddr_set_port(&rtp->addr.u.sa, sdp->rtp_port); + rtp->rtcp_port = htons(sdp->rtp_port + 1); + } + + /* Copy parsed codec set to conn: */ + rtp->cset = sdp->cset; + + return 0; +} + /* Process codec information contained in CRCX/MDCX */ -static int handle_codec_info(struct mgcp_conn_rtp *conn, - struct mgcp_request_data *rq, int have_sdp, bool crcx) +static int handle_codec_info(struct mgcp_conn_rtp *conn, struct mgcp_request_data *rq) { struct mgcp_endpoint *endp = rq->endp; struct mgcp_conn *conn_dst; struct mgcp_conn_rtp *conn_dst_rtp; struct mgcp_rtp_codecset *cset = &conn->end.cset; - int rc; - char *cmd; - - if (crcx) - cmd = "CRCX"; - else - cmd = "MDCX"; /* Collect codec information */ - if (have_sdp) { + if (rq->pdata->hpars.have_sdp) { /* If we have SDP, we ignore the local connection options and * use only the SDP information. */ - mgcp_codecset_reset(cset); - rc = mgcp_parse_sdp_data(endp, conn, rq->pdata); - if (rc != 0) { - LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, - "%s: sdp not parseable\n", cmd); - - /* See also RFC 3661: Protocol error */ - return 510; - } + rc = handle_sdp(conn, rq); + if (rc != 0) + goto error; } else if (endp->local_options.codec) { /* When no SDP is available, we use the codec information from * the local connection options (if present) */ @@ -780,9 +803,7 @@ return 0; error: - LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, - "%s: codec negotiation failure\n", cmd); - + LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "%s: codec negotiation failure\n", rq->name); /* See also RFC 3661: Codec negotiation failure */ return 534; } @@ -862,6 +883,15 @@ return create_err_response(endp, endp, 523, "CRCX", pdata->trans); } + /* Parse SDP if found: */ + if (hpars->have_sdp) { + rc = mgcp_parse_sdp_data(pdata); + if (rc < 0) { /* See also RFC 3661: Protocol error */ + LOGPENDP(endp, DLMGCP, LOGL_ERROR, "CRCX: sdp not parseable\n"); + return create_err_response(endp, endp, 510, "CRCX", pdata->trans); + } + } + remote_osmux_cid = hpars->remote_osmux_cid; /* If osmux is disabled, just skip setting it up */ if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) @@ -971,7 +1001,7 @@ } /* Handle codec information and decide for a suitable codec */ - rc = handle_codec_info(conn_rtp, rq, hpars->have_sdp, true); + rc = handle_codec_info(conn_rtp, rq); mgcp_codecset_summary(&conn_rtp->end.cset, mgcp_conn_dump(conn)); if (rc) { error_code = rc; @@ -1105,6 +1135,16 @@ return create_err_response(endp, endp, error_code, "MDCX", pdata->trans); } + /* Parse SDP if found: */ + if (hpars->have_sdp) { + rc = mgcp_parse_sdp_data(pdata); + if (rc < 0) { + /* See also RFC 3661: Protocol error */ + LOGPENDP(endp, DLMGCP, LOGL_ERROR, "MDCX: sdp not parseable\n"); + return create_err_response(endp, endp, 510, "MDCX", pdata->trans); + } + } + conn = mgcp_endp_get_conn(endp, hpars->connid); if (!conn) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_MDCX_FAIL_CONN_NOT_FOUND)); @@ -1138,7 +1178,7 @@ OSMO_ASSERT(conn_rtp); /* Handle codec information and decide for a suitable codec */ - rc = handle_codec_info(conn_rtp, rq, hpars->have_sdp, false); + rc = handle_codec_info(conn_rtp, rq); mgcp_codecset_summary(&conn_rtp->end.cset, mgcp_conn_dump(conn)); if (rc) { error_code = rc; diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index ffd0f18..1d76ddb 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -312,16 +312,13 @@ } /*! Analyze SDP input string. - * \param[in] endp trunk endpoint. - * \param[out] conn associated rtp connection. - * \param[out] caller provided memory to store the parsing results. + * \param[inout] p provided memory to store the parsing results. * - * Note: In conn (conn->end) the function returns the packet duration, - * rtp port, rtcp port and the codec information. * \returns 0 on success, -1 on failure. */ -int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, - struct mgcp_conn_rtp *conn, struct mgcp_parse_data *p) +int mgcp_parse_sdp_data(struct mgcp_parse_data *p) { + OSMO_ASSERT(p); + struct mgcp_parse_sdp *sdp = &p->sdp; struct sdp_rtp_map codecs[MGCP_MAX_CODECS]; unsigned int codecs_used = 0; struct sdp_fmtp_param fmtp_params[MGCP_MAX_CODECS]; @@ -331,19 +328,14 @@ char *line; unsigned int i; void *tmp_ctx = talloc_new(NULL); - struct mgcp_rtp_end *rtp; int payload_type; int ptime, ptime2 = 0; char audio_name[64]; int port, rc; - OSMO_ASSERT(endp); - OSMO_ASSERT(conn); - OSMO_ASSERT(p); - - rtp = &conn->end; memset(&codecs, 0, sizeof(codecs)); + mgcp_parse_sdp_init(sdp); for_each_line(line, p->save) { switch (line[0]) { @@ -361,19 +353,19 @@ if (sscanf(line, "a=ptime:%d-%d", &ptime, &ptime2) >= 1) { if (ptime2 > 0 && ptime2 != ptime) - mgcp_rtp_end_set_packet_duration_ms(rtp, 0); + sdp->ptime = 0; else - mgcp_rtp_end_set_packet_duration_ms(rtp, ptime); + sdp->ptime = ptime; break; } if (sscanf(line, "a=maxptime:%d", &ptime2) == 1) { - rtp->maximum_packet_time = ptime2; + sdp->maxptime = ptime2; break; } if (strncmp("a=fmtp:", line, 6) == 0) { - rc = fmtp_from_sdp(conn->conn, &fmtp_params[fmtp_used], line); + rc = fmtp_from_sdp(tmp_ctx, &fmtp_params[fmtp_used], line); if (rc >= 0) fmtp_used++; break; @@ -382,33 +374,23 @@ break; case 'm': rc = sscanf(line, "m=audio %d RTP/AVP", &port); - if (rc == 1) { - osmo_sockaddr_set_port(&rtp->addr.u.sa, port); - rtp->rtcp_port = htons(port + 1); - } + if (rc == 1) + sdp->rtp_port = port; - rc = pt_from_sdp(conn->conn, codecs, - ARRAY_SIZE(codecs), line); + rc = pt_from_sdp(tmp_ctx, codecs, ARRAY_SIZE(codecs), line); if (rc > 0) codecs_used = rc; break; case 'c': - if (audio_ip_from_sdp(&rtp->addr, line) < 0) { + if (audio_ip_from_sdp(&sdp->rem_addr, line) < 0) { talloc_free(tmp_ctx); return -1; } break; default: - if (endp) - /* TODO: Check spec: We used the bare endpoint number before, - * now we use the endpoint name as a whole? Is this allowed? */ - LOGP(DLMGCP, LOGL_NOTICE, - "Unhandled SDP option: '%c'/%d on %s\n", - line[0], line[0], endp->name); - else - LOGP(DLMGCP, LOGL_NOTICE, - "Unhandled SDP option: '%c'/%d\n", - line[0], line[0]); + LOGP(DLMGCP, LOGL_NOTICE, + "Unhandled SDP option: '%c'/%d on %s\n", + line[0], line[0], p->epname); break; } } @@ -422,23 +404,22 @@ /* Store parsed codec information */ for (i = 0; i < codecs_used; i++) { codec_param = param_by_pt(codecs[i].payload_type, fmtp_params, fmtp_used); - rc = mgcp_codecset_add_codec(&conn->end.cset, codecs[i].payload_type, codecs[i].map_line, codec_param); + rc = mgcp_codecset_add_codec(&sdp->cset, codecs[i].payload_type, codecs[i].map_line, codec_param); if (rc < 0) - LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "failed to add codec\n"); + LOGP(DLMGCP, LOGL_NOTICE, "%s: failed to add codec\n", p->epname); } talloc_free(tmp_ctx); - LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE, - "Got media info via SDP: port:%d, addr:%s, duration:%d, payload-types:", - osmo_sockaddr_port(&rtp->addr.u.sa), osmo_sockaddr_ntop(&rtp->addr.u.sa, ipbuf), - rtp->packet_duration_ms); + LOGP(DLMGCP, LOGL_NOTICE, + "%s: Got media info via SDP: port:%d, addr:%s, duration:%d, payload-types:", + p->epname, sdp->rtp_port, osmo_sockaddr_ntop(&sdp->rem_addr.u.sa, ipbuf), sdp->ptime); if (codecs_used == 0) LOGPC(DLMGCP, LOGL_NOTICE, "none"); for (i = 0; i < codecs_used; i++) { LOGPC(DLMGCP, LOGL_NOTICE, "%d=%s", - rtp->cset.codecs[i].payload_type, - strlen(rtp->cset.codecs[i].subtype_name) ? rtp->cset.codecs[i].subtype_name : "unknown"); + sdp->cset.codecs[i].payload_type, + strlen(sdp->cset.codecs[i].subtype_name) ? sdp->cset.codecs[i].subtype_name : "unknown"); LOGPC(DLMGCP, LOGL_NOTICE, " "); } LOGPC(DLMGCP, LOGL_NOTICE, "\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39248?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: I4a2aecb542886672c1f586c6607714e0356abe35 Gerrit-Change-Number: 39248 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>

5 months

1
0
0 0

[XS] Change in osmo-mgw[master]: mgcp_msg: Improve logging checking MGCP line param

by neels

neels has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39352?usp=email ) Change subject: mgcp_msg: Improve logging checking MGCP line param ...................................................................... Patch Set 3: (1 comment) Patchset: PS1: > > this patch might be a misunderstanding from CR on the CRCX parsing patch? […] i hadn't realized the pdata->epname arg, sorry for the noise -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39352?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: I18fd316a2d830b9418a806e32f27558d980259d6 Gerrit-Change-Number: 39352 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Jan 2025 15:51:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

5 months

1
0
0 0

[L] Change in osmo-mgw[master]: mgw: CRCX: Split mgcp header pars parsing into a previous step

by pespin

Attention is currently required from: daniel, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email ) Change subject: mgw: CRCX: Split mgcp header pars parsing into a previous step ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39224?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: I3ee5158c254213203830fe9c38de11c15b4b19c1 Gerrit-Change-Number: 39224 Gerrit-PatchSet: 9 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Jan 2025 15:50:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2025