April 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: SCCP N-PCSTATE: trigger MSC status on PC availability
by msuraev 12 Apr '23

12 Apr '23

Attention is currently required from: neels, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32151 ) Change subject: SCCP N-PCSTATE: trigger MSC status on PC availability ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3a0869598b8395601a16d78dbc46eec400c0ea84 Gerrit-Change-Number: 32151 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 03:45:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by msuraev 12 Apr '23

12 Apr '23

Attention is currently required from: neels. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... Patch Set 1: (1 comment) File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/33205fd8_bbf0… PS1, Line 454: ty synchronize point-codes and routing keys between STP and \{BSC,MSC}: typo: to -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 03:39:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: TODO-RELEASE: add note on osmo-sip-connector and SDP
by neels 11 Apr '23

11 Apr '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/32274 ) Change subject: TODO-RELEASE: add note on osmo-sip-connector and SDP ...................................................................... TODO-RELEASE: add note on osmo-sip-connector and SDP Change-Id: I37fb5e18f06a5379d0320ee7d47885c9283cbd06 --- M TODO-RELEASE 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/74/32274/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index a2695f2..a2c7f6a 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty() + MNCC osmo-sip-connector should do full SDP via MNCC and be released at the same time as the next osmo-msc, ask neels, thanks -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37fb5e18f06a5379d0320ee7d47885c9283cbd06 Gerrit-Change-Number: 32274 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by neels 11 Apr '23

