Change in osmo-bsc[master]: use mgcp-client configured endpoint domain name

[Neels Hofmeyr]

Neels Hofmeyr has uploaded this change for review. ( 
https://gerrit.osmocom.org/12358


Change subject: use mgcp-client configured endpoint domain name
......................................................................

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
---
M src/osmo-bsc/bsc_subscr_conn_fsm.c
1 file changed, 3 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/12358/1

diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c 
b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 85e754f..aa75273 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -468,7 +468,8 @@
                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 @@
                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;

--
To view, visit https://gerrit.osmocom.org/12358
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I492023e9dca0233ec0a077032455d9f2e3880f78
Gerrit-Change-Number: 12358
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>