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

Change in osmo-ccid-firmware[master]: add simple gangupdater for multiple octsim boards
by roh 15 Mar '25

15 Mar '25

roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 ) Change subject: add simple gangupdater for multiple octsim boards ...................................................................... add simple gangupdater for multiple octsim boards Change-Id: Ic10572c121ac55586ec43126b63d69529757132b --- A contrib/flash_all_octsim.sh 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/96/26896/1 diff --git a/contrib/flash_all_octsim.sh b/contrib/flash_all_octsim.sh new file mode 100644 index 0000000..4f4c89b --- /dev/null +++ b/contrib/flash_all_octsim.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# this script is to scan for octsim boards, sort them by usb path and call dfu-util on each to update the board +# basic flow +# - get usb path and serialno tupel from dfu-util -l +# - reformat and sort by usbpath, drop the usbpath (grep cut tr sort cut) +# - flash the boards + +# TODO: +# - error handling +# - filter dfu-util output and generate nice summary + +dfu-util -l \ + | grep "^Found" \ + | grep "\[1d50:6141\]" \ + | cut -d ' ' -f 8,13 \ + | tr -d ',' \ + | cut -d \" -f 2,4 \ + | tr \" ' ' \ + | sort \ + | cut -d ' ' -f 2 + | xargs -n 1 dfu-util -d 1d50:6141 -D sysmoOCTSIM.bin -R -p -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/26896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic10572c121ac55586ec43126b63d69529757132b Gerrit-Change-Number: 26896 Gerrit-PatchSet: 1 Gerrit-Owner: roh <jsteiger(a)sysmocom.de> Gerrit-MessageType: newchange

2 2

[S] Change in osmo-bts[master]: rsl: rsl_handle_chan_mod_ie(): set lchan->csd_mode
by pespin 31 Jul '23

31 Jul '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34032 ) Change subject: rsl: rsl_handle_chan_mod_ie(): set lchan->csd_mode ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b1b44cffae1484098709efe496efafacbd354a8 Gerrit-Change-Number: 34032 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 21:43:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: rsl: rsl_handle_chan_mod_ie(): do not use legacy defines
by pespin 31 Jul '23

31 Jul '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34033 ) Change subject: rsl: rsl_handle_chan_mod_ie(): do not use legacy defines ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e8f9ff5189af80bce13cfd1b27585aabda03f7a Gerrit-Change-Number: 34033 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 21:42:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: rsl: rsl_handle_chan_mod_ie(): set lchan->csd_mode
by fixeria 31 Jul '23

31 Jul '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34032 ) Change subject: rsl: rsl_handle_chan_mod_ie(): set lchan->csd_mode ...................................................................... rsl: rsl_handle_chan_mod_ie(): set lchan->csd_mode Change-Id: I6b1b44cffae1484098709efe496efafacbd354a8 Related: ca418643 "csd_v110_rtp_encode(): properly set E1/E2/E3 bits" Related: OS#1572 --- M src/common/rsl.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/34032/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index d47ba99..9c0bce0 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -242,29 +242,47 @@ case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_32000): /* 32.0 kbit/s services, 32.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_32k0; + lchan->csd_mode = LCHAN_CSD_M_T_32000; break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_29000): /* 29.0 kbit/s services, 29.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_29k0; + lchan->csd_mode = LCHAN_CSD_M_T_29000; break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_14400): /* 14.4 kbit/s services, 14.5 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_14k5; + lchan->csd_mode = LCHAN_CSD_M_T_14400; break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_9600): /* 9.6 kbit/s services, 12.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_12k0; + lchan->csd_mode = LCHAN_CSD_M_T_9600; break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_4800): /* 4.8 kbit/s services, 6.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_6k0; + lchan->csd_mode = LCHAN_CSD_M_T_4800; break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_2400): + /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ + lchan->tch_mode = GSM48_CMODE_DATA_3k6; + lchan->csd_mode = LCHAN_CSD_M_T_2400; + break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_1200): + /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ + lchan->tch_mode = GSM48_CMODE_DATA_3k6; + lchan->csd_mode = LCHAN_CSD_M_T_1200; + break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_600): + /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ + lchan->tch_mode = GSM48_CMODE_DATA_3k6; + lchan->csd_mode = LCHAN_CSD_M_T_600; + break; case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_1200_75): /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_3k6; + lchan->csd_mode = LCHAN_CSD_M_T_1200_75; break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b1b44cffae1484098709efe496efafacbd354a8 Gerrit-Change-Number: 34032 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: rsl: rsl_handle_chan_mod_ie(): do not use legacy defines
by fixeria 31 Jul '23

