Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 ) Change subject: Store MSC ...................................................................... Patch Set 2: (6 comments) File include/osmocom/bsc_nat/bsc_nat.h: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473/comment/14c166f9_e4d8483c PS1, Line 57: struct msc *bsc_nat_msc_add_from_addr_book(struct bsc_nat *bsc_nat); See the other comment. https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473/comment/790a2f45_dc6d0678 PS1, Line 58: struct msc *bsc_nat_msc_get(struct bsc_nat *bsc_nat); Yes, since there is currently only one MSC. I'd adjust the function when support for multiple MSCs gets added. As I understand it, MSC pooling is outside of the scope of SYS#5560, OS#2545. Related: https://osmocom.org/projects/osmo-bscnat/wiki/AoIP_OsmoBSCNAT#MSC-pooling File src/osmo-bsc-nat/bsc_nat.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473/comment/5cf854e3_92289cf0 PS1, Line 70: struct msc *bsc_nat_msc_add_from_addr_book(struct bsc_nat *bsc_nat) This function adds the msc from the following block in the config: cs7 instance 0 sccp-address msc routing-indicator PC point-code 0.23.1 subsystem-number 254 When OsmoBSCNAT supports multiple MSCs, it does not go away, but rather we need to read multiple msc entries from the config (msc0, msc1, ... probably). This is necessary, because the BSCNAT needs to send the RESET towards the MSC, so it needs to know its address. (We don't need to know the address of the BSCs, since they send the RESET to BSCNAT and then we know the address.) Therefore I'd keep a function for adding the MSC from the address book. But the return value isn't really used and doesn't make sense once this parses multiple MSCs, I've changed it to int, return 0 on success and -ENOENT on error. https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473/comment/8e96e1d2_760f0485 PS1, Line 93: void bsc_nat_msc_del(struct bsc_nat *bsc_nat, struct msc *msc) Done File src/osmo-bsc-nat/main.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473/comment/160b1db0_f353ef48 PS1, Line 202: if (!bsc_nat_msc_add_from_addr_book(g_bsc_nat)) IMHO it makes main() a bit more readable if this remains inside a function. File src/osmo-bsc-nat/msc_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473/comment/e93f3000_f480aeb7 PS1, Line 44: { 0, NULL } Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I711df0c649728f1007857fbfda500ed5ef69287b Gerrit-Change-Number: 27473 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Mar 2022 12:35:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment