laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41682?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: Added example keyfile
......................................................................
Added example keyfile
Added an example keyfile that people can use when trying to decrypt
TEA-encrypted traffic. Note that a legitimate 80-bit key is needed.
This is not a cracking tool.
Change-Id: I7e13dcd10546e118e2cf9845f14121862db0cca9
---
A src/example_keyfile.txt
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/example_keyfile.txt b/src/example_keyfile.txt
new file mode 100644
index 0000000..93e2b06
--- /dev/null
+++ b/src/example_keyfile.txt
@@ -0,0 +1,2 @@
+network mcc 204 mnc 1337 ksg_type 1 security_class 2
+key mcc 204 mnc 1337 addr 00000000 key_type 1 key_num 1234 key 00112233445566778899
--
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41682?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I7e13dcd10546e118e2cf9845f14121862db0cca9
Gerrit-Change-Number: 41682
Gerrit-PatchSet: 3
Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41679?usp=email )
Change subject: Fix preventing crashes when -d missing
......................................................................
Fix preventing crashes when -d missing
Small fix that check whether a dumpdir was provided with -d. If not,
no voice data is written to file.
Change-Id: I6a857f62aae542b054cbb474594359da626762bb
---
M src/lower_mac/tetra_lower_mac.c
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c
index f8e7810..d58f2ab 100644
--- a/src/lower_mac/tetra_lower_mac.c
+++ b/src/lower_mac/tetra_lower_mac.c
@@ -194,8 +194,11 @@
if (tms->cur_burst.is_traffic && type == TPSAP_T_NDB && blk_num == BLK_1)
tms->cur_burst.blk1_stolen = true;
- /* If this is a traffic channel, dump. */
- if (tms->cur_burst.is_traffic && (type == TPSAP_T_SCH_F || (blk_num == BLK_2 && !tms->cur_burst.blk2_stolen))) {
+ /* If this is a traffic channel and we have a dump output directory, dump. */
+ if (tms->dumpdir &&
+ tms->cur_burst.is_traffic &&
+ (type == TPSAP_T_SCH_F || (blk_num == BLK_2 && !tms->cur_burst.blk2_stolen))) {
+
char fname[PATH_MAX];
int16_t block[690];
FILE *f;
--
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41679?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: I6a857f62aae542b054cbb474594359da626762bb
Gerrit-Change-Number: 41679
Gerrit-PatchSet: 3
Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/41680?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: Small bugfix in SYSINFO parsing
......................................................................
Small bugfix in SYSINFO parsing
Small bugfix. We now increases the position in the SYSINFO read
buffer when parsing hyperframe or cck number.
Change-Id: Ic35f5106c096a7a3dd0d2302ad53fa00c69ab76d
---
M src/tetra_mac_pdu.c
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/tetra_mac_pdu.c b/src/tetra_mac_pdu.c
index 06c93ef..b81edcb 100644
--- a/src/tetra_mac_pdu.c
+++ b/src/tetra_mac_pdu.c
@@ -57,10 +57,11 @@
sid->access_parameter = bits_to_uint(cur, 4); cur += 4;
sid->radio_dl_timeout = bits_to_uint(cur, 4); cur += 4;
sid->cck_valid_no_hf = *cur++;
- if (sid->cck_valid_no_hf)
- sid->cck_id = bits_to_uint(cur, 16);
- else
- sid->hyperframe_number = bits_to_uint(cur, 16);
+ if (sid->cck_valid_no_hf) {
+ sid->cck_id = bits_to_uint(cur, 16); cur += 16;
+ } else {
+ sid->hyperframe_number = bits_to_uint(cur, 16); cur += 16;
+ }
sid->option_field = bits_to_uint(cur, 2); cur += 2;
switch (sid->option_field) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/41680?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-tetra
Gerrit-Branch: master
Gerrit-Change-Id: Ic35f5106c096a7a3dd0d2302ad53fa00c69ab76d
Gerrit-Change-Number: 41680
Gerrit-PatchSet: 3
Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: daniel, dexter.
laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/41508?usp=email )
Change subject: card_key_provider: add PostgreSQL support
......................................................................
Patch Set 5:
(1 comment)
File setup.py:
https://gerrit.osmocom.org/c/pysim/+/41508/comment/c5fa580e_954c6b8a?usp=em… :
PS4, Line 37: psycopg2-binary
> > What if we leave it out and mention it in the manual that it is needed […]
I agree it should be extras_require
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41508?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Icba625c02a60d7e1f519b506a46bda5ded0537d3
Gerrit-Change-Number: 41508
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 18 Dec 2025 19:47:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>