31 Jul '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34033 ) Change subject: rsl: rsl_handle_chan_mod_ie(): do not use legacy defines ...................................................................... rsl: rsl_handle_chan_mod_ie(): do not use legacy defines Change-Id: I4e8f9ff5189af80bce13cfd1b27585aabda03f7a Related: OS#1572 --- M src/common/rsl.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/34033/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 9c0bce0..b37dd43 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -239,37 +239,37 @@ break; /* If octet 4 indicates transparent data */ - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_32000): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_32k0): /* 32.0 kbit/s services, 32.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_32k0; lchan->csd_mode = LCHAN_CSD_M_T_32000; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_29000): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_29k0): /* 29.0 kbit/s services, 29.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_29k0; lchan->csd_mode = LCHAN_CSD_M_T_29000; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_14400): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_14k4): /* 14.4 kbit/s services, 14.5 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_14k5; lchan->csd_mode = LCHAN_CSD_M_T_14400; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_9600): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_9k6): /* 9.6 kbit/s services, 12.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_12k0; lchan->csd_mode = LCHAN_CSD_M_T_9600; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_4800): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_4k8): /* 4.8 kbit/s services, 6.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_6k0; lchan->csd_mode = LCHAN_CSD_M_T_4800; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_2400): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_2k4): /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_3k6; lchan->csd_mode = LCHAN_CSD_M_T_2400; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_1200): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_1k2): /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_3k6; lchan->csd_mode = LCHAN_CSD_M_T_1200; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e8f9ff5189af80bce13cfd1b27585aabda03f7a Gerrit-Change-Number: 34033 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: layer23: modem: Fix newline character typo in log line
by pespin 31 Jul '23

