summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2017-06-12 11:43:44 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-18 17:50:09 +0200
commit778e14a51e28294e2e4f4c869c01ec177713c263 (patch)
treed29936f2419523d59b2404bd9595d3f842d78a9f
parent7a36bbad99e4cdbd5c081a5db62663aca3aee191 (diff)
Revert "mgcp: make sure all endpoints are closed on startup"
Clearing all endpoints by sending a DLCX on startup has ben found to be a bit too offensive. It also will not help against inconsitancies that may occour during runtime (e.g. an overheard DLCX during regular call teardown). This reverts commit b669ea94cb78fd9b56ee8dd9392538151349f8ba.
-rw-r--r--openbsc/include/openbsc/msc_ifaces.h1
-rw-r--r--openbsc/src/libmgcp/mgcpgw_client.c3
-rw-r--r--openbsc/src/libmsc/msc_ifaces.c18
-rw-r--r--openbsc/src/osmo-msc/msc_main.c4
4 files changed, 1 insertions, 25 deletions
diff --git a/openbsc/include/openbsc/msc_ifaces.h b/openbsc/include/openbsc/msc_ifaces.h
index d9f681f2d..e278f9305 100644
--- a/openbsc/include/openbsc/msc_ifaces.h
+++ b/openbsc/include/openbsc/msc_ifaces.h
@@ -56,4 +56,3 @@ int msc_tx_common_id(struct gsm_subscriber_connection *conn);
int msc_call_assignment(struct gsm_trans *trans);
int msc_call_bridge(struct gsm_trans *trans1, struct gsm_trans *trans2);
void msc_call_release(struct gsm_trans *trans);
-void msc_call_release_all(struct mgcpgw_client *mgcp);
diff --git a/openbsc/src/libmgcp/mgcpgw_client.c b/openbsc/src/libmgcp/mgcpgw_client.c
index 4ccff844b..0c5b5caf7 100644
--- a/openbsc/src/libmgcp/mgcpgw_client.c
+++ b/openbsc/src/libmgcp/mgcpgw_client.c
@@ -402,8 +402,7 @@ int mgcpgw_client_connect(struct mgcpgw_client *mgcp)
mgcp->remote_addr = htonl(addr.sin_addr.s_addr);
- osmo_wqueue_init(wq, (mgcp->actual.last_endpoint - mgcp->actual.first_endpoint) + 10);
-
+ osmo_wqueue_init(wq, 10);
wq->bfd.when = BSC_FD_READ;
wq->bfd.data = mgcp;
wq->read_cb = mgcp_do_read;
diff --git a/openbsc/src/libmsc/msc_ifaces.c b/openbsc/src/libmsc/msc_ifaces.c
index 5d019cf40..3dbe7c3e9 100644
--- a/openbsc/src/libmsc/msc_ifaces.c
+++ b/openbsc/src/libmsc/msc_ifaces.c
@@ -356,21 +356,3 @@ 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/openbsc/src/osmo-msc/msc_main.c b/openbsc/src/osmo-msc/msc_main.c
index 4319b84e2..83d8fa4aa 100644
--- a/openbsc/src/osmo-msc/msc_main.c
+++ b/openbsc/src/osmo-msc/msc_main.c
@@ -496,10 +496,6 @@ 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. */