diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-12-18 18:27:43 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-12-19 18:58:51 +0100 |
| commit | ea0c3203db95518c75258bf5c6bb350a3ffb56fc (patch) | |
| tree | a67cdbb7c4faa862f1467ef98a28ddc78e63f2d0 /src/osmo-bsc/osmo_bsc_audio.c | |
| parent | ca494f385e2f71475c7f4dd04383939729fed9d6 (diff) | |
osmo-bsc: Move user plane/voice related bits into sub-structure
This clarifies which members of the struct are for what.
Change-Id: I618822e6f2d48adce25f9df5c25acbce7c858412
Diffstat (limited to 'src/osmo-bsc/osmo_bsc_audio.c')
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_audio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/osmo-bsc/osmo_bsc_audio.c b/src/osmo-bsc/osmo_bsc_audio.c index 0c11b85e3..82367f074 100644 --- a/src/osmo-bsc/osmo_bsc_audio.c +++ b/src/osmo-bsc/osmo_bsc_audio.c @@ -57,17 +57,17 @@ static int handle_abisip_signal(unsigned int subsys, unsigned int signal, /* we can ask it to connect now */ LOGP(DMSC, LOGL_DEBUG, "Connecting BTS to port: %d conn: %d\n", - con->sccp_con->rtp_port, lchan->abis_ip.conn_id); + con->sccp_con->user_plane.rtp_port, lchan->abis_ip.conn_id); /* If AoIP is in use, the rtp_ip, which has been communicated * via the A interface as connect_ip */ - if(con->sccp_con->rtp_ip) - rtp_ip = con->sccp_con->rtp_ip; + if(con->sccp_con->user_plane.rtp_ip) + rtp_ip = con->sccp_con->user_plane.rtp_ip; else rtp_ip = ntohl(INADDR_ANY); rc = rsl_ipacc_mdcx(lchan, rtp_ip, - con->sccp_con->rtp_port, + con->sccp_con->user_plane.rtp_port, lchan->abis_ip.rtp_payload2); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "Failed to send MDCX: %d\n", rc); @@ -84,13 +84,13 @@ static int handle_abisip_signal(unsigned int subsys, unsigned int signal, * inform the logic that controls the MGW about the new * connection info */ LOGP(DMSC, LOGL_INFO,"RTP connection handover initiated...\n"); - mgcp_handover(con->sccp_con->mgcp_ctx, con->ho_lchan); - } else if (is_ipaccess_bts(con->bts) && con->sccp_con->rtp_ip) { + mgcp_handover(con->sccp_con->user_plane.mgcp_ctx, con->ho_lchan); + } else if (is_ipaccess_bts(con->bts) && con->sccp_con->user_plane.rtp_ip) { /* NOTE: This is only relevant on AoIP networks with * IPA based base stations. See also osmo_bsc_api.c, * function bsc_assign_compl() */ LOGP(DMSC, LOGL_INFO, "Tx MSC ASSIGN COMPL (POSTPONED)\n"); - mgcp_ass_complete(con->sccp_con->mgcp_ctx, lchan); + mgcp_ass_complete(con->sccp_con->user_plane.mgcp_ctx, lchan); } break; } |