31 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34028 ) Change subject: layer23: modem: Fix newline character typo in log line ...................................................................... layer23: modem: Fix newline character typo in log line Change-Id: I3ff9b71ff469e339aadff643b582efb06d5efb6c --- M src/host/layer23/src/modem/gmm.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index 5ea2b43..17cc228 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -161,7 +161,7 @@ } } else { if (old_tlli != OSMO_GPRS_GMM_TLLI_UNASSIGNED) - LOGP(DGMM, LOGL_ERROR, "%s(): Unexpected Rx %s with unknown TLLI=0x%08xn", + LOGP(DGMM, LOGL_ERROR, "%s(): Unexpected Rx %s with unknown TLLI=0x%08x\n", __func__, pdu_name, old_tlli); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3ff9b71ff469e339aadff643b582efb06d5efb6c Gerrit-Change-Number: 34028 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: layer23: modem: gmm: Log allocated TLLI on Attach Success
by pespin 31 Jul '23

31 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34030 ) Change subject: layer23: modem: gmm: Log allocated TLLI on Attach Success ...................................................................... layer23: modem: gmm: Log allocated TLLI on Attach Success Change-Id: I29242873ebec173c430e6d413e6c533ec1e2b97a --- M src/host/layer23/src/modem/gmm.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index 17cc228..b8df38b 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -60,8 +60,9 @@ switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_ATTACH, PRIM_OP_CONFIRM): if (gmm_prim->gmmreg.attach_cnf.accepted) { - LOGP(DGMM, LOGL_NOTICE, "%s(): Rx %s: Attach success P-TMSI=0x%08x\n", - __func__, pdu_name, gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi); + LOGP(DGMM, LOGL_NOTICE, "%s(): Rx %s: Attach success P-TMSI=0x%08x TLLI=0x%08x\n", + __func__, pdu_name, gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi, + gmm_prim->gmmreg.attach_cnf.acc.allocated_tlli); ms->subscr.gprs.ptmsi = gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi; ms->gmmlayer.tlli = gmm_prim->gmmreg.attach_cnf.acc.allocated_tlli; app_data.modem_state = MODEM_ST_ATTACHED; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I29242873ebec173c430e6d413e6c533ec1e2b97a Gerrit-Change-Number: 34030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: rlcmac: rx pkt_uk_ack_nack: Use correct field containing UL TFI
by pespin 31 Jul '23

31 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34026 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: rlcmac: rx pkt_uk_ack_nack: Use correct field containing UL TFI ...................................................................... rlcmac: rx pkt_uk_ack_nack: Use correct field containing UL TFI Change-Id: If0bbd9989413a550243a6496bce16b6eb04508db --- M src/rlcmac/rlcmac.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index a6d0e71..212b801 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -701,13 +701,14 @@ { struct gprs_rlcmac_ul_tbf *ul_tbf; int rc; + const Packet_Uplink_Ack_Nack_t *pkt_ul_ack = &dl_block->u.Packet_Uplink_Ack_Nack; - ul_tbf = gprs_rlcmac_find_ul_tbf_by_tfi(dl_block->TFI); + ul_tbf = gprs_rlcmac_find_ul_tbf_by_tfi(pkt_ul_ack->UPLINK_TFI); if (!ul_tbf) { LOGRLCMAC(LOGL_INFO, "TS=%u FN=%u Rx Pkt UL ACK/NACK: UL_TBF TFI=%u not found\n", rlcmac_prim->l1ctl.pdch_data_ind.ts_nr, rlcmac_prim->l1ctl.pdch_data_ind.fn, - dl_block->TFI); + pkt_ul_ack->UPLINK_TFI); return -ENOENT; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If0bbd9989413a550243a6496bce16b6eb04508db Gerrit-Change-Number: 34026 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: llc,sndcp: Add missing hex prefix to log line printing TLLI
by pespin 31 Jul '23

31 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34027 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: llc,sndcp: Add missing hex prefix to log line printing TLLI ...................................................................... llc,sndcp: Add missing hex prefix to log line printing TLLI Change-Id: I8d31ed7cf89555a1ec3cbd91a77cc00cc42b546f --- M src/llc/llc_llgmm.c M src/sndcp/sndcp_prim.c M tests/llc/llc_prim_test.err M tests/sndcp/sndcp_prim_test.err 4 files changed, 27 insertions(+), 18 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index 438de51..27150cc 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -166,7 +166,7 @@ goto ret_free; } - LOGLLME(llme, LOGL_NOTICE, "LLGM Assign pre (%08x => %08x)\n", old_tlli, new_tlli); + LOGLLME(llme, LOGL_NOTICE, "LLGM Assign pre (0x%08x => 0x%08x)\n", old_tlli, new_tlli); if (old_tlli == TLLI_UNASSIGNED && new_tlli != TLLI_UNASSIGNED) { /* TLLI Assignment 8.3.1 */ @@ -221,7 +221,7 @@ free = true; } - LOGLLME(llme, LOGL_NOTICE, "LLGM Assign post (%08x => %08x)\n", old_tlli, new_tlli); + LOGLLME(llme, LOGL_NOTICE, "LLGM Assign post (0x%08x => 0x%08x)\n", old_tlli, new_tlli); if (free) gprs_llc_llme_free(llme); diff --git a/src/sndcp/sndcp_prim.c b/src/sndcp/sndcp_prim.c index 45d6a0f..c07508a 100644 --- a/src/sndcp/sndcp_prim.c +++ b/src/sndcp/sndcp_prim.c @@ -335,7 +335,7 @@ sndcp_prim->sn.data_req.nsapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n", sndcp_prim->sn.tlli, sndcp_prim->sn.sapi, sndcp_prim->sn.data_req.nsapi); rc = -EIO; @@ -360,7 +360,7 @@ sndcp_prim->sn.unitdata_req.nsapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n", sndcp_prim->sn.tlli, sndcp_prim->sn.sapi, sndcp_prim->sn.unitdata_req.nsapi); rc = -EIO; @@ -383,7 +383,7 @@ sndcp_prim->sn.xid_req.nsapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n", sndcp_prim->sn.tlli, sndcp_prim->sn.sapi, sndcp_prim->sn.xid_req.nsapi); rc = -EIO; @@ -405,7 +405,7 @@ sndcp_prim->sn.xid_rsp.nsapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n", sndcp_prim->sn.tlli, sndcp_prim->sn.sapi, sndcp_prim->sn.xid_rsp.nsapi); rc = -EIO; @@ -476,7 +476,7 @@ sne = gprs_sndcp_sne_by_dlci_nsapi(llc_prim->ll.tlli, llc_prim->ll.sapi, sch->nsapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u, NSAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n", llc_prim->ll.tlli, llc_prim->ll.sapi, sch->nsapi); return -EIO; } @@ -493,7 +493,7 @@ sne = gprs_sndcp_sne_by_dlci(llc_prim->ll.tlli, llc_prim->ll.sapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u)\n", llc_prim->ll.tlli, llc_prim->ll.sapi); return -EIO; } @@ -510,7 +510,7 @@ snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); if (!snme) { LOGSNDCP(LOGL_ERROR, "SNDCP-LL-XID.ind: Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u)\n", llc_prim->ll.tlli, llc_prim->ll.sapi); return -EIO; } @@ -529,7 +529,7 @@ snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); if (!snme) { LOGSNDCP(LOGL_ERROR, "SNDCP-LL-XID.cnf: Message for non-existing SNDCP Entity " - "(TLLI=%08x, SAPI=%u)\n", + "(TLLI=0x%08x, SAPI=%u)\n", llc_prim->ll.tlli, llc_prim->ll.sapi); return -EIO; } @@ -546,7 +546,7 @@ snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); if (!snme) { - LOGSNDCP(LOGL_ERROR, "SNDCP-LL-ASSIGN.ind: Message for non-existing SNDCP Entity (TLLI=%08x)\n", + LOGSNDCP(LOGL_ERROR, "SNDCP-LL-ASSIGN.ind: Message for non-existing SNDCP Entity (TLLI=0x%08x)\n", llc_prim->ll.tlli); return -EIO; } @@ -639,7 +639,7 @@ struct gprs_sndcp_entity *sne; struct osmo_gprs_sm_qos_profile_decoded decoded; - LOGSNDCP(LOGL_INFO, "SNSM-ACTIVATE.ind (TLLI=%08x, SAPI=%u, NSAPI=%u)\n", + LOGSNDCP(LOGL_INFO, "SNSM-ACTIVATE.ind (TLLI=0x%08x, SAPI=%u, NSAPI=%u)\n", tlli, sapi, nsapi); snme = gprs_sndcp_snme_find_by_tlli(tlli); @@ -709,14 +709,14 @@ snme = gprs_sndcp_snme_find_by_tlli(tlli); if (!snme) { LOGSNDCP(LOGL_ERROR, "SNSM-DEACTIVATE.ind: Message for non-existing SNDCP Management Entity " - "(TLLI=%08x, NSAPI=%u)\n", tlli, nsapi); + "(TLLI=0x%08x, NSAPI=%u)\n", tlli, nsapi); return -EIO; } sne = gprs_sndcp_snme_get_sne(snme, nsapi); if (!sne) { LOGSNDCP(LOGL_ERROR, "SNSM-DEACTIVATE.ind: Message for non-existing SNDCP Entity " - "(TLLI=%08x, NSAPI=%u)\n", tlli, nsapi); + "(TLLI=0x%08x, NSAPI=%u)\n", tlli, nsapi); return -EIO; } diff --git a/tests/llc/llc_prim_test.err b/tests/llc/llc_prim_test.err index 022dfac..e13bd7b 100644 --- a/tests/llc/llc_prim_test.err +++ b/tests/llc/llc_prim_test.err @@ -26,8 +26,8 @@ DLGLOBAL DEBUG LLE(ffffffff/e1c5d364,GMM){UNASSIGNED} Rx SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 DLGLOBAL INFO Rx from upper layers: LL-UNITDATA.request DLGLOBAL INFO Rx from upper layers: LLGMM-ASSIGN.request -DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (e1c5d364 => e1c5d364) -DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (e1c5d364 => e1c5d364) +DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLGM Assign pre (0xe1c5d364 => 0xe1c5d364) +DLGLOBAL NOTICE LLME(e1c5d364/e1c5d364){ASSIGNED} LLGM Assign post (0xe1c5d364 => 0xe1c5d364) DLGLOBAL INFO Rx from upper layers: LLGMM-RESET.request DLGLOBAL INFO LLME(e1c5d364/e1c5d364){ASSIGNED} LLGMM-RESET.request DLGLOBAL INFO Rx from upper layers: LL-ESTABLISH.request diff --git a/tests/sndcp/sndcp_prim_test.err b/tests/sndcp/sndcp_prim_test.err index d61a18a..d858a49 100644 --- a/tests/sndcp/sndcp_prim_test.err +++ b/tests/sndcp/sndcp_prim_test.err @@ -1,5 +1,5 @@ DLGLOBAL INFO Rx from SNDCP SM sublayer: SNSM-ACTIVATE.indication -DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=e1c5d364, SAPI=3, NSAPI=5) +DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=0xe1c5d364, SAPI=3, NSAPI=5) DLGLOBAL INFO Rx from lower layers: LL-XID.indication DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.ind: Found SNE SAPI=3 DLGLOBAL DEBUG SNME(e1c5d364) LL-XID.cnf requested comp_fields: @@ -112,7 +112,7 @@ DLGLOBAL DEBUG SNME(e1c5d364) No SNDCP Entities left activate, freeing SNME DLGLOBAL DEBUG SNME(e1c5d364) free() DLGLOBAL INFO Rx from SNDCP SM sublayer: SNSM-ACTIVATE.indication -DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=e1c5d364, SAPI=3, NSAPI=5) +DLGLOBAL INFO SNSM-ACTIVATE.ind (TLLI=0xe1c5d364, SAPI=3, NSAPI=5) DLGLOBAL INFO Rx from lower layers: LL-XID.confirm DLGLOBAL DEBUG SNE(e1c5d364,SNDCP3,5) LL-XID.cnf: Found SNE SAPI=3 DLGLOBAL INFO Rx from upper layers: SN-XID.request -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I8d31ed7cf89555a1ec3cbd91a77cc00cc42b546f Gerrit-Change-Number: 34027 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: llc: Silently discard UI Dummy commands
by pespin 31 Jul '23

