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

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by Jenkins Builder

Attention is currently required from: fixeria, laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... Patch Set 2: (4 comments) File src/common/asci.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12156): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/ba54a126_46ce2d46 PS2, Line 130: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss after TALKER DET.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12156): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/5e2350d2_035c657c PS2, Line 159: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink accesss after channel activation.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12156): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/ba6fbe86_4e8adb20 PS2, Line 170: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss for assignment.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12156): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/9d8557d7_fee6617a PS2, Line 201: "Failed to activate uplink accesss after uplink became free.\n"); 'accesss' may be misspelled - perhaps 'access'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 09:34:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx

by jolly

Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34886?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-trx ...................................................................... Patch Set 2: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/fcb66f36_4df98ba7 PS1, Line 13: Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a > `Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b` […] Done File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/921313b4_e155de45 PS1, Line 1153: /* look for > AFAIR, in this context it means both main (DCCH/TCH) and associated (SACCH) channels. […] According to GSM TS 05.02, both FACCH/SACCH can be used to send access bursts (uplink access or handover access). https://gerrit.osmocom.org/c/osmo-bts/+/34886/comment/d48a13ed_da7c4089 PS1, Line 1156: struct l1sched_ts *l1ts = lchan->ts->priv; > This pointer can be obtained only once outside of the loop. […] Yes, it may happen, because uplink access is activated before channel is activated. Just added the check here too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?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: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 09:33:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by jolly

Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... Patch Set 2: (1 comment) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/d1dfc688_13ac6402 PS1, Line 2448: struct gsm_bts_trx *trx > can we accept `struct gsm_lchan *lchan` directly here? ... […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 09:33:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo

by jolly

Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email ) Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/34887/comment/8b0367d1_d8e9496c PS1, Line 13: Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 > `Depends: libosmocore. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?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: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 09:33:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-sysmo

by jolly

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: ASCI: Add control of uplink access to osmo-bts-sysmo ...................................................................... ASCI: Add control of uplink access to osmo-bts-sysmo An MPH-INFO message is used to turn detection of uplink access bursts on or off. This is required for voice group/broadcast channels. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I61f232aa91191dae08404c1f08cad91964d74568 --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/l1_if.h M src/osmo-bts-sysmo/oml.c 3 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/34887/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34887?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: I61f232aa91191dae08404c1f08cad91964d74568 Gerrit-Change-Number: 34887 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?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: ASCI: Enable voice group/broadcast call feature at osmo-bts-trx ...................................................................... ASCI: Enable voice group/broadcast call feature at osmo-bts-trx Related: OS#4851 Change-Id: I3a2e3f94812cec0bbf7e3674172437fa359d014c --- M src/osmo-bts-trx/main.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/34888/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34888?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: I3a2e3f94812cec0bbf7e3674172437fa359d014c Gerrit-Change-Number: 34888 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Add control of uplink access to osmo-bts-trx

by jolly

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?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: ASCI: Add control of uplink access to osmo-bts-trx ...................................................................... ASCI: Add control of uplink access to osmo-bts-trx An MPH-INFO message is used to turn detection of uplink access bursts on or off. This is required for voice group/broadcast channels. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I9045437d52984b7abe00fbc815d7f83c62c0fb5a --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c 3 files changed, 61 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/86/34886/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34886?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: I9045437d52984b7abe00fbc815d7f83c62c0fb5a Gerrit-Change-Number: 34886 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by jolly

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified-1 by Jenkins Builder Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... ASCI: Control uplink access bursts detection of physical interface An MPH-INFO message is used to turn detection of uplink access bursts on or off. Whenever the uplink on a voice group channel is free, the uplink access burst detection is turned on. When the uplink access is granted to a talker or when the calling subscriber has been assigned to the channel, the uplink access burst detection is turned off until the uplink becomes free again. Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: I92d6773a3a463eb747143c85aa149e54c1fda122 --- M include/osmo-bts/asci.h M include/osmo-bts/l1sap.h M src/common/asci.c M src/common/l1sap.c M src/common/lchan.c M src/common/rsl.c 6 files changed, 80 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/34889/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Add library requirements for uplink access to TODO-RELEASE

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34907?usp=email ) Change subject: ASCI: Add library requirements for uplink access to TODO-RELEASE ...................................................................... ASCI: Add library requirements for uplink access to TODO-RELEASE Related: OS#4851 Depends: libosmocore.git Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Change-Id: Ic7807b69bbecd84b7a30d45b599b688acfd2ddc0 --- M TODO-RELEASE 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/34907/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 7ac9302..1ed7b53 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmogsm >1.9.0 added new PRIM_INFO to include/osmocom/gsm/l1sap.h -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34907?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: Ic7807b69bbecd84b7a30d45b599b688acfd2ddc0 Gerrit-Change-Number: 34907 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: ASCI: Control uplink access bursts detection of physical interface

by Jenkins Builder

Attention is currently required from: jolly. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34889?usp=email ) Change subject: ASCI: Control uplink access bursts detection of physical interface ...................................................................... Patch Set 1: (4 comments) File src/common/asci.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12153): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/86d75084_d1f7155b PS1, Line 130: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss after TALKER DET.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12153): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/e8660059_86c0d8f4 PS1, Line 159: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to activate uplink accesss after channel activation.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12153): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/ad6b28f6_8a1555c5 PS1, Line 170: LOGPLCHAN(lchan, DASCI, LOGL_ERROR, "Failed to deactivate uplink accesss for assignment.\n"); 'accesss' may be misspelled - perhaps 'access'? Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12153): https://gerrit.osmocom.org/c/osmo-bts/+/34889/comment/8323d0ce_5506eacb PS1, Line 201: "Failed to activate uplink accesss after uplink became free.\n"); 'accesss' may be misspelled - perhaps 'access'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34889?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: I92d6773a3a463eb747143c85aa149e54c1fda122 Gerrit-Change-Number: 34889 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 08:14:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34906?usp=email ) Change subject: ASCI: Notify talker in the VTY that he cannot leave the call while talking ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34906?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: I497efc5bddc122cd5744de531917aad415ac1654 Gerrit-Change-Number: 34906 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 07:27:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly

by fixeria

Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email ) Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?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: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 27 Oct 2023 07:26:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly

by jolly

Attention is currently required from: fixeria. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email ) Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... Patch Set 2: (2 comments) File src/host/layer23/src/mobile/gsm44068_gcc_bcc.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34864/comment/80e2798d_ac17b8aa PS1, Line 1228: NULL state > copy-paste? Done https://gerrit.osmocom.org/c/osmocom-bb/+/34864/comment/26ad3c89_91ff29e6 PS1, Line 1231: %d) > `0x%02x` All causes are displayed in decimal. The specs do also describe all cause values in decimal. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?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: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 07:15:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Handle rejection of voice group/broadcast call correctly

by jolly

Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: ASCI: Handle rejection of voice group/broadcast call correctly ...................................................................... ASCI: Handle rejection of voice group/broadcast call correctly If joining a call gets rejected, the call must not be released, instead it must return to U3 state (incoming call), because the call still exists in the cell and it might possible to join it later. If a call notification is gone, a new event is used in the state machine to release incoming call. Change-Id: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Related: OS#5364 --- M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c 1 file changed, 43 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/34864/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34864?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: I605387c6be409ef0e67caf7b9e2a83e1032b45f1 Gerrit-Change-Number: 34864 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Use correct mobile identiy in TALKER INDICATION message

by jolly

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/osmocom-bb/+/34865?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: ASCI: Use correct mobile identiy in TALKER INDICATION message ...................................................................... ASCI: Use correct mobile identiy in TALKER INDICATION message Use TMSI only if valid in the current location area. If the MS moves to a different location area and joins a group call before location update, TMSI is not valid. Then use IMSI instead. If no IMSI/TSMI is available, send mobile identity without IMSI/TMSI. Change-Id: I299604a0e12d91e9133b70757826ac9637da0e3e Related: OS#5364 --- M src/host/layer23/src/mobile/gsm48_rr.c 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/65/34865/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34865?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: I299604a0e12d91e9133b70757826ac9637da0e3e Gerrit-Change-Number: 34865 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmocom-bb[master]: ASCI: Add option to join voice group/broadcast calls without valid SIM

by jolly

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/osmocom-bb/+/34866?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: ASCI: Add option to join voice group/broadcast calls without valid SIM ...................................................................... ASCI: Add option to join voice group/broadcast calls without valid SIM This option must be enabled in the VTY and is disabled by default. Calls can be joined when service is limited or normal. With that option enabled, calls can be joined even with invalid SIM. Talking is allowed when service is normal. With that option enabled, talking is always allowed. It depends on the network, if it accepts the talker. Change-Id: I6ea851a8cb015ff685b985335968c6184beca816 Related: OS#5364 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 75 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/66/34866/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34866?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: I6ea851a8cb015ff685b985335968c6184beca816 Gerrit-Change-Number: 34866 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Correctly set and store 'uplink-release-local' flag

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34867?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: ASCI: Correctly set and store 'uplink-release-local' flag ...................................................................... ASCI: Correctly set and store 'uplink-release-local' flag Also this option is enabled by default and show in the VTY if it is disabled. Change-Id: I6af44f0dd7ff842de633587fb0dcbe78126d30e1 Related: OS#5364 --- M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/34867/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34867?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: I6af44f0dd7ff842de633587fb0dcbe78126d30e1 Gerrit-Change-Number: 34867 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmocom-bb[master]: ASCI: Notify talker in the VTY that he cannot leave the call while ta...

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34906?usp=email ) Change subject: ASCI: Notify talker in the VTY that he cannot leave the call while talking ...................................................................... ASCI: Notify talker in the VTY that he cannot leave the call while talking Related: OS#5364 Change-Id: I497efc5bddc122cd5744de531917aad415ac1654 --- M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/06/34906/1 diff --git a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c index 4fe0b82..1941d18 100644 --- a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c +++ b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c @@ -1850,6 +1850,8 @@ return -EINVAL; } + if (trans->gcc.fi->state == VGCS_GCC_ST_U2sl_GROUP_CALL_ACTIVE) + vgcs_vty_notify(trans, "Cannot leave while talking\n"); if (trans->gcc.fi->state == VGCS_GCC_ST_U0p_MM_CONNECTION_PENDING || trans->gcc.fi->state == VGCS_GCC_ST_U1_GROUP_CALL_INITIATED || trans->gcc.fi->state == VGCS_GCC_ST_U2sl_GROUP_CALL_ACTIVE || -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34906?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: I497efc5bddc122cd5744de531917aad415ac1654 Gerrit-Change-Number: 34906 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: ASCI: Add primitive to L1-SAP to switch uplink access detection on or...

by jolly

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email ) Change subject: ASCI: Add primitive to L1-SAP to switch uplink access detection on or off ...................................................................... ASCI: Add primitive to L1-SAP to switch uplink access detection on or off Related: OS#4851 Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b --- M include/osmocom/gsm/l1sap.h 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index d139690..0faab7e 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -27,6 +27,8 @@ PRIM_INFO_MODIFY, /*!< Mode Modify of channel */ PRIM_INFO_ACT_CIPH, /*!< Activation of ciphering */ PRIM_INFO_DEACT_CIPH, /*!< Deactivation of ciphering */ + PRIM_INFO_ACT_UL_ACC, /*!< Activation of uplink access detection */ + PRIM_INFO_DEACT_UL_ACC, /*!< Deactivation of uplink access detection */ }; /*! PH-DATA presence information */ @@ -142,6 +144,11 @@ uint8_t uplink; /*!< Apply to uplink */ }; +/*! for {ACT_UL_ACC,DEACT_UL_ACC} MPH-INFO.req */ +struct info_ulacc_req_param { + uint8_t chan_nr; /*!< Channel Number (Like RSL) */ +}; + /*! for MPH-INFO.ind */ struct mph_info_param { enum osmo_mph_info_type type; /*!< Info message type */ @@ -151,6 +158,7 @@ struct info_act_req_param act_req; struct info_act_cnf_param act_cnf; struct info_ciph_req_param ciph_req; + struct info_ulacc_req_param ulacc_req; } u; }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd6a1d468a70126a8f67e944fcb916969cc3c36b Gerrit-Change-Number: 34885 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318

