From 575420637981828b64c1292ada015d7170b89390 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Wed, 29 Jun 2016 16:24:42 +0200 Subject: osmux: Add negotiation state so race conditions can't disable osmux Without this commit it is possible that osmux is disabled again on links with high jitter. This happens when an MGCP response without X-Osmux header is received before the NAT receives an Osmux dummy frame from the other side. Ticket: SYS#2628, SYS#2627 Sponsored-by: On-Waves ehf Change-Id: Id624b0279aee5e2412059a10296ce7896e2d4628 --- openbsc/src/libmgcp/mgcp_protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openbsc/src/libmgcp/mgcp_protocol.c') diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c index 1819ceaf9..ff0fc3e7e 100644 --- a/openbsc/src/libmgcp/mgcp_protocol.c +++ b/openbsc/src/libmgcp/mgcp_protocol.c @@ -277,7 +277,7 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp, if (!addr) addr = mgcp_net_src_addr(endp); - if (endp->osmux.state == OSMUX_STATE_ACTIVATING) + if (endp->osmux.state == OSMUX_STATE_NEGOTIATING) sprintf(osmux_extension, "\nX-Osmux: %u", endp->osmux.cid); else osmux_extension[0] = '\0'; @@ -811,13 +811,13 @@ mgcp_header_done: if (endp->ci == CI_UNUSED) goto error2; - /* Annotate Osmux circuit ID and set it to activating state until this + /* Annotate Osmux circuit ID and set it to negotiating state until this * is fully set up from the dummy load. */ endp->osmux.state = OSMUX_STATE_DISABLED; if (osmux_cid >= 0) { endp->osmux.cid = osmux_cid; - endp->osmux.state = OSMUX_STATE_ACTIVATING; + endp->osmux.state = OSMUX_STATE_NEGOTIATING; } else if(endp->cfg->osmux == OSMUX_USAGE_ONLY) { LOGP(DMGCP, LOGL_ERROR, "Osmux only and no osmux offered on 0x%x\n", ENDPOINT_NUMBER(endp)); -- cgit v1.2.3