Review at https://gerrit.osmocom.org/5020
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 --- M src/osmo-msc/msc_main.c 1 file changed, 5 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/5020/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 5c192e8..b4bafd5 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -312,9 +312,7 @@ #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 @@ * 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 @@ 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 -- To view, visit https://gerrit.osmocom.org/5020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d5466eff5680cb5aa95a76a9e179fdf88ce8aa0 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <[email protected]>