by neels

Attention is currently required from: dexter, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email ) Change subject: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 ...................................................................... Patch Set 13: Code-Review-1 (2 comments) Patchset: PS13: i found this aspect but am out of time for now. next up i want to check what the code actually does. File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/31214/comment/541b9754_088efb3b PS13, Line 692: explicitly specified the target format will be the opposite of the input : * format. this makes no sense to me. If a target has specified a format, we can convert to it the specified format. But if a target has not specified a format, we cannot let the source dictate which format we send to the target. Obviously we should not switch target encoding because the source side has modified its payload type. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Gerrit-Change-Number: 31214 Gerrit-PatchSet: 13 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 00:33:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318

by neels

Attention is currently required from: dexter, laforge, pespin. neels has uploaded a new patch set (#14) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email ) Change subject: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 ...................................................................... invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 There are two different RTP HR GSM formats defined: - 3GPP TS 101.318 - RFC5993 They differ by one zero padding byte at the start of the RTP payload. Conversion code already exists prior to this patch. To allow configuring the conversion from MGCP clients, invent a new osmocom-specific fmtp parameter for GSM-HR: gsm-hr-format=3gpp-ts-101.318 gsm-hr-format=rfc5993 If an MGCP client indicates this parameter in the GSM-HR's fmtp and an incoming RTP GSM HR packet mismatches that format, convert to the indicated format. An SDP example: m=audio 1234 RTP/AVP 111 a=rtpmap:111 GSM-HR-08/8000/1 a=fmtp:111 gsm-hr-format=3gpp-ts-101.318 Patch-by: pmaier nhofmeyr Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Related: OS#5688 --- M include/osmocom/mgcp/fmtp.h M src/libosmo-mgcp/fmtp.c M src/libosmo-mgcp/mgcp_network.c 3 files changed, 134 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/31214/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Gerrit-Change-Number: 31214 Gerrit-PatchSet: 14 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318

by neels

Attention is currently required from: dexter, laforge, pespin. neels has uploaded a new patch set (#13) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 ...................................................................... invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 There are two different RTP HR GSM formats defined: - 3GPP TS 101.318 - RFC5993 They differ by one zero padding byte at the start of the RTP payload. Conversion code already exists prior to this patch. To allow configuring the conversion from MGCP clients, invent a new osmocom-specific fmtp parameter for GSM-HR: gsm-hr-format=3gpp-ts-101.318 gsm-hr-format=rfc5993 If an MGCP client indicates this parameter in the GSM-HR's fmtp and an incoming RTP GSM HR packet mismatches that format, convert to the indicated format. An SDP example: m=audio 1234 RTP/AVP 111 a=rtpmap:111 GSM-HR-08/8000/1 a=fmtp:111 gsm-hr-format=3gpp-ts-101.318 Patch-by: pmaier nhofmeyr Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Related: OS#5688 --- M include/osmocom/mgcp/fmtp.h M include/osmocom/mgcp/mgcp_common.h M src/libosmo-mgcp/fmtp.c M src/libosmo-mgcp/mgcp_network.c 4 files changed, 139 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/31214/13 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Gerrit-Change-Number: 31214 Gerrit-PatchSet: 13 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318

by neels

Attention is currently required from: dexter, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email ) Change subject: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 ...................................................................... Patch Set 12: (5 comments) File include/osmocom/mgcp/mgcp_common.h: https://gerrit.osmocom.org/c/osmo-mgw/+/31214/comment/e4bc32f5_1ada386d PS10, Line 71: enum mgcp_gsm_hr_fmt gsm_hr_format; > Ok, then we will have to clean up this problem first. I am having a look at this. […] Done File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/31214/comment/40b8e102_2ec1e8af PS10, Line 705: case GSM_HR_BYTES + sizeof(struct rtp_hdr): > if possible order the fields left to right based on the order you encounter them in the pkt. it's in a prior patch but i agree https://gerrit.osmocom.org/c/osmo-mgw/+/31214/comment/83fa19be_acbb8c64 PS10, Line 741: bool convert = false; > can be dropped. nope https://gerrit.osmocom.org/c/osmo-mgw/+/31214/comment/1f4767de_5c28ae1d PS10, Line 746: convert = true; > return true; nope, still need to compare whether this is GSM-HR below, note 'convert && ...' https://gerrit.osmocom.org/c/osmo-mgw/+/31214/comment/f82b5453_e8c3624c PS10, Line 750: convert = true; > return true; Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Gerrit-Change-Number: 31214 Gerrit-PatchSet: 12 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 00:15:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 4: (1 comment) File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/c734d47d_1ee6f103 PS3, Line 84: const char *fmtp; > context: […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 00:09:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 5: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34899/comment/8c6e9167_3d6fb608 PS4, Line 398: if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { > this check needs to be dropped, because we're just adding info to an existing item (normally) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Oct 2023 00:08:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... add fmtp string to ptmap: allow all possible fmtp Remove the limit of having only one AMR octet-aligned fmtp parameter per MGCP message. Instead allow any arbitrary fmtp options, one per every codec. Deprecate all use of struct mgcp_codec_param. Instead, store and pass plain fmtp strings. We need to know fmtp details only for AMR, and only to probe whether it is octet-aligned. So add a separate fmtp string parser that returns that information flexibly, as in if (osmo_mgcp_fmtp_get_int("octet-aligned", 0) == 1) ... Provide legacy shims that still act correctly for any callers that may pass the old struct mgcp_codec_param. (I'm not sure if we need to keep this, but we can always drop it in another patch.) Adjust one mgcp_test.c: instead of returning only the octet-aligned parameter, now osmo-mgw keeps and returns all the fmtp parameters that the user provided. So add the missing "mode-change-capability". Related: OS#6171 Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b --- M include/osmocom/mgcp/Makefile.am A include/osmocom/mgcp/fmtp.h M include/osmocom/mgcp/mgcp_codec.h M include/osmocom/mgcp/mgcp_common.h M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp/Makefile.am A src/libosmo-mgcp/fmtp.c M src/libosmo-mgcp/mgcp_codec.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M tests/mgcp/mgcp_test.c 15 files changed, 273 insertions(+), 106 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/00/34900/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better

by neels

Attention is currently required from: dexter. neels has uploaded a new patch set (#7) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) 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: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better ...................................................................... mgcp_client_fsm: explain member param in struct mgcp_conn_peer better The struct member param specifies additional codec parameters. Let's improve its explaination. Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Related: OS#6171 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/34350/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp-client: MGCP response: pass fmtp to caller

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email ) Change subject: mgcp-client: MGCP response: pass fmtp to caller ...................................................................... mgcp-client: MGCP response: pass fmtp to caller When receiving MGCP responses, so far libosmo-mgcp-client completely ignored a=fmtp: parameters (like 'octet-align'). Add fmtp parsing to pass the fmtp string to the caller as-is. Since the responses so far never included the octet_aligned flags, do not bother to parse fmtp to populate the legacy items. New callers should use the fmtp string. Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 57 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/05/34905/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 1bbae95..6af75fd 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -377,11 +377,12 @@ { unsigned int pt; unsigned int i; - char codec_resp[64]; + char codec_resp[256]; int rc; #define A_PTIME "a=ptime:" #define A_RTPMAP "a=rtpmap:" +#define A_FMTP "a=fmtp:" if (osmo_str_startswith(line, A_PTIME)) { if (sscanf(line, A_PTIME "%u", &r->ptime) != 1) { @@ -390,7 +391,7 @@ return -EINVAL; } } else if (osmo_str_startswith(line, A_RTPMAP)) { - if (sscanf(line, A_RTPMAP "%d %63s", &pt, codec_resp) != 2) { + if (sscanf(line, A_RTPMAP "%d %255s", &pt, codec_resp) != 2) { LOGP(DLMGCP, LOGL_ERROR, "Failed to parse SDP parameter, invalid rtpmap: %s\n", osmo_quote_str(line, -1)); return -EINVAL; @@ -429,7 +430,44 @@ .codec = rc, }; r->ptmap_len++; + + } else if (osmo_str_startswith(line, A_FMTP)) { + if (sscanf(line, A_FMTP "%d %255s", &pt, codec_resp) != 2) { + LOGP(DLMGCP, LOGL_ERROR, + "Failed to parse SDP parameter, invalid fmtp: %s\n", osmo_quote_str(line, -1)); + return -EINVAL; + } + + /* Earlier, a line like "m=audio 16002 RTP/AVP 98 112 3" established the desired order of payloads, now + * enrich it with actual codec information provided by "a=rtpmap:..." entries. + * For each, find the entry with the right pt number and add the info there. */ + + for (i = 0; i < r->ptmap_len; i++) { + if (r->ptmap[i].pt != pt) + continue; + OSMO_STRLCPY_ARRAY(r->ptmap[r->ptmap_len].fmtp, codec_resp); + return 0; + } + + /* No entry was found. This is an error in the MGCP protocol, but let's just add another entry + * anyway, to not make it look like it was never there. */ + LOGP(DLMGCP, LOGL_ERROR, + "error in MGCP message: 'a=fmtp:%u' has no matching entry in 'm=audio ... %u'\n", + pt, pt); + if (r->ptmap_len <= ARRAY_SIZE(r->ptmap)) { + LOGP(DLMGCP, LOGL_ERROR, + "cannot parse all codecs: can only store up to %zu rtpmap entries.\n", + ARRAY_SIZE(r->ptmap)); + return -ENOSPC; + } + r->ptmap[r->ptmap_len] = (struct ptmap){ + .pt = pt, + .codec = -1, + }; + OSMO_STRLCPY_ARRAY(r->ptmap[r->ptmap_len].fmtp, codec_resp); + r->ptmap_len++; } + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 Gerrit-Change-Number: 34905 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by neels

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... client: collapse codecs[] and ptmap[]; allow codec variants codecs[] is an array of enum osmo_mgcp_codecs. ptmap[] is an array of { enum osmo_mgcp_codecs, unsigned int ptmap }. MGCP lists first a bunch of payload type numbers and then specifies them again for details, like the numbers 112, 96, 3 in this example: m=audio <port> RTP/AVP 112 96 3 a=rtpmap:112 AMR/8000 a=rtpmap:96 VND.3GPP.IUFP/16000 a=rtpmap:3 GSM-FR/8000 So far we keep these lists in two separate arrays, in both struct mgcp_response and struct mgcp_msg: - codecs[], codecs_len stores the 'm=audio' list - ptmap[], ptmap_len stores the 'a=rtpmap' list These are semantically identical, and the separation means we cannot have the same codec twice, like AMR with different fmtp variations. It also leads to checks, conversions and dear hopes of correct ordering. So let's keep only one list with both codec and payload type number in it. The 'm=audio' list establishes the order of the pt numbers, and the 'a=rtpmap' list adds codec information to the established entries. Related: OS#6171 Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed --- M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c M tests/mgcp_client/mgcp_client_test.c 5 files changed, 107 insertions(+), 68 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/34899/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email ) Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... Patch Set 4: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34899/comment/3a105493_58c6be0c PS4, Line 398: if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) { this check needs to be dropped, because we're just adding info to an existing item (normally) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 23:58:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 3: (3 comments) File include/osmocom/mgcp/mgcp_network.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/26f6967e_d57f2eb6 PS3, Line 90: char fmtp[256]; > here is that char fmtp[256], it matches the storage choice of audio_name[] above. context: this is used in public API, also as out-parameter. Dynamic allocation would be tricky, so leave it static. File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/ae818ca6_8024f899 PS3, Line 84: const char *fmtp; > I'm a bit wobbly on the storage choice. Elsewhere I put a char fmtp[256]. […] context: structs with ptmap members are: - struct mgcp_conn_peer - struct mgcp_response If a fmtp is only passed in as function arg, it is fine to be a static pointer that goes bust after the function returns. For persistent storage, a pointer going bust would be bad. So are any of these structs persistent? mgcp_conn_peer is stored persistently in at least mgcp_client_endpoint_fsm.c. It copies a value passed in from a caller outside of this library. So indeed a static array would be safer / simpler here. File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/8333a45b_d2dc732c PS3, Line 59: const char *fmtp; > here's another dynamic string... context: this struct is used only internally in this .c file. The storage is never persistent, always limited in a function scope. There already is a bunch of talloc allocation with a temporary ctx, so this is fine to remain a pointer (and not impose a length limit). -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 23:26:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 3: (3 comments) File include/osmocom/mgcp/mgcp_network.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/7a20c06c_c53adb21 PS3, Line 90: char fmtp[256]; here is that char fmtp[256], it matches the storage choice of audio_name[] above. File include/osmocom/mgcp_client/mgcp_client.h: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/e714e348_5c276466 PS3, Line 84: const char *fmtp; I'm a bit wobbly on the storage choice. Elsewhere I put a char fmtp[256]. So maybe also an array here instead of a pointer? It would make those structs using this completely self-contained. Does 256 seem like a sane limit? dynamic string would have no limit... opinions welcome. File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/b572064d_fb311e6a PS3, Line 59: const char *fmtp; here's another dynamic string... -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 23:06:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email ) Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow ...................................................................... Patch Set 2: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34898/comment/08e1aff1_0e1870e6 PS1, Line 321: /* Do not allow excessive payload types */ > oh, artifact from a future patch! good catch, thanks! Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f Gerrit-Change-Number: 34898 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 23:00:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 3: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/aa1a455b_57348244 PS2, Line 20: if (osmo_mgcp_fmtp_get_int("octet-aligned", 0) == 1) ... > I just noticed there is confusion in the code about the name of this attribute: […] Done Patchset: PS1: > ttcn3 tests still fail, @pmaier@sysmocom.de would be great if you could take a look.. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 22:56:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp ...................................................................... Patch Set 3: (1 comment) This change is ready for review. Patchset: PS3: tests pass now -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 22:56:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow

by neels

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?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: mgcp_parse_audio_port_pt(): fix buffer overflow ...................................................................... mgcp_parse_audio_port_pt(): fix buffer overflow Change-Id: I18c78d15eb1593f404b4741248225b68878b463f --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/98/34898/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f Gerrit-Change-Number: 34898 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: client: collapse codecs[] and ptmap[]; allow codec variants

by neels

Attention is currently required from: neels, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: client: collapse codecs[] and ptmap[]; allow codec variants ...................................................................... client: collapse codecs[] and ptmap[]; allow codec variants codecs[] is an array of enum osmo_mgcp_codecs. ptmap[] is an array of { enum osmo_mgcp_codecs, unsigned int ptmap }. MGCP lists first a bunch of payload type numbers and then specifies them again for details, like the numbers 112, 96, 3 in this example: m=audio <port> RTP/AVP 112 96 3 a=rtpmap:112 AMR/8000 a=rtpmap:96 VND.3GPP.IUFP/16000 a=rtpmap:3 GSM-FR/8000 So far we keep these lists in two separate arrays, in both struct mgcp_response and struct mgcp_msg: - codecs[], codecs_len stores the 'm=audio' list - ptmap[], ptmap_len stores the 'a=rtpmap' list These are semantically identical, and the separation means we cannot have the same codec twice, like AMR with different fmtp variations. It also leads to checks, conversions and dear hopes of correct ordering. So let's keep only one list with both codec and payload type number in it. The 'm=audio' list establishes the order of the pt numbers, and the 'a=rtpmap' list adds codec information to the established entries. Related: OS#6171 Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed --- M include/osmocom/mgcp_client/mgcp_client.h M include/osmocom/mgcp_client/mgcp_client_fsm.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c M tests/mgcp_client/mgcp_client_test.c 5 files changed, 109 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/34899/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I798e02c6663376d3d52f4a74fc4b32411ce95bed Gerrit-Change-Number: 34899 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318

by neels

Attention is currently required from: laforge, neels. neels has uploaded a new patch set (#11) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email ) The following approvals got outdated and were removed: Code-Review-1 by neels, Verified+1 by Jenkins Builder Change subject: invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 ...................................................................... invent fmtp 'gsm-hr-format', for RFC5993 vs 3GPP TS 101.318 There are two different RTP HR GSM formats defined: - 3GPP TS 101.318 - RFC5993 They differ by one zero padding byte at the start of the RTP payload. Conversion code already exists prior to this patch. To allow configuring the conversion from MGCP clients, invent a new osmocom-specific fmtp parameter for GSM-HR: gsm-hr-format=3gpp-ts-101.318 gsm-hr-format=rfc5993 If an MGCP client indicates this parameter in the GSM-HR's fmtp and an incoming RTP GSM HR packet mismatches that format, convert to the indicated format. An SDP example: m=audio 1234 RTP/AVP 111 a=rtpmap:111 GSM-HR-08/8000/1 a=fmtp:111 gsm-hr-format=3gpp-ts-101.318 Patch-by: pmaier nhofmeyr Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Related: OS#5688 --- M include/osmocom/mgcp/fmtp.h M include/osmocom/mgcp/mgcp_common.h M src/libosmo-mgcp/fmtp.c M src/libosmo-mgcp/mgcp_network.c 4 files changed, 131 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/31214/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31214?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Idde8da27fd335dc03b8fbd9e0fedc1491b77e9e4 Gerrit-Change-Number: 31214 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email ) Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34898/comment/e7c40dda_92252c49 PS1, Line 321: /* Do not allow excessive payload types */ > why is this r->ptmap now? I see you are acessing r->codecs[count] below... oh, artifact from a future patch! good catch, thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f Gerrit-Change-Number: 34898 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 21:02:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

6 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: filesystem: add flag to tell whether an ADF supports an FS or not

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34902?usp=email ) Change subject: filesystem: add flag to tell whether an ADF supports an FS or not ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: strictly speaking, in terms of terminology an application with AID and no filesystem probably doesn't even have an "ADF" to begin with? Do you agree with that? Do you know any spec reference explaining this? If this is true maybe we can find a way in pySim to express this also in the class model... i.e. have something that is *not* a derived class from CardFile which one can select? Probably not easy, but at least worth thinking about, IMHO -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34902?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: Ifd0f7c34164685ea18d8a746394e55416fa0aa66 Gerrit-Change-Number: 34902 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:22:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: runtime: fix tracking of selected_adf

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34897?usp=email ) Change subject: runtime: fix tracking of selected_adf ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: I now see that self.selected_adf refers to RuntimeState. But shouldn't that be per-lchan state to begin with? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34897?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: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d Gerrit-Change-Number: 34897 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:20:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: runtime: fix tracking of selected_adf

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34897?usp=email ) Change subject: runtime: fix tracking of selected_adf ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: this fix works. Hoever, it might be less error-prone in the future, if the RuntimeLchan would have a method for selecting ADF by AID which automatically updated that member variable? This way any future callers might not run into the same trap of just calling the method without updating state. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34897?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: I4cc0c58ff887422b4f3954d35c8380ddc00baa1d Gerrit-Change-Number: 34897 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:19:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: transport: print reader device/number on init

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34903?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. Let's extend the messages so that the path is printed. To prevent problems with integration-tests, let's also add an environment variable that we can use to detect when pySim runs inside a integration-test. Related: OS#6210 Change-Id: Ibe296d51885b1ef5f9c9ecaf1d28da52014dcc4b --- M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M tests/pySim-prog_test.sh M tests/pySim-trace_test.sh 6 files changed, 40 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index ea97b69..98330a9 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -79,8 +79,10 @@ def __init__(self, sock_path: str = "/tmp/osmocom_l2", **kwargs): super().__init__(**kwargs) - print("Using Calypso-based (OsmocomBB) reader interface") - + if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": + print("Using Calypso-based (OsmocomBB) reader interface") + else: + print("Using Calypso-based (OsmocomBB) reader at socket %s" % sock_path) # Make sure that a given socket path exists if not os.path.exists(sock_path): raise ReaderError( diff --git a/pySim/transport/modem_atcmd.py b/pySim/transport/modem_atcmd.py index fee09c8..71f76e2 100644 --- a/pySim/transport/modem_atcmd.py +++ b/pySim/transport/modem_atcmd.py @@ -21,6 +21,7 @@ import time import re import argparse +import os from typing import Optional from pySim.utils import Hexstr, ResTuple @@ -36,7 +37,10 @@ def __init__(self, device: str = '/dev/ttyUSB0', baudrate: int = 115200, **kwargs): super().__init__(**kwargs) - print("Using modem for Generic SIM Access (3GPP TS 27.007)") + if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": + print("Using modem for Generic SIM Access (3GPP TS 27.007)") + else: + print("Using modem for Generic SIM Access (3GPP TS 27.007) at port %s" % device) self._sl = serial.Serial(device, baudrate, timeout=5) self._echo = False # this will be auto-detected by _check_echo() self._device = device diff --git a/pySim/transport/pcsc.py b/pySim/transport/pcsc.py index fbe7c0f..762908c 100644 --- a/pySim/transport/pcsc.py +++ b/pySim/transport/pcsc.py @@ -18,6 +18,7 @@ # import argparse +import os from typing import Optional from smartcard.CardConnection import CardConnection @@ -35,7 +36,10 @@ def __init__(self, reader_number: int = 0, **kwargs): super().__init__(**kwargs) - print("Using PC/SC reader interface") + if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": + print("Using PC/SC reader interface") + else: + print("Using PC/SC reader number %u" % reader_number) r = readers() if reader_number >= len(r): raise ReaderError('No reader found for number %d' % reader_number) diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py index 867317c..ad800ed 100644 --- a/pySim/transport/serial.py +++ b/pySim/transport/serial.py @@ -18,7 +18,7 @@ import serial import time -import os.path +import os import argparse from typing import Optional @@ -33,7 +33,10 @@ def __init__(self, device: str = '/dev/ttyUSB0', baudrate: int = 9600, rst: str = '-rts', debug: bool = False, **kwargs): super().__init__(**kwargs) - print("Using serial reader interface") + if os.environ.get('PYSIM_INTEGRATION_TEST') == "1": + print("Using serial reader interface") + else: + print("Using serial reader interface at port %s" % device) if not os.path.exists(device): raise ValueError("device file %s does not exist -- abort" % device) self._sl = serial.Serial( diff --git a/tests/pySim-prog_test.sh b/tests/pySim-prog_test.sh index f518618..28d9777 100755 --- a/tests/pySim-prog_test.sh +++ b/tests/pySim-prog_test.sh @@ -25,6 +25,7 @@ TEMPFILE=temp.tmp PYTHON=python3 +export PYSIM_INTEGRATION_TEST=1 set -e echo "pySim-prog_test - a test program to test pySim-prog.py" diff --git a/tests/pySim-trace_test.sh b/tests/pySim-trace_test.sh index 4ccb2aa..f7b97e8 100755 --- a/tests/pySim-trace_test.sh +++ b/tests/pySim-trace_test.sh @@ -24,6 +24,8 @@ GSMTAP_TRACE=pySim-trace_test_gsmtap.pcapng TEMPFILE=temp.tmp +export PYSIM_INTEGRATION_TEST=1 + echo "pySim-trace_test - a test program to test pySim-trace.py" echo "========================================================" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34903?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: Ibe296d51885b1ef5f9c9ecaf1d28da52014dcc4b Gerrit-Change-Number: 34903 Gerrit-PatchSet: 9 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: transport: print reader device/number on init

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34903?usp=email ) Change subject: transport: print reader device/number on init ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34903?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: Ibe296d51885b1ef5f9c9ecaf1d28da52014dcc4b Gerrit-Change-Number: 34903 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:17:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: euicc: Add get_profiles_info command

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34880?usp=email ) Change subject: euicc: Add get_profiles_info command ...................................................................... euicc: Add get_profiles_info command Example output: pySIM-shell (02:MF/ADF.ISD-R)> get_profiles_info { "profile_info_seq": { "profile_info": { "iccid": "98940462222222222222", "isdp_aid": "a0000005591010ffffffff8900001200", "profile_state": "enabled", "service_provider_name": "foobar", "profile_name": "foobar", "profile_class": "provisioning" } } } Change-Id: I52d136f99dc0eb29905e7ca0cd0865486d3cf65b --- M docs/shell.rst M pySim/euicc.py 2 files changed, 70 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 31d73c0..610500f 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -883,6 +883,11 @@ :module: pySim.euicc :func: ADF_ISDR.AddlShellCommands.rem_notif_parser +get_profiles_info +~~~~~~~~~~~~~~~~~ + +Obtain information about the profiles present on the eUICC using the ES10c GetProfilesInfo() function. + enable_profile ~~~~~~~~~~~~~~ diff --git a/pySim/euicc.py b/pySim/euicc.py index d9b7b70..45ebf1c 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -167,11 +167,41 @@ class LoadCRL(BER_TLV_IE, tag=0xbf35, nested=[]): # FIXME pass +# SGP.22 Section 5.7.15: GetProfilesInfo +class TagList(BER_TLV_IE, tag=0x5c): + _construct = GreedyRange(Int8ub) # FIXME: tags could be multi-byte +class ProfileInfoListReq(BER_TLV_IE, tag=0xbf2d, nested=[TagList]): # FIXME: SearchCriteria + pass +class IsdpAid(BER_TLV_IE, tag=0x4f): + _construct = HexAdapter(GreedyBytes) +class ProfileState(BER_TLV_IE, tag=0x9f70): + _construct = Enum(Int8ub, disabled=0, enabled=1) +class ProfileNickname(BER_TLV_IE, tag=0x90): + _construct = Utf8Adapter(GreedyBytes) +class ServiceProviderName(BER_TLV_IE, tag=0x91): + _construct = Utf8Adapter(GreedyBytes) +class ProfileName(BER_TLV_IE, tag=0x92): + _construct = Utf8Adapter(GreedyBytes) +class IconType(BER_TLV_IE, tag=0x93): + _construct = Enum(Int8ub, jpg=0, png=1) +class Icon(BER_TLV_IE, tag=0x94): + _construct = GreedyBytes +class ProfileClass(BER_TLV_IE, tag=0x95): + _construct = Enum(Int8ub, test=0, provisioning=1, operational=2) +class ProfileInfo(BER_TLV_IE, tag=0xe3, nested=[Iccid, IsdpAid, ProfileState, ProfileNickname, + ServiceProviderName, ProfileName, IconType, Icon, + ProfileClass]): # FIXME: more IEs + pass +class ProfileInfoSeq(BER_TLV_IE, tag=0xa0, nested=[ProfileInfo]): + pass +class ProfileInfoListError(BER_TLV_IE, tag=0x81): + _construct = Enum(Int8ub, incorrectInputValues=1, undefinedError=2) +class ProfileInfoListResp(BER_TLV_IE, tag=0xbf2d, nested=[ProfileInfoSeq, ProfileInfoListError]): + pass + # SGP.22 Section 5.7.16:: EnableProfile class RefreshFlag(BER_TLV_IE, tag=0x88): # FIXME _construct = Int8ub # FIXME -class IsdpAid(BER_TLV_IE, tag=0x4f): - _construct = HexAdapter(GreedyBytes) class EnableResult(BER_TLV_IE, tag=0x80): _construct = Enum(Int8ub, ok=0, iccidOrAidNotFound=1, profileNotInDisabledState=2, disallowedByPolicy=3, wrongProfileReenabling=4, catBusy=5, undefinedError=127) @@ -199,17 +229,15 @@ pass # SGP.22 Section 5.7.20 GetEID -class TagList(BER_TLV_IE, tag=0x5c): - _construct = GreedyRange(Int8ub) class EidValue(BER_TLV_IE, tag=0x5a): _construct = HexAdapter(GreedyBytes) class GetEuiccData(BER_TLV_IE, tag=0xbf3e, nested=[TagList, EidValue]): pass # SGP.22 Section 5.7.21: ES10c SetNickname -class ProfileNickname(BER_TLV_IE, tag=0x8f): +class SnrProfileNickname(BER_TLV_IE, tag=0x8f): _construct = Utf8Adapter(GreedyBytes) -class SetNicknameReq(BER_TLV_IE, tag=0xbf29, children=[Iccid, ProfileNickname]): +class SetNicknameReq(BER_TLV_IE, tag=0xbf29, children=[Iccid, SnrProfileNickname]): pass class SetNicknameResult(BER_TLV_IE, tag=0x80): _construct = Enum(Int8ub, ok=0, iccidNotFound=1, undefinedError=127) @@ -321,6 +349,12 @@ d = rn.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['notification_sent_resp'])) + def do_get_profiles_info(self, opts): + """Perform an ES10c GetProfilesInfo function.""" + pi = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, ProfileInfoListReq(), ProfileInfoListResp) + d = pi.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['profile_info_list_resp'])) + en_prof_parser = argparse.ArgumentParser() en_prof_grp = en_prof_parser.add_mutually_exclusive_group() en_prof_grp.add_argument('--isdp-aid', help='Profile identified by its ISD-P AID') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34880?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: I52d136f99dc0eb29905e7ca0cd0865486d3cf65b Gerrit-Change-Number: 34880 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: euicc: add some first IoT eUICC commands (GSMA SGP.32)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34882?usp=email ) Change subject: euicc: add some first IoT eUICC commands (GSMA SGP.32) ...................................................................... euicc: add some first IoT eUICC commands (GSMA SGP.32) this is far from being complete, just some basic first commands to get the certificates and eIM configuration. Change-Id: Ie05108e635ed9c6de10f0ba431cb1b13893f6be8 --- M docs/shell.rst M pySim/euicc.py 2 files changed, 79 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 610500f..de30ae7 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -921,6 +921,16 @@ :module: pySim.euicc :func: ADF_ISDR.AddlShellCommands.set_nickname_parser +get_certs +~~~~~~~~~ + +Obtain the certificates from an IoT eUICC using the ES10c GetCerts() function. + +get_eim_configuration_data +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Obtain the eIM configuration data from an IoT eUICC using the ES10b GetEimConfigurationData() function. + cmd2 settable parameters ------------------------ diff --git a/pySim/euicc.py b/pySim/euicc.py index 45ebf1c..c89d364 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -124,15 +124,21 @@ _construct = VersionType class SsAcreditationNumber(BER_TLV_IE, tag=0x0c): _construct = Utf8Adapter(GreedyBytes) - +class IpaMode(BER_TLV_IE, tag=0x90): # see SGP.32 v1.0 + _construct = Enum(Int8ub, ipad=0, ipea=1) +class IotVersion(BER_TLV_IE, tag=0x80): # see SGP.32 v1.0 + _construct = VersionType +class IotVersionSeq(BER_TLV_IE, tag=0xa0, nested=[IotVersion]): # see SGP.32 v1.0 + pass +class IotSpecificInfo(BER_TLV_IE, tag=0x94, nested=[IotVersionSeq]): # see SGP.32 v1.0 + pass class EuiccInfo2(BER_TLV_IE, tag=0xbf22, nested=[ProfileVersion, SVN, EuiccFirmwareVer, ExtCardResource, UiccCapability, TS102241Version, GlobalPlatformVersion, RspCapability, EuiccCiPkiListForVerification, EuiccCiPkiListForSigning, EuiccCategory, PpVersion, - SsAcreditationNumber]): + SsAcreditationNumber, IpaMode, IotSpecificInfo]): pass - # SGP.22 Section 5.7.9: ListNotification class ProfileMgmtOperation(BER_TLV_IE, tag=0x81): _construct = FlagsEnum(Byte, install=1, enable=2, disable=4, delete=8) @@ -244,6 +250,40 @@ class SetNicknameResp(BER_TLV_IE, tag=0xbf29, children=[SetNicknameResult]): pass +# SGP.32 Section 5.9.10: ES10b: GetCerts +class GetCertsReq(BER_TLV_IE, tag=0xbf56): + pass +class EumCertificate(BER_TLV_IE, tag=0xa5): + _construct = GreedyBytes +class EuiccCertificate(BER_TLV_IE, tag=0xa6): + _construct = GreedyBytes +class GetCertsError(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, invalidCiPKId=1, undefinedError=127) +class GetCertsResp(BER_TLV_IE, tag=0xbf56, nested=[EumCertificate, EuiccCertificate, GetCertsError]): + pass + +# SGP.32 Section 5.9.18: ES10b: GetEimConfigurationData +class EimId(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) +class EimFqdn(BER_TLV_IE, tag=0x81): + _construct = Utf8Adapter(GreedyBytes) +class EimIdType(BER_TLV_IE, tag=0x82): + _construct = Enum(Int8ub, eimIdTypeOid=1, eimIdTypeFqdn=2, eimIdTypeProprietary=3) +class CounterValue(BER_TLV_IE, tag=0x83): + _construct = GreedyInteger +class AssociationToken(BER_TLV_IE, tag=0x84): + _construct = GreedyInteger +class EimSupportedProtocol(BER_TLV_IE, tag=0x87): + _construct = Enum(Int8ub, eimRetrieveHttps=0, eimRetrieveCoaps=1, eimInjectHttps=2, eimInjectCoaps=3, + eimProprietary=4) +# FIXME: eimPublicKeyData, trustedPublicKeyDataTls, euiccCiPKId +class EimConfigurationData(BER_TLV_IE, tag=0x80, nested=[EimId, EimFqdn, EimIdType, CounterValue, + AssociationToken, EimSupportedProtocol]): + pass +class EimConfigurationDataSeq(BER_TLV_IE, tag=0xa0, nested=[EimConfigurationData]): + pass +class GetEimConfigurationData(BER_TLV_IE, tag=0xbf55, nested=[EimConfigurationDataSeq]): + pass class ADF_ISDR(CardADF): def __init__(self, aid=AID_ISD_R, name='ADF.ISD-R', fid=None, sfid=None, @@ -438,6 +478,20 @@ d = sn.to_dict() self._cmd.poutput_json(flatten_dict_lists(d['set_nickname_resp'])) + def do_get_certs(self, opts): + """Perform an ES10c GetCerts() function on an IoT eUICC.""" + gc = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, GetCertsReq(), GetCertsResp) + d = gc.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['get_certficiates_resp'])) + + def do_get_eim_configuration_data(self, opts): + """Perform an ES10b GetEimConfigurationData function on an Iot eUICC.""" + gec = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, GetEimConfigurationData(), + GetEimConfigurationData) + d = gec.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['get_eim_configuration_data'])) + + class ADF_ECASD(CardADF): def __init__(self, aid=AID_ECASD, name='ADF.ECASD', fid=None, sfid=None, desc='ECASD (eUICC Controlling Authority Security Domain) Application'): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34882?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: Ie05108e635ed9c6de10f0ba431cb1b13893f6be8 Gerrit-Change-Number: 34882 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

