aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2020-08-10 23:36:55 +0200
committerPhilipp Maier <pmaier@sysmocom.de>2020-08-10 23:36:55 +0200
commit3db88c6d8e1102333ab90ae5803b659c225c2d5c (patch)
treebddb1c177bcf5b456c9311140a2fd75d0073f4ca
parent7a11fce61170f23351daee18ef6d6afc6c35c152 (diff)
e1: encode line number as trunk number in MGCP endpointpmaier/mgw
The MGCP endpoint name, that is generated when an E1 endpoint is selected does have a hardcoded trunk id number, which is permanantly set to 1. Lets use the E1 line number instead. Related: OS#2547 Change-Id: Ic5447bb4426e31d119667bdfddfd2c91fd591fc6
-rw-r--r--src/osmo-bsc/bsc_subscr_conn_fsm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 0faf3b2df..ec8a4dfd9 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -495,8 +495,11 @@ struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection
if (is_ipaccess_bts(for_lchan->ts->trx->bts))
/* use dynamic RTPBRIDGE endpoint allocation in MGW */
epname = mgcp_client_rtpbridge_wildcard(conn->network->mgw.client);
- else
- epname = mgcp_client_e1_epname(conn, conn->network->mgw.client, 1, for_lchan->ts->e1_link.e1_ts, 16, for_lchan->ts->e1_link.e1_ts_ss*2);
+ else {
+ epname = mgcp_client_e1_epname(conn, conn->network->mgw.client, for_lchan->ts->e1_link.e1_nr,
+ for_lchan->ts->e1_link.e1_ts, 16,
+ for_lchan->ts->e1_link.e1_ts_ss*2);
+ }
conn->user_plane.mgw_endpoint =
osmo_mgcpc_ep_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,