March 2022 - gerrit-log - lists.osmocom.org

Change in simtrace2[master]: firmware: bugfix: disable cardemu comms in local SIM mode

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26865 ) Change subject: firmware: bugfix: disable cardemu comms in local SIM mode ...................................................................... firmware: bugfix: disable cardemu comms in local SIM mode This change prevents contention on the ISO7816 bus by disabling the card emulation state machine when the SIM switch is in the local mode. Without this change, the card emulation firmware can clobber ISO7816 communications and cause contention with certain (but not all) SIM cards. Changes: - Add 'enabled' flag to cardemu instance that is set/cleared by usb_command_sim_select() (the only place where sim switch occurs). - Flag is initialized as false (disabled) by default, to match local SIM mode default. - When card emulation is disabled, force SIM VCC to be "OFF", SIM RESET as "not in RESET", and drop bytes bytes received on the ISO7816 interface (but do service buffers). Change-Id: I4010f988712eac4a6af8568ccd60062f9de62449 --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 31 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/65/26865/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index 8e4acf9..00a062e 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -83,10 +83,21 @@ #ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; #endif + + /*! real-time state of VCC I/O line, irrespective of enabled flag */ bool vcc_active; + + /*! last VCC state we reported to the card emu state machine (conditioned by enabled flag) */ bool vcc_active_last; + + /*! real-time state of RST I/O line, irrespective of enabled flag */ bool rst_active; + + /*! last RST state we reported to the card emu state machine (conditioned by enabled flag) */ bool rst_active_last; + + /*! flag indicating whether this instance should perform card emulation, or not */ + bool enabled; }; struct cardem_inst cardem_inst[] = { @@ -505,19 +516,25 @@ #endif /* DETECT_VCC_BY_ADC */ -/* called from main loop; dispatches card I/O state changes to card_emu from main loop */ +/** + * called from main loop; dispatches card I/O state changes to card_emu from main loop. + * NOTE: conditions I/O state on the ci->enabled flag; if the instance is disabled, we assume VCC is + * disabled and the device is not in reset + */ static void process_io_statechg(struct cardem_inst *ci) { - if (ci->vcc_active != ci->vcc_active_last) { - card_emu_io_statechg(ci->ch, CARD_IO_VCC, ci->vcc_active); + const bool vcc_active = ci->vcc_active && ci->enabled; + if (vcc_active != ci->vcc_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_VCC, vcc_active); /* FIXME do this for real */ - card_emu_io_statechg(ci->ch, CARD_IO_CLK, ci->vcc_active); - ci->vcc_active_last = ci->vcc_active; + card_emu_io_statechg(ci->ch, CARD_IO_CLK, vcc_active); + ci->vcc_active_last = vcc_active; } - if (ci->rst_active != ci->rst_active_last) { - card_emu_io_statechg(ci->ch, CARD_IO_RST, ci->rst_active); - ci->rst_active_last = ci->rst_active; + const bool rst_active = ci->rst_active && ci->enabled; + if (rst_active != ci->rst_active_last) { + card_emu_io_statechg(ci->ch, CARD_IO_RST, rst_active); + ci->rst_active_last = rst_active; } } @@ -764,10 +781,8 @@ if (msgb_l2len(msg) < sizeof(*mss)) return -1; - if (mss->remote_sim) - sim_switch_use_physical(ci->num, 0); - else - sim_switch_use_physical(ci->num, 1); + ci->enabled = mss->remote_sim ? true : false; + sim_switch_use_physical(ci->num, !ci->enabled); return 0; } @@ -911,7 +926,10 @@ } uint8_t byte = rbuf_read(&ci->rb); __enable_irq(); - card_emu_process_rx_byte(ci->ch, byte); + + if (ci->enabled) { + card_emu_process_rx_byte(ci->ch, byte); + } //TRACE_ERROR("%uRx%02x\r\n", i, byte); } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I4010f988712eac4a6af8568ccd60062f9de62449 Gerrit-Change-Number: 26865 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

3 years, 3 months

3
6
0 0