6 months, 3 weeks

1
0
0 0

[L] Change in pysim[master]: Initial support for eUICC

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34852?usp=email ) Change subject: Initial support for eUICC ...................................................................... Initial support for eUICC This just adds basic support for the ISD-R application and its associated STORE DATA command which is used for the ES10x interfaces between off-card entities and the on-card ISD-R. Change-Id: Ieab37b083e25d3f36c20f6e9ed3e4bdfdd14a42a Closes: OS#5637 --- M docs/shell.rst M pySim-shell.py A pySim/euicc.py M pySim/global_platform.py 4 files changed, 565 insertions(+), 4 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/docs/shell.rst b/docs/shell.rst index 811ef61..31d73c0 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -805,6 +805,118 @@ :module: pySim.global_platform :func: ADF_SD.AddlShellCommands.get_data_parser + +eUICC ISD-R commands +-------------------- + +These commands are to perform a variety of operations against eUICC for GSMA consumer eSIM. They +implement the so-called ES10a, ES10b and ES10c interface. Basically they perform the tasks that usually would +be done by the LPAd in the UE. + +In order to use those commands, you need to go through the specified steps as documented in GSMA SGP.22: + +* open a new logical channel (and start to use it) +* select the ISD-R application + +:: + + pySIM-shell (00:MF)> open_channel 2 + pySIM-shell (00:MF)> switch_channel 2 + pySIM-shell (02:MF)> select ADF.ISD-R + { + "application_id": "a0000005591010ffffffff8900000100", + "proprietary_data": { + "maximum_length_of_data_field_in_command_message": 255 + }, + "isdr_proprietary_application_template": { + "supported_version_number": "020200" + } + } + pySIM-shell (02:ADF.ISD-R)> + +Once you are at this stage, you can issue the various eUICC related commands against the ISD-R application + + +es10x_store_data +~~~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.es10x_store_data_parser + +get_euicc_configured_addresses +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Obtain the configured SM-DP+ and/or SM-DS addresses using the ES10a GetEuiccConfiguredAddresses() function. + +set_default_dp_address +~~~~~~~~~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.set_def_dp_addr_parser + +get_euicc_challenge +~~~~~~~~~~~~~~~~~~~ + +Obtain an authentication challenge from the eUICC using the ES10b GetEUICCChallenge() function. + +get_euicc_info1 +~~~~~~~~~~~~~~~ + +Obtain EUICC Information (1) from the eUICC using the ES10b GetEUICCCInfo() function. + +get_euicc_info2 +~~~~~~~~~~~~~~~ + +Obtain EUICC Information (2) from the eUICC using the ES10b GetEUICCCInfo() function. + +list_notification +~~~~~~~~~~~~~~~~~ + +Obtain the list of notifications from the eUICC using the ES10b ListNotification() function. + +remove_notification_from_list +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.rem_notif_parser + +enable_profile +~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.en_prof_parser + +disable_profile +~~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.dis_prof_parser + +delete_profile +~~~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.del_prof_parser + +get_eid +~~~~~~~ + +Obtain the EID of the eUICC using the ES10c GetEID() function. + +set_nickname +~~~~~~~~~~~~ + +.. argparse:: + :module: pySim.euicc + :func: ADF_ISDR.AddlShellCommands.set_nickname_parser + + cmd2 settable parameters ------------------------ diff --git a/pySim-shell.py b/pySim-shell.py index 022b276..bbb14b2 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -77,6 +77,7 @@ import pySim.ts_31_104 import pySim.ara_m import pySim.global_platform +import pySim.euicc from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field diff --git a/pySim/euicc.py b/pySim/euicc.py new file mode 100644 index 0000000..d9b7b70 --- /dev/null +++ b/pySim/euicc.py @@ -0,0 +1,431 @@ +# -*- coding: utf-8 -*- + +""" +Various definitions related to GSMA eSIM / eUICC + +Related Specs: GSMA SGP.22, GSMA SGP.02, etc. +""" + +# Copyright (C) 2023 Harald Welte <laforge(a)osmocom.org> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from pySim.tlv import * +from pySim.construct import * +from construct import Optional as COptional +from construct import * +import argparse +from cmd2 import cmd2, CommandSet, with_default_category +from pySim.commands import SimCardCommands +from pySim.filesystem import CardADF, CardApplication +from pySim.utils import Hexstr, SwHexstr +import pySim.global_platform + +class VersionAdapter(Adapter): + """convert an EUICC Version (3-int array) to a textual representation.""" + + def _decode(self, obj, context, path): + return "%u.%u.%u" % (obj[0], obj[1], obj[2]) + + def _encode(self, obj, context, path): + return [int(x) for x in obj.split('.')] + +VersionType = VersionAdapter(Array(3, Int8ub)) + +# Application Identifiers as defined in GSMA SGP.02 Annex H +AID_ISD_R = "A0000005591010FFFFFFFF8900000100" +AID_ECASD = "A0000005591010FFFFFFFF8900000200" +AID_ISD_P_FILE = "A0000005591010FFFFFFFF8900000D00" +AID_ISD_P_MODULE = "A0000005591010FFFFFFFF8900000E00" + +sw_isdr = { + 'ISD-R': { + '6a80': 'Incorrect values in command data', + '6a82': 'Profile not found', + '6a88': 'Reference data not found', + '6985': 'Conditions of use not satisfied', + } +} + +class SupportedVersionNumber(BER_TLV_IE, tag=0x82): + _construct = GreedyBytes + +class IsdrProprietaryApplicationTemplate(BER_TLV_IE, tag=0xe0, nested=[SupportedVersionNumber]): + # FIXME: lpaeSupport - what kind of tag would it have? + pass + +# GlobalPlatform 2.1.1 Section 9.9.3.1 from pySim/global_platform.py extended with E0 +class FciTemplate(BER_TLV_IE, tag=0x6f, nested=pySim.global_platform.FciTemplateNestedList + + [IsdrProprietaryApplicationTemplate]): + pass + + +# SGP.22 Section 5.7.3: GetEuiccConfiguredAddresses +class DefaultDpAddress(BER_TLV_IE, tag=0x80): + _construct = Utf8Adapter(GreedyBytes) +class RootDsAddress(BER_TLV_IE, tag=0x81): + _construct = Utf8Adapter(GreedyBytes) +class EuiccConfiguredAddresses(BER_TLV_IE, tag=0xbf3c, nested=[DefaultDpAddress, RootDsAddress]): + pass + +# SGP.22 Section 5.7.4: SetDefaultDpAddress +class SetDefaultDpAddrRes(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, undefinedError=127) +class SetDefaultDpAddress(BER_TLV_IE, tag=0xbf3f, nested=[DefaultDpAddress, SetDefaultDpAddrRes]): + pass + +# SGP.22 Section 5.7.7: GetEUICCChallenge +class EuiccChallenge(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(Bytes(16)) +class GetEuiccChallenge(BER_TLV_IE, tag=0xbf2e, nested=[EuiccChallenge]): + pass + +# SGP.22 Section 5.7.8: GetEUICCInfo +class SVN(BER_TLV_IE, tag=0x82): + _construct = VersionType +class SubjectKeyIdentifier(BER_TLV_IE, tag=0x81): + _construct = HexAdapter(GreedyBytes) +class SubjectKeyIdentifierSeq(BER_TLV_IE, tag=0x04, nested=[SubjectKeyIdentifier]): + pass +class EuiccCiPkiListForVerification(BER_TLV_IE, tag=0xa9, nested=[SubjectKeyIdentifierSeq]): + pass +class EuiccCiPkiListForSigning(BER_TLV_IE, tag=0xaa, nested=[SubjectKeyIdentifierSeq]): + pass +class EuiccInfo1(BER_TLV_IE, tag=0xbf20, nested=[SVN, EuiccCiPkiListForVerification, EuiccCiPkiListForSigning]): + pass +class ProfileVersion(BER_TLV_IE, tag=0x81): + _construct = VersionType +class EuiccFirmwareVer(BER_TLV_IE, tag=0x83): + _construct = VersionType +class ExtCardResource(BER_TLV_IE, tag=0x84): + _construct = HexAdapter(GreedyBytes) +class UiccCapability(BER_TLV_IE, tag=0x85): + _construct = HexAdapter(GreedyBytes) # FIXME +class TS102241Version(BER_TLV_IE, tag=0x86): + _construct = VersionType +class GlobalPlatformVersion(BER_TLV_IE, tag=0x87): + _construct = VersionType +class RspCapability(BER_TLV_IE, tag=0x88): + _construct = HexAdapter(GreedyBytes) # FIXME +class EuiccCategory(BER_TLV_IE, tag=0x8b): + _construct = Enum(Int8ub, other=0, basicEuicc=1, mediumEuicc=2, contactlessEuicc=3) +class PpVersion(BER_TLV_IE, tag=0x04): + _construct = VersionType +class SsAcreditationNumber(BER_TLV_IE, tag=0x0c): + _construct = Utf8Adapter(GreedyBytes) + +class EuiccInfo2(BER_TLV_IE, tag=0xbf22, nested=[ProfileVersion, SVN, EuiccFirmwareVer, ExtCardResource, + UiccCapability, TS102241Version, GlobalPlatformVersion, + RspCapability, EuiccCiPkiListForVerification, + EuiccCiPkiListForSigning, EuiccCategory, PpVersion, + SsAcreditationNumber]): + pass + + +# SGP.22 Section 5.7.9: ListNotification +class ProfileMgmtOperation(BER_TLV_IE, tag=0x81): + _construct = FlagsEnum(Byte, install=1, enable=2, disable=4, delete=8) +class ListNotificationReq(BER_TLV_IE, tag=0xbf28, nested=[ProfileMgmtOperation]): + pass +class SeqNumber(BER_TLV_IE, tag=0x80): + _construct = GreedyInteger +class NotificationAddress(BER_TLV_IE, tag=0x82): + _construct = Utf8Adapter(GreedyBytes) +class Iccid(BER_TLV_IE, tag=0x5a): + _construct = HexAdapter(GreedyBytes) +class NotificationMetadata(BER_TLV_IE, tag=0xbf2f, nested=[SeqNumber, ProfileMgmtOperation, + NotificationAddress, Iccid]): + pass +class NotificationMetadataList(BER_TLV_IE, tag=0xa0, nested=[NotificationMetadata]): + pass +class ListNotificationsResultError(BER_TLV_IE, tag=0x81): + _construct = Enum(Int8ub, undefinedError=127) +class ListNotificationResp(BER_TLV_IE, tag=0xbf28, nested=[NotificationMetadataList, + ListNotificationsResultError]): + pass + +# SGP.22 Section 5.7.11: RemoveNotificationFromList +class DeleteNotificationStatus(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, nothingToDelete=1, undefinedError=127) +class NotificationSentReq(BER_TLV_IE, tag=0xbf30, nested=[SeqNumber]): + pass +class NotificationSentResp(BER_TLV_IE, tag=0xbf30, nested=[DeleteNotificationStatus]): + pass + +# SGP.22 Section 5.7.12: LoadCRL: FIXME +class LoadCRL(BER_TLV_IE, tag=0xbf35, nested=[]): # FIXME + pass + +# SGP.22 Section 5.7.16:: EnableProfile +class RefreshFlag(BER_TLV_IE, tag=0x88): # FIXME + _construct = Int8ub # FIXME +class IsdpAid(BER_TLV_IE, tag=0x4f): + _construct = HexAdapter(GreedyBytes) +class EnableResult(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, iccidOrAidNotFound=1, profileNotInDisabledState=2, + disallowedByPolicy=3, wrongProfileReenabling=4, catBusy=5, undefinedError=127) +class EnableProfileReq(BER_TLV_IE, tag=0xbf31, nested=[IsdpAid, Iccid, RefreshFlag]): + pass +class EnableProfileResp(BER_TLV_IE, tag=0xbf31, nested=[EnableResult]): + pass + +# SGP.22 Section 5.7.17 DisableProfile +class DisableResult(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, iccidOrAidNotFound=1, profileNotInEnabledState=2, + disallowedByPolicy=3, catBusy=5, undefinedError=127) +class DisableProfileReq(BER_TLV_IE, tag=0xbf32, nested=[IsdpAid, Iccid, RefreshFlag]): + pass +class DisableProfileResp(BER_TLV_IE, tag=0xbf32, nested=[DisableResult]): + pass + +# SGP.22 Section 5.7.18: DeleteProfile +class DeleteResult(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, iccidOrAidNotFound=1, profileNotInDisabledState=2, + disallowedByPolicy=3, undefinedError=127) +class DeleteProfileReq(BER_TLV_IE, tag=0xbf33, nested=[IsdpAid, Iccid]): + pass +class DeleteProfileResp(BER_TLV_IE, tag=0xbf33, nested=[DeleteResult]): + pass + +# SGP.22 Section 5.7.20 GetEID +class TagList(BER_TLV_IE, tag=0x5c): + _construct = GreedyRange(Int8ub) +class EidValue(BER_TLV_IE, tag=0x5a): + _construct = HexAdapter(GreedyBytes) +class GetEuiccData(BER_TLV_IE, tag=0xbf3e, nested=[TagList, EidValue]): + pass + +# SGP.22 Section 5.7.21: ES10c SetNickname +class ProfileNickname(BER_TLV_IE, tag=0x8f): + _construct = Utf8Adapter(GreedyBytes) +class SetNicknameReq(BER_TLV_IE, tag=0xbf29, children=[Iccid, ProfileNickname]): + pass +class SetNicknameResult(BER_TLV_IE, tag=0x80): + _construct = Enum(Int8ub, ok=0, iccidNotFound=1, undefinedError=127) +class SetNicknameResp(BER_TLV_IE, tag=0xbf29, children=[SetNicknameResult]): + pass + + +class ADF_ISDR(CardADF): + def __init__(self, aid=AID_ISD_R, name='ADF.ISD-R', fid=None, sfid=None, + desc='ISD-R (Issuer Security Domain Root) Application'): + super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc) + self.shell_commands += [self.AddlShellCommands()] + + @staticmethod + def store_data(scc: SimCardCommands, tx_do: Hexstr) -> Tuple[Hexstr, SwHexstr]: + """Perform STORE DATA according to Table 47+48 in Section 5.7.2 of SGP.22. + Only single-block store supported for now.""" + capdu = '%sE29100%02u%s' % (scc.cla4lchan('80'), len(tx_do)//2, tx_do) + return scc._tp.send_apdu_checksw(capdu) + + @staticmethod + def store_data_tlv(scc: SimCardCommands, cmd_do, resp_cls, exp_sw='9000'): + """Transceive STORE DATA APDU with the card, transparently encoding the command data from TLV + and decoding the response data tlv.""" + if cmd_do: + cmd_do_enc = cmd_do.to_tlv() + cmd_do_len = len(cmd_do_enc) + if cmd_do_len > 255: + return ValueError('DO > 255 bytes not supported yet') + else: + cmd_do_enc = b'' + (data, sw) = ADF_ISDR.store_data(scc, b2h(cmd_do_enc)) + if data: + if resp_cls: + resp_do = resp_cls() + resp_do.from_tlv(h2b(data)) + return resp_do + else: + return data + else: + return None + + def decode_select_response(self, data_hex: Hexstr) -> object: + t = FciTemplate() + t.from_tlv(h2b(data_hex)) + d = t.to_dict() + return flatten_dict_lists(d['fci_template']) + + @with_default_category('Application-Specific Commands') + class AddlShellCommands(CommandSet): + + es10x_store_data_parser = argparse.ArgumentParser() + es10x_store_data_parser.add_argument('TX_DO', help='Hexstring of encoded to-be-transmitted DO') + + @cmd2.with_argparser(es10x_store_data_parser) + def do_es10x_store_data(self, opts): + """Perform a raw STORE DATA command as defined for the ES10x eUICC interface.""" + (data, sw) = ADF_ISDR.store_data(self._cmd.lchan.scc, opts.TX_DO) + + def do_get_euicc_configured_addresses(self, opts): + """Perform an ES10a GetEuiccConfiguredAddresses function.""" + eca = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, EuiccConfiguredAddresses(), EuiccConfiguredAddresses) + d = eca.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['euicc_configured_addresses'])) + + set_def_dp_addr_parser = argparse.ArgumentParser() + set_def_dp_addr_parser.add_argument('DP_ADDRESS', help='Default SM-DP+ address as UTF-8 string') + + @cmd2.with_argparser(set_def_dp_addr_parser) + def do_set_default_dp_address(self, opts): + """Perform an ES10a SetDefaultDpAddress function.""" + sdda_cmd = SetDefaultDpAddress(children=[DefaultDpAddress(decoded=opts.DP_ADDRESS)]) + sdda = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, sdda_cmd, SetDefaultDpAddress) + d = sdda.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['set_default_dp_address'])) + + def do_get_euicc_challenge(self, opts): + """Perform an ES10b GetEUICCChallenge function.""" + gec = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, GetEuiccChallenge(), GetEuiccChallenge) + d = gec.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['get_euicc_challenge'])) + + def do_get_euicc_info1(self, opts): + """Perform an ES10b GetEUICCInfo (1) function.""" + ei1 = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, EuiccInfo1(), EuiccInfo1) + d = ei1.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['euicc_info1'])) + + def do_get_euicc_info2(self, opts): + """Perform an ES10b GetEUICCInfo (2) function.""" + ei2 = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, EuiccInfo2(), EuiccInfo2) + d = ei2.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['euicc_info2'])) + + def do_list_notification(self, opts): + """Perform an ES10b ListNotification function.""" + ln = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, ListNotificationReq(), ListNotificationResp) + d = ln.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['list_notification_resp'])) + + rem_notif_parser = argparse.ArgumentParser() + rem_notif_parser.add_argument('SEQ_NR', type=int, help='Sequence Number of the to-be-removed notification') + + @cmd2.with_argparser(rem_notif_parser) + def do_remove_notification_from_list(self, opts): + """Perform an ES10b RemoveNotificationFromList function.""" + rn_cmd = NotificationSentReq(children=[SeqNumber(decoded=opts.SEQ_NR)]) + rn = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, rn_cmd, NotificationSentResp) + d = rn.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['notification_sent_resp'])) + + en_prof_parser = argparse.ArgumentParser() + en_prof_grp = en_prof_parser.add_mutually_exclusive_group() + en_prof_grp.add_argument('--isdp-aid', help='Profile identified by its ISD-P AID') + en_prof_grp.add_argument('--iccid', help='Profile identified by its ICCID') + en_prof_parser.add_argument('--refresh-required', action='store_true', help='whether a REFRESH is required') + + @cmd2.with_argparser(en_prof_parser) + def do_enable_profile(self, opts): + """Perform an ES10c EnableProfile function.""" + ep_cmd_contents = [] + if opts.isdp_aid: + ep_cmd_contents.append(IsdpAid(decoded=opts.isdp_aid)) + if opts.iccid: + ep_cmd_contents.append(Iccid(decoded=opts.iccid)) + if opts.refresh_required: + ep_cmd_contents.append(RefreshFlag()) + ep_cmd = EnableProfileReq(children=ep_cmd_contents) + ep = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, ep_cmd, EnableProfileResp) + d = ep.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['enable_profile_resp'])) + + dis_prof_parser = argparse.ArgumentParser() + dis_prof_grp = dis_prof_parser.add_mutually_exclusive_group() + dis_prof_grp.add_argument('--isdp-aid', help='Profile identified by its ISD-P AID') + dis_prof_grp.add_argument('--iccid', help='Profile identified by its ICCID') + dis_prof_parser.add_argument('--refresh-required', action='store_true', help='whether a REFRESH is required') + + @cmd2.with_argparser(dis_prof_parser) + def do_disable_profile(self, opts): + """Perform an ES10c DisableProfile function.""" + dp_cmd_contents = [] + if opts.isdp_aid: + dp_cmd_contents.append(IsdpAid(decoded=opts.isdp_aid)) + if opts.iccid: + dp_cmd_contents.append(Iccid(decoded=opts.iccid)) + if opts.refresh_required: + dp_cmd_contents.append(RefreshFlag()) + dp_cmd = DisableProfileReq(children=dp_cmd_contents) + dp = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, dp_cmd, DisableProfileResp) + d = dp.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['disable_profile_resp'])) + + del_prof_parser = argparse.ArgumentParser() + del_prof_grp = del_prof_parser.add_mutually_exclusive_group() + del_prof_grp.add_argument('--isdp-aid', help='Profile identified by its ISD-P AID') + del_prof_grp.add_argument('--iccid', help='Profile identified by its ICCID') + + @cmd2.with_argparser(del_prof_parser) + def do_delete_profile(self, opts): + """Perform an ES10c DeleteProfile function.""" + dp_cmd_contents = [] + if opts.isdp_aid: + dp_cmd_contents.append(IsdpAid(decoded=opts.isdp_aid)) + if opts.iccid: + dp_cmd_contents.append(Iccid(decoded=opts.iccid)) + dp_cmd = DeleteProfileReq(children=dp_cmd_contents) + dp = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, dp_cmd, DeleteProfileResp) + d = dp.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['delete_profile_resp'])) + + + def do_get_eid(self, opts): + """Perform an ES10c GetEID function.""" + (data, sw) = ADF_ISDR.store_data(self._cmd.lchan.scc, 'BF3E035C015A') + ged_cmd = GetEuiccData(children=[TagList(decoded=[0x5A])]) + ged = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, ged_cmd, GetEuiccData) + d = ged.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['get_euicc_data'])) + + set_nickname_parser = argparse.ArgumentParser() + set_nickname_parser.add_argument('ICCID', help='ICCID of the profile whose nickname to set') + set_nickname_parser.add_argument('--profile-nickname', help='Nickname of the profile') + + @cmd2.with_argparser(set_nickname_parser) + def do_set_nickname(self, opts): + """Perform an ES10c SetNickname function.""" + nickname = opts.profile_nickname or '' + sn_cmd_contents = [Iccid(decoded=opts.ICCID), ProfileNickname(decoded=nickname)] + sn_cmd = SetNicknameReq(children=sn_cmd_contents) + sn = ADF_ISDR.store_data_tlv(self._cmd.lchan.scc, sn_cmd, SetNicknameResp) + d = sn.to_dict() + self._cmd.poutput_json(flatten_dict_lists(d['set_nickname_resp'])) + +class ADF_ECASD(CardADF): + def __init__(self, aid=AID_ECASD, name='ADF.ECASD', fid=None, sfid=None, + desc='ECASD (eUICC Controlling Authority Security Domain) Application'): + super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc) + self.shell_commands += [self.AddlShellCommands()] + + def decode_select_response(self, data_hex: Hexstr) -> object: + t = FciTemplate() + t.from_tlv(h2b(data_hex)) + d = t.to_dict() + return flatten_dict_lists(d['fci_template']) + + @with_default_category('Application-Specific Commands') + class AddlShellCommands(CommandSet): + pass + + + +class CardApplicationISDR(CardApplication): + def __init__(self): + super().__init__('ISD-R', adf=ADF_ISDR(), sw=sw_isdr) + +class CardApplicationECASD(CardApplication): + def __init__(self): + super().__init__('ECASD', adf=ADF_ECASD(), sw=sw_isdr) diff --git a/pySim/global_platform.py b/pySim/global_platform.py index bfa2adf..136cccc 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -174,11 +174,14 @@ MaximumLengthOfDataFieldInCommandMessage]): pass +# explicitly define this list and give it a name so pySim.euicc can reference it +FciTemplateNestedList = [ApplicationID, SecurityDomainManagementData, + ApplicationProductionLifeCycleData, + MaximumLengthOfDataFieldInCommandMessage, + ProprietaryData] + # GlobalPlatform 2.1.1 Section 9.9.3.1 -class FciTemplate(BER_TLV_IE, tag=0x6f, nested=[ApplicationID, SecurityDomainManagementData, - ApplicationProductionLifeCycleData, - MaximumLengthOfDataFieldInCommandMessage, - ProprietaryData]): +class FciTemplate(BER_TLV_IE, tag=0x6f, nested=FciTemplateNestedList): pass class IssuerIdentificationNumber(BER_TLV_IE, tag=0x42): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34852?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: Ieab37b083e25d3f36c20f6e9ed3e4bdfdd14a42a Gerrit-Change-Number: 34852 Gerrit-PatchSet: 10 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

6 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: euicc: add some first IoT eUICC commands (GSMA SGP.32)

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34882?usp=email ) Change subject: euicc: add some first IoT eUICC commands (GSMA SGP.32) ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34882?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: Ie05108e635ed9c6de10f0ba431cb1b13893f6be8 Gerrit-Change-Number: 34882 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:16:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

[M] Change in pysim[master]: euicc: Add get_profiles_info command

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34880?usp=email ) Change subject: euicc: Add get_profiles_info command ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34880?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: I52d136f99dc0eb29905e7ca0cd0865486d3cf65b Gerrit-Change-Number: 34880 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:16:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

[L] Change in pysim[master]: Initial support for eUICC

by laforge

Attention is currently required from: fixeria, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34852?usp=email ) Change subject: Initial support for eUICC ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34852?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: Ieab37b083e25d3f36c20f6e9ed3e4bdfdd14a42a Gerrit-Change-Number: 34852 Gerrit-PatchSet: 9 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 26 Oct 2023 15:16:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 months, 3 weeks

1
0
0 0

2024

2023

2022

gerrit-log October 2023