diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-07-19 16:48:42 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-08-29 12:51:19 +0000 |
| commit | 979cd26f35cc979a15073f263cdc5d1b5691bc65 (patch) | |
| tree | 66d6d79a840b5ec74b1abe195d19b684cf485af9 /src/libmsc | |
| parent | c2df7e84a711e1da14d16c7110b45f9a8d9b38fb (diff) | |
move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as libosmo-legacy-mgcp
Rewire build and includes to libosmo-legacy-mgcp.
Drop osmo-bsc_mgcp and related python tests, now found in osmo-mgw.git.
libosmo-legacy-mgcp is installed from osmo-mgw, hence add the dependency to
jenkins.sh (so far using the pre_release branch).
Change-Id: Ic99d681759edce11564da62500c2aac5cf5fffe2
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 93e8ab5e9..e473b7526 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 262bf98a3..161a10019 100644 --- a/src/libmsc/msc_ifaces.c +++ b/src/libmsc/msc_ifaces.c @@ -25,8 +25,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> @@ -249,7 +249,7 @@ int msc_call_assignment(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->rtp.mgcp_rtp_endpoint; /* Establish the RTP stream first as looping back to the originator. diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 6ae4529a1..50679aa01 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -155,7 +155,7 @@ 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); #ifdef BUILD_IU ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); #endif |