<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/17423">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_protocol: Avoid code duplication between virtual + other trunks<br><br>There were two code paths that were supposed to do exactly the same,<br>but then in Change-Id I3994af016fb96427263edbba05f560743f85fdd4 only<br>one of the two was modified, resulting in OS#4034<br><br>Let's<br>* dynamically allocate the virtual trunk<br>* rename mgcp_config.trunk to mgcp_config.virt_trunk to clarify<br>* as a result, abolish copy+pasted code for trunk initialization<br><br>Change-Id: I54762af6d417b849a24b6e71b6c5c996a5cb3fa6<br>Related: OS#4034<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>M src/libosmo-mgcp/mgcp_msg.c<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_osmux.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>M tests/mgcp/mgcp_test.c<br>8 files changed, 132 insertions(+), 127 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h</span><br><span>index 8cdff59..27b1e35 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -261,7 +261,10 @@</span><br><span> uint32_t last_call_id;</span><br><span> </span><br><span> /* trunk handling */</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk_config trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* virtual trunk for RTP - RTP endpoints */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk_config *virt_trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* physical trunks with underlying E1 endpoints */</span><br><span> struct llist_head trunks;</span><br><span> </span><br><span> enum mgcp_role role;</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index cbf533f..670332d 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -282,7 +282,7 @@</span><br><span> return endpoint + 60;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, int index);</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int index);</span><br><span> struct mgcp_trunk_config *mgcp_trunk_num(struct mgcp_config *cfg, int index);</span><br><span> </span><br><span> char *get_lco_identifier(const char *options);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index 3e95ed1..b0d1a9f 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -235,6 +235,7 @@</span><br><span> unsigned int gw = INT_MAX;</span><br><span> const char *endpoint_number_str;</span><br><span> struct mgcp_endpoint *endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk_config *virt_trunk = cfg->virt_trunk;</span><br><span> </span><br><span> *cause = 0;</span><br><span> </span><br><span>@@ -259,15 +260,15 @@</span><br><span> endpoint_number_str =</span><br><span> mgcp + strlen(MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK);</span><br><span> if (endpoint_number_str[0] == '*') {</span><br><span style="color: hsl(0, 100%, 40%);">- endp = find_free_endpoint(cfg->trunk.endpoints,</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.number_endpoints);</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = find_free_endpoint(virt_trunk->endpoints,</span><br><span style="color: hsl(120, 100%, 40%);">+ virt_trunk->number_endpoints);</span><br><span> if (!endp)</span><br><span> *cause = -403;</span><br><span> return endp;</span><br><span> }</span><br><span> gw = strtoul(endpoint_number_str, &endptr, 16);</span><br><span style="color: hsl(0, 100%, 40%);">- if (gw < cfg->trunk.number_endpoints && endptr[0] == '@') {</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[gw];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gw < virt_trunk->number_endpoints && endptr[0] == '@') {</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &virt_trunk->endpoints[gw];</span><br><span> endp->wildcarded_req = false;</span><br><span> return endp;</span><br><span> }</span><br><span>@@ -278,8 +279,8 @@</span><br><span> "Addressing virtual trunk without prefix (deprecated), please use %s: '%s'\n",</span><br><span> MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, mgcp);</span><br><span> gw = strtoul(mgcp, &endptr, 16);</span><br><span style="color: hsl(0, 100%, 40%);">- if (gw < cfg->trunk.number_endpoints && endptr[0] == '@') {</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[gw];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gw < virt_trunk->number_endpoints && endptr[0] == '@') {</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &virt_trunk->endpoints[gw];</span><br><span> endp->wildcarded_req = false;</span><br><span> return endp;</span><br><span> }</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 608a93b..3b8e736 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1440,7 +1440,7 @@</span><br><span> {</span><br><span> /* NOTE: The port that is used for RTCP is the RTP port incremented by one</span><br><span> * (e.g. RTP-Port = 16000 ==> RTCP-Port = 16001) */</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_endpoint *endp = &cfg->trunk.endpoints[endpno];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_endpoint *endp = &cfg->virt_trunk->endpoints[endpno];</span><br><span> </span><br><span> if (mgcp_create_bind(source_addr, &rtp_end->rtp,</span><br><span> rtp_end->local_port) != 0) {</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index a1121de..8da7361 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -202,9 +202,9 @@</span><br><span> struct mgcp_conn_rtp * conn_rtp;</span><br><span> int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i=0; i<cfg->trunk.number_endpoints; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i=0; i<cfg->virt_trunk->number_endpoints; i++) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[i];</span><br><span> </span><br><span> llist_for_each_entry(conn, &endp->conns, entry) {</span><br><span> if (conn->type != MGCP_CONN_TYPE_RTP)</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 6b8eae2..caed0b7 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -379,7 +379,7 @@</span><br><span> * - or a response (three numbers, space, transaction id) */</span><br><span> struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_trunk_config *tcfg = &cfg->trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk_config *tcfg = cfg->virt_trunk;</span><br><span> struct rate_ctr_group *rate_ctrs = tcfg->mgcp_general_ctr_group;</span><br><span> struct mgcp_parse_data pdata;</span><br><span> int rc, i, code, handled = 0;</span><br><span>@@ -1657,33 +1657,26 @@</span><br><span> </span><br><span> cfg->get_net_downlink_format_cb = &mgcp_get_net_downlink_format_default;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* default trunk handling; TODO: avoid duplication with mgcp_trunk_alloc() below */</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.cfg = cfg;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.trunk_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.trunk_type = MGCP_TRUNK_VIRTUAL;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.audio_name = talloc_strdup(cfg, "AMR/8000");</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.audio_payload = 126;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.audio_send_ptime = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.audio_send_name = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 33;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.omit_rtcp = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (alloc_mgcp_rate_counters(&cfg->trunk, cfg) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&cfg->trunks);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* default trunk handling */</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk = mgcp_trunk_alloc(cfg, MGCP_TRUNK_VIRTUAL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cfg->virt_trunk) {</span><br><span> talloc_free(cfg);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&cfg->trunks);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* virtual trunk is not part of the list! */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&cfg->virt_trunk->entry);</span><br><span> </span><br><span> return cfg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! allocate configuration with default values.</span><br><span style="color: hsl(120, 100%, 40%);">+/*! allocate configuration with default values. Do not link it into global list yet!</span><br><span> * (called once at startup by VTY)</span><br><span> * \param[in] cfg mgcp configuration</span><br><span> * \param[in] nr trunk number</span><br><span> * \returns pointer to allocated trunk configuration */</span><br><span style="color: hsl(0, 100%, 40%);">-struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, int nr)</span><br><span style="color: hsl(120, 100%, 40%);">+struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, int nr)</span><br><span> {</span><br><span> struct mgcp_trunk_config *trunk;</span><br><span> </span><br><span>@@ -1694,16 +1687,19 @@</span><br><span> }</span><br><span> </span><br><span> trunk->cfg = cfg;</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->trunk_type = MGCP_TRUNK_E1;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->trunk_type = ttype;</span><br><span> trunk->trunk_nr = nr;</span><br><span style="color: hsl(0, 100%, 40%);">- trunk->audio_name = talloc_strdup(cfg, "AMR/8000");</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->audio_name = talloc_strdup(trunk, "AMR/8000");</span><br><span> trunk->audio_payload = 126;</span><br><span> trunk->audio_send_ptime = 1;</span><br><span> trunk->audio_send_name = 1;</span><br><span> trunk->vty_number_endpoints = 33;</span><br><span> trunk->omit_rtcp = 0;</span><br><span> mgcp_trunk_set_keepalive(trunk, MGCP_KEEPALIVE_ONCE);</span><br><span style="color: hsl(0, 100%, 40%);">- alloc_mgcp_rate_counters(trunk, trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (alloc_mgcp_rate_counters(trunk, trunk) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> llist_add_tail(&trunk->entry, &cfg->trunks);</span><br><span> </span><br><span> return trunk;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index 76d674f..6a431e5 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -47,7 +47,7 @@</span><br><span> struct mgcp_trunk_config *trunk;</span><br><span> </span><br><span> if (nr == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- trunk = &cfg->trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk = cfg->virt_trunk;</span><br><span> else</span><br><span> trunk = mgcp_trunk_num(cfg, nr);</span><br><span> </span><br><span>@@ -68,6 +68,8 @@</span><br><span> </span><br><span> static int config_write_mgcp(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk_config *trunk = g_cfg->virt_trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_out(vty, "mgcp%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " domain %s%s", g_cfg->domain, VTY_NEWLINE);</span><br><span> if (g_cfg->local_ip)</span><br><span>@@ -85,50 +87,50 @@</span><br><span> else</span><br><span> vty_out(vty, " no rtp ip-probing%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " rtp ip-dscp %d%s", g_cfg->endp_dscp, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.keepalive_interval == MGCP_KEEPALIVE_ONCE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->keepalive_interval == MGCP_KEEPALIVE_ONCE)</span><br><span> vty_out(vty, " rtp keep-alive once%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (g_cfg->trunk.keepalive_interval)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (trunk->keepalive_interval)</span><br><span> vty_out(vty, " rtp keep-alive %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.keepalive_interval, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->keepalive_interval, VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " no rtp keep-alive%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.omit_rtcp)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->omit_rtcp)</span><br><span> vty_out(vty, " rtcp-omit%s", VTY_NEWLINE);</span><br><span> else</span><br><span> vty_out(vty, " no rtcp-omit%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.force_constant_ssrc</span><br><span style="color: hsl(0, 100%, 40%);">- || g_cfg->trunk.force_aligned_timing</span><br><span style="color: hsl(0, 100%, 40%);">- || g_cfg->trunk.rfc5993_hr_convert) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->force_constant_ssrc</span><br><span style="color: hsl(120, 100%, 40%);">+ || trunk->force_aligned_timing</span><br><span style="color: hsl(120, 100%, 40%);">+ || trunk->rfc5993_hr_convert) {</span><br><span> vty_out(vty, " %srtp-patch ssrc%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_constant_ssrc ? "" : "no ",</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->force_constant_ssrc ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " %srtp-patch timestamp%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_aligned_timing ? "" : "no ",</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->force_aligned_timing ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " %srtp-patch rfc5993hr%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.rfc5993_hr_convert ? "" : "no ",</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->rfc5993_hr_convert ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span> } else</span><br><span> vty_out(vty, " no rtp-patch%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.audio_payload != -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->audio_payload != -1)</span><br><span> vty_out(vty, " sdp audio-payload number %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_payload, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.audio_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->audio_payload, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->audio_name)</span><br><span> vty_out(vty, " sdp audio-payload name %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_name, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.audio_fmtp_extra)</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->audio_name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->audio_fmtp_extra)</span><br><span> vty_out(vty, " sdp audio fmtp-extra %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_fmtp_extra, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->audio_fmtp_extra, VTY_NEWLINE);</span><br><span> vty_out(vty, " %ssdp audio-payload send-ptime%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_send_ptime ? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE);</span><br><span> vty_out(vty, " %ssdp audio-payload send-name%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_send_name ? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " loop %u%s", ! !g_cfg->trunk.audio_loop, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->audio_send_name ? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " loop %u%s", ! !trunk->audio_loop, VTY_NEWLINE);</span><br><span> vty_out(vty, " number endpoints %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.vty_number_endpoints - 1, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->vty_number_endpoints - 1, VTY_NEWLINE);</span><br><span> vty_out(vty, " %sallow-transcoding%s",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.no_audio_transcoding ? "no " : "", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->no_audio_transcoding ? "no " : "", VTY_NEWLINE);</span><br><span> if (g_cfg->call_agent_addr)</span><br><span> vty_out(vty, " call-agent ip %s%s", g_cfg->call_agent_addr,</span><br><span> VTY_NEWLINE);</span><br><span>@@ -299,7 +301,7 @@</span><br><span> struct mgcp_trunk_config *trunk;</span><br><span> int show_stats = argc >= 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dump_trunk(vty, &g_cfg->trunk, show_stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_trunk(vty, g_cfg->virt_trunk, show_stats);</span><br><span> </span><br><span> llist_for_each_entry(trunk, &g_cfg->trunks, entry)</span><br><span> dump_trunk(vty, trunk, show_stats);</span><br><span>@@ -350,7 +352,7 @@</span><br><span> {</span><br><span> struct mgcp_trunk_config *trunk;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dump_mgcp_endpoint(vty, &g_cfg->trunk, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_mgcp_endpoint(vty, g_cfg->virt_trunk, argv[0]);</span><br><span> llist_for_each_entry(trunk, &g_cfg->trunks, entry)</span><br><span> dump_mgcp_endpoint(vty, trunk, argv[0]);</span><br><span> </span><br><span>@@ -561,7 +563,7 @@</span><br><span> if (!txt)</span><br><span> return CMD_WARNING;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_talloc_replace_string(g_cfg, &g_cfg->trunk.audio_fmtp_extra, txt);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_cfg, &g_cfg->virt_trunk->audio_fmtp_extra, txt);</span><br><span> talloc_free(txt);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -570,7 +572,7 @@</span><br><span> cfg_mgcp_allow_transcoding_cmd,</span><br><span> "allow-transcoding", "Allow transcoding\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.no_audio_transcoding = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->no_audio_transcoding = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -578,7 +580,7 @@</span><br><span> cfg_mgcp_no_allow_transcoding_cmd,</span><br><span> "no allow-transcoding", NO_STR "Allow transcoding\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.no_audio_transcoding = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->no_audio_transcoding = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -590,7 +592,7 @@</span><br><span> SDP_STR AUDIO_STR "Number\n" "Payload number\n")</span><br><span> {</span><br><span> unsigned int payload = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_payload = payload;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->audio_payload = payload;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -604,7 +606,7 @@</span><br><span> "sdp audio-payload name NAME",</span><br><span> SDP_STR AUDIO_STR "Name\n" "Payload name\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_talloc_replace_string(g_cfg, &g_cfg->trunk.audio_name, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(g_cfg, &g_cfg->virt_trunk->audio_name, argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -617,7 +619,7 @@</span><br><span> "sdp audio-payload send-ptime",</span><br><span> SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_send_ptime = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->audio_send_ptime = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -626,7 +628,7 @@</span><br><span> "no sdp audio-payload send-ptime",</span><br><span> NO_STR SDP_STR AUDIO_STR "Send SDP ptime (packet duration) attribute\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_send_ptime = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->audio_send_ptime = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -635,7 +637,7 @@</span><br><span> "sdp audio-payload send-name",</span><br><span> SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_send_name = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->audio_send_name = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -644,7 +646,7 @@</span><br><span> "no sdp audio-payload send-name",</span><br><span> NO_STR SDP_STR AUDIO_STR "Send SDP rtpmap with the audio name\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_send_name = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->audio_send_name = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -657,7 +659,7 @@</span><br><span> vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.audio_loop = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->audio_loop = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -667,7 +669,7 @@</span><br><span> "Force endpoint reallocation when the endpoint is still seized\n"</span><br><span> "Don't force reallocation\n" "force reallocation\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_realloc = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_realloc = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -677,7 +679,7 @@</span><br><span> "Accept all RTP packets, even when the originating IP/Port does not match\n"</span><br><span> "enable filter\n" "disable filter\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.rtp_accept_all = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->rtp_accept_all = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -687,20 +689,20 @@</span><br><span> "Number options\n" "Endpoints available\n" "Number endpoints\n")</span><br><span> {</span><br><span> /* + 1 as we start counting at one */</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.vty_number_endpoints = atoi(argv[0]) + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->vty_number_endpoints = atoi(argv[0]) + 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_mgcp_omit_rtcp, cfg_mgcp_omit_rtcp_cmd, "rtcp-omit", RTCP_OMIT_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.omit_rtcp = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->omit_rtcp = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_mgcp_no_omit_rtcp,</span><br><span> cfg_mgcp_no_omit_rtcp_cmd, "no rtcp-omit", NO_STR RTCP_OMIT_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.omit_rtcp = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->omit_rtcp = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -708,7 +710,7 @@</span><br><span> cfg_mgcp_patch_rtp_ssrc_cmd,</span><br><span> "rtp-patch ssrc", RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_constant_ssrc = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_constant_ssrc = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -716,7 +718,7 @@</span><br><span> cfg_mgcp_no_patch_rtp_ssrc_cmd,</span><br><span> "no rtp-patch ssrc", NO_STR RTP_PATCH_STR "Force a fixed SSRC\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_constant_ssrc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_constant_ssrc = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -724,7 +726,7 @@</span><br><span> cfg_mgcp_patch_rtp_ts_cmd,</span><br><span> "rtp-patch timestamp", RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_aligned_timing = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_aligned_timing = 1;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -732,7 +734,7 @@</span><br><span> cfg_mgcp_no_patch_rtp_ts_cmd,</span><br><span> "no rtp-patch timestamp", NO_STR RTP_PATCH_STR "Adjust RTP timestamp\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_aligned_timing = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_aligned_timing = 0;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -740,7 +742,7 @@</span><br><span> cfg_mgcp_patch_rtp_rfc5993hr_cmd,</span><br><span> "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.rfc5993_hr_convert = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->rfc5993_hr_convert = true;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -748,16 +750,16 @@</span><br><span> cfg_mgcp_no_patch_rtp_rfc5993hr_cmd,</span><br><span> "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.rfc5993_hr_convert = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->rfc5993_hr_convert = false;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_mgcp_no_patch_rtp,</span><br><span> cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_constant_ssrc = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.force_aligned_timing = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.rfc5993_hr_convert = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_constant_ssrc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->force_aligned_timing = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->rfc5993_hr_convert = false;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -766,7 +768,7 @@</span><br><span> "rtp keep-alive <1-120>",</span><br><span> RTP_STR RTP_KEEPALIVE_STR "Keep alive interval in secs\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_set_keepalive(&g_cfg->trunk, atoi(argv[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_trunk_set_keepalive(g_cfg->virt_trunk, atoi(argv[0]));</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -775,7 +777,7 @@</span><br><span> "rtp keep-alive once",</span><br><span> RTP_STR RTP_KEEPALIVE_STR "Send dummy packet only once after CRCX/MDCX\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_set_keepalive(&g_cfg->trunk, MGCP_KEEPALIVE_ONCE);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_trunk_set_keepalive(g_cfg->virt_trunk, MGCP_KEEPALIVE_ONCE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -783,7 +785,7 @@</span><br><span> cfg_mgcp_no_rtp_keepalive_cmd,</span><br><span> "no rtp keep-alive", NO_STR RTP_STR RTP_KEEPALIVE_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_trunk_set_keepalive(&g_cfg->trunk, MGCP_KEEPALIVE_NEVER);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_trunk_set_keepalive(g_cfg->virt_trunk, MGCP_KEEPALIVE_NEVER);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -809,8 +811,11 @@</span><br><span> int index = atoi(argv[0]);</span><br><span> </span><br><span> trunk = mgcp_trunk_num(g_cfg, index);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trunk)</span><br><span style="color: hsl(0, 100%, 40%);">- trunk = mgcp_trunk_alloc(g_cfg, index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk = mgcp_trunk_alloc(g_cfg, MGCP_TRUNK_E1, index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trunk)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (!trunk) {</span><br><span> vty_out(vty, "%%Unable to allocate trunk %u.%s",</span><br><span>@@ -855,7 +860,7 @@</span><br><span> else</span><br><span> vty_out(vty, " no rtcp-omit%s", VTY_NEWLINE);</span><br><span> if (trunk->force_constant_ssrc || trunk->force_aligned_timing</span><br><span style="color: hsl(0, 100%, 40%);">- || g_cfg->trunk.rfc5993_hr_convert) {</span><br><span style="color: hsl(120, 100%, 40%);">+ || g_cfg->virt_trunk->rfc5993_hr_convert) {</span><br><span> vty_out(vty, " %srtp-patch ssrc%s",</span><br><span> trunk->force_constant_ssrc ? "" : "no ",</span><br><span> VTY_NEWLINE);</span><br><span>@@ -1318,7 +1323,7 @@</span><br><span> else if (strcmp(argv[0], "only") == 0)</span><br><span> g_cfg->osmux = OSMUX_USAGE_ONLY;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (g_cfg->trunk.audio_loop) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_cfg->virt_trunk->audio_loop) {</span><br><span> vty_out(vty, "Cannot use `loop' with `osmux'.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -1519,10 +1524,10 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mgcp_endpoints_allocate(&g_cfg->trunk) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mgcp_endpoints_allocate(g_cfg->virt_trunk) != 0) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "Failed to initialize the virtual trunk (%d endpoints)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- g_cfg->trunk.number_endpoints);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->virt_trunk->number_endpoints);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index c72382e..e0518a4 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -757,13 +757,13 @@</span><br><span> </span><br><span> cfg = mgcp_config_alloc();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 64;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_allocate(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->vty_number_endpoints = 64;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_allocate(cfg->virt_trunk);</span><br><span> cfg->policy_cb = mgcp_test_policy_cb;</span><br><span> </span><br><span> memset(last_conn_id, 0, sizeof(last_conn_id));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span> mgcp_endpoints_allocate(trunk2);</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(tests); i++) {</span><br><span>@@ -777,7 +777,7 @@</span><br><span> last_endpoint = -1;</span><br><span> dummy_packets = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_talloc_replace_string(cfg, &cfg->trunk.audio_fmtp_extra,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(cfg, &cfg->virt_trunk->audio_fmtp_extra,</span><br><span> t->extra_fmtp);</span><br><span> </span><br><span> inp = create_msg(t->req, last_conn_id);</span><br><span>@@ -810,7 +810,7 @@</span><br><span> printf("Dummy packets: %d\n", dummy_packets);</span><br><span> </span><br><span> if (last_endpoint != -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> </span><br><span> conn = mgcp_conn_get_rtp(endp, "1");</span><br><span> if (conn) {</span><br><span>@@ -866,7 +866,7 @@</span><br><span> /* Check detected payload type */</span><br><span> if (conn && t->ptype != PTYPE_IGNORE) {</span><br><span> OSMO_ASSERT(last_endpoint != -1);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> </span><br><span> fprintf(stderr, "endpoint 0x%x: "</span><br><span> "payload type %d (expected %d)\n",</span><br><span>@@ -883,7 +883,7 @@</span><br><span> }</span><br><span> </span><br><span> mgcp_endpoints_release(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_release(cfg->virt_trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span> </span><br><span>@@ -897,12 +897,12 @@</span><br><span> </span><br><span> cfg = mgcp_config_alloc();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 64;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_allocate(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->vty_number_endpoints = 64;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_allocate(cfg->virt_trunk);</span><br><span> </span><br><span> memset(last_conn_id, 0, sizeof(last_conn_id));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span> mgcp_endpoints_allocate(trunk2);</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(retransmit); i++) {</span><br><span>@@ -944,7 +944,7 @@</span><br><span> }</span><br><span> </span><br><span> mgcp_endpoints_release(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_release(cfg->virt_trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span> </span><br><span>@@ -965,10 +965,10 @@</span><br><span> cfg = mgcp_config_alloc();</span><br><span> cfg->rqnt_cb = rqnt_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 64;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_allocate(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->vty_number_endpoints = 64;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_allocate(cfg->virt_trunk);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span> mgcp_endpoints_allocate(trunk2);</span><br><span> </span><br><span> inp = create_msg(CRCX, NULL);</span><br><span>@@ -999,7 +999,7 @@</span><br><span> msgb_free(mgcp_handle_message(cfg, inp));</span><br><span> msgb_free(inp);</span><br><span> mgcp_endpoints_release(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_release(cfg->virt_trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span> </span><br><span>@@ -1371,11 +1371,11 @@</span><br><span> printf("Testing multiple payload types\n");</span><br><span> </span><br><span> cfg = mgcp_config_alloc();</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 64;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_allocate(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->vty_number_endpoints = 64;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_allocate(cfg->virt_trunk);</span><br><span> cfg->policy_cb = mgcp_test_policy_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span> mgcp_endpoints_allocate(trunk2);</span><br><span> </span><br><span> /* Allocate endpoint 1@mgw with two codecs */</span><br><span>@@ -1388,7 +1388,7 @@</span><br><span> msgb_free(resp);</span><br><span> </span><br><span> OSMO_ASSERT(last_endpoint == 1);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 18);</span><br><span>@@ -1403,7 +1403,7 @@</span><br><span> msgb_free(resp);</span><br><span> </span><br><span> OSMO_ASSERT(last_endpoint == 2);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 18);</span><br><span>@@ -1423,7 +1423,7 @@</span><br><span> msgb_free(resp);</span><br><span> </span><br><span> OSMO_ASSERT(last_endpoint == 3);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 0);</span><br><span>@@ -1438,7 +1438,7 @@</span><br><span> msgb_free(resp);</span><br><span> </span><br><span> OSMO_ASSERT(last_endpoint == 4);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 18);</span><br><span>@@ -1446,9 +1446,9 @@</span><br><span> /* Allocate 5@mgw at select GSM.. */</span><br><span> last_endpoint = -1;</span><br><span> inp = create_msg(CRCX_MULT_GSM_EXACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(cfg->trunk.audio_name);</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.audio_name = "GSM/8000";</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.no_audio_transcoding = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(cfg->virt_trunk->audio_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->audio_name = "GSM/8000";</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->no_audio_transcoding = 1;</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id,</span><br><span> sizeof(conn_id)) == 0);</span><br><span>@@ -1456,7 +1456,7 @@</span><br><span> msgb_free(resp);</span><br><span> </span><br><span> OSMO_ASSERT(last_endpoint == 5);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 3);</span><br><span>@@ -1467,7 +1467,7 @@</span><br><span> msgb_free(inp);</span><br><span> msgb_free(resp);</span><br><span> OSMO_ASSERT(last_endpoint == 5);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 3);</span><br><span>@@ -1489,7 +1489,7 @@</span><br><span> </span><br><span> last_endpoint = -1;</span><br><span> inp = create_msg(CRCX_MULT_GSM_EXACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.no_audio_transcoding = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->no_audio_transcoding = 0;</span><br><span> resp = mgcp_handle_message(cfg, inp);</span><br><span> OSMO_ASSERT(get_conn_id_from_response(resp->data, conn_id,</span><br><span> sizeof(conn_id)) == 0);</span><br><span>@@ -1497,13 +1497,13 @@</span><br><span> msgb_free(resp);</span><br><span> </span><br><span> OSMO_ASSERT(last_endpoint == 5);</span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[last_endpoint];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[last_endpoint];</span><br><span> conn = mgcp_conn_get_rtp(endp, conn_id);</span><br><span> OSMO_ASSERT(conn);</span><br><span> OSMO_ASSERT(conn->end.codec->payload_type == 0);</span><br><span> </span><br><span> mgcp_endpoints_release(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_release(cfg->virt_trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span> </span><br><span>@@ -1517,10 +1517,10 @@</span><br><span> printf("Testing no sequence flow on initial packet\n");</span><br><span> </span><br><span> cfg = mgcp_config_alloc();</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 64;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_allocate(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->vty_number_endpoints = 64;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_allocate(cfg->virt_trunk);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- endp = &cfg->trunk.endpoints[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ endp = &cfg->virt_trunk->endpoints[1];</span><br><span> </span><br><span> _conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP,</span><br><span> "test-connection");</span><br><span>@@ -1552,7 +1552,7 @@</span><br><span> OSMO_ASSERT(conn->state.stats.cycles == UINT16_MAX + 1);</span><br><span> OSMO_ASSERT(conn->state.stats.max_seq == 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_release(cfg->virt_trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span> </span><br><span>@@ -1565,13 +1565,13 @@</span><br><span> printf("Testing no rtpmap name\n");</span><br><span> cfg = mgcp_config_alloc();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.vty_number_endpoints = 64;</span><br><span style="color: hsl(0, 100%, 40%);">- cfg->trunk.audio_send_name = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_allocate(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->vty_number_endpoints = 64;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->virt_trunk->audio_send_name = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_allocate(cfg->virt_trunk);</span><br><span> </span><br><span> cfg->policy_cb = mgcp_test_policy_cb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trunk2 = mgcp_trunk_alloc(cfg, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk2 = mgcp_trunk_alloc(cfg, MGCP_TRUNK_E1, 1);</span><br><span> mgcp_endpoints_allocate(trunk2);</span><br><span> </span><br><span> inp = create_msg(CRCX, NULL);</span><br><span>@@ -1586,7 +1586,7 @@</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> mgcp_endpoints_release(trunk2);</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_endpoints_release(&cfg->trunk);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endpoints_release(cfg->virt_trunk);</span><br><span> talloc_free(cfg);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/17423">change 17423</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-mgw/+/17423"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I54762af6d417b849a24b6e71b6c5c996a5cb3fa6 </div>
<div style="display:none"> Gerrit-Change-Number: 17423 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>