osmith has uploaded this change for review.

View Change

lb: Avoid using osmo_ss7_instance private field

We know the id because we just found/created it base don that id, so
simply use it instead of accessing the library object field.

Change-Id: Ib6d1f4898eb0a804ebda527fdd876d2ca4ec1e67
(cherry picked from commit d812fb1e98001f99e2f814ea52292ebdfe03a52f)
---
M src/osmo-bsc/lb.c
1 file changed, 3 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/38755/1
diff --git a/src/osmo-bsc/lb.c b/src/osmo-bsc/lb.c
index 9d5f78e..603b1e1 100644
--- a/src/osmo-bsc/lb.c
+++ b/src/osmo-bsc/lb.c
@@ -451,13 +451,13 @@
OSMO_SCCP_SSN_SMLC_BSSAP_LE);

/* Set up SCCP user and one ASP+AS */
- snprintf(inst_name, sizeof(inst_name), "Lb-%u-%s", cs7_inst->cfg.id, osmo_ss7_asp_protocol_name(used_proto));
+ snprintf(inst_name, sizeof(inst_name), "Lb-%u-%s", bsc_gsmnet->smlc->cs7_instance, osmo_ss7_asp_protocol_name(used_proto));
LOGP(DLCS, LOGL_NOTICE, "Initializing SCCP connection for Lb/%s on cs7 instance %u\n",
- osmo_ss7_asp_protocol_name(used_proto), cs7_inst->cfg.id);
+ osmo_ss7_asp_protocol_name(used_proto), bsc_gsmnet->smlc->cs7_instance);

/* SS7 Protocol stack */
default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC);
- sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, cs7_inst->cfg.id, inst_name,
+ sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, bsc_gsmnet->smlc->cs7_instance, inst_name,
default_pc, used_proto,
0, DEFAULT_ASP_LOCAL_IP,
0, DEFAULT_ASP_REMOTE_IP);

To view, visit change 38755. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: osmo-bsc
Gerrit-Branch: osmith/1.12.2
Gerrit-Change-Id: Ib6d1f4898eb0a804ebda527fdd876d2ca4ec1e67
Gerrit-Change-Number: 38755
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-CC: pespin <pespin@sysmocom.de>