- gerrit-log - lists.osmocom.org

Change in simtrace2[master]: contrib/simtrace.lua: Register for "decode as..."

by laforge

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/89/26989/1 diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 30171c4..eba06fc 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -277,6 +277,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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Dissect some more cardem related message types

by laforge

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/88/26988/1 diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index eb2de80..30171c4 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") @@ -172,6 +194,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 @@ -193,8 +253,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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26986 ) Change subject: contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO ...................................................................... Patch Set 1: Code-Review+2 -- 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: 1 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-Comment-Date: Tue, 25 Jan 2022 18:59:06 +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 Flag bits + Data to COL_INFO

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26985 ) Change subject: contrib/simtrace.lua: Add Flag bits + Data to COL_INFO ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File contrib/simtrace.lua: https://gerrit.osmocom.org/c/simtrace2/+/26985/comment/485c53ea_228e3edc PS1, Line 93: if is_pbrx().value == 1 then Using ternary operator may improve readability here: flagstr = flagstr + if is_pbrx().value == 1 then "R" else "." end -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I0aa3d68172022907fbe8371aaca6538df0649dfe Gerrit-Change-Number: 26985 Gerrit-PatchSet: 1 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-Comment-Date: Tue, 25 Jan 2022 18:58:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

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

by fixeria

Attention is currently required from: laforge. fixeria 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+1 -- 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jan 2022 18:54:15 +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 fixeria

Attention is currently required from: laforge. fixeria 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+1 -- 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jan 2022 18:53:50 +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 fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26977 ) Change subject: cosmetic: contrib/simtrace.lua: more consistent formatting ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 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-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Jan 2022 18:53:17 +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.lue: Add VID/PID of all currentl simtrace2 devices

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26976 ) Change subject: contrib/simtrace.lue: Add VID/PID of all currentl simtrace2 devices ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/simtrace2/+/26976/comment/6c32d746_99d56c6e PS1, Line 7: lue lua -- 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: 1 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-Comment-Date: Tue, 25 Jan 2022 18:52:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/26987 ) Change subject: ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice ...................................................................... ttcn3-bsc-test/jenkins.sh: fix '--ulimit core=-1' set twice Change-Id: I3223f8f4cc09797de44971215a94fc62ad8d263b --- M ttcn3-bsc-test/jenkins.sh 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/87/26987/1 diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 7f05c5e..fd9046c 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -32,7 +32,6 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ - --ulimit core=-1 \ $DOCKER_ARGS \ $REPO_USER/osmo-stp-$IMAGE_SUFFIX -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3223f8f4cc09797de44971215a94fc62ad8d263b Gerrit-Change-Number: 26987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

Change in simtrace2[master]: contrib/simtrace.lua: Don't print SIMTRACE_MSGT_ in every COL_INFO

by laforge

laforge has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/86/26986/1 diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 0a2d0ec..eb2de80 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) -- 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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log