lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

January 2022

  • 3 participants
  • 781 discussions
Change in simtrace2[master]: contrib/simtrace.lua: Register for "decode as..."
by laforge 26 Jan '22

26 Jan '22
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26989 ) Change subject: contrib/simtrace.lua: Register for "decode as..." ...................................................................... contrib/simtrace.lua: Register for "decode as..." This allows to manually decode traces that don't contain the vid/pid information Change-Id: Idd605f63f01f005f07a4c329847d08331bfdc9e8 --- M contrib/simtrace.lua 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 25b91a6..fa477d5 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -253,6 +253,7 @@ 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.device"):add_for_decode_as(usb_simtrace_protocol) 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/+/26989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Idd605f63f01f005f07a4c329847d08331bfdc9e8 Gerrit-Change-Number: 26989 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged
1 0
0 0
Change in simtrace2[master]: contrib/simtrace.lua: Dissect some more cardem related message types
by laforge 26 Jan '22

26 Jan '22
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26988 ) Change subject: contrib/simtrace.lua: Dissect some more cardem related message types ...................................................................... contrib/simtrace.lua: Dissect some more cardem related message types Change-Id: I1892c1e154130d8048e99fd1d8f8809f00366e80 --- M contrib/simtrace.lua 1 file changed, 69 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 4371dfa..25b91a6 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -49,6 +49,19 @@ local rxtxdatalen = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.DEC) local rxtxdata = ProtoField.bytes("usb_simtrace.rxtxdata", "rx/tx (data)") +local hf_pts_len = ProtoField.uint8("usb_simtrace.pts_len", "PTS length", base.DEC) +local hf_pts_req = ProtoField.bytes("usb_simtrace.pts_req", "PTS request") +local hf_pts_resp = ProtoField.bytes("usb_simtrace.pts_resp", "PTS response") + +local hf_cemu_cfg_features = ProtoField.uint32("usb_simtrace.cemu_cfg.features.status_irq", "CardEm Features", base.HEX) +local hf_cemu_cfg_slot_mux_nr = ProtoField.uint32("usb_simtrace.cemu_cfg.features.slot_mux_nr", "CardEm Slot Mux Nr", base.DEC) + +local card_insert_types = { + [0x00] = "not inserted", + [0x01] = "inserted", +} +local hf_cemu_cardinsert = ProtoField.uint8("usb_simtrace.cardinsert", "Card Insert", base.DEC, card_insert_types, 0xff) + local CEMU_STATUS_F_VCC_PRESENT = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_VCC_PRESENT", "VCC_PRESENT", base.HEX_DEC, NULL, 0x00000001) local CEMU_STATUS_F_CLK_ACTIVE = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_CLK_ACTIVE", "CLK_ACTIVE", base.HEX_DEC, NULL, 0x00000002) local CEMU_STATUS_F_RCEMU_ACTIVE = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_RCEMU_ACTIVE", "CEMU_ACTIVE", base.HEX_DEC, NULL, 0x00000004) @@ -63,11 +76,20 @@ local modem_reset_status = ProtoField.uint8("usb_simtrace.modem.reset_type", "modem reset type", base.HEX, modem_reset_types, 0xf) local modem_reset_len = ProtoField.uint8("usb_simtrace.modem.reset_len", "modem reset length (ms)", base.DEC) +local modem_sim_select_types = { + [0x00] = "local", + [0x01] = "remote", +} +local hf_modem_sim_select = ProtoField.uint8("usb_simtrace.modem.sim_select", "SIM card selection", base.DEC, modem_sim_select_types, 0xff) + usb_simtrace_protocol.fields = { msgtype, seqnr, slotnr, reserved, payloadlen, payload, pb_and_rx, pb_and_tx, final, tpdu_hdr, rxtxdatalen, rxtxdata, CEMU_STATUS_F_VCC_PRESENT, CEMU_STATUS_F_CLK_ACTIVE, CEMU_STATUS_F_RCEMU_ACTIVE, CEMU_STATUS_F_CARD_INSERT, CEMU_STATUS_F_RESET_ACTIVE, - modem_reset_status, modem_reset_len + modem_reset_status, modem_reset_len, + hf_pts_len, hf_pts_req, hf_pts_resp, + hf_cemu_cfg_features, hf_cemu_cfg_slot_mux_nr, + hf_cemu_cardinsert, hf_modem_sim_select, } local is_hdr = Field.new("usb_simtrace.tpdu_hdr") @@ -148,6 +170,44 @@ end +function dissect_pts(payload_data, pinfo, tree) + local subtree = tree:add(usb_simtrace_protocol, payload_data, "PTS") + local pts_len = payload_data(0,1):le_uint() + local pts_req = payload_data(1, pts_len); + local pts_resp = payload_data(7, pts_len); + + subtree:add(hf_pts_len, pts_len); + subtree:add(hf_pts_req, pts_req); + subtree:add(hf_pts_resp, pts_resp); + + pinfo.cols.info:append(" Req: " .. pts_req .. ", Resp: " .. pts_resp); +end + +function dissect_cemu_config(payload_data, pinfo, tree) + local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Emu Config") + + subtree:add(hf_cemu_cfg_features, payload_data(0,4)); + subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1)); +end + +function dissect_modem_sim_sel(payload_data, pinfo, tree) + local subtree = tree:add(usb_simtrace_protocol, payload_data, "Modem SIM Select") + local sim_select = payload_data(0,1):le_uint(); + + subtree:add(hf_modem_sim_select, sim_select); + pinfo.cols.info:append(" " .. modem_sim_select_types[sim_select]); +end + +function dissect_cemu_cardinsert(payload_data, pinfo, tree) + local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Insert") + local cins_type = payload_data(0,1):le_uint() + + subtree:add(hf_cemu_cardinsert, cins_type); + pinfo.cols.info:append(" " .. card_insert_types[cins_type]); +end + + + function usb_simtrace_protocol.dissector(buffer, pinfo, tree) length = buffer:len() if length == 0 then return end @@ -169,8 +229,16 @@ return dissect_status(payload_data(),pinfo,subtree) elseif(command == 0x0102) then return dissect_atr(payload_data(),pinfo,subtree) + elseif(command == 0x0105) then + return dissect_cemu_cardinsert(payload_data(),pinfo,subtree) + elseif(command == 0x0107) then + return dissect_pts(payload_data(),pinfo,subtree) + elseif(command == 0x0108) then + return dissect_cemu_config(payload_data(),pinfo,subtree) elseif(command == 0x0201) then return dissect_modem_reset(payload_data(),pinfo,subtree) + elseif(command == 0x0202) then + return dissect_modem_sim_sel(payload_data(),pinfo,subtree) else subtree:add(payload, payload_data) end -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I1892c1e154130d8048e99fd1d8f8809f00366e80 Gerrit-Change-Number: 26988 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged
1 0
0 0
Change in simtrace2[master]: contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO
by laforge 26 Jan '22

