[S] Change in pysim[master]: transport: print device path/number on initialization failure
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34693?usp=email ) Change subject: transport: print device path/number on initialization failure .. Patch Set 4: Code-Review-1 (1 comment) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34693/comment/4f3a89e3_897e8530 PS4, Line 330: devinfo = "serial:%s" % opts.device I don't think that common code should contain clauses for each specific backend. that's a layering violation and sounds like we actually want this to be dispatched to methods of the specific transport? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3f5387508ccc2aa349adc7aec3d04d8fc977690b Gerrit-Change-Number: 34693 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 20:16:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34692?usp=email ) Change subject: pySim-shell: print device info in case an exception occurs .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb Gerrit-Change-Number: 34692 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 20:13:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 20:12:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in pysim[master]: pySim-prog, pySim-shell do not use global variables
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34688?usp=email ) Change subject: pySim-prog, pySim-shell do not use global variables .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f Gerrit-Change-Number: 34688 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 20:11:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: firmware/layer1: handle CSD related cmodes in tch_get_params()
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34694?usp=email ) Change subject: firmware/layer1: handle CSD related cmodes in tch_get_params() .. firmware/layer1: handle CSD related cmodes in tch_get_params() Change-Id: Ib73210b273826ded56d42c41ffeb835eef96dd2b Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/94/34694/1 diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index e3cffd1..20085f7 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -81,6 +81,18 @@ case GSM48_CMODE_SPEECH_EFR: *tch_mode = *tch_f_hn ? TCH_EFR_MODE : SIG_ONLY_MODE; break; + case GSM48_CMODE_DATA_14k5: + *tch_mode = *tch_f_hn ? TCH_144_MODE : SIG_ONLY_MODE; + break; + case GSM48_CMODE_DATA_12k0: + *tch_mode = *tch_f_hn ? TCH_96_MODE : SIG_ONLY_MODE; + break; + case GSM48_CMODE_DATA_6k0: + *tch_mode = *tch_f_hn ? TCH_48F_MODE : TCH_48H_MODE; + break; + case GSM48_CMODE_DATA_3k6: + *tch_mode = *tch_f_hn ? TCH_24F_MODE : TCH_24H_MODE; + break; default: *tch_mode = SIG_ONLY_MODE; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34694?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib73210b273826ded56d42c41ffeb835eef96dd2b Gerrit-Change-Number: 34694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[S] Change in pysim[master]: transport: print device path/number on initialization failure
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34693?usp=email ) Change subject: transport: print device path/number on initialization failure .. Patch Set 4: (1 comment) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34693/comment/b8c6c936_1674ba60 PS4, Line 323: if opts.pcsc_dev is not None: > Can we just include this info in the `print()s` above? […] There is a patch that does this, see I5c08995fcd55bd9bb173adc2acd9722e438a164b, but I am not sure if it is the best solution. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3f5387508ccc2aa349adc7aec3d04d8fc977690b Gerrit-Change-Number: 34693 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 15:37:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email ) Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?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: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Mon, 09 Oct 2023 15:33:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band .. BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band At some point (see related commit) we changed the ordering of default interference boundaries from descending to ascending in osmo-bsc. However the testsuite was not updated. Fix this. Change-Id: I4f0d0814c343c626f6f7e5bafb7ac46cd7f362f6 Related: osmo-bsc.git Ie9bf4bf0c89418685b8ea5096332d22cfba7c521 Related: SYS#5313, OS#5956 --- M bts/BTS_Tests.ttcn 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index db66b0c..d667344 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -135,16 +135,16 @@ /* default Training Sequence Code */ GsmTsc mp_tsc_def := 7; /* Default interference boundaries in osmo-bsc (in dBm): -* 0(-85) X1(-91) X2(-97) X3(-103) X4(-109) X5(-115) +* 0(-115) X1(-109) X2(-103) X3(-97) X4(-91) X5(-85) * Default interference level reported by fake_trx.py: -*0: -109 >= -85 dBm (no) -* X1: -109 >= -91 dBm (no) -* X2: -109 >= -97 dBm (no) -* X3: -109 >= -103 dBm (no) -* X4: -109 >= -109 dBm (yes) -* X5: -109 >= -115 dBm (no) -* So all channels should be in band 4. */ - uint3_t mp_interf_band := 4; +*0: -109 < -115 dBm +* X1: -109 < -109 dBm +* X2: -109 < -103 dBm <-- stop here +* X3: -109 < -97 dBm +* X4: -109 < -91 dBm +* X5: -109 < -85 dBm +* So all channels should be in band 2. */ + uint3_t mp_interf_band := 2; /* T3105 timer (see 3GPP TS 44.018, section 11.1.2) */ integer mp_ho_t3105_ms := 100; /* Ny1 counter (see 3GPP TS 44.018, section 11.1.3) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?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: I4f0d0814c343c626f6f7e5bafb7ac46cd7f362f6 Gerrit-Change-Number: 34678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band .. Patch Set 1: Code-Review+2 (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678/comment/a5e77bf3_b04b9b68 PS1, Line 140: -109 > remove -109 as well if you remove the (yes) and (no)? `-109` is the default interference level reported by fake_trx.py, so we have it in each line to clarify what is compared against what. So I prefer to keep it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?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: I4f0d0814c343c626f6f7e5bafb7ac46cd7f362f6 Gerrit-Change-Number: 34678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 15:09:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: print reader device/number on init
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init .. Patch Set 8: (1 comment) Patchset: PS8: Funny enough, it was you who removed this additional info from `print()s` and now you're adding it back :P https://gerrit.osmocom.org/q/I243cc332f075d007b1c111292effcc610e874eb3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 15:04:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: print reader device/number on init
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init .. Patch Set 8: (1 comment) Patchset: PS4: > It is probably not the best idea to print the device name all the time. […] A potential solution is to use proper Python's logging rather than `print()s`. This way you can control the logging level/verbosity and even turn on/off logging for specific *.py modules. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 15:00:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: print device path/number on initialization failure
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34693?usp=email ) Change subject: transport: print device path/number on initialization failure .. Patch Set 4: (1 comment) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34693/comment/53e7d902_666a5672 PS4, Line 323: if opts.pcsc_dev is not None: Can we just include this info in the `print()s` above? This way you always get this info, not only on exception... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3f5387508ccc2aa349adc7aec3d04d8fc977690b Gerrit-Change-Number: 34693 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:58:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34692?usp=email ) Change subject: pySim-shell: print device info in case an exception occurs .. Patch Set 4: Code-Review+2 (1 comment) File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34692/comment/ec7805e5_79f77a32 PS4, Line 72: def __str__(self): `-> str:` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb Gerrit-Change-Number: 34692 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:55:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:53:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: show full traceback on failed reader init
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34687?usp=email ) Change subject: transport: show full traceback on failed reader init .. Patch Set 4: (2 comments) Commit Message: https://gerrit.osmocom.org/c/pysim/+/34687/comment/1c968293_3119e18c PS4, Line 9: failes fails? File pySim/transport/__init__.py: https://gerrit.osmocom.org/c/pysim/+/34687/comment/44ffb089_e7bb2c3a PS4, Line 318: except Exception as e I am wondering if we really need to catch exceptions here. All we're doing is printing the backtrace and returning `None`, right? All callers of this function check the returned value and do `sys.exit()` if it's `None`. This kinda mimics what happens when you don't catch the exceptions at all and let them raise... I would suggest simply removing this `try-catch` block as well as all checks against `None` - this way we efficiently achieve the same result without any additional logic. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46e913a516dbc13f7610512484f515ab25d3fbae Gerrit-Change-Number: 34687 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:51:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in pysim[master]: pySim-prog, pySim-shell do not use global variables
Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34688?usp=email ) Change subject: pySim-prog, pySim-shell do not use global variables .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f Gerrit-Change-Number: 34688 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:37:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: print device path/number on initialization failure
Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34693?usp=email ) Change subject: transport: print device path/number on initialization failure .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3f5387508ccc2aa349adc7aec3d04d8fc977690b Gerrit-Change-Number: 34693 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:09:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34692?usp=email ) Change subject: pySim-shell: print device info in case an exception occurs .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb Gerrit-Change-Number: 34692 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:07:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
Attention is currently required from: dexter, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 14:05:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email to look at the new patch set (#4). Change subject: pySim-shell: print device info in case an exception occurs .. pySim-shell: print device info in case an exception occurs When an exception occurs while initializing or handling the card we print a traceback, but we do not print any info that allows us to identify the device that was involved when the exception occurred. Let's include the device path or number in the error message before we print the traceback. In order to make it easier to print the device information, let's add a __str__() method to all of our devices. This method shall return the device number or path. Related: OS#6210 Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb --- M pySim-shell.py M pySim-trace.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py 7 files changed, 46 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/34692/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb Gerrit-Change-Number: 34692 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34692?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: pySim-shell: print device info in case an exception occurs .. pySim-shell: print device info in case an exception occurs When an exception occurs while initializing or handling the card we print a traceback, but we do not print any info that allows us to identify the device that was involved when the exception occurred. Let's include the device path or number in the error message before we print the traceback. In order to make it easier to print the device information, let's add a __str__() method to all of our devices. This method shall return the device number or path. Related: OS#6210 Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb --- M pySim-shell.py M pySim-trace.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py 7 files changed, 46 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/34692/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb Gerrit-Change-Number: 34692 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: transport: print reader device/number on init
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init .. Patch Set 6: (1 comment) Patchset: PS6: I am not sure if this a good solution. Maybe we should print the device info only in case an error occurs? See also the patch before this one: I3f5387508ccc2aa349adc7aec3d04d8fc977690b -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 13:08:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34692?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: pySim-shell: print device info in case an exception occurs .. pySim-shell: print device info in case an exception occurs When an exception occurs while initializing or handling the card we print a traceback, but we do not print any info that allows us to identify the device that was involved when the exception occurred. Let's include the device path or number in the error message before we print the traceback. In order to make it easier to print the device information, let's add a __str__() method to all of our devices. This method shall return the device number or path. Related: OS#6210 Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb --- M pySim-shell.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py 6 files changed, 43 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/34692/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34692?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb Gerrit-Change-Number: 34692 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. stream: Add and use helper function osmo_ipa_push_headers() Related OS#5753, OS#5751 Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/ipa.h M src/ipa.c M tests/stream/stream_test.c 5 files changed, 38 insertions(+), 10 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index db7d441..cb07ef6 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -93,9 +93,7 @@ msg_sent->num = i; llist_add(_sent->head, _sent_list); - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_MGCP); - osmo_ipa_msg_push_header(msg, IPAC_PROTO_OSMO); - + osmo_ipa_msg_push_headers(msg, osmo_ipa_msgb_cb_proto(msg), osmo_ipa_msgb_cb_proto_ext(msg)); osmo_stream_cli_send(conn, msg); LOGP(DIPATEST, LOGL_DEBUG, "enqueueing msg %d of " diff --git a/examples/ipa-stream-server.c b/examples/ipa-stream-server.c index d31b752..5317921 100644 --- a/examples/ipa-stream-server.c +++ b/examples/ipa-stream-server.c @@ -51,9 +51,7 @@ { LOGP(DSTREAMTEST, LOGL_DEBUG, "received message from stream (payload len=%d)\n", msgb_length(msg)); - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_MGCP); - osmo_ipa_msg_push_header(msg, IPAC_PROTO_OSMO); - + osmo_ipa_msg_push_headers(msg, osmo_ipa_msgb_cb_proto(msg), osmo_ipa_msgb_cb_proto_ext(msg)); osmo_stream_srv_send(conn, msg); return 0; } diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h index 7826895..038b9ac 100644 --- a/include/osmocom/netif/ipa.h +++ b/include/osmocom/netif/ipa.h @@ -65,4 +65,6 @@ int osmo_ipa_segmentation_cb(struct msgb *msg); +void osmo_ipa_msg_push_headers(struct msgb *msg, enum ipaccess_proto p, enum ipaccess_proto_ext pe); + #endif diff --git a/src/ipa.c b/src/ipa.c index a67521f..8720427 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -436,3 +436,15 @@ } return total_len; } + +/*! Push IPA headers to a message + * If we have IPAC_PROTO_OSMO this also takes care of the extension header + * \param[out] msgTarget message + * \param p Target IPA protocol + * \param pe Target IPA protocol extension. Ignored, unless p equals IPAC_PROTO_OSMO. */ +void osmo_ipa_msg_push_headers(struct msgb *msg, enum ipaccess_proto p, enum ipaccess_proto_ext pe) +{ + if (p == IPAC_PROTO_OSMO) + ipa_prepend_header_ext(msg, pe); + osmo_ipa_msg_push_header(msg, p); +} diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index 960d8fa..4830302 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -384,12 +384,17 @@ IPAC_PROTO_IPACCESS, IPAC_MSGT_PONG }; +#define IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER \ + IPAC_MSGT_ID_GET, \ + 0x01, IPAC_IDTAG_UNITNAME +static const uint8_t ipac_msg_idreq_payload[] = { + IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER +}; #define IPAC_MSG_ID_REQ_LEN 0x03 static const uint8_t ipac_msg_idreq[] = { 0x00, IPAC_MSG_ID_REQ_LEN, IPAC_PROTO_IPACCESS, - IPAC_MSGT_ID_GET, - 0x01, IPAC_IDTAG_UNITNAME + IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER }; #define ipac_msg_idreq_third (sizeof(ipac_msg_idreq)/3) #define ipac_msg_idreq_last_third (sizeof(ipac_msg_idreq) - 2 * ipac_msg_idreq_third) @@ -574,7 +579,8 @@ fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; } - put_ipa_msg(data, m, ipac_msg_idreq); + put_ipa_msg(data, m, ipac_msg_idreq_payload); + osmo_ipa_msg_push_headers(m, IPAC_PROTO_IPACCESS, -1); osmo_stream_srv_send(conn, m); } else if (msgnum_srv == 7 && *msgt == IPAC_MSGT_PONG) { test_segm_ipa_stream_srv_all_msgs_processed = true; @@ -766,7 +772,8 @@ fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; } - put_ipa_msg(data, m, ipac_msg_idreq); + put_ipa_msg(data, m, ipac_msg_idreq_payload); + osmo_ipa_msg_push_headers(m, IPAC_PROTO_IPACCESS, -1); osmo_stream_cli_send(osc, m); } else if (msgnum_cli == 7 && *msgt == IPAC_MSGT_PONG) { test_segm_ipa_stream_cli_all_msgs_processed = true; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email To unsubscribe, or for help writing mail filters, visit
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
Attention is currently required from: arehbein, fixeria, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. Patch Set 22: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?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: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 22 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 12:48:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
Attention is currently required from: fixeria, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. Patch Set 22: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/d9b1697e_24d5290a PS21, Line 73: static inline void osmo_ipa_msg_push_headers(struct msgb *msg, enum ipaccess_proto p, enum ipaccess_proto_ext pe) > This is still not applied? Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?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: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 22 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 12:37:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
Attention is currently required from: arehbein, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. Patch Set 22: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?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: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 22 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: arehbein Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 12:30:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
Attention is currently required from: arehbein, fixeria, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email to look at the new patch set (#22). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. stream: Add and use helper function osmo_ipa_push_headers() Related OS#5753, OS#5751 Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/ipa.h M src/ipa.c M tests/stream/stream_test.c 5 files changed, 38 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/33201/22 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?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: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 22 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: arehbein Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
Attention is currently required from: arehbein, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. Patch Set 21: Code-Review-1 (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/3ebdef31_ceb3b173 PS21, Line 73: static inline void osmo_ipa_msg_push_headers(struct msgb *msg, enum ipaccess_proto p, enum ipaccess_proto_ext pe) > Let's put this in a proper function, not a "static inline", given it's an > public API in a library. […] This is still not applied? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?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: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: arehbein Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 12:28:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream (test): Fix Coverity CID 323456
arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34671?usp=email ) Change subject: stream (test): Fix Coverity CID 323456 .. stream (test): Fix Coverity CID 323456 Fix Coverity CID 323456 ("Control flow issues (NO_EFFECT)") by removing 'greater than 0'-check on unsigned integer-type variable. Change-Id: I2efb28feae4d4fa7516702f01026af09aa3777ac --- M tests/stream/stream_test.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index e945a1e..960d8fa 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -678,7 +678,7 @@ } LOGSRV(conn, "Received message from stream (total len including stripped headers = %lu)\n", osmo_ntohs(h->len) + sizeof(*h)); - if (ipa_msg_type < 0 || 5 < ipa_msg_type) { + if (5 < ipa_msg_type) { fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipa_msg_type); return -ENOMSG; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34671?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: I2efb28feae4d4fa7516702f01026af09aa3777ac Gerrit-Change-Number: 34671 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmo-netif[master]: stream: Add and use helper function osmo_ipa_push_headers()
Attention is currently required from: fixeria, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201?usp=email ) Change subject: stream: Add and use helper function osmo_ipa_push_headers() .. Patch Set 21: (3 comments) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/b47e2a42_6755dcd6 PS20, Line 6: #include > This header file contains a protocol definition, and making it contain the > whole stream API does not […] Done File src/ipa.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/7ede88bc_d251f762 PS20, Line 443: struct msgb *msg > If we go for exposing this API (see my other comment), the `msg` pointer > should become the first arg […] Done https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/bdd42606_87f1ac99 PS20, Line 456: osmo_ipa_stream_srv_send > I agree with fixeria here, I already shared my concerns about this kind of > API ;) Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201?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: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 21 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 09 Oct 2023 12:12:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: print reader device/number on init
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init .. Patch Set 5: (1 comment) Patchset: PS4: It is probably not the best idea to print the device name all the time. At least the tests -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 11:49:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: print device path/number on initialization failure
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34693?usp=email ) Change subject: transport: print device path/number on initialization failure .. transport: print device path/number on initialization failure When the try block in init_reader raises an exception, we print a tranceback, but we do not mention which device was involved when the problem occurred. Let's make sure we print enough information that allows us to identify the device. Related: OS#6210 Change-Id: I3f5387508ccc2aa349adc7aec3d04d8fc977690b --- M pySim/transport/__init__.py 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/93/34693/1 diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 9b28a8f..70878c7 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -321,7 +321,18 @@ baudrate=opts.baudrate, **kwargs) return sl except Exception as e: -print("Card reader initialization failed with an exception:") +if opts.pcsc_dev is not None: +devinfo = "PCSC:%u" % opts.pcsc_dev +elif opts.osmocon_sock is not None: +devinfo = "osmocon:%s" % opts.osmocon_sock +elif opts.modem_dev is not None: +devinfo = "modem:%s" % opts.modem_dev +elif opts.device is not None: +devinfo = "serial:%s" % opts.device +else: +devinfo = "none" + +print("Card reader initialization (%s) failed with an exception:" % devinfo) print("-8<-") traceback.print_exc() print("-8<-") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34693?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3f5387508ccc2aa349adc7aec3d04d8fc977690b Gerrit-Change-Number: 34693 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in pysim[master]: pySim-shell: print device info in case an exception occurs
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34692?usp=email ) Change subject: pySim-shell: print device info in case an exception occurs .. pySim-shell: print device info in case an exception occurs When an exception occurs while initializing or handling the card we print a traceback, but we do not print any info that allows us to identify the device that was involved when the exception occurred. Let's include the device path or number in the error message before we print the traceback. In order to make it easier to print the device information, let's add a __str__() method to all of our devices. This method shall return the device number or path. Related: OS#6210 Change-Id: I200463e692245da40ea6d5b609bfc0ca02d15bdb --- M pySim-shell.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py 6 files changed, 44 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/92/34692/1 diff --git a/pySim-shell.py b/pySim-shell.py index 79b4d8b..56655ba 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -374,7 +374,7 @@ rc = self.equip(card, rs) except: self.poutput("") -self.poutput("Card initialization failed with an exception:") +self.poutput("Card initialization (%s) failed with an exception:" % str(self.sl)) self.poutput("-8<-") traceback.print_exc() self.poutput("-8<-") @@ -489,7 +489,7 @@ return except: self.poutput("") -self.poutput("Card handling failed with an exception:") +self.poutput("Card handling (%s) failed with an exception:" % str(self.sl)) self.poutput("-8<-") traceback.print_exc() self.poutput("-8<-") @@ -1031,7 +1031,7 @@ rs, card = init_card(sl) app = PysimApp(card, rs, sl, ch, opts.script) except: -print("Card initialization failed with an exception:") +print("Card initialization (%s) failed with an exception:" % str(sl)) print("-8<-") traceback.print_exc() print("-8<-") diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 80a4208..9b28a8f 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -69,6 +69,10 @@ self.proactive_handler = proactive_handler @abc.abstractmethod +def __str__(self): +"""Implementation specific method for printing an information to identify the device.""" + +@abc.abstractmethod def _send_apdu_raw(self, pdu: Hexstr) -> ResTuple: """Implementation specific method for sending the PDU.""" @@ -300,6 +304,7 @@ print("Using PC/SC reader interface") from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev, **kwargs) +print(sl) elif opts.osmocon_sock is not None: print("Using Calypso-based (OsmocomBB) reader interface") from pySim.transport.calypso import CalypsoSimLink diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index 34fc646..9cfc5c6 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -90,6 +90,9 @@ self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.sock.connect(sock_path) + # Remember socket path + self._sock_path = sock_path + def __del__(self): self.sock.close() @@ -156,3 +159,6 @@ sw = rsp[-2:] return b2h(data), b2h(sw) + +def __str__(self): +return "osmocon:%s" % (self._sock_path) diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index e99762d..58d6f9d 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -169,3 +169,6 @@ sw = rsp_pdu[-4:].decode().lower() log.debug('Command response: %s, %s', data, sw) return data, sw + +def __str__(self): +return "modem:%s" % self._device diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py index a01917f..41c4c19 100644 --- a/pySim/transport/pcsc.py +++ b/pySim/transport/pcsc.py @@ -39,6 +39,7 @@ raise ReaderError('No reader found for number %d' % reader_number) self._reader = r[reader_number] self._con = self._reader.createConnection() +self._reader_number = reader_number def __del__(self): try: @@ -91,3 +92,6 @@ # Return value return i2h(data), i2h(sw) + +
[S] Change in pysim[master]: pySim-shell: do not pass failed card object to PysimApp
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34691?usp=email ) Change subject: pySim-shell: do not pass failed card object to PysimApp .. pySim-shell: do not pass failed card object to PysimApp When the try block in which we also call init_card() fails, there may be no card object, so we must not pass the card object to PysimApp in the except block. This is also no problem, PysimApp will run without the card object until the user executes do_equip for a second attempt. Related: OS#6210 Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 --- M pySim-shell.py 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/34691/1 diff --git a/pySim-shell.py b/pySim-shell.py index 3b6945c..79b4d8b 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -1040,7 +1040,7 @@ " it should also be noted that some readers may behave strangely when no card") print(" is inserted.)") print("") -app = PysimApp(card, None, sl, ch, opts.script) +app = PysimApp(None, None, sl, ch, opts.script) # If the user supplies an ADM PIN at via commandline args authenticate # immediately so that the user does not have to use the shell commands -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34691?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I28195f442ce007f05f7610c882bbc4a6520a8ce6 Gerrit-Change-Number: 34691 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in osmo-pcu[master]: Increase RR scheduler priority to 20, to avoid dropped bursts
jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34690?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Increase RR scheduler priority to 20, to avoid dropped bursts This has been fixed in osmo-bts too. If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da --- M contrib/systemd/osmo-pcu.service 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service index f688d7f..521f6fc 100644 --- a/contrib/systemd/osmo-pcu.service +++ b/contrib/systemd/osmo-pcu.service @@ -13,7 +13,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34690?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da Gerrit-Change-Number: 34690 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support .. Patch Set 4: (2 comments) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/16ca84fe_5f42e97f PS2, Line 1499: /* Do spare padding. We cannot do it earlier, because encoding might corrupt it if differenctial cell info > Indeed, SI10 employs so-called differential encoding: you encode all the info > for the first BTS and […] So if you mean "differential", then please use the correct spelling. File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/53519a82_0964f4bf PS4, Line 1456: llist_for_each_entry(c, >vgcs_chan.call->vgcs_call.chan_list, vgcs_chan.list) { "struct gsm_bts *c_bts;" can be moved here (loop scope). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?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: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 11:21:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: Increase RR scheduler priority to 20, to avoid dropped bursts
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34690?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34690?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da Gerrit-Change-Number: 34690 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: jolly Gerrit-Comment-Date: Mon, 09 Oct 2023 11:13:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: Increase RR scheduler priority to 20, to avoid dropped bursts
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34690?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Increase RR scheduler priority to 20, to avoid dropped bursts This has been fixed in osmo-bts too. If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da --- M contrib/systemd/osmo-pcu.service 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/34690/1 diff --git a/contrib/systemd/osmo-pcu.service b/contrib/systemd/osmo-pcu.service index f688d7f..521f6fc 100644 --- a/contrib/systemd/osmo-pcu.service +++ b/contrib/systemd/osmo-pcu.service @@ -13,7 +13,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34690?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifa2c36bc0975e89d21b6fb2fc49db6077e5207da Gerrit-Change-Number: 34690 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-MessageType: newchange
[S] Change in pysim[master]: transport: print reader device/number on init
Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 10:58:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email ) Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?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: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 10:57:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: transport: show full traceback on failed reader init
Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34687?usp=email ) Change subject: transport: show full traceback on failed reader init .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46e913a516dbc13f7610512484f515ab25d3fbae Gerrit-Change-Number: 34687 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 10:56:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in pysim[master]: pySim-prog, pySim-shell do not use global variables
Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34688?usp=email ) Change subject: pySim-prog, pySim-shell do not use global variables .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f Gerrit-Change-Number: 34688 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: dexter Gerrit-Comment-Date: Mon, 09 Oct 2023 10:55:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: fixeria, jolly, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. ASCI: Make neigh_list_get_arfcn() available to other users The error logging message within this function is moved to the user neigh_list_get_arfcn(). In case of an error, which results in measurement report with cell index that does not exist in the list of neigbor cells, the measurement report is truncated to 0 neighbor cell measurements. Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 50 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/34625/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?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: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: Do not generate 'bit map 0' neighbor lists with R-GSM ARFCN
Attention is currently required from: jolly, neels. Hello Jenkins Builder, fixeria, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34602?usp=email to look at the new patch set (#2). 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: Do not generate 'bit map 0' neighbor lists with R-GSM ARFCN .. Do not generate 'bit map 0' neighbor lists with R-GSM ARFCN Before this patch, neighbor cells with ARFCN 955 to 974 were ignored in the GSM 900 band. This resulted an empty 'bit map 0' list in SI2/SI5 messages. This patch includes R-GSM ARFCN in range 955 to 974. A different encoding is chosen, if neigboring cells fall within this range. Change-Id: I40d024290fa4be2ba8d3149ec841b182d0cc8c1f --- M src/osmo-bsc/system_information.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/34602/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34602?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: I40d024290fa4be2ba8d3149ec841b182d0cc8c1f Gerrit-Change-Number: 34602 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: neels Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: Select correct neighbor list for measurement report decoding
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34624?usp=email to look at the new patch set (#2). 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: Select correct neighbor list for measurement report decoding .. Select correct neighbor list for measurement report decoding System Information 2 (bis/ter) uses BA_IND of 0. This refers to "neigh_list". System information 5 (bis/ter) uses BA_IND of 1. This may refer to "neigh_list" or optionally "si5_neigh_list", depending on the VTY settings. If BA_IND of 1 is received in measurement report and if the optional "si5_neigh_list" is used, this list is chosen to decode the measurement report. Change-Id: Ie9123928fb3ae6f10921ecf01d1b50330661da38 --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/34624/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34624?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: Ie9123928fb3ae6f10921ecf01d1b50330661da38 Gerrit-Change-Number: 34624 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in pysim[master]: pySim-prog, pySim-shell do not use global variables
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34688?usp=email ) Change subject: pySim-prog, pySim-shell do not use global variables .. Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f Gerrit-Change-Number: 34688 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 09 Oct 2023 10:27:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: do not use global variable app
dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/34689?usp=email ) Change subject: pySim-shell: do not use global variable app .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34689?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc415ee84ee2d1e419fd641a8dcb9bc592644fdb Gerrit-Change-Number: 34689 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in pysim[master]: pySim-shell: do not use global variable app
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34689?usp=email ) Change subject: pySim-shell: do not use global variable app .. pySim-shell: do not use global variable app The constructor of Cmd2ApduTracer assigns self.cmd2 from the global variable app. However the constructor has a parameter cmd2_app, which is also a reference to app. Lets use cmd2_app here instead. Related: OS#6210 Change-Id: Ibc415ee84ee2d1e419fd641a8dcb9bc592644fdb --- M pySim-shell.py 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/89/34689/1 diff --git a/pySim-shell.py b/pySim-shell.py index c7b2607..a949509 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -276,7 +276,7 @@ class Cmd2ApduTracer(ApduTracer): def __init__(self, cmd2_app): -self.cmd2 = app +self.cmd2 = cmd2_app def trace_response(self, cmd, sw, resp): self.cmd2.poutput("-> %s %s" % (cmd[:10], cmd[10:])) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34689?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc415ee84ee2d1e419fd641a8dcb9bc592644fdb Gerrit-Change-Number: 34689 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in pysim[master]: WIP: fix problem with global variables
Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34688?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: WIP: fix problem with global variables .. WIP: fix problem with global variables Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f --- M pySim-prog.py M pySim-shell.py A testme 3 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/88/34688/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f Gerrit-Change-Number: 34688 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in osmo-bts[osmith/1.7.1]: Bump version: 1.7.0.5-2f73 → 1.7.1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email ) Change subject: Bump version: 1.7.0.5-2f73 → 1.7.1 .. Bump version: 1.7.0.5-2f73 → 1.7.1 Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c --- M debian/changelog 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 410c549..d317627 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +osmo-bts (1.7.1) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind + + [ Oliver Smith ] + * systemd: remove RestartPreventExitStatus=1 + + [ Andreas Eversberg ] + * ASCI: Ignore LAPD frames from MS, while the uplink is not active + * Do not prefix UI header to System Information Type 10 + * Increase RR scheduler priority to 20, to avoid dropped bursts + + -- Oliver Smith Mon, 09 Oct 2023 10:11:10 +0200 + osmo-bts (1.7.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c Gerrit-Change-Number: 34685 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bts[osmith/1.7.1]: Increase RR scheduler priority to 20, to avoid dropped bursts
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Increase RR scheduler priority to 20, to avoid dropped bursts If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 (cherry picked from commit d265ce68b24b1c3ed95f328f9fe8bec6e5396c5a) --- M contrib/systemd/osmo-bts-sysmo.service 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09e91de..3d99655 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -17,7 +17,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34684 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: jolly Gerrit-MessageType: merged
[S] Change in osmo-bts[osmith/1.7.1]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email ) 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 that is received on the uplink 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 messages. A response by LAPD to these messages is not desired and not required. If LAPD would respond, it would cause stopping transmission of UPLINK FREE messages. No MS could access the uplink anymore. Note: UPLINK FREE messages are repeated automatically until a different message is transmitted. Related: OS#5781 Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 (cherry picked from commit f5c1cd3889bb52b1166066885e2d65b87692a37e) --- M src/common/l1sap.c 1 file changed, 35 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 9814f86..844fdad 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1810,9 +1810,20 @@ if (lchan->ho.active == HANDOVER_WAIT_FRAME) handover_frame(lchan); - /* report first valid received frame to VGCS talker process */ - if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt) && lchan->asci.talker_active == VGCS_TALKER_WAIT_FRAME) - vgcs_talker_frame(lchan); + if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) { + /* report first valid received frame to VGCS talker process */ + if (lchan->asci.talker_active == VGCS_TALKER_WAIT_FRAME) + vgcs_talker_frame(lchan); + /* Do not forward any message that is received on the uplink 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 messages. A +* response by LAPD to these messages is not desired and not required. If +* LAPD would respond, it would cause stopping transmission of UPLINK FREE +* messages. No MS could access the uplink anymore. +*/ + if (lchan->asci.talker_active != VGCS_TALKER_ACTIVE) + return 0; + } if (L1SAP_IS_LINK_SACCH(link_id)) le = >lapdm_ch.lapdm_acch; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34682 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: jolly Gerrit-MessageType: merged
[S] Change in osmo-bts[osmith/1.7.1]: Do not prefix UI header to System Information Type 10
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email ) Change subject: Do not prefix UI header to System Information Type 10 .. Do not prefix UI header to System Information Type 10 System Information Type 10 uses short L2 header that is transmitted as Bter UI frame. The complete frame is sent by BSC, including short L2 header. Only the SACCH layer 1 header is added by the BTS. A switch() statement is used, so other System Information with short L2 header can be added in the future. Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c (cherry picked from commit ddc15996ddecfdb533d77ae45fa33587c51bb223) --- M src/common/rsl.c 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 5231765..fdb9899 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -993,6 +993,15 @@ * \param[in] len length of \a current in octets */ static inline void lapdm_ui_prefix(uint8_t *buf, uint32_t *valid, const uint8_t *current, uint8_t osmo_si, uint16_t len) { + /* Special case for short header SI. Do not pre-fix the two-byte UI header. */ + switch (osmo_si) { + case SYSINFO_TYPE_10: + (*valid) |= (1 << osmo_si); + memset(buf, GSM_MACBLOCK_PADDING, sizeof(sysinfo_buf_t)); + memcpy(buf, current, len); + return; + } + /* We have to pre-fix with the two-byte LAPDM UI header */ if (len > sizeof(sysinfo_buf_t) - 2) { LOGP(DRSL, LOGL_ERROR, "Truncating received SI%s (%u -> %zu) to prepend LAPDM UI header (2 bytes)\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c Gerrit-Change-Number: 34683 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: jolly Gerrit-MessageType: merged
[S] Change in osmo-bts[osmith/1.7.1]: systemd: remove RestartPreventExitStatus=1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. systemd: remove RestartPreventExitStatus=1 Fix OsmoBTS not restarting if e.g. an external gsmtap IP is configured that is currently not available. Also make the service files more consistent with other Osmocom projects. Partial revert of ae2473c2 ("systemd: Do not restart with a broken config file or such"). Related: SYS#6581 Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b (cherry picked from commit 188f76275a2b0d64a4b1beaceb73ad89c837a607) --- M contrib/systemd/osmo-bts-lc15.service M contrib/systemd/osmo-bts-oc2g.service M contrib/systemd/osmo-bts-sysmo.service 3 files changed, 18 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service index fd0760a..03341bd 100644 --- a/contrib/systemd/osmo-bts-lc15.service +++ b/contrib/systemd/osmo-bts-lc15.service @@ -11,7 +11,6 @@ RuntimeDirectory=osmo-bts Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index dabb002..bc64a54 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -11,7 +11,6 @@ RuntimeDirectory=osmo-bts Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09880a8..09e91de 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -13,7 +13,6 @@ WorkingDirectory=%S/osmocom Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34681 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bts[osmith/1.7.1]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind .. l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind It was reported that osmo-bts-sysmo is crashing due to a TCH.ind primitive being received by l1sap_tch_ind() for an lchan, which is operating neither in speech nor data, but in signalling mode. It's not clear which scenario is causing this situation. My best guess is that one or more TCH.ind primitive(s) remain waiting in the lower layers and bob up right after the channel mode change. This can happen, for instance, when a dynamic timeslot gets switched from TCH/F or TCH/H to PDCH or SDCCH/8. Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Fixes: d1f8f3429 "l1sap: proper rate adaptation for CSD" Closes: OS#6180 (cherry picked from commit aa06f9732672098eb58cb11ec388f3ea932fbd5b) --- M src/common/l1sap.c 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 13d271e..9814f86 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1979,6 +1979,7 @@ send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len); break; case RSL_CMOD_SPD_SIGN: + return 0; /* drop stale TCH.ind */ default: /* shall not happen */ OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged
[XS] Change in pysim[master]: Test, please ignore
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34688?usp=email ) Change subject: Test, please ignore .. Test, please ignore Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f --- A testme 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/88/34688/1 diff --git a/testme b/testme new file mode 100644 index 000..e69de29 --- /dev/null +++ b/testme -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7f09e9a6a6bfc658de75e86f7383ce73726f Gerrit-Change-Number: 34688 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in pysim[master]: transport: print reader device/number on init
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34686?usp=email ) Change subject: transport: print reader device/number on init .. transport: print reader device/number on init When we initialize the reader, we currently tell only which type of interface we are using, but we do not print the reader number or the device path. Related: OS#6210 Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b --- M pySim/transport/__init__.py 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/34686/1 diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index c8079f6..79f82c2 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -295,20 +295,20 @@ sl = None # type : :Optional[LinkBase] try: if opts.pcsc_dev is not None: -print("Using PC/SC reader interface") +print("Using PC/SC reader number %u" % opts.pcsc_dev) from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev, **kwargs) elif opts.osmocon_sock is not None: -print("Using Calypso-based (OsmocomBB) reader interface") +print("Using Calypso-based (OsmocomBB) reader at socket %s" % opts.osmocon_sock) from pySim.transport.calypso import CalypsoSimLink sl = CalypsoSimLink(sock_path=opts.osmocon_sock, **kwargs) elif opts.modem_dev is not None: -print("Using modem for Generic SIM Access (3GPP TS 27.007)") +print("Using modem for Generic SIM Access (3GPP TS 27.007) at port %s" % opts.modem_dev) from pySim.transport.modem_atcmd import ModemATCommandLink sl = ModemATCommandLink( device=opts.modem_dev, baudrate=opts.modem_baud, **kwargs) else: # Serial reader is default -print("Using serial reader interface") +print("Using serial reader interface at port %s" % opts.device) from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate, **kwargs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5c08995fcd55bd9bb173adc2acd9722e438a164b Gerrit-Change-Number: 34686 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in pysim[master]: transport: show full traceback on failed reader init
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34687?usp=email ) Change subject: transport: show full traceback on failed reader init .. transport: show full traceback on failed reader init When the reader initialization failes with an exception we may have a major hardware problem and it may not be enough to print only the exception message. Also in some rare cases an exception message may not be available. To make it easier to debug problems lets print the full traceback like we already do it in pySim-shell.py. Related: OS#6210 Change-Id: I46e913a516dbc13f7610512484f515ab25d3fbae --- M pySim/transport/__init__.py 1 file changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/87/34687/1 diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 79f82c2..6bce674 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -5,6 +5,7 @@ import abc import argparse +import traceback from typing import Optional, Tuple from construct import Construct @@ -293,6 +294,7 @@ Init card reader driver """ sl = None # type : :Optional[LinkBase] + try: if opts.pcsc_dev is not None: print("Using PC/SC reader number %u" % opts.pcsc_dev) @@ -314,9 +316,8 @@ baudrate=opts.baudrate, **kwargs) return sl except Exception as e: -if str(e): -print("Card reader initialization failed with exception:\n" + str(e)) -else: -print( -"Card reader initialization failed with an exception of type:\n" + str(type(e))) +print("Card reader initialization failed with an exception:") +print("-8<-") +traceback.print_exc() +print("-8<-") return None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I46e913a516dbc13f7610512484f515ab25d3fbae Gerrit-Change-Number: 34687 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
[S] Change in osmo-bts[osmith/1.7.1]: Bump version: 1.7.0.5-2f73 → 1.7.1
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email ) Change subject: Bump version: 1.7.0.5-2f73 → 1.7.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c Gerrit-Change-Number: 34685 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 08:27:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Increase RR scheduler priority to 20, to avoid dropped bursts
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34684 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: jolly Gerrit-Comment-Date: Mon, 09 Oct 2023 08:27:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Do not prefix UI header to System Information Type 10
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email ) Change subject: Do not prefix UI header to System Information Type 10 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c Gerrit-Change-Number: 34683 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: jolly Gerrit-Comment-Date: Mon, 09 Oct 2023 08:27:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email ) Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34682 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: jolly Gerrit-Comment-Date: Mon, 09 Oct 2023 08:27:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: systemd: remove RestartPreventExitStatus=1
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34681 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 09 Oct 2023 08:27:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 08:27:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?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: I4f0d0814c343c626f6f7e5bafb7ac46cd7f362f6 Gerrit-Change-Number: 34678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 08:26:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Bump version: 1.7.0.5-2f73 → 1.7.1
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email ) Change subject: Bump version: 1.7.0.5-2f73 → 1.7.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c Gerrit-Change-Number: 34685 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 08:26:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Increase RR scheduler priority to 20, to avoid dropped bursts
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34684 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: jolly Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:26:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Bump version: 1.7.0.5-2f73 → 1.7.1
Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email ) Change subject: Bump version: 1.7.0.5-2f73 → 1.7.1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c Gerrit-Change-Number: 34685 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 09 Oct 2023 08:25:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Increase RR scheduler priority to 20, to avoid dropped bursts
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34684 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-CC: jolly Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:25:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Do not prefix UI header to System Information Type 10
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email ) Change subject: Do not prefix UI header to System Information Type 10 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c Gerrit-Change-Number: 34683 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: jolly Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:25:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Do not prefix UI header to System Information Type 10
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email ) Change subject: Do not prefix UI header to System Information Type 10 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c Gerrit-Change-Number: 34683 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: jolly Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:25:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email ) Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34682 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: jolly Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:25:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email ) Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34682 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: jolly Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:25:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: systemd: remove RestartPreventExitStatus=1
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34681 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:24:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: systemd: remove RestartPreventExitStatus=1
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34681 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:24:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:24:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 09 Oct 2023 08:24:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[osmith/1.7.1]: Bump version: 1.7.0.5-2f73 → 1.7.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email ) Change subject: Bump version: 1.7.0.5-2f73 → 1.7.1 .. Bump version: 1.7.0.5-2f73 → 1.7.1 Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c --- M debian/changelog 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/34685/1 diff --git a/debian/changelog b/debian/changelog index 410c549..d317627 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +osmo-bts (1.7.1) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind + + [ Oliver Smith ] + * systemd: remove RestartPreventExitStatus=1 + + [ Andreas Eversberg ] + * ASCI: Ignore LAPD frames from MS, while the uplink is not active + * Do not prefix UI header to System Information Type 10 + * Increase RR scheduler priority to 20, to avoid dropped bursts + + -- Oliver Smith Mon, 09 Oct 2023 10:11:10 +0200 + osmo-bts (1.7.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I7125471f5962e558b361802835055e4a8c8f6a3c Gerrit-Change-Number: 34685 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-bts[osmith/1.7.1]: Do not prefix UI header to System Information Type 10
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email ) Change subject: Do not prefix UI header to System Information Type 10 .. Do not prefix UI header to System Information Type 10 System Information Type 10 uses short L2 header that is transmitted as Bter UI frame. The complete frame is sent by BSC, including short L2 header. Only the SACCH layer 1 header is added by the BTS. A switch() statement is used, so other System Information with short L2 header can be added in the future. Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c (cherry picked from commit ddc15996ddecfdb533d77ae45fa33587c51bb223) --- M src/common/rsl.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/34683/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 5231765..fdb9899 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -993,6 +993,15 @@ * \param[in] len length of \a current in octets */ static inline void lapdm_ui_prefix(uint8_t *buf, uint32_t *valid, const uint8_t *current, uint8_t osmo_si, uint16_t len) { + /* Special case for short header SI. Do not pre-fix the two-byte UI header. */ + switch (osmo_si) { + case SYSINFO_TYPE_10: + (*valid) |= (1 << osmo_si); + memset(buf, GSM_MACBLOCK_PADDING, sizeof(sysinfo_buf_t)); + memcpy(buf, current, len); + return; + } + /* We have to pre-fix with the two-byte LAPDM UI header */ if (len > sizeof(sysinfo_buf_t) - 2) { LOGP(DRSL, LOGL_ERROR, "Truncating received SI%s (%u -> %zu) to prepend LAPDM UI header (2 bytes)\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34683?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ifede42bfd84ea5914b559a20ae68f594d2ee1a5c Gerrit-Change-Number: 34683 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: jolly Gerrit-MessageType: newchange
[S] Change in osmo-bts[osmith/1.7.1]: systemd: remove RestartPreventExitStatus=1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email ) Change subject: systemd: remove RestartPreventExitStatus=1 .. systemd: remove RestartPreventExitStatus=1 Fix OsmoBTS not restarting if e.g. an external gsmtap IP is configured that is currently not available. Also make the service files more consistent with other Osmocom projects. Partial revert of ae2473c2 ("systemd: Do not restart with a broken config file or such"). Related: SYS#6581 Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b (cherry picked from commit 188f76275a2b0d64a4b1beaceb73ad89c837a607) --- M contrib/systemd/osmo-bts-lc15.service M contrib/systemd/osmo-bts-oc2g.service M contrib/systemd/osmo-bts-sysmo.service 3 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/34681/1 diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service index fd0760a..03341bd 100644 --- a/contrib/systemd/osmo-bts-lc15.service +++ b/contrib/systemd/osmo-bts-lc15.service @@ -11,7 +11,6 @@ RuntimeDirectory=osmo-bts Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index dabb002..bc64a54 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -11,7 +11,6 @@ RuntimeDirectory=osmo-bts Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09880a8..09e91de 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -13,7 +13,6 @@ WorkingDirectory=%S/osmocom Restart=always RestartSec=2 -RestartPreventExitStatus=1 # CPU scheduling policy: CPUSchedulingPolicy=rr -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: Ieeed858c159839ebaa27b2be35a597fb86874c4b Gerrit-Change-Number: 34681 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-bts[osmith/1.7.1]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind .. l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind It was reported that osmo-bts-sysmo is crashing due to a TCH.ind primitive being received by l1sap_tch_ind() for an lchan, which is operating neither in speech nor data, but in signalling mode. It's not clear which scenario is causing this situation. My best guess is that one or more TCH.ind primitive(s) remain waiting in the lower layers and bob up right after the channel mode change. This can happen, for instance, when a dynamic timeslot gets switched from TCH/F or TCH/H to PDCH or SDCCH/8. Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Fixes: d1f8f3429 "l1sap: proper rate adaptation for CSD" Closes: OS#6180 (cherry picked from commit aa06f9732672098eb58cb11ec388f3ea932fbd5b) --- M src/common/l1sap.c 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/34680/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 13d271e..9814f86 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1979,6 +1979,7 @@ send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len); break; case RSL_CMOD_SPD_SIGN: + return 0; /* drop stale TCH.ind */ default: /* shall not happen */ OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34680?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34680 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: fixeria Gerrit-MessageType: newchange
[S] Change in osmo-bts[osmith/1.7.1]: Increase RR scheduler priority to 20, to avoid dropped bursts
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Increase RR scheduler priority to 20, to avoid dropped bursts If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 (cherry picked from commit d265ce68b24b1c3ed95f328f9fe8bec6e5396c5a) --- M contrib/systemd/osmo-bts-sysmo.service 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/34684/1 diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09e91de..3d99655 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -17,7 +17,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34684 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: jolly Gerrit-MessageType: newchange
[S] Change in osmo-bts[osmith/1.7.1]: ASCI: Ignore LAPD frames from MS, while the uplink is not active
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email ) 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 that is received on the uplink 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 messages. A response by LAPD to these messages is not desired and not required. If LAPD would respond, it would cause stopping transmission of UPLINK FREE messages. No MS could access the uplink anymore. Note: UPLINK FREE messages are repeated automatically until a different message is transmitted. Related: OS#5781 Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 (cherry picked from commit f5c1cd3889bb52b1166066885e2d65b87692a37e) --- M src/common/l1sap.c 1 file changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/34682/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 9814f86..844fdad 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1810,9 +1810,20 @@ if (lchan->ho.active == HANDOVER_WAIT_FRAME) handover_frame(lchan); - /* report first valid received frame to VGCS talker process */ - if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt) && lchan->asci.talker_active == VGCS_TALKER_WAIT_FRAME) - vgcs_talker_frame(lchan); + if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt)) { + /* report first valid received frame to VGCS talker process */ + if (lchan->asci.talker_active == VGCS_TALKER_WAIT_FRAME) + vgcs_talker_frame(lchan); + /* Do not forward any message that is received on the uplink 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 messages. A +* response by LAPD to these messages is not desired and not required. If +* LAPD would respond, it would cause stopping transmission of UPLINK FREE +* messages. No MS could access the uplink anymore. +*/ + if (lchan->asci.talker_active != VGCS_TALKER_ACTIVE) + return 0; + } if (L1SAP_IS_LINK_SACCH(link_id)) le = >lapdm_ch.lapdm_acch; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34682?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: osmith/1.7.1 Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34682 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: jolly Gerrit-MessageType: newchange
[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Increase RR scheduler priority to 20, to avoid dropped bursts If frames are not deliverd fast enough to the DSP, bursts will get dropped. The osmo-bts-sysmo process must have priority over other processes, so it can deliver frames fast enough. Related: OS#6199 Change-Id: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 --- M contrib/systemd/osmo-bts-sysmo.service 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index 09e91de..3d99655 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -17,7 +17,7 @@ # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): -CPUSchedulingPriority=11 +CPUSchedulingPriority=20 # See sched(7) for further details on real-time policies and priorities [Install] -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?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: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: Increase RR scheduler priority to 20, to avoid dropped bursts
Attention is currently required from: jolly. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34581?usp=email ) Change subject: Increase RR scheduler priority to 20, to avoid dropped bursts .. Patch Set 1: (1 comment) Patchset: PS1: I'll merge this, to include it in osmo-bts 1.7.1 (OS#6198). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34581?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: I2394e6bbc00a1d47987dbe7b70f4b5cbedf69b10 Gerrit-Change-Number: 34581 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Mon, 09 Oct 2023 08:04:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band
Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?usp=email ) Change subject: BTS_Tests: fix TC_rsl_rf_resource_ind: update mp_interf_band .. Patch Set 1: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678/comment/7772c45b_b753e792 PS1, Line 140: -109 remove -109 as well if you remove the (yes) and (no)? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34678?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: I4f0d0814c343c626f6f7e5bafb7ac46cd7f362f6 Gerrit-Change-Number: 34678 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Mon, 09 Oct 2023 08:00:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment