<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/25086">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib: more cardem dissection<br><br>Change-Id: Ia74d3674f854b390c9745a1cb8d5756bd5d39540<br>---<br>M contrib/simtrace.lua<br>1 file changed, 27 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/86/25086/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua</span><br><span>index 8298265..c21870e 100644</span><br><span>--- a/contrib/simtrace.lua</span><br><span>+++ b/contrib/simtrace.lua</span><br><span>@@ -36,9 +36,29 @@</span><br><span> local payloadlen  = ProtoField.uint16("usb_simtrace.length", "length", base.HEX_DEC)</span><br><span> local payload  = ProtoField.bytes("usb_simtrace.payload", "Data")</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+local pb_and_rx  = ProtoField.uint32("usb_simtrace.pb_and_rx", "pb_and_rx", base.HEX_DEC, NULL, 0x8)</span><br><span style="color: hsl(120, 100%, 40%);">+local pb_and_tx  = ProtoField.uint32("usb_simtrace.pb_and_tx", "pb_and_tx", base.HEX_DEC, NULL, 04)</span><br><span style="color: hsl(120, 100%, 40%);">+local final  = ProtoField.uint32("usb_simtrace.final", "final", base.HEX_DEC, NULL, 0x2)</span><br><span style="color: hsl(120, 100%, 40%);">+local tpdu_hdr  = ProtoField.uint32("usb_simtrace.tpdu_hdr", "tpdu_hdr", base.HEX_DEC, NULL, 0x1)</span><br><span style="color: hsl(120, 100%, 40%);">+local rxtxdatalen  = ProtoField.uint16("usb_simtrace.rxtxdatalen", "rx/tx data length", base.HEX_DEC)</span><br><span style="color: hsl(120, 100%, 40%);">+local rxtxdata  = ProtoField.bytes("usb_simtrace.rxtxdata", "rx/tx Data")</span><br><span> usb_simtrace_protocol.fields = {</span><br><span style="color: hsl(0, 100%, 40%);">-  msgtype, seqnr, slotnr, reserved, payloadlen, payload</span><br><span style="color: hsl(120, 100%, 40%);">+  msgtype, seqnr, slotnr, reserved, payloadlen, payload, pb_and_rx, pb_and_tx, final, tpdu_hdr, rxtxdatalen, rxtxdata</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+function dissect_rxtx(payload_data,pinfo,tree)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  local headerSubtree = tree:add(usb_simtrace_protocol, payload_data, "rx/tx data")</span><br><span style="color: hsl(120, 100%, 40%);">+  local len  = payload_data(8+4,2):le_uint();</span><br><span style="color: hsl(120, 100%, 40%);">+  local cmd32 =  payload_data(8+0,4):le_uint();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  headerSubtree:add(pb_and_rx, cmd32)</span><br><span style="color: hsl(120, 100%, 40%);">+  headerSubtree:add(pb_and_tx, cmd32)</span><br><span style="color: hsl(120, 100%, 40%);">+  headerSubtree:add(final, cmd32)</span><br><span style="color: hsl(120, 100%, 40%);">+  headerSubtree:add(tpdu_hdr, cmd32)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  headerSubtree:add(rxtxdatalen, len)</span><br><span style="color: hsl(120, 100%, 40%);">+  headerSubtree:add_le(rxtxdata, payload_data(8+6,len))</span><br><span style="color: hsl(120, 100%, 40%);">+end</span><br><span> </span><br><span> function usb_simtrace_protocol.dissector(buffer, pinfo, tree)</span><br><span>   length = buffer:len()</span><br><span>@@ -54,7 +74,12 @@</span><br><span>   subtree:add(slotnr, buffer(3,1))</span><br><span>   subtree:add_le(payloadlen, buffer(6,2))</span><br><span>   pinfo.cols.info = string.format("Cmd 0x%04X : %s", command, control_commands[command])</span><br><span style="color: hsl(0, 100%, 40%);">-  subtree:add(payload, buffer(8,length-8))</span><br><span style="color: hsl(120, 100%, 40%);">+  local payload_data = buffer(8,length-8)</span><br><span style="color: hsl(120, 100%, 40%);">+  if(command == 0x0101 or command == 0x0106) then</span><br><span style="color: hsl(120, 100%, 40%);">+    return dissect_rxtx(buffer(),pinfo,subtree)</span><br><span style="color: hsl(120, 100%, 40%);">+  else</span><br><span style="color: hsl(120, 100%, 40%);">+    subtree:add(payload, payload_data)</span><br><span style="color: hsl(120, 100%, 40%);">+  end</span><br><span> </span><br><span> end</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/25086">change 25086</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/25086"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia74d3674f854b390c9745a1cb8d5756bd5d39540 </div>
<div style="display:none"> Gerrit-Change-Number: 25086 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>