<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12358">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use mgcp-client configured endpoint domain name<br><br>Rationale: reading pcaps becomes so much easier when each of osmo-bsc and<br>osmo-msc address their MGW with differing domain names. Otherwise, both will<br>have a '0@mgw' endpoint and it gets really confusing.<br><br>After this, with according configuration, there can be a '0@bsc' and a '0@msc'<br>endpoint.<br><br>osmo-mgw-for-bsc.cfg:<br> mgcp<br>  domain bsc<br><br>osmo-bsc.cfg:<br> msc 0<br>  mgw endpoint-domain bsc<br><br>Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw)<br>Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78<br>---<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>1 file changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index c1ac6eb..fc34968 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -468,7 +468,8 @@</span><br><span>              conn->user_plane.mgw_endpoint =</span><br><span>                   mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span>                                           conn->network->mgw.client, conn->fi->id,</span><br><span style="color: hsl(0, 100%, 40%);">-                                    "%x@mgw", msc_assigned_cic);</span><br><span style="color: hsl(120, 100%, 40%);">+                                        "%x@%s", msc_assigned_cic,</span><br><span style="color: hsl(120, 100%, 40%);">+                                          mgcp_client_endpoint_domain(conn->network->mgw.client));</span><br><span>            LOGPFSML(conn->fi, LOGL_DEBUG, "MGW endpoint name derived from CIC 0x%x: %s\n",</span><br><span>                          msc_assigned_cic, mgw_endpoint_name(conn->user_plane.mgw_endpoint));</span><br><span> </span><br><span>@@ -477,7 +478,7 @@</span><br><span>           conn->user_plane.mgw_endpoint =</span><br><span>                   mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,</span><br><span>                                           conn->network->mgw.client, conn->fi->id,</span><br><span style="color: hsl(0, 100%, 40%);">-                                    "rtpbridge/*@mgw");</span><br><span style="color: hsl(120, 100%, 40%);">+                                         "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client));</span><br><span>         } else {</span><br><span>             LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n");</span><br><span>                return NULL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12358">change 12358</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/12358"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78 </div>
<div style="display:none"> Gerrit-Change-Number: 12358 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>