11 Apr '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... add static SS7 routing example to cs7-config.adoc Related: SYS#6422 Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa --- M common/chapters/cs7-config.adoc 1 file changed, 161 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/32273/1 diff --git a/common/chapters/cs7-config.adoc b/common/chapters/cs7-config.adoc index 5ac9bae..203df07 100644 --- a/common/chapters/cs7-config.adoc +++ b/common/chapters/cs7-config.adoc @@ -343,3 +343,154 @@ So you only have the following options: * Using M3UA with routing context (1..N) * Using M3UA without routing context (0) + +==== Example: Static Routing + +Osmocom SS7 supports dynamic routing, allowing minimal SS7 configuration. If all of your components support dynamic +routing, you should probably use that: see `accept-asp-connections dynamic-permitted` in osmo-stp.cfg. +This chapter explains how to configure osmo-stp if dynamic routing is not an option. + +In this example, let's connect osmo-bsc via osmo-stp to osmo-msc using only static SS7 routing. + +---- + BSC <--RK-1--> STP <--RK-3--> MSC + IP 1.1.1.1 IP 2.2.2.2 IP 3.3.3.3 + M3UA 12905 M3UA 2905 M3UA 32905 + PC 1.1.1 PC 3.3.3 +---- + +Every one static route fanning out from STP gets assigned a distinct Routing Key -- a simple integer number. Above, the +BSC's link has RK 1, the MSC's link has RK 3. + +Every component has a distinct M3UA port. For static routing, the M3UA port numbers must be fixed, i.e. there must be no +`0` for a client's local port as in `asp foo 2905 0 m3ua`. + +Above example has distinct IP addresses 1.1.1.1, 2.2.2.2, 3.3.3.3 *and* distinct M3UA port numbers 12905, 2905, 32905, +just to show which ends up where in the configuration. + +The BSC needs to configure: + +- its own point-code -- has to match the PC in osmo-stp.cfg +- the routing key -- has to match the RK assigned to BSC's PC in osmo-stp.cfg +- the MSC's point-code -- has to match the PC in osmo-stp.cfg and osmo-msc.cfg +- local+remote IP:port for M3UA -- have to match the IP:ports in osmo-stp.cfg + +The MSC needs to configure: + +- its own point-code -- has to match the PC in osmo-stp.cfg +- the routing key -- has to match the RK assigned to MSC's PC in osmo-stp.cfg +- local+remote IP:port for M3UA -- have to match the IP:ports in osmo-stp.cfg + +The STP needs to configure: + +- all routing keys -- they have to match the RKs used in osmo-bsc.cfg and osmo-msc.cfg +- all point-codes -- they have to match the PC in osmo-bsc.cfg and osmo-msc.cfg +- local+remote IP:port for M3UA -- have to match the IP:ports in osmo-bsc.cfg and osmo-msc.cfg + +.osmo-bsc.cfg +---- +cs7 instance 0 + point-code 1.1.1 + + asp mybsc-0 2905 12905 m3ua + remote-ip 2.2.2.2 + local-ip 1.1.1.1 + sctp-role client + as mybsc0 m3ua + asp mybsc0-0 + routing-key 1 1.1.1 + + sccp-address mymsc + routing-indicator PC + point-code 3.3.3 + +msc 0 + msc-addr mymsc +---- + +.osmo-stp.cfg +---- +cs7 instance 0 + xua rkm routing-key-allocation static-only + listen m3ua 2905 + accept-asp-connections pre-configured + local-ip 2.2.2.2 + + # asp <name> <remote-port> <local-port|0> m3ua + asp mybsc-0 12905 2905 m3ua + remote-ip 1.1.1.1 + local-ip 2.2.2.2 + as mybsc m3ua + asp bsc-0 + routing-key 1 1.1.1 + + asp mymsc-0 32905 2905 m3ua + remote-ip 3.3.3.3 + local-ip 2.2.2.2 + as mymsc m3ua + asp mymsc-0 + routing-key 3 3.3.3 + + route-table system + update route 1.1.1 7.255.7 linkset mybsc + update route 3.3.3 7.255.7 linkset mymsc +---- + +.osmo-msc.cfg +---- +cs7 instance 0 + point-code 3.3.3 + + asp mymsc-0 2905 32905 m3ua + remote-ip 2.2.2.2 + local-ip 3.3.3.3 + sctp-role client + as mymsc0 m3ua + asp mymsc0-0 + routing-key 3 3.3.3 +---- + +For comparison, the same setup with dynamic routing is a lot shorter, especially at osmo-stp.cfg, and there is no need +ty synchronize point-codes and routing keys between STP and \{BSC,MSC}: + +.osmo-bsc.cfg +---- +cs7 instance 0 + point-code 1.1.1 + + asp mybsc-0 2905 0 m3ua + remote-ip 2.2.2.2 + local-ip 1.1.1.1 + sctp-role client + as mybsc0 m3ua + asp mybsc0-0 + + sccp-address mymsc + routing-indicator PC + point-code 3.3.3 + +msc 0 + msc-addr mymsc +---- + +.osmo-stp.cfg +---- +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + listen m3ua 2905 + accept-asp-connections dynamic-permitted + local-ip 2.2.2.2 +---- + +.osmo-msc.cfg +---- +cs7 instance 0 + point-code 3.3.3 + + asp mymsc-0 2905 0 m3ua + remote-ip 2.2.2.2 + local-ip 3.3.3.3 + sctp-role client + as mymsc0 m3ua + asp mymsc0-0 +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 ) Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269/comment/8406bf87_94d7… PS2, Line 9: it is fine for the BTS to ACK : the RSL CONNECT despite later on failing to connect the RSL link > RSL_CONNECT is really just setting the attributes ... and connect happens later on This is an implementation detail, IMO. If you first send an ACK and then fail to connect, how do you indicate connection failure to the BSC? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10df611f0086d34a5482f7c8a79703938313ab3d Gerrit-Change-Number: 32269 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:50:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 ) Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack ...................................................................... Patch Set 2: Code-Review-1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269/comment/e8f16b02_18e5… PS2, Line 9: it is fine for the BTS to ACK : the RSL CONNECT despite later on failing to connect the RSL link Are you really sure? You're saying it's just setting the attributes, but in reality `rx_oml_ipa_rsl_connect()` does call `e1inp_ipa_bts_rsl_connect_n()` and checks the return value. You're also saying that "it can be replaced with SETATTR in the future", but I don't see how given that it's an ip.access specific message and this is what nanoBTS expects. I don't remember all the details, but I think I wrote this testcase looking at how nanoBTS behaves in such situations. Can you re-test and clarify its behavior? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269/comment/db56e5f2_acac… PS2, Line 23: Change-Id: I10df611f0086d34a5482f7c8a79703938313ab3d Related: OS#5964 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I10df611f0086d34a5482f7c8a79703938313ab3d Gerrit-Change-Number: 32269 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 16:40:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: bts-sysmo: Delay marking phy_link as connected until L1 reset + got info
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32272 ) Change subject: bts-sysmo: Delay marking phy_link as connected until L1 reset + got info ...................................................................... bts-sysmo: Delay marking phy_link as connected until L1 reset + got info Better wait until the DSP is reset and all the information is retrieved before telling upper layers that the phy is ready. Keep it in CONNECTING state meanwhile. Change-Id: Ifdc791336fb8efd42f4428893f687093085af129 --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 59a168f..9a0b19f 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1515,6 +1515,8 @@ msgb_free(resp); + phy_link_state_set(trx->pinst->phy_link, PHY_LINK_CONNECTED); + /* FIXME: clock related */ return 0; } @@ -1917,7 +1919,5 @@ hdl = pinst->u.sysmobts.hdl; osmo_strlcpy(bts->sub_model, sysmobts_model(hdl->hw_info.model_nr, hdl->hw_info.trx_nr), sizeof(bts->sub_model)); - phy_link_state_set(plink, PHY_LINK_CONNECTED); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifdc791336fb8efd42f4428893f687093085af129 Gerrit-Change-Number: 32272 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bts[master]: oml: Fix potential null ptr access on trx object
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32268 ) Change subject: oml: Fix potential null ptr access on trx object ...................................................................... oml: Fix potential null ptr access on trx object If the TRX_NR had no matching TRX it would access a NULL pointer trx after failing to resolve it. This commit refactors the code path to only require the trx pointer at the very end, and NACKs the message if TRX fails to be resolved. Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 --- M src/common/oml.c 1 file changed, 38 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/common/oml.c b/src/common/oml.c index 2d6694a..5f9feff 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1521,16 +1521,17 @@ return rc; } -static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, +static int rx_oml_ipa_rsl_connect(struct gsm_bts *bts, struct msgb *msg, const struct tlv_parsed *tp) { - struct e1inp_sign_link *oml_link = trx->bts->oml_link; - uint16_t port = IPA_TCP_PORT_RSL; - const char *trx_name = gsm_trx_name(trx); + struct e1inp_sign_link *oml_link = bts->oml_link; + const struct abis_om_fom_hdr *foh = msgb_l3(msg); + struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + const char *trx_name; struct in_addr in; - int rc; - + uint16_t port = IPA_TCP_PORT_RSL; uint8_t stream_id = 0; + int rc; if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); @@ -1542,17 +1543,31 @@ if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); + if (!trx) { + LOGP(DOML, LOGL_ERROR, "Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x for unknown TRX_NR=%u\n", + inet_ntoa(in), port, stream_id, foh->obj_inst.trx_nr); + rc = NM_NACK_TRXNR_UNKN; + goto tx_ack_nack; + } + + trx_name = gsm_trx_name(trx); + LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", trx_name, inet_ntoa(in), port, stream_id); - if (trx->bts->variant == BTS_OSMO_OMLDUMMY) { + if (bts->variant == BTS_OSMO_OMLDUMMY) { rc = 0; LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in OML-DUMMY!\n", trx_name); } else { trx->rsl_tei = stream_id; rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr); + if (rc < 0) { + LOGP(DOML, LOGL_NOTICE, "%s: Error connecting IPA RSL: %d\n", trx_name, rc); + rc = NM_NACK_CANT_PERFORM; + } } +tx_ack_nack: /* The ACK/NACK is expected to contain all IEs */ if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) /* TV32 */ msgb_tv_fixed_put(msg, NM_ATT_IPACC_DST_IP, sizeof(in), @@ -1562,12 +1577,7 @@ if (!TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) /* TV */ msgb_tv_put(msg, NM_ATT_IPACC_STREAM_ID, stream_id); - if (rc < 0) { - LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc); - return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); - } - - return oml_fom_ack_nack(msg, 0); + return oml_fom_ack_nack(msg, rc); } static int down_mom(struct gsm_bts *bts, struct msgb *msg) @@ -1616,8 +1626,7 @@ switch (foh->msg_type) { case NM_MT_IPACC_RSL_CONNECT: - trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); - ret = rx_oml_ipa_rsl_connect(trx, msg, &tp); + ret = rx_oml_ipa_rsl_connect(bts, msg, &tp); break; case NM_MT_IPACC_SET_ATTR: ret = oml_ipa_set_attr(bts, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 Gerrit-Change-Number: 32268 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: bts-sysmo: Fix pinst->version filled too early
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32270 ) Change subject: bts-sysmo: Fix pinst->version filled too early ...................................................................... bts-sysmo: Fix pinst->version filled too early The fields used to fill in pinst->version are set when info_compl_cb() is called, which happens asynchronously and hence later than when in bts_model_phy_link_open(). Hence, copying the values when in bts_model_phy_link_open() (l1if_open()) makes no sense at all. Fill in pinst->version in info_compl_cb(), just when the layer receives the required information. Related: OS#5978 Change-Id: Ica53a5d852214b24de7f75b08ad7e595ce5236ee --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 24 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 786382c..59a168f 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1474,10 +1474,12 @@ fl1h->hw_info.ver_minor = sic->boardVersion.option; #endif - LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\nn", - sic->dspVersion.major, sic->dspVersion.minor, - sic->dspVersion.build, sic->fpgaVersion.major, - sic->fpgaVersion.minor, sic->fpgaVersion.build); + snprintf(trx->pinst->version, sizeof(trx->pinst->version), "%u.%u dsp %u.%u.%u fpga %u.%u.%u", + fl1h->hw_info.ver_major, fl1h->hw_info.ver_minor, + fl1h->hw_info.dsp_version[0], fl1h->hw_info.dsp_version[1], fl1h->hw_info.dsp_version[2], + fl1h->hw_info.fpga_version[0], fl1h->hw_info.fpga_version[1], fl1h->hw_info.fpga_version[2]); + + LOGP(DL1C, LOGL_INFO, "%s\n", trx->pinst->version); #ifdef HW_SYSMOBTS_V1 if (sic->rfBand.gsm850) @@ -1914,10 +1916,6 @@ hdl = pinst->u.sysmobts.hdl; osmo_strlcpy(bts->sub_model, sysmobts_model(hdl->hw_info.model_nr, hdl->hw_info.trx_nr), sizeof(bts->sub_model)); - snprintf(pinst->version, sizeof(pinst->version), "%u.%u dsp %u.%u.%u fpga %u.%u.%u", - hdl->hw_info.ver_major, hdl->hw_info.ver_minor, - hdl->hw_info.dsp_version[0], hdl->hw_info.dsp_version[1], hdl->hw_info.dsp_version[2], - hdl->hw_info.fpga_version[0], hdl->hw_info.fpga_version[1], hdl->hw_info.fpga_version[2]); phy_link_state_set(plink, PHY_LINK_CONNECTED); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ica53a5d852214b24de7f75b08ad7e595ce5236ee Gerrit-Change-Number: 32270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Ignore SW Activated Reports
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 ) Change subject: bts/oml: Ignore SW Activated Reports ...................................................................... bts/oml: Ignore SW Activated Reports Some components directly report being activated. Let's allow it. This fixes TC_initial_state_reports. Change-Id: I054dc74f60edee027923f03f8e73e56b1dc11a83 --- M bts/BTS_Tests_OML.ttcn 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn index e3099e2..cf88931 100644 --- a/bts/BTS_Tests_OML.ttcn +++ b/bts/BTS_Tests_OML.ttcn @@ -86,6 +86,7 @@ private altstep as_SwAct() runs on BSC_OML_CT { var OML_PDU rx; + [] OML.receive(tr_OML_SwActivatedRep(?, ?)); [] OML.receive(tr_OML_SwActReq(?, ?, ?, ?)) -> value rx { var OML_FOM_ObjectClass obj_class := rx.u.fom.hdr.obj_class; var OML_FOM_ObjectInstance obj_inst := rx.u.fom.hdr.obj_inst; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I054dc74f60edee027923f03f8e73e56b1dc11a83 Gerrit-Change-Number: 32267 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0