diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2017-08-07 17:34:55 +0200 |
|---|---|---|
| committer | Philipp Maier <pmaier@sysmocom.de> | 2017-08-07 17:34:55 +0200 |
| commit | c7ee7cc7c57c7c6181eab52cb05b451cbe52aff3 (patch) | |
| tree | 688e9e0f196fc2a2d18e3f0e464f63942e638ba4 | |
| parent | 2515fb8c598ed5ede26f9f3cf4b42d662b531154 (diff) | |
osmo-msc: Use proper sccp instance names
If the user chooses to use a single sccp instance to connect to
the core network. That instance would be named OsmoMSC-Iu. This
is confusing because that same connection would also serve all
A interface traffic. This patch checks for the described condition
and picks a more suitable name then.
| -rw-r--r-- | openbsc/src/osmo-msc/msc_main.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/openbsc/src/osmo-msc/msc_main.c b/openbsc/src/osmo-msc/msc_main.c index fb1da33e0..11ae6cbbd 100644 --- a/openbsc/src/osmo-msc/msc_main.c +++ b/openbsc/src/osmo-msc/msc_main.c @@ -350,15 +350,27 @@ int ss7_setup(void *ctx) uint32_t cs7_instance_a = msc_network->a.cs7_instance; uint32_t cs7_instance_iu = msc_network->iu.cs7_instance; + char sccp_inst_name_iu[32]; + char sccp_inst_name_A[32]; + LOGP(DMSC, LOGL_NOTICE, "CS7 Instance identifier, A-Interface: %u\n", cs7_instance_a); LOGP(DMSC, LOGL_NOTICE, "CS7 Instance identifier, Iu-Interface: %u\n", cs7_instance_iu); - /* Create first SCCP instance (Iu) */ + /* Setup instance names */ + if (cs7_instance_a == cs7_instance_iu) + strcpy(sccp_inst_name_iu, "OsmoMSC-Iu-A"); + else { + strcpy(sccp_inst_name_iu, "OsmoMSC-Iu"); + strcpy(sccp_inst_name_A, "OsmoMSC-A"); + } + + /* Create first SCCP instance (Iu and possibly also for A) */ msc_network->iu.sccp = osmo_sccp_simple_client_on_ss7_id(ctx, cs7_instance_iu, - "OsmoMSC-Iu", IU_DEFAULT_PC, + sccp_inst_name_iu, + IU_DEFAULT_PC, OSMO_SS7_ASP_PROT_M3UA, 0, IU_DEFAULT_LOCAL_IP, 0, IU_DEFAULT_REMOTE_IP); @@ -376,7 +388,7 @@ int ss7_setup(void *ctx) /* Create second SCCP instance (A) */ msc_network->a.sccp = osmo_sccp_simple_client_on_ss7_id(ctx, cs7_instance_a, - "OsmoMSC-A", A_DEFAULT_PC, + sccp_inst_name_A, A_DEFAULT_PC, OSMO_SS7_ASP_PROT_M3UA, 0, A_DEFAULT_LOCAL_IP, 0, A_DEFAULT_REMOTE_IP); |