September 2024 - gerrit-log - lists.osmocom.org

Change in osmo-ccid-firmware[master]: add simple gangupdater for multiple octsim boards

by roh

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

3 months, 1 week

2
2
0 0

[M] Change in osmo-msc[master]: silent-call: add CSD channel modes

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38311?usp=email ) Change subject: silent-call: add CSD channel modes ...................................................................... silent-call: add CSD channel modes This is useful for BER testing and figuring out if the baseband supports the requested channel mode, e.g. half-rate data calls. Going below 2.4k (0.6k, 1.2k, 1.2k_75) makes no sense, because: * these rates are carried by TCH/[FH]2.4 channels anyway, and * we never tell the user data rate to the MS (part of CC SETUP) The same applies to transparent vs non-transparent channel modes, but let's add non-transparent variants anyway, just in case the BTS PHY does not support transparent modes. Change-Id: Ife83f5bcb2b68a228a014f47c7cbb21660290593 --- M src/libmsc/msc_vty.c 1 file changed, 65 insertions(+), 20 deletions(-) Approvals: fixeria: Looks good to me, approved falconia: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 1f389f4..dfed117 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -1474,19 +1474,39 @@ #define CHAN_TYPES "(any|tch/f|tch/h|tch/any|sdcch)" #define CHAN_TYPE_HELP \ - "Any channel\n" \ - "TCH/F channel\n" \ - "TCH/H channel\n" \ - "Any TCH channel\n" \ - "SDCCH channel\n" + "Any channel\n" \ + "TCH/F channel\n" \ + "TCH/H channel\n" \ + "Any TCH channel\n" \ + "SDCCH channel\n" -#define CHAN_MODES "(signalling|speech-hr|speech-fr|speech-efr|speech-amr)" -#define CHAN_MODE_HELP \ - "Signalling only\n" \ - "Speech with HR codec\n" \ - "Speech with FR codec\n" \ - "Speech with EFR codec\n" \ - "Speech with AMR codec\n" +#define CHAN_MODES_SPEECH "speech-hr|speech-fr|speech-efr|speech-amr" +#define CHAN_MODE_HELP_SPEECH \ + "Speech with HR codec\n" \ + "Speech with FR codec\n" \ + "Speech with EFR codec\n" \ + "Speech with AMR codec\n" + +#define CHAN_MODES_DATA_T "data-2400|data-4800|data-9600|data-14400" +#define CHAN_MODE_HELP_DATA_T \ + "Data (transparent) @ 2.4k/3.6k\n" \ + "Data (transparent) @ 4.8k/6.0k\n" \ + "Data (transparent) @ 9.6k/12.0k\n" \ + "Data (transparent) @ 14.4k/14.5k\n" + +#define CHAN_MODES_DATA_NT "data-4800-nt|data-9600-nt|data-14400-nt" +#define CHAN_MODE_HELP_DATA_NT \ + "Data (non-transparent) @ 4.8k/6k\n" \ + "Data (non-transparent) @ 9.6k/12k\n" \ + "Data (non-transparent) @ 14.4k/14.5k\n" + +#define CHAN_MODES "(signalling|" CHAN_MODES_SPEECH "|" CHAN_MODES_DATA_T "|" CHAN_MODES_DATA_NT ")" +#define CHAN_MODE_HELP \ + "Signalling only\n" \ + CHAN_MODE_HELP_SPEECH \ + CHAN_MODE_HELP_DATA_T \ + CHAN_MODE_HELP_DATA_NT + DEFUN(subscriber_silent_call_start, subscriber_silent_call_start_cmd, @@ -1500,7 +1520,7 @@ struct gsm0808_channel_type ct; const char *ip; uint16_t port; - int rc, speech; + int rc, sign; if (!vsub) { vty_out(vty, "%% No subscriber found for %s %s%s", @@ -1531,24 +1551,49 @@ ct.perm_spch[0] = GSM0808_PERM_FR3; ct.perm_spch[1] = GSM0808_PERM_HR3; ct.perm_spch_len = 2; + } else if (!strcmp(argv[3], "data-2400")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_TRANSP_2k4; + ct.data_transparent = true; + } else if (!strcmp(argv[3], "data-4800")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_TRANSP_4k8; + ct.data_transparent = true; + } else if (!strcmp(argv[3], "data-9600")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_TRANSP_9k6; + ct.data_transparent = true; + } else if (!strcmp(argv[3], "data-14400")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_TRANSP_14k4; + ct.data_transparent = true; + } else if (!strcmp(argv[3], "data-4800-nt")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_NON_TRANSP_6k0; + } else if (!strcmp(argv[3], "data-9600-nt")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_NON_TRANSP_12k0; + } else if (!strcmp(argv[3], "data-14400-nt")) { + ct.ch_indctr = GSM0808_CHAN_DATA; + ct.data_rate = GSM0808_DATA_RATE_NON_TRANSP_14k5; } - speech = ct.ch_indctr == GSM0808_CHAN_SPEECH; + sign = ct.ch_indctr == GSM0808_CHAN_SIGN; if (!strcmp(argv[2], "tch/f")) - ct.ch_rate_type = speech ? GSM0808_SPEECH_FULL_BM : GSM0808_SIGN_FULL_BM; + ct.ch_rate_type = sign ? GSM0808_SIGN_FULL_BM : GSM0808_SPEECH_FULL_BM; else if (!strcmp(argv[2], "tch/h")) - ct.ch_rate_type = speech ? GSM0808_SPEECH_HALF_LM : GSM0808_SIGN_HALF_LM; + ct.ch_rate_type = sign ? GSM0808_SIGN_HALF_LM : GSM0808_SPEECH_HALF_LM; else if (!strcmp(argv[2], "tch/any")) - ct.ch_rate_type = speech ? GSM0808_SPEECH_FULL_PREF : GSM0808_SIGN_FULL_PREF; + ct.ch_rate_type = sign ? GSM0808_SIGN_FULL_PREF : GSM0808_SPEECH_FULL_PREF; else if (!strcmp(argv[2], "sdcch")) { - if (speech) { - vty_out(vty, "Can't request speech on SDCCH%s", VTY_NEWLINE); + if (!sign) { + vty_out(vty, "Can't request speech/data on SDCCH%s", VTY_NEWLINE); return CMD_WARNING; } ct.ch_rate_type = GSM0808_SIGN_SDCCH; } else - ct.ch_rate_type = speech ? GSM0808_SPEECH_FULL_PREF : GSM0808_SIGN_ANY; + ct.ch_rate_type = sign ? GSM0808_SIGN_ANY : GSM0808_SPEECH_FULL_PREF; ip = argc >= 5 ? argv[4] : "127.0.0.1"; port = argc >= 6 ? atoi(argv[5]) : 4000; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ife83f5bcb2b68a228a014f47c7cbb21660290593 Gerrit-Change-Number: 38311 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-msc[master]: silent-call: add CSD channel modes

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-msc/+/38311?usp=email ) Change subject: silent-call: add CSD channel modes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ife83f5bcb2b68a228a014f47c7cbb21660290593 Gerrit-Change-Number: 38311 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Sep 2024 20:29:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman: disable send_redirects

