diff options
author | Philipp Maier <pmaier@sysmocom.de> | 2017-06-08 15:36:14 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-07-12 23:42:46 +0200 |
commit | 6db2ffdcd6cd9c298ba5dcaca03289bc7bd20dc8 (patch) | |
tree | fd177463f1bc4b2e89e91eb56af5f0b3f13f6081 /src | |
parent | b7bec70f601e5d98a31546713a7600a6dee973cf (diff) |
mgcp: make sure all endpoints are closed on startup
If the MSC is crashing and restarting, it may leave some endpoints
open. The endpoints can not be re-used until they are deleted
(DLCX). This patch sends a DLCX to all possible endpoints (usually
this is in a countable range) in order to clear possible open
endpoints from a previous run
Change-Id: I9de2f67ffe08b2d76574ef4470c7a9767ca74702
Diffstat (limited to 'src')
-rw-r--r-- | src/libmgcp/mgcpgw_client.c | 3 | ||||
-rw-r--r-- | src/libmsc/msc_ifaces.c | 18 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 4 |
3 files changed, 24 insertions, 1 deletions
diff --git a/src/libmgcp/mgcpgw_client.c b/src/libmgcp/mgcpgw_client.c index 0c5b5caf7..4ccff844b 100644 --- a/src/libmgcp/mgcpgw_client.c +++ b/src/libmgcp/mgcpgw_client.c @@ -402,7 +402,8 @@ int mgcpgw_client_connect(struct mgcpgw_client *mgcp) mgcp->remote_addr = htonl(addr.sin_addr.s_addr); - osmo_wqueue_init(wq, 10); + osmo_wqueue_init(wq, (mgcp->actual.last_endpoint - mgcp->actual.first_endpoint) + 10); + wq->bfd.when = BSC_FD_READ; wq->bfd.data = mgcp; wq->read_cb = mgcp_do_read; diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index 9533ddecd..43959c13f 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -345,3 +345,21 @@ void msc_call_release(struct gsm_trans *trans) /* Release endpoint id */ mgcpgw_client_release_endpoint(conn->iu.mgcp_rtp_endpoint, mgcp); } + +void msc_call_release_all(struct mgcpgw_client *mgcp) +{ + struct msgb *msg; + unsigned int i; + + uint16_t first_endpoint = mgcp->actual.first_endpoint; + uint16_t last_endpoint = mgcp->actual.last_endpoint; + + for (i = first_endpoint; i < last_endpoint; i++) { + msg = mgcp_msg_dlcx(mgcp, i); + if (mgcpgw_client_tx(mgcp, msg, NULL, NULL)) + LOGP(DMGCP, LOGL_ERROR, + "Failed to send DLCX message for endpoint %u\n", i); + + mgcpgw_client_release_endpoint(i, mgcp); + } +} diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 83d8fa4aa..4319b84e2 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -496,6 +496,10 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i return 7; } + /* Make sure all mgcp endpoints are cleared */ + msc_call_release_all(msc_network->mgcpgw.client); + + /* Set up A-Interface */ /* TODO: implement A-Interface and remove above legacy stuff. */ |