May 2022 - gerrit-log - lists.osmocom.org

Change in libosmocore[master]: coding: do not reset codec ID on receipt of DTX frames

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28175 ) Change subject: coding: do not reset codec ID on receipt of DTX frames ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic4edbb8ab873fe0bdd69a8710803628bc4f447d0 Gerrit-Change-Number: 28175 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 09:39:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 ) Change subject: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: I've read through the conversation... > This looks like a similar issue to what I encountered before. If so the race is most likely that the f_IPA_send and the second f_vty_config2 have arrived in the same main loop iteration in the stp and the config change is being handled before the data is forwarded. This sounds plausible to me, and that's how it is is implemented now. Therefore +1. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 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: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 Gerrit-Change-Number: 28131 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 09:34:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-mgw[master]: IuUP: Support RFCI ID != RFCI Index

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/28183 ) Change subject: IuUP: Support RFCI ID != RFCI Index ...................................................................... IuUP: Support RFCI ID != RFCI Index The initially merged IuUP API and implementation in libosmocore assumed that RFCI with ID was always in the position of its ID inside the list of RFCIs. This was the case for messages sent by ip.access nano3g as well as our own osmocom implementation. However it was noticed that other nodes from other vendors actually use other order, as allowed by the IuUP message format. Hence, we need to break the assumption and provide explicit ID information in the list. NOTICE: This commit breaks API and ABI compatibility with older versions of libosmogsm. Related: SYS#5969 Depends: libosmocore.git Change-Id Ib21cee2e30bf83dff4e167f79541796007af9845 Change-Id: I40ebf36ad37f5196751caf2297a340e538ad28bc --- M TODO-RELEASE M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_iuup.c 3 files changed, 42 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/28183/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index c5a3b36..5aef211 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,3 +24,4 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line +libosmogsm >1.6.0 API breakage in IuUP (libosmocore.git Ib21cee2e30bf83dff4e167f79541796007af9845) diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 5ba6836..7338027 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -98,7 +98,7 @@ struct { struct osmo_iuup_instance *iui; bool active_init; /* true: Send IuUP Init */ - int rfci_idx_no_data; /* Index for RFCI NO_DATA (-1 if not available) */ + int rfci_id_no_data; /* RFCI Id for RFCI NO_DATA (-1 if not available) */ bool configured; struct osmo_iuup_rnl_prim *init_ind; } iuup; diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 5af481d..1fea392 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -64,19 +64,29 @@ static int _find_rfci_no_data(struct osmo_iuup_rnl_prim *irp) { int i; + uint8_t rfci_cnt = 0; /* Find RFCI containing NO_DATA: */ - for (i = 0; i < irp->u.status.u.initialization.num_rfci; i++) { + for (i = 0; i < ARRAY_SIZE(irp->u.status.u.initialization.rfci); i++) { + struct osmo_iuup_rfci *rfci = &irp->u.status.u.initialization.rfci[i]; int j; - bool is_no_data = true; + bool is_no_data; + if (!rfci->used) + continue; + rfci_cnt++; + + is_no_data = true; for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) { - if (irp->u.status.u.initialization.subflow_sizes[i][j]) { + if (rfci->subflow_sizes[j]) { is_no_data = false; break; } } - if (is_no_data) { - return i; - } + if (is_no_data) + return rfci->id; + + /* early loop termination: */ + if (rfci_cnt == irp->u.status.u.initialization.num_subflows) + break; } return -1; } @@ -85,20 +95,30 @@ static int8_t _conn_iuup_amr_ft_2_rfci(struct mgcp_conn_rtp *conn_rtp, uint8_t ft) { int8_t i; + uint8_t rfci_cnt = 0; unsigned match_bytes = (unsigned)osmo_amr_bytes(ft); struct osmo_iuup_rnl_prim *irp = conn_rtp->iuup.init_ind; OSMO_ASSERT(irp); /* TODO: cache this somehow */ - for (i = 0; i < irp->u.status.u.initialization.num_rfci; i++) { + for (i = 0; i < ARRAY_SIZE(irp->u.status.u.initialization.rfci); i++) { + struct osmo_iuup_rfci *rfci = &irp->u.status.u.initialization.rfci[i]; int j; - unsigned num_bits = 0; - for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) - num_bits += irp->u.status.u.initialization.subflow_sizes[i][j]; - if (match_bytes == (num_bits + 7)/8) - return i; - } + unsigned num_bits; + if (!rfci->used) + continue; + rfci_cnt++; + num_bits = 0; + for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) + num_bits += rfci->subflow_sizes[j]; + if (match_bytes == (num_bits + 7)/8) + return rfci->id; + + /* early loop termination: */ + if (rfci_cnt == irp->u.status.u.initialization.num_subflows) + break; + } return -1; } @@ -134,9 +154,9 @@ conn_rtp->iuup.active_init = true; /* Find RFCI containing NO_DATA: */ - conn_rtp->iuup.rfci_idx_no_data = _find_rfci_no_data(init_ind); + conn_rtp->iuup.rfci_id_no_data = _find_rfci_no_data(init_ind); - /* Copy over the rfci_idx_no_data, since we reuse the same subflow set: */ + /* Copy over the rfci_id_no_data, since we reuse the same subflow set: */ msg = msgb_copy_c(conn_rtp->conn, irp->oph.msg, "iuup-init-copy"); conn_rtp->iuup.init_ind = (struct osmo_iuup_rnl_prim *)msgb_data(msg); conn_rtp->iuup.init_ind->oph.msg = msg; @@ -149,12 +169,8 @@ irp2->u.config.supported_versions_mask = def_configure_req.supported_versions_mask; irp2->u.config.num_rfci = irp->u.status.u.initialization.num_rfci; irp2->u.config.num_subflows = irp->u.status.u.initialization.num_subflows; - memcpy(irp2->u.config.subflow_sizes, irp->u.status.u.initialization.subflow_sizes, - IUUP_MAX_RFCIS * IUUP_MAX_SUBFLOWS * sizeof(irp2->u.config.subflow_sizes[0][0])); irp2->u.config.IPTIs_present = irp->u.status.u.initialization.IPTIs_present; - if (irp->u.status.u.initialization.IPTIs_present) - memcpy(irp2->u.config.IPTIs, irp->u.status.u.initialization.IPTIs, - IUUP_MAX_RFCIS * sizeof(irp2->u.config.IPTIs[0])); + memcpy(irp2->u.config.rfci, irp->u.status.u.initialization.rfci, sizeof(irp2->u.config.rfci)); irp2->u.config.t_init = def_configure_req.t_init; irp2->u.config.t_ta = def_configure_req.t_ta; irp2->u.config.t_rc = def_configure_req.t_rc; @@ -350,7 +366,7 @@ struct msgb *msg; /* Find RFCI containing NO_DATA: */ - conn_rtp_src->iuup.rfci_idx_no_data = _find_rfci_no_data(irp); + conn_rtp_src->iuup.rfci_id_no_data = _find_rfci_no_data(irp); msg = msgb_copy_c(conn_rtp_src->conn, irp->oph.msg, "iuup-init-copy"); conn_rtp_src->iuup.init_ind = (struct osmo_iuup_rnl_prim *)msgb_data(msg); @@ -554,7 +570,7 @@ OSMO_ASSERT(conn_rtp->iuup.iui); osmo_iuup_instance_set_user_prim_cb(conn_rtp->iuup.iui, _conn_iuup_user_prim_cb, conn_rtp); osmo_iuup_instance_set_transport_prim_cb(conn_rtp->iuup.iui, _conn_iuup_transport_prim_cb, conn_rtp); - conn_rtp->iuup.rfci_idx_no_data = -1; + conn_rtp->iuup.rfci_id_no_data = -1; return 0; } @@ -701,7 +717,7 @@ struct osmo_iuup_rnl_prim *irp; int rc; - if (conn_rtp->iuup.rfci_idx_no_data == -1) { + if (conn_rtp->iuup.rfci_id_no_data == -1) { LOG_CONN_RTP(conn_rtp, LOGL_NOTICE, "No RFCI NO_DATA found, unable to send dummy packet\n"); return -ENOTSUP; } @@ -709,7 +725,7 @@ irp = osmo_iuup_rnl_prim_alloc(conn_rtp->conn, OSMO_IUUP_RNL_DATA, PRIM_OP_REQUEST, MGW_IUUP_MSGB_SIZE); irp->u.data.frame_nr = 0; irp->u.data.fqc = IUUP_FQC_FRAME_GOOD; - irp->u.data.rfci = conn_rtp->iuup.rfci_idx_no_data; + irp->u.data.rfci = conn_rtp->iuup.rfci_id_no_data; irp->oph.msg->l3h = irp->oph.msg->tail; if ((rc = osmo_iuup_rnl_prim_down(conn_rtp->iuup.iui, irp)) != 0) { LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "Failed Tx RTP dummy payload down the IuUP layer\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/28183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I40ebf36ad37f5196751caf2297a340e538ad28bc Gerrit-Change-Number: 28183 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: WIP: workaround gcc 12.1.0 error

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28181 ) Change subject: WIP: workaround gcc 12.1.0 error ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b1650280965ba4f7722d8882f630b5fb75e6029 Gerrit-Change-Number: 28181 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28182 ) Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... iuup: Rework API to support RFCI IDs != RFCI index The initially merged IuUP API and implementation assumed that RFCI with ID was always in the position of its ID inside the list of RFCIs. This was the case for messages sent by ip.access nano3g as well as our own osmocom implementation. However it was noticed that other nodes from other vendors actually use other order, as allowed by the IuUP message format. Hence, we need to break the assumption and provide explicit ID information in the list. NOTICE: This commit breaks API and ABI compatibility with older versions of libosmogsm. This mainly affects its only known user: osmo-mgw. Related: SYS#5969 Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 --- M TODO-RELEASE M include/osmocom/gsm/iuup.h M src/gsm/iuup.c M tests/iuup/iuup_test.c 4 files changed, 76 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/28182/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ae28c0..a02a346 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmogsm add struct member Add codec_list_bss_supported to gsm0808_handover_request_ack (more_items flag ensures ABI compat) libosmogb ABI BREAKAGE Add reset_ack_notification function pointer to struct bssgp_bvc_fsm_ops libosmogsm add API Add rach_tx_integer_raw2val() in gsm_utils.h +libosmogsm API BREAKAGE iuup.h osmo_iuup_rnl_config and osmo_iuup_rnl_status (affects osmo-mgw) diff --git a/include/osmocom/gsm/iuup.h b/include/osmocom/gsm/iuup.h index 1ea2b2e..db3d5e0 100644 --- a/include/osmocom/gsm/iuup.h +++ b/include/osmocom/gsm/iuup.h @@ -42,6 +42,14 @@ uint32_t t_ms; /* time in ms */ uint32_t n_max; /* max number of repetitions */ }; +struct osmo_iuup_rfci { + uint8_t used:1, + spare1:1, + id:6; + uint8_t spare2:4, + IPTI:4; /* values range 0-15, 4 bits */; + uint16_t subflow_sizes[IUUP_MAX_SUBFLOWS]; +}; struct osmo_iuup_rnl_config { /* transparent (true) or SMpSDU (false): */ bool transparent; @@ -56,9 +64,8 @@ uint16_t supported_versions_mask; uint8_t num_rfci; uint8_t num_subflows; - uint16_t subflow_sizes[IUUP_MAX_RFCIS][IUUP_MAX_SUBFLOWS]; bool IPTIs_present; - uint8_t IPTIs[IUUP_MAX_RFCIS]; /* values range 0-15, 4 bits */ + struct osmo_iuup_rfci rfci[IUUP_MAX_RFCIS]; /* TODO: Indication of delivery of erroneous SDUs*/ struct osmo_iuup_rnl_config_timer t_init; @@ -84,9 +91,8 @@ uint8_t data_pdu_type; uint8_t num_rfci; uint8_t num_subflows; - uint16_t subflow_sizes[IUUP_MAX_RFCIS][IUUP_MAX_SUBFLOWS]; bool IPTIs_present; - uint8_t IPTIs[IUUP_MAX_RFCIS]; /* values range 0-15, 4 bits */ + struct osmo_iuup_rfci rfci[IUUP_MAX_RFCIS]; } initialization; struct { } rate_control; diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index eb595ce..edcea3b 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -286,13 +286,10 @@ struct iuup_ctrl_init_rfci_hdr *ihdr_rfci; struct iuup_ctrl_init_tail *itail; unsigned int i, j; - uint8_t num_subflows, num_rfci; uint16_t payload_crc; + uint8_t rfci_cnt; struct msgb *msg; - num_subflows = iui->config.num_subflows; - num_rfci = iui->config.num_rfci; - itp = osmo_iuup_tnl_prim_alloc(iui, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_REQUEST, IUUP_MSGB_SIZE); msg = itp->oph.msg; @@ -307,42 +304,68 @@ ihdr = (struct iuup_ctrl_init_hdr *)msgb_put(msg, sizeof(*ihdr)); ihdr->chain_ind = 0; /* this frame is the last frame for the procedure. TODO: support several */ - ihdr->num_subflows_per_rfci = num_subflows; + ihdr->num_subflows_per_rfci = iui->config.num_subflows; ihdr->ti = iui->config.IPTIs_present ? 1 : 0; ihdr->spare = 0; /* RFCI + subflow size part: */ - for (i = 0; i < num_rfci; i++) { - bool last = (i+1 == num_rfci); - uint8_t len_size = 1; - for (j = 0; j < num_subflows; j++) { - if (iui->config.subflow_sizes[i][j] > UINT8_MAX) + rfci_cnt = 0; + for (i = 0; i < ARRAY_SIZE(iui->config.rfci); i++) { + bool last; + uint8_t len_size; + struct osmo_iuup_rfci *rfci = &iui->config.rfci[i]; + if (!rfci->used) + continue; + rfci_cnt++; + last = (rfci_cnt == iui->config.num_rfci); + + len_size = 1; + for (j = 0; j < iui->config.num_subflows; j++) { + if (rfci->subflow_sizes[j] > UINT8_MAX) len_size = 2; } - ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)msgb_put(msg, sizeof(*ihdr_rfci) + len_size * num_subflows); - ihdr_rfci->rfci = i; + + ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)msgb_put(msg, sizeof(*ihdr_rfci) + len_size * iui->config.num_subflows); + ihdr_rfci->rfci = rfci->id; ihdr_rfci->li = len_size - 1; ihdr_rfci->lri = last; if (len_size == 2) { uint16_t *buf = (uint16_t *)&ihdr_rfci->subflow_length[0]; - for (j = 0; j < num_subflows; j++) - osmo_store16be(iui->config.subflow_sizes[i][j], buf++); + for (j = 0; j < iui->config.num_subflows; j++) + osmo_store16be(rfci->subflow_sizes[j], buf++); } else { - for (j = 0; j < num_subflows; j++) - ihdr_rfci->subflow_length[j] = iui->config.subflow_sizes[i][j]; + for (j = 0; j < iui->config.num_subflows; j++) + ihdr_rfci->subflow_length[j] = rfci->subflow_sizes[j]; } + /* early loop termination: */ + if (last) + break; + } + /* Sanity check: */ + if (rfci_cnt != iui->config.num_rfci) { + LOGP(DLIUUP, LOGL_ERROR, "rfci_cnt %u != num_rfci %u\n", + rfci_cnt, iui->config.num_rfci); + msgb_free(msg); + return NULL; } if (iui->config.IPTIs_present) { - uint8_t num_bytes = (num_rfci + 1) / 2; + uint8_t num_bytes = (iui->config.num_rfci + 1) / 2; uint8_t *buf = msgb_put(msg, num_bytes); - for (i = 0; i < num_bytes - 1; i++) - buf[i] = iui->config.IPTIs[i*2] << 4 | - (iui->config.IPTIs[i*2 + 1] & 0x0f); - buf[i] = iui->config.IPTIs[i*2] << 4; - if (!(num_rfci & 0x01)) /* is even: */ - buf[i] |= (iui->config.IPTIs[i*2 + 1] & 0x0f); - + rfci_cnt = 0; + for (i = 0; i < ARRAY_SIZE(iui->config.rfci); i++) { + struct osmo_iuup_rfci *rfci = &iui->config.rfci[i]; + if (!rfci->used) + continue; + if (!(rfci_cnt & 0x01)) /* is even: */ + buf[rfci_cnt / 2] = (((uint8_t)rfci->IPTI) << 4); + else + buf[rfci_cnt / 2] |= (rfci->IPTI & 0x0F); + rfci_cnt++; + /* early loop termination: */ + if (rfci_cnt == iui->config.num_rfci) + break; + } } itail = (struct iuup_ctrl_init_tail *)msgb_put(msg, sizeof(*itail)); @@ -368,12 +391,8 @@ irp->u.status.u.initialization.data_pdu_type = iui->config.data_pdu_type; irp->u.status.u.initialization.num_subflows = iui->config.num_subflows; irp->u.status.u.initialization.num_rfci = iui->config.num_rfci; - memcpy(irp->u.status.u.initialization.subflow_sizes, iui->config.subflow_sizes, - IUUP_MAX_RFCIS * IUUP_MAX_SUBFLOWS * sizeof(iui->config.subflow_sizes[0][0])); irp->u.status.u.initialization.IPTIs_present = iui->config.IPTIs_present; - if (iui->config.IPTIs_present) - memcpy(irp->u.status.u.initialization.IPTIs, iui->config.IPTIs, - IUUP_MAX_RFCIS * sizeof(iui->config.IPTIs[0])); + memcpy(irp->u.status.u.initialization.rfci, iui->config.rfci, sizeof(iui->config.rfci)); return irp; } @@ -530,24 +549,27 @@ ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)ihdr->rfci_data; do { + struct osmo_iuup_rfci *rfci = &iui->config.rfci[num_rfci]; uint8_t l_size_bytes = ihdr_rfci->li + 1; is_last = ihdr_rfci->lri; - if (ihdr_rfci->rfci != num_rfci) { - LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Unexpected RFCI %u at position %u received\n", - ihdr_rfci->rfci, num_rfci); + if (num_rfci >= IUUP_MAX_RFCIS) { + LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Too many RFCIs received (%u)\n", + num_rfci); err_cause = IUUP_ERR_CAUSE_UNEXPECTED_RFCI; goto send_nack; } + rfci->used = 1; + rfci->id = ihdr_rfci->rfci; if (l_size_bytes == 2) { uint16_t *subflow_size = (uint16_t *)ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = osmo_load16be(subflow_size); + rfci->subflow_sizes[i] = osmo_load16be(subflow_size); subflow_size++; } } else { uint8_t *subflow_size = ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = *subflow_size; + rfci->subflow_sizes[i] = *subflow_size; subflow_size++; } } @@ -561,19 +583,18 @@ uint8_t num_bytes = (num_rfci + 1) / 2; iui->config.IPTIs_present = true; for (i = 0; i < num_bytes - 1; i++) { - iui->config.IPTIs[i*2] = *buf >> 4; - iui->config.IPTIs[i*2 + 1] = *buf & 0x0f; + iui->config.rfci[i*2].IPTI = *buf >> 4; + iui->config.rfci[i*2 + 1].IPTI = *buf & 0x0f; buf++; } - iui->config.IPTIs[i*2] = *buf >> 4; + iui->config.rfci[i*2].IPTI = *buf >> 4; if (!(num_rfci & 0x01)) /* is even: */ - iui->config.IPTIs[i*2 + 1] = *buf & 0x0f; + iui->config.rfci[i*2 + 1].IPTI = *buf & 0x0f; buf++; itail = (struct iuup_ctrl_init_tail *)buf; } else { itail = (struct iuup_ctrl_init_tail *)ihdr_rfci; } - if (itail->data_pdu_type > 1) { LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Unexpected Data PDU Type %u received\n", itail->data_pdu_type); err_cause = IUUP_ERR_CAUSE_UNEXPECTED_VALUE; diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index a58481d..6e3d8ca 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -19,14 +19,14 @@ .supported_versions_mask = 0x0001, .num_rfci = 3, .num_subflows = 3, - .subflow_sizes = { - {81, 103, 60}, - {39, 0, 0}, - {0, 0, 0}, + .IPTIs_present = true, + .rfci = { + {.used = 1, .id = 0, .IPTI = 1, .subflow_sizes = {81, 103, 60} }, + {.used = 1, .id = 1, .IPTI = 7, .subflow_sizes = {39, 0, 0} }, + {.used = 1, .id = 2, .IPTI = 1, .subflow_sizes = {0, 0, 0} }, }, /* .delivery_err_sdu = All set to 0 (YES) by default, */ .IPTIs_present = true, - .IPTIs = {1, 7, 1}, .t_init = { .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }, .t_ta = { .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }, .t_rc = { .t_ms = IUUP_TIMER_RC_T_DEFAULT, .n_max = IUUP_TIMER_RC_N_DEFAULT }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: WIP: workaround gcc 12.1.0 error

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28181 ) Change subject: WIP: workaround gcc 12.1.0 error ...................................................................... WIP: workaround gcc 12.1.0 error Change-Id: I0b1650280965ba4f7722d8882f630b5fb75e6029 --- M src/sim/reader.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/28181/1 diff --git a/src/sim/reader.c b/src/sim/reader.c index b41b730..cceb7d9 100644 --- a/src/sim/reader.c +++ b/src/sim/reader.c @@ -40,7 +40,7 @@ { int ret; - if (!msgb_apdu_de(resp) || msgb_apdu_le(resp) < 2) + if (msgb_apdu_le(resp) < 2) return -EIO; ret = msgb_get_u16(resp); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b1650280965ba4f7722d8882f630b5fb75e6029 Gerrit-Change-Number: 28181 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: reader: more meaningful null pointer check in get_sw

by fixeria

Attention is currently required from: neels, laforge, daniel, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28180 ) Change subject: reader: more meaningful null pointer check in get_sw ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Gerrit-Change-Number: 28180 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 May 2022 17:49:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: reader: more meaningful null pointer check in get_sw

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28180 ) Change subject: reader: more meaningful null pointer check in get_sw ...................................................................... reader: more meaningful null pointer check in get_sw At the moment msgb_apdu_de(resp) is used to check if the msgb that is handed over to get_sw is properly populated with data. However, since msgb_apdu_de() is just adding an offset, which cannot be 0 to ->l2h the returned value also can never be NULL. This means that we cannot use msgb_apdu_de() to detect if resp contains a nullpointer. Lets check if ->l2h is not NULL instead. This will make sure that ->l2h is populated. Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Related: OS#5560 --- M src/sim/reader.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/28180/1 diff --git a/src/sim/reader.c b/src/sim/reader.c index b41b730..982b2ee 100644 --- a/src/sim/reader.c +++ b/src/sim/reader.c @@ -40,7 +40,7 @@ { int ret; - if (!msgb_apdu_de(resp) || msgb_apdu_le(resp) < 2) + if (!resp->l2h || msgb_apdu_le(resp) < 2) return -EIO; ret = msgb_get_u16(resp); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Gerrit-Change-Number: 28180 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 to look at the new patch set (#2). Change subject: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni ...................................................................... stp: Fix sporadic failure in TC_ipa_to_m3ua_ni It was spotted that from time to time the test set NI international instead of national. This is presumable due to a race condition between VTY and messages being received and forwarded. Let's delay resetting the VTY config after the message is recieved, to avoid the race conditions between them. Change-Id: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 --- M stp/STP_Tests.ttcn 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/28131/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 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: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 Gerrit-Change-Number: 28131 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by iedemam

Attention is currently required from: neels. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: Patchset 4 has now been deployed. It is providing reliable statistics and not causing any more performance impact than the aforementioned global timers such as update_t3122_chan_load_timer and bsc_store_bts_uptime. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 May 2022 13:12:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022