cellular-infrastructure
/
osmo-bsc-nat
mirror of https://gerrit.osmocom.org/osmo-bsc-nat
10
1
Fork 1
Code Issues Releases Wiki Activity

bsc_nat_sccp_inst: store ss7_inst 

Get ss7_inst once and store it inside bsc_nat_sccp_inst to avoid
multiple calls to osmo_ss7_instance_find().

Related: SYS#5560
Change-Id: I9a8b69fb3df17c85a67958fbca88948573d39694
This commit is contained in:
Oliver Smith 2022-03-09 13:03:43 +01:00
parent 399df14b6d
commit d586b71e8b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/bsc_nat/bsc_nat.h
View File

@ -24,6 +24,8 @@
struct bsc_nat_sccp_inst {
uint32_t ss7_id;
struct osmo_ss7_instance *ss7_inst;
struct osmo_sccp_addr local_sccp_addr;
struct osmo_sccp_user *scu;
};

16
src/osmo-bsc-nat/bsc_nat_fsm.c
View File

@ -100,17 +100,14 @@ static int sccp_sap_get_peer_addr_out(struct bsc_nat_sccp_inst *src, struct osmo
struct osmo_sccp_addr *peer_addr_out)
{
struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src);
struct osmo_ss7_instance *dest_ss7 = osmo_ss7_instance_find(dest->ss7_id);
OSMO_ASSERT(dest_ss7);
if (src == g_bsc_nat->ran) {
if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest_ss7) < 0) {
if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest->ss7_inst) < 0) {
LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find MSC in address book\n");
return -1;
}
} else {
if (osmo_sccp_addr_by_name_local(peer_addr_out, "bsc", dest_ss7) < 0) {
if (osmo_sccp_addr_by_name_local(peer_addr_out, "bsc", dest->ss7_inst) < 0) {
LOG_SCCP(src, peer_addr_in, LOGL_ERROR, "Could not find BSC in address book\n");
return -2;
}
@ -251,6 +248,8 @@ static int sccp_inst_init(struct bsc_nat_sccp_inst *sccp_inst, const char *name,
return -1;
}
sccp_inst->ss7_inst = osmo_ss7_instance_find(sccp_inst->ss7_id);
osmo_sccp_local_addr_by_instance(&sccp_inst->local_sccp_addr, sccp, ssn);
sccp_inst->scu = osmo_sccp_user_bind(sccp, name, sccp_sap_up, ssn);
@ -270,9 +269,10 @@ static void sccp_inst_free(struct bsc_nat_sccp_inst *sccp_inst)
sccp_inst->scu = NULL;
}
struct osmo_ss7_instance *ss7_inst = osmo_ss7_instance_find(sccp_inst->ss7_id);
if (ss7_inst)
osmo_ss7_instance_destroy(ss7_inst);
if (sccp_inst->ss7_inst) {
osmo_ss7_instance_destroy(sccp_inst->ss7_inst);
sccp_inst->ss7_inst = NULL;
}
talloc_free(sccp_inst);
}