use only 0.23.1 as point code for both A and Iu

We usually have both A and IuCS on 0.23.1, using differing SSNs.

0.23.2 was used only if there was a separate cs7 instance for Iu, which is not
practical, and even if used does not conflict with 0.23.1 (since it would be on
a different STP).

Just use 0.23.1 for all SCCP clients.

This needs adjustment of
https://osmocom.org/projects/cellular-infrastructure/wiki/Point_Codes

Change-Id: I3d5466eff5680cb5aa95a76a9e179fdf88ce8aa0
This commit is contained in:
Neels Hofmeyr 2017-11-24 04:36:35 +01:00 committed by Neels Hofmeyr
parent d11d5f1b6d
commit c875f84b1e
1 changed files with 5 additions and 7 deletions

View File

@ -312,9 +312,7 @@ static int rx_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type t
#endif
#define DEFAULT_M3UA_REMOTE_IP "127.0.0.1"
#define DEFAULT_PC_A "0.23.1"
#define DEFAULT_PC_IU "0.23.2"
#define DEFAULT_PC_A_IU DEFAULT_PC_A
#define DEFAULT_PC "0.23.1"
static struct osmo_sccp_instance *sccp_setup(void *ctx, uint32_t cs7_instance,
const char *label, const char *default_pc_str)
@ -344,7 +342,7 @@ static int ss7_setup(void *ctx)
* Iu and A at the same time, under the same point-code */
LOGP(DMSC, LOGL_NOTICE, "CS7 Instance identifiers: A = Iu = %u\n", cs7_instance_a);
msc_network->a.sccp = sccp_setup(ctx, cs7_instance_a, "OsmoMSC-A-Iu", DEFAULT_PC_A_IU);
msc_network->a.sccp = sccp_setup(ctx, cs7_instance_a, "OsmoMSC-A-Iu", DEFAULT_PC);
if (!msc_network->a.sccp)
return -EINVAL;
@ -355,17 +353,17 @@ static int ss7_setup(void *ctx)
LOGP(DMSC, LOGL_NOTICE, "CS7 Instance identifiers: A = %u, Iu = %u\n",
cs7_instance_a, cs7_instance_iu);
msc_network->a.sccp = sccp_setup(ctx, cs7_instance_a, "OsmoMSC-A", DEFAULT_PC_A);
msc_network->a.sccp = sccp_setup(ctx, cs7_instance_a, "OsmoMSC-A", DEFAULT_PC);
if (!msc_network->a.sccp)
return -EINVAL;
msc_network->iu.sccp = sccp_setup(ctx, cs7_instance_iu, "OsmoMSC-Iu", DEFAULT_PC_IU);
msc_network->iu.sccp = sccp_setup(ctx, cs7_instance_iu, "OsmoMSC-Iu", DEFAULT_PC);
if (!msc_network->iu.sccp)
return -EINVAL;
}
#else
/* No Iu support, just open up an A instance */
msc_network->a.sccp = sccp_setup(ctx, cs7_instance_a, "OsmoMSC-A", DEFAULT_PC_A);
msc_network->a.sccp = sccp_setup(ctx, cs7_instance_a, "OsmoMSC-A", DEFAULT_PC);
if (!msc_network->a.sccp)
return -EINVAL;
#endif