use mgcp-client configured endpoint domain name

Rationale: reading pcaps becomes so much easier when each of osmo-bsc and
osmo-msc address their MGW with differing domain names. Otherwise, both will
have a '0@mgw' endpoint and it gets really confusing.

After this, with according configuration, there can be a '0@bsc' and a '0@msc'
endpoint.

osmo-mgw-for-bsc.cfg:
 mgcp
  domain bsc

osmo-bsc.cfg:
 msc 0
  mgw endpoint-domain bsc

Depends: Ia662016f29dd8727d9c4626d726729641e21e1f8 (osmo-mgw)
Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78
This commit is contained in:
Neels Hofmeyr 2018-12-19 01:18:32 +01:00
parent f3bd838afc
commit cf4a49b7b0
1 changed files with 3 additions and 2 deletions

View File

@ -468,7 +468,8 @@ struct mgw_endpoint *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection
conn->user_plane.mgw_endpoint =
mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,
conn->network->mgw.client, conn->fi->id,
"%x@mgw", msc_assigned_cic);
"%x@%s", msc_assigned_cic,
mgcp_client_endpoint_domain(conn->network->mgw.client));
LOGPFSML(conn->fi, LOGL_DEBUG, "MGW endpoint name derived from CIC 0x%x: %s\n",
msc_assigned_cic, mgw_endpoint_name(conn->user_plane.mgw_endpoint));
@ -477,7 +478,7 @@ struct mgw_endpoint *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection
conn->user_plane.mgw_endpoint =
mgw_endpoint_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,
conn->network->mgw.client, conn->fi->id,
"rtpbridge/*@mgw");
"%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client));
} else {
LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n");
return NULL;