26 Jan '22
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26986 ) Change subject: contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO ...................................................................... contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO this is redundant. We care about *which* message type, and not about wasting horizontal screen real-estate. Change-Id: I98f90561b39401f1c2339f79a3cb40574bb03b2d --- M contrib/simtrace.lua 1 file changed, 16 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index c5bdafb..4371dfa 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -13,26 +13,26 @@ [0x0001] = "SIMTRACE_CMD_BD_BOARD_INFO", -- /* SIMTRACE_MSGC_CARDEM */ -[0x0101] = "SIMTRACE_MSGT_DT_CEMU_TX_DATA", -[0x0102] = "SIMTRACE_MSGT_DT_CEMU_SET_ATR", -[0x0103] = "SIMTRACE_MSGT_BD_CEMU_STATS", -[0x0104] = "SIMTRACE_MSGT_BD_CEMU_STATUS", -[0x0105] = "SIMTRACE_MSGT_DT_CEMU_CARDINSERT", -[0x0106] = "SIMTRACE_MSGT_DO_CEMU_RX_DATA", -[0x0107] = "SIMTRACE_MSGT_DO_CEMU_PTS", -[0x0108] = "SIMTRACE_MSGT_BD_CEMU_CONFIG", +[0x0101] = "DT_CEMU_TX_DATA", +[0x0102] = "DT_CEMU_SET_ATR", +[0x0103] = "BD_CEMU_STATS", +[0x0104] = "BD_CEMU_STATUS", +[0x0105] = "DT_CEMU_CARDINSERT", +[0x0106] = "DO_CEMU_RX_DATA", +[0x0107] = "DO_CEMU_PTS", +[0x0108] = "BD_CEMU_CONFIG", -- /* SIMTRACE_MSGC_MODEM */ -[0x0201] = "SIMTRACE_MSGT_DT_MODEM_RESET", -[0x0202] = "SIMTRACE_MSGT_DT_MODEM_SIM_SELECT", -[0x0203] = "SIMTRACE_MSGT_BD_MODEM_STATUS", +[0x0201] = "DT_MODEM_RESET", +[0x0202] = "DT_MODEM_SIM_SELECT", +[0x0203] = "BD_MODEM_STATUS", -- /* SIMTRACE_MSGC_SNIFF */ -[0x0300] = "SIMTRACE_MSGT_SNIFF_CHANGE", -[0x0301] = "SIMTRACE_MSGT_SNIFF_FIDI", -[0x0302] = "SIMTRACE_MSGT_SNIFF_ATR", -[0x0304] = "SIMTRACE_MSGT_SNIFF_TPDU", -[0x0303] = "SIMTRACE_MSGT_SNIFF_PPS" +[0x0300] = "SNIFF_CHANGE", +[0x0301] = "SNIFF_FIDI", +[0x0302] = "SNIFF_ATR", +[0x0304] = "SNIFF_TPDU", +[0x0303] = "SNIFF_PPS" } local msgtype = ProtoField.uint16("usb_simtrace.msgtype", "Message Type", base.HEX_DEC, control_commands) 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/+/26986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I98f90561b39401f1c2339f79a3cb40574bb03b2d Gerrit-Change-Number: 26986 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
1 0
0 0
Change in simtrace2[master]: contrib/simtrace.lua: Register for "decode as..."
by laforge 26 Jan '22

