summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2017-06-12 11:39:41 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-18 17:50:09 +0200
commit7a36bbad99e4cdbd5c081a5db62663aca3aee191 (patch)
treef144aedf986a84428ecec5bb44c7eff6fb3601ef
parent41c0e21364974d4dca2a28c3c70dec76a1c9269e (diff)
mgcp: Make sure endpoint is free on CRCX
The MSC is aware of the assigned endpoints at all times, so it will not assign an occupied endpoint to someone else. However, if it has just restarted, there maybe lingering open endpoints. This patch introduces a fairly simple soultion. Before a new endpoint is seized (CRCX), a DLCX is send in advance. If the endpoint was still occupied with a dead connection, it will be freed. If it was free anyway, the DLCX will just have no effect.
-rw-r--r--openbsc/src/libmsc/msc_ifaces.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/openbsc/src/libmsc/msc_ifaces.c b/openbsc/src/libmsc/msc_ifaces.c
index 43959c1..5d019cf 100644
--- a/openbsc/src/libmsc/msc_ifaces.c
+++ b/openbsc/src/libmsc/msc_ifaces.c
@@ -194,6 +194,7 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans)
struct gsm_subscriber_connection *conn = trans->conn;
struct mgcpgw_client *mgcp = conn->network->mgcpgw.client;
struct msgb *msg;
+ struct msgb *msg_dlcx;
/* HACK. where to scope the RAB Id? At the conn / subscriber /
* ue_conn_ctx? */
@@ -206,6 +207,16 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans)
* and config. */
conn->iu.mgcp_rtp_port_ue = 4000 + 2 * conn->iu.mgcp_rtp_endpoint;
+ /* Since we know now the endpoint number, we enforce a DLCX on tha
+ * endpoint in order to ensure that this endpoint is not occupied
+ * with some old connection that was not properly cleared during
+ * some crash or restart event */
+ msg_dlcx = mgcp_msg_dlcx(mgcp, conn->iu.mgcp_rtp_endpoint);
+ if (mgcpgw_client_tx(mgcp, msg_dlcx, NULL, NULL))
+ LOGP(DMGCP, LOGL_ERROR,
+ "Failed to send DLCX message for %s\n",
+ vlr_subscr_name(trans->vsub));
+
/* Establish the RTP stream first as looping back to the originator.
* The MDCX will patch through to the counterpart. TODO: play a ring
* tone instead. */