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/14030 ) Change subject: osmux: Drop unneeded OSMUX_STATE_NEGOTIATING ...................................................................... osmux: Drop unneeded OSMUX_STATE_NEGOTIATING Change-Id: I94e7df3287d037975adc16c5ada05adf94269ead --- M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_protocol.c 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index c080c85..eb05610 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -28,7 +28,6 @@ enum osmux_state { OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */ - OSMUX_STATE_NEGOTIATING, /* Osmux was locally requested in MGCP CRCX */ OSMUX_STATE_ACTIVATING, /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */ OSMUX_STATE_ENABLED, /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */ }; diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 555d6c6..609b5fb 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -327,7 +327,6 @@ rc = msgb_printf(sdp, "X-Osmux: %u\r\n", conn->osmux.cid); if (rc < 0) goto error; - conn->osmux.state = OSMUX_STATE_ACTIVATING; } /* Attach line break to separate the parameters from the SDP block */ @@ -918,7 +917,7 @@ * is fully set up from the dummy load. */ conn->osmux.state = OSMUX_STATE_DISABLED; if (osmux_cid >= -1) { /* -1 is wilcard, alloc next avail CID */ - conn->osmux.state = OSMUX_STATE_NEGOTIATING; + conn->osmux.state = OSMUX_STATE_ACTIVATING; if (conn_osmux_allocate_cid(conn, osmux_cid) == -1) { rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]); goto error2; -- To view, visit https://gerrit.osmocom.org/14030 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: I94e7df3287d037975adc16c5ada05adf94269ead Gerrit-Change-Number: 14030 Gerrit-PatchSet: 2 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/20190519/fdf16d57/attachment.htm>