cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

osmux: Drop unneeded OSMUX_STATE_NEGOTIATING 

Change-Id: I94e7df3287d037975adc16c5ada05adf94269ead
This commit is contained in:
Pau Espin 2019-05-13 13:10:06 +02:00
parent c63f15a9a7
commit 14f8a08f44
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osmocom/mgcp/osmux.h
View File

@ -28,7 +28,6 @@ int osmux_cid_pool_count_used(void);
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 */
};

3
src/libosmo-mgcp/mgcp_protocol.c
View File

@ -327,7 +327,6 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
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 @@ mgcp_header_done:
* 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;