use separated libosmo-mgcp-client, apply rename to mgcp_client_*
After osmo-mgw changes I8e0b2d2a399b77086a36606f5e427271c6242df1 and
I99f7faab637cfcc22ece64a1dbcbe590f2042187, apply linking of new
libosmo-mgcp-client and renames to drop the "gw" from mgcp_client_*.
Also rename the gsm_network.mgcpgw to mgw, to indicate that the MGCP client is
used to contact the MGW (Media Gateway).
Depends: I8e0b2d2a399b77086a36606f5e427271c6242df1 (osmo-mgw)
I99f7faab637cfcc22ece64a1dbcbe590f2042187 (osmo-mgw)
Change-Id: I093ad02ca0e532f659447c785e09678b3e6f220d
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 41dfedb..75ba19c 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -64,7 +64,7 @@
#include <osmocom/msc/osmo_bsc_rf.h>
#include <osmocom/msc/smpp.h>
#include <osmocom/sigtran/osmo_ss7.h>
-#include <osmocom/legacy_mgcp/mgcpgw_client.h>
+#include <osmocom/mgcp_client/mgcp_client.h>
#ifdef BUILD_IU
#include <osmocom/ranap/iu_client.h>
@@ -251,7 +251,7 @@
MSC_HLR_REMOTE_IP_DEFAULT);
net->gsup_server_port = MSC_HLR_REMOTE_PORT_DEFAULT;
- mgcpgw_client_conf_init(&net->mgcpgw.conf);
+ mgcp_client_conf_init(&net->mgw.conf);
return net;
}
@@ -553,10 +553,10 @@
if (sms_queue_start(msc_network, 20) != 0)
return -1;
- msc_network->mgcpgw.client = mgcpgw_client_init(
- msc_network, &msc_network->mgcpgw.conf);
+ msc_network->mgw.client = mgcp_client_init(
+ msc_network, &msc_network->mgw.conf);
- if (mgcpgw_client_connect(msc_network->mgcpgw.client)) {
+ if (mgcp_client_connect(msc_network->mgw.client)) {
printf("MGCPGW connect failed\n");
return 7;
}