26 Jan '22
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26989 ) Change subject: contrib/simtrace.lua: Register for "decode as..." ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Idd605f63f01f005f07a4c329847d08331bfdc9e8 Gerrit-Change-Number: 26989 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:11:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in simtrace2[master]: contrib/simtrace.lua: Dissect some more cardem related message types
by laforge 26 Jan '22

26 Jan '22
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26988 ) Change subject: contrib/simtrace.lua: Dissect some more cardem related message types ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I1892c1e154130d8048e99fd1d8f8809f00366e80 Gerrit-Change-Number: 26988 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:11:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in simtrace2[master]: cardem: set more reasonable interrupt priorities
by laforge 26 Jan '22

26 Jan '22
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26995 to look at the new patch set (#2). Change subject: cardem: set more reasonable interrupt priorities ...................................................................... cardem: set more reasonable interrupt priorities the ISO7816 UARTs have highest priority, while console has lowest. remaining sources (USB, ADC, GPIO) are in between. Change-Id: Ie6c97d61d8da3990b6e44144f36cb6d37d194307 --- M firmware/apps/cardem/main.c M firmware/libboard/common/source/uart_console.c M firmware/libcommon/source/mode_cardemu.c 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/95/26995/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie6c97d61d8da3990b6e44144f36cb6d37d194307 Gerrit-Change-Number: 26995 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
1 0
0 0
Change in libosmo-sccp[2021q4]: sccp_user: do not force the role ASP when configured differently
by daniel 26 Jan '22

26 Jan '22
Attention is currently required from: neels, laforge, fixeria, dexter. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/26994 ) Change subject: sccp_user: do not force the role ASP when configured differently ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/26994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: 2021q4 Gerrit-Change-Id: Ib57c513407747d36e503a4fb01c50c69dea0cb85 Gerrit-Change-Number: 26994 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jan 2022 15:07:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
Change in simtrace2[master]: contrib/simtrace.lua: print length + slot-number in decimal only
by laforge 26 Jan '22

26 Jan '22
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26984 ) Change subject: contrib/simtrace.lua: print length + slot-number in decimal only ...................................................................... contrib/simtrace.lua: print length + slot-number in decimal only Change-Id: Ia9a969b88170c49f8bb1cb0cda6918d6a894d3ba --- M contrib/simtrace.lua 1 file changed, 4 insertions(+), 4 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 d05ff0a..c5bdafb 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -36,17 +36,17 @@ } local msgtype = ProtoField.uint16("usb_simtrace.msgtype", "Message Type", base.HEX_DEC, control_commands) -local seqnr = ProtoField.uint8("usb_simtrace.seqnr", "Sequence Number", base.HEX_DEC) -local slotnr = ProtoField.uint8("usb_simtrace.slotnr", "Slot Number", base.HEX_DEC) +local seqnr = ProtoField.uint8("usb_simtrace.seqnr", "Sequence Number", base.DEC) +local slotnr = ProtoField.uint8("usb_simtrace.slotnr", "Slot Number", base.DEC) local reserved = ProtoField.uint16("usb_simtrace.reserved", "reserved", base.HEX_DEC) -local payloadlen = ProtoField.uint16("usb_simtrace.length", "length", base.HEX_DEC) +local payloadlen = ProtoField.uint16("usb_simtrace.length", "length", base.DEC) local payload = ProtoField.bytes("usb_simtrace.payload", "Data") local pb_and_rx = ProtoField.uint32("usb_simtrace.pb_and_rx", "pb_and_rx", base.HEX_DEC, NULL, 0x8) local pb_and_tx = ProtoField.uint32("usb_simtrace.pb_and_tx", "pb_and_tx", base.HEX_DEC, NULL, 0x4) local final = ProtoField.uint32("usb_simtrace.final", "final", base.HEX_DEC, NULL, 0x2) local tpdu_hdr = ProtoField.uint32("usb_simtrace.tpdu_hdr", "tpdu_hdr", base.HEX_DEC, NULL, 0x1) -local rxtxdatalen = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.HEX_DEC) +local rxtxdatalen = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.DEC) local rxtxdata = ProtoField.bytes("usb_simtrace.rxtxdata", "rx/tx (data)") local CEMU_STATUS_F_VCC_PRESENT = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_VCC_PRESENT", "VCC_PRESENT", base.HEX_DEC, NULL, 0x00000001) 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/+/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: 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
1 0
0 0
Change in simtrace2[master]: cosmetic: contrib/simtrace.lua: more consistent formatting
by laforge 26 Jan '22

26 Jan '22
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
1 0
0 0
Change in simtrace2[master]: contrib/simtrace.lua: Add header with author/description/usage
by laforge 26 Jan '22

26 Jan '22
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
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • ...
  • 79
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.