This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11377 ) Change subject: osmux: Don't process regular osmux frames if disabled by cfg ...................................................................... osmux: Don't process regular osmux frames if disabled by cfg Prior to this commit, the check was only done on legacy dummy frames. Port from openbsc a42d4584fd01c9cd1021fab609bdaaafe859c13a. Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 12 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 2e58c55..2e6307e 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -331,6 +331,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DLMGCP, LOGL_ERROR, + "bsc-nat wants to use Osmux but bsc did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) goto out; @@ -382,12 +388,6 @@ LOGP(DLMGCP, LOGL_DEBUG, "Received Osmux dummy load from %s\n", inet_ntoa(addr->sin_addr)); - if (!cfg->osmux) { - LOGP(DLMGCP, LOGL_ERROR, - "bsc wants to use Osmux but bsc-nat did not request it\n"); - goto out; - } - /* extract the osmux CID from the dummy message */ memcpy(&osmux_cid, &msg->data[1], sizeof(osmux_cid)); @@ -433,6 +433,12 @@ if (!msg) return -1; + if (!cfg->osmux) { + LOGP(DLMGCP, LOGL_ERROR, + "bsc wants to use Osmux but bsc-nat did not request it\n"); + goto out; + } + /* not any further processing dummy messages */ if (msg->data[0] == MGCP_DUMMY_LOAD) return osmux_handle_dummy(cfg, &addr, msg); -- To view, visit https://gerrit.osmocom.org/11377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5b6606d72a9f5ae593a8e3ab5fbbe7e1e5a0ae11 Gerrit-Change-Number: 11377 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181016/7a82f9c4/attachment.htm>