31 Jul '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34025 ) Change subject: llc: Silently discard UI Dummy commands ...................................................................... llc: Silently discard UI Dummy commands Change-Id: I807e140b96de7140d8f6922417f3eaf0eadeed84 --- M src/llc/llc.c 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/llc/llc.c b/src/llc/llc.c index be1ebec..dc1a7b6 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -53,6 +53,11 @@ { 0, NULL } }; +/* 3GPP TS 44.064 6.4.2.2 */ +static const uint8_t gprs_llc_ui_dummy_command[] = { + 0x43, 0xc0, 0x01, 0x2b, 0x2b, 0x2b +}; + /* Section 8.9.9 LLC layer parameter default values */ static const struct gprs_llc_params llc_default_params[NUM_SAPIS] = { [1] = { @@ -844,6 +849,15 @@ if (~pdu_dec->flags & OSMO_GPRS_LLC_PDU_F_PROT_MODE) crc_length = OSMO_MIN(crc_length, UI_HDR_LEN + N202); if (pdu_dec->fcs != gprs_llc_fcs(ll_pdu, crc_length)) { + if (ll_pdu_len >= sizeof(gprs_llc_ui_dummy_command) || + memcmp(ll_pdu, gprs_llc_ui_dummy_command, sizeof(gprs_llc_ui_dummy_command)) == 0) { + /* 6.4.2.2: "If the LLC entity at the MS receives a UI Dummy command, it shall discard + * it without any further actions" [...] + * "The format specified for the UI Dummy command ensures that a receiving LLC entity + * will always discard it, since the FCS field check always fails" "*/ + LOGLLE(lle, LOGL_DEBUG, "Dropping UI Dummy command len=%zu\n", ll_pdu_len); + return 0; + } LOGLLE(lle, LOGL_NOTICE, "Dropping frame with invalid FCS 0x%06x vs exp 0x%06x: %s\n", pdu_dec->fcs, gprs_llc_fcs(ll_pdu, crc_length), osmo_hexdump(ll_pdu, ll_pdu_len)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I807e140b96de7140d8f6922417f3eaf0eadeed84 Gerrit-Change-Number: 34025 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0