diff options
Diffstat (limited to 'src/libmsc')
-rw-r--r-- | src/libmsc/a_iface.c | 2 | ||||
-rw-r--r-- | src/libmsc/msc_ifaces.c | 6 | ||||
-rw-r--r-- | src/libmsc/msc_vty.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 09d7d1f24..25d3970f0 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -34,7 +34,7 @@ #include <openbsc/a_iface.h> #include <openbsc/a_iface_bssap.h> #include <openbsc/transaction.h> -#include <openbsc/mgcpgw_client.h> +#include <osmocom/legacy_mgcp/mgcpgw_client.h> #include <osmocom/core/byteswap.h> #include <osmocom/sccp/sccp_types.h> #include <openbsc/a_reset.h> diff --git a/src/libmsc/msc_ifaces.c b/src/libmsc/msc_ifaces.c index e25ed28f7..712b3b553 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -26,8 +26,8 @@ #include <openbsc/msc_ifaces.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/transaction.h> -#include <openbsc/mgcp.h> -#include <openbsc/mgcpgw_client.h> +#include <osmocom/legacy_mgcp/mgcp.h> +#include <osmocom/legacy_mgcp/mgcpgw_client.h> #include <openbsc/vlr.h> #include <openbsc/a_iface.h> @@ -236,7 +236,7 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans) * its RTP traffic to that port on the MGCPGW side. The MGCPGW only * gets the endpoint ID via the CRCX. It will do the same calculation * on his side too to get knowledge of the rtp port. */ - bts_base = mgcp->actual.bts_base; + bts_base = mgcpgw_client_conf_actual(mgcp)->bts_base; conn->rtp.port_subscr = bts_base + 2 * conn->iu.mgcp_rtp_endpoint; /* Since we know now the endpoint number, we enforce a DLCX on tha diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 16ae62c24..ec26e5610 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -149,6 +149,6 @@ void msc_vty_init(struct gsm_network *msc_network) install_element(MSC_NODE, &cfg_msc_cs7_instance_a_cmd); install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd); - mgcpgw_client_vty_init(MSC_NODE, &msc_network->mgcpgw.conf); + mgcpgw_client_vty_init(msc_network, MSC_NODE, &msc_network->mgcpgw.conf); ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); } |