aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/include/openbsc/osmux.h
diff options
context:
space:
mode:
authorDaniel Willmann <dwillmann@sysmocom.de>2016-06-29 16:24:42 +0200
committerHarald Welte <laforge@gnumonks.org>2016-07-11 19:19:05 +0000
commit575420637981828b64c1292ada015d7170b89390 (patch)
treee488858e289f79b1c288d885af525a5ab5f35550 /openbsc/include/openbsc/osmux.h
parent176b62a80c0170f1b9a1578d0b16c3ef27cf1a8f (diff)
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
Diffstat (limited to 'openbsc/include/openbsc/osmux.h')
-rw-r--r--openbsc/include/openbsc/osmux.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/openbsc/include/openbsc/osmux.h b/openbsc/include/openbsc/osmux.h
index 82b8fa35b..0b64a7f1e 100644
--- a/openbsc/include/openbsc/osmux.h
+++ b/openbsc/include/openbsc/osmux.h
@@ -28,6 +28,7 @@ int osmux_used_cid(void);
enum osmux_state {
OSMUX_STATE_DISABLED = 0,
+ OSMUX_STATE_NEGOTIATING,
OSMUX_STATE_ACTIVATING,
OSMUX_STATE_ENABLED,
};