Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28788 )
Change subject: vty: Fix 'show message' not finding expired messages
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> I can add that as a follow up patch (all|active|expired)
Ah that's for "show message", not "show messages". I can add a new "show message expired id ID" one then if you want.
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28788
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I23523876f1df167e8afd730b2164f133c2776085
Gerrit-Change-Number: 28788
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 26 Jul 2022 06:17:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28788 )
Change subject: vty: Fix 'show message' not finding expired messages
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> I'm not sure we should always show both of them. […]
I can add that as a follow up patch (all|active|expired)
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28788
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I23523876f1df167e8afd730b2164f133c2776085
Gerrit-Change-Number: 28788
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 26 Jul 2022 06:16:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: laforge.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28786 )
Change subject: vty: Add command to delete expired messages
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
> I would expect this to be primarily done via the REST API, which is the primary interface between th […]
We do have one to DELETE a message, which does the Stop-Warning on the CBSP/SBcAP side and then moves the message to the expired list. But there's no REST API to remove expired messages.
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28786
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3
Gerrit-Change-Number: 28786
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 26 Jul 2022 06:15:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28785 )
Change subject: vty: Print created and expired times for each message
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28785
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I9ee49b99546a44be706700c3db94d45210c47e54
Gerrit-Change-Number: 28785
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 26 Jul 2022 06:14:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28788 )
Change subject: vty: Fix 'show message' not finding expired messages
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I'm not sure we should always show both of them. Maybe we need an additional argument (active|expired) or the like?
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28788
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I23523876f1df167e8afd730b2164f133c2776085
Gerrit-Change-Number: 28788
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 26 Jul 2022 06:14:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28786 )
Change subject: vty: Add command to delete expired messages
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
I would expect this to be primarily done via the REST API, which is the primary interface between the user (ESME) and the CBC. Don't we have a related command on the REST interface side?
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28786
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3
Gerrit-Change-Number: 28786
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 26 Jul 2022 06:13:41 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28770 )
Change subject: apdu/ts_102_221: SELECT: allow select of SELF
......................................................................
apdu/ts_102_221: SELECT: allow select of SELF
While in the pySim-shell, it's useful to filter the currently selected
file from the choice of available files for select, this doesn't apply
for the tracing case: It's perfectly valid for the UE to SELECT the
file that's already selected right now. The operation basically
becomes equivalent to a STATUS.
Change-Id: I1a20fb3ba70426333ac34448c6cb782c51363965
---
M pySim/apdu/ts_102_221.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/pySim/apdu/ts_102_221.py b/pySim/apdu/ts_102_221.py
index 769c38e..fb2f375 100644
--- a/pySim/apdu/ts_102_221.py
+++ b/pySim/apdu/ts_102_221.py
@@ -66,7 +66,7 @@
# iterate to next element in path
continue
else:
- sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT'])
+ sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT','SELF'])
if file_hex in sels:
if self.successful:
#print("\tSELECT %s" % sels[file_hex])
@@ -80,7 +80,7 @@
elif mode == 'df_ef_or_mf_by_file_id':
if len(self.cmd_data) != 2:
raise ValueError('Expecting a 2-byte FID')
- sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT'])
+ sels = lchan.selected_file.get_selectables(['FIDS','MF','PARENT','SELF'])
file_hex = b2h(self.cmd_data)
if file_hex in sels:
if self.successful:
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28770
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I1a20fb3ba70426333ac34448c6cb782c51363965
Gerrit-Change-Number: 28770
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28768 )
Change subject: filesystem: We can select not just immediate parent DF but all ancestors
......................................................................
filesystem: We can select not just immediate parent DF but all ancestors
I didn't check the specs, but at least experience with real-world cards
(and modems) shows that it's not just permitted to select the immediate
parent DF, but all ancestors of the currently selected file.
So adjust the get_selectables() method to not just return the immediate
parent, but to recurse all the way up and report the FID of any ancestor
DF.
Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49
---
M pySim/filesystem.py
1 file changed, 16 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 886a48d..a3d1122 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -194,6 +194,21 @@
sels.update({self.name: self})
return sels
+ def _get_parent_selectables(self, alias: Optional[str] = None, flags=[]) -> Dict[str, 'CardFile']:
+ sels = {}
+ if not self.parent or self.parent == self:
+ return sels
+ # add our immediate parent
+ if alias:
+ sels.update({alias: self.parent})
+ if self.parent.fid and (flags == [] or 'FIDS' in flags):
+ sels.update({self.parent.fid: self.parent})
+ if self.parent.name and (flags == [] or 'FNAMES' in flags):
+ sels.update({self.parent.name: self.parent})
+ # recurse to parents of our parent, but without any alias
+ sels.update(self.parent._get_parent_selectables(None, flags))
+ return sels
+
def get_selectables(self, flags=[]) -> Dict[str, 'CardFile']:
"""Return a dict of {'identifier': File} that is selectable from the current file.
@@ -210,8 +225,7 @@
sels = self._get_self_selectables('.', flags)
# we can always select our parent
if flags == [] or 'PARENT' in flags:
- if self.parent:
- sels = self.parent._get_self_selectables('..', flags)
+ sels.update(self._get_parent_selectables('..', flags))
# if we have a MF, we can always select its applications
if flags == [] or 'MF' in flags:
mf = self.get_mf()
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28768
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49
Gerrit-Change-Number: 28768
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: merged