- gerrit-log - lists.osmocom.org

Change in simtrace2[master]: cosmetic: contrib/simtrace.lua: more consistent formatting

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26977 ) Change subject: cosmetic: contrib/simtrace.lua: more consistent formatting ...................................................................... cosmetic: contrib/simtrace.lua: more consistent formatting Change-Id: If842dd95c7244ebe33579ed104247c66682ed4d4 --- M contrib/simtrace.lua 1 file changed, 11 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 83bc925..09ee9e6 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -160,11 +160,11 @@ if(command == 0x0101 or command == 0x0106) then return dissect_rxtx(payload_data(),pinfo,subtree) elseif(command == 0x0104) then - return dissect_status(payload_data(),pinfo,subtree) + return dissect_status(payload_data(),pinfo,subtree) elseif(command == 0x0102) then - return dissect_atr(payload_data(),pinfo,subtree) + return dissect_atr(payload_data(),pinfo,subtree) elseif(command == 0x0201) then - return dissect_modem_reset(payload_data(),pinfo,subtree) + return dissect_modem_reset(payload_data(),pinfo,subtree) else subtree:add(payload, payload_data) end @@ -173,13 +173,12 @@ function usb_simtrace_protocol.init() -local usb_product_dissectors = DissectorTable.get("usb.product") -usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST -usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM -usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2 -usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD -usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW -DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol) -DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol) ---concatss = ByteArray.new() + local usb_product_dissectors = DissectorTable.get("usb.product") + usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST + usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM + usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2 + usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD + usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW + DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol) + DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol) end -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If842dd95c7244ebe33579ed104247c66682ed4d4 Gerrit-Change-Number: 26977 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(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, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add header with author/description/usage

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26978 ) Change subject: contrib/simtrace.lua: Add header with author/description/usage ...................................................................... contrib/simtrace.lua: Add header with author/description/usage Change-Id: I56574741cd77436f9f452420677c00d8049a50cc --- M contrib/simtrace.lua 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 09ee9e6..d05ff0a 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -1,3 +1,9 @@ +-- wireshark LUA dissector for the SIMtrace USB protocol +-- (C) 2021 by sysmocom - s.f.m.c. GmbH, Author: Eric Wild +-- SPDX-License-Identifier: GPL-2.0+ +-- +-- Usage: Put this into your ~/.wireshark/init.lua [or include it from there] + usb_simtrace_protocol = Proto("USB_simtrace", "USB simtrace protocol") 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I56574741cd77436f9f452420677c00d8049a50cc Gerrit-Change-Number: 26978 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: print length + slot-number in decimal only

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26984 ) Change subject: contrib/simtrace.lua: print length + slot-number in decimal only ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia9a969b88170c49f8bb1cb0cda6918d6a894d3ba Gerrit-Change-Number: 26984 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:05:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add header with author/description/usage

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26978 ) Change subject: contrib/simtrace.lua: Add header with author/description/usage ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I56574741cd77436f9f452420677c00d8049a50cc Gerrit-Change-Number: 26978 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:05:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: cosmetic: contrib/simtrace.lua: more consistent formatting

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26977 ) Change subject: cosmetic: contrib/simtrace.lua: more consistent formatting ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If842dd95c7244ebe33579ed104247c66682ed4d4 Gerrit-Change-Number: 26977 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:05:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: host: properly zero-initialize interface match structures

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26975 ) Change subject: host: properly zero-initialize interface match structures ...................................................................... host: properly zero-initialize interface match structures This can lead to some fields not properly zero-initialized, fooling our matching code into the application having requested certain fields to match ('0' is usually assumed to be unspecified). Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-tool.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 3ec7509..8b08f36 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -549,6 +549,7 @@ do { struct usb_interface_match _ifm, *ifm = &_ifm; + memset(ifm, 0, sizeof(*ifm)); ifm->vendor = vendor_id; ifm->product = product_id; ifm->configuration = config_id; diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d705796..9c9b5ed 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -303,6 +303,7 @@ do { if (transp->udp_fd < 0) { struct usb_interface_match _ifm, *ifm = &_ifm; + memset(ifm, 0, sizeof(*ifm)); ifm->vendor = vendor_id; ifm->product = product_id; ifm->configuration = config_id; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 Gerrit-Change-Number: 26975 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26976 ) Change subject: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices ...................................................................... contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d --- M contrib/simtrace.lua 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index efae492..83bc925 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -174,8 +174,11 @@ function usb_simtrace_protocol.init() local usb_product_dissectors = DissectorTable.get("usb.product") -usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) +usb_product_dissectors:add(0x1d50616d, usb_simtrace_protocol) -- OCTSIMTEST +usb_product_dissectors:add(0x1d50616e, usb_simtrace_protocol) -- NGFF_CARDEM +usb_product_dissectors:add(0x1d5060e3, usb_simtrace_protocol) -- SIMTRACE2 +usb_product_dissectors:add(0x1d504004, usb_simtrace_protocol) -- QMOD +usb_product_dissectors:add(0x1d504001, usb_simtrace_protocol) -- OWHW DissectorTable.get("usb.bulk"):add(0xffff, usb_simtrace_protocol) DissectorTable.get("usb.interrupt"):add(0xffff, usb_simtrace_protocol) --concatss = ByteArray.new() -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d Gerrit-Change-Number: 26976 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26976 ) Change subject: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d Gerrit-Change-Number: 26976 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:04:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26976 to look at the new patch set (#2). Change subject: contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices ...................................................................... contrib/simtrace.lua: Add VID/PID of all currentl simtrace2 devices Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d --- M contrib/simtrace.lua 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/76/26976/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie425f8dbd3a02c6bdcdaeaafaf0d5b4fb351ec4d Gerrit-Change-Number: 26976 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: host: properly zero-initialize interface match structures

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26975 ) Change subject: host: properly zero-initialize interface match structures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I304d55b584e37d9dccb75b24057bb682f799beb2 Gerrit-Change-Number: 26975 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:04:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log