Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40703?usp=email
to look at the new patch set (#2).
Change subject: 7816 fsm: ensure errors always return a msgb
......................................................................
7816 fsm: ensure errors always return a msgb
This should always be safe to do, since I introduced statically allocated (but useless in this case) msgbs for the fsm years ago, and this was just leftover code from before that.
The only exception is the internal ISO7816_E_TPDU_CLEAR_REQ.
Change-Id: If32484675a0a10f1504477f5eea00c879ec78f1e
---
M ccid_common/iso7816_fsm.c
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/03/40703/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40703?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: If32484675a0a10f1504477f5eea00c879ec78f1e
Gerrit-Change-Number: 40703
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40703?usp=email )
Change subject: 7816 fsm: ensure errors always return a msgb
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40703?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: If32484675a0a10f1504477f5eea00c879ec78f1e
Gerrit-Change-Number: 40703
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 18 Jul 2025 19:03:23 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Attention is currently required from: Hoernchen.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40721?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: 7816 fsm: drop inverse convention lut for arm
......................................................................
7816 fsm: drop inverse convention lut for arm
3 instructions is more reliable than precious bytes and awfully slow
memory.
Change-Id: I1c6f1c4b733074201cb02c0b9e7cf80a9f8dca7c
---
M ccid_common/iso7816_fsm.c
1 file changed, 21 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/21/40721/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40721?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I1c6f1c4b733074201cb02c0b9e7cf80a9f8dca7c
Gerrit-Change-Number: 40721
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40722?usp=email )
Change subject: timers: fix them
......................................................................
timers: fix them
Since they are barely used at all they silently broke during the usb fixing attempts, which in turn broke ATR timeouts for cards that don't play well with 5V.
Change-Id: I0a9ba7a9097fe09614beceeae7541bd7b82b9087
---
M sysmoOCTSIM/main.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/22/40722/1
diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c
index b0c0229..7d81853 100644
--- a/sysmoOCTSIM/main.c
+++ b/sysmoOCTSIM/main.c
@@ -543,7 +543,7 @@
void reset_all_stuff_irq(void)
{
- SysTick->CTRL = 0; // no clock ticks for osmo timers
+ SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk; // no clock ticks for osmo timers
Sercom *const sercom_modules[] = SERCOM_INSTS;
for (uint32_t i = 0; i < SERCOM_INST_NUM; i++) {
@@ -605,7 +605,7 @@
#endif
}
- SysTick->CTRL = 1;
+ SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
// while (!ccid_df_is_enabled())
// ;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/40722?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I0a9ba7a9097fe09614beceeae7541bd7b82b9087
Gerrit-Change-Number: 40722
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/40713?usp=email )
Change subject: cosmetic: sgsnemu: Fix trailing whitespace
......................................................................
cosmetic: sgsnemu: Fix trailing whitespace
Also make linter happy:
sgsnemu/cmdline.c:4: WARNING:LEADING_SPACE: please, no spaces at the start of a line
Change-Id: Ie89a9f9de64cd59d21341b6f381b32f56693840f
---
M sgsnemu/cmdline.c
M sgsnemu/cmdline.ggo
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/sgsnemu/cmdline.c b/sgsnemu/cmdline.c
index 604e76b..e287116 100644
--- a/sgsnemu/cmdline.c
+++ b/sgsnemu/cmdline.c
@@ -1,12 +1,12 @@
/*
- File autogenerated by gengetopt version 2.22.6
- generated with the following command:
- gengetopt --conf-parser
-
- The developers of gengetopt consider the fixed text that goes in all
- gengetopt output files to be in the public domain:
- we make no copyright claims on it.
-*/
+ * File autogenerated by gengetopt version 2.22.6
+ * generated with the following command:
+ * gengetopt --conf-parser
+ *
+ * The developers of gengetopt consider the fixed text that goes in all
+ * gengetopt output files to be in the public domain:
+ * we make no copyright claims on it.
+ */
/* If we use autoconf. */
#ifdef HAVE_CONFIG_H
diff --git a/sgsnemu/cmdline.ggo b/sgsnemu/cmdline.ggo
index 0d074aa..54db05b 100644
--- a/sgsnemu/cmdline.ggo
+++ b/sgsnemu/cmdline.ggo
@@ -1,11 +1,11 @@
# OsmoGGSN - Gateway GPRS Support Node
# Copyright (C) 2002, 2003, 2004 Mondru AB.
-#
+#
# The contents of this file may be used under the terms of the GNU
# General Public License Version 2, provided that the above copyright
# notice and this permission notice is included in all copies or
# substantial portions of the software.
-#
+#
# Use
# gengetopt --conf-parser < cmdline.ggo
# linux-2.6/scripts/Lindent cmdline.c
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/40713?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ie89a9f9de64cd59d21341b6f381b32f56693840f
Gerrit-Change-Number: 40713
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40702?usp=email )
Change subject: sccp_sclc: Remove SCCP cause mask in N-NOTICE.ind 'Reason for return' field
......................................................................
sccp_sclc: Remove SCCP cause mask in N-NOTICE.ind 'Reason for return' field
ITU Q.713 A.5 states "There is a one-to-one mapping between the return cause of
UDTS, XUDTS or LUDTS messages and the reason for return in the N-NOTICE
primitives".
This matches with the list of strings listed in ITU Q.711 6.2.2.2.4
"Reason for return".
"return cause" can in turn be found in ITU Q.713 3.12.
During sccp_sclc_rx_scrc_rout_fail(), we are encoding the "return cause"
param into the xua_msg usig gen_ret_msg(), which encodes it as SUA by
prepending the SUA_CAUSE_T_RETURN bitmask cause-type to it.
However, when constructing the primitive N-NOTICE.ind, we need to remove
that mask when filling in "Reason for return".
Change-Id: Iccff1e8809769edae36081a79119eb8da901841a
---
M include/osmocom/sigtran/sccp_sap.h
M src/sccp_sclc.c
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h
index 65eff74..7399b3d 100644
--- a/include/osmocom/sigtran/sccp_sap.h
+++ b/include/osmocom/sigtran/sccp_sap.h
@@ -256,8 +256,10 @@
struct osmo_scu_notice_param {
struct osmo_sccp_addr called_addr;
struct osmo_sccp_addr calling_addr;
+ /* ITU Q.711 6.2.2.2.4 "Reason for return":
+ * enum sccp_return_cause (ITU Q.713 3.12), as per ITU Q.713 A.5. */
uint32_t cause;
- uint32_t importance;
+ uint32_t importance; /* ITU Q.711 6.2.2.2.6, Q.713 3.19 */
/* user data */
};
diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c
index c7dce89..0a47cd9 100644
--- a/src/sccp_sclc.c
+++ b/src/sccp_sclc.c
@@ -287,7 +287,7 @@
}
param->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
- param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE);
+ param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE) & ~SUA_CAUSE_T_MASK;
scu = sccp_user_find(inst, param->called_addr.ssn,
param->called_addr.pc);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40702?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Iccff1e8809769edae36081a79119eb8da901841a
Gerrit-Change-Number: 40702
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>