by fixeria

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38299?usp=email ) Change subject: testenv: podman: disable send_redirects ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie27668f38b80c52ffef4e17b3fe64f0c9109bdea Gerrit-Change-Number: 38299 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Sep 2024 20:29:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bts[master]: l1sap: prevent buffer overflow in l1sap_rtp_rx_cb()

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38313?usp=email ) Change subject: l1sap: prevent buffer overflow in l1sap_rtp_rx_cb() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38313?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I214070ecf7458202922475505a8747950bedf930 Gerrit-Change-Number: 38313 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 30 Sep 2024 20:21:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 3 weeks

1
0
0 0

[XS] Change in osmo-bts[master]: l1sap: move struct osmo_rlp_frame_decoded to the if-scope

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38315?usp=email ) Change subject: l1sap: move struct osmo_rlp_frame_decoded to the if-scope ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38315?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide99b35192246b0f7b2a4f31281e2d84984a9795 Gerrit-Change-Number: 38315 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Sep 2024 20:19:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: l1sap: call csd_v110_rtp_decode() in l1sap_tch_rts_ind()

by Jenkins Builder

Attention is currently required from: fixeria. Jenkins Builder has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38312?usp=email ) Change subject: l1sap: call csd_v110_rtp_decode() in l1sap_tch_rts_ind() ...................................................................... Patch Set 3: (2 comments) File src/common/l1sap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18990): https://gerrit.osmocom.org/c/osmo-bts/+/38312/comment/f282ca8d_7ed7616f?usp… : PS3, Line 468: } else { else is not generally useful after a break or return Robot Comment from checkpatch (run ID jenkins-gerrit-lint-18990): https://gerrit.osmocom.org/c/osmo-bts/+/38312/comment/c8b5ca15_1fb24003?usp… : PS3, Line 482: } else { else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38312?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idca6807b1e49b89072683b9f00ff4e7cee44cf33 Gerrit-Change-Number: 38312 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 30 Sep 2024 20:15:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bts[master]: l1sap: fix GSMTAP RLP frame reassembly for TCH/F4.8 NT

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/38314?usp=email to look at the new patch set (#4). Change subject: l1sap: fix GSMTAP RLP frame reassembly for TCH/F4.8 NT ...................................................................... l1sap: fix GSMTAP RLP frame reassembly for TCH/F4.8 NT Unfortunately this approach cannot work because bit E7 simply does not exist in NT mode: that bit position gets replaced by one of D-prime bits belonging to the RLP frame. Let's use TDMA Fn of the given TCH.ind to distinguish between the 1st and 2nd halves of an RLP frame, like we do in csd_v110_rtp_encode(). Related: OS#6578 Change-Id: Ia6b3b03faa066ca7fd828d24ba2559ac69c0362a --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c M src/common/l1sap.c 3 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/38314/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38314?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia6b3b03faa066ca7fd828d24ba2559ac69c0362a Gerrit-Change-Number: 38314 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

8 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: l1sap: call csd_v110_rtp_decode() in l1sap_tch_rts_ind()

by fixeria

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-bts/+/38312?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: l1sap: call csd_v110_rtp_decode() in l1sap_tch_rts_ind() ...................................................................... l1sap: call csd_v110_rtp_decode() in l1sap_tch_rts_ind() The problem with calling csd_v110_rtp_decode() from l1sap_rtp_rx_cb() is that we don't know in advance at which TDMA frame number the resulting TCH block is going to be scheduled/transmitted. This knowledge will be required in follow-up patches. * In l1sap_rtp_rx_cb(): create an L1SAP msgb with the RTP payload unmodified (160 bytes), like we do for speech frames. * In l1sap_tch_rts_ind(): copy the RTP payload into a temporary buffer on stack and call csd_v110_rtp_decode(), re-using the L1SAP msgb as the output buffer. This patch brings no functional changes, except that the DL RLP PDUs now how the correct TDMA frame number in GSMTAP output (was always 0). Related: OS#6578 Change-Id: Idca6807b1e49b89072683b9f00ff4e7cee44cf33 --- M src/common/l1sap.c 1 file changed, 107 insertions(+), 101 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/12/38312/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38312?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idca6807b1e49b89072683b9f00ff4e7cee44cf33 Gerrit-Change-Number: 38312 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

8 months, 3 weeks

1
0
0 0

[S] Change in osmo-bts[master]: l1sap: ensure DL RLP frame alignment for TCH/F4.8 NT

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38316?usp=email ) Change subject: l1sap: ensure DL RLP frame alignment for TCH/F4.8 NT ...................................................................... l1sap: ensure DL RLP frame alignment for TCH/F4.8 NT Related: OS#6578 Change-Id: Ic8ec1a5d84950d27b22fd7491d5e4a82ace9fd62 --- M include/osmo-bts/csd_v110.h M src/common/csd_v110.c M src/common/l1sap.c M tests/csd/csd_test.c 4 files changed, 31 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/16/38316/1 diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h index f1c1027..54a6745 100644 --- a/include/osmo-bts/csd_v110.h +++ b/include/osmo-bts/csd_v110.h @@ -22,4 +22,4 @@ int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len, uint32_t fn); int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data, - const uint8_t *rtp, size_t rtp_len); + const uint8_t *rtp, size_t rtp_len, uint32_t fn); diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index d25eb7b..f214735 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -158,7 +158,7 @@ } int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data, - const uint8_t *rtp, size_t rtp_len) + const uint8_t *rtp, size_t rtp_len, uint32_t fn) { const struct csd_v110_frame_desc *desc; ubit_t ra_bits[80 * 4]; @@ -187,6 +187,23 @@ ra_bits[i] = (rtp[i] >> 7); } + /* TCH/F4.8 NT: check RLP frame alignment */ + if (lchan->tch_mode == GSM48_CMODE_DATA_6k0 && + lchan->csd_mode == LCHAN_CSD_M_NT) { + const ubit_t e2 = csd_v110_tchf48_nt_e2_map[fn % 26]; + const ubit_t *e_bits; + + /* check bits E2/E3 in the 1st V.110 frame */ + e_bits = &ra_bits[0 * 80 + 5 * 8 + 1]; + if (e_bits[1] != e2 || e_bits[2] != 0) + return -EAGAIN; + /* check bits E2/E3 in the 2nd V.110 frame */ + e_bits = &ra_bits[1 * 80 + 5 * 8 + 1]; + if (e_bits[1] != e2 || e_bits[2] != 1) + return -EAGAIN; + /* -EAGAIN means postpone transmission */ + } + /* RA1'/RA1: convert from an intermediate rate to radio rate */ for (unsigned int i = 0; i < desc->num_blocks; i++) { struct osmo_v110_decoded_frame df; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 85e986d..3f7aa6a 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1635,11 +1635,11 @@ memcpy(&rtp[0], msgb_l2(resp_msg), OSMO_MIN(msgb_l2len(resp_msg), sizeof(rtp))); - msgb_get(resp_msg, msgb_l2len(resp_msg)); int rc = csd_v110_rtp_decode(lchan, msgb_l2(resp_msg), - &rtp[0], sizeof(rtp)); + &rtp[0], sizeof(rtp), fn); if (rc > 0) { + msgb_get(resp_msg, msgb_l2len(resp_msg)); msgb_put(resp_msg, rc); /* 'fake' tch_ind containing all-zero so gsmtap code can be shared * between UL and DL */ @@ -1648,8 +1648,15 @@ msgb_l2(resp_msg), msgb_l2len(resp_msg)); } else { - rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RTP_RX_DROP_V110_DEC); - msgb_free(resp_msg); + if (rc == -EAGAIN) { + /* enqueue back, postpone transmission + * XXX: we don't have msgb_enqueue_tail[_count]() */ + llist_add(&resp_msg->list, &lchan->dl_tch_queue); + lchan->dl_tch_queue_len++; + } else { + rate_ctr_inc2(trx->bts->ctrs, BTS_CTR_RTP_RX_DROP_V110_DEC); + msgb_free(resp_msg); + } resp_msg = NULL; resp_l1sap = &empty_l1sap; } diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index bef0ec8..0ca7209 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -136,7 +136,7 @@ fprintf(stderr, " %s\n", osmo_hexdump(&rtp[i * 16], 16)); /* decode the encoded RTP frame */ - rc = csd_v110_rtp_decode(&lchan, &data_dec[0], &rtp[0], sizeof(rtp)); + rc = csd_v110_rtp_decode(&lchan, &data_dec[0], &rtp[0], sizeof(rtp), 0); fprintf(stderr, "[i] csd_v110_rtp_decode() returns %d\n", rc); if (rc != bit_num) return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38316?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic8ec1a5d84950d27b22fd7491d5e4a82ace9fd62 Gerrit-Change-Number: 38316 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

8 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024