<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/9342">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Re-introduce support for IPA-encapsulated MGCP<br><br>Old osmo-bsc-sccplite already supported this, but in the migration<br>over to libosmo-sigtran and to real 3GPP AoIP, this functionality<br>got lost.<br><br>We now create a UDP proxy socket. Any MGCP commands received via IPA<br>from MSC (or rather: bsc_nat) are retransmitted to the MGW via UDP on<br>this socket. Any responses back from the MGW received on the UDP<br>socket are retransmitted back to MSC/bsc_nat as MGCP inside the IPA<br>multiplex.<br><br>Closes: OS#2536<br>Change-Id: I38ad8fa645c08900e0e1f1b4b96136bc6d96b3ab<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M include/osmocom/bsc/osmo_bsc_sigtran.h<br>M src/osmo-bsc/Makefile.am<br>M src/osmo-bsc/osmo_bsc_ctrl.c<br>A src/osmo-bsc/osmo_bsc_mgcp.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M src/osmo-bsc/osmo_bsc_sigtran.c<br>M tests/handover/Makefile.am<br>8 files changed, 207 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 1f9872a..2ad7c68 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include "osmux.h"</span><br><span> </span><br><span> #include <osmocom/core/timer.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/select.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> </span><br><span> </span><br><span>@@ -135,6 +136,16 @@</span><br><span> enum osmux_usage use_osmux;</span><br><span> /* Whether we detected the MSC supports Osmux (during BSSMAP_RESET) */</span><br><span> bool remote_supports_osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Proxy between IPA/SCCPlite encapsulated MGCP and UDP */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* local (BSC) IP address to be used */</span><br><span style="color: hsl(120, 100%, 40%);">+ char *local_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* local (BSC) UDP port to be used to talk with MGW */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t local_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* UDP socket for proxying MGCP via SCCPlite/IPA */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+ } mgcp_ipa;</span><br><span> };</span><br><span> </span><br><span> /*</span><br><span>diff --git a/include/osmocom/bsc/osmo_bsc_sigtran.h b/include/osmocom/bsc/osmo_bsc_sigtran.h</span><br><span>index bd8b063..b934d51 100644</span><br><span>--- a/include/osmocom/bsc/osmo_bsc_sigtran.h</span><br><span>+++ b/include/osmocom/bsc/osmo_bsc_sigtran.h</span><br><span>@@ -44,3 +44,12 @@</span><br><span> </span><br><span> /* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */</span><br><span> int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* receive + process a MGCP message from the piggy-back on the IPA/SCCPlite link */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* send a message via SCCPLite to given MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* we received some data on the UDP proxy socket from the MGW. Pass it to MSC via IPA */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccplite_mgcp_proxy_cb(struct osmo_fd *ofd, unsigned int what);</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index e88e614..d50515b 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -78,6 +78,7 @@</span><br><span> osmo_bsc_grace.c \</span><br><span> osmo_bsc_lcls.c \</span><br><span> osmo_bsc_main.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_bsc_mgcp.c \</span><br><span> osmo_bsc_msc.c \</span><br><span> osmo_bsc_sigtran.c \</span><br><span> osmo_bsc_vty.c \</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>index 80699f8..afe061e 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_ctrl.c</span><br><span>@@ -52,6 +52,39 @@</span><br><span> return rt->dest.as;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int _ss7_as_send(struct osmo_ss7_as *as, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ss7_asp *asp;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ asp = as->cfg.asps[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!asp)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: deal with multiple ASPs per AS */</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_ss7_asp_send(asp, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_ss7_as *as;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ as = msc_get_ss7_as(msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!as) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* don't attempt to send CTRL on a non-SCCPlite AS */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return _ss7_as_send(as, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> /* Encode a CTRL command and send it to the given ASP</span><br><span> * \param[in] asp ASP through which we shall send the encoded message</span><br><span>@@ -83,30 +116,20 @@</span><br><span> * Caller must hence free 'cmd' itself. */</span><br><span> static int sccplite_msc_ctrl_cmd_send(struct bsc_msc_data *msc, struct ctrl_cmd *cmd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ss7_as *as;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_ss7_asp *asp;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- as = msc_get_ss7_as(msc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!as)</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = ctrl_cmd_make(cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span> return -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* don't attempt to send CTRL on a non-SCCPlite AS */</span><br><span style="color: hsl(0, 100%, 40%);">- if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_prepend_header(msg, IPAC_PROTO_OSMO);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- asp = as->cfg.asps[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (!asp)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: deal with multiple ASPs per AS */</span><br><span style="color: hsl(0, 100%, 40%);">- return sccplite_asp_ctrl_cmd_send(asp, cmd);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_sccplite_msc_send(msc, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */</span><br><span style="color: hsl(120, 100%, 40%);">+/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Transfers msg ownership. */</span><br><span> int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg)</span><br><span> {</span><br><span> struct ctrl_cmd *cmd;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c</span><br><span>new file mode 100644</span><br><span>index 0000000..bec7930</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_mgcp.c</span><br><span>@@ -0,0 +1,92 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * SCCPlite MGCP handling</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_msc_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/osmo_bsc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/debug.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/ipa.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/ipaccess.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/osmo_bsc_sigtran.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <arpa/inet.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Determine MSC based on the ASP over which the message was received */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct bsc_msc_data *msc_from_asp(struct osmo_ss7_asp *asp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int msc_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* this is rather ugly, as we of course have MTP-level routing between</span><br><span style="color: hsl(120, 100%, 40%);">+ * the local SCCP user (BSC) and the AS/ASPs. However, for the most simple</span><br><span style="color: hsl(120, 100%, 40%);">+ * SCCPlite case, there is a 1:1 mapping between ASP and AS, and using</span><br><span style="color: hsl(120, 100%, 40%);">+ * the libosmo-sigtran "simple client", the names are "as[p]-clnt-msc-%u",</span><br><span style="color: hsl(120, 100%, 40%);">+ * as set in osmo_bsc_sigtran_init() */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(asp->cfg.name, "asp-clnt-msc-%u", &msc_nr) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "Cannot find to which MSC the ASP %s belongs\n", asp->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_msc_data_find(bsc_gsmnet, msc_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* We received an IPA-encapsulated MGCP message from a MSC. Transfers msg ownership. */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n", asp->cfg.name, msg->l2h);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc = msc_from_asp(asp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we don't have a write queue here as we simply expect the socket buffers</span><br><span style="color: hsl(120, 100%, 40%);">+ * to be large enough to deal with whatever small/infrequent MGCP messages */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = send(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* we received some data on the UDP proxy socket from the MGW. Pass it to MSC via IPA */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccplite_mgcp_proxy_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = ofd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(what & BSC_FD_READ))</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = msgb_alloc_headroom(1024, 16, "MGCP->IPA");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = recv(ofd->fd, msg->data, msgb_tailroom(msg), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "error receiving data from MGCP<->IPA proxy UDP socket: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l2h = msgb_put(msg, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l2h[rc] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "Received MGCP on UDP proxy socket: %s\n", msg->l2h);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_prepend_header(msg, IPAC_PROTO_MGCP_OLD);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_sccplite_msc_send(msc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index 6a6b1a9..7e78d94 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -27,26 +27,49 @@</span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/ipaccess.h></span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/osmo_bsc_sigtran.h></span><br><span> #include <osmocom/bsc/signal.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/socket.h></span><br><span> </span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> </span><br><span> #include <osmocom/abis/ipa.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp_client/mgcp_client.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <sys/socket.h></span><br><span> #include <netinet/tcp.h></span><br><span> #include <unistd.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_bsc_msc_init(struct bsc_msc_data *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_bsc_msc_init(struct bsc_msc_data *msc)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = msc->network;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t mgw_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: This is a leftover from the old architecture that used</span><br><span> * sccp-lite with osmocom specific authentication. Since we now</span><br><span> * changed to AoIP the connected status and the authentication</span><br><span> * status is managed differently. However osmo_bsc_filter.c still</span><br><span> * needs the flags to be set to one. See also: OS#3112 */</span><br><span style="color: hsl(0, 100%, 40%);">- data->is_authenticated = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->is_authenticated = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (net->mgw.conf->remote_port >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_port = net->mgw.conf->remote_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw_port = MGCP_CLIENT_REMOTE_PORT_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_init2_ofd(&msc->mgcp_ipa.ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP,</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->mgcp_ipa.local_addr, msc->mgcp_ipa.local_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ net->mgw.conf->remote_addr, mgw_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "msc %u: Could not create/connect/bind MGCP proxy socket: %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->nr, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -117,6 +140,10 @@</span><br><span> msc_data->audio_support[4]->ver = 3;</span><br><span> msc_data->audio_support[4]->hr = 1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, BSC_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0");</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_data->mgcp_ipa.local_port = 0; /* dynamic */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return msc_data;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>index 18f269d..763e1e1 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>@@ -611,8 +611,12 @@</span><br><span> switch (iph_ext->proto) {</span><br><span> case IPAC_PROTO_EXT_CTRL:</span><br><span> return bsc_sccplite_rx_ctrl(asp, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPAC_PROTO_EXT_MGCP:</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_sccplite_rx_mgcp(asp, msg);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case IPAC_PROTO_MGCP_OLD:</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_sccplite_rx_mgcp(asp, msg);</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 56aea50..84c341e 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -8,6 +8,8 @@</span><br><span> -ggdb3 \</span><br><span> $(LIBOSMOCORE_CFLAGS) \</span><br><span> $(LIBOSMOGSM_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_CFLAGS) \</span><br><span> $(LIBOSMOABIS_CFLAGS) \</span><br><span> $(LIBOSMOSIGTRAN_CFLAGS) \</span><br><span> $(LIBOSMOMGCPCLIENT_CFLAGS) \</span><br><span>@@ -38,15 +40,24 @@</span><br><span> $(NULL)</span><br><span> </span><br><span> handover_test_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/libfilter/bsc_msg_acc.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/libfilter/bsc_msg_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/a_reset.o \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/abis_nm_vty.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/abis_om2000.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_rsl.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/acc_ramp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \</span><br><span> $(top_builddir)/src/osmo-bsc/assignment_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_init.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/bsc_rf_ctrl.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_rll.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_subscr_conn_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/bsc_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_sysmobts.o \</span><br><span>@@ -60,14 +71,20 @@</span><br><span> $(top_builddir)/src/osmo-bsc/handover_decision_2.o \</span><br><span> $(top_builddir)/src/osmo-bsc/handover_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/handover_logic.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/handover_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/lchan_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/lchan_rtp_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/lchan_select.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/meas_feed.o \</span><br><span> $(top_builddir)/src/osmo-bsc/meas_rep.o \</span><br><span> $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/neighbor_ident_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/osmo_bsc_ctrl.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/osmo_bsc_mgcp.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/osmo-bsc/osmo_bsc_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/paging.o \</span><br><span> $(top_builddir)/src/osmo-bsc/pcu_sock.o \</span><br><span> $(top_builddir)/src/osmo-bsc/penalty_timers.o \</span><br><span>@@ -76,6 +93,8 @@</span><br><span> $(top_builddir)/src/osmo-bsc/timeslot_fsm.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_LIBS) \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span> $(LIBOSMOSIGTRAN_LIBS) \</span><br><span> $(LIBOSMOMGCPCLIENT_LIBS) \</span><br><span>@@ -89,6 +108,7 @@</span><br><span> $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_LIBS) \</span><br><span> $(NULL)</span><br><span> </span><br><span> .PHONY: update_exp</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/9342">change 9342</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/9342"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I38ad8fa645c08900e0e1f1b4b96136bc6d96b3ab </div>
<div style="display:none"> Gerrit-Change-Number: 9342 </div>
<div style="display:none"> Gerrit-PatchSet: 10 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Assignee: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>