Change in libosmocore[master]: clean-up pkg-config files: Make use of "Requires" as documented

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27521 ) Change subject: clean-up pkg-config files: Make use of "Requires" as documented ...................................................................... clean-up pkg-config files: Make use of "Requires" as documented According to the pkg-config manual, "Libs" should not contain flags for _required_ packages. Instead, they should be expressed via "Requires". Let's do that Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b --- M libosmocodec.pc.in M libosmocoding.pc.in M libosmocore.pc.in M libosmoctrl.pc.in M libosmogb.pc.in M libosmogsm.pc.in M libosmosim.pc.in M libosmousb.pc.in M libosmovty.pc.in 9 files changed, 22 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in index 9e058ef..0c4de8d 100644 --- a/libosmocodec.pc.in +++ b/libosmocodec.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Codec related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocodec -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ - +Requires: talloc, libosmocore +Libs: -L${libdir} -losmocodec +Cflags: -I${includedir}/ diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in index d1d03c4..5b91a60 100644 --- a/libosmocoding.pc.in +++ b/libosmocoding.pc.in @@ -6,6 +6,6 @@ Name: Osmocom L1 transcoding Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocoding -losmocodec -losmogsm -losmocore -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ - +Requires: talloc, libosmocore, libosmogsm, libosmocodec +Libs: -L${libdir} -losmocoding +Cflags: -I${includedir}/ diff --git a/libosmocore.pc.in b/libosmocore.pc.in index 80f17c8..3bb9b9a 100644 --- a/libosmocore.pc.in +++ b/libosmocore.pc.in @@ -6,6 +6,7 @@ Name: Osmocom Core Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocore -Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@ -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ @PTHREAD_CFLAGS@ +Requires: talloc, libsctp +Libs: -L${libdir} -losmocore +Libs.private: @PTHREAD_LIBS@ +Cflags: -I${includedir}/ @PTHREAD_CFLAGS@ diff --git a/libosmoctrl.pc.in b/libosmoctrl.pc.in index 4676b31..e9947dc 100644 --- a/libosmoctrl.pc.in +++ b/libosmoctrl.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Control Interface Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmoctrl -losmogsm -losmocore +Requires: talloc, libosmocore, libosmogsm +Libs: -L${libdir} -losmoctrl Cflags: -I${includedir}/ - diff --git a/libosmogb.pc.in b/libosmogb.pc.in index a163cc4..d545ce2 100644 --- a/libosmogb.pc.in +++ b/libosmogb.pc.in @@ -6,6 +6,6 @@ Name: Osmocom GPRS Gb Library Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmogb -losmovty -losmocore +Requires: libosmocore, libosmovty +Libs: -L${libdir} -losmogb Cflags: -I${includedir}/ -fno-strict-aliasing - diff --git a/libosmogsm.pc.in b/libosmogsm.pc.in index 0160be8..0aaf51e 100644 --- a/libosmogsm.pc.in +++ b/libosmogsm.pc.in @@ -6,6 +6,6 @@ Name: Osmocom GSM Core Library Description: GSM Core Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmogsm -losmocore +Requires: talloc, libosmocore +Libs: -L${libdir} -losmogsm Cflags: -I${includedir}/ - diff --git a/libosmosim.pc.in b/libosmosim.pc.in index 83777c3..a8f50d6 100644 --- a/libosmosim.pc.in +++ b/libosmosim.pc.in @@ -6,6 +6,6 @@ Name: Osmocom SIM card related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmosim -losmocore +Requires: talloc, libosmocore +Libs: -L${libdir} -losmosim Cflags: -I${includedir}/ - diff --git a/libosmousb.pc.in b/libosmousb.pc.in index ce6d271..dbedb0e 100644 --- a/libosmousb.pc.in +++ b/libosmousb.pc.in @@ -6,6 +6,6 @@ Name: Osmocom libusb (USB) integration Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmousb -losmocore +Requires: talloc, libusb-1.0, libosmocore +Libs: -L${libdir} -losmousb Cflags: -I${includedir}/ - diff --git a/libosmovty.pc.in b/libosmovty.pc.in index 6204e45..9a907e0 100644 --- a/libosmovty.pc.in +++ b/libosmovty.pc.in @@ -6,6 +6,6 @@ Name: Osmocom VTY Interface Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmovty -losmocore +Requires: libosmocore +Libs: -L${libdir} -losmovty Cflags: -I${includedir}/ - -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b Gerrit-Change-Number: 27521 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: clean-up pkg-config files: Make use of "Requires" as documented

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27521 ) Change subject: clean-up pkg-config files: Make use of "Requires" as documented ...................................................................... Patch Set 1: Code-Review+2 (2 comments) File libosmogb.pc.in: https://gerrit.osmocom.org/c/libosmocore/+/27521/comment/f7a491b3_1913325f PS1, Line 9: Requires: libosmocore, libosmovty > libosmocore 'requires' talloc, so no need to specify it here again. […] Done File libosmovty.pc.in: https://gerrit.osmocom.org/c/libosmocore/+/27521/comment/6f33dce5_0be38113 PS1, Line 9: Requires: libosmocore > talloc is missing here. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b Gerrit-Change-Number: 27521 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:57:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: clean-up pkg-config files: Make use of "Requires" as documented

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27521 ) Change subject: clean-up pkg-config files: Make use of "Requires" as documented ...................................................................... Patch Set 1: (1 comment) File libosmogb.pc.in: https://gerrit.osmocom.org/c/libosmocore/+/27521/comment/262bfb9a_2011a6c4 PS1, Line 9: Requires: libosmocore, libosmovty > talloc is missing here. libosmocore 'requires' talloc, so no need to specify it here again. pkg-config does this recursively. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b Gerrit-Change-Number: 27521 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:56:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-pfcp: implement/generate TLV and IE value coding

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27222 ) Change subject: libosmo-pfcp: implement/generate TLV and IE value coding ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3069045b2d42dac88d955c636230adc64a7a4aa7 Gerrit-Change-Number: 27222 Gerrit-PatchSet: 11 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:55:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-pfcp: add pfcp_proto.h pfcp_strs.h

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27221 ) Change subject: libosmo-pfcp: add pfcp_proto.h pfcp_strs.h ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I568b821e89007ed52eeefcdbcb6edd8052a8b5be Gerrit-Change-Number: 27221 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:54:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-gtlv: add TLIV capability

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27529 ) Change subject: libosmo-gtlv: add TLIV capability ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0a076e54dfba6038cc779cb7c8f3967d212226aa Gerrit-Change-Number: 27529 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:53:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-gtlv: add C code generator for IE structs and arrays

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27219 ) Change subject: libosmo-gtlv: add C code generator for IE structs and arrays ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ifb3ea54d2797ce060b95834aa117725ec2d6c4cf Gerrit-Change-Number: 27219 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:53:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-gtlv: add generic TLV de- and encoder

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27217 ) Change subject: libosmo-gtlv: add generic TLV de- and encoder ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: I would put it straight into the libosmocore repo, avoiding the need to change stuff later on, but it's up to you. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ib0fd00d9f288ffe13b7e67701f3e47073587404a Gerrit-Change-Number: 27217 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:51:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: pco.h: Fix typo in reference to spec

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27568 ) Change subject: pco.h: Fix typo in reference to spec ...................................................................... pco.h: Fix typo in reference to spec Change-Id: Ic428892161123b62d25a7619128ef7325bf85500 --- M ggsn/pco.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ggsn/pco.h b/ggsn/pco.h index 7ebe05a..4d999ef 100644 --- a/ggsn/pco.h +++ b/ggsn/pco.h @@ -4,7 +4,7 @@ #include "../gtp/pdp.h" -/* 3GPP TS 24.008 10.6.5.3 */ +/* 3GPP TS 24.008 10.5.6.3 */ enum pco_protocols { PCO_P_LCP = 0xC021, PCO_P_PAP = 0xC023, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic428892161123b62d25a7619128ef7325bf85500 Gerrit-Change-Number: 27568 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022