diff options
-rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 6 | ||||
-rw-r--r-- | openbsc/src/libmsc/cscn_vty.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-cscn/Makefile.am | 1 | ||||
-rw-r--r-- | openbsc/src/osmo-cscn/cscn_main.c | 17 |
4 files changed, 28 insertions, 0 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 09f04422c..e646ccf21 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -15,6 +15,7 @@ #include <openbsc/rest_octets.h> #include <openbsc/xsc.h> +#include <openbsc/mgcpgw_client.h> /** annotations for msgb ownership */ #define __uses @@ -398,6 +399,11 @@ struct gsm_network { /* Periodic location update default value */ uint8_t t3212; + + struct { + struct mgcpgw_client_conf conf; + struct mgcpgw_client *client; + } mgcpgw; }; struct osmo_esme; diff --git a/openbsc/src/libmsc/cscn_vty.c b/openbsc/src/libmsc/cscn_vty.c index adba37daa..f93c5602b 100644 --- a/openbsc/src/libmsc/cscn_vty.c +++ b/openbsc/src/libmsc/cscn_vty.c @@ -121,6 +121,9 @@ static int config_write_cscn(struct vty *vty) VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->avoid_tmsi ? "no " : "", VTY_NEWLINE); + + mgcpgw_client_config_write(vty, " "); + return CMD_SUCCESS; } @@ -171,4 +174,5 @@ void cscn_vty_init(struct gsm_network *cscn_network) install_element(CSCN_NODE, &cfg_cscn_no_subscr_create_cmd); install_element(CSCN_NODE, &cfg_cscn_assign_tmsi_cmd); install_element(CSCN_NODE, &cfg_cscn_no_assign_tmsi_cmd); + mgcpgw_client_vty_init(CSCN_NODE, &cscn_network->mgcpgw.conf); } diff --git a/openbsc/src/osmo-cscn/Makefile.am b/openbsc/src/osmo-cscn/Makefile.am index 8245a64e9..2f9c31a10 100644 --- a/openbsc/src/osmo-cscn/Makefile.am +++ b/openbsc/src/osmo-cscn/Makefile.am @@ -41,6 +41,7 @@ osmo_cscn_LDADD = \ $(top_builddir)/src/libxsc/libxsc.a \ $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ + $(top_builddir)/src/libmgcp/libmgcp.a \ $(LIBCRYPT) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ diff --git a/openbsc/src/osmo-cscn/cscn_main.c b/openbsc/src/osmo-cscn/cscn_main.c index 694b5b9fe..1f333b477 100644 --- a/openbsc/src/osmo-cscn/cscn_main.c +++ b/openbsc/src/osmo-cscn/cscn_main.c @@ -66,6 +66,7 @@ #include <openbsc/smpp.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/sua.h> +#include <openbsc/mgcpgw_client.h> #include <openbsc/msc_ifaces.h> #include <openbsc/iu.h> @@ -95,6 +96,16 @@ void *tall_map_ctx = NULL; void *tall_upq_ctx = NULL; /* end deps from libbsc legacy. */ +static void mgcp_rx_cb(struct msgb *msg, void *priv) +{ + static char strbuf[4096]; + unsigned int l = msg->len < sizeof(strbuf)-1 ? msg->len : sizeof(strbuf)-1; + strncpy(strbuf, (const char*)msg->data, l); + strbuf[l] = '\0'; + DEBUGP(DMGCP, "Rx MGCP msg from MGCP GW: '%s'\n", strbuf); + talloc_free(msg); +} + static struct { const char *database_name; const char *config_file; @@ -245,6 +256,8 @@ struct gsm_network *cscn_network_alloc(void *ctx, net->name_long = talloc_strdup(net, "OsmoCSCN"); net->name_short = talloc_strdup(net, "OsmoCSCN"); + mgcpgw_client_conf_init(&net->mgcpgw.conf); + return net; } @@ -471,6 +484,10 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i } #endif + cscn_network->mgcpgw.client = mgcpgw_client_init( + cscn_network, &cscn_network->mgcpgw.conf, + mgcp_rx_cb, NULL); + if (db_init(cscn_cmdline_config.database_name)) { printf("DB: Failed to init database: %s\n", cscn_cmdline_config.database_name); |