dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28277 )
Change subject: pySim-shell: set default ADM key reference
......................................................................
pySim-shell: set default ADM key reference
ETSI TS 102 221, Table 9.3 specifies 0x0A as default key reference for
ADM1. Lets make sure pySim-shell uses this key-reference if the card is
a generic UICC.
Change-Id: I8a96244269dc6619f39a5369502b15b83740ee45
---
M pySim-shell.py
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/28277/1
diff --git a/pySim-shell.py b/pySim-shell.py
index f498dea..e52c4ef 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -83,16 +83,26 @@
print("Card not readable!")
return None, None
+ generic_card = False
card = card_detect("auto", scc)
if card is None:
print("Warning: Could not detect card type - assuming a generic card type...")
card = SimCard(scc)
+ generic_card = True
profile = CardProfile.pick(scc)
if profile is None:
print("Unsupported card type!")
return None, card
+ # ETSI TS 102 221, Table 9.3 specifies a default for the PIN key
+ # references, however card manufactures may still decide to pick an
+ # arbitrary key reference. In case we run on a generic card class that is
+ # detected as an UICC, we will pick the key reference that is officially
+ # specified.
+ if generic_card and isinstance(profile, CardProfileUICC):
+ card._adm_chv_num = 0x0A
+
print("Info: Card is of type: %s" % str(profile))
# FIXME: This shouln't be here, the profile should add the applications,
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28277
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I8a96244269dc6619f39a5369502b15b83740ee45
Gerrit-Change-Number: 28277
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28278 )
Change subject: cards: populate ADM1 key reference member
......................................................................
cards: populate ADM1 key reference member
In class SimCard, we speficy the key reference for ADM1 as 0x04. in the
UsimCard class, which inherets from SimCard nothing is specified, even
though ETSI TS 102 221 specifies 0x0A as key reference. Lets set the
member in UsimCard accordingly to be closer to the spec.
Note: For the moment this is a cosmetic fix, it does not change the
behaviour since all card classes derived from UsimCard set the key
reference properly.
Change-Id: I96af395b1832f4462a6043cca3bb3812fddac612
---
M pySim/cards.py
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/28278/1
diff --git a/pySim/cards.py b/pySim/cards.py
index b186044..71ddaa2 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -347,6 +347,10 @@
def __init__(self, ssc):
super(UsimCard, self).__init__(ssc)
+ print("NOW")
+
+ # See also: ETSI TS 102 221, Table 9.3
+ self._adm_chv_num = 0xA0
def read_ehplmn(self):
(res, sw) = self._scc.read_binary(EF_USIM_ADF_map['EHPLMN'])
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I96af395b1832f4462a6043cca3bb3812fddac612
Gerrit-Change-Number: 28278
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels, laforge, pespin, fixeria, dexter.
iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28276 )
Change subject: Expand VTY option which controls use of TCH for signalling
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> Wasn't there already a previous discussion on whether it really made (no) sense about having this op […]
I'd prefer to just have signaling YES/NO than make the TCH-only distinction. My guidance on this patch started from our original conversation and your suggestion here: https://projects.sysmocom.de/issues/5548#note-43
We need the option because sites behave unpredictably when EarlyIA is enabled and bandwidth is congested. Lots of SDCCH failures which then turn into TCH failures. We're rather see a SDCCH block and be done with it (what we always wanted actually).
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4459941ddad4e4a3bec8409b180d9a23a735e640
Gerrit-Change-Number: 28276
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 14 Jun 2022 14:00:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: iedemam.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28276 )
Change subject: Expand VTY option which controls use of TCH for signalling
......................................................................
Patch Set 2:
(2 comments)
Patchset:
PS2:
Wasn't there already a previous discussion on whether it really made (no) sense about having this option? @neels
File include/osmocom/bsc/bts.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/28276/comment/9c640789_35eebc5b
PS2, Line 517: /* If SDCCHs are exhausted:
Sounds like we want an enum here ;)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4459941ddad4e4a3bec8409b180d9a23a735e640
Gerrit-Change-Number: 28276
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-Comment-Date: Tue, 14 Jun 2022 13:42:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: iedemam.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/28276
to look at the new patch set (#2).
Change subject: Expand VTY option which controls use of TCH for signalling
......................................................................
Expand VTY option which controls use of TCH for signalling
For statistical clarity and site tuning, it is sometimes
desirable to completely disable the use of TCH for signaling.
In the existing version of this VTY command, there is no way to
accomplish this. We can only restrict TCH for signaling non-voice
related actions.
This patch adds the ability to completely disable signaling on TCH.
Change-Id: I4459941ddad4e4a3bec8409b180d9a23a735e640
---
M include/osmocom/bsc/bts.h
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_vty.c
M tests/osmo-bsc.vty
5 files changed, 26 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/28276/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4459941ddad4e4a3bec8409b180d9a23a735e640
Gerrit-Change-Number: 28276
Gerrit-PatchSet: 2
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: iedemam <michael(a)kapsulate.com>
Gerrit-MessageType: newpatchset
iedemam has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28276 )
Change subject: Expand VTY option which controls use of TCH for signalling
......................................................................
Expand VTY option which controls use of TCH for signalling
For statistical clarity and site tuning, it is sometimes
desirable to completely disable the use of TCH for signaling.
In the existing version of this VTY command, there is no way to
accomplish this. We can only restrict TCH for signaling non-voice
related actions.
This patch adds the ability to completely disable signaling on TCH.
Change-Id: I4459941ddad4e4a3bec8409b180d9a23a735e640
---
M include/osmocom/bsc/bts.h
M src/osmo-bsc/abis_rsl.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_vty.c
4 files changed, 20 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/28276/1
diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 66cf68f..ce86c4c 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -514,9 +514,11 @@
* interference reported in RSL Resource Indication. */
bool chan_alloc_avoid_interf;
- /* When true (default), TCH can be allocated to serve
- * non-voicecall-related signalling services when SDCCHs are exhausted */
- bool chan_alloc_allow_tch_for_signalling;
+ /* If SDCCHs are exhausted:
+ * when 1 (default), TCH can be allocated for all signaling purposes
+ * when 0, TCH can only be used for voicecall-related signaling purposes
+ * when -1, TCH can never be used for signaling purposes. */
+ int chan_alloc_allow_tch_for_signalling;
enum neigh_list_manual_mode neigh_list_manual_mode;
/* parameters from which we build SYSTEM INFORMATION */
diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c
index d37fac8..efd4e06 100644
--- a/src/osmo-bsc/abis_rsl.c
+++ b/src/osmo-bsc/abis_rsl.c
@@ -2178,7 +2178,8 @@
* in the code below, all other channel requests will get an SDCCH first
* (if possible). */
- if (gsm_chreq_reason_is_voicecall(rqd->reason) || bts->chan_alloc_allow_tch_for_signalling) {
+ if (bts->chan_alloc_allow_tch_for_signalling == 1
+ || (gsm_chreq_reason_is_voicecall(rqd->reason) && bts->chan_alloc_allow_tch_for_signalling == 0)) {
if (!lchan) {
LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD[%s]: no resources for %s 0x%x, retrying with %s\n",
get_value_string(gsm_chreq_descs, rqd->reason), gsm_lchant_name(GSM_LCHAN_SDCCH),
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index d0adb2a..d844e68 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -295,7 +295,7 @@
bts->neigh_list_manual_mode = NL_MODE_AUTOMATIC;
bts->early_classmark_allowed_3g = true; /* 3g Early Classmark Sending controlled by bts->early_classmark_allowed param */
bts->si_unused_send_empty = true;
- bts->chan_alloc_allow_tch_for_signalling = true;
+ bts->chan_alloc_allow_tch_for_signalling = 1;
bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */
bts->si_common.cell_sel_par.rxlev_acc_min = 0;
bts->si_common.si2quater_neigh_list.arfcn = bts->si_common.data.earfcn_list;
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index ba4215a..d3e7383 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -567,19 +567,22 @@
DEFUN_ATTR(cfg_bts_chan_alloc_allow_tch_for_signalling,
cfg_bts_chan_alloc_allow_tch_for_signalling_cmd,
- "channel allocator allow-tch-for-signalling (0|1)",
+ "channel allocator allow-tch-for-signalling (0|1|call-only)",
"Channel Allocator\n" "Channel Allocator\n"
- "Configure whether TCH/H or TCH/F channels can be used to serve non-call-related signalling if SDCCHs are exhausted\n"
- "Forbid use of TCH for non-call-related signalling purposes\n"
- "Allow use of TCH for non-call-related signalling purposes (default)\n",
+ "Configure when TCH/H or TCH/F channels can be used to serve signalling if SDCCHs are exhausted\n"
+ "Never allow TCH for signalling purposes\n"
+ "Always allow TCH for signalling purposes (default)\n"
+ "Only allow TCH for signalling purposes when establishing a voice call\n",
CMD_ATTR_IMMEDIATE)
{
struct gsm_bts *bts = vty->index;
if (!strcmp(argv[0], "0"))
- bts->chan_alloc_allow_tch_for_signalling = false;
+ bts->chan_alloc_allow_tch_for_signalling = -1;
+ else if (!strcmp(argv[0], "call-only"))
+ bts->chan_alloc_allow_tch_for_signalling = 0;
else
- bts->chan_alloc_allow_tch_for_signalling = true;
+ bts->chan_alloc_allow_tch_for_signalling = 1;
return CMD_SUCCESS;
}
@@ -4185,8 +4188,10 @@
VTY_NEWLINE);
if (bts->chan_alloc_avoid_interf)
vty_out(vty, " channel allocator avoid-interference 1%s", VTY_NEWLINE);
- if (!bts->chan_alloc_allow_tch_for_signalling)
+ if (bts->chan_alloc_allow_tch_for_signalling == -1)
vty_out(vty, " channel allocator allow-tch-for-signalling 0%s", VTY_NEWLINE);
+ else if (bts->chan_alloc_allow_tch_for_signalling == 0)
+ vty_out(vty, " channel allocator allow-tch-for-signalling call-only%s", VTY_NEWLINE);
vty_out(vty, " rach tx integer %u%s",
bts->si_common.rach_control.tx_integer, VTY_NEWLINE);
vty_out(vty, " rach max transmission %u%s",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28276
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4459941ddad4e4a3bec8409b180d9a23a735e640
Gerrit-Change-Number: 28276
Gerrit-PatchSet: 1
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28273
to look at the new patch set (#2).
Change subject: bsc-cbsp: Test BTS Failure+Restart when BTS becomes (un)available
......................................................................
bsc-cbsp: Test BTS Failure+Restart when BTS becomes (un)available
Related: SYS#5910
Change-Id: I35ddde7bc2e39d35c301f1153416b549ba1630cd
---
M bsc/BSC_Tests_CBSP.ttcn
M library/CBSP_Templates.ttcn
2 files changed, 89 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/28273/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28273
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: I35ddde7bc2e39d35c301f1153416b549ba1630cd
Gerrit-Change-Number: 28273
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset