[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: falconia, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email ) Change subject: SMS over GSUP: implement forwarding of MO SMS .. Patch Set 2: (1 comment) File src/hlr_sms.c: https://gerrit.osmocom.org/c/osmo-hlr/+/34449/comment/3dc43aba_ca9401c9 PS2, Line 136: char smsc_addr[21]; > libosmocore header addition: […] Ah I thought libsmpp34 was already used but I was probably confused with osmo-msc. Then indeed no need to use it here. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 08:13:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsm/protocol/gsm_04_11.h: add SMSC-address length limit definitions
Attention is currently required from: falconia, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34456?usp=email ) Change subject: gsm/protocol/gsm_04_11.h: add SMSC-address length limit definitions .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34456?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iea5c29909c5be80f81dbbc2873656ff5cf590a5d Gerrit-Change-Number: 34456 Gerrit-PatchSet: 1 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 19 Sep 2023 08:18:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-sgsn[master]: sgsn_rim: forward message based on RIM ROUTING ADDRESS
Attention is currently required from: dexter, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/34122?usp=email ) Change subject: sgsn_rim: forward message based on RIM ROUTING ADDRESS .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/34122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifd2b915ed2f05130cff8ee77714b82005c17de3d Gerrit-Change-Number: 34122 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 08:27:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 08:28:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 5: Code-Review+1 (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/814a012b_64aaa3b1 PS5, Line 35: struct This could be `struct osmo_ipa_msgb_cb _cb`? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 08:33:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 5: -Code-Review (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/c5423780_a2c4b866 PS5, Line 35: struct > This could be `struct osmo_ipa_msgb_cb _cb`? Yeah probably, since this is still only used internally in the macro. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 08:35:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: daniel, dexter, fixeria, laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 5: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/7b1c68c5_1f87f366 PS5, Line 35: struct > Yeah probably, since this is still only used internally in the macro. Not entirely sure I understand... do you mean like in patchset 3? https://gerrit.osmocom.org/c/libosmo-netif/+/34445/3..5/include/osmocom/netif/ipa.h -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 08:54:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 5: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/29f70574_d9cd97c4 PS5, Line 35: struct > Not entirely sure I understand... do you mean like in patchset 3? […] #define OSMO_IPA_MSGB_CB(__msg) (&( \ union { \ unsigned long cb; \ struct osmo_ipa_msgb_cb _cb; \ } \ *)&((__msg)->cb[0])->_cb) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 09:00:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: oml: Store RSL connect related fields in bb_transc
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email ) Change subject: oml: Store RSL connect related fields in bb_transc .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917 Gerrit-Change-Number: 34440 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 09:10:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Move trx->rsl_link to trx->bb_transc.rsl.link
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email ) Change subject: Move trx->rsl_link to trx->bb_transc.rsl.link .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62937cbd81c27274b9f5f70d454d5319a6898c7b Gerrit-Change-Number: 34441 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 09:12:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: nm: delay RSL connect until BBTRANSC object is OPSTARTed
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email ) Change subject: nm: delay RSL connect until BBTRANSC object is OPSTARTed .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0 Gerrit-Change-Number: 34442 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 09:14:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: nm: delay RSL connect until BBTRANSC object is OPSTARTed
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email ) Change subject: nm: delay RSL connect until BBTRANSC object is OPSTARTed .. nm: delay RSL connect until BBTRANSC object is OPSTARTed Have same behavior as nanoBTS. Related: OS#5253 Change-Id: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0 --- M src/common/nm_bb_transc_fsm.c M src/common/oml.c 2 files changed, 28 insertions(+), 12 deletions(-) Approvals: pespin: Verified fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 12493e4..c668eff 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -119,6 +119,7 @@ { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc); + struct gsm_bts *bts = trx->bts; struct nm_fsm_ev_setattr_data *setattr_data; bool phy_state_connected; bool rsl_link_connected; @@ -145,6 +146,19 @@ return; } #endif + /* Connect RSL link: */ + if (bts->variant == BTS_OSMO_OMLDUMMY) { + LOGPFSML(fi, LOGL_NOTICE, "Not connecting RSL in OML-DUMMY!\n"); + } else { + rc = e1inp_ipa_bts_rsl_connect_n(bts->oml_link->ts->line, + bb_transc->rsl.rem_addrstr.ip, + bb_transc->rsl.rem_addrstr.port, trx->nr); + if (rc < 0) { + LOGPFSML(fi, LOGL_NOTICE, "Error connecting IPA RSL: %d\n", rc); + oml_mo_opstart_nack(&bb_transc->mo, NM_NACK_CANT_PERFORM); + return; + } + } bts_model_opstart(trx->bts, &bb_transc->mo, bb_transc); return; case NM_EV_OPSTART_ACK: @@ -170,7 +184,7 @@ } - if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ + if (bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ struct phy_instance *pinst = trx_phy_instance(trx); phy_state_connected = phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED; rsl_link_connected = !!trx->bb_transc.rsl.link; diff --git a/src/common/oml.c b/src/common/oml.c index f78790a..4565e9a 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1512,17 +1512,7 @@ trx_name, bb_transc->rsl.rem_addrstr.ip, bb_transc->rsl.rem_addrstr.port, bb_transc->rsl.tei); - if (bts->variant == BTS_OSMO_OMLDUMMY) { - rc = 0; - LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in OML-DUMMY!\n", trx_name); - } else { - rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, bb_transc->rsl.rem_addrstr.ip, - bb_transc->rsl.rem_addrstr.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; - } - } + rc = 0; tx_ack_nack: /* The ACK/NACK is expected to contain all IEs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0 Gerrit-Change-Number: 34442 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: oml: Store RSL connect related fields in bb_transc
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email ) Change subject: oml: Store RSL connect related fields in bb_transc .. oml: Store RSL connect related fields in bb_transc This is a preparation commit towards delaying connection of RSL tcp socket until the BBTRANSC object is OPSTARTed, as it is the case already in nanoBTS. Related: OS#5253 Change-Id: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917 --- M include/osmo-bts/bts_trx.h M src/common/abis.c M src/common/oml.c M src/common/vty.c 4 files changed, 32 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index 72522eb..3ea017e 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -1,9 +1,15 @@ #pragma once +#include #include struct gsm_bts_bb_trx { struct gsm_abis_mo mo; + /* how do we talk RSL with this TRX? */ + struct { + struct osmo_sockaddr_str rem_addrstr; + uint8_t tei; + } rsl; }; /* One TRX in a BTS */ @@ -17,7 +23,6 @@ /* human readable name / description */ char *description; /* how do we talk RSL with this TRX? */ - uint8_t rsl_tei; struct e1inp_sign_link *rsl_link; /* NM Radio Carrier and Baseband Transciever */ diff --git a/src/common/abis.c b/src/common/abis.c index 10eeaff..9677c1f 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -405,7 +405,7 @@ } e1inp_ts_config_sign(sign_ts, line); trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, - trx, trx->rsl_tei, 0); + trx, trx->bb_transc.rsl.tei, 0); trx_link_estab(trx); return trx->rsl_link; } diff --git a/src/common/oml.c b/src/common/oml.c index 85ec5d7..f78790a 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1478,6 +1478,7 @@ 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); + struct gsm_bts_bb_trx *bb_transc; const char *trx_name; struct in_addr in; uint16_t port = IPA_TCP_PORT_RSL; @@ -1491,6 +1492,7 @@ if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); + if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); @@ -1501,17 +1503,21 @@ goto tx_ack_nack; } - trx_name = gsm_trx_name(trx); + bb_transc = &trx->bb_transc; + osmo_sockaddr_str_from_in_addr(&bb_transc->rsl.rem_addrstr, &in, port); + bb_transc->rsl.tei = stream_id; + 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); +trx_name, bb_transc->rsl.rem_addrstr.ip, bb_transc->rsl.rem_addrstr.port, +bb_transc->rsl.tei); 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); + rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, bb_transc->rsl.rem_addrstr.ip, + bb_transc->rsl.rem_addrstr.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; diff --git a/src/common/vty.c b/src/common/vty.c index 31104c2..47e0ecd 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1662,7 +1662,7 @@ vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); vty_out(vty, " Baseband Transceiver NM State: "); net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); - vty_out(vty, " IPA stream ID: 0x%02x%s", trx->rsl_tei, VTY_NEWLINE); + vty_out(vty, " IPA stream ID: 0x%02x%s", trx->bb_transc.rsl.tei, VTY_NEWLINE); } static inline void print_all_trx(struct vty *vty, const struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia571ec19e9e8f8a6d7c2554642aab0afe1b
[M] Change in osmo-bts[master]: Move trx->rsl_link to trx->bb_transc.rsl.link
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email ) Change subject: Move trx->rsl_link to trx->bb_transc.rsl.link .. Move trx->rsl_link to trx->bb_transc.rsl.link The RSL link is configured/set up by the BBTRANSC NM object, hence move it to the appropiate substruct. Related: OS#5253 Change-Id: I62937cbd81c27274b9f5f70d454d5319a6898c7b --- M include/osmo-bts/bts_trx.h M src/common/abis.c M src/common/nm_bb_transc_fsm.c M src/common/nm_radio_carrier_fsm.c M src/common/rsl.c M src/common/vty.c M src/osmo-bts-trx/trx_vty.c M tests/handover/handover_test.c 8 files changed, 40 insertions(+), 28 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index 3ea017e..a098c3e 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -9,6 +9,7 @@ struct { struct osmo_sockaddr_str rem_addrstr; uint8_t tei; + struct e1inp_sign_link *link; } rsl; }; @@ -22,8 +23,6 @@ uint8_t nr; /* human readable name / description */ char *description; - /* how do we talk RSL with this TRX? */ - struct e1inp_sign_link *rsl_link; /* NM Radio Carrier and Baseband Transciever */ struct gsm_abis_mo mo; diff --git a/src/common/abis.c b/src/common/abis.c index 9677c1f..18e6c63 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -225,9 +225,9 @@ /* Then iterate over the RSL signalling links */ llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->rsl_link) { - e1inp_sign_link_destroy(trx->rsl_link); - trx->rsl_link = NULL; + if (trx->bb_transc.rsl.link) { + e1inp_sign_link_destroy(trx->bb_transc.rsl.link); + trx->bb_transc.rsl.link = NULL; if (trx == trx->bts->c0) load_timer_stop(trx->bts); } else { @@ -364,7 +364,7 @@ /* osmo-bts uses msg->trx internally, but libosmo-abis uses * the signalling link at msg->dst */ - msg->dst = msg->trx->rsl_link; + msg->dst = msg->trx->bb_transc.rsl.link; return abis_sendmsg(msg); } @@ -404,10 +404,10 @@ break; } e1inp_ts_config_sign(sign_ts, line); - trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, - trx, trx->bb_transc.rsl.tei, 0); + trx->bb_transc.rsl.link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, +trx, trx->bb_transc.rsl.tei, 0); trx_link_estab(trx); - return trx->rsl_link; + return trx->bb_transc.rsl.link; } return NULL; } diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 1dd2c85..12493e4 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -173,7 +173,7 @@ if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ struct phy_instance *pinst = trx_phy_instance(trx); phy_state_connected = phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED; - rsl_link_connected = !!trx->rsl_link; + rsl_link_connected = !!trx->bb_transc.rsl.link; } else { phy_state_connected = true; rsl_link_connected = true; diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index 4431eb5..0e37c87 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -153,7 +153,7 @@ if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ struct phy_instance *pinst = trx_phy_instance(trx); phy_state_connected = phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED; - rsl_link_connected = !!trx->rsl_link; + rsl_link_connected = !!trx->bb_transc.rsl.link; } else { phy_state_connected = true; rsl_link_connected = true; diff --git a/src/common/rsl.c b/src/common/rsl.c index 5231765..f11ec0e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2911,7 +2911,7 @@ static char *get_rsl_local_ip(struct gsm_bts_trx *trx) { - struct e1inp_ts *ts = trx->rsl_link->ts; + struct e1inp_ts *ts = trx->bb_transc.rsl.link->ts; struct sockaddr_storage ss; socklen_t sa_len = sizeof(ss); static char hostbuf[256]; @@ -3054,7 +3054,7 @@ * address */ if (connect_ip == 0) {
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, fixeria, laforge. Hello Jenkins Builder, daniel, dexter, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: ipa: Don't break strict aliasing rule .. ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, fixeria, laforge. Hello Jenkins Builder, daniel, dexter, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ipa: Don't break strict aliasing rule .. ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: daniel, dexter, fixeria, laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 7: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/2b941b13_bef9707e PS5, Line 35: struct > #define OSMO_IPA_MSGB_CB(__msg) (&( \ […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 10:33:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsmtap.h: Add definitions for ISDN PPP sub-type
Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email ) Change subject: gsmtap.h: Add definitions for ISDN PPP sub-type .. Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: as there is both synchronous PPP over ISDN (the one you're describing here, where the HDLC around the PPP is directly in the B channel) as well as asynchronous PPP over ISDN (e.g. inside X.75), it might be best to indicate which is being talked about here. Maybe even reference https://www.rfc-editor.org/rfc/rfc1618.html ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I17137167b2c74b6c5e53459743b6e140fc1a4386 Gerrit-Change-Number: 34457 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: manawyrm Gerrit-Comment-Date: Tue, 19 Sep 2023 10:34:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. ASCI: Ignore LAPD frames from MS, while the uplink is not active Do not forward any message from the MS to LAPD while the uplink is not active. If the MS did not recognize (fast enough) that the uplink is free, it may continue to transmit LAPD frames. A reaction of LAPD is to these frames is not desired and not required. If we react on them, we will transmit LAPD response frames to the MS and this stops us from sending UPLINK FREE messages. Note: UPLINK FREE messages are repeated automatically until a different message is transmitted. Related: OS#5781 Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 --- M src/common/l1sap.c 1 file changed, 33 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/34423/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34423 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: daniel, dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 10:37:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: hnbgw_cn: Remove assert hit due to wrong assumption
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email ) Change subject: hnbgw_cn: Remove assert hit due to wrong assumption .. hnbgw_cn: Remove assert hit due to wrong assumption The HNBGW in correctly assumes that no ss7->sccp instance is allocated until the same function calls osmo_sccp_simple_client_on_ss7_id(). This assumption is wrong, since ss7 may create its own ss7->sccp instance internally as a result of vty configuration, eg. when "sccp max-optional-data 124" is placed in osmo-hnbgw.cfg file. In this scenario, simply removing the assert is enough, since osmo_sccp_simple_client_on_ss7_id() just calls osmo_ss7_ensure_sccp(), the same that the libmoso-sccp code called to allocate the pointer. Related: SYS#6566 Fixes: f3caea850bc892551cd09bbaf49f798c172590c4 Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/58/34458/1 diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index b95cf28..31bf192 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -849,11 +849,7 @@ return 0; } /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no SCCP instance yet\n", ss7->cfg.id); - - /* All SCCP instances should originate from this function. So if there is no hnbgw_sccp_user for the cs7 -* instance, then the cs7 instance should not have an SCCP instance yet. */ - OSMO_ASSERT(!ss7->sccp); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", ss7->cfg.id); } /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c Gerrit-Change-Number: 34458 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: arehbein, daniel, dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 10:39:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
Attention is currently required from: fixeria. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email ) Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. Patch Set 2: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/34423/comment/7d01b0fe_a6b3a02e PS1, Line 1814: rsl_chan_rt_is_asci > I am wondering if the new check you added can be integrated here as follows: > […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34423 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 10:40:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: falconia, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing .. Patch Set 2: (1 comment) File include/osmocom/hlr/hlr_sms.h: https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/e545f39c_99bae55a PS2, Line 17: void smsc_del(struct hlr_smsc *smsc); > Removing from llist is in general fine instead the _free function too, you > can see plenty of example […] I think we need to differntiate between a) a pure "foo_free" function which primarily is a about releasing memory b) some function that does more additional work, where e.g. a route is added or deleted. in that case add+del is fine. Now the problem starts to be problematic if we have "alloc" on the creation side and "del" on the release side. That really just looks wrong. so either it's add+del, or it's alloc+free. strictly speaking, an "alloc" function should not add it to a list, and a free function shouldn'd delete it. So either you have add/del doing the alloc/free automagically, or you have orthogonal alloc -> add -> del -> free functions. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: falconia Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 10:40:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsm/protocol/gsm_04_11.h: add SMSC-address length limit definitions
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34456?usp=email ) Change subject: gsm/protocol/gsm_04_11.h: add SMSC-address length limit definitions .. gsm/protocol/gsm_04_11.h: add SMSC-address length limit definitions Change-Id: Iea5c29909c5be80f81dbbc2873656ff5cf590a5d --- M include/osmocom/gsm/protocol/gsm_04_11.h 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_04_11.h b/include/osmocom/gsm/protocol/gsm_04_11.h index 31f25ac..9054302 100644 --- a/include/osmocom/gsm/protocol/gsm_04_11.h +++ b/include/osmocom/gsm/protocol/gsm_04_11.h @@ -62,6 +62,16 @@ GSM411_IE_RP_CAUSE = 0x42, /* 8.2.5.4 */ }; +/* Sections 8.2.5.1 and 8.2.5.2 set limits on the length of an SMSC-address. + * The spec states these limits in terms of min and max values of the length + * octet in type 4 IEs SM-RP-OA and SM-RP-DA; these IE length limits translate + * into a minimum of 1 digit and a maximum of 20 digits. + */ +#define GSM411_SMSC_ADDR_MIN_OCTETS2 +#define GSM411_SMSC_ADDR_MAX_OCTETS11 +#define GSM411_SMSC_ADDR_MIN_DIGITS1 +#define GSM411_SMSC_ADDR_MAX_DIGITS20 + /* Chapter 8.2.5.4 Table 8.4 */ enum gsm411_rp_cause { /* valid only for MO */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34456?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iea5c29909c5be80f81dbbc2873656ff5cf590a5d Gerrit-Change-Number: 34456 Gerrit-PatchSet: 1 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: falconia, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email ) Change subject: SMS over GSUP: implement forwarding of MO SMS .. Patch Set 2: Code-Review+1 (1 comment) File src/hlr_sms.c: https://gerrit.osmocom.org/c/osmo-hlr/+/34449/comment/674a918b_92afd891 PS2, Line 136: char smsc_addr[21]; > Ah I thought libsmpp34 was already used but I was probably confused with > osmo-msc. […] I just merged the libosmocore header addition. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 10:42:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MT SMS
Attention is currently required from: falconia. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email ) Change subject: SMS over GSUP: implement forwarding of MT SMS .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b Gerrit-Change-Number: 34450 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Comment-Date: Tue, 19 Sep 2023 10:42:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hlr[master]: SMS over GSUP: handle READY-FOR-SM.req from MSCs
Attention is currently required from: falconia. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email ) Change subject: SMS over GSUP: handle READY-FOR-SM.req from MSCs .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 Gerrit-Change-Number: 34451 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Comment-Date: Tue, 19 Sep 2023 10:42:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email ) Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. Patch Set 2: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/34423/comment/b7791f22_2bac9f9e PS2, Line 12: these frames is not desired and not required. If we react on them, we "A reaction of LAPD is to these frames" ^ makes no sense, please rephrase. File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/34423/comment/bafeba6d_b2281148 PS2, Line 1817: /* Do not forward any message from the MS to LAPD while the uplink is not This "MS to LAPD" direction description is not really clear to me. Can you find a better term or decription? https://gerrit.osmocom.org/c/osmo-bts/+/34423/comment/7b13aadc_c0ef7cd5 PS2, Line 1820: * these frames is not desired and not required. If we react on them, we "A reaction of LAPD is to these frames" ^ again, makes no sense. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34423 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 10:42:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: falconia, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing .. Patch Set 2: (1 comment) File include/osmocom/hlr/hlr_sms.h: https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/07b919da_41831ab4 PS2, Line 17: void smsc_del(struct hlr_smsc *smsc); > I think we need to differntiate between […] Regarding "adding object to llist during alloc", I think it makes sense to do so and it's useful/simplifies code if the object is expected to be in the during its entire lifespan. So if that's the case, having llist_add in alloc and llist_del in _free it's fine to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 10:45:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: PCU_Tests: use PCUIF v.11 exclusively
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?usp=email ) Change subject: PCU_Tests: use PCUIF v.11 exclusively .. Patch Set 7: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?usp=email 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: I6c4042f2224cd48aecc1b1499226f7d23caddd4f Gerrit-Change-Number: 33796 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 11:11:19 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: PCU_Tests: use PCUIF v.11 exclusively
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?usp=email ) Change subject: PCU_Tests: use PCUIF v.11 exclusively .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?usp=email 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: I6c4042f2224cd48aecc1b1499226f7d23caddd4f Gerrit-Change-Number: 33796 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 11:21:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsmtap.h: Add definitions for ISDN PPP sub-type
Attention is currently required from: laforge. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email ) Change subject: gsmtap.h: Add definitions for ISDN PPP sub-type .. Patch Set 2: (1 comment) Patchset: PS2: > as there is both synchronous PPP over ISDN (the one you're describing here, > where the HDLC around th […] the only relevant difference in the protocol (after the framing) seems to be that the async mode can also have an asyncmap (listing a number of bytes which must not be sent over the line, like XON/XOFF). It might make sense to indicate here that it's meant for Synchronous ISDN, but all of the "specialties" of RFC1618 (framing, NRZ vs. NRZI, etc.) are already gone by this point (because these frames only contain the payload). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I17137167b2c74b6c5e53459743b6e140fc1a4386 Gerrit-Change-Number: 34457 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Tue, 19 Sep 2023 11:49:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: PCU_Tests: use PCUIF v.11 exclusively
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33796?usp=email ) Change subject: PCU_Tests: use PCUIF v.11 exclusively .. PCU_Tests: use PCUIF v.11 exclusively OsmoPCU has support for PCUIF v.11 for quite some time now. Let's upgrade the testsuite as well. Related: OS#5927 Change-Id: I6c4042f2224cd48aecc1b1499226f7d23caddd4f --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 44 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 4b8ca5b..983ae8f 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -628,7 +628,7 @@ ms.ul_tbf := f_ultbf_new_from_rr_imm_ass(rr_imm_ass); } -function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH, +function f_ms_exp_dl_tbf_ass_ccch(inout GprsMS ms, template PCUIF_Sapi sapi := PCU_IF_SAPI_PCH_2, template GsmRrMessage t_imm_ass := tr_IMM_TBF_ASS(true, ?, ?), template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT { @@ -882,19 +882,17 @@ /* This function can be used to send DATA.cnf in response to the IUT originated DATA.req. */ function f_pcuif_tx_data_cnf(in BTS_CCCH_Block data_msg) runs on MS_BTS_IFACE_CT { - var PCUIF_Message pcu_msg_cnf := { - msg_type := PCU_IF_MSG_DATA_CNF, - bts_nr := data_msg.bts_nr, - spare := ''O, - u := { data_cnf := data_msg.raw } +var PCUIF_data_cnf cnf := { + sapi := data_msg.raw.sapi, + msg_id := data_msg.msg_id }; - /* PCU wants DATA.cnf containing basically everything that was in DATA.req, -* but PCU_IF_SAPI_PCH is a special case - paging group shall be excluded. */ - if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) { - pcu_msg_cnf.u.data_cnf.data := substr(data_msg.raw.data, 3, - data_msg.raw.len - 3); - } + var PCUIF_Message pcu_msg_cnf := { + msg_type := PCU_IF_MSG_DATA_CNF_2, + bts_nr := data_msg.bts_nr, + spare := ''O, + u := { data_cnf2 := cnf} + }; BTS.send(pcu_msg_cnf); } @@ -1061,7 +1059,7 @@ } } -altstep as_ms_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, +altstep as_ms_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH_2, template GsmRrMessage t_imm_ass := ?, template (present) TsTrxBtsNum nr := ts_TsTrxBtsNum, out GsmRrMessage rr_imm_ass) @@ -1073,14 +1071,12 @@ rr_imm_ass := data_msg.rr_msg; log("Rx Immediate Assignment: ", rr_imm_ass); /* Send DATA.cnf back to the IUT (only needed for PCH) */ - if (data_msg.raw.sapi == PCU_IF_SAPI_PCH) { - f_pcuif_tx_data_cnf(data_msg); - } + f_pcuif_tx_data_cnf(data_msg); setverdict(pass); } } -function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH, +function f_pcuif_rx_imm_ass(template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH_2, template GsmRrMessage t_imm_ass := ?, template (present) TsTrxBtsNum nr := tr_TsTrxBtsNum) runs on MS_BTS_IFACE_CT return GsmRrMessage { @@ -1131,7 +1127,7 @@ if (is_11bit != 0) { ra := 127; } /* Expect Immediate (TBF) Assignment on the same TS/TRX/BTS */ - return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH, tr_IMM_TBF_ASS(false, ra, fn), nr); + return f_pcuif_rx_imm_ass(PCU_IF_SAPI_AGCH_2, tr_IMM_TBF_ASS(false, ra, fn), nr); } /* Enqueue DATA.ind (both TDMA frame and block numbers to be patched) */ @@ -1174,7 +1170,7 @@ var BTS_CCCH_Block data_msg; BTS.receive(tr_PCUIF_DATA_RR(nr.bts_nr, -tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH), +tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PCH_2), tr_PAG_REQ1(tr_MI_LV(mi1 -> value data_msg; rr_pag_req1 := data_msg.rr_msg; log("Rx Paging Request Type1: ", rr_pag_req1); diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index d844736..9829edb 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -4858,7 +4858,22 @@ /* SGSN sends some DL data, PCU will page on CCCH (PCH) */ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, f_rnd_octstring(12))); - f_ms_exp_dl_tbf_ass_ccch(ms); + + /* The PCU will send an IMMEDIATE ASSIGNMENT message on the AGCH. It +* should be noted that IMMEDIATE ASSIGNMENT messages for DL TBFs are +
[S] Change in osmo-hnbgw[master]: hnbgw_cn: Remove assert hit due to wrong assumption
Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email ) Change subject: hnbgw_cn: Remove assert hit due to wrong assumption .. Patch Set 1: Verified+1 (1 comment) Patchset: PS1: I tested with a sample config file that this patch fixes the crash due to assert being hit. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c Gerrit-Change-Number: 34458 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 13:54:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-hnbgw[master]: hnbgw_cn: Remove assert hit due to wrong assumption
Attention is currently required from: laforge, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email ) Change subject: hnbgw_cn: Remove assert hit due to wrong assumption .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c Gerrit-Change-Number: 34458 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 14:04:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email to look at the new patch set (#2). Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. oml: ipacc: add missing is_ipa_abisip_bts() checks These functions are called from a signal handler (SS_NM), and the signal itself is sent from the generic OML logic whenever the Software Activated Report is received from some BTS, which is not necessarily a nanoBTS or osmo-bts. It would be nice if we could check the BTS type once in the signal handler, but the signal data is not always the same and depends on the signal type, so unfortunately it's not possible. Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/34454/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email ) Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. Patch Set 2: (1 comment) Patchset: PS1: > why are these checks being added? See the updated commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 14:20:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email ) Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. Patch Set 2: (1 comment) Patchset: PS2: My point asking was/is: why do we care about the type of BTS in use? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 14:23:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: abis_nm: fix bts->nr vs bts->bts_nr
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34443?usp=email ) Change subject: abis_nm: fix bts->nr vs bts->bts_nr .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I99d9c72752e55c4553e2e9c60df5caa8343b7be0 Gerrit-Change-Number: 34443 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 14:24:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email ) Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. Patch Set 2: (1 comment) Patchset: PS2: > My point asking was/is: why do we care about the type of BTS in use? Because one can have multiple BTS configured in osmo-bsc.cfg, and they can be of different types (this is what you're doing, IIRC). I know that other BTS models use their own A-bis/OML dialects or even completely different protocols, but the point still applies: this file is called `bts_ipaccess_nanobts.c` and among with the general logic defines handling of ip.access specific MOs and protocol extensions. This is why we already doing this check here in this file, but so far not in all functions. Does that make sense for you? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 14:32:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email ) Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: > Because one can have multiple BTS configured in osmo-bsc. […] ack. I don't really like either adding those checks in all functions, but I see your point and why you did it like that. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 14:51:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email ) Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 15:12:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: oml: ipacc: add missing is_ipa_abisip_bts() checks
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email ) Change subject: oml: ipacc: add missing is_ipa_abisip_bts() checks .. oml: ipacc: add missing is_ipa_abisip_bts() checks These functions are called from a signal handler (SS_NM), and the signal itself is sent from the generic OML logic whenever the Software Activated Report is received from some BTS, which is not necessarily a nanoBTS or osmo-bts. It would be nice if we could check the BTS type once in the signal handler, but the signal data is not always the same and depends on the signal type, so unfortunately it's not possible. Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 42 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 24966a7..d99489b 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -235,6 +235,9 @@ struct gsm_bts *bts = sign_link->trx->bts; struct gsm_abis_mo *mo; + if (!is_ipa_abisip_bts(bts)) + return; + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); if (mo == NULL) LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART ACK for non-existent MO\n"); @@ -249,6 +252,9 @@ struct gsm_bts *bts = sign_link->trx->bts; struct gsm_abis_mo *mo; + if (!is_ipa_abisip_bts(bts)) + return; + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); if (mo == NULL) LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART NACK for non-existent MO\n"); @@ -263,6 +269,9 @@ struct gsm_bts *bts = sign_link->trx->bts; struct gsm_abis_mo *mo; + if (!is_ipa_abisip_bts(bts)) + return; + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); if (mo == NULL) LOGPFOH(DNM, LOGL_ERROR, foh, "Rx Get Attribute Report for non-existent MO\n"); @@ -276,6 +285,9 @@ struct e1inp_sign_link *sign_link = oml_msg->dst; struct gsm_bts *bts = sign_link->trx->bts; + if (!is_ipa_abisip_bts(bts)) + return; + if (foh->obj_class != NM_OC_BTS) { LOG_BTS(bts, DNM, LOGL_ERROR, "Set BTS Attr Ack received on non BTS object!\n"); return; @@ -289,8 +301,12 @@ struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; struct gsm_bts *bts = sign_link->trx->bts; - struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + struct gsm_bts_trx *trx; + if (!is_ipa_abisip_bts(bts)) + return; + + trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); if (!trx || foh->obj_class != NM_OC_RADIO_CARRIER) { LOGPFOH(DNM, LOGL_ERROR, foh, "Set Radio Carrier Attr Ack received on non Radio Carrier object!\n"); return; @@ -301,8 +317,14 @@ static void nm_rx_set_chan_attr_ack(struct msgb *oml_msg) { struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); - struct gsm_bts_trx_ts *ts = abis_nm_get_ts(oml_msg); + struct e1inp_sign_link *sign_link = oml_msg->dst; + struct gsm_bts *bts = sign_link->trx->bts; + struct gsm_bts_trx_ts *ts; + if (!is_ipa_abisip_bts(bts)) + return; + + ts = abis_nm_get_ts(oml_msg); if (!ts || foh->obj_class != NM_OC_CHANNEL) { LOGPFOH(DNM, LOGL_ERROR, foh, "Set Channel Attr Ack received on non Radio Channel object!\n"); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34454?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I088ff75f2048e54e4bfd926a79c1dcf27b4fb3a4 Gerrit-Change-Number: 34454 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bsc[master]: abis_nm: fix bts->nr vs bts->bts_nr
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34443?usp=email ) Change subject: abis_nm: fix bts->nr vs bts->bts_nr .. abis_nm: fix bts->nr vs bts->bts_nr Using bts->nr on the wire is wrong because: * bts->nr is a BTS number in the BSC's config file, * bts->bts_nr is a BTS number within the SITE-MANAGER MO. The problem does not show up if there exists only one BTS node in osmo-bsc.cfg. Otherwise, the Software Load and BTS Restart procedures are broken for nanoBTS. Change-Id: I99d9c72752e55c4553e2e9c60df5caa8343b7be0 --- M src/osmo-bsc/abis_nm.c 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 90b28eb..81a0272 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -1693,7 +1693,7 @@ break; case GSM_BTS_TYPE_NANOBTS: sw->obj_class = NM_OC_BASEB_TRANSC; - sw->obj_instance[0] = sw->bts->nr; + sw->obj_instance[0] = sw->bts->bts_nr; sw->obj_instance[1] = sw->trx_nr; sw->obj_instance[2] = 0xff; break; @@ -3102,7 +3102,7 @@ oh = (struct abis_om_hdr *) msgb_put(msg, ABIS_OM_FOM_HDR_SIZE); fill_om_fom_hdr(oh, 0, NM_MT_IPACC_RESTART, NM_OC_BASEB_TRANSC, - trx->bts->nr, trx->nr, 0xff); + trx->bts->bts_nr, trx->nr, 0xff); return abis_nm_sendmsg_direct(trx->bts, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I99d9c72752e55c4553e2e9c60df5caa8343b7be0 Gerrit-Change-Number: 34443 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: falconia, fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: SMS over GSUP: implement forwarding of MO SMS .. SMS over GSUP: implement forwarding of MO SMS MO-forwardSM.req messages are now forwarded to a connected SMSC based on the SMSC address (SM-RP-DA) in the MO SM and the vty-defined mapping from SMSC numeric addresses to IPA names. Related: OS#6135 Depends: Iea5c29909c5be80f81dbbc2873656ff5cf590a5d (libosmocore) Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 --- M TODO-RELEASE M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 4 files changed, 111 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/34449/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MT SMS
Attention is currently required from: falconia. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SMS over GSUP: implement forwarding of MT SMS .. SMS over GSUP: implement forwarding of MT SMS When an SMSC tries to deliver an SM to a subscriber, it will send us an MT-forwardSM.req GSUP message. We look up the subscriber by IMSI and see if they are attached to a VLR. If the subscriber is attached, we forward the message to the MSC/VLR, otherwise return an error to the SMSC. Related: OS#6135 Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/50/34450/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib3551bf7839690606c677461758c5cfef5f0aa7b Gerrit-Change-Number: 34450 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-MessageType: newpatchset
[M] Change in osmo-hlr[master]: SMS over GSUP: handle READY-FOR-SM.req from MSCs
Attention is currently required from: falconia. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: SMS over GSUP: handle READY-FOR-SM.req from MSCs .. SMS over GSUP: handle READY-FOR-SM.req from MSCs When an MS indicates that it is ready to receive MT SMS, the MSC will send us a READY-FOR-SM.req message. Handle it by sending copies of the same message to all connected SMSCs and returning OK result to the MS that indicates its ready status. Related: OS#6135 Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 --- M include/osmocom/hlr/hlr_sms.h M src/hlr.c M src/hlr_sms.c 3 files changed, 75 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/51/34451/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I731545a3a0d0804289e24a7769e13bfd3f645132 Gerrit-Change-Number: 34451 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-MessageType: newpatchset
[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: fixeria, laforge, pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email ) Change subject: SMS over GSUP: implement forwarding of MO SMS .. Patch Set 3: (1 comment) File src/hlr_sms.c: https://gerrit.osmocom.org/c/osmo-hlr/+/34449/comment/18dbc193_b49a3bba PS2, Line 136: char smsc_addr[21]; > I just merged the libosmocore header addition. The new version of the present patch has no more hard-coded numbers - instead it uses the definitions that were added to . -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 17:23:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-hlr[master]: SMS over GSUP: implement vty config of SMSC routing
Attention is currently required from: fixeria, laforge, pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email ) Change subject: SMS over GSUP: implement vty config of SMSC routing .. Patch Set 2: (1 comment) File include/osmocom/hlr/hlr_sms.h: https://gerrit.osmocom.org/c/osmo-hlr/+/34448/comment/db52a7d7_b6671ad9 PS2, Line 17: void smsc_del(struct hlr_smsc *smsc); > Regarding "adding object to llist during alloc", I think it makes sense to do > so and it's useful/sim […] @laforge says that alloc+del is inconsistent, instead it should be either alloc+free or add+del - and I agree. In the present case of HLR configs for EUSE/USSD and SMSC entities and routing, it looks like I need to do the following sequence: 1) mark the present patch as WIP; 2) prepare a separate patch changing the existing EUSE/USSD code to the agreed-upon convention, and get that patch through review to merge; 3) revisit the present patch and make it the same as the newly fixed EUSE/USSD. What I need now is an agreement from @laforge and @pespin on which convention I should use in the present cases of EUSE/USSD and SMSC: alloc+free or add+del? -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I1624dcd9d22b4efca965ccdd1c74f0063a94a33c Gerrit-Change-Number: 34448 Gerrit-PatchSet: 2 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 19 Sep 2023 17:32:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-hlr[master]: SMS over GSUP: implement forwarding of MO SMS
Attention is currently required from: falconia, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email ) Change subject: SMS over GSUP: implement forwarding of MO SMS .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/34449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iaad4531922c41583d261c79f42561a1bdbe03521 Gerrit-Change-Number: 34449 Gerrit-PatchSet: 3 Gerrit-Owner: falconia Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: falconia Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 19 Sep 2023 18:28:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
Attention is currently required from: daniel, dexter, fixeria. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. Patch Set 7: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/5d2d1557_f9b81eda PS2, Line 26: #warning "OSMO_IPA_MSGB_CB breaks the strict aliasing rule. Don't use unless -fno-strict-aliasing flag is enabled!" > I'm not sure if getting no warning from gcc is always equivalent with gcc not > making use of, say str […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 18:41:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule
arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule .. ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 30 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h index 1923253..7826895 100644 --- a/include/osmocom/netif/ipa.h +++ b/include/osmocom/netif/ipa.h @@ -23,7 +23,19 @@ uint8_t proto_ext; } __attribute__ ((packed)); -#define OSMO_IPA_MSGB_CB(__msg)((struct osmo_ipa_msgb_cb *)&((__msg)->cb[0])) + +/* We don't just cast to 'struct osmo_ipa_msgb_cb *', because that would + * break the strict aliasing rule. Casting to a reference to a union with + * a compatible struct member seems to be allowed, though, see: + * N1570 Committee Draft — April 12, 2011 ISO/IEC 9899:201x, + * Section 6.5, §7 */ +#define OSMO_IPA_MSGB_CB(__msg)(&((( \ + union { \ + unsigned long cb; \ + struct osmo_ipa_msgb_cb _cb; \ + } \ + *)&((__msg)->cb[0]))->_cb)) + #define osmo_ipa_msgb_cb_proto(__x)OSMO_IPA_MSGB_CB(__x)->proto #define osmo_ipa_msgb_cb_proto_ext(__x)OSMO_IPA_MSGB_CB(__x)->proto_ext -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in libosmocore[master]: write_queue: Enable updating max_length field
Attention is currently required from: dexter, fixeria, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/3?usp=email ) Change subject: write_queue: Enable updating max_length field .. Patch Set 5: Code-Review+2 (2 comments) File src/core/write_queue.c: https://gerrit.osmocom.org/c/libosmocore/+/3/comment/923878c4_ec8e962b PS4, Line 153: * \returns Number of messages dropped. > I would prefer to leave it like this, if that's alright. […] Done https://gerrit.osmocom.org/c/libosmocore/+/3/comment/da14a911_3835276a PS4, Line 165: dropped_msgs++; > It's not going to work if you do this after the while-loop, because the > `queue->current_length` woul […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/3?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 3 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 19 Sep 2023 18:45:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: arehbein Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in libosmocore[master]: write_queue: Enable updating max_length field
arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/3?usp=email ) Change subject: write_queue: Enable updating max_length field .. write_queue: Enable updating max_length field Dequeue and free any excess messages, in case the new queue length is shorter than the old. Related: OS#5774 Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 --- M include/osmocom/core/write_queue.h M src/core/libosmocore.map M src/core/write_queue.c M tests/write_queue/wqueue_test.c 4 files changed, 87 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve arehbein: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 6cb0a6b..fe76282 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -50,6 +50,7 @@ void osmo_wqueue_clear(struct osmo_wqueue *queue); int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data); +size_t osmo_wqueue_set_maxlen(struct osmo_wqueue *queue, unsigned int len); int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what); /*! @} */ diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index c0e164b..30814c3 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -565,6 +565,7 @@ osmo_wqueue_clear; osmo_wqueue_enqueue; osmo_wqueue_enqueue_quiet; +osmo_wqueue_set_maxlen; osmo_wqueue_init; rate_ctr_add; rate_ctr_difference; diff --git a/src/core/write_queue.c b/src/core/write_queue.c index 884cebd..ffa7704 100644 --- a/src/core/write_queue.c +++ b/src/core/write_queue.c @@ -147,4 +147,24 @@ queue->bfd.when &= ~OSMO_FD_WRITE; } +/* Update write queue length & drop excess messages. + * \param[in] queue linked list header of message queue + * \param[in] len new max. wqueue length + * \returns Number of messages dropped. + * + * Messages beyond the new maximum message queue size will be dropped. + */ +size_t osmo_wqueue_set_maxlen(struct osmo_wqueue *queue, unsigned int len) +{ + size_t dropped_msgs = 0; + struct msgb *msg; + queue->max_length = len; + while (queue->current_length > queue->max_length) { + msg = msgb_dequeue_count(&queue->msg_queue, &queue->current_length); + msgb_free(msg); + dropped_msgs++; + } + return dropped_msgs; +} + /*! @} */ diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c index 3823ef5..d4476f1 100644 --- a/tests/write_queue/wqueue_test.c +++ b/tests/write_queue/wqueue_test.c @@ -1,3 +1,14 @@ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH. + * Authors: Holger Hans Peter Freyther + * Alexander Rehbein + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + #include #include #include @@ -15,6 +26,7 @@ struct msgb *msg; struct osmo_wqueue wqueue; int rc; + size_t dropped_msgs; osmo_wqueue_init(&wqueue, 0); OSMO_ASSERT(wqueue.max_length == 0); @@ -63,6 +75,46 @@ OSMO_ASSERT(wqueue.current_length == 2); msgb_free(msg); osmo_wqueue_clear(&wqueue); + + /* Update limit */ + OSMO_ASSERT(osmo_wqueue_set_maxlen(&wqueue, 5) == 0); + OSMO_ASSERT(osmo_wqueue_set_maxlen(&wqueue, 1) == 0); + OSMO_ASSERT(osmo_wqueue_set_maxlen(&wqueue, 4) == 0); + + /* Add three, update limit to 1 */ + OSMO_ASSERT(wqueue.max_length == 4); + msg = msgb_alloc(4096, "msg6"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(wqueue.current_length == 1); + msg = msgb_alloc(4096, "msg7"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(wqueue.current_length == 2); + msg = msgb_alloc(4096, "msg8"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(wqueue.current_length == 3); + dropped_msgs = osmo_wqueue_set_maxlen(&wqueue, 1); + OSMO_ASSERT(dropped_msgs == 2); + osmo_wqueue_clear(&wqueue); + + /* Add three, reduce limit to 3 from 6 */ + OSMO_ASSERT(osmo_wqueue_set_maxlen(&wqueue, 6) == 0); + OSMO_ASSERT(wqueue.max_length == 6); + msg = msgb_alloc(4096, "msg9"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(wqueue.current_length == 1); + msg = msgb_alloc(4096, "msg10"); + rc = osmo_wqueue_enqueue(&wqueue, msg); + OSMO_ASSERT(rc == 0); + OSMO_ASSERT(wqueue.current_lengt
[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
Attention is currently required from: daniel, fixeria, laforge, osmith. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA .. Patch Set 21: (1 comment) Patchset: PS21: > Patch to take care of type punning: https://gerrit.osmocom. […] The patch for fixing the aliasing problem has been merged. Hopefully, this Heisenbug here has been taken care of with that. So, as Daniel has also previously suggested, I would say let's get this patch merged and if we should encounter the timestamp issue again (if the issue should persist, it would pop up every now and then, but not on each build), then we can save the build binary `libosmo-netif.git:tests/stream/stream_test` from the failed Jenkins build (couldn't do that for the Jenkins build triggered by Gerrit patches, because it doesn't keep these build files) and investigate, if we really want to get into that again. Or we can remove timestamps from the test. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-CC: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 19 Sep 2023 18:54:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: arehbein Comment-In-Reply-To: daniel Gerrit-MessageType: comment